@midwayjs/core 3.4.0-beta.3 → 3.4.0-beta.6

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.js

@@ -115,7 +115,7 @@ class WebControllerGenerator {
                 debug(`[core]: Load Router "${routeInfo.requestMethod.toUpperCase()} ${routeInfo.url}"`);
                 // apply controller from request context
                 // eslint-disable-next-line prefer-spread
-                newRouter[routeInfo.requestMethod].apply(newRouter, routerArgs);
+                newRouter[routeInfo.requestMethod.toLowerCase()].apply(newRouter, routerArgs);
             }
             routerHandler && routerHandler(newRouter);
         }

package/dist/index.d.ts

@@ -19,11 +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, WebRouterCollector, } from './service/webRouterService';
+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.WebRouterCollector = 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;
+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");
@@ -63,11 +63,14 @@ 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; } });
-Object.defineProperty(exports, "WebRouterCollector", { enumerable: true, get: function () { return webRouterService_1.WebRouterCollector; } });
+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/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/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: -999,
+                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

package/dist/service/webRouterService.d.ts

@@ -73,8 +73,12 @@ export interface RouterInfo {
      * serverless function metadata
      */
     functionMetadata?: any;
+    /**
+     * pattern after path-regexp compile
+     */
+    urlCompiledPattern?: RegExp;
 }
