@midwayjs/core 3.7.0 → 3.9.0

package/dist/baseFramework.d.ts

@@ -77,9 +77,9 @@ export declare abstract class BaseFramework<APP extends IMidwayApplication<CTX>,
      */
     protected afterContainerReady(options: Partial<IMidwayBootstrapOptions>): Promise<void>;
     applyMiddleware<R, N>(lastMiddleware?: CommonMiddlewareUnion<CTX, R, N>): Promise<MiddlewareRespond<CTX, R, N>>;
-    getLogger(name?: string): ILogger;
+    getLogger(name?: string): any;
     getCoreLogger(): ILogger;
-    createLogger(name: string, option?: LoggerOptions): ILogger;
+    createLogger(name: string, option?: LoggerOptions): any;
     getProjectName(): string;
     getFrameworkName(): string;
     useMiddleware(middleware: CommonMiddlewareUnion<CTX, ResOrNext, Next>): void;

package/dist/common/dataSourceManager.d.ts

@@ -2,6 +2,7 @@ export declare abstract class DataSourceManager<T> {
     protected dataSource: Map<string, T>;
     protected options: {};
     protected modelMapping: WeakMap<object, any>;
+    private innerDefaultDataSourceName;
     protected initDataSource(options: any, appDir: string): Promise<void>;
     /**
      * get a data source instance
@@ -32,6 +33,7 @@ export declare abstract class DataSourceManager<T> {
     stop(): Promise<void>;
     getDefaultDataSourceName(): string;
 }
+export declare function formatGlobString(globString: string): string[];
 export declare function globModels(globString: string, appDir: string): any[];
 export interface CreateDataSourceInstanceOptions {
     /**

package/dist/common/dataSourceManager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.globModels = exports.DataSourceManager = void 0;
+exports.globModels = exports.formatGlobString = exports.DataSourceManager = void 0;
 /**
  * 数据源管理器实现
  */
@@ -113,30 +113,44 @@ class DataSourceManager {
         this.dataSource.clear();
     }
     getDefaultDataSourceName() {
-        return this.options['defaultDataSourceName'];
+        if (this.innerDefaultDataSourceName === undefined) {
+            if (this.options['defaultDataSourceName']) {
+                this.innerDefaultDataSourceName = this.options['defaultDataSourceName'];
+            }
+            else if (this.dataSource.size === 1) {
+                // Set the default source name when there is only one data source
+                this.innerDefaultDataSourceName = Array.from(this.dataSource.keys())[0];
+            }
+            else {
+                // Set empty string for cache
+                this.innerDefaultDataSourceName = '';
+            }
+        }
+        return this.innerDefaultDataSourceName;
     }
 }
 exports.DataSourceManager = DataSourceManager;
