api-def 0.12.0 → 0.13.0

package/esm/middleware/ClientCacheMiddleware.d.ts

@@ -1,4 +1,4 @@
-import type { RequestMiddleware } from "../ApiTypes";
+import type { RequestMiddleware } from "../ApiTypes.js";
 export interface ClientCacheMiddlewareOptions {
     defaultExpiry?: number;
     predicate?: () => boolean;

package/esm/middleware/ClientCacheMiddleware.js

@@ -1,17 +1,8 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { CacheSource, EventResultType, RequestEvent, RequestMethod } from "../ApiConstants";
-import * as ClientCaching from "../cache/ClientCaching";
+import { CacheSource, EventResultType, RequestEvent, RequestMethod } from "../ApiConstants.js";
+import * as ClientCaching from "../cache/ClientCaching.js";
 const ClientCacheMiddleware = (options = {}) => {
     return {
-        [RequestEvent.SUCCESS]: (context) => __awaiter(void 0, void 0, void 0, function* () {
+        [RequestEvent.SUCCESS]: async (context) => {
             if (context.method !== RequestMethod.GET)
                 return;
             const { clientCache } = context.requestConfig || {};
@@ -20,17 +11,17 @@ const ClientCacheMiddleware = (options = {}) => {
                 const expiry = typeof clientCache === "number"
                     ? clientCache
                     : options.defaultExpiry || ClientCaching.DEFAULT_CLIENT_CACHE_EXPIRY;
-                yield ClientCaching.setClientCachedItem(context.key, context.response, expiry);
+                await ClientCaching.setClientCachedItem(context.key, context.response, expiry);
             }
-        }),
-        [RequestEvent.BEFORE_SEND]: (context) => __awaiter(void 0, void 0, void 0, function* () {
+        },
+        [RequestEvent.BEFORE_SEND]: async (context) => {
             if (context.method !== RequestMethod.GET)
                 return;
             const { clientCache } = context.requestConfig || {};
             const shouldCache = !options.predicate || options.predicate();
             if (clientCache && shouldCache) {
                 if (clientCache) {
-                    const cachedValue = yield ClientCaching.getClientCachedItem(context.key);
+                    const cachedValue = await ClientCaching.getClientCachedItem(context.key);
                     if (cachedValue) {
                         context.stats.cached = {
                             is: true,
@@ -54,7 +45,7 @@ const ClientCacheMiddleware = (options = {}) => {
                     "Cache-Control": "no-cache, no-store, must-revalidate",
                 });
             }
-        }),
+        },
     };
 };
 export default ClientCacheMiddleware;

package/esm/middleware/LoggingMiddleware.d.ts

@@ -1,4 +1,4 @@
-import type { RequestMiddleware } from "../ApiTypes";
+import type { RequestMiddleware } from "../ApiTypes.js";
 export interface LoggingMiddlewareOptions {
     predicate?: () => boolean;
 }

package/esm/middleware/LoggingMiddleware.js

@@ -1,6 +1,6 @@
-import { RequestEvent } from "../ApiConstants";
-import * as ApiUtils from "../ApiUtils";
-import * as Utils from "../Utils";
+import { RequestEvent } from "../ApiConstants.js";
+import * as ApiUtils from "../ApiUtils.js";
+import * as Utils from "../Utils.js";
 var LogType;
 (function (LogType) {
     LogType[LogType["INFO"] = 0] = "INFO";
@@ -25,7 +25,7 @@ const diagnoseError = (error) => {
         return { message: "client-side error", error };
     }
     const { status, data } = error.response;
-    const code = data === null || data === void 0 ? void 0 : data.code;
+    const code = data?.code;
     return {
         message: `responded with ${status}${code ? ` (${code})` : ""}`,
         response: error.response,
@@ -57,9 +57,8 @@ const LoggingMiddleware = (config = {}) => {
             log(context, LogType.INFO, context.stats.attempt > 1 ? "retrying" : "sending", config);
         },
         [RequestEvent.SUCCESS]: (context) => {
-            var _a;
             const cacheSource = context.cacheInfo.source;
-            log(context, LogType.SUCCESS, `responded with ${(_a = context.response) === null || _a === void 0 ? void 0 : _a.status}${cacheSource ? ` (cached by ${cacheSource})` : ""}`, config);
+            log(context, LogType.SUCCESS, `responded with ${context.response?.status}${cacheSource ? ` (cached by ${cacheSource})` : ""}`, config);
         },
         [RequestEvent.ERROR]: (context) => {
             if (context.error) {

package/esm/util/retry/index.js

@@ -1,4 +1,4 @@
-import * as retrier from "./lib/retry";
+import * as retrier from "./lib/retry.js";
 // Retry is just transplanted from here:
 // https://www.npmjs.com/package/retry (lib), and
 // https://www.npmjs.com/package/async-retry (RetryFunction)

package/esm/util/retry/lib/retry.d.ts

@@ -1,3 +1,3 @@
 import type { RetryOptions } from "../interfaces";
-import RetryOperation from "./retryOperation";
+import RetryOperation from "./retryOperation.js";
 export declare const operation: (options: RetryOptions) => RetryOperation;

package/esm/util/retry/lib/retry.js

@@ -1,14 +1,13 @@
-import RetryOperation from "./retryOperation";
+import RetryOperation from "./retryOperation.js";
 export const operation = (options) => {
     const timeouts = _timeouts(options);
     return new RetryOperation(timeouts, {
         forever: options && (options.forever || options.retries === Number.POSITIVE_INFINITY),
-        unref: options === null || options === void 0 ? void 0 : options.unref,
-        maxRetryTime: options === null || options === void 0 ? void 0 : options.maxRetryTime,
+        unref: options?.unref,
+        maxRetryTime: options?.maxRetryTime,
     });
 };
 const _timeouts = (options) => {
-    var _a;
     const createTimeout = (attempt, opts) => {
         const random = opts.randomize ? Math.random() + 1 : 1;
         let timeout = Math.round(random * Math.max(opts.minTimeout, 1) * opts.factor ** attempt);
@@ -16,16 +15,23 @@ const _timeouts = (options) => {
         return timeout;
     };
     const defaultRetries = 10;
-    const opts = Object.assign({ retries: defaultRetries, factor: 2, minTimeout: 1 * 1000, maxTimeout: Number.POSITIVE_INFINITY, randomize: false }, options);
+    const opts = {
+        retries: defaultRetries,
+        factor: 2,
+        minTimeout: 1 * 1000,
+        maxTimeout: Number.POSITIVE_INFINITY,
+        randomize: false,
+        ...options,
+    };
     if (opts.minTimeout > opts.maxTimeout) {
         throw new Error("minTimeout is greater than maxTimeout");
     }
     const timeouts = [];
-    const numRetries = (_a = opts.retries) !== null && _a !== void 0 ? _a : defaultRetries;
+    const numRetries = opts.retries ?? defaultRetries;
     for (let i = 0; i < numRetries; i++) {
         timeouts.push(createTimeout(i, opts));
     }
-    if ((options === null || options === void 0 ? void 0 : options.forever) && !timeouts.length) {
+    if (options?.forever && !timeouts.length) {
         timeouts.push(createTimeout(numRetries, opts));
     }
     // sort the array numerically ascending

package/esm/util/retry/lib/retryOperation.d.ts

@@ -1,27 +1,2 @@
-export default RetryOperation;
 declare function RetryOperation(timeouts: any, options: any): void;
-declare class RetryOperation {
-    constructor(timeouts: any, options: any);
-    _originalTimeouts: any;
-    _timeouts: any;
-    _options: any;
-    _maxRetryTime: any;
-    _fn: any;
-    _errors: any[];
-    _attempts: number;
-    _operationTimeout: any;
-    _operationTimeoutCb: any;
-    _timeout: NodeJS.Timeout | null;
-    _operationStart: number | null;
-    _timer: NodeJS.Timeout | null;
-    _cachedTimeouts: any;
-    reset(): void;
-    stop(): void;
-    retry(err: any): boolean;
-    attempt(fn: any, timeoutOps: any): void;
-    try(fn: any): void;
-    start: (fn: any) => void;
-    errors(): any[];
-    attempts(): number;
-    mainError(): any;
-}
+export default RetryOperation;

package/esm/util/retry/lib/retryOperation.js

@@ -2,7 +2,7 @@ function RetryOperation(timeouts, options) {
     this._originalTimeouts = JSON.parse(JSON.stringify(timeouts));
     this._timeouts = timeouts;
     this._options = options || {};
-    this._maxRetryTime = (options === null || options === void 0 ? void 0 : options.maxRetryTime) || Number.POSITIVE_INFINITY;
+    this._maxRetryTime = options?.maxRetryTime || Number.POSITIVE_INFINITY;
     this._fn = null;
     this._errors = [];
     this._attempts = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-def",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Typed API definitions with middleware support",
   "main": "cjs/index.js",
   "types": "esm/index.d.ts",
@@ -8,60 +8,98 @@
   "bin": {
     "api-def": "bin/index.js"
   },
+  "engines": {
+    "node": ">=22"
+  },
   "sideEffects": false,
   "scripts": {
     "generate:fixtures": "bun scripts/generateFixtures.ts",
     "prepublishOnly": "npm run check:fix && npm run test && npm run build",
-    "test": "jest",
+    "test": "jest --watchman=false",
     "example:start": "cd example && npm run start",
-    "check:fix": "tsc --noEmit --project tsconfig.json && npx @biomejs/biome check --write",
-    "check": "tsc --noEmit --project tsconfig.json && npx @biomejs/biome check",
+    "check:fix": "tsgo --noEmit --project tsconfig.json && npx @biomejs/biome check --write",
+    "check": "tsgo --noEmit --project tsconfig.json && npx @biomejs/biome check",
     "cleanup": "rimraf esm && rimraf cjs",
     "build": "npm run cleanup && npm run build:esm && npm run build:cjs && npm run build:cli",
-    "build:esm": "tsc --module es2015 --target es2016 --outDir esm --preserveWatchOutput && rm -rf esm/tests",
-    "build:cjs": "tsc --module commonjs --target es5 --outDir cjs --preserveWatchOutput && rm -rf cjs/tests",
+    "build:esm": "tsgo --project tsconfig.esm.json --outDir esm --preserveWatchOutput && tsc-alias --project tsconfig.esm.json --outDir esm --resolve-full-paths --resolve-full-extension .js && rm -rf esm/tests",
+    "build:cjs": "tsgo --project tsconfig.cjs.json --outDir cjs --preserveWatchOutput && rm -rf cjs/tests",
     "build:cli": "esbuild cli/index.ts --bundle --platform=node --outfile=bin/index.js --minify --legal-comments=none",
     "website:dev": "cd website && npm run start",
     "website:deploy": "cd website && npm run deploy"
   },
-  "keywords": ["typescript", "javascript", "node", "web", "api", "typed", "cache", "fetch", "retry", "middleware"],
+  "exports": {
+    ".": {
+      "types": "./esm/index.d.ts",
+      "import": "./esm/index.js",
+      "require": "./cjs/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "keywords": [
+    "typescript",
+    "javascript",
+    "node",
+    "web",
+    "api",
+    "typed",
+    "cache",
+    "fetch",
+    "retry",
+    "middleware"
+  ],
   "author": "James Waterhouse <09jwater@gmail.com>",
   "license": "MIT",
-  "files": ["LICENSE", "README.md", "esm/", "cjs/", "bin/"],
+  "files": [
+    "LICENSE",
+    "README.md",
+    "esm/",
+    "cjs/",
+    "bin/"
+  ],
   "jest": {
     "transform": {
       "^.+\\.(t|j)sx?$": [
         "@swc/jest",
         {
-          "env": {}
+          "jsc": {
+            "target": "es2020"
+          },
+          "module": {
+            "type": "commonjs"
+          }
         }
       ]
-    }
+    },
+    "transformIgnorePatterns": [
+      "/node_modules/(?!parse-json|index-to-position)/"
+    ]
   },
   "repository": "https://github.com/Censkh/api-def",
   "devDependencies": {
-    "@biomejs/biome": "1.9.4",
+    "@biomejs/biome": "2.4.16",
     "@redocly/openapi-core": "^1.34.3",
-    "@swc/core": "^1.12.11",
+    "@swc/core": "^1.15.40",
     "@swc/jest": "^0.2.39",
     "@types/axios": "0.14.4",
-    "@types/bun": "^1.2.18",
+    "@types/bun": "^1.3.14",
     "@types/jest": "^30.0.0",
-    "@types/lodash": "^4.17.20",
-    "@types/node": "24.0.12",
-    "@types/qs": "6.14.0",
-    "axios": "1.10.0",
-    "commander": "^14.0.0",
-    "cross-env": "7.0.3",
-    "esbuild": "^0.25.6",
-    "jest": "latest",
-    "lodash": "^4.17.21",
-    "chalk": "4.1.2",
+    "@types/lodash": "^4.17.24",
+    "@types/node": "25.9.1",
+    "@types/qs": "6.15.1",
+    "@typescript/native-preview": "7.0.0-dev.20260603.1",
+    "axios": "1.17.0",
+    "commander": "^15.0.0",
+    "cross-env": "10.1.0",
+    "esbuild": "^0.28.0",
+    "jest": "30.4.2",
+    "kleur": "^4.1.5",
+    "lodash": "^4.18.1",
     "npm-run-all": "4.1.5",
-    "openapi-typescript": "7.6.1",
-    "qs": "6.14.0",
-    "rimraf": "6.0.1",
-    "typescript": "^5.8.3",
-    "zod": "3.25.76"
+    "openapi-typescript": "7.13.0",
+    "qs": "6.15.2",
+    "rimraf": "6.1.3",
+    "tsc-alias": "^1.8.16",
+    "typescript": "^6.0.3",
+    "zod": "4.4.3"
   }
 }