api-def 0.11.0-alpha.1 → 0.11.0-alpha.2

package/cjs/RequestConfig.d.ts

@@ -1,2 +1,2 @@
-import { type BaseRequestConfig, type Body, type ComputedRequestConfig, type Query, type RequestConfig, type State } from "./ApiTypes";
-export declare const computeRequestConfig: <TParams extends string | undefined, TQuery extends Query, TBody extends Body | undefined, TState extends State>(configs: (RequestConfig<TParams, TQuery, TBody, TState> | BaseRequestConfig | undefined)[]) => ComputedRequestConfig<TParams, TQuery, TBody, TState>;
+import { type BaseRequestConfig, type Body, type ComputedRequestConfig, type Params, type Query, type RequestConfig, type State } from "./ApiTypes";
+export declare const computeRequestConfig: <TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State>(configs: (RequestConfig<TParams, TQuery, TBody, TState> | BaseRequestConfig | undefined)[]) => ComputedRequestConfig<TParams, TQuery, TBody, TState>;

package/cjs/Requester.d.ts

@@ -1,3 +1,3 @@
-import type { ApiResponse, Body, Query, RequestConfig, RequestHost, State } from "./ApiTypes";
+import type { ApiResponse, Body, Params, Query, RequestConfig, RequestHost, State } from "./ApiTypes";
 import type { EndpointMockingConfig } from "./MockingTypes";
-export declare const submit: <TResponse, TParams extends string | undefined, TQuery extends Query, TBody extends Body | undefined, TState extends State>(host: RequestHost, config: RequestConfig<TParams, TQuery, TBody, TState>, mocking: EndpointMockingConfig<TResponse, TParams, TQuery, TBody, TState> | null | undefined) => Promise<ApiResponse<TResponse>>;
+export declare const submit: <TResponse, TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State>(host: RequestHost, config: RequestConfig<TParams, TQuery, TBody, TState>, mocking: EndpointMockingConfig<TResponse, TParams, TQuery, TBody, TState> | null | undefined) => Promise<ApiResponse<TResponse>>;

package/cjs/Utils.d.ts

@@ -13,3 +13,4 @@ export declare const noop: () => void;
  */
 export declare const delayThenReturn: <T>(value: T, delayMs: number) => Promise<T>;
 export declare const randInt: (min: number, max: number) => number;
+export declare const isFormData: (value: any) => value is FormData;

