@midwayjs/core 3.3.5 → 3.4.0-beta.10

package/dist/error/framework.d.ts

@@ -16,6 +16,8 @@ export declare const FrameworkErrorEnum: {
     readonly UTIL_HTTP_TIMEOUT: "MIDWAY_10012";
     readonly INCONSISTENT_VERSION: "MIDWAY_10013";
     readonly INVALID_CONFIG: "MIDWAY_10014";
+    readonly DUPLICATE_CLASS_NAME: "MIDWAY_10015";
+    readonly DUPLICATE_CONTROLLER_PREFIX_OPTIONS: "MIDWAY_10016";
 };
 export declare class MidwayCommonError extends MidwayError {
     constructor(message: string);
@@ -62,4 +64,10 @@ export declare class MidwayUtilHttpClientTimeoutError extends MidwayError {
 export declare class MidwayInconsistentVersionError extends MidwayError {
     constructor();
 }
+export declare class MidwayDuplicateClassNameError extends MidwayError {
+    constructor(className: string, existPath: string, existPathOther: string);
+}
+export declare class MidwayDuplicateControllerOptionsError extends MidwayError {
+    constructor(prefix: string, existController: string, existControllerOther: string);
+}
 //# sourceMappingURL=framework.d.ts.map

package/dist/error/framework.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayInconsistentVersionError = exports.MidwayUtilHttpClientTimeoutError = exports.MidwayMissingImportComponentError = exports.MidwaySingletonInjectRequestError = exports.MidwayUseWrongMethodError = exports.MidwayDuplicateRouteError = exports.MidwayResolverMissingError = exports.MidwayInvalidConfigError = exports.MidwayConfigMissingError = exports.MidwayFeatureNotImplementedError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = exports.FrameworkErrorEnum = void 0;
+exports.MidwayDuplicateControllerOptionsError = exports.MidwayDuplicateClassNameError = exports.MidwayInconsistentVersionError = exports.MidwayUtilHttpClientTimeoutError = exports.MidwayMissingImportComponentError = exports.MidwaySingletonInjectRequestError = exports.MidwayUseWrongMethodError = exports.MidwayDuplicateRouteError = exports.MidwayResolverMissingError = exports.MidwayInvalidConfigError = exports.MidwayConfigMissingError = exports.MidwayFeatureNotImplementedError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = exports.FrameworkErrorEnum = void 0;
 const base_1 = require("./base");
 exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
     UNKNOWN: 10000,
@@ -18,6 +18,8 @@ exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
     UTIL_HTTP_TIMEOUT: 10012,
     INCONSISTENT_VERSION: 10013,
     INVALID_CONFIG: 10014,
+    DUPLICATE_CLASS_NAME: 10015,
+    DUPLICATE_CONTROLLER_PREFIX_OPTIONS: 10016,
 });
 class MidwayCommonError extends base_1.MidwayError {
     constructor(message) {
@@ -122,4 +124,16 @@ class MidwayInconsistentVersionError extends base_1.MidwayError {
     }
 }
 exports.MidwayInconsistentVersionError = MidwayInconsistentVersionError;
+class MidwayDuplicateClassNameError extends base_1.MidwayError {
+    constructor(className, existPath, existPathOther) {
+        super(`"${className}" duplicated between "${existPath}" and "${existPathOther}"`, exports.FrameworkErrorEnum.DUPLICATE_CLASS_NAME);
+    }
+}
+exports.MidwayDuplicateClassNameError = MidwayDuplicateClassNameError;
+class MidwayDuplicateControllerOptionsError extends base_1.MidwayError {
+    constructor(prefix, existController, existControllerOther) {
+        super(`"Prefix ${prefix}" with duplicated controller options between "${existController}" and "${existControllerOther}"`, exports.FrameworkErrorEnum.DUPLICATE_CONTROLLER_PREFIX_OPTIONS);
+    }
+}
+exports.MidwayDuplicateControllerOptionsError = MidwayDuplicateControllerOptionsError;
 //# sourceMappingURL=framework.js.map

package/dist/index.d.ts

@@ -4,12 +4,10 @@ export { MidwayRequestContainer } from './context/requestContainer';
 export { BaseFramework } from './baseFramework';
 export * from './context/providerWrapper';
 export * from './common/constants';
-export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, delegateTargetAllPrototypeMethod, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, } from './util/';
+export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, delegateTargetAllPrototypeMethod, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, wrapAsync, } from './util/';
 export { extend } from './util/extend';
 export * from './util/pathFileUtil';
 export * from './util/webRouterParam';
