@midwayjs/core 3.4.0-beta.1 → 3.4.0-beta.4

package/dist/common/dataSourceManager.d.ts

@@ -1,7 +1,8 @@
 export declare abstract class DataSourceManager<T> {
     protected dataSource: Map<string, T>;
     protected options: {};
-    protected initDataSource(options?: any): Promise<void>;
+    protected modelMapping: WeakMap<object, any>;
+    protected initDataSource(options: any, appDir: string): Promise<void>;
     /**
      * get a data source instance
      * @param dataSourceName
@@ -19,10 +20,16 @@ export declare abstract class DataSourceManager<T> {
      */
     isConnected(dataSourceName: string): Promise<boolean>;
     createInstance(config: any, clientName: any): Promise<T | void>;
+    /**
+     * get data source name by model or repository
+     * @param modelOrRepository
+     */
+    getDataSourceNameByModel(modelOrRepository: any): string | undefined;
     abstract getName(): string;
     protected abstract createDataSource(config: any, dataSourceName: string): Promise<T | void> | (T | void);
     protected abstract checkConnected(dataSource: T): Promise<boolean>;
     protected destroyDataSource(dataSource: T): Promise<void>;
     stop(): Promise<void>;
 }
+export declare function globModels(globString: string, appDir: string): any[];
 //# sourceMappingURL=dataSourceManager.d.ts.map

package/dist/common/dataSourceManager.js

@@ -1,22 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataSourceManager = void 0;
+exports.globModels = exports.DataSourceManager = void 0;
 /**
  * 数据源管理器实现
  */
 const extend_1 = require("../util/extend");
 const error_1 = require("../error");
