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

package/dist/service/slsFunctionService.js

@@ -133,7 +133,9 @@ let MidwayServerlessFunctionService = class MidwayServerlessFunctionService exte
         }
     }
     async getFunctionList() {
-        return this.getFlattenRouterTable();
+        return this.getFlattenRouterTable({
+            compileUrlPattern: true,
+        });
     }
     addServerlessFunction(func, triggerOptions, functionOptions = {}) {
         var _a, _b;

package/dist/service/webRouterService.d.ts

@@ -73,6 +73,10 @@ export interface RouterInfo {
      * serverless function metadata
      */
     functionMetadata?: any;
+    /**
+     * pattern after path-regexp compile
+     */
+    urlCompiledPattern?: RegExp;
 }
 export declare type DynamicRouterInfo = Omit<RouterInfo, 'id' | 'method' | 'controllerId' | 'controllerMiddleware' | 'responseMetadata'>;
 export interface RouterPriority {
@@ -95,6 +99,8 @@ export declare class MidwayWebRouterService {
     private isReady;
     protected routes: Map<string, RouterInfo[]>;
     protected routesPriority: RouterPriority[];
+    private cachedFlattenRouteList;
+    private includeCompileUrlPattern;
     constructor(options?: RouterCollectorOptions);
     protected analyze(): Promise<void>;
     protected analyzeController(): void;
@@ -192,10 +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[]>;
+    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

@@ -14,6 +14,7 @@ const decorator_1 = require("@midwayjs/decorator");
 const util_1 = require("../util");
 const error_1 = require("../error");
 const util = require("util");
+const pathToRegexp_1 = require("../util/pathToRegexp");
 const debug = util.debuglog('midway:debug');
 let MidwayWebRouterService = class MidwayWebRouterService {
     constructor(options = {}) {
@@ -21,6 +22,7 @@ let MidwayWebRouterService = class MidwayWebRouterService {
         this.isReady = false;
         this.routes = new Map();
         this.routesPriority = [];
+        this.includeCompileUrlPattern = false;
     }
     async analyze() {
         this.analyzeController();
@@ -249,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;
@@ -258,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 => {

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.5",
+  "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.5",
+    "@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": "d84d1c77aed1fd973d002ab65cd0adeadb7924a6"
+  "gitHead": "8e187c4593d4832de32b6745af3e195f6b90816c"
 }