-export declare type DynamicRouterInfo = Omit<RouterInfo, 'id' | 'url' | 'prefix' | 'method' | 'controllerId' | 'controllerMiddleware' | 'responseMetadata'>;
+export declare type DynamicRouterInfo = Omit<RouterInfo, 'id' | 'method' | 'controllerId' | 'controllerMiddleware' | 'responseMetadata'>;
 export interface RouterPriority {
     prefix: string;
     priority: number;
@@ -94,9 +98,13 @@ export declare class MidwayWebRouterService {
     readonly options: RouterCollectorOptions;
     private isReady;
     protected routes: Map<string, RouterInfo[]>;
-    private routesPriority;
+    protected routesPriority: RouterPriority[];
+    private cachedFlattenRouteList;
+    private includeCompileUrlPattern;
     constructor(options?: RouterCollectorOptions);
-    private analyze;
+    protected analyze(): Promise<void>;
+    protected analyzeController(): void;
+    protected sortPrefixAndRouter(): void;
     /**
      * dynamically add a controller
      * @param controllerClz
@@ -110,8 +118,7 @@ export declare class MidwayWebRouterService {
      * @param routerFunction
      * @param routerInfoOption
      */
-    addRouter(routerPath: string | RegExp, routerFunction: (...args: any[]) => void, routerInfoOption: DynamicRouterInfo): void;
-    protected collectFunctionRoute(module: any, functionMeta?: boolean): void;
+    addRouter(routerFunction: (...args: any[]) => void, routerInfoOption: DynamicRouterInfo): void;
     sortRouter(urlMatchList: RouterInfo[]): {
         _pureRouter: string;
         _level: number;
@@ -191,23 +198,18 @@ export declare class MidwayWebRouterService {
          * serverless function metadata
          */
         functionMetadata?: any;
+        /**
+         * pattern after path-regexp compile
+         */
+        urlCompiledPattern?: RegExp;
     }[];
     getRoutePriorityList(): Promise<RouterPriority[]>;
     getRouterTable(): Promise<Map<string, RouterInfo[]>>;
-    getFlattenRouterTable(): Promise<RouterInfo[]>;
-    private checkDuplicateAndPush;
-}
-/**
- * @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[]>;
+    getFlattenRouterTable(options?: {
+        compileUrlPattern?: boolean;
+        noCache?: boolean;
+    }): Promise<RouterInfo[]>;
+    getMatchedRouterInfo(routerUrl: string, method: string): Promise<RouterInfo | undefined>;
+    protected checkDuplicateAndPush(prefix: any, routerInfo: RouterInfo): void;
 }
 //# sourceMappingURL=webRouterService.d.ts.map

package/dist/service/webRouterService.js

@@ -9,14 +9,12 @@ 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.MidwayWebRouterService = void 0;
+exports.MidwayWebRouterService = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const util_1 = require("../util");
 const error_1 = require("../error");
 const util = require("util");
-const contextUtil_1 = require("../util/contextUtil");
-const container_1 = require("../context/container");
-const fileDetector_1 = require("../common/fileDetector");
+const pathToRegexp_1 = require("../util/pathToRegexp");
 const debug = util.debuglog('midway:debug');
 let MidwayWebRouterService = class MidwayWebRouterService {
     constructor(options = {}) {
@@ -24,19 +22,20 @@ let MidwayWebRouterService = class MidwayWebRouterService {
         this.isReady = false;
         this.routes = new Map();
         this.routesPriority = [];
+        this.includeCompileUrlPattern = false;
     }
     async analyze() {
+        this.analyzeController();
+        this.sortPrefixAndRouter();
+    }
+    analyzeController() {
         const controllerModules = (0, decorator_1.listModule)(decorator_1.CONTROLLER_KEY);
         for (const module of controllerModules) {
             const controllerOption = (0, decorator_1.getClassMetadata)(decorator_1.CONTROLLER_KEY, module);
             this.addController(module, controllerOption, this.options.includeFunctionRouter);
         }
-        if (this.options.includeFunctionRouter) {
-            const fnModules = (0, decorator_1.listModule)(decorator_1.FUNC_KEY);
-            for (const module of fnModules) {
-                this.collectFunctionRoute(module, this.options.includeFunctionRouter);
-            }
-        }
+    }
+    sortPrefixAndRouter() {
         // filter empty prefix
         this.routesPriority = this.routesPriority.filter(item => {
             const prefixList = this.routes.get(item.prefix);
@@ -57,25 +56,6 @@ let MidwayWebRouterService = class MidwayWebRouterService {
         this.routesPriority = this.routesPriority.sort((routeA, routeB) => {
             return routeB.prefix.length - routeA.prefix.length;
         });
-        // format function router meta
-        if (this.options.includeFunctionRouter) {
-            // 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',
-                        ];
-                    }
-                }
-            }
-        }
     }
     /**
      * dynamically add a controller
@@ -178,19 +158,8 @@ let MidwayWebRouterService = class MidwayWebRouterService {
      * @param routerFunction
      * @param routerInfoOption
      */
-    addRouter(routerPath, routerFunction, routerInfoOption) {
-        this.checkDuplicateAndPush('/', Object.assign(routerInfoOption, {
-            method: routerFunction,
-            url: routerPath,
-        }));
-    }
-    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 = '/';
+    addRouter(routerFunction, routerInfoOption) {
+        const prefix = routerInfoOption.prefix || '';
         if (!this.routes.has(prefix)) {
             this.routes.set(prefix, []);
             this.routesPriority.push({
@@ -198,78 +167,13 @@ let MidwayWebRouterService = class MidwayWebRouterService {
                 priority: -999,
                 middleware: [],
                 routerOptions: {},
-                controllerId,
-                routerModule: module,
+                controllerId: undefined,
+                routerModule: undefined,
             });
         }
-        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,
-                        },
-                    });
-                }
-            }
-        }
+        this.checkDuplicateAndPush(prefix, Object.assign(routerInfoOption, {
+            method: routerFunction,
+        }));
     }
     sortRouter(urlMatchList) {
         // 1. 绝对路径规则优先级最高如 /ab/cb/e
@@ -347,7 +251,21 @@ let MidwayWebRouterService = class MidwayWebRouterService {
         }
         return this.routes;
     }
