api-def 0.6.0-alpha9 → 0.6.2-alpha.1

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.d.ts

@@ -28,4 +28,5 @@ export declare class Api implements ApiInfo {
     post: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
     put: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
     delete: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
+    patch: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
 }

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;
 }());
@@ -98,6 +98,7 @@ var Api = /** @class */ (function () {
         this.post = this.hotRequest(ApiConstants_1.RequestMethod.POST);
         this.put = this.hotRequest(ApiConstants_1.RequestMethod.PUT);
         this.delete = this.hotRequest(ApiConstants_1.RequestMethod.DELETE);
+        this.patch = this.hotRequest(ApiConstants_1.RequestMethod.PATCH);
         this.name = info.name;
         this.baseUrl = info.baseUrl;
         this.middleware = info.middleware || [];

package/cjs/ApiConstants.d.ts

@@ -8,6 +8,7 @@ export declare const RequestMethod: {
     readonly GET: "get";
     readonly PUT: "put";
     readonly DELETE: "delete";
+    readonly PATCH: "patch";
 };
 export declare type RequestMethod = EnumOf<typeof RequestMethod>;
 export declare const RequestEvent: {

package/cjs/ApiConstants.js

@@ -10,6 +10,7 @@ exports.RequestMethod = {
     GET: "get",
     PUT: "put",
     DELETE: "delete",
+    PATCH: "patch",
 };
 exports.RequestEvent = {
     /** @deprecated use 'BEFORE_SEND' */

package/cjs/ApiUtils.d.ts

@@ -1,7 +1,6 @@
-import { AcceptableStatus, ApiResponse, CancelledRequestError } from "./ApiTypes";
+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 parseResponseDataToObject: (response: ApiResponse) => void;
-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/ApiUtils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inferResponseType = exports.isAcceptableStatus = exports.parseResponseDataToObject = exports.isNetworkError = exports.isCancelledError = void 0;
-var TextDecoding_1 = require("./TextDecoding");
+exports.inferResponseType = exports.isAcceptableStatus = exports.isNetworkError = exports.isCancelledError = void 0;
 var isCancelledError = function (error) {
     return "isCancelledRequest" in error;
 };
@@ -13,23 +12,6 @@ var isNetworkError = function (error) {
         ((_a = error.constructor) === null || _a === void 0 ? void 0 : _a.name) === "NetworkError");
 };
 exports.isNetworkError = isNetworkError;
-var parseResponseDataToObject = function (response) {
-    if (response.data &&
-        typeof response.data === "object") {
-        var data = response.data;
-        if (data.constructor && data.constructor.name === "ArrayBuffer") {
-            try {
-                var decodedData = (response.data = TextDecoding_1.textDecode(data));
-                response.data = JSON.parse(decodedData);
-            }
-            catch (e) {
-                // eslint-disable-next-line
-                console.warn("[api-def] Couldn't parse array buffer content to JSON response", e);
-            }
-        }
-    }
-};
-exports.parseResponseDataToObject = parseResponseDataToObject;
 var DEFAULT_ACCEPTABLE_STATUS = [[200, 299], 304];
 var isAcceptableStatus = function (status, acceptableStatus) {
     var acceptable = acceptableStatus !== null && acceptableStatus !== void 0 ? acceptableStatus : DEFAULT_ACCEPTABLE_STATUS;
@@ -50,11 +32,21 @@ var isAcceptableStatus = function (status, acceptableStatus) {
     return (false);
 };
 exports.isAcceptableStatus = isAcceptableStatus;
+var TEXT_CONTENT_TYPES = ["text/plain"];
 var JSON_CONTENT_TYPES = ["text/json", "application/json"];
+var ARRRAY_BUFFER_CONTENT_TYPES = ["application/octet-stream"];
 var inferResponseType = function (contentType) {
     var contentTypePart = contentType === null || contentType === void 0 ? void 0 : contentType.split(";")[0].trim();
-    if (contentTypePart && JSON_CONTENT_TYPES.includes(contentTypePart)) {
-        return "json";
+    if (contentTypePart) {
+        if (TEXT_CONTENT_TYPES.includes(contentTypePart)) {
+            return "text";
+        }
+        else if (JSON_CONTENT_TYPES.includes(contentTypePart)) {
+            return "json";
+        }
+        else if (ARRRAY_BUFFER_CONTENT_TYPES.includes(contentTypePart)) {
+            return "arraybuffer";
+        }
     }
     return "text";
 };

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,6 +28,8 @@ 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;

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;

package/cjs/RequestError.js

@@ -15,10 +15,13 @@ exports.isRequestError = isRequestError;
 var convertToRequestError = function (config) {
     var error = config.error, response = config.response, code = config.code;
     return Object.assign(error, {
-        name: error.name === "Error" ? "RequestError" : error.name,
+        name: "RequestError",
         response: response,
         code: code,
         isRequestError: true,
+        config: undefined,
+        request: undefined,
+        toJSON: undefined,
     });
 };
 exports.convertToRequestError = convertToRequestError;

package/cjs/Requester.js

@@ -56,6 +56,7 @@ var ApiConstants_1 = require("./ApiConstants");
 var retry_1 = require("./util/retry");
 var MockRequestBackend_1 = require("./backend/MockRequestBackend");
 var RequestError_1 = require("./RequestError");
+var TextDecoding_1 = require("./TextDecoding");
 var locks = {};
 var runningOperations = {};
 var MOCK_REQUEST_BACKEND = new MockRequestBackend_1.default();
@@ -155,9 +156,9 @@ 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,
                                     });
@@ -174,10 +175,6 @@ var makeRequest = function (context) { return __awaiter(void 0, void 0, void 0,
                                 error = _b.sent();
                                 context.error = error;
                                 context.response = error.response;
-                                // transform array buffer responses to objs
-                                if (context.response) {
-                                    ApiUtils.parseResponseDataToObject(context.response);
-                                }
                                 return [4 /*yield*/, context.triggerEvent(ApiConstants_1.RequestEvent.Error)];
                             case 6:
                                 errorEventResult = _b.sent();
@@ -206,7 +203,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)];
@@ -214,18 +211,53 @@ var makeRequest = function (context) { return __awaiter(void 0, void 0, void 0,
     });
 }); };
 var parseResponse = function (context, response, error) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedResponse;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var parsedResponse_1, contentType, inferredResponseType, data, decodedData;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 if (!response) return [3 /*break*/, 2];