-export * from './common/webRouterCollector';
-export * from './common/triggerCollector';
 export { createConfiguration } from './functional/configuration';
 export { MidwayConfigService } from './service/configService';
 export { MidwayEnvironmentService } from './service/environmentService';
@@ -21,6 +19,9 @@ export { MidwayLifeCycleService } from './service/lifeCycleService';
 export { MidwayMiddlewareService } from './service/middlewareService';
 export { MidwayDecoratorService } from './service/decoratorService';
 export { MidwayMockService } from './service/mockService';
+export { RouterInfo, DynamicRouterInfo, RouterPriority, RouterCollectorOptions, MidwayWebRouterService, } from './service/webRouterService';
+export { MidwayServerlessFunctionService, WebRouterCollector, } from './service/slsFunctionService';
+export { DataSourceManager } from './common/dataSourceManager';
 export * from './service/pipelineService';
 export * from './util/contextUtil';
 export * from './common/serviceFactory';
@@ -34,6 +35,7 @@ export * from './common/filterManager';
 export * from './common/applicationManager';
 export * from './setup';
 export * from './error';
+export { AsyncContextManager, ASYNC_ROOT_CONTEXT, AsyncContext, } from './common/asyncContextManager';
 /**
  * proxy
  */

package/dist/index.js

@@ -14,7 +14,7 @@ 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.MidwayFrameworkType = exports.MidwayMockService = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.extend = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
+exports.MidwayFrameworkType = exports.ASYNC_ROOT_CONTEXT = exports.DataSourceManager = exports.WebRouterCollector = exports.MidwayServerlessFunctionService = exports.MidwayWebRouterService = exports.MidwayMockService = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.extend = exports.wrapAsync = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
 __exportStar(require("./interface"), exports);
 __exportStar(require("./context/container"), exports);
 var requestContainer_1 = require("./context/requestContainer");
