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

package/cjs/backend/FetchRequestBackend.js

@@ -55,7 +55,6 @@ var Utils = require("../Utils");
 var Utils_1 = require("../Utils");
 var ApiConstants_1 = require("../ApiConstants");
 var ApiUtils_1 = require("../ApiUtils");
-var RequestError_1 = require("../RequestError");
 var FetchError = /** @class */ (function (_super) {
     __extends(FetchError, _super);
     function FetchError() {
@@ -65,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;
@@ -83,59 +82,47 @@ var FetchRequestBackend = /** @class */ (function () {
             });
         });
     };
-    FetchRequestBackend.prototype.convertResponse = function (context, response, error) {
+    FetchRequestBackend.prototype.convertResponse = function (context, response) {
         return __awaiter(this, void 0, void 0, function () {
-            var data, contentType, inferredResponseType, responseType, _a, error_1, status;
+            var contentType, responseType, _a, data, status, headers, error_1;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         contentType = response.headers.get("Content-Type");
-                        inferredResponseType = ApiUtils_1.inferResponseType(contentType);
-                        responseType = error ? inferredResponseType : context.responseType;
-                        // 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,
-                            });
-                        }
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 8, , 9]);
-                        if (!!response.__text) return [3 /*break*/, 3];
+                        responseType = (0, ApiUtils_1.inferResponseType)(contentType);
+                        if (!!response.__text) return [3 /*break*/, 2];
                         _a = response;
                         return [4 /*yield*/, response.clone().text()];
-                    case 2:
+                    case 1:
                         _a.__text = _b.sent();
+                        _b.label = 2;
+                    case 2:
+                        data = response.__text;
+                        status = response.status, headers = response.headers;
                         _b.label = 3;
                     case 3:
-                        if (!(responseType === ApiConstants_1.ResponseType.Text)) return [3 /*break*/, 4];
-                        data = response.__text;
-                        return [3 /*break*/, 7];
-                    case 4:
-                        if (!(responseType === ApiConstants_1.ResponseType.ArrayBuffer)) return [3 /*break*/, 6];
+                        _b.trys.push([3, 7, , 8]);
+                        if (!(responseType === ApiConstants_1.ResponseType.ArrayBuffer)) return [3 /*break*/, 5];
                         return [4 /*yield*/, response.clone().arrayBuffer()];
-                    case 5:
+                    case 4:
                         data = _b.sent();
-                        return [3 /*break*/, 7];
-                    case 6:
+                        return [3 /*break*/, 6];
+                    case 5:
                         if (responseType === ApiConstants_1.ResponseType.Json) {
                             data = JSON.parse(response.__text);
                         }
-                        _b.label = 7;
-                    case 7: return [3 /*break*/, 9];
-                    case 8:
+                        _b.label = 6;
+                    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 9:
-                        status = response.status;
-                        return [2 /*return*/, {
-                                data: data,
-                                status: status,
-                                headers: response.headers,
-                            }];
+                    case 8: return [2 /*return*/, {
+                            data: data,
+                            status: status,
+                            headers: headers,
+                        }];
                 }
             });
         });
@@ -174,7 +161,8 @@ var FetchRequestBackend = /** @class */ (function () {
         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",
@@ -188,7 +176,7 @@ var FetchRequestBackend = /** @class */ (function () {
         }, {});
         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,26 @@ 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,
                             });
                         }
                         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 +92,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 +107,12 @@ 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,
                                 });
                             }
-                            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 +126,17 @@ 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,
                             });
                         }
+                        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/backend/RequestBackend.d.ts

