@midwayjs/core 3.0.13 → 3.0.14-beta.1

package/dist/baseFramework.d.ts

@@ -77,7 +77,7 @@ export declare abstract class BaseFramework<APP extends IMidwayApplication<CTX>,
     createLogger(name: string, option?: LoggerOptions): ILogger;
     getProjectName(): string;
     getFrameworkName(): string;
-    useMiddleware(Middleware: CommonMiddlewareUnion<CTX, ResOrNext, Next>): void;
+    useMiddleware(middleware: CommonMiddlewareUnion<CTX, ResOrNext, Next>): void;
     getMiddleware(): ContextMiddlewareManager<CTX, ResOrNext, Next>;
     useFilter(Filter: CommonFilterUnion<CTX, ResOrNext, Next>): void;
     protected createMiddlewareManager(): ContextMiddlewareManager<CTX, ResOrNext, Next>;

package/dist/baseFramework.js

@@ -243,8 +243,8 @@ class BaseFramework {
     getFrameworkName() {
         return this.getFrameworkType().name;
     }
-    useMiddleware(Middleware) {
-        this.middlewareManager.insertLast(Middleware);
+    useMiddleware(middleware) {
+        this.middlewareManager.insertLast(middleware);
     }
     getMiddleware() {
         return this.middlewareManager;

package/dist/common/serviceFactory.d.ts

@@ -8,7 +8,7 @@ export declare abstract class ServiceFactory<T> {
     get<U = T>(id?: string): U;
     createInstance(config: any, clientName?: any): Promise<T | void>;
     abstract getName(): string;
-    protected abstract createClient(config: any, clientName: any): Promise<T | void>;
+    protected abstract createClient(config: any, clientName: any): Promise<T | void> | (T | void);
     protected destroyClient(client: T): Promise<void>;
     stop(): Promise<void>;
 }

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

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

package/dist/config/config.default.js

@@ -6,12 +6,15 @@ const path_1 = require("path");
 exports.default = (appInfo) => {
     var _a;
     const isDevelopment = (0, util_1.isDevelopmentEnvironment)((0, util_1.getCurrentEnvironment)());
+    const logRoot = (_a = process.env[interface_1.MIDWAY_LOGGER_WRITEABLE_DIR]) !== null && _a !== void 0 ? _a : appInfo.root;
     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),
+                dir: (0, path_1.join)(logRoot, 'logs', appInfo.name),
                 level: isDevelopment ? 'info' : 'warn',
                 consoleLevel: isDevelopment ? 'info' : 'warn',
+                auditFileDir: (0, path_1.join)(logRoot, 'logs', appInfo.name, '.audit'),
+                errorDir: (0, path_1.join)(logRoot, 'logs', appInfo.name),
             },
             clients: {
                 coreLogger: {
@@ -23,6 +26,9 @@ exports.default = (appInfo) => {
                 },
             },
         },
+        debug: {
+            recordConfigMergeOrder: isDevelopment,
+        },
     };
 };
 //# sourceMappingURL=config.default.js.map

package/dist/context/container.d.ts

