api-def 0.12.1 → 0.14.0-alpha.1

package/cjs/backend/FetchRequestBackend.js

@@ -1,69 +1,46 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = 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];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
     };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var ApiUtils_1 = require("../ApiUtils");
-var RequestError_1 = require("../RequestError");
-var Utils = require("../Utils");
-var Utils_1 = require("../Utils");
-var FetchError = /** @class */ (function (_super) {
-    __extends(FetchError, _super);
-    function FetchError() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return FetchError;
-}(Error));
-var FetchRequestBackend = /** @class */ (function () {
-    function FetchRequestBackend(fetchLibrary) {
+const ApiUtils_1 = require("../ApiUtils");
+const RequestError_1 = require("../RequestError");
+const Utils = __importStar(require("../Utils"));
+const Utils_1 = require("../Utils");
+class FetchError extends Error {
+}
+class FetchRequestBackend {
+    constructor(fetchLibrary) {
         this.fetch = (0, Utils_1.getGlobalFetch)();
         this.id = "fetch";
         if (fetchLibrary !== undefined) {
@@ -74,102 +51,80 @@ var FetchRequestBackend = /** @class */ (function () {
             }
         }
     }
-    FetchRequestBackend.prototype.extractResponseFromError = function (error) {
-        return __awaiter(this, void 0, void 0, function () {
-            var fetchError;
-            return __generator(this, function (_a) {
-                if ("response" in error) {
-                    fetchError = error;
-                    return [2 /*return*/, fetchError.response ? fetchError.response : null];
-                }
-                return [2 /*return*/, undefined];
-            });
-        });
-    };
-    FetchRequestBackend.prototype.convertResponse = function (context, response) {
-        return __awaiter(this, void 0, void 0, function () {
-            var status, headers, convertedResponse, responseType, text, data, error_1;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        status = response.status, headers = response.headers;
-                        convertedResponse = {
-                            method: context.method,
-                            url: response.url,
-                            data: undefined,
-                            status: status,
-                            headers: headers,
-                            state: context.requestConfig.state,
-                            stats: context.stats,
-                        };
-                        responseType = (_a = context.responseType) !== null && _a !== void 0 ? _a : (0, ApiUtils_1.inferResponseType)(response.headers.get("Content-Type"));
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 9, , 10]);
-                        if (!(responseType === "arraybuffer")) return [3 /*break*/, 3];
-                        return [4 /*yield*/, response.arrayBuffer()];
-                    case 2:
-                        data = _b.sent();
-                        return [3 /*break*/, 8];
-                    case 3:
-                        if (!(responseType === "json")) return [3 /*break*/, 5];
-                        return [4 /*yield*/, response.text()];
-                    case 4:
-                        text = _b.sent();
-                        data = JSON.parse(text);
-                        return [3 /*break*/, 8];
-                    case 5:
-                        if (!(responseType === "stream")) return [3 /*break*/, 6];
-                        data = response.body;
-                        return [3 /*break*/, 8];
-                    case 6: return [4 /*yield*/, response.text()];
-                    case 7:
-                        data = _b.sent();
-                        _b.label = 8;
-                    case 8: return [3 /*break*/, 10];
-                    case 9:
-                        error_1 = _b.sent();
-                        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 10:
-                        convertedResponse.data = data;
-                        return [2 /*return*/, convertedResponse];
-                }
+    async extractResponseFromError(error) {
+        if ("response" in error) {
+            const fetchError = error;
+            return fetchError.response ? fetchError.response : null;
+        }
+        return undefined;
+    }
+    async convertResponse(context, response) {
+        const { status, headers } = response;
+        const convertedResponse = {
+            method: context.method,
+            url: response.url,
+            data: undefined,
+            status: status,
+            headers: headers,
+            state: context.requestConfig.state,
+            stats: context.stats,
+        };
+        const responseType = context.responseType ?? (0, ApiUtils_1.inferResponseType)(response.headers.get("Content-Type"));
+        let text;
+        let data;
+        try {
+            if (responseType === "arraybuffer") {
+                data = await response.arrayBuffer();
+            }
+            else if (responseType === "json") {
+                text = await response.text();
+                data = JSON.parse(text);
+            }
+            else if (responseType === "stream") {
+                data = response.body;
+            }
+            else {
+                data = await response.text();
+            }
+        }
+        catch (error) {
+            throw (0, RequestError_1.convertToRequestError)({
+                error: Object.assign(new Error(`[api-def] Failed to parse response as '${responseType}'${text ? `, got: ${text}` : ""}`), {
+                    cause: error,
+                }),
+                code: RequestError_1.RequestErrorCode.REQUEST_MISMATCH_RESPONSE_TYPE,
+                context: context,
+                response: convertedResponse,
             });
-        });
-    };
-    FetchRequestBackend.prototype.makeRequest = function (context) {
+        }
+        convertedResponse.data = data;
+        return convertedResponse;
+    }
+    makeRequest(context) {
         if (!this.fetch) {
             throw new Error("[api-def] No fetch impl was provided to FetchRequestBackend");
         }
-        var requestConfig = context.requestConfig;
+        const { requestConfig } = context;
         // abort controller is a newer feature than fetch
-        var abortController = AbortController && new AbortController();
-        var abortSignal = abortController ? abortController.signal : undefined;
-        var softAbort = false;
-        var responded = false;
-        var body = context.getParsedBody();
-        var bodyJsonify = body !== null && typeof body === "object" && !Utils.isFormData(body);
-        var headers = Utils.assign({
+        const abortController = AbortController && new AbortController();
+        const abortSignal = abortController ? abortController.signal : undefined;
+        let softAbort = false;
+        let responded = false;
+        const body = context.getParsedBody();
+        const bodyJsonify = body !== null && typeof body === "object" && !Utils.isFormData(body) && !(body instanceof URLSearchParams);
+        const headers = Utils.assign({
             // logic from axios
             "Content-Type": bodyJsonify ? "application/json;charset=utf-8" : undefined,
         }, requestConfig.headers);
-        var parsedHeaders = Object.keys(headers).reduce(function (parsedHeaders, key) {
-            var value = headers[key];
+        const parsedHeaders = Object.keys(headers).reduce((parsedHeaders, key) => {
+            const value = headers[key];
             if (value !== undefined) {
                 parsedHeaders[key] = value;
             }
             return parsedHeaders;
         }, {});
-        var url = context.requestUrl;
-        var fetchOptions = {
+        const url = context.requestUrl;
+        const fetchOptions = {
             method: context.method.toUpperCase(),
             body: bodyJsonify ? JSON.stringify(body) : body,
             headers: parsedHeaders,
@@ -183,12 +138,12 @@ var FetchRequestBackend = /** @class */ (function () {
             fetchOptions.credentials = requestConfig.credentials ? "include" : undefined;
         }
         if (requestConfig.debug) {
-            console.log("[api-def] Fetching '".concat(url.href, "' with options"), JSON.stringify(fetchOptions, null, 2));
+            console.log(`[api-def] Fetching '${url.href}' with options`, JSON.stringify(fetchOptions, null, 2));
         }
-        var promise = this.fetch(url.href, fetchOptions).then(function (response) {
+        const promise = this.fetch(url.href, fetchOptions).then((response) => {
             responded = true;
             if (!response.ok) {
-                var error = new FetchError("Fetch failed");
+                const error = new FetchError("Fetch failed");
                 error.response = response;
                 throw error;
             }
@@ -200,15 +155,14 @@ var FetchRequestBackend = /** @class */ (function () {
         return {
             promise: promise,
             canceler: abortSignal
-                ? function () { return !responded && abortController.abort(); }
-                : function () {
+                ? () => !responded && abortController.abort()
+                : () => {
                     softAbort = true;
                 },
         };
-    };
-    FetchRequestBackend.prototype.getErrorInfo = function (error, response) {
+    }
+    getErrorInfo(error, response) {
         return undefined;
-    };
-    return FetchRequestBackend;
-}());
+    }
+}
 exports.default = FetchRequestBackend;

package/cjs/backend/MockRequestBackend.d.ts

@@ -1,7 +1,7 @@
 import type { ApiResponse } from "../ApiTypes";
 import type RequestContext from "../RequestContext";
-import type { RequestBackendErrorInfo, RequestOperation } from "./RequestBackend";
 import type RequestBackend from "./RequestBackend";
+import type { RequestBackendErrorInfo, RequestOperation } from "./RequestBackend";
 export default class MockRequestBackend implements RequestBackend<ApiResponse> {
     readonly id = "mock";
     convertResponse<T>(context: RequestContext, response: ApiResponse, error?: boolean): Promise<ApiResponse<T>>;