axios-annotations 2.2.0 → 3.0.0

package/lib/core/common.js

@@ -1,166 +1,158 @@
 "use strict";
-var __awaiter = this && this.__awaiter || function(thisArg, _arguments, P, generator) {
-    function adopt(value) {
-        return value instanceof P ? value : new P(function(resolve) {
-            resolve(value);
-        });
-    }
-    return new (P || (P = Promise))(function(resolve, reject) {
-        function fulfilled(value) {
-            try {
-                step(generator.next(value));
-            } catch (e) {
-                reject(e);
-            }
-        }
-        function rejected(value) {
-            try {
-                step(generator["throw"](value));
-            } catch (e) {
-                reject(e);
-            }
-        }
-        function step(result) {
-            result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-        }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = this && this.__generator || function(thisArg, body) {
-    var _ = {
-        label: 0,
-        sent: function sent() {
-            if (t[0] & 1) throw t[1];
-            return t[1];
-        },
-        trys: [],
-        ops: []
-    }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
-    }), g;
-    function verb(n) {
-        return function(v) {
-            return step([
-                n,
-                v
-            ]);
-        };
-    }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while(g && (g = 0, op[0] && (_ = 0)), _)try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [
-                op[0] & 2,
-                t.value
-            ];
-            switch(op[0]){
-                case 0:
-                case 1:
-                    t = op;
-                    break;
-                case 4:
-                    _.label++;
-                    return {
-                        value: op[1],
-                        done: false
-                    };
-                case 5:
-                    _.label++;
-                    y = op[1];
-                    op = [
-                        0
-                    ];
-                    continue;
-                case 7:
-                    op = _.ops.pop();
-                    _.trys.pop();
-                    continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                        _ = 0;
-                        continue;
-                    }
-                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-                        _.label = op[1];
-                        break;
-                    }
-                    if (op[0] === 6 && _.label < t[1]) {
-                        _.label = t[1];
-                        t = op;
-                        break;
-                    }
-                    if (t && _.label < t[2]) {
-                        _.label = t[2];
-                        _.ops.push(op);
-                        break;
-                    }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop();
-                    continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) {
-            op = [
-                6,
-                e
-            ];
-            y = 0;
-        } finally{
-            f = t = 0;
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
+var __values = (void 0) && (void 0).__values || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function next() {
+            if (o && i >= o.length) o = void 0;
+            return {
+                value: o && o[i++],
+                done: !o
+            };
         }
-        if (op[0] & 5) throw op[1];
-        return {
-            value: op[0] ? op[1] : void 0,
-            done: true
-        };
-    }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.normalizePath = normalizePath;
 exports.isNullOrEmpty = isNullOrEmpty;
-exports.forward = forward;
-exports.replaceAllStr = replaceAllStr;
-exports.mapToDefaultMethod = mapToDefaultMethod;
+exports.castToMetaDescriptor = castToMetaDescriptor;
+exports.mergeAxiosConfigs = mergeAxiosConfigs;
+exports.formatUrl = formatUrl;
+exports.isPlainObject = isPlainObject;
+var builder_1 = require("./builder");
 function normalizePath(path) {
     return path.replace(/\/+/g, "/").replace(/\/$/, "");
 }
 function isNullOrEmpty(param) {
     return param === null || param === undefined || param === "";
 }
