@snail-js/api 0.1.16 → 0.1.17

package/dist/core/snailMethod.d.ts

@@ -1,12 +1,12 @@
 import { AxiosResponse, AxiosRequestConfig } from "axios";
-import { EventHandler, Strategy, ResponseData, SendRequest, StandardResponseData, ResponseJsonData, SnailMethodEventType } from "../typings";
+import { EventHandler, Strategy, ResponseData, SendRequest, StandardResponseData, SnailMethodEventType } from "../typings";
 import { SnailApi } from "./snailApi";
 /**
  * SnailMethod
  * 泛型参数: RT => response.data类型,默认标准json返回
  *  DK => response.data.data 类型
  */
-export declare class SnailMethod<RT extends ResponseData = StandardResponseData<ResponseJsonData>> {
+export declare class SnailMethod<RT extends ResponseData = StandardResponseData> {
     private Name;
     private apiInstance;
     private target;

package/dist/core/snailServer.d.ts

@@ -1,6 +1,6 @@
 import "reflect-metadata";
 import { AxiosInstance } from "axios";
-import { Strategy, ApiInstanceOptions, VersioningOption, CacheStorage, ApiProxy, ResponseData, StandardResponseData, ResponseJsonData, CacheForType } from "../typings";
+import { Strategy, ApiInstanceOptions, VersioningOption, CacheStorage, ApiProxy, ResponseData, StandardResponseData, CacheForType } from "../typings";
 import { SnailApi } from "./snailApi";
 import { SnailSse } from "./snailSse";
 export declare const CacheStorageMap: Map<string, CacheStorage>;
@@ -10,7 +10,7 @@ export declare const ExpireSourceMap: Map<string, Set<string>>;
 export declare const AxiosInstanceMap: Map<string, AxiosInstance>;
 export declare const StrategyMap: Map<string, (new () => Strategy)[]>;
 export declare const VersioningMap: Map<string, VersioningOption>;
-export declare class SnailServer<RT extends ResponseData = StandardResponseData<ResponseJsonData>, DK extends string = "data"> {
+export declare class SnailServer<RT extends ResponseData = StandardResponseData, DK extends string = "data"> {
     private Name;
     private BaseURL;
     private Version;

package/dist/snail-api.js

@@ -1339,21 +1339,6 @@ const noop = () => {
 const toFiniteNumber = (value, defaultValue) => {
   return value != null && Number.isFinite(value = +value) ? value : defaultValue;
 };
-const ALPHA = "abcdefghijklmnopqrstuvwxyz";
-const DIGIT = "0123456789";
-const ALPHABET = {
-  DIGIT,
-  ALPHA,
-  ALPHA_DIGIT: ALPHA + ALPHA.toUpperCase() + DIGIT
-};
-const generateString = (size = 16, alphabet = ALPHABET.ALPHA_DIGIT) => {
-  let str = "";
-  const { length } = alphabet;
-  while (size--) {
-    str += alphabet[Math.random() * length | 0];
-  }
-  return str;
-};
 function isSpecCompliantForm(thing) {
   return !!(thing && isFunction(thing.append) && thing[Symbol.toStringTag] === "FormData" && thing[Symbol.iterator]);
 }
@@ -1452,8 +1437,6 @@ const utils$1 = {
   findKey,
   global: _global,
   isContextDefined,
-  ALPHABET,
-  generateString,
   isSpecCompliantForm,
   toJSONObject,
   isAsyncFn,
@@ -2409,8 +2392,9 @@ function isAbsoluteURL(url) {
 function combineURLs(baseURL, relativeURL) {
   return relativeURL ? baseURL.replace(/\/?\/$/, "") + "/" + relativeURL.replace(/^\/+/, "") : baseURL;
 }
-function buildFullPath(baseURL, requestedURL) {
-  if (baseURL && !isAbsoluteURL(requestedURL)) {
+function buildFullPath(baseURL, requestedURL, allowAbsoluteUrls) {
+  let isRelativeUrl = !isAbsoluteURL(requestedURL);
+  if (baseURL && isRelativeUrl || allowAbsoluteUrls == false) {
     return combineURLs(baseURL, requestedURL);
   }
   return requestedURL;
@@ -2497,7 +2481,7 @@ const resolveConfig = (config) => {
   const newConfig = mergeConfig({}, config);
   let { data, withXSRFToken, xsrfHeaderName, xsrfCookieName, headers, auth } = newConfig;
   newConfig.headers = headers = AxiosHeaders.from(headers);
-  newConfig.url = buildURL(buildFullPath(newConfig.baseURL, newConfig.url), config.params, config.paramsSerializer);
+  newConfig.url = buildURL(buildFullPath(newConfig.baseURL, newConfig.url, newConfig.allowAbsoluteUrls), config.params, config.paramsSerializer);
   if (auth) {
     headers.set(
       "Authorization",
@@ -3014,7 +2998,7 @@ function dispatchRequest(config) {
     return Promise.reject(reason);
   });
 }
-const VERSION = "1.7.9";
+const VERSION = "1.8.3";
 const validators$1 = {};
 ["object", "boolean", "number", "function", "string", "symbol"].forEach((type, i) => {
   validators$1[type] = function validator2(thing) {
@@ -3142,6 +3126,12 @@ class Axios {
         }, true);
       }
     }
+    if (config.allowAbsoluteUrls !== void 0) ;
+    else if (this.defaults.allowAbsoluteUrls !== void 0) {
+      config.allowAbsoluteUrls = this.defaults.allowAbsoluteUrls;
+    } else {
+      config.allowAbsoluteUrls = true;
+    }
     validator.assertOptions(config, {
       baseUrl: validators.spelling("baseURL"),
       withXsrfToken: validators.spelling("withXSRFToken")
@@ -3212,7 +3202,7 @@ class Axios {
   }
   getUri(config) {
     config = mergeConfig(this.defaults, config);
-    const fullPath = buildFullPath(config.baseURL, config.url);
+    const fullPath = buildFullPath(config.baseURL, config.url, config.allowAbsoluteUrls);
     return buildURL(fullPath, config.params, config.paramsSerializer);
   }
 }

package/dist/snail-api.umd.cjs

@@ -1343,21 +1343,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   const toFiniteNumber = (value, defaultValue) => {
     return value != null && Number.isFinite(value = +value) ? value : defaultValue;
   };
-  const ALPHA = "abcdefghijklmnopqrstuvwxyz";
-  const DIGIT = "0123456789";
-  const ALPHABET = {
-    DIGIT,
-    ALPHA,
-    ALPHA_DIGIT: ALPHA + ALPHA.toUpperCase() + DIGIT
-  };
-  const generateString = (size = 16, alphabet = ALPHABET.ALPHA_DIGIT) => {
-    let str = "";
-    const { length } = alphabet;
-    while (size--) {
-      str += alphabet[Math.random() * length | 0];
-    }
-    return str;
-  };
   function isSpecCompliantForm(thing) {
     return !!(thing && isFunction(thing.append) && thing[Symbol.toStringTag] === "FormData" && thing[Symbol.iterator]);
   }
@@ -1456,8 +1441,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     findKey,
     global: _global,
     isContextDefined,
-    ALPHABET,
-    generateString,
     isSpecCompliantForm,
     toJSONObject,
     isAsyncFn,
@@ -2413,8 +2396,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   function combineURLs(baseURL, relativeURL) {
     return relativeURL ? baseURL.replace(/\/?\/$/, "") + "/" + relativeURL.replace(/^\/+/, "") : baseURL;
   }
-  function buildFullPath(baseURL, requestedURL) {
-    if (baseURL && !isAbsoluteURL(requestedURL)) {
+  function buildFullPath(baseURL, requestedURL, allowAbsoluteUrls) {
+    let isRelativeUrl = !isAbsoluteURL(requestedURL);
+    if (baseURL && isRelativeUrl || allowAbsoluteUrls == false) {
       return combineURLs(baseURL, requestedURL);
     }
     return requestedURL;
@@ -2501,7 +2485,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     const newConfig = mergeConfig({}, config);
     let { data, withXSRFToken, xsrfHeaderName, xsrfCookieName, headers, auth } = newConfig;
     newConfig.headers = headers = AxiosHeaders.from(headers);
-    newConfig.url = buildURL(buildFullPath(newConfig.baseURL, newConfig.url), config.params, config.paramsSerializer);
+    newConfig.url = buildURL(buildFullPath(newConfig.baseURL, newConfig.url, newConfig.allowAbsoluteUrls), config.params, config.paramsSerializer);
     if (auth) {
       headers.set(
         "Authorization",
@@ -3018,7 +3002,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return Promise.reject(reason);
     });
   }
-  const VERSION = "1.7.9";
+  const VERSION = "1.8.3";
   const validators$1 = {};
   ["object", "boolean", "number", "function", "string", "symbol"].forEach((type, i) => {
     validators$1[type] = function validator2(thing) {
@@ -3146,6 +3130,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           }, true);
         }
       }
+      if (config.allowAbsoluteUrls !== void 0) ;
+      else if (this.defaults.allowAbsoluteUrls !== void 0) {
+        config.allowAbsoluteUrls = this.defaults.allowAbsoluteUrls;
+      } else {
+        config.allowAbsoluteUrls = true;
+      }
       validator.assertOptions(config, {
         baseUrl: validators.spelling("baseURL"),
         withXsrfToken: validators.spelling("withXSRFToken")
@@ -3216,7 +3206,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     getUri(config) {
       config = mergeConfig(this.defaults, config);
-      const fullPath = buildFullPath(config.baseURL, config.url);
+      const fullPath = buildFullPath(config.baseURL, config.url, config.allowAbsoluteUrls);
       return buildURL(fullPath, config.params, config.paramsSerializer);
     }
   }

package/dist/typings/apiProxy.d.ts

@@ -1,11 +1,11 @@
-import { ResponseData, ResponseJsonData, SpecialResponseData, StandardResponseData } from "./response.data";
+import { ResponseData, SpecialResponseData, StandardResponseData } from "./response.data";
 import { SnailMethod } from "../core/snailMethod";
 export type ApiResponse<T> = Promise<{
     data: T | null;
     error: Error | null;
     hitCache?: boolean;
 }>;
-export type ApiProxy<T extends object, RT extends ResponseData = StandardResponseData<ResponseJsonData>, DK extends string = "data"> = {
+export type ApiProxy<T extends object, RT extends ResponseData = StandardResponseData, DK extends string = "data"> = {
     [K in keyof T]: T[K] extends (...args: infer A) => any ? RT extends SpecialResponseData ? <RD>(...args: A) => SnailMethod<RD extends SpecialResponseData ? RD : never> : <RD>(...args: A) => RD extends SpecialResponseData ? SnailMethod<RD> : SnailMethod<RT & {
         [KK in DK]: RD;
     }> : T[K];

package/dist/typings/response.data.d.ts

@@ -6,7 +6,7 @@ export interface PaginationData<T> {
 }
 export type ResponseJsonData = Record<string, any> | object;
 export type SpecialResponseData = string | ArrayBuffer | Blob | FormData;
-export type StandardResponseData<T extends ResponseJsonData = Record<string, any>> = {
+export type StandardResponseData<T = any> = {
     code: number;
     message: string;
     data: T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snail-js/api",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "Http Request with Decorators Api, build on axios",
   "type": "module",
   "main": "./src/index.ts",
@@ -26,7 +26,7 @@
   "author": "",
   "license": "MIT",
   "peerDependencies": {
-    "axios": "^1.7.9"
+    "axios": "^1.8.3"
   },
   "files": [
     "README.md",