api-def 0.9.0 → 0.9.1

package/cjs/RequestError.js

@@ -34,7 +34,7 @@ var convertToRequestError = function (config) {
         },
     });
     try {
-        Object.defineProperty(resultError, "message", { value: "Request failed".concat((response === null || response === void 0 ? void 0 : response.status) ? " with status code ".concat(response.status) : "", " (").concat(code, ")") });
+        Object.defineProperty(resultError, "message", { value: "Request failed".concat((response === null || response === void 0 ? void 0 : response.status) ? " with status code ".concat(response.status) : "", " [").concat(code, "]: ").concat(resultError.message) });
     }
     catch (e) {
         // ignore

package/cjs/backend/FetchRequestBackend.js

@@ -54,6 +54,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var Utils = require("../Utils");
 var Utils_1 = require("../Utils");
 var ApiUtils_1 = require("../ApiUtils");
+var RequestError_1 = require("../RequestError");
 var FetchError = /** @class */ (function (_super) {
     __extends(FetchError, _super);
     function FetchError() {
@@ -86,54 +87,58 @@ var FetchRequestBackend = /** @class */ (function () {
         });
     };
     FetchRequestBackend.prototype.convertResponse = function (context, response) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var contentType, responseType, _a, data, status, headers, error_1, processedHeaders;
+            var status, headers, processedHeaders, convertedResponse, responseType, text, data, error_1;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        contentType = response.headers.get("Content-Type");
-                        responseType = (0, ApiUtils_1.inferResponseType)(contentType);
-                        if (!!response.__text) return [3 /*break*/, 2];
-                        _a = response;
-                        return [4 /*yield*/, response.clone().text()];
+                        status = response.status, headers = response.headers;
+                        processedHeaders = {};
+                        headers.forEach(function (value, key) {
+                            processedHeaders[key] = value;
+                        });
+                        convertedResponse = {
+                            __lowercaseHeaders: processedHeaders,
+                            method: context.method,
+                            url: response.url,
+                            data: undefined,
+                            status: status,
+                            headers: processedHeaders,
+                        };
+                        responseType = (_a = context.responseType) !== null && _a !== void 0 ? _a : (0, ApiUtils_1.inferResponseType)(response.headers.get("Content-Type"));
+                        _b.label = 1;
                     case 1:
-                        _a.__text = _b.sent();
-                        _b.label = 2;
+                        _b.trys.push([1, 7, , 8]);
+                        if (!(responseType === "arraybuffer")) return [3 /*break*/, 3];
+                        return [4 /*yield*/, response.arrayBuffer()];
                     case 2:
-                        data = response.__text;
-                        status = response.status, headers = response.headers;
-                        _b.label = 3;
+                        data = _b.sent();
+                        return [3 /*break*/, 6];
                     case 3:
-                        _b.trys.push([3, 7, , 8]);
-                        if (!(responseType === "arraybuffer")) return [3 /*break*/, 5];
-                        return [4 /*yield*/, response.clone().arrayBuffer()];
+                        if (!(responseType === "json")) return [3 /*break*/, 5];
+                        return [4 /*yield*/, response.text()];
                     case 4:
-                        data = _b.sent();
+                        text = _b.sent();
+                        data = JSON.parse(text);
                         return [3 /*break*/, 6];
                     case 5:
-                        if (responseType === "json") {
-                            data = JSON.parse(response.__text);
-                        }
+                        data = response.text();
                         _b.label = 6;
                     case 6: return [3 /*break*/, 8];
                     case 7:
                         error_1 = _b.sent();
-                        throw Object.assign(new Error("[api-def] Invalid '".concat(context.responseType, "' response, got: '").concat(response.__text, "'")), {
-                            response: response,
+                        throw (0, RequestError_1.convertToRequestError)({
+                            error: Object.assign(new Error("[api-def] Failed to parse response as '".concat(responseType, "'").concat(text ? ", got: ".concat(text) : "")), {
+                                cause: error_1,
+                            }),
+                            code: RequestError_1.RequestErrorCode.REQUEST_MISMATCH_RESPONSE_TYPE,
+                            context: context,
+                            response: convertedResponse,
                         });
                     case 8:
-                        processedHeaders = {};
-                        headers.forEach(function (value, key) {
-                            processedHeaders[key] = value;
-                        });
-                        return [2 /*return*/, {
-                                __lowercaseHeaders: processedHeaders,
-                                method: context.method,
-                                url: response.url,
-                                data: data,
-                                status: status,
-                                headers: processedHeaders,
-                            }];
+                        convertedResponse.data = data;
+                        return [2 /*return*/, convertedResponse];
                 }
             });
         });

