axios-annotations 2.2.0 → 3.0.0

package/lib/core/service.js

@@ -1,562 +1,60 @@
 "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;
-        }
-        if (op[0] & 5) throw op[1];
-        return {
-            value: op[0] ? op[1] : void 0,
-            done: true
-        };
-    }
-};
-var __spreadArray = this && this.__spreadArray || function(to, from, pack) {
-    if (pack || arguments.length === 2) for(var i = 0, l = from.length, ar; i < l; i++){
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
+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
+            };
         }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.ConfigMapping = void 0;
-var common_1 = require("./common");
-var parser_1 = require("./parser");
 var config_1 = require("./config");
-exports.ConfigMapping = {
-    requestHeaders: function requestHeaders(rules, args) {
-        if (args === void 0) {
-            args = [];
-        }
-        var headers = {};
-        if (rules) {
-            for(var h in rules){
-                var value = rules[h];
-                if (typeof value === "function") {
-                    headers[h] = value.apply(undefined, args);
-                } else {
-                    headers[h] = value;
-                }
-            }
-        }
-        return headers;
-    },
-    axiosConfig: function axiosConfig(options, args) {
-        var config = {};
-        (options || []).forEach(function(o) {
-            if (typeof o === "function") {
-                Object.assign(config, o.apply(undefined, args));
-            } else {
-                Object.assign(config, o);
-            }
-        });
-        return config;
-    },
-    querystring: function querystring(features, rules, data) {
-        if (!data) {
-            return "";
-        }
-        if (rules) {
-            var encoder = parser_1["default"].decode(data);
-            for(var key in data){
-                var value = data[key];
-                var rule = rules[key];
-                if (rule) {
-                    if (!rule.body) {
-                        if (!rule.required) {
-                            if ((0, common_1.isNullOrEmpty)(value)) {
-                                if (parser_1["default"].has(encoder, key)) {
-                                    parser_1["default"]["delete"](encoder, key);
-                                }
-                            }
-                        } else {
-                            if ((0, common_1.isNullOrEmpty)(value)) {
-                                if (!parser_1["default"].has(encoder, key)) {
-                                    parser_1["default"].append(encoder, key, "");
-                                }
-                            }
-                        }
-                    } else {
-                        parser_1["default"]["delete"](encoder, key);
-                    }
-                } else {
-                    if (features && features.ignoreResidualParams === true) {
-                        parser_1["default"]["delete"](encoder, key);
+var Service = /** @class */ function() {
+    function Service() {
+        var e_1, _a;
+        this.config = config_1.config;
+        this.path = '';
+        var target = Object.getPrototypeOf(this);
+        // 获取被加入切面的方法
+        var methodsToBind = target.__decoratedMethods;
+        if (methodsToBind && Array.isArray(methodsToBind)) {
+            try {
+                for(var methodsToBind_1 = __values(methodsToBind), methodsToBind_1_1 = methodsToBind_1.next(); !methodsToBind_1_1.done; methodsToBind_1_1 = methodsToBind_1.next()){
+                    var methodName = methodsToBind_1_1.value;
+                    if (typeof this[methodName] === 'function') {
+                        this[methodName] = this[methodName].bind(this);
                     }
                 }
-            }
-            for(var key in rules){
-                var rule = rules[key];
-                if (rule && !rule.body && rule.required && !parser_1["default"].has(encoder, key)) {
-                    parser_1["default"].append(encoder, key, "");
-                }
-            }
-            return parser_1["default"].encode(encoder);
-        } else {
-            if (features && features.ignoreResidualParams === true) {
-                return "";
-            } else {
-                var encoder = parser_1["default"].decode(data);
-                return parser_1["default"].encode(encoder);
-            }
-        }
-    },
-    /**
-     * 从参数对象中提取 body 所属字段
-     * @param rules
-     * @param data
-     */ body: function body(rules, data) {
-        if (rules) {
-            for(var r in rules){
-                var rule = rules[r];
-                if (rule.body === true) {
-                    return !(0, common_1.isNullOrEmpty)(data) ? data[r] : undefined;
+            } catch (e_1_1) {
+                e_1 = {
+                    error: e_1_1
+                };
+            } finally{
+                try {
+                    if (methodsToBind_1_1 && !methodsToBind_1_1.done && (_a = methodsToBind_1["return"])) _a.call(methodsToBind_1);
+                } finally{
+                    if (e_1) throw e_1.error;
                 }
             }
         }
-        return null;
-    }
-};
-// noinspection JSUnusedGlobalSymbols
-var Service = /** @class */ function() {
-    function Service(path) {
-        if (path === void 0) {
-            path = null;
-        }
-        this._path = "";
-        this._config = config_1.config;
-        this._headers = {};
-        this._params = {};
-        this._configs = {};
-        this._for = {};
-        this._features = {};
-        if (!this._path && path) {
-            this._path = path;
+        if (target.__path) {
+            this.path = target.__path;
         }
-        if (typeof Object.getPrototypeOf === "function") {
-            if (Object.getPrototypeOf(this)._path) {
-                this._path = Object.getPrototypeOf(this)._path;
-            }
-            if (Object.getPrototypeOf(this)._config) {
-                this._config = Object.getPrototypeOf(this)._config;
-            }
-        } else {
-            if (Object.getPrototypeOf(this)._path) {
-                this._path = Object.getPrototypeOf(this)._path;
-            }
-            if (Object.getPrototypeOf(this)._config) {
-                this._config = Object.getPrototypeOf(this)._config;
-            }
+        if (target.__config) {
+            this.config = target.__config;
         }
+        Reflect.deleteProperty(target, '__path');
+        Reflect.deleteProperty(target, '__config');
+        Reflect.deleteProperty(target, '__decoratedMethods');
     }
-    Object.defineProperty(Service.prototype, "config", {
-        get: function get() {
-            return this._config;
-        },
-        set: function set(value) {
-            this._config = value;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(Service.prototype, "path", {
-        get: function get() {
-            return this._path;
-        },
-        set: function set(value) {
-            this._path = value;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Service.prototype.params = function(id, name, config) {
-        var _a, _b;
-        if (config === void 0) {
-            config = {
-                required: false
-            };
-        }
-        if (!this._params || !this._params[id] || !Object.hasOwnProperty.call(this._params[id], name)) {
-            var cfg = Object.assign({
-                required: false,
-                body: false
-            }, config);
-            var root = this._params || {};
-            var rules = this._params ? this._params[id] || {} : {};
-            var rule = rules[name] || {};
-            if (cfg.body === true) {
-                for(var r in rules){
-                    var rule_1 = rules[r];
-                    rule_1.body = false;
-                }
-            }
-            this._params = Object.assign(root, (_a = {}, _a[id] = Object.assign(rules, (_b = {}, _b[name] = Object.assign(rule, cfg), _b)), _a));
-        }
-    };
-    Service.prototype.headers = function(id, header, value) {
-        var _a, _b;
-        var root = this._headers || {};
-        Object.assign(root, (_a = {}, _a[id] = Object.assign(root[id] || {}, (_b = {}, _b[header] = value, _b)), _a));
-    };
-    Service.prototype["for"] = function(id, registrationName) {
-        var _a;
-        if (arguments.length === 1) {
-            return this._for[id];
-        }
-        Object.assign(this._for, (_a = {}, _a[id] = registrationName, _a));
-    };
-    Service.prototype.abort = function(id, abortController) {
-        var cfg = Object.assign(this.features(id) || {}, {
-            abortController: abortController
-        });
-        this.features(id, cfg);
-    };
-    Service.prototype.features = function(id, options) {
-        var _a;
-        if (arguments.length === 1) {
-            return this._features[id];
-        }
-        Object.assign(this._features, (_a = {}, _a[id] = options, _a));
-    };
-    Service.prototype.configs = function(id, options) {
-        var _a;
-        var root = this._configs || {};
-        Object.assign(root, (_a = {}, _a[id] = (root[id] || []).concat(options), _a));
-    };
-    /**
-     * 填充路径占位符 <br/>
-     * override this method to custom placeholder replacement <br>
-     * default implement: data = { id: 111 }; <br/>
-     * "/path/{id}" -> return "/path/111"
-     * @param path
-     * @param data
-     */ Service.prototype.pathVariable = function(path, data) {
-        var p = path || "";
-        var matchers = p.match(/{\w+}/g);
-        if (Array.isArray(matchers)) {
-            matchers.forEach(function(m) {
-                var field = m.substring(1, m.length - 1);
-                p = (0, common_1.replaceAllStr)(p, "{".concat(field, "}"), data[field]);
-            });
-        }
-        return p;
-    };
-    Service.prototype.createRequestConfig = function(id, path, data, headerArgs, configArgs) {
-        if (headerArgs === void 0) {
-            headerArgs = [];
-        }
-        if (configArgs === void 0) {
-            configArgs = [];
-        }
-        var query = exports.ConfigMapping.querystring(this._features[id], this._params[id], data);
-        var body = exports.ConfigMapping.body(this._params[id], data);
-        var headers = exports.ConfigMapping.requestHeaders(this._headers[id], headerArgs);
-        var config = exports.ConfigMapping.axiosConfig(this._configs[id], configArgs);
-        var p = "".concat(path).concat(query ? (path.lastIndexOf("?") >= 0 ? "&" : "?") + query : "");
-        if (this._features && this._features[id] && this._features[id].abortController) {
-            var abortController = this._features[id].abortController;
-            var __abortControllerInst = void 0;
-            if (typeof abortController === "function") {
-                __abortControllerInst = abortController.apply(undefined, configArgs);
-            } else {
-                __abortControllerInst = abortController;
-            }
-            if (__abortControllerInst) {
-                if (__abortControllerInst.source) {
-                    config.cancelToken = __abortControllerInst.source.token;
-                } else {
-                    config.signal = __abortControllerInst.signal;
-                }
-            }
-        }
-        Object.assign(config, {
-            headers: Object.assign(headers, config.headers || null)
-        });
-        return {
-            path: p,
-            body: body,
-            config: config,
-            query: query
-        };
-    };
-    Service.prototype.request = function(method_1, path_1) {
-        return __awaiter(this, arguments, void 0, function(method, path, data, config) {
-            var url, axios;
-            if (data === void 0) {
-                data = {};
-            }
-            if (config === void 0) {
-                config = {};
-            }
-            return __generator(this, function(_a) {
-                switch(_a.label){
-                    case 0:
-                        url = path.indexOf("http") >= 0 ? path : this.config.baseURL + (0, common_1.normalizePath)("/".concat(this.path || "", "/").concat(path));
-                        return [
-                            4 /*yield*/ ,
-                            this.config.requestAxiosInstance()
-                        ];
-                    case 1:
-                        axios = _a.sent();
-                        return [
-                            2 /*return*/ ,
-                            axios.request(Object.assign({
-                                method: method,
-                                url: url,
-                                data: data
-                            }, config))
-                        ];
-                }
-            });
-        });
-    };
-    Service.prototype.requestWith = function(method, path) {
-        var _this = this;
-        if (path === void 0) {
-            path = "";
-        }
-        var _params = {};
-        var _configs = [];
-        var _headers = {};
-        var _features = {};
-        var _withConfig = this.config;
-        var controller = {
-            "with": function _with(registration) {
-                var c = config_1["default"].forName(registration);
-                if (c) {
-                    _withConfig = c;
-                }
-                return controller;
-            },
-            param: function param(key, required) {
-                var _a;
-                if (required === void 0) {
-                    required = false;
-                }
-                var rule = _params[key] || {};
-                Object.assign(_params, (_a = {}, _a[key] = Object.assign(rule, {
-                    required: required,
-                    body: false
-                }), _a));
-                return controller;
-            },
-            abort: function abort(abortController) {
-                Object.assign(_features, {
-                    abortController: abortController
-                });
-                return controller;
-            },
-            ignoreResidualParams: function ignoreResidualParams(ignore) {
-                if (ignore === void 0) {
-                    ignore = true;
-                }
-                Object.assign(_features, {
-                    ignoreResidualParams: ignore
-                });
-                return controller;
-            },
-            header: function header(header, value) {
-                var _a;
-                Object.assign(_headers, (_a = {}, _a[header] = value, _a));
-                return controller;
-            },
-            body: function body(key) {
-                var _a;
-                var rule = _params[key] || {};
-                for(var r in _params){
-                    var rule_2 = _params[r];
-                    rule_2.body = false;
-                }
-                Object.assign(_params, (_a = {}, _a[key] = Object.assign(rule, {
-                    required: false,
-                    body: true
-                }), _a));
-                return controller;
-            },
-            config: function config(cfg) {
-                _configs.push(cfg);
-                return controller;
-            },
-            send: function send() {
-                var args_1 = [];
-                for(var _i = 0; _i < arguments.length; _i++){
-                    args_1[_i] = arguments[_i];
-                }
-                return __awaiter(_this, __spreadArray([], args_1, true), void 0, function(data) {
-                    var query, body, headers, config, abortController, __abortControllerInst, axios, p;
-                    if (data === void 0) {
-                        data = {};
-                    }
-                    return __generator(this, function(_a) {
-                        switch(_a.label){
-                            case 0:
-                                query = exports.ConfigMapping.querystring(_features, _params, data);
-                                body = exports.ConfigMapping.body(_params, data);
-                                headers = exports.ConfigMapping.requestHeaders(_headers, [
-                                    data
-                                ]);
-                                config = exports.ConfigMapping.axiosConfig(_configs, [
-                                    data
-                                ]);
-                                abortController = _features.abortController;
-                                Object.assign(config, {
-                                    headers: Object.assign(headers, config.headers || null)
-                                });
-                                if (abortController) {
-                                    __abortControllerInst = void 0;
-                                    if (typeof abortController === "function") {
-                                        __abortControllerInst = abortController.apply(undefined, [
-                                            data
-                                        ]);
-                                    } else {
-                                        __abortControllerInst = abortController;
-                                    }
-                                    if (__abortControllerInst) {
-                                        if (__abortControllerInst.source) {
-                                            config.cancelToken = __abortControllerInst.source.token;
-                                        } else {
-                                            config.signal = __abortControllerInst.signal;
-                                        }
-                                    }
-                                }
-                                return [
-                                    4 /*yield*/ ,
-                                    _withConfig.requestAxiosInstance()
-                                ];
-                            case 1:
-                                axios = _a.sent();
-                                if (_withConfig) {
-                                    return [
-                                        2 /*return*/ ,
-                                        (0, common_1.forward)(axios, _withConfig.origin, _withConfig.prefix, this.path, path, method, query, body, config)
-                                    ];
-                                } else {
-                                    p = "".concat(this.pathVariable(path || "", data)).concat(query ? (path.lastIndexOf("?") >= 0 ? "&" : "?") + query : "");
-                                    return [
-                                        2 /*return*/ ,
-                                        this.request(method, p, body, config)
-                                    ];
-                                }
-                                return [
-                                    2 /*return*/ 
-                                ];
-                        }
-                    });
-                });
-            }
-        };
-        return controller;
-    };
     return Service;
 }();
 exports["default"] = Service;

package/lib/decorator/path-variables.d.ts

@@ -0,0 +1,7 @@
+import { ParamsMapping } from "../core/builder";
+import type Service from "../core/service";
+type PathVariablesParamsMapping = Omit<ParamsMapping, 'key'> & {
+    key?: string;
+};
+export default function PathVariables(keyOrMapping?: string | PathVariablesParamsMapping): <T extends Service>(_target: T, propertyKey: string, descriptor: PropertyDescriptor) => void;
+export {};

package/lib/decorator/path-variables.js

@@ -0,0 +1,37 @@
+"use strict";
+var __assign = (void 0) && (void 0).__assign || function() {
+    __assign = Object.assign || function(t) {
+        for(var s, i = 1, n = arguments.length; i < n; i++){
+            s = arguments[i];
+            for(var p in s)if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports["default"] = PathVariables;
+var common_1 = require("../core/common");
+function PathVariables(keyOrMapping) {
+    return function(_target, propertyKey, descriptor) {
+        var metaDescriptor = (0, common_1.castToMetaDescriptor)(descriptor);
+        var builder = metaDescriptor.builder;
+        if (builder) {
+            if (typeof keyOrMapping === 'string' || keyOrMapping === undefined || (0, common_1.isNullOrEmpty)(keyOrMapping)) {
+                builder.pathVariable({
+                    // key 为空使用数据源本体
+                    key: typeof keyOrMapping === 'string' ? keyOrMapping : '',
+                    required: false,
+                    value: undefined
+                });
+            } else {
+                builder.pathVariable(__assign(__assign({}, keyOrMapping), {
+                    key: typeof keyOrMapping.key === 'string' ? keyOrMapping.key : '',
+                    required: false
+                }));
+            }
+        }
+    };
+}

package/lib/decorator/request-body.d.ts

@@ -1 +1,7 @@
-export default function RequestBody(name?: string): MethodDecorator;
+import type Service from "../core/service";
+import { ParamsMapping } from "../core/builder";
+type RequestBodyParamsMapping = Omit<ParamsMapping, 'key'> & {
+    key?: string;
+};
+export default function RequestBody(keyOrMapping?: string | RequestBodyParamsMapping): <T extends Service>(_target: T, propertyKey: string, descriptor: PropertyDescriptor) => void;
+export {};