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

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/service/configService.js

@@ -184,9 +184,6 @@ let MidwayConfigService = class MidwayConfigService {
                 exports = exports.default;
             }
         }
-        else {
-            console.log(exports);
-        }
         return exports;
     }
     clearAllConfig() {

package/dist/service/slsFunctionService.js

@@ -137,7 +137,7 @@ let MidwayServerlessFunctionService = class MidwayServerlessFunctionService exte
     }
     addServerlessFunction(func, triggerOptions, functionOptions = {}) {
         var _a, _b;
-        const prefix = '/';
+        const prefix = '';
         if (!this.routes.has(prefix)) {
             this.routes.set(prefix, []);
             this.routesPriority.push({
@@ -146,7 +146,7 @@ let MidwayServerlessFunctionService = class MidwayServerlessFunctionService exte
                 middleware: [],
                 routerOptions: {},
                 controllerId: undefined,
-                routerModule: module,
+                routerModule: undefined,
             });
         }
         const functionName = (_a = triggerOptions.functionName) !== null && _a !== void 0 ? _a : functionOptions.functionName;

package/dist/service/webRouterService.d.ts

@@ -74,7 +74,7 @@ export interface RouterInfo {
      */
     functionMetadata?: any;
 }
-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;
@@ -112,7 +112,7 @@ export declare class MidwayWebRouterService {
      * @param routerFunction
      * @param routerInfoOption
      */
-    addRouter(routerPath: string | RegExp, routerFunction: (...args: any[]) => void, routerInfoOption: DynamicRouterInfo): void;
+    addRouter(routerFunction: (...args: any[]) => void, routerInfoOption: DynamicRouterInfo): void;
     sortRouter(urlMatchList: RouterInfo[]): {
         _pureRouter: string;
         _level: number;

package/dist/service/webRouterService.js

@@ -156,10 +156,21 @@ let MidwayWebRouterService = class MidwayWebRouterService {
      * @param routerFunction
      * @param routerInfoOption
      */
-    addRouter(routerPath, routerFunction, routerInfoOption) {
-        this.checkDuplicateAndPush('/', Object.assign(routerInfoOption, {
+    addRouter(routerFunction, routerInfoOption) {
+        const prefix = routerInfoOption.prefix || '';
+        if (!this.routes.has(prefix)) {
+            this.routes.set(prefix, []);
+            this.routesPriority.push({
+                prefix,
+                priority: -999,
+                middleware: [],
+                routerOptions: {},
+                controllerId: undefined,
+                routerModule: undefined,
+            });
+        }
+        this.checkDuplicateAndPush(prefix, Object.assign(routerInfoOption, {
             method: routerFunction,
-            url: routerPath,
         }));
     }
     sortRouter(urlMatchList) {

package/package.json

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