package/cjs/Utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.randInt = exports.delayThenReturn = exports.noop = exports.getGlobalFetch = exports.getGlobal = exports.padNumber = exports.assign = void 0;
+exports.isFormData = exports.randInt = exports.delayThenReturn = exports.noop = exports.getGlobalFetch = exports.getGlobal = exports.padNumber = exports.assign = void 0;
 // polyfill from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign
 exports.assign = Object.assign ||
     (function (target) {
@@ -75,3 +75,7 @@ var randInt = function (min, max) {
     return Math.floor(Math.random() * (maxI - minI + 1)) + minI;
 };
 exports.randInt = randInt;
+var isFormData = function (value) {
+    return value instanceof FormData;
+};
+exports.isFormData = isFormData;

package/cjs/backend/AxiosRequestBackend.d.ts

@@ -3,7 +3,7 @@ import type { ApiResponse } from "../ApiTypes";
 import type RequestContext from "../RequestContext";
 import type RequestBackend from "./RequestBackend";
 import type { ConvertedApiResponse, RequestBackendErrorInfo, RequestOperation } from "./RequestBackend";
-export declare const isAxiosError: (error: Error) => error is AxiosError<unknown, any>;
+export declare const isAxiosError: (error: Error) => error is AxiosError;
 export default class AxiosRequestBackend implements RequestBackend<AxiosResponse> {
     readonly id = "axios";
     constructor(axiosLibrary: any);

package/cjs/backend/FetchRequestBackend.d.ts

@@ -4,7 +4,7 @@ import { type Fetch } from "../Utils";
 import type RequestBackend from "./RequestBackend";
 import type { ConvertedApiResponse, RequestBackendErrorInfo, RequestOperation } from "./RequestBackend";
 export default class FetchRequestBackend implements RequestBackend<Response> {
-    fetch: (((input: URL | RequestInfo, init?: RequestInit | undefined) => Promise<Response>) & typeof fetch) | undefined;
+    fetch: (((input: RequestInfo | URL, init?: RequestInit) => Promise<Response>) & typeof fetch) | undefined;
     readonly id = "fetch";
     constructor(fetchLibrary?: Fetch);
     extractResponseFromError(error: Error): Promise<Response | null | undefined>;

package/cjs/backend/FetchRequestBackend.js

@@ -144,18 +144,18 @@ var FetchRequestBackend = /** @class */ (function () {
         if (!this.fetch) {
             throw new Error("[api-def] No fetch impl was provided to FetchRequestBackend");
         }
-        var computedConfig = context.computedConfig;
+        var requestConfig = context.requestConfig;
         // abort controller is a newer feature than fetch
         var abortController = AbortController && new AbortController();
         var abortSignal = abortController ? abortController.signal : undefined;
         var softAbort = false;
         var responded = false;
         var body = context.getParsedBody();
-        var bodyJsonify = body !== null && typeof body === "object";
+        var bodyJsonify = body !== null && typeof body === "object" && !Utils.isFormData(body);
         var headers = Utils.assign({
             // logic from axios
             "Content-Type": bodyJsonify ? "application/json;charset=utf-8" : "application/x-www-form-urlencoded",
-        }, computedConfig.headers);
+        }, requestConfig.headers);
         var parsedHeaders = Object.keys(headers).reduce(function (parsedHeaders, key) {
             var value = headers[key];
             if (value !== undefined) {

package/esm/RequestConfig.d.ts

@@ -1,2 +1,2 @@
-import { type BaseRequestConfig, type Body, type ComputedRequestConfig, type Query, type RequestConfig, type State } from "./ApiTypes";
-export declare const computeRequestConfig: <TParams extends string | undefined, TQuery extends Query, TBody extends Body | undefined, TState extends State>(configs: (RequestConfig<TParams, TQuery, TBody, TState> | BaseRequestConfig | undefined)[]) => ComputedRequestConfig<TParams, TQuery, TBody, TState>;
+import { type BaseRequestConfig, type Body, type ComputedRequestConfig, type Params, type Query, type RequestConfig, type State } from "./ApiTypes";
+export declare const computeRequestConfig: <TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State>(configs: (RequestConfig<TParams, TQuery, TBody, TState> | BaseRequestConfig | undefined)[]) => ComputedRequestConfig<TParams, TQuery, TBody, TState>;

package/esm/Requester.d.ts

@@ -1,3 +1,3 @@
-import type { ApiResponse, Body, Query, RequestConfig, RequestHost, State } from "./ApiTypes";
+import type { ApiResponse, Body, Params, Query, RequestConfig, RequestHost, State } from "./ApiTypes";
 import type { EndpointMockingConfig } from "./MockingTypes";
-export declare const submit: <TResponse, TParams extends string | undefined, TQuery extends Query, TBody extends Body | undefined, TState extends State>(host: RequestHost, config: RequestConfig<TParams, TQuery, TBody, TState>, mocking: EndpointMockingConfig<TResponse, TParams, TQuery, TBody, TState> | null | undefined) => Promise<ApiResponse<TResponse>>;
+export declare const submit: <TResponse, TParams extends Params | undefined, TQuery extends Query | undefined, TBody extends Body | undefined, TState extends State>(host: RequestHost, config: RequestConfig<TParams, TQuery, TBody, TState>, mocking: EndpointMockingConfig<TResponse, TParams, TQuery, TBody, TState> | null | undefined) => Promise<ApiResponse<TResponse>>;

package/esm/Requester.js

@@ -175,7 +175,7 @@ const makeRequest = (context) => __awaiter(void 0, void 0, void 0, function* ()
     return response;
 });
 const parseResponse = (context, response, error) => __awaiter(void 0, void 0, void 0, function* () {
-    var _d;
+    var _a;
     if (response) {
         const parsedResponse = yield context.backend.convertResponse(context, response);
         const contentType = parsedResponse.headers.get("content-type");
@@ -194,7 +194,7 @@ const parseResponse = (context, response, error) => __awaiter(void 0, void 0, vo
             if (inferredResponseType === "arraybuffer" && context.responseType === "json") {
                 if (parsedResponse.data && typeof parsedResponse.data === "object") {
                     const data = response.data;
-                    if (((_d = data.constructor) === null || _d === void 0 ? void 0 : _d.name) === "ArrayBuffer") {
+                    if (((_a = data.constructor) === null || _a === void 0 ? void 0 : _a.name) === "ArrayBuffer") {
                         try {
                             const decodedData = (response.data = textDecode(data));
                             response.data = JSON.parse(decodedData);
@@ -216,7 +216,7 @@ const parseResponse = (context, response, error) => __awaiter(void 0, void 0, vo
     return response;
 });
 const parseError = (context, rawError) => __awaiter(void 0, void 0, void 0, function* () {
-    var _e;
+    var _a;
     let error;
     if (isRequestError(rawError)) {
         error = rawError;
@@ -236,7 +236,7 @@ const parseError = (context, rawError) => __awaiter(void 0, void 0, void 0, func
             }
         }
         else {
-            if (rawError.code === "ENOTFOUND" || ((_e = rawError.cause) === null || _e === void 0 ? void 0 : _e.code) === "ENOTFOUND") {
+            if (rawError.code === "ENOTFOUND" || ((_a = rawError.cause) === null || _a === void 0 ? void 0 : _a.code) === "ENOTFOUND") {
                 code = RequestErrorCode.REQUEST_HOST_NAME_NOT_FOUND;
             }
         }

package/esm/Utils.d.ts

@@ -13,3 +13,4 @@ export declare const noop: () => void;
  */
 export declare const delayThenReturn: <T>(value: T, delayMs: number) => Promise<T>;
 export declare const randInt: (min: number, max: number) => number;
+export declare const isFormData: (value: any) => value is FormData;

package/esm/Utils.js

@@ -62,3 +62,6 @@ export const randInt = (min, max) => {
     const maxI = Math.floor(max);
     return Math.floor(Math.random() * (maxI - minI + 1)) + minI;
 };
+export const isFormData = (value) => {
+    return value instanceof FormData;
+};

package/esm/backend/AxiosRequestBackend.d.ts

@@ -3,7 +3,7 @@ import type { ApiResponse } from "../ApiTypes";
 import type RequestContext from "../RequestContext";
 import type RequestBackend from "./RequestBackend";
 import type { ConvertedApiResponse, RequestBackendErrorInfo, RequestOperation } from "./RequestBackend";
-export declare const isAxiosError: (error: Error) => error is AxiosError<unknown, any>;
+export declare const isAxiosError: (error: Error) => error is AxiosError;
 export default class AxiosRequestBackend implements RequestBackend<AxiosResponse> {
     readonly id = "axios";
     constructor(axiosLibrary: any);

package/esm/backend/FetchRequestBackend.d.ts

@@ -4,7 +4,7 @@ import { type Fetch } from "../Utils";
 import type RequestBackend from "./RequestBackend";
 import type { ConvertedApiResponse, RequestBackendErrorInfo, RequestOperation } from "./RequestBackend";
 export default class FetchRequestBackend implements RequestBackend<Response> {
-    fetch: (((input: URL | RequestInfo, init?: RequestInit | undefined) => Promise<Response>) & typeof fetch) | undefined;
+    fetch: (((input: RequestInfo | URL, init?: RequestInit) => Promise<Response>) & typeof fetch) | undefined;
     readonly id = "fetch";
     constructor(fetchLibrary?: Fetch);
     extractResponseFromError(error: Error): Promise<Response | null | undefined>;

package/esm/backend/FetchRequestBackend.js

@@ -79,18 +79,18 @@ export default class FetchRequestBackend {
         if (!this.fetch) {
             throw new Error("[api-def] No fetch impl was provided to FetchRequestBackend");
         }
-        const { computedConfig } = context;
+        const { requestConfig } = context;
         // abort controller is a newer feature than fetch
         const abortController = AbortController && new AbortController();
         const abortSignal = abortController ? abortController.signal : undefined;
         let softAbort = false;
         let responded = false;
         const body = context.getParsedBody();
-        const bodyJsonify = body !== null && typeof body === "object";
+        const bodyJsonify = body !== null && typeof body === "object" && !Utils.isFormData(body);
         const headers = Utils.assign({
             // logic from axios
             "Content-Type": bodyJsonify ? "application/json;charset=utf-8" : "application/x-www-form-urlencoded",
-        }, computedConfig.headers);
+        }, requestConfig.headers);
         const parsedHeaders = Object.keys(headers).reduce((parsedHeaders, key) => {
             const value = headers[key];
             if (value !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-def",
-  "version": "0.11.0-alpha.1",
+  "version": "0.11.0-alpha.2",
   "description": "Typed API definitions with middleware support",
   "main": "cjs/index.js",
   "types": "esm/index.d.ts",
@@ -10,8 +10,8 @@
     "prepublishOnly": "npm run check:fix && npm run test && npm run build",
     "test": "jest",
     "example:start": "cd example && npm run start",
-    "check:fix": "tsc --noEmit --project tsconfig.json && npx @biomejs/biome check --apply .",
-    "check": "tsc --noEmit --project tsconfig.json && npx @biomejs/biome check .",
+    "check:fix": "tsc --noEmit --project tsconfig.json && npx @biomejs/biome check --write",
+    "check": "tsc --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",
     "build:esm": "tsc --module es2015 --target es2016 --outDir esm --preserveWatchOutput",
@@ -30,20 +30,20 @@
   },
   "repository": "https://github.com/Censkh/api-def",
   "devDependencies": {
-    "@biomejs/biome": "1.8.1",
+    "@biomejs/biome": "1.8.3",
     "@swc/core": "latest",
     "@swc/jest": "latest",
     "@types/axios": "0.14.0",
     "@types/jest": "^29.5.12",
-    "@types/node": "20.14.2",
+    "@types/node": "22.4.0",
     "@types/qs": "6.9.15",
-    "axios": "1.7.2",
+    "axios": "1.7.4",
     "cross-env": "7.0.3",
     "jest": "latest",
     "npm-run-all": "4.1.5",
-    "qs": "6.12.1",
-    "rimraf": "5.0.7",
-    "typescript": "5.4.5",
+    "qs": "6.13.0",
+    "rimraf": "6.0.1",
+    "typescript": "5.5.4",
     "zod": "3.23.8"
   }
 }