@midwayjs/core 3.0.0-alpha.41 → 3.0.0-alpha.42

package/dist/definitions/properties.js

@@ -5,7 +5,7 @@ const _ = require("../common/lodashWrap");
 const util_1 = require("util");
 class ObjectProperties {
     constructor() {
-        this.innerConfig = new Map();
+        this.innerConfig = {};
     }
     get size() {
         return this.keys().length;
@@ -28,7 +28,7 @@ class ObjectProperties {
         return JSON.parse(JSON.stringify(_.get(this.innerConfig, key)));
     }
     has(key) {
-        return this.innerConfig.get(key) !== undefined;
+        return this.innerConfig[key] !== undefined;
     }
     set(key, value) {
         const origin = this.get(key);
@@ -38,14 +38,25 @@ class ObjectProperties {
     putAll(props) {
         const keys = props.keys();
         for (const key of keys) {
-            if (typeof this.innerConfig.get(key) === 'object') {
-                this.set(key, _.defaultsDeep(props.get(key), this.innerConfig.get(key)));
+            if (typeof this.innerConfig[key] === 'object') {
+                this.set(key, _.defaultsDeep(props.get(key), this.innerConfig[key]));
             }
             else {
                 this.set(key, props.get(key));
             }
         }
     }
+    putObject(props, needClone = false) {
+        if (needClone) {
+            const tmp = _.cloneDeep(props);
+            _.defaultsDeep(tmp, this.innerConfig);
+            this.innerConfig = tmp;
+        }
+        else {
+            _.defaultsDeep(props, this.innerConfig);
+            this.innerConfig = props;
+        }
+    }
     stringPropertyNames() {
         return this.keys();
     }
@@ -62,11 +73,16 @@ class ObjectProperties {
         return this.set(key, value);
     }
     clear() {
-        this.innerConfig.clear();
+        this.innerConfig = {};
     }
     toJSON() {
         return JSON.parse(JSON.stringify(this.innerConfig));
     }
+    clone() {
+        const cfg = new ObjectProperties();
+        cfg.putObject(this.toJSON());
+        return cfg;
+    }
 }
 exports.ObjectProperties = ObjectProperties;
 //# sourceMappingURL=properties.js.map

package/dist/features/pipeline.d.ts

@@ -127,7 +127,7 @@ export interface IPipelineHandler {
      */
     waterfall<T>(opts: IPipelineOptions): Promise<IPipelineResult<T>>;
 }
-import { IMidwayContainer } from '../interface';
+import { IApplicationContext } from '../interface';
 export declare class PipelineContext implements IPipelineContext {
     args: any;
     info: {
@@ -145,7 +145,7 @@ export declare class PipelineContext implements IPipelineContext {
 export declare class PipelineHandler implements IPipelineHandler {
     private applicationContext;
     private valves;
-    constructor(applicationContext: IMidwayContainer, valves?: string[]);
+    constructor(applicationContext: IApplicationContext, valves?: string[]);
     parallel<T>(opts: IPipelineOptions): Promise<IPipelineResult<T>>;
     concat<T>(opts: IPipelineOptions): Promise<IPipelineResult<T>>;
     series<T>(opts: IPipelineOptions): Promise<IPipelineResult<T>>;
@@ -155,5 +155,5 @@ export declare class PipelineHandler implements IPipelineHandler {
     private prepareParallelValves;
     private packResult;
 }
-export declare function pipelineFactory(applicationContext: IMidwayContainer, valves?: string[]): PipelineHandler;
+export declare function pipelineFactory(applicationContext: IApplicationContext, valves?: string[]): PipelineHandler;
 //# sourceMappingURL=pipeline.d.ts.map

package/dist/functional/configuration.d.ts

@@ -3,10 +3,8 @@ import { InjectionConfigurationOptions } from '@midwayjs/decorator';
 export declare class FunctionalConfiguration {
     private readyHandler;
     private stopHandler;
-    private configLoadHandler;
     private options;
     constructor(options: InjectionConfigurationOptions);
-    onConfigLoad(configLoadHandler: ((container: IMidwayContainer, app: IMidwayApplication) => any) | IMidwayContainer, app?: IMidwayApplication): this;
     onReady(readyHandler: ((container: IMidwayContainer, app: IMidwayApplication) => void) | IMidwayContainer, app?: IMidwayApplication): this;
     onStop(stopHandler: ((container: IMidwayContainer, app: IMidwayApplication) => void) | IMidwayContainer, app?: IMidwayApplication): this;
     getConfigurationOptions(): InjectionConfigurationOptions;

package/dist/functional/configuration.js

@@ -6,16 +6,6 @@ class FunctionalConfiguration {
         this.options = options;
         this.readyHandler = () => { };
         this.stopHandler = () => { };
-        this.configLoadHandler = () => { };
-    }
-    onConfigLoad(configLoadHandler, app) {
-        if (typeof configLoadHandler === 'function') {
-            this.configLoadHandler = configLoadHandler;
-        }
-        else {
-            this.configLoadHandler(configLoadHandler, app);
-        }
-        return this;
     }
     onReady(readyHandler, app) {
         if (typeof readyHandler === 'function') {

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { MidwayFrameworkType } from '@midwayjs/decorator';
+export { ObjectIdentifier, ObjectDefinitionOptions, IManagedInstance, ScopeEnum, MidwayFrameworkType, saveClassMetadata, attachClassMetadata, getClassMetadata, savePropertyDataToClass, attachPropertyDataToClass, getPropertyDataFromClass, listPropertyDataFromClass, savePropertyMetadata, attachPropertyMetadata, getPropertyMetadata, savePreloadModule, listPreloadModule, saveModule, listModule, resetModule, clearAllModule, getParamNames, getProviderId, getObjectDefinition, classNamed, generateProvideId, } from '@midwayjs/decorator';
 export * from './interface';
 export * from './context/container';
 export { MidwayRequestContainer } from './context/requestContainer';

package/dist/index.js

@@ -10,9 +10,31 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.classToPlain = exports.plainToClass = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = exports.MidwayFrameworkType = void 0;
+exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.classToPlain = exports.plainToClass = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = exports.generateProvideId = exports.classNamed = exports.getObjectDefinition = exports.getProviderId = exports.getParamNames = exports.clearAllModule = exports.resetModule = exports.listModule = exports.saveModule = exports.listPreloadModule = exports.savePreloadModule = exports.getPropertyMetadata = exports.attachPropertyMetadata = exports.savePropertyMetadata = exports.listPropertyDataFromClass = exports.getPropertyDataFromClass = exports.attachPropertyDataToClass = exports.savePropertyDataToClass = exports.getClassMetadata = exports.attachClassMetadata = exports.saveClassMetadata = exports.MidwayFrameworkType = exports.ScopeEnum = void 0;
 var decorator_1 = require("@midwayjs/decorator");
+Object.defineProperty(exports, "ScopeEnum", { enumerable: true, get: function () { return decorator_1.ScopeEnum; } });
 Object.defineProperty(exports, "MidwayFrameworkType", { enumerable: true, get: function () { return decorator_1.MidwayFrameworkType; } });
+Object.defineProperty(exports, "saveClassMetadata", { enumerable: true, get: function () { return decorator_1.saveClassMetadata; } });
+Object.defineProperty(exports, "attachClassMetadata", { enumerable: true, get: function () { return decorator_1.attachClassMetadata; } });
+Object.defineProperty(exports, "getClassMetadata", { enumerable: true, get: function () { return decorator_1.getClassMetadata; } });
+Object.defineProperty(exports, "savePropertyDataToClass", { enumerable: true, get: function () { return decorator_1.savePropertyDataToClass; } });
+Object.defineProperty(exports, "attachPropertyDataToClass", { enumerable: true, get: function () { return decorator_1.attachPropertyDataToClass; } });
+Object.defineProperty(exports, "getPropertyDataFromClass", { enumerable: true, get: function () { return decorator_1.getPropertyDataFromClass; } });
+Object.defineProperty(exports, "listPropertyDataFromClass", { enumerable: true, get: function () { return decorator_1.listPropertyDataFromClass; } });
+Object.defineProperty(exports, "savePropertyMetadata", { enumerable: true, get: function () { return decorator_1.savePropertyMetadata; } });
+Object.defineProperty(exports, "attachPropertyMetadata", { enumerable: true, get: function () { return decorator_1.attachPropertyMetadata; } });
+Object.defineProperty(exports, "getPropertyMetadata", { enumerable: true, get: function () { return decorator_1.getPropertyMetadata; } });
+Object.defineProperty(exports, "savePreloadModule", { enumerable: true, get: function () { return decorator_1.savePreloadModule; } });
+Object.defineProperty(exports, "listPreloadModule", { enumerable: true, get: function () { return decorator_1.listPreloadModule; } });
+Object.defineProperty(exports, "saveModule", { enumerable: true, get: function () { return decorator_1.saveModule; } });
+Object.defineProperty(exports, "listModule", { enumerable: true, get: function () { return decorator_1.listModule; } });
+Object.defineProperty(exports, "resetModule", { enumerable: true, get: function () { return decorator_1.resetModule; } });
+Object.defineProperty(exports, "clearAllModule", { enumerable: true, get: function () { return decorator_1.clearAllModule; } });
+Object.defineProperty(exports, "getParamNames", { enumerable: true, get: function () { return decorator_1.getParamNames; } });
+Object.defineProperty(exports, "getProviderId", { enumerable: true, get: function () { return decorator_1.getProviderId; } });
+Object.defineProperty(exports, "getObjectDefinition", { enumerable: true, get: function () { return decorator_1.getObjectDefinition; } });
+Object.defineProperty(exports, "classNamed", { enumerable: true, get: function () { return decorator_1.classNamed; } });
+Object.defineProperty(exports, "generateProvideId", { enumerable: true, get: function () { return decorator_1.generateProvideId; } });
 __exportStar(require("./interface"), exports);
 __exportStar(require("./context/container"), exports);
 var requestContainer_1 = require("./context/requestContainer");

package/dist/interface.d.ts

@@ -5,7 +5,7 @@ import { ILogger, LoggerOptions } from '@midwayjs/logger';
  * 生命周期定义
  */
 export interface ILifeCycle {
-    onConfigLoad?(container: IMidwayContainer, app?: IMidwayApplication): Promise<any>;
+    onConfigLoad?(container: IMidwayContainer, app?: IMidwayApplication): Promise<void>;
     onReady(container: IMidwayContainer, app?: IMidwayApplication): Promise<void>;
     onStop?(container: IMidwayContainer, app?: IMidwayApplication): Promise<void>;
 }
@@ -22,6 +22,7 @@ export interface IMessageSource {
  */
 export interface IObjectFactory {
     registry: IObjectDefinitionRegistry;
+    isAsync(identifier: ObjectIdentifier): boolean;
     get<T>(identifier: new () => T, args?: any): T;
     get<T>(identifier: ObjectIdentifier, args?: any): T;
     getAsync<T>(identifier: new () => T, args?: any): Promise<T>;
@@ -44,6 +45,7 @@ export interface IObjectDefinition {
     dependsOn: ObjectIdentifier[];
     constructorArgs: IManagedInstance[];
     properties: IProperties;
+    isAutowire(): boolean;
     isAsync(): boolean;
     isSingletonScope(): boolean;
     isRequestScope(): boolean;
@@ -63,12 +65,13 @@ export interface HandlerProp {
  */
 export interface IObjectDefinitionMetadata {
     namespace?: string;
-    id: ObjectIdentifier;
+    id: string;
     name: string;
     initMethod: string;
     destroyMethod: string;
     constructMethod: string;
     scope: ScopeEnum;
+    autowire: boolean;
     srcPath: string;
     path: any;
     export: string;
@@ -85,14 +88,13 @@ export interface IObjectDefinitionMetadata {
 }
 export interface FrameworkDecoratorMetadata {
     key: string;
-    targetKey: string;
     propertyName: string;
     meta: any;
 }
 export interface IObjectCreator {
     load(): any;
-    doConstruct(Clzz: any, args?: any, context?: IMidwayContainer): any;
-    doConstructAsync(Clzz: any, args?: any, context?: IMidwayContainer): Promise<any>;
+    doConstruct(Clzz: any, args?: any, context?: IApplicationContext): any;
+    doConstructAsync(Clzz: any, args?: any, context?: IApplicationContext): Promise<any>;
     doInit(obj: any): void;
     doInitAsync(obj: any): Promise<void>;
     doDestroy(obj: any): void;
@@ -107,6 +109,7 @@ export interface IObjectDefinitionRegistry {
     registerDefinition(identifier: ObjectIdentifier, definition: IObjectDefinition): any;
     getSingletonDefinitionIds(): ObjectIdentifier[];
     getDefinition(identifier: ObjectIdentifier): IObjectDefinition;
+    getDefinitionByPath(path: string): IObjectDefinition;
     getDefinitionByName(name: string): IObjectDefinition[];
     removeDefinition(identifier: ObjectIdentifier): void;
     hasDefinition(identifier: ObjectIdentifier): boolean;
@@ -114,8 +117,6 @@ export interface IObjectDefinitionRegistry {
     hasObject(identifier: ObjectIdentifier): boolean;
     registerObject(identifier: ObjectIdentifier, target: any): any;
     getObject(identifier: ObjectIdentifier): any;
-    getIdentifierRelation(): IIdentifierRelationShip;
-    setIdentifierRelation(identifierRelation: IIdentifierRelationShip): any;
 }
 /**
  * 属性配置抽象
@@ -134,6 +135,7 @@ export interface IProperties {
     addProperty(key: ObjectIdentifier, value: any): void;
     setProperty(key: ObjectIdentifier, value: any): any;
     clear(): void;
+    clone(): IProperties;
 }
 /**
  * 资源配置抽象
@@ -154,6 +156,19 @@ export interface IResource {
     getSubResources(): IResource[];
     createRelative(path: string): IResource;
 }
+/**
+ * IoC上下文抽象
+ */
+export interface IApplicationContext extends IObjectFactory {
+    disableConflictCheck: boolean;
+    baseDir: string;
+    parent: IApplicationContext;
+    props: IProperties;
+    dependencyMap: Map<string, ObjectDependencyTree>;
+    ready(): any;
+    stop(): Promise<void>;
+    registerObject(identifier: ObjectIdentifier, target: any): any;
+}
 /**
  * 解析内部管理的属性、json、ref等实例的解析器
  * 同时创建这些对象的实际使用的对象
@@ -199,18 +214,7 @@ export interface IResolverHandler {
     hasHandler(key: string): boolean;
     getHandler(key: string): any;
 }
-export interface IIdentifierRelationShip {
-    saveClassRelation(module: any, namespace?: string): any;
-    saveFunctionRelation(ObjectIdentifier: any, uuid: any): any;
-    hasRelation(id: ObjectIdentifier): boolean;
-    getRelation(id: ObjectIdentifier): string;
-}
-export interface IMidwayContainer extends IObjectFactory {
-    parent: IMidwayContainer;
-    identifierMapping: IIdentifierRelationShip;
-    ready(): any;
-    stop(): Promise<void>;
-    registerObject(identifier: ObjectIdentifier, target: any): any;
+export interface IMidwayContainer extends IApplicationContext {
     load(module?: any): any;
     bind<T>(target: T, options?: ObjectDefinitionOptions): void;
     bind<T>(identifier: ObjectIdentifier, target: T, options?: ObjectDefinitionOptions): void;
@@ -219,6 +223,9 @@ export interface IMidwayContainer extends IObjectFactory {
     setFileDetector(fileDetector: IFileDetector): any;
     registerDataHandler(handlerType: string, handler: (...args: any[]) => any): any;
     createChild(): IMidwayContainer;
+    /**
+     * 默认不添加创建的 configuration 到 configurations 数组中
+     */
     getConfigService(): IConfigService;
     getEnvironmentService(): IEnvironmentService;
     getInformationService(): IInformationService;
@@ -239,7 +246,7 @@ export interface IMidwayContainer extends IObjectFactory {
     getAttr<T>(key: string): T;
 }
 export interface IFileDetector {
-    run(container: IMidwayContainer): any;
+    run(container: IApplicationContext): any;
 }
 export interface IConfigService {
     add(configFilePaths: any[]): any;
@@ -317,6 +324,11 @@ export interface IMidwayBaseApplication<T extends IMidwayContext = IMidwayContex
     getAttr<T>(key: string): T;
 }
 export declare type IMidwayApplication<T extends IMidwayContext = IMidwayContext, FrameworkApplication = unknown> = IMidwayBaseApplication<T> & FrameworkApplication;
+/**
+ * @deprecated
+ */
+export interface IMidwayCoreApplication extends IMidwayApplication {
+}
 export interface IMidwayBootstrapOptions {
     logger?: ILogger | boolean;
     baseDir?: string;
@@ -330,7 +342,6 @@ export interface IMidwayBootstrapOptions {
     loadDir?: string[];
     disableConflictCheck?: boolean;
     applicationContext?: IMidwayContainer;
-    configurationModule?: any;
     isMainFramework?: boolean;
     globalApplicationHandler?: (type: MidwayFrameworkType) => IMidwayApplication;
     globalConfig?: any;

package/dist/util/containerUtil.js

@@ -15,7 +15,7 @@ const createModuleContainer = (options) => {
 };
 exports.createModuleContainer = createModuleContainer;
 const createDirectoryGlobContainer = options => {
-    const applicationContext = new container_1.MidwayContainer();
+    const applicationContext = new container_1.MidwayContainer(options.baseDir, undefined);
     applicationContext.setFileDetector(new fileDetector_1.DirectoryFileDetector({
         loadDir: options.baseDir,
     }));

package/dist/util/staticConfig.d.ts

@@ -0,0 +1,10 @@
+import { IConfigService } from '..';
+export declare class StaticConfigLoader {
+    baseDir: string;
+    configService: IConfigService;
+    constructor(baseDir: string, currentEnvironment: string);
+    getSerializeConfig(): Promise<string>;
+    analyzeConfiguration(configurationModule: any): void;
+    private getConfigurationExport;
+}
+//# sourceMappingURL=staticConfig.d.ts.map

package/dist/util/staticConfig.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StaticConfigLoader = void 0;
+const path_1 = require("path");
+const decorator_1 = require("@midwayjs/decorator");
+const __1 = require("..");
+const configService_1 = require("../service/configService");
+class StaticConfigLoader {
+    constructor(baseDir, currentEnvironment) {
+        this.baseDir = baseDir;
+        this.configService = new configService_1.MidwayConfigService({
+            getCurrentEnv() {
+                return currentEnvironment;
+            },
+        });
+    }
+    async getSerializeConfig() {
+        const mainModule = (0, __1.safeRequire)(this.baseDir);
+        let mainConfiguration;
+        if (mainModule && mainModule['Configuration']) {
+            mainConfiguration = mainModule['Configuration'];
+        }
+        else {
+            mainConfiguration = (0, __1.safeRequire)((0, path_1.join)(this.baseDir, 'src', 'configuration.ts'));
+        }
+        const modules = this.getConfigurationExport(mainConfiguration);
+        for (const module of modules) {
+            this.analyzeConfiguration(module);
+        }
+        this.configService.load();
+        return this.configService.getConfiguration();
+    }
+    analyzeConfiguration(configurationModule) {
+        if (!configurationModule)
+            return;
+        const configurationOptions = (0, decorator_1.getClassMetadata)(decorator_1.CONFIGURATION_KEY, configurationModule);
+        if (!configurationOptions)
+            return;
+        if (configurationOptions.imports) {
+            for (const importModule of configurationOptions.imports) {
+                if (typeof importModule !== 'string') {
+                    this.analyzeConfiguration(importModule['Configuration']);
+                }
+            }
+        }
+        if (configurationOptions === null || configurationOptions === void 0 ? void 0 : configurationOptions.importConfigs) {
+            this.configService.add(configurationOptions.importConfigs);
+        }
+    }
+    getConfigurationExport(exports) {
+        const mods = [];
+        if ((0, decorator_1.isClass)(exports) || (0, decorator_1.isFunction)(exports)) {
+            mods.push(exports);
+        }
+        else {
+            for (const m in exports) {
+                const module = exports[m];
+                if ((0, decorator_1.isClass)(module) || (0, decorator_1.isFunction)(module)) {
+                    mods.push(module);
+                }
+            }
+        }
+        return mods;
+    }
+}
+exports.StaticConfigLoader = StaticConfigLoader;
+//# sourceMappingURL=staticConfig.js.map

package/dist/util/webRouterCollector.d.ts

@@ -1,8 +1,4 @@
 export interface RouterInfo {
-    /**
-     * uuid
-     */
-    id: string;
     /**
      * router prefix
      */
@@ -96,10 +92,6 @@ export declare class WebRouterCollector {
         _paramString: string;
         _category: number;
         _weight: number;
-        /**
-         * uuid
-         */
-        id: string;
         /**
          * router prefix
          */

package/dist/util/webRouterCollector.js

@@ -42,10 +42,10 @@ class WebRouterCollector {
         });
     }
     collectRoute(module, functionMeta = false) {
-        const controllerId = (0, decorator_1.getProviderName)(module);
-        const id = (0, decorator_1.getProviderUUId)(module);
+        const controllerId = (0, decorator_1.getProviderId)(module);
         const controllerOption = (0, decorator_1.getClassMetadata)(decorator_1.CONTROLLER_KEY, module);
-        let priority;
+        // sort for priority
+        let priority = (0, decorator_1.getClassMetadata)(decorator_1.PRIORITY_KEY, module);
         // implement middleware in controller
         const middleware = controllerOption.routerOptions.middleware;
         const prefix = controllerOption.prefix || '/';
@@ -68,7 +68,6 @@ class WebRouterCollector {
                 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,
@@ -101,11 +100,10 @@ class WebRouterCollector {
         }
     }
     collectFunctionRoute(module, functionMeta = false) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        // serverlessTrigger metadata
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        // 老的函数路由
         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 controllerId = (0, decorator_1.getProviderId)(module);
         const prefix = '/';
         if (!this.routes.has(prefix)) {
             this.routes.set(prefix, []);
@@ -118,70 +116,131 @@ class WebRouterCollector {
             });
         }
         for (const webRouter of webRouterInfo) {
-            // 新的 @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 (webRouter['type']) {
+                // 新的 @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 = {
+                        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) {
+                        data.functionName = webRouter['functionName'];
+                        data.functionTriggerName = webRouter['type'];
+                        data.functionTriggerMetadata = webRouter['metadata'];
+                        const functionMeta = (0, 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 = (0, 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 {
-                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,
+                // 老的 @Func 写法
+                if (webRouter['path'] || webRouter['middleware']) {
+                    const data = {
                         prefix,
                         routerName: '',
-                        url: '',
-                        requestMethod: '',
-                        method: webRouter['methodName'],
+                        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 : '',
                         description: '',
                         summary: '',
-                        handlerName: `${controllerId}.${webRouter['methodName']}`,
-                        funcHandlerName: `${controllerId}.${webRouter['methodName']}`,
+                        handlerName: `${controllerId}.${webRouter['key']}`,
+                        funcHandlerName: webRouter['funHandler'] || `${controllerId}.${webRouter['key']}`,
                         controllerId,
-                        middleware: [],
+                        middleware: webRouter['middleware'] || [],
                         controllerMiddleware: [],
                         requestMetadata: [],
                         responseMetadata: [],
-                        functionName,
-                        functionTriggerName: webRouter['type'],
-                        functionTriggerMetadata: webRouter['metadata'],
-                        functionMetadata: {
-                            functionName,
-                            ...functionMeta,
-                        },
-                    });
+                    };
+                    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'],
+                            },
+                        });
+                    }
                 }
             }
         }
@@ -286,7 +345,4 @@ class WebRouterCollector {
     }
 }
 exports.WebRouterCollector = WebRouterCollector;
-function createFunctionName(target, functionName) {
-    return (0, decorator_1.getProviderName)(target).replace(/[:#]/g, '-') + '-' + functionName;
-}
 //# sourceMappingURL=webRouterCollector.js.map