-function globModels(globString, appDir) {
-    let cwd;
+function formatGlobString(globString) {
     let pattern;
-    if (globString.endsWith('**')) {
-        // 去掉尾部的 **，因为 glob 会自动添加
-        globString = globString.slice(0, -2);
+    if (!/^\*/.test(globString)) {
+        globString = '/' + globString;
     }
-    if (/\*/.test(globString)) {
-        cwd = appDir;
-        pattern = [...constants_1.DEFAULT_PATTERN.map(p => (0, path_1.join)(globString, p))];
-        pattern.push(globString);
+    const parsePattern = (0, path_1.parse)(globString);
+    if (parsePattern.base && (/\*/.test(parsePattern.base) || parsePattern.ext)) {
+        pattern = [globString];
     }
     else {
-        pattern = [...constants_1.DEFAULT_PATTERN];
-        cwd = (0, path_1.join)(appDir, globString);
+        pattern = [...constants_1.DEFAULT_PATTERN.map(p => (0, path_1.join)(globString, p))];
     }
+    return pattern;
+}
+exports.formatGlobString = formatGlobString;
+function globModels(globString, appDir) {
+    const pattern = formatGlobString(globString);
     const models = [];
     // string will be glob file
     const files = (0, glob_1.run)(pattern, {
-        cwd,
+        cwd: appDir,
         ignore: constants_1.IGNORE_PATTERN,
     });
     for (const file of files) {

package/dist/common/loggerFactory.d.ts

@@ -0,0 +1,8 @@
+import { ILogger } from '../interface';
+export declare abstract class LoggerFactory<Logger extends ILogger, LoggerOptions> {
+    abstract createLogger(name: string, options: LoggerOptions): Logger;
+    abstract getLogger(loggerName: string): Logger;
+    abstract close(loggerName?: string): any;
+    abstract removeLogger(loggerName: string): any;
+}
+//# sourceMappingURL=loggerFactory.d.ts.map

package/dist/common/loggerFactory.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoggerFactory = void 0;
+class LoggerFactory {
+}
+exports.LoggerFactory = LoggerFactory;
+//# sourceMappingURL=loggerFactory.js.map

package/dist/common/serviceFactory.d.ts

@@ -1,16 +1,18 @@
+import { IServiceFactory } from '../interface';
 /**
  * 多客户端工厂实现
  */
-export declare abstract class ServiceFactory<T> {
+export declare abstract class ServiceFactory<T> implements IServiceFactory<T> {
     protected clients: Map<string, T>;
     protected options: {};
     protected initClients(options?: any): Promise<void>;
     get<U = T>(id?: string): U;
     has(id: string): boolean;
-    createInstance(config: any, clientName?: any): Promise<T | void>;
+    createInstance(config: any, clientName?: any): Promise<T | undefined>;
     abstract getName(): string;
     protected abstract createClient(config: any, clientName: any): Promise<T | void> | (T | void);
     protected destroyClient(client: T): Promise<void>;
     stop(): Promise<void>;
+    getDefaultClientName(): string;
 }
 //# sourceMappingURL=serviceFactory.d.ts.map

package/dist/common/serviceFactory.js

@@ -17,7 +17,6 @@ class ServiceFactory {
             options.clients = options.clients || {};
             options.clients['default'] = options.clients['default'] || {};
             (0, extend_1.extend)(true, options.clients['default'], options.client);
-            delete options.client;
         }
         // multi client
         if (options.clients) {
@@ -49,6 +48,9 @@ class ServiceFactory {
             await this.destroyClient(value);
         }
     }
+    getDefaultClientName() {
+        return this.options['defaultClientName'];
+    }
 }
 exports.ServiceFactory = ServiceFactory;
 //# sourceMappingURL=serviceFactory.js.map

package/dist/constants.d.ts

@@ -14,7 +14,7 @@ export declare const KEYS: {
     PROPS_ELEMENT: string;
     PROP_ELEMENT: string;
     SET_ELEMENT: string;
-    CONSTRUCTORARG_ELEMENT: string;
+    CONSTRUCTOR_ARG_ELEMENT: string;
     REF_ELEMENT: string;
     JSON_ELEMENT: string;
     CONFIGURATION_ELEMENT: string;
@@ -37,16 +37,6 @@ export declare const KEYS: {
     EXPRESSION_ATTRIBUTE: string;
     EXECUTE_ATTRIBUTE: string;
 };
-export declare const VALUE_TYPE: {
-    STRING: string;
-    DATE: string;
-    NUMBER: string;
-    INTEGER: string;
-    TEMPLATE: string;
-    MANAGED: string;
-    OBJECT: string;
-    BOOLEAN: string;
-};
 export declare const FUNCTION_INJECT_KEY = "midway:function_inject_key";
 export declare const MIDWAY_LOGGER_WRITEABLE_DIR = "MIDWAY_LOGGER_WRITEABLE_DIR";
 export declare const REQUEST_CTX_KEY = "ctx";

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IGNORE_PATTERN = exports.DEFAULT_PATTERN = exports.ASYNC_CONTEXT_MANAGER_KEY = exports.ASYNC_CONTEXT_KEY = exports.REQUEST_CTX_LOGGER_CACHE_KEY = exports.HTTP_SERVER_KEY = exports.REQUEST_OBJ_CTX_KEY = exports.REQUEST_CTX_KEY = exports.MIDWAY_LOGGER_WRITEABLE_DIR = exports.FUNCTION_INJECT_KEY = exports.VALUE_TYPE = exports.KEYS = void 0;
+exports.IGNORE_PATTERN = exports.DEFAULT_PATTERN = exports.ASYNC_CONTEXT_MANAGER_KEY = exports.ASYNC_CONTEXT_KEY = exports.REQUEST_CTX_LOGGER_CACHE_KEY = exports.HTTP_SERVER_KEY = exports.REQUEST_OBJ_CTX_KEY = exports.REQUEST_CTX_KEY = exports.MIDWAY_LOGGER_WRITEABLE_DIR = exports.FUNCTION_INJECT_KEY = exports.KEYS = void 0;
 /**
  * 静态参数
  *
@@ -17,7 +17,7 @@ exports.KEYS = {
     PROPS_ELEMENT: 'props',
     PROP_ELEMENT: 'prop',
     SET_ELEMENT: 'set',
-    CONSTRUCTORARG_ELEMENT: 'constructor-arg',
+    CONSTRUCTOR_ARG_ELEMENT: 'constructor-arg',
     REF_ELEMENT: 'ref',
     JSON_ELEMENT: 'json',
     CONFIGURATION_ELEMENT: 'configuration',
@@ -40,16 +40,6 @@ exports.KEYS = {
     EXPRESSION_ATTRIBUTE: 'expression',
     EXECUTE_ATTRIBUTE: 'execute',
 };
-exports.VALUE_TYPE = {
-    STRING: 'string',
-    DATE: 'date',
-    NUMBER: 'number',
-    INTEGER: 'int',
-    TEMPLATE: 'template',
-    MANAGED: 'managed',
-    OBJECT: 'object',
-    BOOLEAN: 'boolean',
-};
 exports.FUNCTION_INJECT_KEY = 'midway:function_inject_key';
 exports.MIDWAY_LOGGER_WRITEABLE_DIR = 'MIDWAY_LOGGER_WRITEABLE_DIR';
 exports.REQUEST_CTX_KEY = 'ctx';

package/dist/decorator/common/inject.d.ts

@@ -1,3 +1,5 @@
 import { ObjectIdentifier } from '../interface';
+import { IServiceFactory } from '../../interface';
 export declare function Inject(identifier?: ObjectIdentifier): (target: any, targetKey: string) => void;
+export declare function InjectClient(serviceFactoryClz: new (...args: any[]) => IServiceFactory<unknown>, clientName?: string): PropertyDecorator;
 //# sourceMappingURL=inject.d.ts.map

package/dist/decorator/common/inject.js

@@ -1,11 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Inject = void 0;
+exports.InjectClient = exports.Inject = void 0;
 const decoratorManager_1 = require("../decoratorManager");
+const constant_1 = require("../constant");
 function Inject(identifier) {
     return function (target, targetKey) {
         (0, decoratorManager_1.savePropertyInject)({ target, targetKey, identifier });
     };
 }
 exports.Inject = Inject;
+function InjectClient(serviceFactoryClz, clientName) {
+    return (0, decoratorManager_1.createCustomPropertyDecorator)(constant_1.FACTORY_SERVICE_CLIENT_KEY, {
+        serviceFactoryClz,
+        clientName,
+    });
+}
+exports.InjectClient = InjectClient;
 //# sourceMappingURL=inject.js.map

package/dist/decorator/constant.d.ts

@@ -6,6 +6,7 @@ export declare const ASPECT_KEY = "common:aspect";
 export declare const CATCH_KEY = "common:catch";
 export declare const MATCH_KEY = "common:match";
 export declare const GUARD_KEY = "common:guard";
+export declare const FACTORY_SERVICE_CLIENT_KEY = "common:service_factory:client";
 export declare const FUNC_KEY = "faas:func";
 export declare const SERVERLESS_FUNC_KEY = "faas:serverless:function";
 export declare const CONTROLLER_KEY = "web:controller";

package/dist/decorator/constant.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OBJ_DEF_CLS = exports.TAGGED_FUN = exports.TAGGED_CLS = exports.INJECT_CUSTOM_PARAM = exports.INJECT_CUSTOM_METHOD = exports.INJECT_CUSTOM_PROPERTY = exports.INJECT_TAG = exports.NAMED_TAG = exports.CLASS_KEY_CONSTRUCTOR = exports.APPLICATION_CONTEXT_KEY = exports.APPLICATION_KEY = exports.LOGGER_KEY = exports.PLUGIN_KEY = exports.CONFIG_KEY = exports.MS_HSF_METHOD_KEY = exports.MS_DUBBO_METHOD_KEY = exports.MS_GRPC_METHOD_KEY = exports.MS_PROVIDER_KEY = exports.MS_PRODUCER_KEY = exports.MS_CONSUMER_KEY = exports.RPC_DUBBO_KEY = exports.RPC_GRPC_KEY = exports.HSF_KEY = exports.WS_EVENT_KEY = exports.WS_CONTROLLER_KEY = exports.MODULE_TASK_QUEUE_OPTIONS = exports.MODULE_TASK_QUEUE_KEY = exports.MODULE_TASK_TASK_LOCAL_OPTIONS = exports.MODULE_TASK_TASK_LOCAL_KEY = exports.MODULE_TASK_METADATA = exports.MODULE_TASK_KEY = exports.WEB_RESPONSE_RENDER = exports.WEB_RESPONSE_CONTENT_TYPE = exports.WEB_RESPONSE_HEADER = exports.WEB_RESPONSE_REDIRECT = exports.WEB_RESPONSE_HTTP_CODE = exports.WEB_RESPONSE_KEY = exports.WEB_ROUTER_PARAM_KEY = exports.WEB_ROUTER_KEY = exports.CONTROLLER_KEY = exports.SERVERLESS_FUNC_KEY = exports.FUNC_KEY = exports.GUARD_KEY = exports.MATCH_KEY = exports.CATCH_KEY = exports.ASPECT_KEY = exports.FRAMEWORK_KEY = exports.CONFIGURATION_KEY = exports.SCHEDULE_KEY = exports.ALL = void 0;
-exports.PRIVATE_META_DATA_KEY = exports.MAIN_MODULE_KEY = exports.LIFECYCLE_IDENTIFIER_PREFIX = exports.PIPELINE_IDENTIFIER = void 0;
+exports.TAGGED_FUN = exports.TAGGED_CLS = exports.INJECT_CUSTOM_PARAM = exports.INJECT_CUSTOM_METHOD = exports.INJECT_CUSTOM_PROPERTY = exports.INJECT_TAG = exports.NAMED_TAG = exports.CLASS_KEY_CONSTRUCTOR = exports.APPLICATION_CONTEXT_KEY = exports.APPLICATION_KEY = exports.LOGGER_KEY = exports.PLUGIN_KEY = exports.CONFIG_KEY = exports.MS_HSF_METHOD_KEY = exports.MS_DUBBO_METHOD_KEY = exports.MS_GRPC_METHOD_KEY = exports.MS_PROVIDER_KEY = exports.MS_PRODUCER_KEY = exports.MS_CONSUMER_KEY = exports.RPC_DUBBO_KEY = exports.RPC_GRPC_KEY = exports.HSF_KEY = exports.WS_EVENT_KEY = exports.WS_CONTROLLER_KEY = exports.MODULE_TASK_QUEUE_OPTIONS = exports.MODULE_TASK_QUEUE_KEY = exports.MODULE_TASK_TASK_LOCAL_OPTIONS = exports.MODULE_TASK_TASK_LOCAL_KEY = exports.MODULE_TASK_METADATA = exports.MODULE_TASK_KEY = exports.WEB_RESPONSE_RENDER = exports.WEB_RESPONSE_CONTENT_TYPE = exports.WEB_RESPONSE_HEADER = exports.WEB_RESPONSE_REDIRECT = exports.WEB_RESPONSE_HTTP_CODE = exports.WEB_RESPONSE_KEY = exports.WEB_ROUTER_PARAM_KEY = exports.WEB_ROUTER_KEY = exports.CONTROLLER_KEY = exports.SERVERLESS_FUNC_KEY = exports.FUNC_KEY = exports.FACTORY_SERVICE_CLIENT_KEY = exports.GUARD_KEY = exports.MATCH_KEY = exports.CATCH_KEY = exports.ASPECT_KEY = exports.FRAMEWORK_KEY = exports.CONFIGURATION_KEY = exports.SCHEDULE_KEY = exports.ALL = void 0;
+exports.PRIVATE_META_DATA_KEY = exports.MAIN_MODULE_KEY = exports.LIFECYCLE_IDENTIFIER_PREFIX = exports.PIPELINE_IDENTIFIER = exports.OBJ_DEF_CLS = void 0;
 // got all value with no property name
 exports.ALL = 'common:all_value_key';
 // common
@@ -12,6 +12,7 @@ exports.ASPECT_KEY = 'common:aspect';
 exports.CATCH_KEY = 'common:catch';
 exports.MATCH_KEY = 'common:match';
 exports.GUARD_KEY = 'common:guard';
+exports.FACTORY_SERVICE_CLIENT_KEY = 'common:service_factory:client';
 // faas
 exports.FUNC_KEY = 'faas:func';
 exports.SERVERLESS_FUNC_KEY = 'faas:serverless:function';

package/dist/index.d.ts

@@ -19,6 +19,7 @@ export { RouterInfo, DynamicRouterInfo, RouterPriority, RouterCollectorOptions,
 export { MidwayServerlessFunctionService, WebRouterCollector, } from './service/slsFunctionService';
 export { CreateDataSourceInstanceOptions, DataSourceManager, } from './common/dataSourceManager';
 export * from './service/pipelineService';
+export * from './common/loggerFactory';
 export * from './common/serviceFactory';
 export * from './common/dataListener';
 export * from './common/fileDetector';

package/dist/index.js

@@ -54,6 +54,7 @@ Object.defineProperty(exports, "WebRouterCollector", { enumerable: true, get: fu
 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("./common/loggerFactory"), exports);
 __exportStar(require("./common/serviceFactory"), exports);
 __exportStar(require("./common/dataListener"), exports);
 __exportStar(require("./common/fileDetector"), exports);

package/dist/interface.d.ts

@@ -1,9 +1,16 @@
 /// <reference types="node" />
-import type { ILogger, LoggerOptions, LoggerContextFormat } from '@midwayjs/logger';
+import type { LoggerOptions, LoggerContextFormat } from '@midwayjs/logger';
 import * as EventEmitter from 'events';
 import type { AsyncContextManager } from './common/asyncContextManager';
+import type { LoggerFactory } from './common/loggerFactory';
 import type { IManagedInstance, IMethodAspect, ObjectIdentifier } from './decorator';
 import { FrameworkType, ScopeEnum } from './decorator';
+export interface ILogger {
+    info(msg: any, ...args: any[]): void;
+    debug(msg: any, ...args: any[]): void;
+    error(msg: any, ...args: any[]): void;
+    warn(msg: any, ...args: any[]): void;
+}
 export interface MidwayCoreDefaultConfig {
     midwayLogger?: ServiceFactoryConfigOption<LoggerOptions>;
     debug?: {
@@ -22,6 +29,7 @@ export declare type ServiceFactoryConfigOption<OPTIONS> = {
     clients?: {
         [key: string]: PowerPartial<OPTIONS>;
     };
+    defaultClientName?: string;
 };
 export declare type DataSourceManagerConfigOption<OPTIONS> = {
     default?: PowerPartial<OPTIONS>;
@@ -473,6 +481,7 @@ export interface IMidwayBootstrapOptions {
         [environmentName: string]: Record<string, any>;
     }> | Record<string, any>;
     asyncContextManager?: AsyncContextManager;
+    loggerFactory?: LoggerFactory<any, any>;
 }
 export interface IConfigurationOptions {
     logger?: ILogger;
@@ -521,5 +530,13 @@ export interface MidwayAppInfo {
 export interface MidwayConfig extends FileConfigOption<MidwayCoreDefaultConfig> {
     [customConfigKey: string]: unknown;
 }
+export interface IServiceFactory<Client> {
+    get(clientId: string): Client;
+    has(clientId: string): boolean;
+    createInstance(config: any, clientId?: string): Promise<Client | undefined>;
+    getName(): string;
+    stop(): Promise<void>;
+    getDefaultClientName(): string;
+}
 export {};
 //# sourceMappingURL=interface.d.ts.map

package/dist/service/decoratorService.js

@@ -40,7 +40,7 @@ let MidwayDecoratorService = class MidwayDecoratorService {
                         if (!methodDecoratorHandler) {
                             throw new error_1.MidwayCommonError(`Method Decorator "${key}" handler not found, please register first.`);
                         }
-                        return this.methodDecoratorMap.get(key)({
+                        return methodDecoratorHandler({
                             target: Clzz,
                             propertyName,
                             metadata,

package/dist/service/frameworkService.js

@@ -66,6 +66,21 @@ let MidwayFrameworkService = class MidwayFrameworkService {
             var _a;
             return this.getMainApp()[(_a = meta.identifier) !== null && _a !== void 0 ? _a : propertyName];
         });
+        this.decoratorService.registerPropertyHandler(decorator_1.FACTORY_SERVICE_CLIENT_KEY, (propertyName, meta) => {
+            const factory = this.applicationContext.get(meta.serviceFactoryClz);
+            const clientName = meta.clientName || factory.getDefaultClientName();
+            if (clientName && factory.has(clientName)) {
+                return factory.get(clientName);
+            }
+            else {
+                if (!clientName) {
+                    throw new error_1.MidwayParameterError(`Please set clientName or options.defaultClientName for ${meta.serviceFactoryClz.name}).`);
+                }
+                else {
+                    throw new error_1.MidwayParameterError(`ClientName(${clientName} not found in ${meta.serviceFactoryClz.name}).`);
+                }
+            }
+        });
         let frameworks = (0, decorator_1.listModule)(decorator_1.FRAMEWORK_KEY);
         // filter proto
         frameworks = filterProtoFramework(frameworks);

package/dist/service/loggerService.d.ts

@@ -1,15 +1,18 @@
 import { MidwayConfigService } from './configService';
 import { ServiceFactory } from '../common/serviceFactory';
-import { ILogger, LoggerOptions } from '@midwayjs/logger';
-import { IMidwayContainer } from '../interface';
+import { ILogger, IMidwayContainer } from '../interface';
+import { LoggerFactory } from '../common/loggerFactory';
 export declare class MidwayLoggerService extends ServiceFactory<ILogger> {
     readonly applicationContext: IMidwayContainer;
+    readonly globalOptions: {};
     configService: MidwayConfigService;
-    constructor(applicationContext: IMidwayContainer);
+    private loggerFactory;
+    constructor(applicationContext: IMidwayContainer, globalOptions?: {});
     protected init(): void;
-    protected createClient(config: LoggerOptions, name?: string): void;
+    protected createClient(config: any, name?: string): void;
     getName(): string;
-    createLogger(name: any, config: any): ILogger;
-    getLogger(name: string): ILogger;
+    createLogger(name: any, config: any): any;
+    getLogger(name: string): any;
+    getCurrentLoggerFactory(): LoggerFactory<any, any>;
 }
 //# sourceMappingURL=loggerService.d.ts.map

package/dist/service/loggerService.js

@@ -15,27 +15,32 @@ const configService_1 = require("./configService");
 const serviceFactory_1 = require("../common/serviceFactory");
 const logger_1 = require("@midwayjs/logger");
 let MidwayLoggerService = class MidwayLoggerService extends serviceFactory_1.ServiceFactory {
-    constructor(applicationContext) {
+    constructor(applicationContext, globalOptions = {}) {
         super();
         this.applicationContext = applicationContext;
+        this.globalOptions = globalOptions;
     }
     init() {
         var _a;
+        this.loggerFactory = this.globalOptions['loggerFactory'] || logger_1.loggers;
         this.initClients(this.configService.getConfiguration('midwayLogger'));
         // alias inject logger
         (_a = this.applicationContext) === null || _a === void 0 ? void 0 : _a.registerObject('logger', this.getLogger('appLogger'));
     }
     createClient(config, name) {
-        logger_1.loggers.createLogger(name, config);
+        this.loggerFactory.createLogger(name, config);
     }
     getName() {
         return 'logger';
     }
     createLogger(name, config) {
-        return logger_1.loggers.createLogger(name, config);
+        return this.loggerFactory.createLogger(name, config);
     }
     getLogger(name) {
-        return logger_1.loggers.getLogger(name);
+        return this.loggerFactory.getLogger(name);
+    }
+    getCurrentLoggerFactory() {
+        return this.loggerFactory;
     }
 };
 __decorate([
@@ -51,7 +56,7 @@ __decorate([
 MidwayLoggerService = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton),
-    __metadata("design:paramtypes", [Object])
+    __metadata("design:paramtypes", [Object, Object])
 ], MidwayLoggerService);
 exports.MidwayLoggerService = MidwayLoggerService;
 //# sourceMappingURL=loggerService.js.map

package/dist/service/webRouterService.d.ts

@@ -114,8 +114,6 @@ 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;
@@ -239,7 +237,6 @@ export declare class MidwayWebRouterService {
     getRouterTable(): Promise<Map<string, RouterInfo[]>>;
     getFlattenRouterTable(options?: {
         compileUrlPattern?: boolean;
-        noCache?: boolean;
     }): Promise<RouterInfo[]>;
     getMatchedRouterInfo(routerUrl: string, method: string): Promise<RouterInfo | undefined>;
     protected checkDuplicateAndPush(prefix: any, routerInfo: RouterInfo): void;

package/dist/service/webRouterService.js

@@ -23,7 +23,6 @@ let MidwayWebRouterService = class MidwayWebRouterService {
         this.isReady = false;
         this.routes = new Map();
         this.routesPriority = [];
-        this.includeCompileUrlPattern = false;
     }
     async analyze() {
         this.analyzeController();
@@ -182,6 +181,8 @@ let MidwayWebRouterService = class MidwayWebRouterService {
         this.checkDuplicateAndPush(prefix, Object.assign(routerInfoOption, {
             method: routerFunction,
         }));
+        // sort again
+        this.sortPrefixAndRouter();
     }
     sortRouter(urlMatchList) {
         // 1. 绝对路径规则优先级最高如 /ab/cb/e
@@ -260,18 +261,6 @@ let MidwayWebRouterService = class MidwayWebRouterService {
         return this.routes;
     }
     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.fullUrlFlattenString) {
-                        item.fullUrlCompiledRegexp = pathToRegexp_1.PathToRegexpUtil.toRegexp(item.fullUrlFlattenString);
-                    }
-                }
-            }
-            return this.cachedFlattenRouteList;
-        }
         if (!this.isReady) {
             await this.analyze();
             this.isReady = true;
@@ -281,7 +270,6 @@ let MidwayWebRouterService = class MidwayWebRouterService {
             routeArr = routeArr.concat(this.routes.get(routerPriority.prefix));
         }
         if (options.compileUrlPattern) {
-            this.includeCompileUrlPattern = true;
             // attach match pattern function
             for (const item of routeArr) {
                 if (item.fullUrlFlattenString) {
@@ -289,7 +277,6 @@ let MidwayWebRouterService = class MidwayWebRouterService {
                 }
             }
         }
-        this.cachedFlattenRouteList = routeArr;
         return routeArr;
     }
     async getMatchedRouterInfo(routerUrl, method) {

package/dist/setup.js

@@ -6,7 +6,6 @@ const config_default_1 = require("./config/config.default");
 const decorator_1 = require("./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');
 /**
@@ -18,6 +17,7 @@ async function initializeGlobalApplicationContext(globalOptions) {
     // init logger
     const loggerService = await applicationContext.getAsync(_1.MidwayLoggerService, [
         applicationContext,
+        globalOptions,
     ]);
     if (loggerService.getLogger('appLogger')) {
         // register global logger
@@ -42,13 +42,15 @@ async function initializeGlobalApplicationContext(globalOptions) {
 }
 exports.initializeGlobalApplicationContext = initializeGlobalApplicationContext;
 async function destroyGlobalApplicationContext(applicationContext) {
+    const loggerService = await applicationContext.getAsync(_1.MidwayLoggerService);
+    const loggerFactory = loggerService.getCurrentLoggerFactory();
     // stop lifecycle
     const lifecycleService = await applicationContext.getAsync(_1.MidwayLifeCycleService);
     await lifecycleService.stop();
     // stop container
     await applicationContext.stop();
     (0, decorator_1.clearBindContainer)();
-    logger_1.loggers.close();
+    loggerFactory.close();
     global['MIDWAY_APPLICATION_CONTEXT'] = undefined;
     global['MIDWAY_MAIN_FRAMEWORK'] = undefined;
 }

package/dist/util/camelCase.js

@@ -12,19 +12,19 @@ const preserveCamelCase = (string, toLowerCase, toUpperCase) => {
     let isLastCharLower = false;
     let isLastCharUpper = false;
     let isLastLastCharUpper = false;
-    for (let i = 0; i < string.length; i++) {
-        const character = string[i];
+    for (let index = 0; index < string.length; index++) {
+        const character = string[index];
         if (isLastCharLower && UPPERCASE.test(character)) {
-            string = string.slice(0, i) + '-' + string.slice(i);
+            string = string.slice(0, index) + '-' + string.slice(index);
             isLastCharLower = false;
             isLastLastCharUpper = isLastCharUpper;
             isLastCharUpper = true;
-            i++;
+            index++;
         }
         else if (isLastCharUpper &&
             isLastLastCharUpper &&
             LOWERCASE.test(character)) {
-            string = string.slice(0, i - 1) + '-' + string.slice(i - 1);
+            string = string.slice(0, index - 1) + '-' + string.slice(index - 1);
             isLastLastCharUpper = isLastCharUpper;
             isLastCharUpper = false;
             isLastCharLower = true;
@@ -60,6 +60,9 @@ function camelCaseOrigin(input, options) {
     const toLowerCase = string => string.toLowerCase();
     const toUpperCase = string => string.toUpperCase();
     if (input.length === 1) {
+        if (SEPARATORS.test(input)) {
+            return '';
+        }
         return options.pascalCase ? toUpperCase(input) : toLowerCase(input);
     }
     const hasUpperCase = input !== toLowerCase(input);

package/dist/util/types.js

@@ -5,11 +5,6 @@ const util = require("util");
 const ToString = Function.prototype.toString;
 const hasOwn = Object.prototype.hasOwnProperty;
 const toStr = Object.prototype.toString;
-function fnBody(fn) {
-    return ToString.call(fn)
-        .replace(/^[^{]*{\s*/, '')
-        .replace(/\s*}[^}]*$/, '');
-}
 function isString(value) {
     return typeof value === 'string';
 }
@@ -21,10 +16,6 @@ function isClass(fn) {
     if (/^class[\s{]/.test(ToString.call(fn))) {
         return true;
     }
-    // babel.js classCallCheck() & inlined
-    const body = fnBody(fn);
-    return (/classCallCheck\(/.test(body) ||
-        /TypeError\("Cannot call a class as a function"\)/.test(body));
 }
 exports.isClass = isClass;
 function isAsyncFunction(value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.7.0",
+  "version": "3.9.0",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -23,10 +23,10 @@
   "license": "MIT",
   "devDependencies": {
     "koa": "2.13.4",
-    "mm": "3.2.0",
+    "mm": "3.2.1",
     "pg": "8.8.0",
     "raw-body": "2.5.1",
-    "sinon": "14.0.1"
+    "sinon": "14.0.2"
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
@@ -38,10 +38,10 @@
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
     "type": "git",
-    "url": "http://github.com/midwayjs/midway.git"
+    "url": "https://github.com/midwayjs/midway.git"
   },
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "99386083ee26b386fd508b9c892091c914e77535"
+  "gitHead": "5f6603d2c9606fc6fc7ece71f956e89e394efeee"
 }