api-def 0.6.1 → 0.6.2-alpha.2

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.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;
 }());

package/esm/ApiUtils.d.ts

@@ -2,5 +2,5 @@ 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 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/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,8 +28,11 @@ 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;
     cancel(): void;
+    getRequestUrl(): URL;
 }

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;
@@ -162,6 +189,38 @@ var RequestContext = /** @class */ (function () {
             this.canceler();
         }
     };
+    RequestContext.prototype.getRequestUrl = function () {
+        var _a;
+        var path = !this.baseUrl.endsWith("/")
+            ? this.baseUrl + "/"
+            : this.baseUrl;
+        path += this.computedPath.startsWith("/")
+            ? this.computedPath.substring(1)
+            : this.computedPath;
+        var origin = undefined;
+        if (typeof window !== "undefined") {
+            origin = window.origin;
+        }
+        if (!origin) {
+            if (path.indexOf("://") === -1) {
+                path = "https://".concat(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()) || "");
+                }
+            }
+        }
+        return url;
+    };
     return RequestContext;
 }());
 export default RequestContext;

package/esm/RequestError.d.ts

@@ -1,5 +1,6 @@
 import { ApiResponse } from "./ApiTypes";
 import { EnumOf } from "./Utils";
+import RequestContext from "./RequestContext";
 export declare const RequestErrorCode: {
     readonly MISC_UNKNOWN_ERROR: "misc/unknown-error";
     readonly REQUEST_NETWORK_ERROR: "request/network-error";
@@ -17,6 +18,7 @@ export declare const isRequestError: (error: Error) => error is RequestError;
 export interface RequestErrorConfig {
     error: Error;
     code: string;
+    context: RequestContext;
     response?: ApiResponse | null;
 }
 export declare const convertToRequestError: (config: RequestErrorConfig) => RequestError;

package/esm/RequestError.js

@@ -9,14 +9,20 @@ export var isRequestError = function (error) {
     return "isRequestError" in error;
 };
 export var convertToRequestError = function (config) {
-    var error = config.error, response = config.response, code = config.code;
-    return Object.assign(error, {
+    var error = config.error, context = config.context, response = config.response, code = config.code;
+    var resultError = Object.assign(error, {
         name: "RequestError",
         response: response,
         code: code,
         isRequestError: true,
-        config: undefined,
-        request: undefined,
-        toJSON: undefined,
+        request: {
+            url: context.getRequestUrl().href,
+            query: context.computedConfig.query,
+            headers: context.computedConfig.headers,
+            body: context.getParsedBody(),
+        },
     });
+    delete resultError.config;
+    delete resultError.toJSON;
+    return resultError;
 };

package/esm/Requester.js

@@ -154,9 +154,10 @@ 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,
+                                        context: context,
                                     });
                                 }
                                 context.response = parsedResponse;
