api-def 0.7.4 → 0.8.1

package/esm/RequestContext.js

@@ -7,37 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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;
-    return g = { next: verb(0), "throw": verb(1), "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 (_) 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 };
-    }
-};
 import * as Utils from "./Utils";
-var contextIdCounter = 0;
-var RequestContext = /** @class */ (function () {
-    function RequestContext(backend, host, config, computedPath, mocking) {
+let contextIdCounter = 0;
+export default class RequestContext {
+    constructor(backend, host, config, computedPath, mocking) {
         this.canceler = null;
         this.response = undefined;
         this.error = null;
@@ -59,80 +32,54 @@ var RequestContext = /** @class */ (function () {
         this.initMiddleware();
         this.parseRequestBody();
     }
-    Object.defineProperty(RequestContext.prototype, "method", {
-        get: function () {
-            return this.host.method;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(RequestContext.prototype, "api", {
-        get: function () {
-            return this.host.api;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(RequestContext.prototype, "baseUrl", {
-        get: function () {
-            return this.host.baseUrl;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(RequestContext.prototype, "responseType", {
-        get: function () {
-            return this.host.responseType;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    RequestContext.prototype.initMiddleware = function () {
-        var middleware = this.api.middleware;
-        for (var i = 0; i < middleware.length; i++) {
-            var events = middleware[i];
-            var eventTypes = Object.keys(events);
-            for (var n = 0; n < eventTypes.length; n++) {
-                var eventType = eventTypes[n];
-                var eventHandlersForType = this.eventHandlers[eventType] || (this.eventHandlers[eventType] = []);
-                var middlewareEventHandlers = events[eventType];
+    get method() {
+        return this.host.method;
+    }
+    get api() {
+        return this.host.api;
+    }
+    get baseUrl() {
+        return this.host.baseUrl;
+    }
+    get responseType() {
+        return this.host.responseType;
+    }
+    initMiddleware() {
+        const { middleware } = this.api;
+        for (let i = 0; i < middleware.length; i++) {
+            const events = middleware[i];
+            const eventTypes = Object.keys(events);
+            for (let n = 0; n < eventTypes.length; n++) {
+                const eventType = eventTypes[n];
+                const eventHandlersForType = this.eventHandlers[eventType] || (this.eventHandlers[eventType] = []);
+                const middlewareEventHandlers = events[eventType];
                 if (middlewareEventHandlers) {
                     eventHandlersForType.push(middlewareEventHandlers);
                 }
             }
         }
-    };
-    RequestContext.prototype.generateKey = function () {
-        var computedConfig = this.computedConfig;
-        var key = this.computedPath.trim();
-        var queryStrings = [];
-        if (computedConfig.query) {
-            var queryKeys = Object.keys(computedConfig.query);
-            for (var i = 0; i < queryKeys.length; i++) {
-                var queryKey = queryKeys[i];
-                queryStrings.push("".concat(queryKey, "=").concat(computedConfig.query[queryKey]));
-            }
-        }
-        if (queryStrings.length > 0) {
-            key += "?" + queryStrings.join("&");
+    }
+    generateKey() {
+        let key = this.computedPath.trim();
+        if (this.computedConfig.queryString) {
+            key += "?" + this.computedConfig.queryString;
         }
         return key;
-    };
-    RequestContext.prototype.updateHeaders = function (newHeaders) {
+    }
+    updateHeaders(newHeaders) {
         this.computedConfig.headers = Utils.assign({}, this.computedConfig.headers, newHeaders);
         this.parseRequestBody();
         return this;
-    };
-    RequestContext.prototype.parseRequestBody = function () {
+    }
+    parseRequestBody() {
         var _a;
         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 && ((_a = this.computedConfig.headers[contentTypeKey]) === null || _a === void 0 ? void 0 : _a.toString().split(";")[0].trim());
+            const contentTypeKey = Object.keys(this.computedConfig.headers).find(key => key.toLowerCase() === "content-type");
+            const contentType = contentTypeKey && ((_a = this.computedConfig.headers[contentTypeKey]) === null || _a === void 0 ? void 0 : _a.toString().split(";")[0].trim());
             if (contentType === "application/x-www-form-urlencoded") {
-                var searchParams = new URLSearchParams();
-                for (var _i = 0, _b = Object.keys(this.computedConfig.body); _i < _b.length; _i++) {
-                    var key = _b[_i];
-                    var value = this.computedConfig.body[key];
+                const searchParams = new URLSearchParams();
+                for (const key of Object.keys(this.computedConfig.body)) {
+                    const value = this.computedConfig.body[key];
                     searchParams.append(key, value === null || value === void 0 ? void 0 : value.toString());
                 }
                 this.parsedBody = searchParams;
@@ -144,83 +91,59 @@ var RequestContext = /** @class */ (function () {
         else {
             this.parsedBody = undefined;
         }
-    };
-    RequestContext.prototype.getParsedBody = function () {
+    }
+    getParsedBody() {
         return this.parsedBody;
-    };
-    RequestContext.prototype.updateQuery = function (newQuery) {
-        this.computedConfig.query = Utils.assign(this.computedConfig.query || {}, newQuery);
+    }
+    updateQuery(newQuery) {
+        this.computedConfig.queryObject = Utils.assign({}, this.computedConfig.queryObject, newQuery);
         return this;
-    };
-    RequestContext.prototype.triggerEvent = function (eventType) {
-        return __awaiter(this, void 0, void 0, function () {
-            var eventHandlers, i, eventHandler, eventResult;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        eventHandlers = this.eventHandlers[eventType];
-                        if (!eventHandlers) return [3 /*break*/, 4];
-                        i = 0;
-                        _a.label = 1;
-                    case 1:
-                        if (!(i < eventHandlers.length)) return [3 /*break*/, 4];
-                        eventHandler = eventHandlers[i];
-                        return [4 /*yield*/, eventHandler(this)];
-                    case 2:
-                        eventResult = _a.sent();
-                        if (eventResult) {
-                            return [2 /*return*/, eventResult];
-                        }
-                        _a.label = 3;
-                    case 3:
-                        i++;
-                        return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, undefined];
+    }
+    triggerEvent(eventType) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const eventHandlers = this.eventHandlers[eventType];
+            if (eventHandlers) {
+                for (let i = 0; i < eventHandlers.length; i++) {
+                    const eventHandler = eventHandlers[i];
+                    // eslint-disable-next-line no-await-in-loop
+                    const eventResult = yield eventHandler(this);
+                    if (eventResult) {
+                        return eventResult;
+                    }
                 }
-            });
+            }
+            return undefined;
         });
-    };
-    RequestContext.prototype.addCanceller = function (canceler) {
+    }
+    addCanceller(canceler) {
         this.canceler = canceler;
-    };
-    RequestContext.prototype.cancel = function () {
+    }
+    cancel() {
         this.cancelled = true;
         if (this.canceler) {
             this.canceler();
         }
-    };
-    RequestContext.prototype.getRequestUrl = function () {
-        var _a;
-        var path = !this.baseUrl.endsWith("/")
+    }
+    getRequestUrl() {
+        let path = !this.baseUrl.endsWith("/")
             ? this.baseUrl + "/"
             : this.baseUrl;
         path += this.computedPath.startsWith("/")
             ? this.computedPath.substring(1)
             : this.computedPath;
-        var origin = undefined;
+        let origin = undefined;
         if (typeof window !== "undefined") {
             origin = window.origin;
         }
         if (!origin) {
             if (path.indexOf("://") === -1) {
-                path = "https://".concat(path);
+                path = `https://${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()) || "");
-                }
-            }
+        const url = new URL(path, origin);
+        if (this.computedConfig.queryString) {
+            url.search = this.computedConfig.queryString;
         }
         return url;
-    };
-    return RequestContext;
-}());
-export default RequestContext;
+    }
+}

package/esm/RequestError.js

@@ -1,24 +1,24 @@
-export var RequestErrorCode = {
+export const RequestErrorCode = {
     MISC_UNKNOWN_ERROR: "misc/unknown-error",
     REQUEST_NETWORK_ERROR: "request/network-error",
     REQUEST_INVALID_STATUS: "request/invalid-status",
     REQUEST_INVALID_CONFIG: "request/invalid-config",
     REQUEST_MISMATCH_RESPONSE_TYPE: "request/mismatch-response-type",
 };
-export var isRequestError = function (error) {
+export const isRequestError = (error) => {
     return "isRequestError" in error;
 };
-export var convertToRequestError = function (config) {
-    var error = config.error, context = config.context, response = config.response, code = config.code;
-    var body = context.getParsedBody();
-    var resultError = Object.assign(error, {
+export const convertToRequestError = (config) => {
+    const { error, context, response, code } = config;
+    const body = context.getParsedBody();
+    const resultError = Object.assign(error, {
         name: "RequestError",
         response: response,
         code: code,
         isRequestError: true,
         request: {
             url: context.getRequestUrl().href,
-            query: context.computedConfig.query,
+            query: context.computedConfig.queryObject,
             headers: context.computedConfig.headers,
             body: body,
         },

package/esm/Requester.d.ts

@@ -1,3 +1,3 @@
 import { ApiResponse, Body, Query, RequestConfig, RequestHost } from "./ApiTypes";
 import { EndpointMockingConfig } from "./MockingTypes";
-export declare const submit: <R, P extends string | undefined, Q extends Query | undefined, B extends Body | undefined>(host: RequestHost, config: RequestConfig<P, Q, B>, mocking: EndpointMockingConfig<R, P, Q, B> | null | undefined) => Promise<ApiResponse<R>>;
+export declare const submit: <R, P extends string | undefined, Q extends Query, B extends Body | undefined>(host: RequestHost, config: RequestConfig<P, Q, B>, mocking: EndpointMockingConfig<R, P, Q, B> | null | undefined) => Promise<ApiResponse<R>>;