@midwayjs/core 3.0.0-alpha.9 → 3.0.0-beta.4

package/dist/{util → common}/webRouterCollector.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebRouterCollector = void 0;
 const decorator_1 = require("@midwayjs/decorator");
-const index_1 = require("./index");
+const util_1 = require("../util");
 const container_1 = require("../context/container");
 const fileDetector_1 = require("./fileDetector");
+const util = require("util");
+const debug = util.debuglog('midway:debug');
 class WebRouterCollector {
     constructor(baseDir = '', options = {}) {
         this.isReady = false;
@@ -21,16 +23,27 @@ class WebRouterCollector {
             }));
             await container.ready();
         }
-        const controllerModules = decorator_1.listModule(decorator_1.CONTROLLER_KEY);
+        const controllerModules = (0, decorator_1.listModule)(decorator_1.CONTROLLER_KEY);
         for (const module of controllerModules) {
             this.collectRoute(module);
         }
         if (this.options.includeFunctionRouter) {
-            const fnModules = decorator_1.listModule(decorator_1.FUNC_KEY);
+            const fnModules = (0, decorator_1.listModule)(decorator_1.FUNC_KEY);
             for (const module of fnModules) {
                 this.collectFunctionRoute(module);
             }
         }
+        // filter empty prefix
+        this.routesPriority = this.routesPriority.filter(item => {
+            const prefixList = this.routes.get(item.prefix);
+            if (prefixList.length > 0) {
+                return true;
+            }
+            else {
+                this.routes.delete(item.prefix);
+                return false;
+            }
+        });
         // sort router
         for (const prefix of this.routes.keys()) {
             const routerInfo = this.routes.get(prefix);
@@ -38,37 +51,57 @@ class WebRouterCollector {
         }
         // sort prefix
         this.routesPriority = this.routesPriority.sort((routeA, routeB) => {
-            return routeB.priority - routeA.priority;
+            return routeB.prefix.length - routeA.prefix.length;
         });
     }
     collectRoute(module, functionMeta = false) {
-        const controllerId = decorator_1.getProviderId(module);
-        const controllerOption = decorator_1.getClassMetadata(decorator_1.CONTROLLER_KEY, module);
-        // sort for priority
-        let priority = decorator_1.getClassMetadata(decorator_1.PRIORITY_KEY, module);
+        var _a;
+        const controllerId = (0, decorator_1.getProviderName)(module);
+        debug(`[core:webCollector]: Found Controller ${controllerId}.`);
+        const id = (0, decorator_1.getProviderUUId)(module);
+        const controllerOption = (0, decorator_1.getClassMetadata)(decorator_1.CONTROLLER_KEY, module);
+        let priority;
         // implement middleware in controller
         const middleware = controllerOption.routerOptions.middleware;
-        const prefix = controllerOption.prefix || '/';
-        if (prefix === '/' && priority === undefined) {
-            priority = -999;
+        const controllerIgnoreGlobalPrefix = !!((_a = controllerOption.routerOptions) === null || _a === void 0 ? void 0 : _a.ignoreGlobalPrefix);
+        let prefix = (0, util_1.joinURLPath)(this.options.globalPrefix, controllerOption.prefix || '/');
+        const ignorePrefix = controllerOption.prefix || '/';
+        // if controller set ignore global prefix, all router will be ignore too.
+        if (controllerIgnoreGlobalPrefix) {
+            prefix = ignorePrefix;
         }
+        // set prefix
         if (!this.routes.has(prefix)) {
             this.routes.set(prefix, []);
             this.routesPriority.push({
                 prefix,
-                priority: priority || 0,
+                priority: prefix === '/' && priority === undefined ? -999 : 0,
                 middleware,
                 routerOptions: controllerOption.routerOptions,
                 controllerId,
+                routerModule: module,
             });
         }
-        const webRouterInfo = decorator_1.getClassMetadata(decorator_1.WEB_ROUTER_KEY, module);
+        // set ignorePrefix
+        if (!this.routes.has(ignorePrefix)) {
+            this.routes.set(ignorePrefix, []);
+            this.routesPriority.push({
+                prefix: ignorePrefix,
+                priority: ignorePrefix === '/' && priority === undefined ? -999 : 0,
+                middleware,
+                routerOptions: controllerOption.routerOptions,
+                controllerId,
+                routerModule: module,
+            });
+        }
+        const webRouterInfo = (0, decorator_1.getClassMetadata)(decorator_1.WEB_ROUTER_KEY, module);
         if (webRouterInfo && typeof webRouterInfo[Symbol.iterator] === 'function') {
             for (const webRouter of webRouterInfo) {
-                const routeArgsInfo = decorator_1.getPropertyDataFromClass(decorator_1.WEB_ROUTER_PARAM_KEY, module, webRouter.method) || [];
-                const routerResponseData = decorator_1.getPropertyMetadata(decorator_1.WEB_RESPONSE_KEY, module, webRouter.method) || [];
+                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 data = {
-                    prefix,
+                    id,
+                    prefix: webRouter.ignoreGlobalPrefix ? ignorePrefix : prefix,
                     routerName: webRouter.routerName || '',
                     url: webRouter.path,
                     requestMethod: webRouter.requestMethod,
@@ -88,22 +121,23 @@ class WebRouterCollector {
                     data.functionName = controllerId + '-' + webRouter.method;
                     data.functionTriggerName = decorator_1.ServerlessTriggerType.HTTP;
                     data.functionTriggerMetadata = {
-                        path: index_1.joinURLPath(prefix, webRouter.path.toString()),
+                        path: (0, util_1.joinURLPath)(prefix, webRouter.path.toString()),
                         method: webRouter.requestMethod,
                     };
                     data.functionMetadata = {
                         functionName: data.functionName,
                     };
                 }
-                this.checkDuplicateAndPush(prefix, data);
+                this.checkDuplicateAndPush(data.prefix, data);
             }
         }
     }
     collectFunctionRoute(module, functionMeta = false) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        // 老的函数路由
-        const webRouterInfo = decorator_1.getClassMetadata(decorator_1.FUNC_KEY, module);
-        const controllerId = decorator_1.getProviderId(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, []);
@@ -113,134 +147,74 @@ class WebRouterCollector {
                 middleware: [],
                 routerOptions: {},
                 controllerId,
+                routerModule: module,
             });
         }
         for (const webRouter of webRouterInfo) {
-            if (webRouter['type']) {
-                // 新的 @ServerlessTrigger 写法
-                if ((_a = webRouter['metadata']) === null || _a === void 0 ? void 0 : _a['path']) {
-                    const routeArgsInfo = decorator_1.getPropertyDataFromClass(decorator_1.WEB_ROUTER_PARAM_KEY, module, webRouter['methodName']) || [];
-                    const routerResponseData = decorator_1.getPropertyMetadata(decorator_1.WEB_RESPONSE_KEY, module, webRouter['methodName']) || [];
-                    // 新 http/api gateway 函数
-                    const data = {
-                        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,
+            // 新的 @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,
                     };
-                    if (functionMeta) {
-                        data.functionName = webRouter['functionName'];
-                        data.functionTriggerName = webRouter['type'];
-                        data.functionTriggerMetadata = webRouter['metadata'];
-                        const functionMeta = decorator_1.getPropertyMetadata(decorator_1.SERVERLESS_FUNC_KEY, module, webRouter['methodName']) || {};
-                        data.functionMetadata = {
-                            functionName: webRouter['functionName'],
-                            ...functionMeta,
-                        };
-                    }
-                    this.checkDuplicateAndPush(prefix, data);
-                }
-                else {
-                    if (functionMeta) {
-                        const functionMeta = decorator_1.getPropertyMetadata(decorator_1.SERVERLESS_FUNC_KEY, module, webRouter['methodName']) || {};
-                        // 其他类型的函数
-                        this.checkDuplicateAndPush(prefix, {
-                            prefix,
-                            routerName: '',
-                            url: '',
-                            requestMethod: '',
-                            method: webRouter['methodName'],
-                            description: '',
-                            summary: '',
-                            handlerName: `${controllerId}.${webRouter['methodName']}`,
-                            funcHandlerName: `${controllerId}.${webRouter['methodName']}`,
-                            controllerId,
-                            middleware: [],
-                            controllerMiddleware: [],
-                            requestMetadata: [],
-                            responseMetadata: [],
-                            functionName: webRouter['functionName'],
-                            functionTriggerName: webRouter['type'],
-                            functionTriggerMetadata: webRouter['metadata'],
-                            functionMetadata: {
-                                functionName: webRouter['functionName'],
-                                ...functionMeta,
-                            },
-                        });
-                    }
                 }
+                this.checkDuplicateAndPush(prefix, data);
             }
             else {
-                // 老的 @Func 写法
-                if (webRouter['path'] || webRouter['middleware']) {
-                    const data = {
+                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: (_e = webRouter['path']) !== null && _e !== void 0 ? _e : '',
-                        requestMethod: (_f = webRouter['method']) !== null && _f !== void 0 ? _f : 'get',
-                        method: (_g = webRouter['key']) !== null && _g !== void 0 ? _g : '',
+                        url: '',
+                        requestMethod: '',
+                        method: webRouter['methodName'],
                         description: '',
                         summary: '',
-                        handlerName: `${controllerId}.${webRouter['key']}`,
-                        funcHandlerName: webRouter['funHandler'] || `${controllerId}.${webRouter['key']}`,
+                        handlerName: `${controllerId}.${webRouter['methodName']}`,
+                        funcHandlerName: `${controllerId}.${webRouter['methodName']}`,
                         controllerId,
-                        middleware: webRouter['middleware'] || [],
+                        middleware: ((_j = webRouter['metadata']) === null || _j === void 0 ? void 0 : _j['middleware']) || [],
                         controllerMiddleware: [],
                         requestMetadata: [],
                         responseMetadata: [],
-                    };
-                    if (functionMeta) {
-                        // get function information
-                        data.functionName = controllerId + '-' + ((_h = webRouter['key']) !== null && _h !== void 0 ? _h : '');
-                        data.functionTriggerName = decorator_1.ServerlessTriggerType.HTTP;
-                        data.functionTriggerMetadata = {
-                            path: (_j = webRouter['path']) !== null && _j !== void 0 ? _j : '/',
-                            method: (_k = webRouter['method']) !== null && _k !== void 0 ? _k : 'get',
-                        };
-                        data.functionMetadata = {
-                            functionName: data.functionName,
-                        };
-                    }
-                    // 老函数的 http
-                    this.checkDuplicateAndPush(prefix, data);
-                }
-                else {
-                    if (functionMeta) {
-                        // 非 http
-                        this.checkDuplicateAndPush(prefix, {
-                            prefix,
-                            routerName: '',
-                            url: '',
-                            requestMethod: '',
-                            method: webRouter['key'],
-                            description: '',
-                            summary: '',
-                            handlerName: `${controllerId}.${webRouter['key']}`,
-                            funcHandlerName: webRouter['funHandler'] ||
-                                `${controllerId}.${webRouter['key']}`,
-                            controllerId,
-                            middleware: webRouter['middleware'] || [],
-                            controllerMiddleware: [],
-                            requestMetadata: [],
-                            responseMetadata: [],
-                            functionName: webRouter['functionName'],
-                            functionTriggerName: webRouter['type'],
-                            functionTriggerMetadata: webRouter['metadata'],
-                            functionMetadata: {
-                                functionName: webRouter['functionName'],
-                            },
-                        });
-                    }
+                        functionName,
+                        functionTriggerName: webRouter['type'],
+                        functionTriggerMetadata: webRouter['metadata'],
+                        functionMetadata: {
+                            functionName,
+                            ...functionMeta,
+                        },
+                    });
                 }
             }
         }