-function forward(axios, origin, prefix1, prefix2, path, method, query, body, config) {
-    return __awaiter(this, void 0, void 0, function() {
-        var url;
-        return __generator(this, function(_a) {
-            url = "".concat(origin) + normalizePath("/".concat(prefix1, "/").concat(prefix2, "/").concat(path));
-            if (query) {
-                if (url.lastIndexOf("?") >= 0) {
-                    url += "&" + query;
-                } else {
-                    url += "?" + query;
-                }
+function castToMetaDescriptor(descriptor) {
+    if (!descriptor.builder) {
+        descriptor.builder = new builder_1["default"]();
+    }
+    return descriptor;
+}
+/**
+ * Merges multiple Axios request configurations with specific logic for Axios.
+ * - `headers` and `params` are shallowly merged.
+ * - All other properties are replaced by the last provided value.
+ *
+ * @param sources A list of AxiosRequestConfig objects to merge.
+ * @returns A new, merged AxiosRequestConfig object.
+ */ function mergeAxiosConfigs() {
+    var e_1, _a, e_2, _b;
+    var sources = [];
+    for(var _i = 0; _i < arguments.length; _i++){
+        sources[_i] = arguments[_i];
+    }
+    // Start with an empty config
+    var finalConfig = {};
+    try {
+        // Sequentially apply all source configs. This handles the "replacement" logic for most properties.
+        for(var sources_1 = __values(sources), sources_1_1 = sources_1.next(); !sources_1_1.done; sources_1_1 = sources_1.next()){
+            var source = sources_1_1.value;
+            if (source) {
+                Object.assign(finalConfig, source);
+            }
+        }
+    } catch (e_1_1) {
+        e_1 = {
+            error: e_1_1
+        };
+    } finally{
+        try {
+            if (sources_1_1 && !sources_1_1.done && (_a = sources_1["return"])) _a.call(sources_1);
+        } finally{
+            if (e_1) throw e_1.error;
+        }
+    }
+    // Now, handle the special merge logic for 'headers' and 'params'
+    var finalHeaders = {};
+    var finalParams = {};
+    try {
+        for(var sources_2 = __values(sources), sources_2_1 = sources_2.next(); !sources_2_1.done; sources_2_1 = sources_2.next()){
+            var source = sources_2_1.value;
+            if (source === null || source === void 0 ? void 0 : source.headers) {
+                Object.assign(finalHeaders, source.headers);
+            }
+            if (source === null || source === void 0 ? void 0 : source.params) {
+                Object.assign(finalParams, source.params);
+            }
+        }
+    } catch (e_2_1) {
+        e_2 = {
+            error: e_2_1
+        };
+    } finally{
+        try {
+            if (sources_2_1 && !sources_2_1.done && (_b = sources_2["return"])) _b.call(sources_2);
+        } finally{
+            if (e_2) throw e_2.error;
+        }
+    }
+    // Assign the merged headers and params back to the final config
+    if (Object.keys(finalHeaders).length > 0) {
+        finalConfig.headers = finalHeaders;
+    }
+    if (Object.keys(finalParams).length > 0) {
+        finalConfig.params = finalParams;
+    }
+    return finalConfig;
+}
+/**
+ * 替换链接占位符，注意使用基本类型
+ * Replaces placeholders in a URL with values from a data object.
+ * e.g., formatUrl("http://a.com/{c}?d={e}", {c: 'x', e: 100}) -> "http://a.com/x?d=100"
+ *
+ * @param url The URL string with placeholders like {key}.
+ * @param data The plain object data source.
+ * @returns The formatted URL string.
+ */ function formatUrl(url, data) {
+    return url.replace(/\{([^{}]+)}/g, function(match, key) {
+        // Check if the key exists in the data object
+        if (Object.prototype.hasOwnProperty.call(data, key)) {
+            var value = data[key];
+            // Handle null, undefined, NaN
+            if (value === null) return 'null';
+            if (value === undefined) return 'undefined';
+            if (Number.isNaN(value)) return 'NaN';
+            var valueType = typeof value === "undefined" ? "undefined" : _type_of(value);
+            // Handle primitive types
+            if (valueType === 'string' || valueType === 'number' || valueType === 'boolean') {
+                return String(value);
             }
-            return [
-                2 /*return*/ ,
-                axios.request(Object.assign({
-                    method: method,
-                    url: url,
-                    data: body
-                }, config))
-            ];
-        });
+            // Handle objects and arrays
+            try {
+                // 此处不应该触发 不要传奇怪的类型
+                return JSON.stringify(value);
+            } catch (e) {
+                // 如果取出的值不是基本类型（例如数组），则直接JSON.stringify后替换，JSON转换过程抛异常则替换为 undefined
+                console.error("Error stringify value for key \"".concat(key, "\":"), e);
+                return 'undefined'; // Replace with 'undefined' on stringify error
+            }
+        }
+        // If key is not found in data, return the original placeholder
+        return match;
     });
 }
-function replaceAllStr(target, search, replacement) {
-    var pattern = typeof search === 'string' ? RegExp(search, 'g') : search;
-    return target.replace(pattern, replacement);
-}
-function mapToDefaultMethod(method, defaultMethod) {
-    if (defaultMethod === void 0) {
-        defaultMethod = "GET";
+/**
+ * Checks if a value is a plain object, i.e., an object created by `{}` or `new Object()`.
+ * @param value The value to check.
+ * @returns True if the value is a plain object, false otherwise.
+ */ function isPlainObject(value) {
+    if (value === null || (typeof value === "undefined" ? "undefined" : _type_of(value)) !== 'object') {
+        return false;
+    }
+    var proto = Object.getPrototypeOf(value);
+    if (proto === null) {
+        return true;
     }
-    return typeof method === "string" ? method : defaultMethod;
+    return proto === Object.prototype;
 }

package/lib/core/config.d.ts

@@ -1,10 +1,10 @@
+import type { AxiosInstance } from 'axios';
 import AxiosStaticInstanceProvider from "./provider";
-import type { AxiosInstance, AxiosStatic } from "axios";
-export type ConfigPlugin<StaticType = AxiosStatic, InstanceType = AxiosInstance> = (axios: InstanceType, config: Config<StaticType, InstanceType>) => void;
+export type ConfigPlugin = (axios: AxiosInstance, config: Config) => void;
 export type PartialConstructorString = string | null;
 export type PartialConstructorNumber = number | null;
-export type PartialPluginConstructorPlugins<StaticType = AxiosStatic, InstanceType = AxiosInstance> = ConfigPlugin<StaticType, InstanceType>[] | null;
-export default class Config<StaticType = AxiosStatic, InstanceType = AxiosInstance> {
+export type PartialPluginConstructorPlugins = ConfigPlugin[] | null;
+export default class Config {
     private _host;
     private _port;
     private _protocol;
@@ -17,11 +17,11 @@ export default class Config<StaticType = AxiosStatic, InstanceType = AxiosInstan
         host?: PartialConstructorString;
         port?: PartialConstructorNumber;
         prefix?: PartialConstructorString;
-        plugins?: PartialPluginConstructorPlugins<StaticType, InstanceType>;
-        axiosProvider?: AxiosStaticInstanceProvider<StaticType>;
+        plugins?: PartialPluginConstructorPlugins;
+        axiosProvider?: AxiosStaticInstanceProvider;
     });
     static forName(name: string): Config | null;
-    init(protocol: PartialConstructorString, host: PartialConstructorString, port: PartialConstructorNumber, prefix: PartialConstructorString, plugins: PartialPluginConstructorPlugins<StaticType, InstanceType>): void;
+    init(protocol: PartialConstructorString, host: PartialConstructorString, port: PartialConstructorNumber, prefix: PartialConstructorString, plugins: PartialPluginConstructorPlugins): void;
     get host(): string;
     set host(value: string);
     get port(): number;
@@ -40,21 +40,21 @@ export default class Config<StaticType = AxiosStatic, InstanceType = AxiosInstan
      * return "http://localhost:8080/a"
      */
     get baseURL(): string;
-    get plugins(): PartialPluginConstructorPlugins<StaticType, InstanceType>;
-    set plugins(value: PartialPluginConstructorPlugins<StaticType, InstanceType>);
-    get axiosProvider(): AxiosStaticInstanceProvider<StaticType>;
-    set axiosProvider(value: AxiosStaticInstanceProvider<StaticType>);
+    get plugins(): PartialPluginConstructorPlugins;
+    set plugins(value: PartialPluginConstructorPlugins);
+    get axiosProvider(): AxiosStaticInstanceProvider;
+    set axiosProvider(value: AxiosStaticInstanceProvider);
     /**
      * register config global and return self.
      * @param name
      * @return {Config} config self
      */
-    register(name: string): Config<StaticType, InstanceType>;
+    register(name: string): Config;
     /**
      * remove self from global config store.
      * @return {Config} - config self
      */
-    unregister(): Config<StaticType, InstanceType>;
-    requestAxiosInstance(): Promise<InstanceType>;
+    unregister(): Config;
+    requestAxiosInstance(): Promise<AxiosInstance>;
 }
-export declare const config: Config<AxiosStatic, AxiosInstance>;
+export declare const config: Config;

package/lib/core/config.js

@@ -1,5 +1,5 @@
 "use strict";
-var __awaiter = this && this.__awaiter || function(thisArg, _arguments, P, generator) {
+var __awaiter = (void 0) && (void 0).__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
         return value instanceof P ? value : new P(function(resolve) {
             resolve(value);
@@ -26,7 +26,7 @@ var __awaiter = this && this.__awaiter || function(thisArg, _arguments, P, gener
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = this && this.__generator || function(thisArg, body) {
+var __generator = (void 0) && (void 0).__generator || function(thisArg, body) {
     var _ = {
         label: 0,
         sent: function sent() {
@@ -117,6 +117,20 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
+var __values = (void 0) && (void 0).__values || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function next() {
+            if (o && i >= o.length) o = void 0;
+            return {
+                value: o && o[i++],
+                done: !o
+            };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
@@ -209,7 +223,8 @@ var Config = /** @class */ function() {
          * default value: <br/>
          * http://localhost:8080
          */ get: function get() {
-            return "".concat(this.protocol, "://").concat(this.host).concat(this.port ? ":" + this.port : "");
+            var port = this.protocol === "https" && String(this.port) === "443" || this.protocol === "http" && String(this.port) === "80" ? "" : this.port;
+            return "".concat(this.protocol, "://").concat(this.host).concat(port ? ":" + port : "");
         },
         enumerable: false,
         configurable: true
@@ -277,12 +292,13 @@ var Config = /** @class */ function() {
         }
         return this;
     };
+    // 创建 axios 实例
     Config.prototype.requestAxiosInstance = function() {
         return __awaiter(this, void 0, void 0, function() {
-            var _a, e_1;
-            var _this = this;
-            return __generator(this, function(_b) {
-                switch(_b.label){
+            var _a, e_1, _b, _c, plugin;
+            var e_2, _d;
+            return __generator(this, function(_e) {
+                switch(_e.label){
                     case 0:
                         if (this._axios) {
                             return [
@@ -290,9 +306,9 @@ var Config = /** @class */ function() {
                                 this._axios
                             ];
                         }
-                        _b.label = 1;
+                        _e.label = 1;
                     case 1:
-                        _b.trys.push([
+                        _e.trys.push([
                             1,
                             3,
                             ,
@@ -304,19 +320,33 @@ var Config = /** @class */ function() {
                             this._axiosProvider.get()
                         ];
                     case 2:
-                        _a._axios = _b.sent().create();
+                        _a._axios = _e.sent().create();
                         return [
                             3 /*break*/ ,
                             4
                         ];
                     case 3:
-                        e_1 = _b.sent();
+                        e_1 = _e.sent();
                         throw e_1;
                     case 4:
+                        // 插件注入
                         if (this._plugins && this._plugins.length) {
-                            this._plugins.forEach(function(plugin) {
-                                plugin(_this._axios, _this);
-                            });
+                            try {
+                                for(_b = __values(this._plugins), _c = _b.next(); !_c.done; _c = _b.next()){
+                                    plugin = _c.value;
+                                    plugin(this._axios, this);
+                                }
+                            } catch (e_2_1) {
+                                e_2 = {
+                                    error: e_2_1
+                                };
+                            } finally{
+                                try {
+                                    if (_c && !_c.done && (_d = _b["return"])) _d.call(_b);
+                                } finally{
+                                    if (e_2) throw e_2.error;
+                                }
+                            }
                         }
                         return [
                             2 /*return*/ ,

package/lib/core/core-expect.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports["default"] = IndexCjs;
+function IndexCjs(params) {
+    return params;
+}

package/lib/core/expect.d.ts

@@ -1,4 +1,2 @@
-import type {AxiosPromise} from "axios";
-
-export default function Expect<T, D = AxiosPromise<T>>(params: any): D;
-export {};
+import Expect from "./core-expect";
+export default Expect;

package/lib/core/expect.js

@@ -2,14 +2,5 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports["default"] = Expect;
-/**
- * 警告 Warning: <br/>
- * 仅用于仿冒使用装饰器的方法返回值，绕过IDE/Typescript的类型检查，获得代码提示功能。<br/>
- *
- * Only used to ensure the return value of a method that uses decorators,
- * bypassing IDE/Typescript type checking and obtaining code intelligence.
- */
-function Expect(params) {
-    return params;
-}
+var core_expect_1 = require("./core-expect");
+exports["default"] = core_expect_1["default"];

package/lib/core/provider.d.ts

@@ -1,6 +1,6 @@
-import type { AxiosStatic } from "axios";
-export default class AxiosStaticInstanceProvider<StaticType = AxiosStatic> {
-    __instance: StaticType | null;
-    provide(): Promise<StaticType>;
-    get(): Promise<StaticType>;
+import type { AxiosStatic } from 'axios';
+export default class AxiosStaticInstanceProvider {
+    __instance: AxiosStatic | null;
+    provide(): Promise<AxiosStatic>;
+    get(): Promise<AxiosStatic>;
 }

package/lib/core/provider.js

@@ -1,5 +1,5 @@
 "use strict";
-var __awaiter = this && this.__awaiter || function(thisArg, _arguments, P, generator) {
+var __awaiter = (void 0) && (void 0).__awaiter || function(thisArg, _arguments, P, generator) {
     function adopt(value) {
         return value instanceof P ? value : new P(function(resolve) {
             resolve(value);
@@ -26,7 +26,7 @@ var __awaiter = this && this.__awaiter || function(thisArg, _arguments, P, gener
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = this && this.__generator || function(thisArg, body) {
+var __generator = (void 0) && (void 0).__generator || function(thisArg, body) {
     var _ = {
         label: 0,
         sent: function sent() {