api-def 0.6.1 → 0.6.2-alpha.2

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2019 James Waterhouse
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+
+Copyright (c) 2019 James Waterhouse
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

package/README.md

@@ -1,34 +1,34 @@
-# [api-def](https://github.com/Censkh/api-def/) · [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/Censkh/api-def/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/api-def.svg?style=flat)](https://www.npmjs.com/package/api-def) [![build status](https://img.shields.io/github/workflow/status/censkh/api-def/Node.js%20CI)](https://github.com/Censkh/api-def/actions)
-
-Typed APIs with middleware support
-
-API def provides a unified way to type your endpoints allowing for compile time checking of query, body, response and even url parameters
-
-``` npm i api-def ```
-
-- [Documentation](https://censkh.github.io/api-def/)
-
-```typescript
-import {Api} from "api-def";
-
-const api = new Api({
-  baseUrl: "https://my-api/",
-  name: "My API",
-});
-
-const fetchData = api.endpoint()
-    .queryOf<{ includeAwesome: boolean; }>()
-    .responseOf<{ data: {awesome: boolean; } }>()
-    .build({
-      id: "fetch_data",
-      method: "get",
-      path: "/data"
-    });
-
-// calls GET https://my-api/data?includeAwesome=true
-const res = await fetchData.submit({
-  query: {includeAwesome: true}
-});
-
-console.log(res.data); // { data: { awesome: true } }
-```
+# [api-def](https://github.com/Censkh/api-def/) &middot; [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/Censkh/api-def/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/api-def.svg?style=flat)](https://www.npmjs.com/package/api-def) [![build status](https://img.shields.io/github/workflow/status/censkh/api-def/Node.js%20CI)](https://github.com/Censkh/api-def/actions)
+
+Typed APIs with middleware support
+
+API def provides a unified way to type your endpoints allowing for compile time checking of query, body, response and even url parameters
+
+``` npm i api-def ```
+
+- [Documentation](https://censkh.github.io/api-def/)
+
+```typescript
+import {Api} from "api-def";
+
+const api = new Api({
+  baseUrl: "https://my-api/",
+  name: "My API",
+});
+
+const fetchData = api.endpoint()
+    .queryOf<{ includeAwesome: boolean; }>()
+    .responseOf<{ data: {awesome: boolean; } }>()
+    .build({
+      id: "fetch_data",
+      method: "get",
+      path: "/data"
+    });
+
+// calls GET https://my-api/data?includeAwesome=true
+const res = await fetchData.submit({
+  query: {includeAwesome: true}
+});
+
+console.log(res.data); // { data: { awesome: true } }
+```

package/cjs/Api.js

@@ -77,7 +77,7 @@ var HotRequestHost = /** @class */ (function () {
         return Utils.assign({}, apiDefaults, config);
     };
     HotRequestHost.prototype.computePath = function (path, config) {
-        return path.startsWith("/") ? path : "/" + path;
+        return path.startsWith("/") ? path : "/".concat(path);
     };
     return HotRequestHost;
 }());

package/cjs/ApiUtils.d.ts

@@ -2,5 +2,5 @@ import { AcceptableStatus, CancelledRequestError } from "./ApiTypes";
 import { ResponseType } from "./ApiConstants";
 export declare const isCancelledError: (error: Error) => error is CancelledRequestError;
 export declare const isNetworkError: (error: Error) => boolean;
-export declare const isAcceptableStatus: (status: number, acceptableStatus?: AcceptableStatus[] | undefined) => boolean;
+export declare const isAcceptableStatus: (status: number, acceptableStatus?: AcceptableStatus[]) => boolean;
 export declare const inferResponseType: (contentType: string | null | undefined) => ResponseType;

package/cjs/Endpoint.js

@@ -62,7 +62,7 @@ var Endpoint = /** @class */ (function () {
                     mockingEnabled = (_a = (typeof apiMocking.enabled === "function" ? apiMocking.enabled() : apiMocking.enabled)) !== null && _a !== void 0 ? _a : false;
                     if (mockingEnabled) {
                         if (!((_b = this.mocking) === null || _b === void 0 ? void 0 : _b.handler)) {
-                            throw new Error("[api-def] Endpoint for '" + this.path + "' has no mocking");
+                            throw new Error("[api-def] Endpoint for '".concat(this.path, "' has no mocking"));
                         }
                         mock = true;
                     }
@@ -72,16 +72,16 @@ var Endpoint = /** @class */ (function () {
         });
     };
     Endpoint.prototype.computePath = function (path, request) {
-        var computedPath = path.startsWith("/") ? path : "/" + path;
+        var computedPath = path.startsWith("/") ? path : "/".concat(path);
         if (request.params) {
             var keys = Object.keys(request.params);
             for (var i = 0; i < keys.length; i++) {
                 var argName = keys[i];
-                computedPath = computedPath.replace(":" + argName, request.params[argName]);
+                computedPath = computedPath.replace(":".concat(argName), request.params[argName]);
             }
         }
         if (computedPath.includes(":")) {
-            throw new Error("[api-def] Not all path params have been resolved: '" + computedPath + "'");
+            throw new Error("[api-def] Not all path params have been resolved: '".concat(computedPath, "'"));
         }
         return computedPath;
     };

package/cjs/MockingTypes.d.ts

@@ -11,6 +11,7 @@ export interface MockRequest<R = any, P extends Params | undefined = Params | un
 export interface MockResponse<R = any, P extends Params | undefined = Params | undefined, Q extends Query | undefined = Query | undefined, B extends Body | undefined = Body | undefined> {
     statusCode: number;
     response: R | undefined;
+    headers: Headers;
     status(statusCode: number): this;
     send(response: R): this;
 }

package/cjs/RequestContext.d.ts

@@ -19,6 +19,7 @@ export default class RequestContext<R = any, P extends Params | undefined = Para
     cancelled: boolean;
     readonly computedConfig: RequestConfig<P, Q, B>;
     readonly mocking: EndpointMockingConfig<R, P, Q, B> | null | undefined;
+    private parsedBody;
     constructor(backend: RequestBackend, host: RequestHost, config: RequestConfig<P, Q, B>, computedPath: string, mocking: EndpointMockingConfig<R, P, Q, B> | null | undefined);
     get method(): RequestMethod;
     get api(): Api;
@@ -27,8 +28,11 @@ export default class RequestContext<R = any, P extends Params | undefined = Para
     private initMiddleware;
     private generateKey;
     updateHeaders(newHeaders: Headers): this;
+    private parseRequestBody;
+    getParsedBody(): any;
     updateQuery(newQuery: Partial<Q>): this;
     triggerEvent(eventType: RequestEvent): Promise<EventResult<R> | undefined>;
     addCanceller(canceler: () => void): void;
     cancel(): void;
+    getRequestUrl(): URL;
 }

package/cjs/RequestContext.js

@@ -37,6 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var Utils = require("./Utils");
+var url_1 = require("url");
 var contextIdCounter = 0;
 var RequestContext = /** @class */ (function () {
     function RequestContext(backend, host, config, computedPath, mocking) {
@@ -49,7 +50,7 @@ var RequestContext = /** @class */ (function () {
         this.id = contextIdCounter++;
         this.host = host;
         this.computedConfig = config;
-        Utils.assign({}, this.computedConfig.headers, { "Request-Id": this.id });
+        Utils.assign({}, this.computedConfig.headers);
         this.computedPath = computedPath;
         this.key = this.generateKey();
         this.stats = {
@@ -59,6 +60,7 @@ var RequestContext = /** @class */ (function () {
         this.eventHandlers = {};
         this.mocking = mocking;
         this.initMiddleware();
+        this.parseRequestBody();
     }
     Object.defineProperty(RequestContext.prototype, "method", {
         get: function () {
@@ -111,7 +113,7 @@ var RequestContext = /** @class */ (function () {
             var queryKeys = Object.keys(computedConfig.query);
             for (var i = 0; i < queryKeys.length; i++) {
                 var queryKey = queryKeys[i];
-                queryStrings.push(queryKey + "=" + computedConfig.query[queryKey]);
+                queryStrings.push("".concat(queryKey, "=").concat(computedConfig.query[queryKey]));
             }
         }
         if (queryStrings.length > 0) {
@@ -121,8 +123,33 @@ var RequestContext = /** @class */ (function () {
     };
     RequestContext.prototype.updateHeaders = function (newHeaders) {
         this.computedConfig.headers = Utils.assign({}, this.computedConfig.headers, newHeaders);
+        this.parseRequestBody();
         return this;
     };
+    RequestContext.prototype.parseRequestBody = function () {
+        if (this.computedConfig.body && this.computedConfig.headers) {
+            var contentTypeKey = Object.keys(this.computedConfig.headers).find(function (key) { return key.toLowerCase() === "content-type"; });
+            var contentType = contentTypeKey && this.computedConfig.headers[contentTypeKey];
+            if (typeof contentType === "string" && contentType.toLowerCase() === "multipart/form-data") {
+                var searchParams = new url_1.URLSearchParams();
+                for (var _i = 0, _a = Object.keys(this.computedConfig.body); _i < _a.length; _i++) {
+                    var key = _a[_i];
+                    var value = this.computedConfig.body[key];
+                    searchParams.set(key, value === null || value === void 0 ? void 0 : value.toString());
+                }
+                this.parsedBody = searchParams.toString();
+            }
+            else {
+                this.parsedBody = this.computedConfig.body;
+            }
+        }
+        else {
+            this.parsedBody = undefined;
+        }
+    };
+    RequestContext.prototype.getParsedBody = function () {
+        return this.parsedBody;
+    };
     RequestContext.prototype.updateQuery = function (newQuery) {
         this.computedConfig.query = Utils.assign(this.computedConfig.query || {}, newQuery);
         return this;
@@ -164,6 +191,38 @@ var RequestContext = /** @class */ (function () {
             this.canceler();
         }
     };
+    RequestContext.prototype.getRequestUrl = function () {
+        var _a;
+        var path = !this.baseUrl.endsWith("/")
+            ? this.baseUrl + "/"
+            : this.baseUrl;
+        path += this.computedPath.startsWith("/")
+            ? this.computedPath.substring(1)
+            : this.computedPath;
+        var origin = undefined;
+        if (typeof window !== "undefined") {
+            origin = window.origin;
+        }
+        if (!origin) {
+            if (path.indexOf("://") === -1) {
+                path = "https://".concat(path);
+            }
+        }
+        var url = new URL(path, origin);
+        if (this.computedConfig.query) {
+            if (this.computedConfig.queryParser) {
+                url.search = this.computedConfig.queryParser(this.computedConfig.query);
+            }
+            else {
+                var queryKeys = Object.keys(this.computedConfig.query);
+                for (var i = 0; i < queryKeys.length; i++) {
+                    var key = queryKeys[i];
+                    url.searchParams.append(key, ((_a = this.computedConfig.query[key]) === null || _a === void 0 ? void 0 : _a.toString()) || "");
+                }
+            }
+        }
+        return url;
+    };
     return RequestContext;
 }());
 exports.default = RequestContext;

package/cjs/RequestError.d.ts

@@ -1,5 +1,6 @@
 import { ApiResponse } from "./ApiTypes";
 import { EnumOf } from "./Utils";
+import RequestContext from "./RequestContext";
 export declare const RequestErrorCode: {
     readonly MISC_UNKNOWN_ERROR: "misc/unknown-error";
     readonly REQUEST_NETWORK_ERROR: "request/network-error";
@@ -17,6 +18,7 @@ export declare const isRequestError: (error: Error) => error is RequestError;
 export interface RequestErrorConfig {
     error: Error;
     code: string;
+    context: RequestContext;
     response?: ApiResponse | null;
 }
 export declare const convertToRequestError: (config: RequestErrorConfig) => RequestError;

package/cjs/RequestError.js

@@ -13,15 +13,21 @@ var isRequestError = function (error) {
 };
 exports.isRequestError = isRequestError;
 var convertToRequestError = function (config) {
-    var error = config.error, response = config.response, code = config.code;
-    return Object.assign(error, {
+    var error = config.error, context = config.context, response = config.response, code = config.code;
+    var resultError = Object.assign(error, {
         name: "RequestError",
         response: response,
         code: code,
         isRequestError: true,
-        config: undefined,
-        request: undefined,
-        toJSON: undefined,
+        request: {
+            url: context.getRequestUrl().href,
+            query: context.computedConfig.query,
+            headers: context.computedConfig.headers,
+            body: context.getParsedBody(),
+        },
     });
+    delete resultError.config;
+    delete resultError.toJSON;
+    return resultError;
 };
 exports.convertToRequestError = convertToRequestError;

package/cjs/Requester.js

@@ -156,11 +156,12 @@ var makeRequest = function (context) { return __awaiter(void 0, void 0, void 0,
                                 return [4 /*yield*/, parseResponse(context, response_1)];
                             case 3:
                                 parsedResponse = (_b.sent());
-                                if (!ApiUtils_1.isAcceptableStatus(parsedResponse.status, context.computedConfig.acceptableStatus)) {
-                                    throw RequestError_1.convertToRequestError({
-                                        error: new Error("[api-def] Invalid response status code '" + parsedResponse.status + "'"),
+                                if (!(0, ApiUtils_1.isAcceptableStatus)(parsedResponse.status, context.computedConfig.acceptableStatus)) {
+                                    throw (0, RequestError_1.convertToRequestError)({
+                                        error: new Error("[api-def] Invalid response status code '".concat(parsedResponse.status, "'")),
                                         response: parsedResponse,
                                         code: RequestError_1.RequestErrorCode.REQUEST_INVALID_STATUS,
+                                        context: context,
                                     });
                                 }
                                 context.response = parsedResponse;
@@ -203,7 +204,7 @@ var makeRequest = function (context) { return __awaiter(void 0, void 0, void 0,
                         }
                     });
                 }); };
-                return [4 /*yield*/, retry_1.default(performRequest, retryOpts)];
+                return [4 /*yield*/, (0, retry_1.default)(performRequest, retryOpts)];
             case 2:
                 response = _b.sent();
                 return [2 /*return*/, (response)];
@@ -226,14 +227,15 @@ var parseResponse = function (context, response, error) { return __awaiter(void
                     return headers;
                 }, {});
                 contentType = parsedResponse_1.headers["content-type"];
-                inferredResponseType = ApiUtils_1.inferResponseType(contentType);
+                inferredResponseType = (0, ApiUtils_1.inferResponseType)(contentType);
                 if (!error) {
                     // expand to array buffer once we support that in inferResponseType
                     if (inferredResponseType === "text" && context.responseType === "json") {
-                        throw RequestError_1.convertToRequestError({
-                            error: new Error("[api-def] Expected '" + context.responseType + "' response, got '" + inferredResponseType + "' (from 'Content-Type' of '" + contentType + "')"),
+                        throw (0, RequestError_1.convertToRequestError)({
+                            error: new Error("[api-def] Expected '".concat(context.responseType, "' response, got '").concat(inferredResponseType, "' (from 'Content-Type' of '").concat(contentType, "')")),
                             code: RequestError_1.RequestErrorCode.REQUEST_MISMATCH_RESPONSE_TYPE,
                             response: parsedResponse_1,
+                            context: context,
                         });
                     }
                     // transform arrayBuffer to json
@@ -243,14 +245,15 @@ var parseResponse = function (context, response, error) { return __awaiter(void
                             data = response.data;
                             if (((_a = data.constructor) === null || _a === void 0 ? void 0 : _a.name) === "ArrayBuffer") {
                                 try {
-                                    decodedData = (response.data = TextDecoding_1.textDecode(data));
+                                    decodedData = (response.data = (0, TextDecoding_1.textDecode)(data));
                                     response.data = JSON.parse(decodedData);
                                 }
                                 catch (e) {
-                                    throw RequestError_1.convertToRequestError({
-                                        error: new Error("[api-def] Expected '" + context.responseType + "' response, got '" + inferredResponseType + "' (from 'Content-Type' of '" + contentType + "')"),
+                                    throw (0, RequestError_1.convertToRequestError)({
+                                        error: new Error("[api-def] Expected '".concat(context.responseType, "' response, got '").concat(inferredResponseType, "' (from 'Content-Type' of '").concat(contentType, "')")),
                                         code: RequestError_1.RequestErrorCode.REQUEST_MISMATCH_RESPONSE_TYPE,
                                         response: parsedResponse_1,
+                                        context: context,
                                     });
                                 }
                             }
@@ -267,7 +270,7 @@ var parseError = function (context, rawError) { return __awaiter(void 0, void 0,
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                if (!RequestError_1.isRequestError(rawError)) return [3 /*break*/, 1];
+                if (!(0, RequestError_1.isRequestError)(rawError)) return [3 /*break*/, 1];
                 error = rawError;
                 return [3 /*break*/, 5];
             case 1: return [4 /*yield*/, context.backend.extractResponseFromError(rawError)];
@@ -280,14 +283,14 @@ var parseError = function (context, rawError) { return __awaiter(void 0, void 0,
                 errorResponse = _a.sent();
                 _a.label = 4;
             case 4:
-                code = ApiUtils_1.isNetworkError(rawError) ? RequestError_1.RequestErrorCode.REQUEST_NETWORK_ERROR : RequestError_1.RequestErrorCode.MISC_UNKNOWN_ERROR;
+                code = (0, ApiUtils_1.isNetworkError)(rawError) ? RequestError_1.RequestErrorCode.REQUEST_NETWORK_ERROR : RequestError_1.RequestErrorCode.MISC_UNKNOWN_ERROR;
                 if (errorResponse) {
-                    if (!ApiUtils_1.isAcceptableStatus(errorResponse.status, context.computedConfig.acceptableStatus)) {
+                    if (!(0, ApiUtils_1.isAcceptableStatus)(errorResponse.status, context.computedConfig.acceptableStatus)) {
                         code = RequestError_1.RequestErrorCode.REQUEST_INVALID_STATUS;
                     }
                 }
                 errorInfo = context.backend.getErrorInfo(rawError, errorResponse);
-                error = RequestError_1.convertToRequestError(__assign({ error: rawError, response: errorResponse, code: code }, errorInfo));
+                error = (0, RequestError_1.convertToRequestError)(__assign({ error: rawError, response: errorResponse, code: code, context: context }, errorInfo));
                 _a.label = 5;
             case 5: return [2 /*return*/, error];
         }

package/cjs/backend/AxiosRequestBackend.d.ts

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

package/cjs/backend/AxiosRequestBackend.js

@@ -51,7 +51,7 @@ var AxiosRequestBackend = /** @class */ (function () {
     AxiosRequestBackend.prototype.extractResponseFromError = function (error) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                if (exports.isAxiosError(error)) {
+                if ((0, exports.isAxiosError)(error)) {
                     return [2 /*return*/, error.response ? error.response : null];
                 }
                 return [2 /*return*/, undefined];
@@ -77,7 +77,7 @@ var AxiosRequestBackend = /** @class */ (function () {
             method: context.method,
             baseURL: context.baseUrl,
             url: context.computedPath,
-            data: computedConfig.body || {},
+            data: context.getParsedBody() || {},
             params: computedConfig.query || {},
             headers: computedConfig.headers || {},
             responseType: context.responseType,

package/cjs/backend/FetchRequestBackend.d.ts

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

package/cjs/backend/FetchRequestBackend.js

@@ -64,7 +64,7 @@ var FetchError = /** @class */ (function (_super) {
 }(Error));
 var FetchRequestBackend = /** @class */ (function () {
     function FetchRequestBackend(fetchLibrary) {
-        this.fetch = Utils_1.getGlobalFetch();
+        this.fetch = (0, Utils_1.getGlobalFetch)();
         this.id = "fetch";
         if (fetchLibrary !== undefined) {
             this.fetch = fetchLibrary;
@@ -89,7 +89,7 @@ var FetchRequestBackend = /** @class */ (function () {
                 switch (_b.label) {
                     case 0:
                         contentType = response.headers.get("Content-Type");
-                        responseType = ApiUtils_1.inferResponseType(contentType);
+                        responseType = (0, ApiUtils_1.inferResponseType)(contentType);
                         if (!!response.__text) return [3 /*break*/, 2];
                         _a = response;
                         return [4 /*yield*/, response.clone().text()];
@@ -115,7 +115,7 @@ var FetchRequestBackend = /** @class */ (function () {
                     case 6: return [3 /*break*/, 8];
                     case 7:
                         error_1 = _b.sent();
-                        throw Object.assign(new Error("[api-def] Invalid '" + context.responseType + "' response, got: '" + response.__text + "'"), {
+                        throw Object.assign(new Error("[api-def] Invalid '".concat(context.responseType, "' response, got: '").concat(response.__text, "'")), {
                             response: response,
                         });
                     case 8: return [2 /*return*/, {
@@ -128,40 +128,17 @@ var FetchRequestBackend = /** @class */ (function () {
         });
     };
     FetchRequestBackend.prototype.makeRequest = function (context) {
-        var _a;
         if (!this.fetch) {
             throw new Error("[api-def] No fetch impl was provided to FetchRequestBackend");
         }
         var computedConfig = context.computedConfig;
-        var path = !context.baseUrl.endsWith("/")
-            ? context.baseUrl + "/"
-            : context.baseUrl;
-        path += context.computedPath.startsWith("/")
-            ? context.computedPath.substring(1)
-            : context.computedPath;
-        var origin = undefined;
-        if (typeof window !== "undefined") {
-            origin = window.origin;
-        }
-        var url = new URL(path, origin);
-        if (computedConfig.query) {
-            if (context.computedConfig.queryParser) {
-                url.search = context.computedConfig.queryParser(computedConfig.query);
-            }
-            else {
-                var queryKeys = Object.keys(computedConfig.query);
-                for (var i = 0; i < queryKeys.length; i++) {
-                    var key = queryKeys[i];
-                    url.searchParams.append(key, ((_a = computedConfig.query[key]) === null || _a === void 0 ? void 0 : _a.toString()) || "");
-                }
-            }
-        }
         // 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 bodyJsonify = computedConfig.body !== null && typeof computedConfig.body === "object";
+        var body = context.getParsedBody();
+        var bodyJsonify = body !== null && typeof body === "object";
         var headers = Utils.assign({
             // logic from axios
             "Content-Type": bodyJsonify ? "application/json;charset=utf-8" : "application/x-www-form-urlencoded",
@@ -173,9 +150,10 @@ var FetchRequestBackend = /** @class */ (function () {
             }
             return parsedHeaders;
         }, {});
+        var url = context.getRequestUrl();
         var promise = this.fetch(url.href, {
             method: context.method,
-            body: bodyJsonify ? JSON.stringify(computedConfig.body) : computedConfig.body,
+            body: bodyJsonify ? JSON.stringify(body) : body,
             headers: parsedHeaders,
             mode: "cors",
             signal: abortSignal,

package/cjs/backend/MockRequestBackend.js

@@ -65,25 +65,27 @@ var MockRequestBackend = /** @class */ (function () {
     MockRequestBackend.prototype.runRequest = function (context) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
-            var mockingFunc, req, res, delay, delayMs, min, max, _e;
+            var mockingFunc, req, res, delay, delayMs, min, max, _e, parsedHeaders;
             return __generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
                         mockingFunc = (_a = context.mocking) === null || _a === void 0 ? void 0 : _a.handler;
                         if (!mockingFunc) {
-                            throw RequestError_1.convertToRequestError({
+                            throw (0, RequestError_1.convertToRequestError)({
                                 error: new Error("[api-def] Attempted to run mocked request without mocking function"),
                                 code: RequestError_1.RequestErrorCode.REQUEST_INVALID_CONFIG,
+                                context: context,
                             });
                         }
                         req = {
-                            body: context.computedConfig.body,
+                            body: context.getParsedBody(),
                             params: (_b = context.computedConfig.params) !== null && _b !== void 0 ? _b : {},
                             query: context.computedConfig.query,
                             headers: (_c = context.computedConfig.headers) !== null && _c !== void 0 ? _c : {},
                         };
                         res = {
                             statusCode: -1,
+                            headers: {},
                             response: undefined,
                             status: function (statusCode) {
                                 res.statusCode = statusCode;
@@ -91,6 +93,9 @@ var MockRequestBackend = /** @class */ (function () {
                             },
                             send: function (response) {
                                 res.response = response;
+                                if (response && typeof response === "object") {
+                                    res.headers["Content-Type"] = "application/json";
+                                }
                                 return res;
                             },
                         };
@@ -103,12 +108,13 @@ var MockRequestBackend = /** @class */ (function () {
                         else {
                             min = delay[0], max = delay[1];
                             if (min > max) {
-                                throw RequestError_1.convertToRequestError({
+                                throw (0, RequestError_1.convertToRequestError)({
                                     error: new Error("[api-def] Min delay cannot be greater than max delay"),
                                     code: RequestError_1.RequestErrorCode.REQUEST_INVALID_CONFIG,
+                                    context: context,
                                 });
                             }
-                            delayMs = Utils_1.randInt(min, max);
+                            delayMs = (0, Utils_1.randInt)(min, max);
                         }
                         _e = Utils_1.delayThenReturn;
                         return [4 /*yield*/, mockingFunc(req, res)];
@@ -122,13 +128,18 @@ var MockRequestBackend = /** @class */ (function () {
                         _f.label = 5;
                     case 5:
                         if (res.response === undefined) {
-                            throw RequestError_1.convertToRequestError({
+                            throw (0, RequestError_1.convertToRequestError)({
                                 error: new Error("[api-def] Mocked API did not respond"),
                                 code: RequestError_1.RequestErrorCode.REQUEST_INVALID_CONFIG,
+                                context: context,
                             });
                         }
+                        parsedHeaders = Object.keys(res.headers).reduce(function (parsedHeaders, key) {
+                            parsedHeaders[key] = res.headers[key].toString();
+                            return parsedHeaders;
+                        }, {});
                         return [2 /*return*/, {
-                                headers: {},
+                                headers: parsedHeaders,
                                 data: res.response,
                                 status: res.statusCode,
                             }];

package/cjs/cache/Caching.d.ts

@@ -6,5 +6,5 @@ export interface CacheEntry {
     data: any;
     expiry: number | null;
 }
-export declare const setCachedItem: <T>(key: string, value: T, expiry?: number | undefined) => Promise<T>;
+export declare const setCachedItem: <T>(key: string, value: T, expiry?: number) => Promise<T>;
 export declare const getCachedItem: <T = any>(key: string) => Promise<T | undefined>;