ESM fixes

src/backend.ts

@@ -12,7 +12,7 @@
 // OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-import { DeferableFunction, DeferredFunction } from "./index.js";
+import { DeferableFunction, DeferredFunction } from "./index";
 
 export type ExecutionState =
   | "created"

src/backend/local.ts

@@ -32,17 +32,17 @@ import {
   PageResult,
   ReRunExecutionResult,
   RescheduleExecutionResult,
-} from "../backend.js";
+} from "../backend";
 import {
   DeferableFunction,
   DeferredFunction,
   ExecutionMetadata,
-} from "../index.js";
-import { error, info } from "../logger.js";
-import { getEnv, randomUUID, sleep, stringify } from "../utils.js";
-import version from "../version.js";
-import { Counter } from "./local/counter.js";
-import { KV } from "./local/kv.js";
+} from "../index";
+import { error, info } from "../logger";
+import { getEnv, randomUUID, sleep, stringify } from "../utils";
+import version from "../version";
+import { Counter } from "./local/counter";
+import { KV } from "./local/kv";
 
 interface InternalExecution<F extends DeferableFunction> {
   id: string;
@@ -86,7 +86,7 @@ const banner = `
 
 function paginate<T>(
   page: PageRequest | undefined,
-  records: Map<string, T>,
+  records: Map<string, T>
 ): PageResult<T> {
   let edges = Array.from(records.keys()).reverse();
   let hasNextPage: boolean = false;
@@ -137,7 +137,7 @@ function paginate<T>(
 
 function isExecutionMatchFilter(
   filters: ExecutionFilters | undefined,
-  execution: InternalExecution<any>,
+  execution: InternalExecution<any>
 ): boolean {
   if (
     filters?.states &&
@@ -163,13 +163,13 @@ function isExecutionMatchFilter(
 
   if (filters?.metadata && filters.metadata.length > 0 && execution.metadata) {
     const metadataFilters = filters.metadata.filter(
-      (mdFilter) => mdFilter.values.length > 0,
+      (mdFilter) => mdFilter.values.length > 0
     );
     if (
       !metadataFilters.some((mdFilter) =>
         mdFilter.values.some(
-          (value) => execution.metadata[mdFilter.key] === value,
-        ),
+          (value) => execution.metadata[mdFilter.key] === value
+        )
       )
     ) {
       return false;
@@ -264,7 +264,7 @@ async function loop(shouldRun: () => boolean): Promise<void> {
             execution.updatedAt = new Date();
 
             return execution;
-          },
+          }
         );
 
         if (shouldDiscard) {
@@ -320,7 +320,7 @@ async function loop(shouldRun: () => boolean): Promise<void> {
                 execution.updatedAt = new Date();
                 execution.errorCode = errorCode;
                 return execution;
-              },
+              }
             );
           };
 
@@ -342,7 +342,7 @@ export async function enqueue<F extends DeferableFunction>(
   args: Parameters<F>,
   scheduleFor: Date,
   discardAfter: Date | undefined,
-  metadata: { [key: string]: string } | undefined,
+  metadata: { [key: string]: string } | undefined
 ): Promise<EnqueueResult> {
   let functionId = functionIdMapping.get(func.__metadata.name);
   if (functionId === undefined) {
@@ -396,7 +396,7 @@ export async function getExecutionResult(id: string): Promise<any> {
 
 export async function cancelExecution(
   id: string,
-  force: boolean,
+  force: boolean
 ): Promise<CancelExecutionResult> {
   let execution = await executionsStore.get(id);
   if (execution === undefined)
@@ -407,7 +407,7 @@ export async function cancelExecution(
       switch (execution.state) {
         case "aborting":
           throw new ExecutionAbortingAlreadyInProgress(
-            "aborting execution already in progress",
+            "aborting execution already in progress"
           );
         case "created":
           execution.state = "cancelled";
@@ -417,7 +417,7 @@ export async function cancelExecution(
           break;
         default:
           throw new ExecutionNotCancellable(
-            `cannot cancel execution in "${execution.state}" state`,
+            `cannot cancel execution in "${execution.state}" state`
           );
       }
     } else {
@@ -427,7 +427,7 @@ export async function cancelExecution(
           break;
         default:
           throw new ExecutionNotCancellable(
-            `cannot cancel execution in "${execution.state}" state`,
+            `cannot cancel execution in "${execution.state}" state`
           );
       }
     }
@@ -441,7 +441,7 @@ export async function cancelExecution(
 
 export async function rescheduleExecution(
   id: string,
-  scheduleFor: Date,
+  scheduleFor: Date
 ): Promise<RescheduleExecutionResult> {
   let execution = await executionsStore.get(id);
   if (execution === undefined)
@@ -460,7 +460,7 @@ export async function rescheduleExecution(
 }
 
 export async function reRunExecution(
-  id: string,
+  id: string
 ): Promise<ReRunExecutionResult> {
   const execution = await executionsStore.get(id);
   if (execution === undefined)
@@ -487,7 +487,7 @@ export async function reRunExecution(
 
 export async function listExecutions(
   pageRequest?: PageRequest,
-  filters?: ExecutionFilters,
+  filters?: ExecutionFilters
 ): Promise<ListExecutionsResult> {
   const executionIds = await executionsStore.keys();
   const data = new Map<string, Execution>();
@@ -505,7 +505,7 @@ export async function listExecutions(
 export async function listExecutionAttempts(
   id: string,
   pageRequest?: PageRequest,
-  filters?: ExecutionFilters,
+  filters?: ExecutionFilters
 ): Promise<ListExecutionAttemptsResult> {
   const executionIds = await executionsStore.keys();
   const data = new Map<string, Execution>();

src/backend/remote.ts

@@ -33,10 +33,10 @@ import {
   PageRequest,
   ReRunExecutionResult,
   RescheduleExecutionResult,
-} from "../backend.js";
-import { DeferableFunction, DeferredFunction } from "../index.js";
-import { getEnv, stringify } from "../utils.js";
-import { HTTPClient, makeHTTPClient } from "./remote/httpClient.js";
+} from "../backend";
+import { DeferableFunction, DeferredFunction } from "../index";
+import { getEnv, stringify } from "../utils";
+import { HTTPClient, makeHTTPClient } from "./remote/httpClient";
 
 export interface SingleObjectResponse<T> {
   data: T;

src/backend/remote/httpClient.ts

@@ -12,9 +12,9 @@
 // OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-import { DeferError } from "../../backend.js";
-import { errorMessage } from "../../utils.js";
-import VERSION from "../../version.js";
+import { DeferError } from "../../backend";
+import { errorMessage } from "../../utils";
+import VERSION from "../../version";
 
 export type HTTPClient = <T>(
   method: string,

src/index.ts

@@ -24,12 +24,12 @@ import {
   PageRequest,
   ReRunExecutionResult,
   RescheduleExecutionResult,
-} from "./backend.js";
-import * as localBackend from "./backend/local.js";
-import * as remoteBackend from "./backend/remote.js";
-import { jitter } from "./jitter.js";
-import { info, warn } from "./logger.js";
-import { Duration, fromDurationToDate, getEnv, sleep } from "./utils.js";
+} from "./backend";
+import * as localBackend from "./backend/local";
+import * as remoteBackend from "./backend/remote";
+import { jitter } from "./jitter";
+import { info, warn } from "./logger";
+import { Duration, fromDurationToDate, getEnv, sleep } from "./utils";
 
 const INTERNAL_VERSION = 6;
 const RETRY_MAX_ATTEMPTS_PLACEHOLDER = 13;

src/logger.ts

@@ -12,9 +12,9 @@
 // OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-import { isDebugEnabled } from "./utils.js";
+import { isDebugEnabled } from "./utils";
 
-// source: https://github.com/csquared/node-logfmt/blob/master/lib/stringify.js
+// source: https://github.com/csquared/node-logfmt/blob/master/lib/stringify
 function fmtData(data: any): string {
   var line = "";
 

src/next/asNextRoute.ts

@@ -1,10 +1,10 @@
 import type { NextRequest, NextResponse } from "next/server";
-import { DeferError } from "../backend.js";
+import { DeferError } from "../backend";
 import {
   DeferredFunction,
   getExecution,
   getExecutionResult,
-} from "../index.js";
+} from "../index";
 
 export interface DeferNextRoute {
   GetHandler: (request: NextRequest) => Promise<NextResponse | Response>;
@@ -18,7 +18,7 @@ interface Options<
   proxy?: (request: NextRequest) => Promise<Parameters<F>>;
 }
 
-const ResponseJSON = Response.json;
+const ResponseJSON = Responseon;
 
 export function asNextRoute<F extends (...args: any) => Promise<any>>(
   deferFn: DeferredFunction<F>,
@@ -64,7 +64,7 @@ export function asNextRoute<F extends (...args: any) => Promise<any>>(
     PostHandler: async (request: NextRequest) => {
       const args: any = options?.proxy
         ? await options.proxy(request)
-        : await request.json();
+        : await requeston();
       if (Array.isArray(args)) {
         // @ts-expect-error Charly: need to be refined
         const execution = await deferFn(...args);

src/next/index.ts

@@ -1,2 +1,2 @@
-export { DeferNextRoute, asNextRoute } from "./asNextRoute.js";
-export { UseDeferRoute, useDeferRoute } from "./useDeferRoute.js";
+export { DeferNextRoute, asNextRoute } from "./asNextRoute";
+export { UseDeferRoute, useDeferRoute } from "./useDeferRoute";

src/next/useDeferRoute.ts

@@ -1,7 +1,7 @@
 "use client";
 import { useCallback, useRef, useState } from "react";
-import type { ExecutionState } from "../backend.js";
-import type { DeferredFunction } from "../index.js";
+import type { ExecutionState } from "../backend";
+import type { DeferredFunction } from "../index";
 
 export type UseDeferRoute<ARA extends boolean, A extends any[], R> = [
   execute: (...args: ARA extends true ? any : A) => void,
@@ -40,7 +40,7 @@ export const useDeferRoute = <
     const res = await fetch(`${routePath}?id=${executionId}`, {
       method: "GET",
     });
-    const data = (await res.json()) as any;
+    const data = (await reson()) as any;
     setStatus(data.state);
     if (["succeed", "failed"].includes(data.state) && intervalRef.current) {
       clearInterval(intervalRef.current);
@@ -67,7 +67,7 @@ export const useDeferRoute = <
           "Content-type": "application/json",
         },
       });
-      const data = await result.json();
+      const data = await resulton();
       intervalRef.current = setInterval(
         pollExecution(data.id),
         Math.max(500, refreshInterval),

tests/backend/local.test.ts

@@ -1,15 +1,15 @@
 process.env["DEFER_NO_LOCAL_SCHEDULER"] = "1";
 process.env["DEFER_NO_BANNER"] = "1";
 
-import { ExecutionNotFound } from "../../src/backend.js";
+import { ExecutionNotFound } from "../../src/backend";
 import {
   cancelExecution,
   enqueue,
   getExecution,
   reRunExecution,
   rescheduleExecution,
-} from "../../src/backend/local.js";
-import { defer } from "../../src/index.js";
+} from "../../src/backend/local";
+import { defer } from "../../src/index";
 
 const myFunc = async () => console.log("the cake is a lie");
 const myDeferedFunc = defer(myFunc);

tests/backend/local/counter.test.ts

@@ -1,4 +1,4 @@
-import { Counter } from "../../../src/backend/local/counter.js";
+import { Counter } from "../../../src/backend/local/counter";
 
 describe("incr/1", () => {
   describe("increment non existing key", () => {

tests/backend/local/kv.test.ts

@@ -1,4 +1,4 @@
-import { KV } from "../../../src/backend/local/kv.js";
+import { KV } from "../../../src/backend/local/kv";
 
 describe("set/2", () => {
   it("adds value in the store", async () => {

tests/backend/remote.test.ts

@@ -7,7 +7,7 @@ import {
   ExecutionNotCancellable,
   ExecutionNotFound,
   ExecutionNotReschedulable,
-} from "../../src/backend.js";
+} from "../../src/backend";
 import {
   cancelExecution,
   enqueue,
@@ -16,8 +16,8 @@ import {
   listExecutions,
   reRunExecution,
   rescheduleExecution,
-} from "../../src/backend/remote.js";
-import { defer } from "../../src/index.js";
+} from "../../src/backend/remote";
+import { defer } from "../../src/index";
 
 global.fetch = jest.fn();
 

tests/backend/remote/httpClient.test.ts

@@ -1,7 +1,7 @@
 import {
   makeHTTPClient,
   ClientError,
-} from "../../../src/backend/remote/httpClient.js";
+} from "../../../src/backend/remote/httpClient";
 
 global.fetch = jest.fn();
 

tests/index.test.ts

@@ -15,7 +15,7 @@ import {
   listExecutions,
   reRunExecution,
   rescheduleExecution,
-} from "../src/index.js";
+} from "../src/index";
 
 var stop: () => Promise<void> | undefined;
 

tests/logger.test.ts

@@ -1,4 +1,4 @@
-import { error, info, log, warn } from "../src/logger.js";
+import { error, info, log, warn } from "../src/logger";
 
 describe("log/3", () => {
   it("test without data", () => {