@@ -7,10 +7,13 @@ export interface RequestOperation<R> {
 export interface RequestBackendErrorInfo {
     code: string;
 }
+export declare type ConvertedApiResponse<T> = ApiResponse<T> & {
+    __lowercaseHeaders?: any;
+};
 export default interface RequestBackend<R = any> {
     readonly id: string;
     makeRequest(context: RequestContext): RequestOperation<R>;
-    convertResponse<T>(context: RequestContext, response: R, error?: boolean): Promise<ApiResponse<T>>;
+    convertResponse<T>(context: RequestContext, response: R): Promise<ConvertedApiResponse<T>>;
     extractResponseFromError(error: Error): Promise<R | null | undefined>;
     getErrorInfo(error: Error, response: ApiResponse | undefined | null): RequestBackendErrorInfo | undefined;
 }

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>;

package/cjs/index.js

@@ -2,7 +2,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/cjs/middleware/LoggingMiddleware.js

@@ -30,12 +30,12 @@ var diagnoseError = function (error) {
     var _a = error.response, status = _a.status, data = _a.data;
     var code = data === null || data === void 0 ? void 0 : data.code;
     return {
-        message: "responded with " + status + (code ? " (" + code + ")" : ""),
+        message: "responded with ".concat(status).concat(code ? " (".concat(code, ")") : ""),
         response: error.response,
     };
 };
 var formatTime = function (time) {
-    return Utils.padNumber(time.getHours(), 2) + ":" + Utils.padNumber(time.getMinutes(), 2) + ":" + Utils.padNumber(time.getSeconds(), 2) + "." + Utils.padNumber(time.getMilliseconds(), 3);
+    return "".concat(Utils.padNumber(time.getHours(), 2), ":").concat(Utils.padNumber(time.getMinutes(), 2), ":").concat(Utils.padNumber(time.getSeconds(), 2), ".").concat(Utils.padNumber(time.getMilliseconds(), 3));
 };
 var log = function (context, type, message, config, objects) {
     if (typeof config.predicate === "function" && !config.predicate()) {
@@ -45,10 +45,10 @@ var log = function (context, type, message, config, objects) {
     var color = COLOR_MAP[type];
     var timestamp = formatTime(new Date());
     var args = [
-        "%cnetwork %c[" + context.api.name + "] " + context.method.toUpperCase() + " " + computedPath + " %c" + message + " %c@ " + timestamp,
+        "%cnetwork %c[".concat(context.api.name, "] ").concat(context.method.toUpperCase(), " ").concat(computedPath, " %c").concat(message, " %c@ ").concat(timestamp),
         "color:gray",
         "color:auto",
-        "color:" + color,
+        "color:".concat(color),
         "color:gray",
     ];
     /* eslint-disable-next-line no-console */
@@ -68,18 +68,18 @@ var LoggingMiddleware = function (config) {
         _a[ApiConstants_1.RequestEvent.Success] = function (context) {
             var _a;
             var 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 ".concat((_a = context.response) === null || _a === void 0 ? void 0 : _a.status).concat(cacheSource ? " (cached by ".concat(cacheSource, ")") : ""), config);
         },
         _a[ApiConstants_1.RequestEvent.Error] = function (context) {
             if (context.error) {
                 var _a = diagnoseError(context.error), error = _a.error, message = _a.message;
-                log(context, LogType.Warn, "error on attempt " + context.stats.attempt + " - " + message, config, { error: error });
+                log(context, LogType.Warn, "error on attempt ".concat(context.stats.attempt, " - ").concat(message), config, { error: error });
             }
         },
         _a[ApiConstants_1.RequestEvent.UnrecoverableError] = function (context) {
             if (context.error) {
                 var _a = diagnoseError(context.error), error = _a.error, message = _a.message;
-                log(context, LogType.Error, "failed - " + message, config, {
+                log(context, LogType.Error, "failed - ".concat(message), config, {
                     error: error,
                 });
             }

package/esm/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/esm/Api.js

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

package/esm/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/esm/ApiConstants.js

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

package/esm/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/esm/ApiUtils.js

@@ -1,4 +1,3 @@
-import { textDecode } from "./TextDecoding";
 export var isCancelledError = function (error) {
     return "isCancelledRequest" in error;
 };
@@ -8,22 +7,6 @@ export var isNetworkError = function (error) {
         error.message === "Network Error" ||
         ((_a = error.constructor) === null || _a === void 0 ? void 0 : _a.name) === "NetworkError");
 };
-export 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 = 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);
-            }
-        }
-    }
-};
 var DEFAULT_ACCEPTABLE_STATUS = [[200, 299], 304];
 export var isAcceptableStatus = function (status, acceptableStatus) {
     var acceptable = acceptableStatus !== null && acceptableStatus !== void 0 ? acceptableStatus : DEFAULT_ACCEPTABLE_STATUS;
@@ -43,11 +26,21 @@ export var isAcceptableStatus = function (status, acceptableStatus) {
     }
     return (false);
 };
+var TEXT_CONTENT_TYPES = ["text/plain"];
 var JSON_CONTENT_TYPES = ["text/json", "application/json"];
+var ARRRAY_BUFFER_CONTENT_TYPES = ["application/octet-stream"];
 export 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/esm/Endpoint.js

@@ -60,7 +60,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;
                     }
@@ -70,16 +70,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/esm/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/esm/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/esm/RequestContext.js

@@ -35,6 +35,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import * as Utils from "./Utils";
+import { URLSearchParams } from "url";
 var contextIdCounter = 0;
 var RequestContext = /** @class */ (function () {
     function RequestContext(backend, host, config, computedPath, mocking) {
@@ -47,7 +48,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 = {
@@ -57,6 +58,7 @@ var RequestContext = /** @class */ (function () {
         this.eventHandlers = {};
         this.mocking = mocking;
         this.initMiddleware();
+        this.parseRequestBody();
     }
     Object.defineProperty(RequestContext.prototype, "method", {
         get: function () {
@@ -109,7 +111,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) {
@@ -119,8 +121,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 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/esm/RequestError.js

@@ -11,9 +11,12 @@ export var isRequestError = function (error) {
 export 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,
     });
 };

package/esm/Requester.js

@@ -46,13 +46,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import * as ApiUtils from "./ApiUtils";
-import { isAcceptableStatus, isNetworkError } from "./ApiUtils";
+import { inferResponseType, isAcceptableStatus, isNetworkError } from "./ApiUtils";
 import RequestContext from "./RequestContext";
 import * as Api from "./Api";
 import { EventResultType, RequestEvent } from "./ApiConstants";
 import retry from "./util/retry";
 import MockRequestBackend from "./backend/MockRequestBackend";
 import { convertToRequestError, isRequestError, RequestErrorCode } from "./RequestError";
+import { textDecode } from "./TextDecoding";
 var locks = {};
 var runningOperations = {};
 var MOCK_REQUEST_BACKEND = new MockRequestBackend();
@@ -153,7 +154,7 @@ var makeRequest = function (context) { return __awaiter(void 0, void 0, void 0,
                                 parsedResponse = (_b.sent());
                                 if (!isAcceptableStatus(parsedResponse.status, context.computedConfig.acceptableStatus)) {
                                     throw convertToRequestError({
-                                        error: new Error("[api-def] Invalid response status code '" + parsedResponse.status + "'"),
+                                        error: new Error("[api-def] Invalid response status code '".concat(parsedResponse.status, "'")),
                                         response: parsedResponse,
                                         code: RequestErrorCode.REQUEST_INVALID_STATUS,
                                     });
@@ -170,10 +171,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(RequestEvent.Error)];
                             case 6:
                                 errorEventResult = _b.sent();
@@ -210,18 +207,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 = inferResponseType(contentType);
+                if (!error) {
+                    // expand to array buffer once we support that in inferResponseType
+                    if (inferredResponseType === "text" && context.responseType === "json") {
+                        throw convertToRequestError({
+                            error: new Error("[api-def] Expected '".concat(context.responseType, "' response, got '").concat(inferredResponseType, "' (from 'Content-Type' of '").concat(contentType, "')")),
+                            code: 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 = textDecode(data));
+                                    response.data = JSON.parse(decodedData);
+                                }
+                                catch (e) {
+                                    throw convertToRequestError({
+                                        error: new Error("[api-def] Expected '".concat(context.responseType, "' response, got '").concat(inferredResponseType, "' (from 'Content-Type' of '").concat(contentType, "')")),
+                                        code: RequestErrorCode.REQUEST_MISMATCH_RESPONSE_TYPE,
+                                        response: parsedResponse_1,
+                                    });
+                                }
+                            }
+                        }
+                    }
                 }
-                return [2 /*return*/, parsedResponse];
+                return [2 /*return*/, parsedResponse_1];
             case 2: return [2 /*return*/, response];
         }
     });