package/esm/RequestError.js

@@ -30,7 +30,7 @@ export const convertToRequestError = (config) => {
         },
     });
     try {
-        Object.defineProperty(resultError, "message", { value: `Request failed${(response === null || response === void 0 ? void 0 : response.status) ? ` with status code ${response.status}` : ""} (${code})` });
+        Object.defineProperty(resultError, "message", { value: `Request failed${(response === null || response === void 0 ? void 0 : response.status) ? ` with status code ${response.status}` : ""} [${code}]: ${resultError.message}` });
     }
     catch (e) {
         // ignore

package/esm/backend/FetchRequestBackend.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import * as Utils from "../Utils";
 import { getGlobal, getGlobalFetch } from "../Utils";
 import { inferResponseType } from "../ApiUtils";
+import { convertToRequestError, RequestErrorCode } from "../RequestError";
 class FetchError extends Error {
 }
 export default class FetchRequestBackend {
@@ -34,39 +35,48 @@ export default class FetchRequestBackend {
         });
     }
     convertResponse(context, response) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const contentType = response.headers.get("Content-Type");
-            const responseType = inferResponseType(contentType);
-            if (!response.__text) {
-                response.__text = yield response.clone().text();
-            }
-            let data = response.__text;
             const { status, headers } = response;
-            try {
-                if (responseType === "arraybuffer") {
-                    data = yield response.clone().arrayBuffer();
-                }
-                else if (responseType === "json") {
-                    data = JSON.parse(response.__text);
-                }
-            }
-            catch (error) {
-                throw Object.assign(new Error(`[api-def] Invalid '${context.responseType}' response, got: '${response.__text}'`), {
-                    response,
-                });
-            }
             const processedHeaders = {};
             headers.forEach((value, key) => {
                 processedHeaders[key] = value;
             });
-            return {
+            const convertedResponse = {
                 __lowercaseHeaders: processedHeaders,
                 method: context.method,
                 url: response.url,
-                data: data,
+                data: undefined,
                 status: status,
                 headers: processedHeaders,
             };
+            const responseType = (_a = context.responseType) !== null && _a !== void 0 ? _a : inferResponseType(response.headers.get("Content-Type"));
+            let text;
+            let data;
+            try {
+                if (responseType === "arraybuffer") {
+                    data = yield response.arrayBuffer();
+                }
+                else if (responseType === "json") {
+                    text = yield response.text();
+                    data = JSON.parse(text);
+                }
+                else {
+                    data = response.text();
+                }
+            }
+            catch (error) {
+                throw convertToRequestError({
+                    error: Object.assign(new Error(`[api-def] Failed to parse response as '${responseType}'${text ? `, got: ${text}` : ""}`), {
+                        cause: error,
+                    }),
+                    code: RequestErrorCode.REQUEST_MISMATCH_RESPONSE_TYPE,
+                    context: context,
+                    response: convertedResponse,
+                });
+            }
+            convertedResponse.data = data;
+            return convertedResponse;
         });
     }
     makeRequest(context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api-def",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Typed API definitions with middleware support",
   "main": "cjs/index.js",
   "types": "esm/index.d.ts",