+const glob_1 = require("@midwayjs/glob");
+const path_1 = require("path");
+const decorator_1 = require("@midwayjs/decorator");
+const DEFAULT_PATTERN = ['**/**.ts', '**/**.js'];
 class DataSourceManager {
     constructor() {
         this.dataSource = new Map();
         this.options = {};
+        this.modelMapping = new WeakMap();
     }
-    async initDataSource(options = {}) {
+    async initDataSource(options, appDir) {
         this.options = options;
         if (options.dataSource) {
             for (const dataSourceName in options.dataSource) {
+                const dataSourceOptions = options.dataSource[dataSourceName];
+                if (dataSourceOptions['entities']) {
+                    const entities = new Set();
+                    // loop entities and glob files to model
+                    for (const entity of dataSourceOptions['entities']) {
+                        if (typeof entity === 'string') {
+                            // string will be glob file
+                            const models = globModels(entity, appDir);
+                            for (const model of models) {
+                                entities.add(model);
+                                this.modelMapping.set(model, dataSourceName);
+                            }
+                        }
+                        else {
+                            // model will be add to array
+                            entities.add(entity);
+                            this.modelMapping.set(entity, dataSourceName);
+                        }
+                    }
+                    dataSourceOptions['entities'] = Array.from(entities);
+                }
                 // create data source
-                await this.createInstance(options.dataSource[dataSourceName], dataSourceName);
+                await this.createInstance(dataSourceOptions, dataSourceName);
             }
         }
         else {
@@ -58,12 +84,44 @@ class DataSourceManager {
             return client;
         }
     }
+    /**
+     * get data source name by model or repository
+     * @param modelOrRepository
+     */
+    getDataSourceNameByModel(modelOrRepository) {
+        return this.modelMapping.get(modelOrRepository);
+    }
     async destroyDataSource(dataSource) { }
     async stop() {
         for (const value of this.dataSource.values()) {
             await this.destroyDataSource(value);
         }
+        this.dataSource.clear();
     }
 }
 exports.DataSourceManager = DataSourceManager;
+function globModels(globString, appDir) {
+    const cwd = (0, path_1.join)(appDir, globString);
+    const models = [];
+    // string will be glob file
+    const files = (0, glob_1.run)(DEFAULT_PATTERN, {
+        cwd,
+    });
+    for (const file of files) {
+        const exports = require(file);
+        if (decorator_1.Types.isClass(exports)) {
+            models.push(exports);
+        }
+        else {
+            for (const m in exports) {
+                const module = exports[m];
+                if (decorator_1.Types.isClass(module)) {
+                    models.push(module);
+                }
+            }
+        }
+    }
+    return models;
+}
+exports.globModels = globModels;
 //# sourceMappingURL=dataSourceManager.js.map

package/dist/common/webGenerator.d.ts

@@ -1,15 +1,16 @@
-import { RouterInfo, IMidwayApplication } from '../index';
+import { MidwayWebRouterService, RouterInfo, IMidwayApplication } from '../index';
 export declare abstract class WebControllerGenerator<Router extends {
     use: (...args: any[]) => void;
 }> {
     readonly app: IMidwayApplication;
-    protected constructor(app: IMidwayApplication);
+    readonly midwayWebRouterService: MidwayWebRouterService;
+    protected constructor(app: IMidwayApplication, midwayWebRouterService: MidwayWebRouterService);
     /**
      * wrap controller string to middleware function
      * @param routeInfo
      */
     generateKoaController(routeInfo: RouterInfo): (ctx: any, next: any) => Promise<void>;
-    loadMidwayController(globalPrefix: string, routerHandler?: (newRouter: Router) => void): Promise<void>;
+    loadMidwayController(routerHandler?: (newRouter: Router) => void): Promise<void>;
     abstract createRouter(routerOptions: any): Router;
     abstract generateController(routeInfo: RouterInfo): any;
 }

package/dist/common/webGenerator.js

@@ -12,8 +12,9 @@ const index_1 = require("../index");
 const util = require("util");
 const debug = util.debuglog('midway:debug');
 class WebControllerGenerator {
-    constructor(app) {
+    constructor(app, midwayWebRouterService) {
         this.app = app;
+        this.midwayWebRouterService = midwayWebRouterService;
     }
     /**
      * wrap controller string to middleware function
@@ -22,14 +23,24 @@ class WebControllerGenerator {
     generateKoaController(routeInfo) {
         return async (ctx, next) => {
             const args = [ctx, next];
-            const controller = await ctx.requestContext.getAsync(routeInfo.id);
-            // eslint-disable-next-line prefer-spread
-            const result = await controller[routeInfo.method].apply(controller, args);
-            if (result !== undefined) {
-                ctx.body = result;
+            let result;
+            if (typeof routeInfo.method !== 'string') {
+                result = await routeInfo.method(ctx, next);
+            }
+            else {
+                const controller = await ctx.requestContext.getAsync(routeInfo.id);
+                // eslint-disable-next-line prefer-spread
+                result = await controller[routeInfo.method].apply(controller, args);
             }
-            if (ctx.body === undefined && !ctx.response._explicitStatus) {
-                ctx.body = undefined;
+            if (result !== undefined) {
+                if (result === null) {
+                    // 这样设置可以绕过 koa 的 _explicitStatus 赋值机制
+                    ctx.response._body = null;
+                    ctx.response._midwayControllerNullBody = true;
+                }
+                else {
+                    ctx.body = result;
+                }
             }
             // implement response decorator
             if (Array.isArray(routeInfo.responseMetadata) &&
@@ -56,13 +67,10 @@ class WebControllerGenerator {
             }
         };
     }
-    async loadMidwayController(globalPrefix, routerHandler) {
+    async loadMidwayController(routerHandler) {
         var _a, _b;
-        const collector = new index_1.WebRouterCollector('', {
-            globalPrefix,
-        });
-        const routerTable = await collector.getRouterTable();
-        const routerList = await collector.getRoutePriorityList();
+        const routerTable = await this.midwayWebRouterService.getRouterTable();
+        const routerList = await this.midwayWebRouterService.getRoutePriorityList();
         const applicationContext = this.app.getApplicationContext();
         const logger = this.app.getCoreLogger();
         const middlewareService = applicationContext.get(index_1.MidwayMiddlewareService);

package/dist/error/framework.d.ts

@@ -17,6 +17,7 @@ export declare const FrameworkErrorEnum: {
     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);
@@ -66,4 +67,7 @@ export declare class MidwayInconsistentVersionError extends MidwayError {
 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.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;
+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,
@@ -19,6 +19,7 @@ exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
     INCONSISTENT_VERSION: 10013,
     INVALID_CONFIG: 10014,
     DUPLICATE_CLASS_NAME: 10015,
+    DUPLICATE_CONTROLLER_PREFIX_OPTIONS: 10016,
 });
 class MidwayCommonError extends base_1.MidwayError {
     constructor(message) {
@@ -129,4 +130,10 @@ class MidwayDuplicateClassNameError extends base_1.MidwayError {
     }
 }
 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

@@ -8,8 +8,6 @@ export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMe
 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,10 +19,12 @@ 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';
-export * from './common/dataSourceManager';
 export * from './common/dataListener';
 export * from './common/fileDetector';
 export * from './common/webGenerator';

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.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;
+exports.MidwayFrameworkType = 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");
@@ -39,8 +39,6 @@ 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");
@@ -63,10 +61,16 @@ 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);
-__exportStar(require("./common/dataSourceManager"), exports);
 __exportStar(require("./common/dataListener"), exports);
 __exportStar(require("./common/fileDetector"), exports);
 __exportStar(require("./common/webGenerator"), exports);

package/dist/interface.d.ts

@@ -314,10 +314,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
  */

package/dist/service/configService.js

@@ -175,11 +175,17 @@ 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;
+        }
+        else {
+            console.log(exports);
         }
         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

@@ -88,13 +88,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,240 @@
+"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();
+    }
+    addServerlessFunction(func, triggerOptions, functionOptions = {}) {
+        var _a, _b;
+        const prefix = '/';
+        if (!this.routes.has(prefix)) {
+            this.routes.set(prefix, []);
+            this.routesPriority.push({
+                prefix,
+                priority: -999,
+                middleware: [],
+                routerOptions: {},
+                controllerId: undefined,
+                routerModule: module,
+            });
+        }
+        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

package/dist/{common/webRouterCollector.d.ts → service/webRouterService.d.ts}

@@ -1,16 +1,17 @@
+import { ControllerOption } from '@midwayjs/decorator';
 export interface RouterInfo {
     /**
      * uuid
      */
-    id: string;
+    id?: string;
     /**
      * router prefix from controller
      */
-    prefix: string;
+    prefix?: string;
     /**
      * router alias name
      */
-    routerName: string;
+    routerName?: string;
     /**
      * router path, without prefix
      */
@@ -22,40 +23,40 @@ export interface RouterInfo {
     /**
      * invoke function method
      */
-    method: string;
+    method: string | ((...args: any[]) => void);
     /**
      * router description
      */
-    description: string;
-    summary: string;
+    description?: string;
+    summary?: string;
     /**
      * router handler function key，for IoC container load
      */
-    handlerName: string;
+    handlerName?: string;
     /**
      *  serverless func load key
      */
-    funcHandlerName: string;
+    funcHandlerName?: string;
     /**
      * controller provideId
      */
-    controllerId: string;
+    controllerId?: string;
     /**
      * router middleware
      */
-    middleware: any[];
+    middleware?: any[];
     /**
      * controller middleware in this router
      */
-    controllerMiddleware: any[];
+    controllerMiddleware?: any[];
     /**
      * request args metadata
      */
-    requestMetadata: any[];
+    requestMetadata?: any[];
     /**
      * response data metadata
      */
-    responseMetadata: any[];
+    responseMetadata?: any[];
     /**
      * serverless function name
      */
@@ -73,6 +74,7 @@ export interface RouterInfo {
      */
     functionMetadata?: any;
 }
+export declare type DynamicRouterInfo = Omit<RouterInfo, 'id' | 'url' | 'prefix' | 'method' | 'controllerId' | 'controllerMiddleware' | 'responseMetadata'>;
 export interface RouterPriority {
     prefix: string;
     priority: number;
@@ -88,16 +90,29 @@ export interface RouterCollectorOptions {
     includeFunctionRouter?: boolean;
     globalPrefix?: string;
 }
-export declare class WebRouterCollector {
-    protected readonly baseDir: string;
+export declare class MidwayWebRouterService {
+    readonly options: RouterCollectorOptions;
     private isReady;
     protected routes: Map<string, RouterInfo[]>;
-    private routesPriority;
-    protected options: RouterCollectorOptions;
-    constructor(baseDir?: string, options?: RouterCollectorOptions);
+    protected routesPriority: RouterPriority[];
+    constructor(options?: RouterCollectorOptions);
     protected analyze(): Promise<void>;
-    protected collectRoute(module: any, functionMeta?: boolean): void;
-    protected collectFunctionRoute(module: any, functionMeta?: boolean): void;
+    protected analyzeController(): void;
+    protected sortPrefixAndRouter(): void;
+    /**
+     * dynamically add a controller
+     * @param controllerClz
+     * @param controllerOption
+     * @param functionMeta
+     */
+    addController(controllerClz: any, controllerOption: ControllerOption, functionMeta?: boolean): void;
+    /**
+     * dynamically add a route to root prefix
+     * @param routerPath
+     * @param routerFunction
+     * @param routerInfoOption
+     */
+    addRouter(routerPath: string | RegExp, routerFunction: (...args: any[]) => void, routerInfoOption: DynamicRouterInfo): void;
     sortRouter(urlMatchList: RouterInfo[]): {
         _pureRouter: string;
         _level: number;
@@ -107,15 +122,15 @@ export declare class WebRouterCollector {
         /**
          * uuid
          */
-        id: string;
+        id?: string;
         /**
          * router prefix from controller
          */
-        prefix: string;
+        prefix?: string;
         /**
          * router alias name
          */
-        routerName: string;
+        routerName?: string;
         /**
          * router path, without prefix
          */
@@ -127,40 +142,40 @@ export declare class WebRouterCollector {
         /**
          * invoke function method
          */
-        method: string;
+        method: string | ((...args: any[]) => void);
         /**
          * router description
          */
-        description: string;
-        summary: string;
+        description?: string;
+        summary?: string;
         /**
          * router handler function key，for IoC container load
          */
-        handlerName: string;
+        handlerName?: string;
         /**
          *  serverless func load key
          */
-        funcHandlerName: string;
+        funcHandlerName?: string;
         /**
          * controller provideId
          */
-        controllerId: string;
+        controllerId?: string;
         /**
          * router middleware
          */
-        middleware: any[];
+        middleware?: any[];
         /**
          * controller middleware in this router
          */
-        controllerMiddleware: any[];
+        controllerMiddleware?: any[];
         /**
          * request args metadata
          */
-        requestMetadata: any[];
+        requestMetadata?: any[];
         /**
          * response data metadata
          */
-        responseMetadata: any[];
+        responseMetadata?: any[];
         /**
          * serverless function name
          */
@@ -181,6 +196,6 @@ export declare class WebRouterCollector {
     getRoutePriorityList(): Promise<RouterPriority[]>;
     getRouterTable(): Promise<Map<string, RouterInfo[]>>;
     getFlattenRouterTable(): Promise<RouterInfo[]>;
-    private checkDuplicateAndPush;
+    protected checkDuplicateAndPush(prefix: any, routerInfo: RouterInfo): void;
 }
-//# sourceMappingURL=webRouterCollector.d.ts.map
+//# sourceMappingURL=webRouterService.d.ts.map

package/dist/{common/webRouterCollector.js → service/webRouterService.js}

@@ -1,39 +1,39 @@
 "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 = void 0;
+exports.MidwayWebRouterService = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const util_1 = require("../util");
-const container_1 = require("../context/container");
-const fileDetector_1 = require("./fileDetector");
-const util = require("util");
 const error_1 = require("../error");
+const util = require("util");
 const debug = util.debuglog('midway:debug');
-class WebRouterCollector {
-    constructor(baseDir = '', options = {}) {
+let MidwayWebRouterService = class MidwayWebRouterService {
+    constructor(options = {}) {
+        this.options = options;
         this.isReady = false;
         this.routes = new Map();
         this.routesPriority = [];
-        this.baseDir = baseDir;
-        this.options = options;
     }
     async analyze() {
-        if (this.baseDir) {
-            const container = new container_1.MidwayContainer();
-            container.setFileDetector(new fileDetector_1.DirectoryFileDetector({
-                loadDir: this.baseDir,
-            }));
-            await container.ready();
-        }
+        this.analyzeController();
+        this.sortPrefixAndRouter();
+    }
+    analyzeController() {
         const controllerModules = (0, decorator_1.listModule)(decorator_1.CONTROLLER_KEY);
         for (const module of controllerModules) {
-            this.collectRoute(module);
-        }
-        if (this.options.includeFunctionRouter) {
-            const fnModules = (0, decorator_1.listModule)(decorator_1.FUNC_KEY);
-            for (const module of fnModules) {
-                this.collectFunctionRoute(module);
-            }
+            const controllerOption = (0, decorator_1.getClassMetadata)(decorator_1.CONTROLLER_KEY, module);
+            this.addController(module, controllerOption, this.options.includeFunctionRouter);
         }
+    }
+    sortPrefixAndRouter() {
         // filter empty prefix
         this.routesPriority = this.routesPriority.filter(item => {
             const prefixList = this.routes.get(item.prefix);
@@ -55,12 +55,17 @@ class WebRouterCollector {
             return routeB.prefix.length - routeA.prefix.length;
         });
     }
-    collectRoute(module, functionMeta = false) {
+    /**
+     * dynamically add a controller
+     * @param controllerClz
+     * @param controllerOption
+     * @param functionMeta
+     */
+    addController(controllerClz, controllerOption, functionMeta = false) {
         var _a;
-        const controllerId = (0, decorator_1.getProviderName)(module);
+        const controllerId = (0, decorator_1.getProviderName)(controllerClz);
         debug(`[core]: Found Controller ${controllerId}.`);
-        const id = (0, decorator_1.getProviderUUId)(module);
-        const controllerOption = (0, decorator_1.getClassMetadata)(decorator_1.CONTROLLER_KEY, module);
+        const id = (0, decorator_1.getProviderUUId)(controllerClz);
         let priority;
         // implement middleware in controller
         const middleware = controllerOption.routerOptions.middleware;
@@ -83,9 +88,18 @@ class WebRouterCollector {
                 middleware,
                 routerOptions: controllerOption.routerOptions,
                 controllerId,
-                routerModule: module,
+                routerModule: controllerClz,
             });
         }
+        else {
+            // 不同的 controller，可能会有相同的 prefix，一旦 options 不同，就要报错
+            if (middleware) {
+                const originRoute = this.routesPriority.filter(el => {
+                    return el.prefix === prefix;
+                })[0];
+                throw new error_1.MidwayDuplicateControllerOptionsError(prefix, controllerId, originRoute.controllerId);
+            }
+        }
         // set ignorePrefix
         if (!this.routes.has(ignorePrefix)) {
             this.routes.set(ignorePrefix, []);
@@ -95,14 +109,14 @@ class WebRouterCollector {
                 middleware,
                 routerOptions: controllerOption.routerOptions,
                 controllerId,
-                routerModule: module,
+                routerModule: controllerClz,
             });
         }
-        const webRouterInfo = (0, decorator_1.getClassMetadata)(decorator_1.WEB_ROUTER_KEY, module);
+        const webRouterInfo = (0, decorator_1.getClassMetadata)(decorator_1.WEB_ROUTER_KEY, controllerClz);
         if (webRouterInfo && typeof webRouterInfo[Symbol.iterator] === 'function') {
             for (const webRouter of webRouterInfo) {
-                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 routeArgsInfo = (0, decorator_1.getPropertyDataFromClass)(decorator_1.WEB_ROUTER_PARAM_KEY, controllerClz, webRouter.method) || [];
+                const routerResponseData = (0, decorator_1.getPropertyMetadata)(decorator_1.WEB_RESPONSE_KEY, controllerClz, webRouter.method) || [];
                 const data = {
                     id,
                     prefix: webRouter.ignoreGlobalPrefix ? ignorePrefix : prefix,
@@ -136,92 +150,17 @@ class WebRouterCollector {
             }
         }
     }
-    collectFunctionRoute(module, functionMeta = false) {
-        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,
-                };
-                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,
-                    };
-                }
-                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,
-                        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,
-                        },
-                    });
-                }
-            }
-        }
+    /**
+     * dynamically add a route to root prefix
+     * @param routerPath
+     * @param routerFunction
+     * @param routerInfoOption
+     */
+    addRouter(routerPath, routerFunction, routerInfoOption) {
+        this.checkDuplicateAndPush('/', Object.assign(routerInfoOption, {
+            method: routerFunction,
+            url: routerPath,
+        }));
     }
     sortRouter(urlMatchList) {
         // 1. 绝对路径规则优先级最高如 /ab/cb/e
@@ -323,9 +262,11 @@ class WebRouterCollector {
         }
         prefixList.push(routerInfo);
     }
-}
-exports.WebRouterCollector = WebRouterCollector;
-function createFunctionName(target, functionName) {
-    return (0, decorator_1.getProviderName)(target).replace(/[:#]/g, '-') + '-' + functionName;
-}
-//# sourceMappingURL=webRouterCollector.js.map
+};
+MidwayWebRouterService = __decorate([
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton),
+    __metadata("design:paramtypes", [Object])
+], MidwayWebRouterService);
+exports.MidwayWebRouterService = MidwayWebRouterService;
+//# sourceMappingURL=webRouterService.js.map

package/dist/setup.js

@@ -7,6 +7,7 @@ const decorator_1 = require("@midwayjs/decorator");
 const util = require("util");
 const path_1 = require("path");
 const logger_1 = require("@midwayjs/logger");
+const slsFunctionService_1 = require("./service/slsFunctionService");
 const debug = util.debuglog('midway:debug');
 /**
  * midway framework main entry, this method bootstrap all service and framework.
@@ -95,6 +96,8 @@ function prepareGlobalApplicationContext(globalOptions) {
     applicationContext.bindClass(_1.MidwayMiddlewareService);
     applicationContext.bindClass(_1.MidwayLifeCycleService);
     applicationContext.bindClass(_1.MidwayMockService);
+    applicationContext.bindClass(_1.MidwayWebRouterService);
+    applicationContext.bindClass(slsFunctionService_1.MidwayServerlessFunctionService);
     // bind preload module
     if (globalOptions.preloadModules && globalOptions.preloadModules.length) {
         for (const preloadModule of globalOptions.preloadModules) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.4.0-beta.1",
+  "version": "3.4.0-beta.4",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.0-beta.1",
+    "@midwayjs/decorator": "^3.4.0-beta.4",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "14d8440f20978426184c988808343cc24bcf6e20"
+  "gitHead": "3b686101f7802f87d47b8c9d25561339d556e573"
 }

package/dist/common/triggerCollector.d.ts

@@ -1,8 +0,0 @@
-import { RouterInfo, WebRouterCollector } from './webRouterCollector';
-export declare class ServerlessTriggerCollector extends WebRouterCollector {
-    protected analyze(): Promise<void>;
-    protected collectRoute(module: any): void;
-    protected collectFunctionRoute(module: any): void;
-    getFunctionList(): Promise<RouterInfo[]>;
-}
-//# sourceMappingURL=triggerCollector.d.ts.map

package/dist/common/triggerCollector.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerlessTriggerCollector = void 0;
-const webRouterCollector_1 = require("./webRouterCollector");
-class ServerlessTriggerCollector extends webRouterCollector_1.WebRouterCollector {
-    async analyze() {
-        this.options.includeFunctionRouter = true;
-        await super.analyze();
-        // 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',
-                    ];
-                }
-            }
-        }
-    }
-    collectRoute(module) {
-        super.collectRoute(module, true);
-    }
-    collectFunctionRoute(module) {
-        super.collectFunctionRoute(module, true);
-    }
-    async getFunctionList() {
-        return this.getFlattenRouterTable();
-    }
-}
-exports.ServerlessTriggerCollector = ServerlessTriggerCollector;
-//# sourceMappingURL=triggerCollector.js.map