api-def 0.8.5 → 0.9.1

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2019 James Waterhouse
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+
+Copyright (c) 2019 James Waterhouse
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

package/README.md

@@ -1,34 +1,34 @@
-# [api-def](https://github.com/Censkh/api-def/) · [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/Censkh/api-def/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/api-def.svg?style=flat)](https://www.npmjs.com/package/api-def) [![build status](https://img.shields.io/github/workflow/status/censkh/api-def/Node.js%20CI)](https://github.com/Censkh/api-def/actions)
-
-Typed APIs with middleware support
-
-API def provides a unified way to type your endpoints allowing for compile time checking of query, body, response and even url parameters
-
-``` npm i api-def ```
-
-- [Documentation](https://censkh.github.io/api-def/)
-
-```typescript
-import {Api} from "api-def";
-
-const api = new Api({
-  baseUrl: "https://my-api/",
-  name: "My API",
-});
-
-const fetchData = api.endpoint()
-    .queryOf<{ includeAwesome: boolean; }>()
-    .responseOf<{ data: {awesome: boolean; } }>()
-    .build({
-      id: "fetch_data",
-      method: "get",
-      path: "/data"
-    });
-
-// calls GET https://my-api/data?includeAwesome=true
-const res = await fetchData.submit({
-  query: {includeAwesome: true}
-});
-
-console.log(res.data); // { data: { awesome: true } }
-```
+# [api-def](https://github.com/Censkh/api-def/) &middot; [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/Censkh/api-def/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/api-def.svg?style=flat)](https://www.npmjs.com/package/api-def) [![build status](https://img.shields.io/github/workflow/status/censkh/api-def/Node.js%20CI)](https://github.com/Censkh/api-def/actions)
+
+Typed APIs with middleware support
+
+API def provides a unified way to type your endpoints allowing for compile time checking of query, body, response and even url parameters
+
+``` npm i api-def ```
+
+- [Documentation](https://censkh.github.io/api-def/)
+
+```typescript
+import {Api} from "api-def";
+
+const api = new Api({
+  baseUrl: "https://my-api/",
+  name: "My API",
+});
+
+const fetchData = api.endpoint()
+    .queryOf<{ includeAwesome: boolean; }>()
+    .responseOf<{ data: {awesome: boolean; } }>()
+    .build({
+      id: "fetch_data",
+      method: "get",
+      path: "/data"
+    });
+
+// calls GET https://my-api/data?includeAwesome=true
+const res = await fetchData.submit({
+  query: {includeAwesome: true}
+});
+
+console.log(res.data); // { data: { awesome: true } }
+```

package/cjs/RequestContext.d.ts

@@ -8,7 +8,9 @@ import { Validation } from "./Validation";
 export default class RequestContext<R = any, P extends Params | undefined = Params | undefined, Q extends Query | undefined = Query | undefined, B extends Body | undefined = Body | undefined> {
     readonly id: number;
     readonly key: string;
-    readonly computedPath: string;
+    private computedPath;
+    private computedBaseUrl;
+    private computedMethod;
     readonly stats: RequestContextStats;
     private readonly host;
     readonly eventHandlers: RequestEventHandlers<R>;
@@ -19,6 +21,7 @@ export default class RequestContext<R = any, P extends Params | undefined = Para
     readonly cacheInfo: RequestCacheInfo;
     cancelled: boolean;
     readonly computedConfig: ComputedRequestConfig<P, Q, B>;
+    private computedRequestUrl;
     readonly mocking: EndpointMockingConfig<R, P, Q, B> | null | undefined;
     private parsedBody;
     readonly validation: Validation<R, P, Q, B>;
@@ -36,5 +39,10 @@ export default class RequestContext<R = any, P extends Params | undefined = Para
     triggerEvent(eventType: RequestEvent): Promise<EventResult<R> | undefined>;
     addCanceller(canceler: () => void): void;
     cancel(): void;
-    getRequestUrl(): URL;
+    get requestUrl(): URL;
+    get path(): string;
+    updatePath(path: string): void;
+    updateBaseUrl(baseUrl: string): void;
+    updateMethod(method: RequestMethod): void;
+    private generateRequestUrl;
 }

package/cjs/RequestContext.js

@@ -51,6 +51,8 @@ var RequestContext = /** @class */ (function () {
         this.computedConfig = config;
         Utils.assign({}, this.computedConfig.headers);
         this.computedPath = computedPath;
+        this.computedBaseUrl = host.baseUrl;
+        this.computedMethod = host.method;
         this.key = this.generateKey();
         this.stats = {
             attempt: 0,
@@ -61,10 +63,11 @@ var RequestContext = /** @class */ (function () {
         this.validation = host.validation;
         this.initMiddleware();
         this.parseRequestBody();
+        this.computedRequestUrl = this.generateRequestUrl();
     }
     Object.defineProperty(RequestContext.prototype, "method", {
         get: function () {
-            return this.host.method;
+            return this.computedMethod;
         },
         enumerable: false,
         configurable: true
@@ -78,7 +81,7 @@ var RequestContext = /** @class */ (function () {
     });
     Object.defineProperty(RequestContext.prototype, "baseUrl", {
         get: function () {
-            return this.host.baseUrl;
+            return this.computedBaseUrl;
         },
         enumerable: false,
         configurable: true
@@ -183,7 +186,32 @@ var RequestContext = /** @class */ (function () {
             this.canceler();
         }
     };
-    RequestContext.prototype.getRequestUrl = function () {
+    Object.defineProperty(RequestContext.prototype, "requestUrl", {
+        get: function () {
+            return this.computedRequestUrl;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(RequestContext.prototype, "path", {
+        get: function () {
+            return this.computedPath;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    RequestContext.prototype.updatePath = function (path) {
+        this.computedPath = path;
+        this.computedRequestUrl = this.generateRequestUrl();
+    };
+    RequestContext.prototype.updateBaseUrl = function (baseUrl) {
+        this.computedBaseUrl = baseUrl;
+        this.computedRequestUrl = this.generateRequestUrl();
+    };
+    RequestContext.prototype.updateMethod = function (method) {
+        this.computedMethod = method;
+    };
+    RequestContext.prototype.generateRequestUrl = function () {
         var path = !this.baseUrl.endsWith("/")
             ? this.baseUrl + "/"
             : this.baseUrl;

package/cjs/RequestError.d.ts

@@ -4,6 +4,7 @@ import RequestContext from "./RequestContext";
 export declare const RequestErrorCode: {
     readonly MISC_UNKNOWN_ERROR: "misc/unknown-error";
     readonly REQUEST_NETWORK_ERROR: "request/network-error";
+    readonly REQUEST_HOST_NAME_NOT_FOUND: "request/host-name-not-found";
     readonly REQUEST_INVALID_STATUS: "request/invalid-status";
     readonly REQUEST_INVALID_CONFIG: "request/invalid-config";
     readonly REQUEST_MISMATCH_RESPONSE_TYPE: "request/mismatch-response-type";

package/cjs/RequestError.js

@@ -4,6 +4,7 @@ exports.convertToRequestError = exports.isRequestError = exports.RequestErrorCod
 exports.RequestErrorCode = {
     MISC_UNKNOWN_ERROR: "misc/unknown-error",
     REQUEST_NETWORK_ERROR: "request/network-error",
+    REQUEST_HOST_NAME_NOT_FOUND: "request/host-name-not-found",
     REQUEST_INVALID_STATUS: "request/invalid-status",
     REQUEST_INVALID_CONFIG: "request/invalid-config",
     REQUEST_MISMATCH_RESPONSE_TYPE: "request/mismatch-response-type",
@@ -26,12 +27,18 @@ var convertToRequestError = function (config) {
         isRequestError: true,
         attempts: context.stats.attempt,
         request: {
-            url: context.getRequestUrl().href,
+            url: context.requestUrl.href,
             query: context.computedConfig.queryObject,
             headers: context.computedConfig.headers,
             body: body,
         },
     });
+    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, "]: ").concat(resultError.message) });
+    }
+    catch (e) {
+        // ignore
+    }
     delete resultError.config;
     delete resultError.toJSON;
     Object.setPrototypeOf(error, Error);

package/cjs/Requester.js

@@ -299,21 +299,22 @@ var parseResponse = function (context, response, error) { return __awaiter(void
 }); };
 var parseError = function (context, rawError) { return __awaiter(void 0, void 0, void 0, function () {
     var error, extractedResponse, errorResponse, code, errorInfo;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 if (!(0, RequestError_1.isRequestError)(rawError)) return [3 /*break*/, 1];
                 error = rawError;
                 return [3 /*break*/, 5];
             case 1: return [4 /*yield*/, context.backend.extractResponseFromError(rawError)];
             case 2:
-                extractedResponse = _a.sent();
+                extractedResponse = _b.sent();
                 errorResponse = undefined;
                 if (!(extractedResponse !== undefined)) return [3 /*break*/, 4];
                 return [4 /*yield*/, parseResponse(context, extractedResponse, true)];
             case 3:
-                errorResponse = _a.sent();
-                _a.label = 4;
+                errorResponse = _b.sent();
+                _b.label = 4;
             case 4:
                 code = (0, ApiUtils_1.isNetworkError)(rawError) ? RequestError_1.RequestErrorCode.REQUEST_NETWORK_ERROR : RequestError_1.RequestErrorCode.MISC_UNKNOWN_ERROR;
                 if (errorResponse) {
@@ -321,9 +322,14 @@ var parseError = function (context, rawError) { return __awaiter(void 0, void 0,
                         code = RequestError_1.RequestErrorCode.REQUEST_INVALID_STATUS;
                     }
                 }
+                else {
+                    if (rawError.code === "ENOTFOUND" || ((_a = rawError.cause) === null || _a === void 0 ? void 0 : _a.code) === "ENOTFOUND") {
+                        code = RequestError_1.RequestErrorCode.REQUEST_HOST_NAME_NOT_FOUND;
+                    }
+                }
                 errorInfo = context.backend.getErrorInfo(rawError, errorResponse);
                 error = (0, RequestError_1.convertToRequestError)(__assign({ error: rawError, response: errorResponse, code: code, context: context }, errorInfo));
-                _a.label = 5;
+                _b.label = 5;
             case 5: return [2 /*return*/, error];
         }
     });

package/cjs/backend/AxiosRequestBackend.js

@@ -74,7 +74,7 @@ var AxiosRequestBackend = /** @class */ (function () {
     };
     AxiosRequestBackend.prototype.makeRequest = function (context) {
         var computedConfig = context.computedConfig;
-        var url = context.getRequestUrl();
+        var url = context.requestUrl;
         var canceler = null;
         var promise = axios({
             method: context.method,

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];
                 }
             });
         });
@@ -161,7 +166,7 @@ var FetchRequestBackend = /** @class */ (function () {
             }
             return parsedHeaders;
         }, {});
-        var url = context.getRequestUrl();
+        var url = context.requestUrl;
         var promise = this.fetch(url.href, {
             method: context.method.toUpperCase(),
             body: bodyJsonify ? JSON.stringify(body) : body,

package/cjs/backend/MockRequestBackend.js

@@ -82,7 +82,7 @@ var MockRequestBackend = /** @class */ (function () {
                             params: (_b = context.computedConfig.params) !== null && _b !== void 0 ? _b : {},
                             query: context.computedConfig.queryObject,
                             headers: (_c = context.computedConfig.headers) !== null && _c !== void 0 ? _c : {},
-                            url: context.getRequestUrl().toString(),
+                            url: context.requestUrl.toString(),
                         };
                         res = {
                             statusCode: -1,
@@ -140,7 +140,7 @@ var MockRequestBackend = /** @class */ (function () {
                             return parsedHeaders;
                         }, {});
                         return [2 /*return*/, {
-                                url: context.getRequestUrl().href,
+                                url: context.requestUrl.href,
                                 method: context.method,
                                 headers: parsedHeaders,
                                 data: res.response,

package/cjs/middleware/LoggingMiddleware.js

@@ -41,11 +41,10 @@ var log = function (context, type, message, config, objects) {
     if (typeof config.predicate === "function" && !config.predicate()) {
         return;
     }
-    var computedPath = context.computedPath;
     var color = COLOR_MAP[type];
     var timestamp = formatTime(new Date());
     var args = [
-        "%cnetwork %c[".concat(context.api.name, "] ").concat(context.method.toUpperCase(), " ").concat(computedPath, " %c").concat(message, " %c@ ").concat(timestamp),
+        "%cnetwork %c[".concat(context.api.name, "] ").concat(context.method.toUpperCase(), " ").concat(context.path, " %c").concat(message, " %c@ ").concat(timestamp),
         "color:gray",
         "color:auto",
         "color:".concat(color),

package/esm/RequestContext.d.ts

@@ -8,7 +8,9 @@ import { Validation } from "./Validation";
 export default class RequestContext<R = any, P extends Params | undefined = Params | undefined, Q extends Query | undefined = Query | undefined, B extends Body | undefined = Body | undefined> {
     readonly id: number;
     readonly key: string;
-    readonly computedPath: string;
+    private computedPath;
+    private computedBaseUrl;
+    private computedMethod;
     readonly stats: RequestContextStats;
     private readonly host;
     readonly eventHandlers: RequestEventHandlers<R>;
@@ -19,6 +21,7 @@ export default class RequestContext<R = any, P extends Params | undefined = Para
     readonly cacheInfo: RequestCacheInfo;
     cancelled: boolean;
     readonly computedConfig: ComputedRequestConfig<P, Q, B>;
+    private computedRequestUrl;
     readonly mocking: EndpointMockingConfig<R, P, Q, B> | null | undefined;
     private parsedBody;
     readonly validation: Validation<R, P, Q, B>;
@@ -36,5 +39,10 @@ export default class RequestContext<R = any, P extends Params | undefined = Para
     triggerEvent(eventType: RequestEvent): Promise<EventResult<R> | undefined>;
     addCanceller(canceler: () => void): void;
     cancel(): void;
-    getRequestUrl(): URL;
+    get requestUrl(): URL;
+    get path(): string;
+    updatePath(path: string): void;
+    updateBaseUrl(baseUrl: string): void;
+    updateMethod(method: RequestMethod): void;
+    private generateRequestUrl;
 }

package/esm/RequestContext.js

@@ -22,6 +22,8 @@ export default class RequestContext {
         this.computedConfig = config;
         Utils.assign({}, this.computedConfig.headers);
         this.computedPath = computedPath;
+        this.computedBaseUrl = host.baseUrl;
+        this.computedMethod = host.method;
         this.key = this.generateKey();
         this.stats = {
             attempt: 0,
@@ -32,15 +34,16 @@ export default class RequestContext {
         this.validation = host.validation;
         this.initMiddleware();
         this.parseRequestBody();
+        this.computedRequestUrl = this.generateRequestUrl();
     }
     get method() {
-        return this.host.method;
+        return this.computedMethod;
     }
     get api() {
         return this.host.api;
     }
     get baseUrl() {
-        return this.host.baseUrl;
+        return this.computedBaseUrl;
     }
     get responseType() {
         return this.host.responseType;
@@ -125,7 +128,24 @@ export default class RequestContext {
             this.canceler();
         }
     }
-    getRequestUrl() {
+    get requestUrl() {
+        return this.computedRequestUrl;
+    }
+    get path() {
+        return this.computedPath;
+    }
+    updatePath(path) {
+        this.computedPath = path;
+        this.computedRequestUrl = this.generateRequestUrl();
+    }
+    updateBaseUrl(baseUrl) {
+        this.computedBaseUrl = baseUrl;
+        this.computedRequestUrl = this.generateRequestUrl();
+    }
+    updateMethod(method) {
+        this.computedMethod = method;
+    }
+    generateRequestUrl() {
         let path = !this.baseUrl.endsWith("/")
             ? this.baseUrl + "/"
             : this.baseUrl;

package/esm/RequestError.d.ts

@@ -4,6 +4,7 @@ import RequestContext from "./RequestContext";
 export declare const RequestErrorCode: {
     readonly MISC_UNKNOWN_ERROR: "misc/unknown-error";
     readonly REQUEST_NETWORK_ERROR: "request/network-error";
+    readonly REQUEST_HOST_NAME_NOT_FOUND: "request/host-name-not-found";
     readonly REQUEST_INVALID_STATUS: "request/invalid-status";
     readonly REQUEST_INVALID_CONFIG: "request/invalid-config";
     readonly REQUEST_MISMATCH_RESPONSE_TYPE: "request/mismatch-response-type";

package/esm/RequestError.js

@@ -1,6 +1,7 @@
 export const RequestErrorCode = {
     MISC_UNKNOWN_ERROR: "misc/unknown-error",
     REQUEST_NETWORK_ERROR: "request/network-error",
+    REQUEST_HOST_NAME_NOT_FOUND: "request/host-name-not-found",
     REQUEST_INVALID_STATUS: "request/invalid-status",
     REQUEST_INVALID_CONFIG: "request/invalid-config",
     REQUEST_MISMATCH_RESPONSE_TYPE: "request/mismatch-response-type",
@@ -22,12 +23,18 @@ export const convertToRequestError = (config) => {
         isRequestError: true,
         attempts: context.stats.attempt,
         request: {
-            url: context.getRequestUrl().href,
+            url: context.requestUrl.href,
             query: context.computedConfig.queryObject,
             headers: context.computedConfig.headers,
             body: body,
         },
     });
+    try {
+        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
+    }
     delete resultError.config;
     delete resultError.toJSON;
     Object.setPrototypeOf(error, Error);

package/esm/Requester.js

@@ -224,6 +224,7 @@ const parseResponse = (context, response, error) => __awaiter(void 0, void 0, vo
     return response;
 });
 const parseError = (context, rawError) => __awaiter(void 0, void 0, void 0, function* () {
+    var _e;
     let error;
     if (isRequestError(rawError)) {
         error = rawError;
@@ -240,6 +241,11 @@ const parseError = (context, rawError) => __awaiter(void 0, void 0, void 0, func
                 code = RequestErrorCode.REQUEST_INVALID_STATUS;
             }
         }
+        else {
+            if (rawError.code === "ENOTFOUND" || ((_e = rawError.cause) === null || _e === void 0 ? void 0 : _e.code) === "ENOTFOUND") {
+                code = RequestErrorCode.REQUEST_HOST_NAME_NOT_FOUND;
+            }
+        }
         const errorInfo = context.backend.getErrorInfo(rawError, errorResponse);
         error = convertToRequestError(Object.assign({ error: rawError, response: errorResponse, code: code, context: context }, errorInfo));
     }

package/esm/backend/AxiosRequestBackend.js

@@ -39,7 +39,7 @@ export default class AxiosRequestBackend {
     }
     makeRequest(context) {
         const { computedConfig } = context;
-        const url = context.getRequestUrl();
+        const url = context.requestUrl;
         let canceler = null;
         const promise = axios({
             method: context.method,

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) {
@@ -92,7 +102,7 @@ export default class FetchRequestBackend {
             }
             return parsedHeaders;
         }, {});
-        const url = context.getRequestUrl();
+        const url = context.requestUrl;
         const promise = this.fetch(url.href, {
             method: context.method.toUpperCase(),
             body: bodyJsonify ? JSON.stringify(body) : body,

package/esm/backend/MockRequestBackend.js

@@ -44,7 +44,7 @@ export default class MockRequestBackend {
                 params: (_b = context.computedConfig.params) !== null && _b !== void 0 ? _b : {},
                 query: context.computedConfig.queryObject,
                 headers: (_c = context.computedConfig.headers) !== null && _c !== void 0 ? _c : {},
-                url: context.getRequestUrl().toString(),
+                url: context.requestUrl.toString(),
             };
             const res = {
                 statusCode: -1,
@@ -96,7 +96,7 @@ export default class MockRequestBackend {
                 return parsedHeaders;
             }, {});
             return {
-                url: context.getRequestUrl().href,
+                url: context.requestUrl.href,
                 method: context.method,
                 headers: parsedHeaders,
                 data: res.response,

package/esm/middleware/LoggingMiddleware.js

@@ -38,11 +38,10 @@ const log = (context, type, message, config, objects) => {
     if (typeof config.predicate === "function" && !config.predicate()) {
         return;
     }
-    const { computedPath } = context;
     const color = COLOR_MAP[type];
     const timestamp = formatTime(new Date());
     const args = [
-        `%cnetwork %c[${context.api.name}] ${context.method.toUpperCase()} ${computedPath} %c${message} %c@ ${timestamp}`,
+        `%cnetwork %c[${context.api.name}] ${context.method.toUpperCase()} ${context.path} %c${message} %c@ ${timestamp}`,
         "color:gray",
         "color:auto",
         `color:${color}`,

package/package.json

@@ -1,79 +1,79 @@
-{
-  "name": "api-def",
-  "version": "0.8.5",
-  "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": "ava",
-    "test:lint": "npm run lint:strict",
-    "test:types": "tsc --noEmit -p .",
-    "example:start": "cd example && npm run start",
-    "lint": "esw --ext .tsx,.ts src",
-    "lint:watch": "npm run lint -- --watch",
-    "lint:fix": "npm run lint -- --fix",
-    "lint:strict": "npm run lint -- --max-warnings 0",
-    "cleanup": "rimraf esm && rimraf cjs",
-    "build": "npm run cleanup && npm run build:esm && npm run build:cjs",
-    "build:esm": "tsc --module es2015 --target es2016 --outDir esm --preserveWatchOutput",
-    "build:cjs": "tsc --module commonjs --target es5 --outDir cjs --preserveWatchOutput",
-    "build:watch": "npm-run-all -p \"build:esm -- -w\" \"build:cjs -- -w\" \"lint:watch\"",
-    "website:dev": "cd website && npm run start",
-    "website:deploy": "cd website && npm run deploy"
-  },
-  "keywords": [
-    "typescript",
-    "javascript",
-    "node",
-    "web",
-    "api",
-    "typed",
-    "cache",
-    "fetch",
-    "retry",
-    "middleware"
-  ],
-  "author": "James Waterhouse <09jwater@gmail.com>",
-  "license": "MIT",
-  "files": [
-    "LICENSE",
-    "README.md",
-    "esm/",
-    "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/node": "16.4.6",
-    "@types/qs": "6.9.8",
-    "@typescript-eslint/eslint-plugin": "4.28.5",
-    "@typescript-eslint/parser": "4.28.5",
-    "ava": "5.0.1",
-    "axios": "1.1.3",
-    "cross-env": "7.0.3",
-    "eslint": "7.31.0",
-    "eslint-watch": "7.0.0",
-    "npm-run-all": "4.1.5",
-    "qs": "6.11.2",
-    "typescript": "4.8.4",
-    "zod": "3.22.4"
-  }
-}
+{
+  "name": "api-def",
+  "version": "0.9.1",
+  "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": "ava",
+    "test:lint": "npm run lint:strict",
+    "test:types": "tsc --noEmit -p .",
+    "example:start": "cd example && npm run start",
+    "lint": "esw --ext .tsx,.ts src",
+    "lint:watch": "npm run lint -- --watch",
+    "lint:fix": "npm run lint -- --fix",
+    "lint:strict": "npm run lint -- --max-warnings 0",
+    "cleanup": "rimraf esm && rimraf cjs",
+    "build": "npm run cleanup && npm run build:esm && npm run build:cjs",
+    "build:esm": "tsc --module es2015 --target es2016 --outDir esm --preserveWatchOutput",
+    "build:cjs": "tsc --module commonjs --target es5 --outDir cjs --preserveWatchOutput",
+    "build:watch": "npm-run-all -p \"build:esm -- -w\" \"build:cjs -- -w\" \"lint:watch\"",
+    "website:dev": "cd website && npm run start",
+    "website:deploy": "cd website && npm run deploy"
+  },
+  "keywords": [
+    "typescript",
+    "javascript",
+    "node",
+    "web",
+    "api",
+    "typed",
+    "cache",
+    "fetch",
+    "retry",
+    "middleware"
+  ],
+  "author": "James Waterhouse <09jwater@gmail.com>",
+  "license": "MIT",
+  "files": [
+    "LICENSE",
+    "README.md",
+    "esm/",
+    "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/node": "16.4.6",
+    "@types/qs": "6.9.8",
+    "@typescript-eslint/eslint-plugin": "4.28.5",
+    "@typescript-eslint/parser": "4.28.5",
+    "ava": "5.0.1",
+    "axios": "1.1.3",
+    "cross-env": "7.0.3",
+    "eslint": "7.31.0",
+    "eslint-watch": "7.0.0",
+    "npm-run-all": "4.1.5",
+    "qs": "6.11.2",
+    "typescript": "4.8.4",
+    "zod": "3.22.4"
+  }
+}