@midwayjs/core 3.0.0-alpha.2 → 3.0.0-alpha.40

package/dist/service/configService.d.ts

@@ -7,9 +7,9 @@ export declare class MidwayConfigService implements IConfigService {
     isReady: boolean;
     externalObject: Record<string, unknown>[];
     constructor(container: any);
-    add(configFilePaths: string[]): void;
+    add(configFilePaths: any[]): void;
     addObject(obj: Record<string, unknown>): void;
-    getEnvSet(env: any): Set<string>;
+    getEnvSet(env: any): Set<any>;
     getConfigEnv(configFilePath: any): string;
     load(): Promise<void>;
     getConfiguration(configKey?: string): any;

package/dist/service/configService.js

@@ -21,23 +21,32 @@ class MidwayConfigService {
     }
     add(configFilePaths) {
         for (const dir of configFilePaths) {
-            if (/\.\w+$/.test(dir)) {
-                // file
-                const env = this.getConfigEnv(dir);
-                const envSet = this.getEnvSet(env);
-                envSet.add(dir);
-                if (this.aliasMap[env]) {
-                    this.getEnvSet(this.aliasMap[env]).add(dir);
+            if (typeof dir === 'string') {
+                if (/\.\w+$/.test(dir)) {
+                    // file
+                    const env = this.getConfigEnv(dir);
+                    const envSet = this.getEnvSet(env);
+                    envSet.add(dir);
+                    if (this.aliasMap[env]) {
+                        this.getEnvSet(this.aliasMap[env]).add(dir);
+                    }
+                }
+                else {
+                    // directory
+                    const fileStat = (0, fs_1.statSync)(dir);
+                    if (fileStat.isDirectory()) {
+                        const files = (0, fs_1.readdirSync)(dir);
+                        this.add(files.map(file => {
+                            return (0, path_1.join)(dir, file);
+                        }));
+                    }
                 }
             }
             else {
-                // directory
-                const fileStat = fs_1.statSync(dir);
-                if (fileStat.isDirectory()) {
-                    const files = fs_1.readdirSync(dir);
-                    this.add(files.map(file => {
-                        return path_1.join(dir, file);
-                    }));
+                // object add
+                for (const env in dir) {
+                    const envSet = this.getEnvSet(env);
+                    envSet.add(dir[env]);
                 }
             }
         }
@@ -58,7 +67,7 @@ class MidwayConfigService {
     }
     getConfigEnv(configFilePath) {
         // parse env
-        const configFileBaseName = path_1.basename(configFilePath);
+        const configFileBaseName = (0, path_1.basename)(configFilePath);
         const splits = configFileBaseName.split('.');
         const suffix = splits.pop();
         if (suffix !== 'js' && suffix !== 'ts') {
@@ -76,7 +85,10 @@ class MidwayConfigService {
         // merge set
         const target = {};
         for (const filename of [...defaultSet, ...currentEnvSet]) {
-            const config = await this.loadConfig(filename, target);
+            let config = filename;
+            if (typeof filename === 'string') {
+                config = await this.loadConfig(filename, target);
+            }
             if (!config) {
                 continue;
             }
@@ -97,7 +109,7 @@ class MidwayConfigService {
     getConfiguration(configKey) {
         if (configKey) {
             debug('get configuration by key => %s.', configKey);
-            return util_1.safelyGet(configKey, this.configuration);
+            return (0, util_1.safelyGet)(configKey, this.configuration);
         }
         return this.configuration;
     }
@@ -108,7 +120,7 @@ class MidwayConfigService {
             exports = exports['default'];
         }
         let result = exports;
-        if (decorator_1.isFunction(exports)) {
+        if ((0, decorator_1.isFunction)(exports)) {
             const informationService = this.container.getInformationService();
             // eslint-disable-next-line prefer-spread
             result = exports.apply(null, [

package/dist/service/environmentService.js

@@ -5,7 +5,7 @@ const util_1 = require("../util");
 class MidwayEnvironmentService {
     getCurrentEnvironment() {
         if (!this.environment) {
-            this.environment = util_1.getCurrentEnvironment();
+            this.environment = (0, util_1.getCurrentEnvironment)();
         }
         return this.environment;
     }
@@ -13,7 +13,7 @@ class MidwayEnvironmentService {
         this.environment = environment;
     }
     isDevelopmentEnvironment() {
-        return util_1.isDevelopmentEnvironment(this.environment);
+        return (0, util_1.isDevelopmentEnvironment)(this.environment);
     }
 }
 exports.MidwayEnvironmentService = MidwayEnvironmentService;

package/dist/service/informationService.js

@@ -8,9 +8,9 @@ class MidwayInformationService {
         this.baseDir = options.baseDir;
         this.appDir = options.appDir;
         if (!this.appDir) {
-            this.appDir = path_1.dirname(this.baseDir);
+            this.appDir = (0, path_1.dirname)(this.baseDir);
         }
-        this.pkg = util_1.safeRequire(path_1.join(this.appDir, 'package.json')) || {};
+        this.pkg = (0, util_1.safeRequire)((0, path_1.join)(this.appDir, 'package.json')) || {};
     }
     getAppDir() {
         return this.appDir;
@@ -19,7 +19,7 @@ class MidwayInformationService {
         return this.baseDir;
     }
     getHome() {
-        return util_1.getUserHome();
+        return (0, util_1.getUserHome)();
     }
     getPkg() {
         return this.pkg;
@@ -29,7 +29,7 @@ class MidwayInformationService {
         return ((_a = this.pkg) === null || _a === void 0 ? void 0 : _a['name']) || '';
     }
     getRoot() {
-        const isDevelopmentEnv = util_1.isDevelopmentEnvironment(util_1.getCurrentEnvironment());
+        const isDevelopmentEnv = (0, util_1.isDevelopmentEnvironment)((0, util_1.getCurrentEnvironment)());
         return isDevelopmentEnv ? this.getAppDir() : this.getHome();
     }
 }

package/dist/util/containerUtil.d.ts

@@ -0,0 +1,11 @@
+import { MidwayContainer } from '../context/container';
+import { IMidwayContainer } from '../interface';
+export declare const createModuleContainer: (options: {
+    container?: IMidwayContainer;
+    modules: any[];
+    entry: {
+        Configuration: any;
+    };
+}) => IMidwayContainer | MidwayContainer;
+export declare const createDirectoryGlobContainer: (options: any) => MidwayContainer;
+//# sourceMappingURL=containerUtil.d.ts.map

package/dist/util/containerUtil.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDirectoryGlobContainer = exports.createModuleContainer = void 0;
+const container_1 = require("../context/container");
+const fileDetector_1 = require("./fileDetector");
+const path_1 = require("path");
+const index_1 = require("./index");
+const createModuleContainer = (options) => {
+    const applicationContext = options.container || new container_1.MidwayContainer();
+    applicationContext.setFileDetector(new fileDetector_1.CustomModuleDetector({
+        modules: options.modules,
+    }));
+    applicationContext.load(options.entry);
+    return applicationContext;
+};
+exports.createModuleContainer = createModuleContainer;
+const createDirectoryGlobContainer = options => {
+    const applicationContext = new container_1.MidwayContainer();
+    applicationContext.setFileDetector(new fileDetector_1.DirectoryFileDetector({
+        loadDir: options.baseDir,
+    }));
+    applicationContext.load((0, index_1.safeRequire)((0, path_1.join)(options.baseDir, 'configuration')));
+    return applicationContext;
+};
+exports.createDirectoryGlobContainer = createDirectoryGlobContainer;
+//# sourceMappingURL=containerUtil.js.map

package/dist/util/contextUtil.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCurrentMainApp = exports.getCurrentMainFramework = exports.getCurrentApplicationContext = void 0;
 const getCurrentApplicationContext = () => {
-    return exports.getCurrentMainFramework().getApplicationContext();
+    return (0, exports.getCurrentMainFramework)().getApplicationContext();
 };
 exports.getCurrentApplicationContext = getCurrentApplicationContext;
 const getCurrentMainFramework = () => {
@@ -10,7 +10,7 @@ const getCurrentMainFramework = () => {
 };
 exports.getCurrentMainFramework = getCurrentMainFramework;
 const getCurrentMainApp = () => {
-    return exports.getCurrentMainFramework().getApplication();
+    return (0, exports.getCurrentMainFramework)().getApplication();
 };
 exports.getCurrentMainApp = getCurrentMainApp;
 //# sourceMappingURL=contextUtil.js.map

package/dist/util/fileDetector.js

@@ -32,7 +32,7 @@ class DirectoryFileDetector extends AbstractFileDetector {
         const debugLogger = container.getDebugLogger();
         const loadDirs = [].concat(this.options.loadDir || []);
         for (const dir of loadDirs) {
-            const fileResults = glob_1.run(DEFAULT_PATTERN.concat(this.options.pattern || []), {
+            const fileResults = (0, glob_1.run)(DEFAULT_PATTERN.concat(this.options.pattern || []), {
                 cwd: dir,
                 ignore: DEFAULT_IGNORE_PATTERN.concat(this.options.ignore || []),
             });
@@ -50,7 +50,7 @@ class DirectoryFileDetector extends AbstractFileDetector {
                                 continue;
                             }
                         }
-                        else if (decorator_1.isRegExp(resolveFilter.pattern)) {
+                        else if ((0, decorator_1.isRegExp)(resolveFilter.pattern)) {
                             if (resolveFilter.pattern.test(file)) {
                                 const exports = resolveFilter.ignoreRequire
                                     ? undefined

package/dist/util/index.js

@@ -4,7 +4,7 @@ exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHom
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
-const debug = util_1.debuglog('midway:container:util');
+const debug = (0, util_1.debuglog)('midway:container:util');
 const isDevelopmentEnvironment = env => {
     return ['local', 'test', 'unittest'].includes(env);
 };
@@ -15,14 +15,14 @@ const getCurrentEnvironment = () => {
 exports.getCurrentEnvironment = getCurrentEnvironment;
 const safeRequire = (p, enabledCache = true) => {
     if (p.startsWith(`.${path_1.sep}`) || p.startsWith(`..${path_1.sep}`)) {
-        p = path_1.resolve(path_1.dirname(module.parent.filename), p);
+        p = (0, path_1.resolve)((0, path_1.dirname)(module.parent.filename), p);
     }
     try {
         if (enabledCache) {
             return require(p);
         }
         else {
-            const content = fs_1.readFileSync(p, {
+            const content = (0, fs_1.readFileSync)(p, {
                 encoding: 'utf-8',
             });
             return JSON.parse(content);

package/dist/util/pathFileUtil.js

@@ -15,12 +15,12 @@ exports.PathFileUtil = {
         if (!one || !two) {
             return false;
         }
-        const ext = path_1.extname(one);
+        const ext = (0, path_1.extname)(one);
         return one.replace(ext, '') === two;
     },
     getFileContentSync(filePath, encoding) {
         return typeof filePath === 'string'
-            ? fs_1.readFileSync(filePath, {
+            ? (0, fs_1.readFileSync)(filePath, {
                 encoding,
             })
             : filePath;

package/dist/util/serviceFactory.d.ts

@@ -4,10 +4,12 @@
 export declare abstract class ServiceFactory<T> {
     private clients;
     private options;
-    initClients(options: any): Promise<void>;
+    protected initClients(options: any): Promise<void>;
     get<U = T>(id?: string): U;
-    createInstance(config: any, clientName: any): Promise<any>;
+    createInstance(config: any, clientName?: any): Promise<any>;
     abstract getName(): any;
     protected abstract createClient(config: any): any;
+    protected destroyClient(client: T): Promise<void>;
+    stop(): Promise<void>;
 }
 //# sourceMappingURL=serviceFactory.d.ts.map

package/dist/util/serviceFactory.js

@@ -8,6 +8,7 @@ const assert = require("assert");
 class ServiceFactory {
     constructor() {
         this.clients = new Map();
+        this.options = {};
     }
     async initClients(options) {
         this.options = options;
@@ -22,7 +23,6 @@ class ServiceFactory {
             for (const id of Object.keys(options.clients)) {
                 await this.createInstance(options.clients[id], id);
             }
-            return;
         }
     }
     get(id = 'default') {
@@ -30,11 +30,19 @@ class ServiceFactory {
     }
     async createInstance(config, clientName) {
         // options.default will be merge in to options.clients[id]
-        config = Object.assign({}, this.options.default, config);
+        config = Object.assign({}, this.options['default'], config);
         const client = await this.createClient(config);
-        this.clients.set(clientName, client);
+        if (clientName) {
+            this.clients.set(clientName, client);
+        }
         return client;
     }
+    async destroyClient(client) { }
+    async stop() {
+        for (const value of this.clients.values()) {
+            await this.destroyClient(value);
+        }
+    }
 }
 exports.ServiceFactory = ServiceFactory;
 //# sourceMappingURL=serviceFactory.js.map

package/dist/util/webRouterCollector.d.ts

@@ -1,5 +1,8 @@
-import { IMidwayContainer } from '../interface';
 export interface RouterInfo {
+    /**
+     * uuid
+     */
+    id: string;
     /**
      * router prefix
      */
@@ -83,10 +86,8 @@ export declare class WebRouterCollector {
     protected routes: Map<string, RouterInfo[]>;
     private routesPriority;
     protected options: RouterCollectorOptions;
-    private applicationContext;
-    constructor(options?: RouterCollectorOptions);
+    constructor(baseDir?: string, options?: RouterCollectorOptions);
     protected analyze(): Promise<void>;
-    getApplicationContext(): IMidwayContainer;
     protected collectRoute(module: any, functionMeta?: boolean): void;
     protected collectFunctionRoute(module: any, functionMeta?: boolean): void;
     sortRouter(urlMatchList: RouterInfo[]): {
@@ -95,6 +96,10 @@ export declare class WebRouterCollector {
         _paramString: string;
         _category: number;
         _weight: number;
+        /**
+         * uuid
+         */
+        id: string;
         /**
          * router prefix
          */

package/dist/util/webRouterCollector.js

@@ -3,20 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebRouterCollector = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const index_1 = require("./index");
+const container_1 = require("../context/container");
+const fileDetector_1 = require("./fileDetector");
 class WebRouterCollector {
-    constructor(options = {}) {
+    constructor(baseDir = '', options = {}) {
         this.isReady = false;
         this.routes = new Map();
         this.routesPriority = [];
+        this.baseDir = baseDir;
         this.options = options;
     }
     async analyze() {
-        const controllerModules = decorator_1.listModule(decorator_1.CONTROLLER_KEY);
+        if (this.baseDir) {
+            const container = new container_1.MidwayContainer();
+            container.setFileDetector(new fileDetector_1.DirectoryFileDetector({
+                loadDir: this.baseDir,
+            }));
+            await container.ready();
+        }
+        const controllerModules = (0, decorator_1.listModule)(decorator_1.CONTROLLER_KEY);
         for (const module of controllerModules) {
             this.collectRoute(module);
         }
         if (this.options.includeFunctionRouter) {
-            const fnModules = decorator_1.listModule(decorator_1.FUNC_KEY);
+            const fnModules = (0, decorator_1.listModule)(decorator_1.FUNC_KEY);
             for (const module of fnModules) {
                 this.collectFunctionRoute(module);
             }
@@ -31,14 +41,11 @@ class WebRouterCollector {
             return routeB.priority - routeA.priority;
         });
     }
-    getApplicationContext() {
-        return this.applicationContext;
-    }
     collectRoute(module, functionMeta = false) {
-        const controllerId = decorator_1.getProviderId(module);
-        const controllerOption = decorator_1.getClassMetadata(decorator_1.CONTROLLER_KEY, module);
-        // sort for priority
-        let priority = decorator_1.getClassMetadata(decorator_1.PRIORITY_KEY, module);
+        const controllerId = (0, decorator_1.getProviderName)(module);
+        const id = (0, decorator_1.getProviderUUId)(module);
+        const controllerOption = (0, decorator_1.getClassMetadata)(decorator_1.CONTROLLER_KEY, module);
+        let priority;
         // implement middleware in controller
         const middleware = controllerOption.routerOptions.middleware;
         const prefix = controllerOption.prefix || '/';
@@ -55,12 +62,13 @@ class WebRouterCollector {
                 controllerId,
             });
         }
-        const webRouterInfo = decorator_1.getClassMetadata(decorator_1.WEB_ROUTER_KEY, module);
+        const webRouterInfo = (0, decorator_1.getClassMetadata)(decorator_1.WEB_ROUTER_KEY, module);
         if (webRouterInfo && typeof webRouterInfo[Symbol.iterator] === 'function') {
             for (const webRouter of webRouterInfo) {
-                const routeArgsInfo = decorator_1.getPropertyDataFromClass(decorator_1.WEB_ROUTER_PARAM_KEY, module, webRouter.method) || [];
-                const routerResponseData = decorator_1.getPropertyMetadata(decorator_1.WEB_RESPONSE_KEY, module, webRouter.method) || [];
+                const routeArgsInfo = (0, decorator_1.getPropertyDataFromClass)(decorator_1.WEB_ROUTER_PARAM_KEY, module, webRouter.method) || [];
+                const routerResponseData = (0, decorator_1.getPropertyMetadata)(decorator_1.WEB_RESPONSE_KEY, module, webRouter.method) || [];
                 const data = {
+                    id,
                     prefix,
                     routerName: webRouter.routerName || '',
                     url: webRouter.path,
@@ -81,7 +89,7 @@ class WebRouterCollector {
                     data.functionName = controllerId + '-' + webRouter.method;
                     data.functionTriggerName = decorator_1.ServerlessTriggerType.HTTP;
                     data.functionTriggerMetadata = {
-                        path: index_1.joinURLPath(prefix, webRouter.path.toString()),
+                        path: (0, index_1.joinURLPath)(prefix, webRouter.path.toString()),
                         method: webRouter.requestMethod,
                     };
                     data.functionMetadata = {
@@ -93,10 +101,11 @@ class WebRouterCollector {
         }
     }
     collectFunctionRoute(module, functionMeta = false) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        // 老的函数路由
-        const webRouterInfo = decorator_1.getClassMetadata(decorator_1.FUNC_KEY, module);
-        const controllerId = decorator_1.getProviderId(module);
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        // serverlessTrigger metadata
+        const webRouterInfo = (0, decorator_1.getClassMetadata)(decorator_1.FUNC_KEY, module);
+        const controllerId = (0, decorator_1.getProviderName)(module);
+        const id = (0, decorator_1.getProviderUUId)(module);
         const prefix = '/';
         if (!this.routes.has(prefix)) {
             this.routes.set(prefix, []);
@@ -109,131 +118,70 @@ class WebRouterCollector {
             });
         }
         for (const webRouter of webRouterInfo) {
-            if (webRouter['type']) {
-                // 新的 @ServerlessTrigger 写法
-                if ((_a = webRouter['metadata']) === null || _a === void 0 ? void 0 : _a['path']) {
-                    const routeArgsInfo = decorator_1.getPropertyDataFromClass(decorator_1.WEB_ROUTER_PARAM_KEY, module, webRouter['methodName']) || [];
-                    const routerResponseData = decorator_1.getPropertyMetadata(decorator_1.WEB_RESPONSE_KEY, module, webRouter['methodName']) || [];
-                    // 新 http/api gateway 函数
-                    const data = {
-                        prefix,
-                        routerName: '',
-                        url: webRouter['metadata']['path'],
-                        requestMethod: (_c = (_b = webRouter['metadata']) === null || _b === void 0 ? void 0 : _b['method']) !== null && _c !== void 0 ? _c : 'get',
-                        method: webRouter['methodName'],
-                        description: '',
-                        summary: '',
-                        handlerName: `${controllerId}.${webRouter['methodName']}`,
-                        funcHandlerName: `${controllerId}.${webRouter['methodName']}`,
-                        controllerId,
-                        middleware: ((_d = webRouter['metadata']) === null || _d === void 0 ? void 0 : _d['middleware']) || [],
-                        controllerMiddleware: [],
-                        requestMetadata: routeArgsInfo,
-                        responseMetadata: routerResponseData,
+            // 新的 @ServerlessTrigger 写法
+            if ((_a = webRouter['metadata']) === null || _a === void 0 ? void 0 : _a['path']) {
+                const routeArgsInfo = (0, decorator_1.getPropertyDataFromClass)(decorator_1.WEB_ROUTER_PARAM_KEY, module, webRouter['methodName']) || [];
+                const routerResponseData = (0, decorator_1.getPropertyMetadata)(decorator_1.WEB_RESPONSE_KEY, module, webRouter['methodName']) || [];
+                // 新 http/api gateway 函数
+                const data = {
+                    id,
+                    prefix,
+                    routerName: '',
+                    url: webRouter['metadata']['path'],
+                    requestMethod: (_c = (_b = webRouter['metadata']) === null || _b === void 0 ? void 0 : _b['method']) !== null && _c !== void 0 ? _c : 'get',
+                    method: webRouter['methodName'],
+                    description: '',
+                    summary: '',
+                    handlerName: `${controllerId}.${webRouter['methodName']}`,
+                    funcHandlerName: `${controllerId}.${webRouter['methodName']}`,
+                    controllerId,
+                    middleware: ((_d = webRouter['metadata']) === null || _d === void 0 ? void 0 : _d['middleware']) || [],
+                    controllerMiddleware: [],
+                    requestMetadata: routeArgsInfo,
+                    responseMetadata: routerResponseData,
+                };
+                if (functionMeta) {
+                    const functionMeta = (0, decorator_1.getPropertyMetadata)(decorator_1.SERVERLESS_FUNC_KEY, module, webRouter['methodName']) || {};
+                    const functionName = (_f = (_e = functionMeta['functionName']) !== null && _e !== void 0 ? _e : webRouter['functionName']) !== null && _f !== void 0 ? _f : createFunctionName(module, webRouter['methodName']);
+                    data.functionName = functionName;
+                    data.functionTriggerName = webRouter['type'];
+                    data.functionTriggerMetadata = webRouter['metadata'];
+                    data.functionMetadata = {
+                        functionName,
+                        ...functionMeta,
                     };
-                    if (functionMeta) {
-                        data.functionName = webRouter['functionName'];
-                        data.functionTriggerName = webRouter['type'];
-                        data.functionTriggerMetadata = webRouter['metadata'];
-                        const functionMeta = decorator_1.getPropertyMetadata(decorator_1.SERVERLESS_FUNC_KEY, module, webRouter['methodName']) || {};
-                        data.functionMetadata = {
-                            functionName: webRouter['functionName'],
-                            ...functionMeta,
-                        };
-                    }
-                    this.checkDuplicateAndPush(prefix, data);
-                }
-                else {
-                    if (functionMeta) {
-                        const functionMeta = decorator_1.getPropertyMetadata(decorator_1.SERVERLESS_FUNC_KEY, module, webRouter['methodName']) || {};
-                        // 其他类型的函数
-                        this.checkDuplicateAndPush(prefix, {
-                            prefix,
-                            routerName: '',
-                            url: '',
-                            requestMethod: '',
-                            method: webRouter['methodName'],
-                            description: '',
-                            summary: '',
-                            handlerName: `${controllerId}.${webRouter['methodName']}`,
-                            funcHandlerName: `${controllerId}.${webRouter['methodName']}`,
-                            controllerId,
-                            middleware: [],
-                            controllerMiddleware: [],
-                            requestMetadata: [],
-                            responseMetadata: [],
-                            functionName: webRouter['functionName'],
-                            functionTriggerName: webRouter['type'],
-                            functionTriggerMetadata: webRouter['metadata'],
-                            functionMetadata: {
-                                functionName: webRouter['functionName'],
-                                ...functionMeta,
-                            },
-                        });
-                    }
                 }
+                this.checkDuplicateAndPush(prefix, data);
             }
             else {
-                // 老的 @Func 写法
-                if (webRouter['path'] || webRouter['middleware']) {
-                    const data = {
+                if (functionMeta) {
+                    const functionMeta = (0, decorator_1.getPropertyMetadata)(decorator_1.SERVERLESS_FUNC_KEY, module, webRouter['methodName']) || {};
+                    const functionName = (_h = (_g = functionMeta['functionName']) !== null && _g !== void 0 ? _g : webRouter['functionName']) !== null && _h !== void 0 ? _h : createFunctionName(module, webRouter['methodName']);
+                    // 其他类型的函数
+                    this.checkDuplicateAndPush(prefix, {
+                        id,
                         prefix,
                         routerName: '',
-                        url: (_e = webRouter['path']) !== null && _e !== void 0 ? _e : '',
-                        requestMethod: (_f = webRouter['method']) !== null && _f !== void 0 ? _f : 'get',
-                        method: (_g = webRouter['key']) !== null && _g !== void 0 ? _g : '',
+                        url: '',
+                        requestMethod: '',
+                        method: webRouter['methodName'],
                         description: '',
                         summary: '',
-                        handlerName: `${controllerId}.${webRouter['key']}`,
-                        funcHandlerName: webRouter['funHandler'] || `${controllerId}.${webRouter['key']}`,
+                        handlerName: `${controllerId}.${webRouter['methodName']}`,
+                        funcHandlerName: `${controllerId}.${webRouter['methodName']}`,
                         controllerId,
-                        middleware: webRouter['middleware'] || [],
+                        middleware: [],
                         controllerMiddleware: [],
                         requestMetadata: [],
                         responseMetadata: [],
-                    };
-                    if (functionMeta) {
-                        // get function information
-                        data.functionName = controllerId + '-' + ((_h = webRouter['key']) !== null && _h !== void 0 ? _h : '');
-                        data.functionTriggerName = decorator_1.ServerlessTriggerType.HTTP;
-                        data.functionTriggerMetadata = {
-                            path: (_j = webRouter['path']) !== null && _j !== void 0 ? _j : '/',
-                            method: (_k = webRouter['method']) !== null && _k !== void 0 ? _k : 'get',
-                        };
-                        data.functionMetadata = {
-                            functionName: data.functionName,
-                        };
-                    }
-                    // 老函数的 http
-                    this.checkDuplicateAndPush(prefix, data);
-                }
-                else {
-                    if (functionMeta) {
-                        // 非 http
-                        this.checkDuplicateAndPush(prefix, {
-                            prefix,
-                            routerName: '',
-                            url: '',
-                            requestMethod: '',
-                            method: webRouter['key'],
-                            description: '',
-                            summary: '',
-                            handlerName: `${controllerId}.${webRouter['key']}`,
-                            funcHandlerName: webRouter['funHandler'] ||
-                                `${controllerId}.${webRouter['key']}`,
-                            controllerId,
-                            middleware: webRouter['middleware'] || [],
-                            controllerMiddleware: [],
-                            requestMetadata: [],
-                            responseMetadata: [],
-                            functionName: webRouter['functionName'],
-                            functionTriggerName: webRouter['type'],
-                            functionTriggerMetadata: webRouter['metadata'],
-                            functionMetadata: {
-                                functionName: webRouter['functionName'],
-                            },
-                        });
-                    }
+                        functionName,
+                        functionTriggerName: webRouter['type'],
+                        functionTriggerMetadata: webRouter['metadata'],
+                        functionMetadata: {
+                            functionName,
+                            ...functionMeta,
+                        },
+                    });
                 }
             }
         }
@@ -247,7 +195,7 @@ class WebRouterCollector {
         return urlMatchList
             .map(item => {
             const urlString = item.url.toString();
-            const weightArr = decorator_1.isRegExp(item.url)
+            const weightArr = (0, decorator_1.isRegExp)(item.url)
                 ? urlString.split('/')
                 : urlString.split('/');
             let weight = 0;
@@ -338,4 +286,7 @@ class WebRouterCollector {
     }
 }
 exports.WebRouterCollector = WebRouterCollector;
+function createFunctionName(target, functionName) {
+    return (0, decorator_1.getProviderName)(target).replace(/[:#]/g, '-') + '-' + functionName;
+}
 //# sourceMappingURL=webRouterCollector.js.map