api-def 0.12.0 → 0.12.1

package/cjs/Api.d.ts

@@ -48,10 +48,10 @@ export declare class Api implements ApiInfo {
     getConfig(): BaseRequestConfig;
     computeRequestConfig(): BaseRequestConfig;
     private hotRequest;
-    get: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
-    post: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
-    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>>;
+    get: <R = unknown>(path: string | URL, config: RequestConfig) => Promise<ApiResponse<R>>;
+    post: <R = unknown>(path: string | URL, config: RequestConfig) => Promise<ApiResponse<R>>;
+    put: <R = unknown>(path: string | URL, config: RequestConfig) => Promise<ApiResponse<R>>;
+    delete: <R = unknown>(path: string | URL, config: RequestConfig) => Promise<ApiResponse<R>>;
+    patch: <R = unknown>(path: string | URL, config: RequestConfig) => Promise<ApiResponse<R>>;
     resolveUrl(options: ApiResolveUrlOptions): URL;
 }

package/cjs/Api.js

@@ -102,12 +102,14 @@ var Api = /** @class */ (function () {
           this.mutable = false;
         }*/
         this.hotRequest = function (requestMethod) {
-            return function (path, config) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, Requester.submit(new HotRequestHost(this, path, requestMethod), config, null)];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            }); }); };
+            return function (path, config) { return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, Requester.submit(new HotRequestHost(this, path instanceof URL ? path.href : path, requestMethod), config, null)];
+                        case 1: return [2 /*return*/, _a.sent()];
+                    }
+                });
+            }); };
         };
         this.get = this.hotRequest(ApiConstants_1.RequestMethod.GET);
         this.post = this.hotRequest(ApiConstants_1.RequestMethod.POST);

package/cjs/ApiUtils.d.ts

@@ -1,11 +1,12 @@
 import type { ResponseType } from "./ApiConstants";
 import type { AcceptableStatus, CancelledRequestError } from "./ApiTypes";
 export interface ResolveUrlOptions {
-    path: string;
+    path: string | URL;
     baseUrl: string;
 }
 export declare const isCancelledError: (error: Error) => error is CancelledRequestError;
 export declare const isNetworkError: (error: Error) => boolean;
+export declare const isAbsoluteUrl: (url: string) => 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, allowMissing?: boolean) => string;

package/cjs/ApiUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveUrl = exports.resolvePathParams = exports.inferResponseType = exports.isAcceptableStatus = exports.isNetworkError = exports.isCancelledError = void 0;
+exports.resolveUrl = exports.resolvePathParams = exports.inferResponseType = exports.isAcceptableStatus = exports.isAbsoluteUrl = exports.isNetworkError = exports.isCancelledError = void 0;
 var isCancelledError = function (error) {
     return "isCancelledRequest" in error;
 };
@@ -12,6 +12,10 @@ var isNetworkError = function (error) {
         ((_a = error.constructor) === null || _a === void 0 ? void 0 : _a.name) === "NetworkError");
 };
 exports.isNetworkError = isNetworkError;