-                return [4 /*yield*/, context.backend.convertResponse(context, response, error)];
+                return [4 /*yield*/, context.backend.convertResponse(context, response)];
             case 1:
-                parsedResponse = _a.sent();
-                if (parsedResponse) {
-                    ApiUtils.parseResponseDataToObject(parsedResponse);
+                parsedResponse_1 = _b.sent();
+                // lowercase all header names
+                parsedResponse_1.headers = parsedResponse_1.__lowercaseHeaders || Object.keys(parsedResponse_1.headers).reduce(function (headers, header) {
+                    headers[header.toLowerCase()] = parsedResponse_1.headers[header];
+                    return headers;
+                }, {});
+                contentType = parsedResponse_1.headers["content-type"];
+                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 (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,
+                        });
+                    }
+                    // transform arrayBuffer to json
+                    if (inferredResponseType === "arraybuffer" && context.responseType === "json") {
+                        if (parsedResponse_1.data &&
+                            typeof parsedResponse_1.data === "object") {
+                            data = response.data;
+                            if (((_a = data.constructor) === null || _a === void 0 ? void 0 : _a.name) === "ArrayBuffer") {
+                                try {
+                                    decodedData = (response.data = (0, TextDecoding_1.textDecode)(data));
+                                    response.data = JSON.parse(decodedData);
+                                }
+                                catch (e) {
+                                    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,
+                                    });
+                                }
+                            }
+                        }
+                    }
                 }
-                return [2 /*return*/, parsedResponse];
+                return [2 /*return*/, parsedResponse_1];
             case 2: return [2 /*return*/, response];
         }
     });
@@ -235,7 +267,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)];
@@ -248,14 +280,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 }, errorInfo));
                 _a.label = 5;
             case 5: return [2 /*return*/, error];
         }

package/cjs/backend/AxiosRequestBackend.d.ts

@@ -1,13 +1,13 @@
-import RequestBackend, { RequestBackendErrorInfo, RequestOperation } from "./RequestBackend";
+import RequestBackend, { ConvertedApiResponse, RequestBackendErrorInfo, RequestOperation } from "./RequestBackend";
 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);
     extractResponseFromError(error: Error): Promise<AxiosResponse | null | undefined>;
-    convertResponse<T>(context: RequestContext, response: AxiosResponse): Promise<ApiResponse<T>>;
+    convertResponse<T>(context: RequestContext, response: AxiosResponse): Promise<ConvertedApiResponse<T>>;
     makeRequest(context: RequestContext): RequestOperation<AxiosResponse>;
     getErrorInfo(error: Error, response: ApiResponse | undefined | null): RequestBackendErrorInfo | undefined;
 }

package/cjs/backend/AxiosRequestBackend.js

@@ -37,8 +37,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAxiosError = void 0;
-var ApiUtils_1 = require("../ApiUtils");
-var RequestError_1 = require("../RequestError");
 var axios;
 var isAxiosError = function (error) {
     return "isAxiosError" in error;
@@ -53,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];
@@ -62,18 +60,13 @@ var AxiosRequestBackend = /** @class */ (function () {
     };
     AxiosRequestBackend.prototype.convertResponse = function (context, response) {
         return __awaiter(this, void 0, void 0, function () {
-            var contentType, inferredResponseType;
             return __generator(this, function (_a) {
-                contentType = response.headers["content-type"];
-                inferredResponseType = ApiUtils_1.inferResponseType(contentType);
-                // 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 + "')"),
-                        code: RequestError_1.RequestErrorCode.REQUEST_MISMATCH_RESPONSE_TYPE,
-                    });
-                }
-                return [2 /*return*/, response];
+                return [2 /*return*/, {
+                        data: response.data,
+                        headers: response.headers,
+                        status: response.status,
+                        __lowercaseHeaders: response._lowerCaseResponseHeaders,
+                    }];
             });
         });
     };
@@ -84,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

@@ -1,15 +1,15 @@
-import RequestBackend, { RequestBackendErrorInfo, RequestOperation } from "./RequestBackend";
+import RequestBackend, { ConvertedApiResponse, RequestBackendErrorInfo, RequestOperation } from "./RequestBackend";
 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>;
     convertResponse<T>(context: RequestContext, response: Response & {
         __text?: string;
-    }, error?: boolean): Promise<ApiResponse<T>>;
+    }): Promise<ConvertedApiResponse<T>>;
     makeRequest(context: RequestContext): RequestOperation<Response>;
     getErrorInfo(error: Error, response: ApiResponse | undefined | null): RequestBackendErrorInfo | undefined;
 }