@midwayjs/core 3.3.6 → 3.4.0-beta.3

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

@@ -1,37 +1,40 @@
 "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.WebRouterCollector = 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 contextUtil_1 = require("../util/contextUtil");
+const container_1 = require("../context/container");
+const fileDetector_1 = require("../common/fileDetector");
 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();
-        }
         const controllerModules = (0, decorator_1.listModule)(decorator_1.CONTROLLER_KEY);
         for (const module of controllerModules) {
-            this.collectRoute(module);
+            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.collectFunctionRoute(module, this.options.includeFunctionRouter);
             }
         }
         // filter empty prefix
@@ -54,13 +57,37 @@ class WebRouterCollector {
         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',
+                        ];
+                    }
+                }
+            }
+        }
     }
-    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 +110,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 +131,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,6 +172,18 @@ class WebRouterCollector {
             }
         }
     }
+    /**
+     * 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,
+        }));
+    }
     collectFunctionRoute(module, functionMeta = false) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         // serverlessTrigger metadata
@@ -323,9 +371,56 @@ class WebRouterCollector {
         }
         prefixList.push(routerInfo);
     }
-}
-exports.WebRouterCollector = WebRouterCollector;
+};
+MidwayWebRouterService = __decorate([
+    (0, decorator_1.Provide)(),
+    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton),
+    __metadata("design:paramtypes", [Object])
+], MidwayWebRouterService);
+exports.MidwayWebRouterService = MidwayWebRouterService;
 function createFunctionName(target, functionName) {
     return (0, decorator_1.getProviderName)(target).replace(/[:#]/g, '-') + '-' + functionName;
 }
-//# sourceMappingURL=webRouterCollector.js.map
+/**
+ * @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

@@ -95,6 +95,7 @@ function prepareGlobalApplicationContext(globalOptions) {
     applicationContext.bindClass(_1.MidwayMiddlewareService);
     applicationContext.bindClass(_1.MidwayLifeCycleService);
     applicationContext.bindClass(_1.MidwayMockService);
+    applicationContext.bindClass(_1.MidwayWebRouterService);
     // bind preload module
     if (globalOptions.preloadModules && globalOptions.preloadModules.length) {
         for (const preloadModule of globalOptions.preloadModules) {

package/dist/util/index.d.ts

@@ -90,4 +90,5 @@ export declare function pathMatching(options: any): (ctx?: any) => any;
  */
 export declare function wrapMiddleware(mw: FunctionMiddleware<any, any>, options: any): (context: any, next: any, options?: any) => any;
 export declare function isIncludeProperty(obj: any, prop: string): boolean;
+export declare function wrapAsync(handler: any): (...args: any[]) => any;
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isIncludeProperty = exports.wrapMiddleware = exports.pathMatching = exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
+exports.wrapAsync = exports.isIncludeProperty = exports.wrapMiddleware = exports.pathMatching = exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetAllPrototypeMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
@@ -313,4 +313,25 @@ function isIncludeProperty(obj, prop) {
     return false;
 }
 exports.isIncludeProperty = isIncludeProperty;
+function wrapAsync(handler) {
+    return (...args) => {
+        if (typeof args[args.length - 1] === 'function') {
+            const callback = args.pop();
+            if (handler.constructor.name !== 'AsyncFunction') {
+                const err = new TypeError('Must be an AsyncFunction');
+                return callback(err);
+            }
+            // 其他事件场景
+            return handler.apply(handler, args).then(result => {
+                callback(null, result);
+            }, err => {
+                callback(err);
+            });
+        }
+        else {
+            return handler.apply(handler, args);
+        }
+    };
+}
+exports.wrapAsync = wrapAsync;
 //# sourceMappingURL=index.js.map

package/package.json

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