@@ -254,7 +228,7 @@ class WebRouterCollector {
         return urlMatchList
             .map(item => {
             const urlString = item.url.toString();
-            const weightArr = decorator_1.isRegExp(item.url)
+            const weightArr = (0, decorator_1.isRegExp)(item.url)
                 ? urlString.split('/')
                 : urlString.split('/');
             let weight = 0;
@@ -325,8 +299,8 @@ class WebRouterCollector {
             this.isReady = true;
         }
         let routeArr = [];
-        for (const routerInfo of this.routes.values()) {
-            routeArr = routeArr.concat(routerInfo);
+        for (const routerPriority of this.routesPriority) {
+            routeArr = routeArr.concat(this.routes.get(routerPriority.prefix));
         }
         return routeArr;
     }
@@ -345,4 +319,7 @@ class WebRouterCollector {
     }
 }
 exports.WebRouterCollector = WebRouterCollector;
+function createFunctionName(target, functionName) {
+    return (0, decorator_1.getProviderName)(target).replace(/[:#]/g, '-') + '-' + functionName;
+}
 //# sourceMappingURL=webRouterCollector.js.map

package/dist/config/config.default.d.ts

@@ -0,0 +1,7 @@
+import { MidwayAppInfo, ServiceFactoryConfigOption } from '../interface';
+import type { LoggerOptions } from '@midwayjs/logger';
+declare const _default: (appInfo: MidwayAppInfo) => {
+    midwayLogger?: ServiceFactoryConfigOption<LoggerOptions>;
+};
+export default _default;
+//# sourceMappingURL=config.default.d.ts.map

package/dist/config/config.default.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const interface_1 = require("../interface");
+const util_1 = require("../util/");
+const path_1 = require("path");
+exports.default = (appInfo) => {
+    var _a;
+    const isDevelopment = (0, util_1.isDevelopmentEnvironment)((0, util_1.getCurrentEnvironment)());
+    return {
+        midwayLogger: {
+            default: {
+                dir: (0, path_1.join)((_a = process.env[interface_1.MIDWAY_LOGGER_WRITEABLE_DIR]) !== null && _a !== void 0 ? _a : appInfo.root, 'logs', appInfo.name),
+                level: isDevelopment ? 'info' : 'warn',
+                consoleLevel: isDevelopment ? 'info' : 'warn',
+            },
+            clients: {
+                coreLogger: {
+                    fileLogName: 'midway-core.log',
+                },
+                appLogger: {
+                    fileLogName: 'midway-app.log',
+                    aliasName: 'logger',
+                },
+            },
+        },
+    };
+};
+//# sourceMappingURL=config.default.js.map

package/dist/context/container.d.ts

@@ -1,54 +1,84 @@
-import { ObjectDefinitionOptions, ObjectIdentifier } from '@midwayjs/decorator';
-import { BaseApplicationContext } from './applicationContext';
-import { IConfigService, IEnvironmentService, IFileDetector, IInformationService, IMidwayContainer, IObjectDefinitionMetadata } from '../interface';
-import { ResolverHandler } from './resolverHandler';
-declare class ContainerConfiguration {
-    readonly container: any;
-    private namespace;
-    constructor(container: any);
-    load(module: any): void;
-    addImportConfigs(importConfigs: string[]): void;
-    addImports(imports?: any[]): void;
-    bindConfigurationClass(clzz: any, filePath?: string): void;
-    private getConfigurationExport;
-}
-export declare class MidwayContainer extends BaseApplicationContext implements IMidwayContainer {
-    private debugLogger;
-    private definitionMetadataList;
-    protected resolverHandler: ResolverHandler;
+/// <reference types="node" />
+import { ObjectIdentifier, IModuleStore } from '@midwayjs/decorator';
+import { IFileDetector, IIdentifierRelationShip, IMidwayContainer, IObjectDefinition, IObjectDefinitionRegistry, ObjectContext } from '../interface';
+import { ManagedResolverFactory } from './managedResolverFactory';
+import * as EventEmitter from 'events';
+export declare class MidwayContainer implements IMidwayContainer, IModuleStore {
+    private _resolverFactory;
+    private _registry;
+    private _identifierMapping;
+    private moduleMap;
+    private _objectCreateEventTarget;
+    parent: IMidwayContainer;
     protected ctx: {};
-    protected configService: IConfigService;
-    protected environmentService: IEnvironmentService;
-    protected informationService: IInformationService;
-    protected aspectService: any;
     private fileDetector;
     private attrMap;
+    private _namespaceSet;
     private isLoad;
-    init(): void;
-    initService(): void;
+    constructor(parent?: IMidwayContainer);
+    protected init(): void;
+    get objectCreateEventTarget(): EventEmitter;
+    get registry(): IObjectDefinitionRegistry;
+    set registry(registry: IObjectDefinitionRegistry);
+    get managedResolverFactory(): ManagedResolverFactory;
+    get identifierMapping(): IIdentifierRelationShip;
+    get namespaceSet(): Set<string>;
     load(module?: any): void;
-    loadDefinitions(): void;
-    createConfiguration(): ContainerConfiguration;
-    bindClass(exports: any, namespace?: string, filePath?: string): void;
-    bind<T>(target: T, options?: ObjectDefinitionOptions): void;
-    bind<T>(identifier: ObjectIdentifier, target: T, options?: ObjectDefinitionOptions): void;
-    protected restoreDefinition(definitionMeta: IObjectDefinitionMetadata): void;
-    protected restoreDefinitions(definitionMetadataList: any): void;
-    protected getDefinitionMetaList(): any[];
-    protected bindModule(module: any, namespace?: string, filePath?: string): void;
-    getDebugLogger(): (msg: string, ...param: any[]) => void;
+    protected loadDefinitions(): void;
+    bindClass(exports: any, options?: Partial<IObjectDefinition>): void;
+    bind<T>(target: T, options?: Partial<IObjectDefinition>): void;
+    bind<T>(identifier: ObjectIdentifier, target: T, options?: Partial<IObjectDefinition>): void;
+    protected bindModule(module: any, options: Partial<IObjectDefinition>): void;
     setFileDetector(fileDetector: IFileDetector): void;
     createChild(): IMidwayContainer;
-    registerDataHandler(handlerType: string, handler: (...args: any[]) => any): void;
-    getConfigService(): IConfigService;
-    getEnvironmentService(): IEnvironmentService;
-    getInformationService(): IInformationService;
-    setInformationService(informationService: any): void;
-    getAspectService(): any;
-    getCurrentEnv(): string;
-    getResolverHandler(): ResolverHandler;
     setAttr(key: string, value: any): void;
     getAttr<T>(key: string): T;
+    protected getIdentifier(target: any): string;
+    protected getManagedResolverFactory(): ManagedResolverFactory;
+    stop(): Promise<void>;
+    ready(): Promise<void>;
+    get<T>(identifier: {
+        new (...args: any[]): T;
+    }, args?: any[], objectContext?: ObjectContext): T;
+    get<T>(identifier: ObjectIdentifier, args?: any[], objectContext?: ObjectContext): T;
+    getAsync<T>(identifier: {
+        new (...args: any[]): T;
+    }, args?: any[], objectContext?: ObjectContext): Promise<T>;
+    getAsync<T>(identifier: ObjectIdentifier, args?: any[], objectContext?: ObjectContext): Promise<T>;
+    /**
+     * proxy registry.registerObject
+     * @param {ObjectIdentifier} identifier
+     * @param target
+     */
+    registerObject(identifier: ObjectIdentifier, target: any): void;
+    onBeforeBind(fn: (Clzz: any, options: {
+        context: IMidwayContainer;
+        definition: IObjectDefinition;
+        replaceCallback: (newDefinition: IObjectDefinition) => void;
+    }) => void): void;
+    onBeforeObjectCreated(fn: (Clzz: any, options: {
+        context: IMidwayContainer;
+        definition: IObjectDefinition;
+        constructorArgs: any[];
+    }) => void): void;
+    onObjectCreated<T>(fn: (ins: T, options: {
+        context: IMidwayContainer;
+        definition: IObjectDefinition;
+        replaceCallback: (ins: T) => void;
+    }) => void): void;
+    onObjectInit<T>(fn: (ins: T, options: {
+        context: IMidwayContainer;
+        definition: IObjectDefinition;
+    }) => void): void;
+    onBeforeObjectDestroy<T>(fn: (ins: T, options: {
+        context: IMidwayContainer;
+        definition: IObjectDefinition;
+    }) => void): void;
+    saveModule(key: any, module: any): void;
+    listModule(key: string): unknown[];
+    transformModule(moduleMap: Map<string, Set<any>>): void;
+    hasNamespace(ns: string): boolean;
+    hasDefinition(identifier: ObjectIdentifier): boolean;
+    hasObject(identifier: ObjectIdentifier): boolean;
 }
-export {};
 //# sourceMappingURL=container.d.ts.map