@@ -34,12 +34,11 @@ Object.defineProperty(exports, "deprecatedOutput", { enumerable: true, get: func
 Object.defineProperty(exports, "transformRequestObjectByType", { enumerable: true, get: function () { return util_1.transformRequestObjectByType; } });
 Object.defineProperty(exports, "pathMatching", { enumerable: true, get: function () { return util_1.pathMatching; } });
 Object.defineProperty(exports, "wrapMiddleware", { enumerable: true, get: function () { return util_1.wrapMiddleware; } });
+Object.defineProperty(exports, "wrapAsync", { enumerable: true, get: function () { return util_1.wrapAsync; } });
 var extend_1 = require("./util/extend");
 Object.defineProperty(exports, "extend", { enumerable: true, get: function () { return extend_1.extend; } });
 __exportStar(require("./util/pathFileUtil"), exports);
 __exportStar(require("./util/webRouterParam"), exports);
-__exportStar(require("./common/webRouterCollector"), exports);
-__exportStar(require("./common/triggerCollector"), exports);
 var configuration_1 = require("./functional/configuration");
 Object.defineProperty(exports, "createConfiguration", { enumerable: true, get: function () { return configuration_1.createConfiguration; } });
 var configService_1 = require("./service/configService");
@@ -62,6 +61,13 @@ var decoratorService_1 = require("./service/decoratorService");
 Object.defineProperty(exports, "MidwayDecoratorService", { enumerable: true, get: function () { return decoratorService_1.MidwayDecoratorService; } });
 var mockService_1 = require("./service/mockService");
 Object.defineProperty(exports, "MidwayMockService", { enumerable: true, get: function () { return mockService_1.MidwayMockService; } });
+var webRouterService_1 = require("./service/webRouterService");
+Object.defineProperty(exports, "MidwayWebRouterService", { enumerable: true, get: function () { return webRouterService_1.MidwayWebRouterService; } });
+var slsFunctionService_1 = require("./service/slsFunctionService");
+Object.defineProperty(exports, "MidwayServerlessFunctionService", { enumerable: true, get: function () { return slsFunctionService_1.MidwayServerlessFunctionService; } });
+Object.defineProperty(exports, "WebRouterCollector", { enumerable: true, get: function () { return slsFunctionService_1.WebRouterCollector; } });
+var dataSourceManager_1 = require("./common/dataSourceManager");
+Object.defineProperty(exports, "DataSourceManager", { enumerable: true, get: function () { return dataSourceManager_1.DataSourceManager; } });
 __exportStar(require("./service/pipelineService"), exports);
 __exportStar(require("./util/contextUtil"), exports);
 __exportStar(require("./common/serviceFactory"), exports);
@@ -75,6 +81,8 @@ __exportStar(require("./common/filterManager"), exports);
 __exportStar(require("./common/applicationManager"), exports);
 __exportStar(require("./setup"), exports);
 __exportStar(require("./error"), exports);
+var asyncContextManager_1 = require("./common/asyncContextManager");
+Object.defineProperty(exports, "ASYNC_ROOT_CONTEXT", { enumerable: true, get: function () { return asyncContextManager_1.ASYNC_ROOT_CONTEXT; } });
 /**
  * proxy
  */

package/dist/interface.d.ts

@@ -4,6 +4,7 @@ import { ILogger, LoggerOptions, LoggerContextFormat } from '@midwayjs/logger';
 import * as EventEmitter from 'events';
 import { ContextMiddlewareManager } from './common/middlewareManager';
 import _default from './config/config.default';
+import { AsyncContextManager } from './common/asyncContextManager';
 export declare type PowerPartial<T> = {
     [U in keyof T]?: T[U] extends {} ? PowerPartial<T[U]> : T[U];
 };
@@ -14,6 +15,14 @@ export declare type ServiceFactoryConfigOption<OPTIONS> = {
         [key: string]: PowerPartial<OPTIONS>;
     };
 };
+export declare type DataSourceManagerConfigOption<OPTIONS> = {
+    default?: PowerPartial<OPTIONS>;
+    dataSource?: {
+        [key: string]: PowerPartial<{
+            entities: any[];
+        } & OPTIONS>;
+    };
+};
 declare type ConfigType<T> = T extends (...args: any[]) => any ? Writable<PowerPartial<ReturnType<T>>> : Writable<PowerPartial<T>>;
 /**
  * Get definition from config
@@ -127,6 +136,7 @@ export interface IObjectDefinition {
     }>;
     createFrom: 'framework' | 'file' | 'module';
     allowDowngrade: boolean;
+    bindHook?: (module: any, options?: IObjectDefinition) => void;
 }
 export interface IObjectCreator {
     load(): any;
@@ -305,10 +315,7 @@ export declare type FunctionMiddleware<CTX, R, N = unknown> = N extends true ? (
 export declare type ClassMiddleware<CTX, R, N> = new (...args: any[]) => IMiddleware<CTX, R, N>;
 export declare type CommonMiddleware<CTX, R, N> = ClassMiddleware<CTX, R, N> | FunctionMiddleware<CTX, R, N>;
 export declare type CommonMiddlewareUnion<CTX, R, N> = CommonMiddleware<CTX, R, N> | Array<CommonMiddleware<CTX, R, N>>;
-export declare type MiddlewareRespond<CTX, R, N> = (context: CTX, nextOrRes?: N extends true ? R : NextFunction, next?: N) => Promise<{
-    result: any;
-    error: Error | undefined;
-}>;
+export declare type MiddlewareRespond<CTX, R, N> = (context: CTX, nextOrRes?: N extends true ? R : NextFunction, next?: N) => Promise<any>;
 /**
  * Common Exception Filter definition
  */
@@ -426,6 +433,7 @@ export interface IMidwayBootstrapOptions {
     globalConfig?: Array<{
         [environmentName: string]: Record<string, any>;
     }> | Record<string, any>;
+    asyncContextManager?: AsyncContextManager;
 }
 export interface IConfigurationOptions {
     logger?: ILogger;
@@ -473,5 +481,7 @@ export interface MidwayAppInfo {
 export interface MidwayConfig extends FileConfigOption<typeof _default> {
     [customConfigKey: string]: unknown;
 }
+export declare const ASYNC_CONTEXT_KEY: unique symbol;
+export declare const ASYNC_CONTEXT_MANAGER_KEY = "MIDWAY_ASYNC_CONTEXT_MANAGER_KEY";
 export {};
 //# sourceMappingURL=interface.d.ts.map

package/dist/interface.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MIDWAY_LOGGER_WRITEABLE_DIR = exports.MidwayProcessTypeEnum = exports.REQUEST_CTX_LOGGER_CACHE_KEY = exports.HTTP_SERVER_KEY = exports.REQUEST_OBJ_CTX_KEY = exports.REQUEST_CTX_KEY = exports.ObjectLifeCycleEvent = void 0;
+exports.ASYNC_CONTEXT_MANAGER_KEY = exports.ASYNC_CONTEXT_KEY = exports.MIDWAY_LOGGER_WRITEABLE_DIR = exports.MidwayProcessTypeEnum = exports.REQUEST_CTX_LOGGER_CACHE_KEY = exports.HTTP_SERVER_KEY = exports.REQUEST_OBJ_CTX_KEY = exports.REQUEST_CTX_KEY = exports.ObjectLifeCycleEvent = void 0;
 var ObjectLifeCycleEvent;
 (function (ObjectLifeCycleEvent) {
     ObjectLifeCycleEvent["BEFORE_BIND"] = "beforeBind";
@@ -19,4 +19,6 @@ var MidwayProcessTypeEnum;
     MidwayProcessTypeEnum["AGENT"] = "AGENT";
 })(MidwayProcessTypeEnum = exports.MidwayProcessTypeEnum || (exports.MidwayProcessTypeEnum = {}));
 exports.MIDWAY_LOGGER_WRITEABLE_DIR = 'MIDWAY_LOGGER_WRITEABLE_DIR';
+exports.ASYNC_CONTEXT_KEY = Symbol('ASYNC_CONTEXT_KEY');
+exports.ASYNC_CONTEXT_MANAGER_KEY = 'MIDWAY_ASYNC_CONTEXT_MANAGER_KEY';
 //# sourceMappingURL=interface.js.map

package/dist/service/configService.js

@@ -175,11 +175,14 @@ let MidwayConfigService = class MidwayConfigService {
         let exports = typeof configFilename === 'string'
             ? require(configFilename)
             : configFilename;
-        if (exports && exports.default) {
-            if (Object.keys(exports).length > 1) {
-                throw new error_1.MidwayInvalidConfigError(`${configFilename} should not have both a default export and named export`);
+        // if es module
+        if (exports && exports.__esModule) {
+            if (exports && exports.default) {
+                if (Object.keys(exports).length > 1) {
+                    throw new error_1.MidwayInvalidConfigError(`${configFilename} should not have both a default export and named export`);
+                }
+                exports = exports.default;
             }
-            exports = exports.default;
         }
         return exports;
     }

package/dist/service/frameworkService.js

@@ -50,11 +50,11 @@ let MidwayFrameworkService = class MidwayFrameworkService {
             return new pipelineService_1.MidwayPipelineService((_b = (_a = instance[interface_1.REQUEST_OBJ_CTX_KEY]) === null || _a === void 0 ? void 0 : _a.requestContext) !== null && _b !== void 0 ? _b : this.applicationContext, meta.valves);
         });
         // register @App decorator handler
-        this.decoratorService.registerPropertyHandler(decorator_1.APPLICATION_KEY, (propertyName, mete) => {
-            if (mete.type) {
-                const framework = this.applicationManager.getApplication(mete.type);
+        this.decoratorService.registerPropertyHandler(decorator_1.APPLICATION_KEY, (propertyName, meta) => {
+            if (meta.type) {
+                const framework = this.applicationManager.getApplication(meta.type);
                 if (!framework) {
-                    throw new error_1.MidwayCommonError(`Framework ${mete.type} not Found`);
+                    throw new error_1.MidwayCommonError(`Framework ${meta.type} not Found`);
                 }
                 return framework;
             }
@@ -62,8 +62,9 @@ let MidwayFrameworkService = class MidwayFrameworkService {
                 return this.getMainApp();
             }
         });
-        this.decoratorService.registerPropertyHandler(decorator_1.PLUGIN_KEY, (key, target) => {
-            return this.getMainApp()[key];
+        this.decoratorService.registerPropertyHandler(decorator_1.PLUGIN_KEY, (propertyName, meta) => {
+            var _a;
+            return this.getMainApp()[(_a = meta.identifier) !== null && _a !== void 0 ? _a : propertyName];
         });
         let frameworks = (0, decorator_1.listModule)(decorator_1.FRAMEWORK_KEY);
         // filter proto

package/dist/service/middlewareService.js

@@ -32,6 +32,10 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                 const classMiddleware = await this.applicationContext.getAsync(fn);
                 if (classMiddleware) {
                     fn = await classMiddleware.resolve(app);
+                    if (!fn) {
+                        // for middleware enabled
+                        continue;
+                    }
                     if (!classMiddleware.match && !classMiddleware.ignore) {
                         if (!fn.name) {
                             fn._name = classMiddleware.constructor.name;
@@ -88,13 +92,17 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                         return Promise.resolve(fn(context, dispatch.bind(null, i + 1), {
                             index,
                         })).then(result => {
-                            // need to set body
-                            if (context['body'] && !result) {
-                                result = context['body'];
-                            }
-                            else if (result && context['body'] !== result) {
+                            /**
+                             * 1、return 和 ctx.body，return 的优先级更高
+                             * 2、如果 result 有值（非 undefined），则不管什么情况，都会覆盖当前 body，注意，这里有可能赋值 null，导致 status 为 204，会在中间件处进行修正
+                             * 3、如果 result 没值，且 ctx.body 已经赋值，则向 result 赋值
+                             */
+                            if (result !== undefined) {
                                 context['body'] = result;
                             }
+                            else if (context['body'] !== undefined) {
+                                result = context['body'];
+                            }
                             return result;
                         });
                     }

package/dist/service/slsFunctionService.d.ts

@@ -0,0 +1,25 @@
+import { FaaSMetadata } from '@midwayjs/decorator';
+import { MidwayWebRouterService, RouterCollectorOptions, RouterInfo, RouterPriority } from './webRouterService';
+export declare class MidwayServerlessFunctionService extends MidwayWebRouterService {
+    readonly options: RouterCollectorOptions;
+    constructor(options?: RouterCollectorOptions);
+    protected analyze(): Promise<void>;
+    protected analyzeFunction(): void;
+    protected collectFunctionRoute(module: any): void;
+    getFunctionList(): Promise<RouterInfo[]>;
+    addServerlessFunction(func: (...args: any[]) => Promise<any>, triggerOptions: FaaSMetadata.TriggerMetadata, functionOptions?: FaaSMetadata.ServerlessFunctionOptions): void;
+}
+/**
+ * @deprecated use built-in MidwayWebRouterService first
+ */
+export declare class WebRouterCollector {
+    private baseDir;
+    private options;
+    private proxy;
+    constructor(baseDir?: string, options?: RouterCollectorOptions);
+    protected init(): Promise<void>;
+    getRoutePriorityList(): Promise<RouterPriority[]>;
+    getRouterTable(): Promise<Map<string, RouterInfo[]>>;
+    getFlattenRouterTable(): Promise<RouterInfo[]>;
+}
+//# sourceMappingURL=slsFunctionService.d.ts.map

package/dist/service/slsFunctionService.js

@@ -0,0 +1,242 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebRouterCollector = exports.MidwayServerlessFunctionService = void 0;
+const decorator_1 = require("@midwayjs/decorator");
+const webRouterService_1 = require("./webRouterService");
+const container_1 = require("../context/container");
+const fileDetector_1 = require("../common/fileDetector");
+const contextUtil_1 = require("../util/contextUtil");
+let MidwayServerlessFunctionService = class MidwayServerlessFunctionService extends webRouterService_1.MidwayWebRouterService {
+    constructor(options = {}) {
+        super(Object.assign({}, options, {
+            includeFunctionRouter: true,
+        }));
+        this.options = options;
+    }
+    async analyze() {
+        this.analyzeController();
+        this.analyzeFunction();
+        this.sortPrefixAndRouter();
+        // requestMethod all transform to other method
+        for (const routerInfo of this.routes.values()) {
+            for (const info of routerInfo) {
+                if (info.requestMethod === 'all') {
+                    info.functionTriggerMetadata.method = [
+                        'get',
+                        'post',
+                        'put',
+                        'delete',
+                        'head',
+                        'patch',
+                        'options',
+                    ];
+                }
+            }
+        }
+    }
+    analyzeFunction() {
+        const fnModules = (0, decorator_1.listModule)(decorator_1.FUNC_KEY);
+        for (const module of fnModules) {
+            this.collectFunctionRoute(module);
+        }
+    }
+    collectFunctionRoute(module) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        // 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, []);
+            this.routesPriority.push({
+                prefix,
+                priority: -999,
+                middleware: [],
+                routerOptions: {},
+                controllerId,
+                routerModule: module,
+            });
+        }
+        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,
+                };
+                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,
+                };
+                this.checkDuplicateAndPush(prefix, data);
+            }
+            else {
+                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: '',
+                    requestMethod: '',
+                    method: webRouter['methodName'],
+                    description: '',
+                    summary: '',
+                    handlerName: `${controllerId}.${webRouter['methodName']}`,
+                    funcHandlerName: `${controllerId}.${webRouter['methodName']}`,
+                    controllerId,
+                    middleware: ((_j = webRouter['metadata']) === null || _j === void 0 ? void 0 : _j['middleware']) || [],
+                    controllerMiddleware: [],
+                    requestMetadata: [],
+                    responseMetadata: [],
+                    functionName,
+                    functionTriggerName: webRouter['type'],
+                    functionTriggerMetadata: webRouter['metadata'],
+                    functionMetadata: {
+                        functionName,
+                        ...functionMeta,
+                    },
+                });
+            }
+        }
+    }
+    async getFunctionList() {
+        return this.getFlattenRouterTable({
+            compileUrlPattern: true,
+        });
+    }
+    addServerlessFunction(func, triggerOptions, functionOptions = {}) {
+        var _a, _b;
+        const prefix = '';
+        if (!this.routes.has(prefix)) {
+            this.routes.set(prefix, []);
+            this.routesPriority.push({
+                prefix,
+                priority: 0,
+                middleware: [],
+                routerOptions: {},
+                controllerId: undefined,
+                routerModule: undefined,
+            });
+        }
+        const functionName = (_a = triggerOptions.functionName) !== null && _a !== void 0 ? _a : functionOptions.functionName;
+        this.checkDuplicateAndPush(prefix, {
+            id: null,
+            method: func,
+            url: triggerOptions.metadata['path'] || '',
+            requestMethod: triggerOptions.metadata['method'] || '',
+            description: '',
+            summary: '',
+            handlerName: '',
+            funcHandlerName: triggerOptions.handlerName || functionOptions.handlerName,
+            controllerId: '',
+            middleware: ((_b = triggerOptions.metadata) === null || _b === void 0 ? void 0 : _b.middleware) || [],
+            controllerMiddleware: [],
+            requestMetadata: [],
+            responseMetadata: [],
+            functionName,
+            functionTriggerName: triggerOptions.metadata.name,
+            functionTriggerMetadata: triggerOptions.metadata,
+            functionMetadata: {
+                functionName,
+                ...functionOptions,
+            },
+        });
+    }
+};
+MidwayServerlessFunctionService = __decorate([
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton),
+    __metadata("design:paramtypes", [Object])
+], MidwayServerlessFunctionService);
+exports.MidwayServerlessFunctionService = MidwayServerlessFunctionService;
+function createFunctionName(target, functionName) {
+    return (0, decorator_1.getProviderName)(target).replace(/[:#]/g, '-') + '-' + functionName;
+}
+/**
+ * @deprecated use built-in MidwayWebRouterService first
+ */
+class WebRouterCollector {
+    constructor(baseDir = '', options = {}) {
+        this.baseDir = baseDir;
+        this.options = options;
+    }
+    async init() {
+        if (!this.proxy) {
+            if (this.baseDir) {
+                const container = new container_1.MidwayContainer();
+                (0, decorator_1.bindContainer)(container);
+                container.setFileDetector(new fileDetector_1.DirectoryFileDetector({
+                    loadDir: this.baseDir,
+                }));
+                await container.ready();
+            }
+            if (this.options.includeFunctionRouter) {
+                if ((0, contextUtil_1.getCurrentMainFramework)()) {
+                    this.proxy = await (0, contextUtil_1.getCurrentMainFramework)()
+                        .getApplicationContext()
+                        .getAsync(MidwayServerlessFunctionService, [this.options]);
+                }
+                else {
+                    this.proxy = new MidwayServerlessFunctionService(this.options);
+                }
+            }
+            else {
+                if ((0, contextUtil_1.getCurrentMainFramework)()) {
+                    this.proxy = await (0, contextUtil_1.getCurrentMainFramework)()
+                        .getApplicationContext()
+                        .getAsync(webRouterService_1.MidwayWebRouterService, [this.options]);
+                }
+                else {
+                    this.proxy = new webRouterService_1.MidwayWebRouterService(this.options);
+                }
+            }
+        }
+    }
+    async getRoutePriorityList() {
+        await this.init();
+        return this.proxy.getRoutePriorityList();
+    }
+    async getRouterTable() {
+        await this.init();
+        return this.proxy.getRouterTable();
+    }
+    async getFlattenRouterTable() {
+        await this.init();
+        return this.proxy.getFlattenRouterTable();
+    }
+}
+exports.WebRouterCollector = WebRouterCollector;
+//# sourceMappingURL=slsFunctionService.js.map