api-def 0.12.0-alpha.47 → 0.12.0-alpha.48

package/cjs/Api.d.ts

@@ -1,4 +1,5 @@
 import type { ApiResponse, BaseRequestConfig, RequestConfig, RequestMiddleware } from "./ApiTypes";
+import { type ResolveUrlOptions } from "./ApiUtils";
 import type Endpoint from "./Endpoint";
 import EndpointBuilder from "./EndpointBuilder";
 import type { ApiMockingConfig } from "./MockingTypes";
@@ -16,6 +17,9 @@ export interface ApiOptions {
     readonly mocking?: ApiMockingConfig;
     readonly requestBackend?: RequestBackend;
 }
+export interface ApiResolveUrlOptions extends Omit<ResolveUrlOptions, "baseUrl"> {
+    baseUrl?: string;
+}
 export type ApiInfo = Omit<ApiOptions, "config"> & Required<Pick<ApiOptions, "middleware" | "requestBackend">>;
 export declare class Api implements ApiInfo {
     private readonly info;
@@ -49,5 +53,5 @@ export declare class Api implements ApiInfo {
     put: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
     delete: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
     patch: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
-    resolveUrl(path: string, baseUrl?: string): URL;
+    resolveUrl(options: ApiResolveUrlOptions): URL;
 }

package/cjs/Api.js

@@ -200,8 +200,12 @@ var Api = /** @class */ (function () {
     Api.prototype.computeRequestConfig = function () {
         return ((typeof this.defaultRequestConfig === "function" ? this.defaultRequestConfig() : this.defaultRequestConfig) || {});
     };
-    Api.prototype.resolveUrl = function (path, baseUrl) {
-        return (0, ApiUtils_1.resolveUrl)(baseUrl !== null && baseUrl !== void 0 ? baseUrl : this.baseUrl, path);
+    Api.prototype.resolveUrl = function (options) {
+        var _a;
+        return (0, ApiUtils_1.resolveUrl)({
+            baseUrl: (_a = options.baseUrl) !== null && _a !== void 0 ? _a : this.baseUrl,
+            path: options.path,
+        });
     };
     return Api;
 }());

package/cjs/ApiTypes.d.ts

@@ -95,7 +95,7 @@ export interface RequestStats {
     };
     attempt: number;
     startTimestamp: number;
-    durationMs?: number;
+    endTimestamp: number | undefined;
 }
 export interface RequestHost {
     readonly method: RequestMethod;

package/cjs/ApiUtils.d.ts

@@ -1,8 +1,12 @@
 import type { ResponseType } from "./ApiConstants";
 import type { AcceptableStatus, CancelledRequestError } from "./ApiTypes";
+export interface ResolveUrlOptions {
+    path: string;
+    baseUrl: string;
+}
 export declare const isCancelledError: (error: Error) => error is CancelledRequestError;
 export declare const isNetworkError: (error: Error) => boolean;
 export declare const isAcceptableStatus: (status: number, acceptableStatus?: AcceptableStatus[]) => boolean;
 export declare const inferResponseType: (contentType: string | null | undefined) => ResponseType;
 export declare const resolvePathParams: (path: string, params: Record<string, string> | undefined) => string;
-export declare const resolveUrl: (baseUrl: string, path: string) => URL;
+export declare const resolveUrl: (options: ResolveUrlOptions) => URL;

package/cjs/ApiUtils.js

@@ -71,7 +71,8 @@ var resolvePathParams = function (path, params) {
     return computedPath;
 };
 exports.resolvePathParams = resolvePathParams;
-var resolveUrl = function (baseUrl, path) {
+var resolveUrl = function (options) {
+    var baseUrl = options.baseUrl, path = options.path;
     var result = !baseUrl.endsWith("/") ? "".concat(baseUrl, "/") : baseUrl;
     result += path.startsWith("/") ? path.substring(1) : path;
     var origin = undefined;

package/cjs/Endpoint.js

@@ -156,7 +156,10 @@ var Endpoint = /** @class */ (function () {
     };
     Endpoint.prototype.resolveUrl = function (options) {
         var query = options.query;
-        var url = this.api.resolveUrl(this.resolvePath(options), options.baseUrl);
+        var url = this.api.resolveUrl({
+            path: this.resolvePath(options),
+            baseUrl: options.baseUrl,
+        });
         if (query) {
             url.search = new URLSearchParams(query).toString();
         }

package/cjs/RequestContext.js

@@ -68,6 +68,7 @@ var RequestContext = /** @class */ (function () {
             attempt: 0,
             cached: false,
             startTimestamp: Date.now(),
+            endTimestamp: undefined,
         };
         this.eventHandlers = {};
         this.mocking = mocking;
@@ -241,7 +242,7 @@ var RequestContext = /** @class */ (function () {
         this.parseRequestBody();
     };
     RequestContext.prototype.resolveRequestUrl = function () {
-        var url = (0, ApiUtils_1.resolveUrl)(this.baseUrl, this.computedPath);
+        var url = (0, ApiUtils_1.resolveUrl)({ baseUrl: this.baseUrl, path: this.computedPath });
         if (this.requestConfig.queryString) {
             url.search = this.requestConfig.queryString;
         }

package/cjs/RequestError.js

@@ -28,6 +28,14 @@ var convertToRequestError = function (config) {
     var _a;
     var error = config.error, context = config.context, response = config.response, code = config.code;
     var body = context.getParsedBody();
+    if (error.constructor.name === "TypeError") {
+        error.constructor = TypeError;
+        Object.setPrototypeOf(error, TypeError.prototype);
+    }
+    else if (error.constructor.name === "Error") {
+        error.constructor = Error;
+        Object.setPrototypeOf(error, Error.prototype);
+    }
     var resultError = Object.assign(error, (_a = {
             name: "RequestError",
             response: response,
@@ -52,7 +60,6 @@ var convertToRequestError = function (config) {
     }
     resultError.config = undefined;
     resultError.toJSON = undefined;
-    Object.setPrototypeOf(error, Error);
     return resultError;
 };
 exports.convertToRequestError = convertToRequestError;

package/cjs/Requester.js

@@ -121,8 +121,6 @@ var makeRequest = function (context) { return __awaiter(void 0, void 0, void 0,
             case 1:
                 beforeSendEventResult = _d.sent();
                 if (beforeSendEventResult && beforeSendEventResult.type === ApiConstants_1.EventResultType.RESPOND) {
-                    // Calculate duration for early responses
-                    context.stats.durationMs = Date.now() - context.stats.startTimestamp;
                     return [2 /*return*/, (context.response = beforeSendEventResult.response)];
                 }
                 // validation
@@ -185,13 +183,10 @@ var makeRequest = function (context) { return __awaiter(void 0, void 0, void 0,
                                     });
                                 }
                                 context.response = parsedResponse;
-                                // Calculate duration for successful responses
-                                context.stats.durationMs = Date.now() - context.stats.startTimestamp;
+                                context.stats.endTimestamp = Date.now();
                                 return [2 /*return*/, parsedResponse];
                             case 4:
                                 rawError_1 = _b.sent();
-                                // Calculate duration for failed requests
-                                context.stats.durationMs = Date.now() - context.stats.startTimestamp;
                                 if (context.cancelled) {
                                     rawError_1.isCancelledRequest = true;
                                 }
@@ -200,6 +195,7 @@ var makeRequest = function (context) { return __awaiter(void 0, void 0, void 0,
                                 error = _b.sent();
                                 context.error = error;
                                 context.response = error.response;
+                                context.stats.endTimestamp = Date.now();
                                 return [4 /*yield*/, context.triggerEvent(ApiConstants_1.RequestEvent.ERROR)];
                             case 6:
                                 errorEventResult = _b.sent();

package/esm/Api.d.ts

@@ -1,4 +1,5 @@
 import type { ApiResponse, BaseRequestConfig, RequestConfig, RequestMiddleware } from "./ApiTypes";
+import { type ResolveUrlOptions } from "./ApiUtils";
 import type Endpoint from "./Endpoint";
 import EndpointBuilder from "./EndpointBuilder";
 import type { ApiMockingConfig } from "./MockingTypes";
@@ -16,6 +17,9 @@ export interface ApiOptions {
     readonly mocking?: ApiMockingConfig;
     readonly requestBackend?: RequestBackend;
 }
+export interface ApiResolveUrlOptions extends Omit<ResolveUrlOptions, "baseUrl"> {
+    baseUrl?: string;
+}
 export type ApiInfo = Omit<ApiOptions, "config"> & Required<Pick<ApiOptions, "middleware" | "requestBackend">>;
 export declare class Api implements ApiInfo {
     private readonly info;
@@ -49,5 +53,5 @@ export declare class Api implements ApiInfo {
     put: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
     delete: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
     patch: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
-    resolveUrl(path: string, baseUrl?: string): URL;
+    resolveUrl(options: ApiResolveUrlOptions): URL;
 }

package/esm/Api.js

@@ -126,7 +126,11 @@ export class Api {
     computeRequestConfig() {
         return ((typeof this.defaultRequestConfig === "function" ? this.defaultRequestConfig() : this.defaultRequestConfig) || {});
     }
-    resolveUrl(path, baseUrl) {
-        return resolveUrl(baseUrl !== null && baseUrl !== void 0 ? baseUrl : this.baseUrl, path);
+    resolveUrl(options) {
+        var _a;
+        return resolveUrl({
+            baseUrl: (_a = options.baseUrl) !== null && _a !== void 0 ? _a : this.baseUrl,
+            path: options.path,
+        });
     }
 }

package/esm/ApiTypes.d.ts

@@ -95,7 +95,7 @@ export interface RequestStats {
     };
     attempt: number;
     startTimestamp: number;
-    durationMs?: number;
+    endTimestamp: number | undefined;
 }
 export interface RequestHost {
     readonly method: RequestMethod;

package/esm/ApiUtils.d.ts

@@ -1,8 +1,12 @@
 import type { ResponseType } from "./ApiConstants";
 import type { AcceptableStatus, CancelledRequestError } from "./ApiTypes";
+export interface ResolveUrlOptions {
+    path: string;
+    baseUrl: string;
+}
 export declare const isCancelledError: (error: Error) => error is CancelledRequestError;
 export declare const isNetworkError: (error: Error) => boolean;
 export declare const isAcceptableStatus: (status: number, acceptableStatus?: AcceptableStatus[]) => boolean;
 export declare const inferResponseType: (contentType: string | null | undefined) => ResponseType;
 export declare const resolvePathParams: (path: string, params: Record<string, string> | undefined) => string;
-export declare const resolveUrl: (baseUrl: string, path: string) => URL;
+export declare const resolveUrl: (options: ResolveUrlOptions) => URL;

package/esm/ApiUtils.js

@@ -62,7 +62,8 @@ export const resolvePathParams = (path, params) => {
     }
     return computedPath;
 };
-export const resolveUrl = (baseUrl, path) => {
+export const resolveUrl = (options) => {
+    const { baseUrl, path } = options;
     let result = !baseUrl.endsWith("/") ? `${baseUrl}/` : baseUrl;
     result += path.startsWith("/") ? path.substring(1) : path;
     let origin = undefined;

package/esm/Endpoint.js

@@ -69,7 +69,10 @@ export default class Endpoint {
     }
     resolveUrl(options) {
         const { query } = options;
-        const url = this.api.resolveUrl(this.resolvePath(options), options.baseUrl);
+        const url = this.api.resolveUrl({
+            path: this.resolvePath(options),
+            baseUrl: options.baseUrl,
+        });
         if (query) {
             url.search = new URLSearchParams(query).toString();
         }

package/esm/RequestContext.js

@@ -30,6 +30,7 @@ export default class RequestContext {
             attempt: 0,
             cached: false,
             startTimestamp: Date.now(),
+            endTimestamp: undefined,
         };
         this.eventHandlers = {};
         this.mocking = mocking;
@@ -164,7 +165,7 @@ export default class RequestContext {
         this.parseRequestBody();
     }
     resolveRequestUrl() {
-        const url = resolveUrl(this.baseUrl, this.computedPath);
+        const url = resolveUrl({ baseUrl: this.baseUrl, path: this.computedPath });
         if (this.requestConfig.queryString) {
             url.search = this.requestConfig.queryString;
         }

package/esm/RequestError.js

@@ -23,6 +23,14 @@ export const isRequestError = (error) => {
 export const convertToRequestError = (config) => {
     const { error, context, response, code } = config;
     const body = context.getParsedBody();
+    if (error.constructor.name === "TypeError") {
+        error.constructor = TypeError;
+        Object.setPrototypeOf(error, TypeError.prototype);
+    }
+    else if (error.constructor.name === "Error") {
+        error.constructor = Error;
+        Object.setPrototypeOf(error, Error.prototype);
+    }
     const resultError = Object.assign(error, {
         name: "RequestError",
         response: response,
@@ -46,6 +54,5 @@ export const convertToRequestError = (config) => {
     }
     resultError.config = undefined;
     resultError.toJSON = undefined;
-    Object.setPrototypeOf(error, Error);
     return resultError;
 };

package/esm/Requester.js

@@ -70,8 +70,6 @@ const makeRequest = (context) => __awaiter(void 0, void 0, void 0, function* ()
     var _a, _b, _c;
     const beforeSendEventResult = yield context.triggerEvent(RequestEvent.BEFORE_SEND);
     if (beforeSendEventResult && beforeSendEventResult.type === EventResultType.RESPOND) {
-        // Calculate duration for early responses
-        context.stats.durationMs = Date.now() - context.stats.startTimestamp;
         return (context.response = beforeSendEventResult.response);
     }
     // validation
@@ -124,19 +122,17 @@ const makeRequest = (context) => __awaiter(void 0, void 0, void 0, function* ()
                 });
             }
             context.response = parsedResponse;
-            // Calculate duration for successful responses
-            context.stats.durationMs = Date.now() - context.stats.startTimestamp;
+            context.stats.endTimestamp = Date.now();
             return parsedResponse;
         }
         catch (rawError) {
-            // Calculate duration for failed requests
-            context.stats.durationMs = Date.now() - context.stats.startTimestamp;
             if (context.cancelled) {
                 rawError.isCancelledRequest = true;
             }
             const error = yield parseError(context, rawError);
             context.error = error;
             context.response = error.response;
+            context.stats.endTimestamp = Date.now();
             const errorEventResult = yield context.triggerEvent(RequestEvent.ERROR);
             if ((errorEventResult === null || errorEventResult === void 0 ? void 0 : errorEventResult.type) === EventResultType.RESPOND) {
                 return errorEventResult.response;

package/package.json

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