@@ -227,9 +228,10 @@ var parseResponse = function (context, response, error) { return __awaiter(void
                     // expand to array buffer once we support that in inferResponseType
                     if (inferredResponseType === "text" && context.responseType === "json") {
                         throw convertToRequestError({
-                            error: new Error("[api-def] Expected '" + context.responseType + "' response, got '" + inferredResponseType + "' (from 'Content-Type' of '" + contentType + "')"),
+                            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,
+                            context: context,
                         });
                     }
                     // transform arrayBuffer to json
@@ -244,9 +246,10 @@ var parseResponse = function (context, response, error) { return __awaiter(void
                                 }
                                 catch (e) {
                                     throw convertToRequestError({
-                                        error: new Error("[api-def] Expected '" + context.responseType + "' response, got '" + inferredResponseType + "' (from 'Content-Type' of '" + contentType + "')"),
+                                        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,
+                                        context: context,
                                     });
                                 }
                             }
@@ -283,7 +286,7 @@ var parseError = function (context, rawError) { return __awaiter(void 0, void 0,
                     }
                 }
                 errorInfo = context.backend.getErrorInfo(rawError, errorResponse);
-                error = convertToRequestError(__assign({ error: rawError, response: errorResponse, code: code }, errorInfo));
+                error = convertToRequestError(__assign({ error: rawError, response: errorResponse, code: code, context: context }, errorInfo));
                 _a.label = 5;
             case 5: return [2 /*return*/, error];
         }

package/esm/backend/AxiosRequestBackend.d.ts

@@ -2,7 +2,7 @@ import RequestBackend, { ConvertedApiResponse, RequestBackendErrorInfo, RequestO
 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);

package/esm/backend/AxiosRequestBackend.js

@@ -73,7 +73,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/esm/backend/FetchRequestBackend.d.ts

@@ -3,7 +3,7 @@ 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>;

package/esm/backend/FetchRequestBackend.js

@@ -113,7 +113,7 @@ var FetchRequestBackend = /** @class */ (function () {
                     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 8: return [2 /*return*/, {
@@ -126,40 +126,17 @@ var FetchRequestBackend = /** @class */ (function () {
         });
     };
     FetchRequestBackend.prototype.makeRequest = function (context) {
-        var _a;
         if (!this.fetch) {
             throw new Error("[api-def] No fetch impl was provided to FetchRequestBackend");
         }
         var computedConfig = context.computedConfig;
-        var path = !context.baseUrl.endsWith("/")
-            ? context.baseUrl + "/"
-            : context.baseUrl;
-        path += context.computedPath.startsWith("/")
-            ? context.computedPath.substring(1)
-            : context.computedPath;
-        var origin = undefined;
-        if (typeof window !== "undefined") {
-            origin = window.origin;
-        }
-        var url = new URL(path, origin);
-        if (computedConfig.query) {
-            if (context.computedConfig.queryParser) {
-                url.search = context.computedConfig.queryParser(computedConfig.query);
-            }
-            else {
-                var queryKeys = Object.keys(computedConfig.query);
-                for (var i = 0; i < queryKeys.length; i++) {
-                    var key = queryKeys[i];
-                    url.searchParams.append(key, ((_a = computedConfig.query[key]) === null || _a === void 0 ? void 0 : _a.toString()) || "");
-                }
-            }
-        }
         // 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 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",
@@ -171,9 +148,10 @@ var FetchRequestBackend = /** @class */ (function () {
             }
             return parsedHeaders;
         }, {});
+        var url = context.getRequestUrl();
         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/esm/backend/MockRequestBackend.js

@@ -63,7 +63,7 @@ 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:
@@ -72,16 +72,18 @@ var MockRequestBackend = /** @class */ (function () {
                             throw convertToRequestError({
                                 error: new Error("[api-def] Attempted to run mocked request without mocking function"),
                                 code: RequestErrorCode.REQUEST_INVALID_CONFIG,
+                                context: context,
                             });
                         }
                         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;
@@ -89,6 +91,9 @@ var MockRequestBackend = /** @class */ (function () {
                             },
                             send: function (response) {
                                 res.response = response;
+                                if (response && typeof response === "object") {
+                                    res.headers["Content-Type"] = "application/json";
+                                }
                                 return res;
                             },
                         };
@@ -104,6 +109,7 @@ var MockRequestBackend = /** @class */ (function () {
                                 throw convertToRequestError({
                                     error: new Error("[api-def] Min delay cannot be greater than max delay"),
                                     code: RequestErrorCode.REQUEST_INVALID_CONFIG,
+                                    context: context,
                                 });
                             }
                             delayMs = randInt(min, max);
@@ -123,10 +129,15 @@ var MockRequestBackend = /** @class */ (function () {
                             throw convertToRequestError({
                                 error: new Error("[api-def] Mocked API did not respond"),
                                 code: RequestErrorCode.REQUEST_INVALID_CONFIG,
+                                context: context,
                             });
                         }
+                        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/esm/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/esm/middleware/LoggingMiddleware.js

@@ -28,12 +28,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()) {
@@ -43,10 +43,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 */
@@ -66,18 +66,18 @@ var LoggingMiddleware = function (config) {
         _a[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[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[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/package.json

@@ -1,14 +1,15 @@
 {
   "name": "api-def",
-  "version": "0.6.1",
+  "version": "0.6.2-alpha.2",
   "description": "Typed API definitions with middleware support",
   "main": "cjs/index.js",
   "types": "esm/index.d.ts",
   "module": "esm/index.js",
   "sideEffects": false,
   "scripts": {
+    "prepublishOnly": "npm run test && npm run build",
     "test": "npm run test:types && npm run test:lint && npm run test:unit",
-    "test:unit": "cross-env NODE_ENV=test jest",
+    "test:unit": "ava",
     "test:lint": "npm run lint:strict",
     "test:types": "tsc --noEmit -p .",
     "example:start": "cd example && npm run start",
@@ -45,19 +46,30 @@
     "cjs/"
   ],
   "repository": "https://github.com/Censkh/api-def",
+  "ava": {
+    "extensions": [
+      "ts"
+    ],
+    "files": [
+      "src/tests/**/*.test.ts"
+    ],
+    "nodeArguments": [
+      "--require=@esbuild-kit/cjs-loader"
+    ]
+  },
   "devDependencies": {
     "@babel/preset-env": "7.14.8",
     "@babel/preset-typescript": "7.14.5",
+    "@esbuild-kit/cjs-loader": "2.4.0",
     "@types/axios": "0.14.0",
-    "@types/jest": "26.0.24",
     "@types/node": "16.4.6",
     "@typescript-eslint/eslint-plugin": "4.28.5",
     "@typescript-eslint/parser": "4.28.5",
+    "ava": "5.0.1",
     "cross-env": "7.0.3",
     "eslint": "7.31.0",
     "eslint-watch": "7.0.0",
-    "jest": "27.0.6",
     "npm-run-all": "4.1.5",
-    "typescript": "4.3.5"
+    "typescript": "4.8.4"
   }
 }