-    async getFlattenRouterTable() {
+    async getFlattenRouterTable(options = {}) {
+        if (this.cachedFlattenRouteList && !options.noCache) {
+            if (options.compileUrlPattern && !this.includeCompileUrlPattern) {
+                this.includeCompileUrlPattern = true;
+                // attach match pattern function
+                for (const item of this.cachedFlattenRouteList) {
+                    if (item.url) {
+                        item.urlCompiledPattern = (0, pathToRegexp_1.pathToRegexp)(item.url, [], {
+                            end: false,
+                        });
+                    }
+                }
+            }
+            return this.cachedFlattenRouteList;
+        }
         if (!this.isReady) {
             await this.analyze();
             this.isReady = true;
@@ -356,8 +274,34 @@ let MidwayWebRouterService = class MidwayWebRouterService {
         for (const routerPriority of this.routesPriority) {
             routeArr = routeArr.concat(this.routes.get(routerPriority.prefix));
         }
+        if (options.compileUrlPattern) {
+            this.includeCompileUrlPattern = true;
+            // attach match pattern function
+            for (const item of routeArr) {
+                item.urlCompiledPattern = (0, pathToRegexp_1.pathToRegexp)(item.url, [], {
+                    end: false,
+                });
+            }
+        }
+        this.cachedFlattenRouteList = routeArr;
         return routeArr;
     }
+    async getMatchedRouterInfo(routerUrl, method) {
+        const routes = await this.getFlattenRouterTable({
+            compileUrlPattern: true,
+        });
+        let matchedRouterInfo;
+        for (const item of routes) {
+            if (item.urlCompiledPattern) {
+                if (method.toUpperCase() === item['requestMethod'].toUpperCase() &&
+                    item.urlCompiledPattern.test(routerUrl)) {
+                    matchedRouterInfo = item;
+                    break;
+                }
+            }
+        }
+        return matchedRouterInfo;
+    }
     checkDuplicateAndPush(prefix, routerInfo) {
         const prefixList = this.routes.get(prefix);
         const matched = prefixList.filter(item => {
@@ -378,49 +322,4 @@ MidwayWebRouterService = __decorate([
     __metadata("design:paramtypes", [Object])
 ], MidwayWebRouterService);
 exports.MidwayWebRouterService = MidwayWebRouterService;
-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 ((0, contextUtil_1.getCurrentMainFramework)()) {
-                this.proxy = await (0, contextUtil_1.getCurrentMainFramework)()
-                    .getApplicationContext()
-                    .getAsync(MidwayWebRouterService, [this.options]);
-            }
-            else {
-                this.proxy = new 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=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.
@@ -96,6 +97,7 @@ function prepareGlobalApplicationContext(globalOptions) {
     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/dist/util/pathToRegexp.d.ts

@@ -1,6 +1,12 @@
 /**
  * this file fork from path-to-regexp package v1.8.0
  */
+export interface PathToRegexpOptions {
+    end?: boolean;
+    strict?: boolean;
+    delimiter?: string;
+    sensitive?: boolean;
+}
 /**
  * Normalize the given path string, returning a regular expression.
  *
@@ -13,5 +19,6 @@
  * @param  {Object=}               options
  * @return {!RegExp}
  */
-export declare function pathToRegexp(path: any, keys: any, options: any): any;
+export declare function pathToRegexp(path: string | RegExp | Array<string>, options?: PathToRegexpOptions): RegExp;
+export declare function pathToRegexp(path: string | RegExp | Array<string>, keys: Array<string>, options?: PathToRegexpOptions): RegExp;
 //# sourceMappingURL=pathToRegexp.d.ts.map

package/dist/util/pathToRegexp.js

@@ -246,18 +246,6 @@ function tokensToRegExp(tokens, keys, options) {
     }
     return attachKeys(new RegExp('^' + route, flags(options)), keys);
 }
-/**
- * Normalize the given path string, returning a regular expression.
- *
- * An empty array can be passed in for the keys, which will hold the
- * placeholder key descriptions. For example, using `/user/:id`, `keys` will
- * contain `[{ name: 'id', delimiter: '/', optional: false, repeat: false }]`.
- *
- * @param  {(string|RegExp|Array)} path
- * @param  {(Array|Object)=}       keys
- * @param  {Object=}               options
- * @return {!RegExp}
- */
 function pathToRegexp(path, keys, options) {
     if (!Array.isArray(keys)) {
         options = /** @type {!Object} */ keys || options;

package/package.json

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