+var isAbsoluteUrl = function (url) {
+    return /^[a-zA-Z][a-zA-Z\d+\-.]*:\/\//.test(url);
+};
+exports.isAbsoluteUrl = isAbsoluteUrl;
 var DEFAULT_ACCEPTABLE_STATUS = [[200, 299], 304];
 var isAcceptableStatus = function (status, acceptableStatus) {
     var acceptable = acceptableStatus !== null && acceptableStatus !== void 0 ? acceptableStatus : DEFAULT_ACCEPTABLE_STATUS;
@@ -56,7 +60,7 @@ var inferResponseType = function (contentType) {
 };
 exports.inferResponseType = inferResponseType;
 var resolvePathParams = function (path, params, allowMissing) {
-    var computedPath = path.startsWith("/") ? path : "/".concat(path);
+    var computedPath = path.startsWith("/") || (0, exports.isAbsoluteUrl)(path) ? path : "/".concat(path);
     if (params) {
         var computedPathParts = computedPath.split("/");
         var unusedKeys = new Set(Object.keys(params));
@@ -91,6 +95,12 @@ var resolvePathParams = function (path, params, allowMissing) {
 exports.resolvePathParams = resolvePathParams;
 var resolveUrl = function (options) {
     var baseUrl = options.baseUrl, path = options.path;
+    if (path instanceof URL) {
+        return new URL(path.href);
+    }
+    if ((0, exports.isAbsoluteUrl)(path)) {
+        return new URL(path);
+    }
     var result = !baseUrl.endsWith("/") ? "".concat(baseUrl, "/") : baseUrl;
     result += path.startsWith("/") ? path.substring(1) : path;
     var origin = undefined;
@@ -98,7 +108,7 @@ var resolveUrl = function (options) {
         origin = window.origin;
     }
     if (!origin) {
-        if (result.indexOf("://") === -1) {
+        if (!(0, exports.isAbsoluteUrl)(result)) {
             result = "https://".concat(result);
         }
     }

package/esm/Api.d.ts

@@ -48,10 +48,10 @@ export declare class Api implements ApiInfo {
     getConfig(): BaseRequestConfig;
     computeRequestConfig(): BaseRequestConfig;
     private hotRequest;
-    get: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
-    post: <R = unknown>(path: string, config: RequestConfig) => Promise<ApiResponse<R>>;
-    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>>;
+    get: <R = unknown>(path: string | URL, config: RequestConfig) => Promise<ApiResponse<R>>;
+    post: <R = unknown>(path: string | URL, config: RequestConfig) => Promise<ApiResponse<R>>;
+    put: <R = unknown>(path: string | URL, config: RequestConfig) => Promise<ApiResponse<R>>;
+    delete: <R = unknown>(path: string | URL, config: RequestConfig) => Promise<ApiResponse<R>>;
+    patch: <R = unknown>(path: string | URL, config: RequestConfig) => Promise<ApiResponse<R>>;
     resolveUrl(options: ApiResolveUrlOptions): URL;
 }

package/esm/Api.js

@@ -62,7 +62,9 @@ export class Api {
           Object.assign(this.info, info);
           this.mutable = false;
         }*/
-        this.hotRequest = (requestMethod) => (path, config) => __awaiter(this, void 0, void 0, function* () { return yield Requester.submit(new HotRequestHost(this, path, requestMethod), config, null); });
+        this.hotRequest = (requestMethod) => (path, config) => __awaiter(this, void 0, void 0, function* () {
+            return yield Requester.submit(new HotRequestHost(this, path instanceof URL ? path.href : path, requestMethod), config, null);
+        });
         this.get = this.hotRequest(RequestMethod.GET);
         this.post = this.hotRequest(RequestMethod.POST);
         this.put = this.hotRequest(RequestMethod.PUT);

package/esm/ApiUtils.d.ts

@@ -1,11 +1,12 @@
 import type { ResponseType } from "./ApiConstants";
 import type { AcceptableStatus, CancelledRequestError } from "./ApiTypes";
 export interface ResolveUrlOptions {
-    path: string;
+    path: string | URL;
     baseUrl: string;
 }
 export declare const isCancelledError: (error: Error) => error is CancelledRequestError;
 export declare const isNetworkError: (error: Error) => boolean;
+export declare const isAbsoluteUrl: (url: string) => 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, allowMissing?: boolean) => string;

package/esm/ApiUtils.js

@@ -7,6 +7,9 @@ export const isNetworkError = (error) => {
         error.message === "Network Error" ||
         ((_a = error.constructor) === null || _a === void 0 ? void 0 : _a.name) === "NetworkError");
 };
+export const isAbsoluteUrl = (url) => {
+    return /^[a-zA-Z][a-zA-Z\d+\-.]*:\/\//.test(url);
+};
 const DEFAULT_ACCEPTABLE_STATUS = [[200, 299], 304];
 export const isAcceptableStatus = (status, acceptableStatus) => {
     const acceptable = acceptableStatus !== null && acceptableStatus !== void 0 ? acceptableStatus : DEFAULT_ACCEPTABLE_STATUS;
@@ -48,7 +51,7 @@ export const inferResponseType = (contentType) => {
     return "text";
 };
 export const resolvePathParams = (path, params, allowMissing) => {
-    const computedPath = path.startsWith("/") ? path : `/${path}`;
+    const computedPath = path.startsWith("/") || isAbsoluteUrl(path) ? path : `/${path}`;
     if (params) {
         const computedPathParts = computedPath.split("/");
         const unusedKeys = new Set(Object.keys(params));
@@ -82,6 +85,12 @@ export const resolvePathParams = (path, params, allowMissing) => {
 };
 export const resolveUrl = (options) => {
     const { baseUrl, path } = options;
+    if (path instanceof URL) {
+        return new URL(path.href);
+    }
+    if (isAbsoluteUrl(path)) {
+        return new URL(path);
+    }
     let result = !baseUrl.endsWith("/") ? `${baseUrl}/` : baseUrl;
     result += path.startsWith("/") ? path.substring(1) : path;
     let origin = undefined;
@@ -89,7 +98,7 @@ export const resolveUrl = (options) => {
         origin = window.origin;
     }
     if (!origin) {
-        if (result.indexOf("://") === -1) {
+        if (!isAbsoluteUrl(result)) {
             result = `https://${result}`;
         }
     }

package/package.json

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