@@ -36,7 +36,7 @@ export declare class MidwayContainer implements IMidwayContainer, IModuleStore {
     protected getIdentifier(target: any): string;
     protected getManagedResolverFactory(): ManagedResolverFactory;
     stop(): Promise<void>;
-    ready(): Promise<void>;
+    ready(): void;
     get<T>(identifier: {
         new (...args: any[]): T;
     }, args?: any[], objectContext?: ObjectContext): T;

package/dist/context/container.js

@@ -293,10 +293,10 @@ class MidwayContainer {
         definition.scope = (options === null || options === void 0 ? void 0 : options.scope) || decorator_1.ScopeEnum.Request;
         definition.createFrom = options === null || options === void 0 ? void 0 : options.createFrom;
         if (definition.srcPath) {
-            debug(`[core]: bind id "${definition.name} (${definition.srcPath})"`);
+            debug(`[core]: bind id "${definition.name} (${definition.srcPath}) ${identifier}"`);
         }
         else {
-            debug(`[core]: bind id "${definition.name}"`);
+            debug(`[core]: bind id "${definition.name}" ${identifier}`);
         }
         // inject properties
         const props = (0, decorator_1.getPropertyInject)(target);
@@ -397,8 +397,8 @@ class MidwayContainer {
         await this.getManagedResolverFactory().destroyCache();
         this.registry.clearAll();
     }
-    async ready() {
-        await this.loadDefinitions();
+    ready() {
+        this.loadDefinitions();
     }
     get(identifier, args, objectContext) {
         var _a;

package/dist/context/requestContainer.d.ts

@@ -6,7 +6,7 @@ export declare class MidwayRequestContainer extends MidwayContainer {
     init(): void;
     get<T = any>(identifier: any, args?: any): T;
     getAsync<T = any>(identifier: any, args?: any): Promise<T>;
-    ready(): Promise<void>;
+    ready(): void;
     getContext(): {};
 }
 //# sourceMappingURL=requestContainer.d.ts.map

package/dist/context/requestContainer.js

@@ -67,7 +67,7 @@ class MidwayRequestContainer extends container_1.MidwayContainer {
             return this.parent.getAsync(identifier, args);
         }
     }
-    async ready() {
+    ready() {
         // ignore other things
     }
     getContext() {

package/dist/interface.d.ts

@@ -248,7 +248,7 @@ export interface IFileDetector {
 }
 export interface IConfigService {
     add(configFilePaths: any[]): any;
-    addObject(obj: object): any;
+    addObject(obj: object, reverse?: boolean): any;
     load(): any;
     getConfiguration(configKey?: string): any;
     clearAllConfig(): any;
@@ -424,6 +424,7 @@ export interface IMidwayBootstrapOptions {
     globalConfig?: Array<{
         [environmentName: string]: Record<string, any>;
     }> | Record<string, any>;
+    lazyInitializeFramework?: boolean;
 }
 export interface IConfigurationOptions {
     logger?: ILogger;

package/dist/service/configService.d.ts

@@ -1,23 +1,32 @@
 import { IConfigService, MidwayAppInfo } from '../interface';
 import { MidwayEnvironmentService } from './environmentService';
 import { MidwayInformationService } from './informationService';
+interface ConfigMergeInfo {
+    value: any;
+    env: string;
+    extraPath?: string;
+}
 export declare class MidwayConfigService implements IConfigService {
     private envDirMap;
     private aliasMap;
+    private configMergeOrder;
     protected configuration: any;
     protected isReady: boolean;
     protected externalObject: Record<string, unknown>[];
     protected appInfo: MidwayAppInfo;
     protected environmentService: MidwayEnvironmentService;
     protected informationService: MidwayInformationService;
-    protected init(): Promise<void>;
+    protected init(): void;
     add(configFilePaths: any[]): void;
-    addObject(obj: Record<string, unknown>): void;
+    addObject(obj: Record<string, unknown>, reverse?: boolean): void;
     private getEnvSet;
     private getConfigEnv;
-    load(): Promise<void>;
+    load(): void;
     getConfiguration(configKey?: string): any;
+    getConfigMergeOrder(): Array<ConfigMergeInfo>;
     private loadConfig;
     clearAllConfig(): void;
+    clearConfigMergeOrder(): void;
 }
+export {};
 //# sourceMappingURL=configService.d.ts.map

package/dist/service/configService.js

@@ -26,10 +26,11 @@ let MidwayConfigService = class MidwayConfigService {
             prod: 'production',
             unittest: 'test',
         };
+        this.configMergeOrder = [];
         this.isReady = false;
         this.externalObject = [];
     }
-    async init() {
+    init() {
         this.appInfo = {
             pkg: this.informationService.getPkg(),
             name: this.informationService.getProjectName(),
@@ -72,9 +73,19 @@ let MidwayConfigService = class MidwayConfigService {
             }
         }
     }
-    addObject(obj) {
+    addObject(obj, reverse = false) {
         if (this.isReady) {
-            (0, extend_1.extend)(true, this.configuration, obj);
+            this.configMergeOrder.push({
+                env: 'default',
+                extraPath: '',
+                value: obj,
+            });
+            if (reverse) {
+                this.configuration = (0, extend_1.extend)(true, obj, this.configuration);
+            }
+            else {
+                (0, extend_1.extend)(true, this.configuration, obj);
+            }
         }
         else {
             this.externalObject.push(obj);
@@ -96,7 +107,7 @@ let MidwayConfigService = class MidwayConfigService {
         }
         return splits.pop();
     }
-    async load() {
+    load() {
         if (this.isReady)
             return;
         // get default
@@ -105,8 +116,9 @@ let MidwayConfigService = class MidwayConfigService {
         const currentEnvSet = this.getEnvSet(this.environmentService.getCurrentEnvironment());
         // merge set
         const target = {};
-        for (const filename of [...defaultSet, ...currentEnvSet]) {
-            let config = await this.loadConfig(filename);
+        const defaultSetLength = defaultSet.size;
+        for (const [idx, filename] of [...defaultSet, ...currentEnvSet].entries()) {
+            let config = this.loadConfig(filename);
             if (decorator_1.Types.isFunction(config)) {
                 // eslint-disable-next-line prefer-spread
                 config = config.apply(null, [this.appInfo, target]);
@@ -120,6 +132,13 @@ let MidwayConfigService = class MidwayConfigService {
             else {
                 debug('[config]: Loaded config %j', config);
             }
+            this.configMergeOrder.push({
+                env: idx < defaultSetLength
+                    ? 'default'
+                    : this.environmentService.getCurrentEnvironment(),
+                extraPath: filename,
+                value: config,
+            });
             (0, extend_1.extend)(true, target, config);
         }
         if (this.externalObject.length) {
@@ -127,6 +146,11 @@ let MidwayConfigService = class MidwayConfigService {
                 if (externalObject) {
                     debug('[config]: Loaded external object %j', externalObject);
                     (0, extend_1.extend)(true, target, externalObject);
+                    this.configMergeOrder.push({
+                        env: 'default',
+                        extraPath: '',
+                        value: externalObject,
+                    });
                 }
             }
         }
@@ -139,7 +163,10 @@ let MidwayConfigService = class MidwayConfigService {
         }
         return this.configuration;
     }
-    async loadConfig(configFilename) {
+    getConfigMergeOrder() {
+        return this.configMergeOrder;
+    }
+    loadConfig(configFilename) {
         let exports = typeof configFilename === 'string'
             ? require(configFilename)
             : configFilename;
@@ -151,6 +178,9 @@ let MidwayConfigService = class MidwayConfigService {
     clearAllConfig() {
         this.configuration.clear();
     }
+    clearConfigMergeOrder() {
+        this.configMergeOrder.length = 0;
+    }
 };
 __decorate([
     (0, decorator_1.Inject)(),
@@ -164,7 +194,7 @@ __decorate([
     (0, decorator_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
+    __metadata("design:returntype", void 0)
 ], MidwayConfigService.prototype, "init", null);
 MidwayConfigService = __decorate([
     (0, decorator_1.Provide)(),

package/dist/service/decoratorService.d.ts

@@ -6,7 +6,7 @@ export declare class MidwayDecoratorService {
     private parameterDecoratorMap;
     private aspectService;
     constructor(applicationContext: IMidwayContainer);
-    protected init(): Promise<void>;
+    protected init(): void;
     registerPropertyHandler(decoratorKey: string, fn: HandlerFunction): void;
     registerMethodHandler(decoratorKey: string, fn: MethodHandlerFunction): void;
     registerParameterHandler(decoratorKey: string, fn: ParameterHandlerFunction): void;

package/dist/service/decoratorService.js

@@ -22,7 +22,7 @@ let MidwayDecoratorService = class MidwayDecoratorService {
         this.methodDecoratorMap = new Map();
         this.parameterDecoratorMap = new Map();
     }
-    async init() {
+    init() {
         // add custom method decorator listener
         this.applicationContext.onBeforeBind(Clzz => {
             // find custom method decorator metadata, include method decorator information array
@@ -150,7 +150,7 @@ __decorate([
     (0, decorator_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
+    __metadata("design:returntype", void 0)
 ], MidwayDecoratorService.prototype, "init", null);
 MidwayDecoratorService = __decorate([
     (0, decorator_1.Provide)(),

package/dist/service/lifeCycleService.js

@@ -58,6 +58,10 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
         await this.frameworkService.runFramework();
         // exec onServerReady()
         await this.runContainerLifeCycle(lifecycleInstanceList, 'onServerReady');
+        // clear config merge cache
+        if (!this.configService.getConfiguration('debug.recordConfigMergeOrder')) {
+            this.configService.clearConfigMergeOrder();
+        }
     }
     async stop() {
         // stop lifecycle

package/dist/service/loggerService.d.ts

@@ -6,22 +6,10 @@ export declare class MidwayLoggerService extends ServiceFactory<ILogger> {
     readonly applicationContext: IMidwayContainer;
     configService: MidwayConfigService;
     constructor(applicationContext: IMidwayContainer);
-    protected init(): Promise<void>;
-    protected transformEggConfig(): {
-        midwayLogger: {
-            default: {};
-            clients: {};
-        };
-    };
-    protected createClient(config: any, name?: string): Promise<void>;
+    protected init(): void;
+    protected createClient(config: any, name?: string): void;
     getName(): string;
     createLogger(name: any, config: any): ILogger;
     getLogger(name: string): ILogger;
-    transformEggLogger(options: any): {
-        midwayLogger: {
-            default: {};
-            clients: {};
-        };
-    };
 }
 //# sourceMappingURL=loggerService.d.ts.map

package/dist/service/loggerService.js

@@ -14,60 +14,18 @@ const decorator_1 = require("@midwayjs/decorator");
 const configService_1 = require("./configService");
 const serviceFactory_1 = require("../common/serviceFactory");
 const logger_1 = require("@midwayjs/logger");
-const levelTransform = level => {
-    if (!level) {
-        return undefined;
-    }
-    switch (level) {
-        case 'NONE':
-        case Infinity: // egg logger 的 none 是这个等级
-            return 'none';
-        case 0:
-        case 'DEBUG':
-        case 'debug':
-            return 'debug';
-        case 1:
-        case 'INFO':
-        case 'info':
-            return 'info';
-        case 2:
-        case 'WARN':
-        case 'warn':
-            return 'warn';
-        case 3:
-        case 'ERROR':
-        case 'error':
-            return 'error';
-        default:
-            return 'silly';
-    }
-};
 let MidwayLoggerService = class MidwayLoggerService extends serviceFactory_1.ServiceFactory {
     constructor(applicationContext) {
         super();
         this.applicationContext = applicationContext;
     }
-    async init() {
+    init() {
         var _a;
-        const eggLoggerConfig = this.transformEggConfig();
-        if (eggLoggerConfig) {
-            this.configService.addObject(eggLoggerConfig);
-        }
-        await this.initClients(this.configService.getConfiguration('midwayLogger'));
+        this.initClients(this.configService.getConfiguration('midwayLogger'));
         // alias inject logger
         (_a = this.applicationContext) === null || _a === void 0 ? void 0 : _a.registerObject('logger', this.getLogger('appLogger'));
     }
-    transformEggConfig() {
-        if (this.configService.getConfiguration('customLogger')) {
-            // use egg module
-            return this.transformEggLogger(this.configService.getConfiguration());
-        }
-        else {
-            // it will be use other logger
-            return;
-        }
-    }
-    async createClient(config, name) {
+    createClient(config, name) {
         logger_1.loggers.createLogger(name, config);
     }
     getName() {
@@ -79,32 +37,6 @@ let MidwayLoggerService = class MidwayLoggerService extends serviceFactory_1.Ser
     getLogger(name) {
         return logger_1.loggers.getLogger(name);
     }
-    transformEggLogger(options) {
-        var _a, _b, _c;
-        const transformLoggerConfig = {
-            midwayLogger: {
-                default: {},
-                clients: {},
-            },
-        };
-        if (options.midwayLogger && !options.midwayLogger.default) {
-            transformLoggerConfig.midwayLogger.default = {
-                dir: options.logger.dir,
-                level: levelTransform(options.logger.level),
-                consoleLevel: levelTransform(options.logger.consoleLevel),
-            };
-        }
-        const eggCustomLogger = options['customLogger'];
-        for (const name in eggCustomLogger) {
-            transformLoggerConfig.midwayLogger.clients[name] = {
-                fileLogName: (_a = eggCustomLogger[name]) === null || _a === void 0 ? void 0 : _a.file,
-                level: levelTransform((_b = eggCustomLogger[name]) === null || _b === void 0 ? void 0 : _b.level),
-                consoleLevel: levelTransform((_c = eggCustomLogger[name]) === null || _c === void 0 ? void 0 : _c.consoleLevel),
-            };
-            cleanUndefinedProperty(transformLoggerConfig.midwayLogger.clients[name]);
-        }
-        return transformLoggerConfig;
-    }
 };
 __decorate([
     (0, decorator_1.Inject)(),
@@ -114,7 +46,7 @@ __decorate([
     (0, decorator_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
+    __metadata("design:returntype", void 0)
 ], MidwayLoggerService.prototype, "init", null);
 MidwayLoggerService = __decorate([
     (0, decorator_1.Provide)(),
@@ -122,11 +54,4 @@ MidwayLoggerService = __decorate([
     __metadata("design:paramtypes", [Object])
 ], MidwayLoggerService);
 exports.MidwayLoggerService = MidwayLoggerService;
-function cleanUndefinedProperty(obj) {
-    Object.keys(obj).forEach(key => {
-        if (obj[key] === undefined) {
-            delete obj[key];
-        }
-    });
-}
 //# sourceMappingURL=loggerService.js.map

package/dist/setup.js

@@ -53,18 +53,16 @@ async function initializeGlobalApplicationContext(globalOptions) {
         }
     }
     // init default config
-    const configService = await applicationContext.getAsync(_1.MidwayConfigService);
+    const configService = applicationContext.get(_1.MidwayConfigService);
     configService.add([
         {
             default: config_default_1.default,
         },
     ]);
     // init aop support
-    await applicationContext.getAsync(_1.MidwayAspectService, [applicationContext]);
+    applicationContext.get(_1.MidwayAspectService, [applicationContext]);
     // init decorator service
-    await applicationContext.getAsync(_1.MidwayDecoratorService, [
-        applicationContext,
-    ]);
+    applicationContext.get(_1.MidwayDecoratorService, [applicationContext]);
     if (!globalOptions.imports) {
         globalOptions.imports = [
             (0, _1.safeRequire)((0, path_1.join)(globalOptions.baseDir, 'configuration')),
@@ -77,7 +75,7 @@ async function initializeGlobalApplicationContext(globalOptions) {
         applicationContext.load(configurationModule);
     }
     // bind user code module
-    await applicationContext.ready();
+    applicationContext.ready();
     if (globalOptions.globalConfig) {
         if (Array.isArray(globalOptions.globalConfig)) {
             configService.add(globalOptions.globalConfig);
@@ -87,23 +85,26 @@ async function initializeGlobalApplicationContext(globalOptions) {
         }
     }
     // merge config
-    await configService.load();
+    configService.load();
     debug('[core]: Current config = %j', configService.getConfiguration());
-    // init logger
-    await applicationContext.getAsync(_1.MidwayLoggerService, [applicationContext]);
     // middleware support
-    await applicationContext.getAsync(_1.MidwayMiddlewareService, [
-        applicationContext,
-    ]);
-    // framework/config/plugin/logger/app decorator support
-    await applicationContext.getAsync(_1.MidwayFrameworkService, [
-        applicationContext,
-        globalOptions,
-    ]);
-    // lifecycle support
-    await applicationContext.getAsync(_1.MidwayLifeCycleService, [
-        applicationContext,
-    ]);
+    applicationContext.get(_1.MidwayMiddlewareService, [applicationContext]);
+    // it will be delay framework initialize in egg cluster mode
+    if (!globalOptions.lazyInitializeFramework) {
+        // init logger
+        await applicationContext.getAsync(_1.MidwayLoggerService, [
+            applicationContext,
+        ]);
+        // framework/config/plugin/logger/app decorator support
+        await applicationContext.getAsync(_1.MidwayFrameworkService, [
+            applicationContext,
+            globalOptions,
+        ]);
+        // lifecycle support
+        await applicationContext.getAsync(_1.MidwayLifeCycleService, [
+            applicationContext,
+        ]);
+    }
     return applicationContext;
 }
 exports.initializeGlobalApplicationContext = initializeGlobalApplicationContext;

package/dist/util/index.js

@@ -190,7 +190,8 @@ exports.deprecatedOutput = deprecatedOutput;
 const transformRequestObjectByType = (originValue, targetType) => {
     if (targetType === undefined ||
         targetType === null ||
-        targetType === Object) {
+        targetType === Object ||
+        typeof originValue === 'undefined') {
         return originValue;
     }
     switch (targetType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.13",
+  "version": "3.0.14-beta.1",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "8c8338f4488ec65765c342dd5238ed3e61872b37"
+  "gitHead": "a603d2348d6141f8f723901498f03a162a037708"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.