@midwayjs/core 3.0.0 → 3.0.4

package/dist/baseFramework.d.ts

@@ -1,6 +1,6 @@
 import { CommonMiddlewareUnion, IConfigurationOptions, IMidwayApplication, IMidwayBootstrapOptions, IMidwayContainer, IMidwayContext, IMidwayFramework, CommonFilterUnion, CommonMiddleware, MiddlewareRespond } from './interface';
 import { FrameworkType } from '@midwayjs/decorator';
-import { ILogger, LoggerOptions } from '@midwayjs/logger';
+import { ILogger, LoggerOptions, LoggerContextFormat } from '@midwayjs/logger';
 import { MidwayEnvironmentService } from './service/environmentService';
 import { MidwayConfigService } from './service/configService';
 import { MidwayInformationService } from './service/informationService';
@@ -15,8 +15,8 @@ export declare abstract class BaseFramework<APP extends IMidwayApplication<CTX>,
     protected logger: ILogger;
     protected appLogger: ILogger;
     protected defaultContext: {};
-    protected BaseContextLoggerClass: any;
-    protected ContextLoggerApplyLogger: string;
+    protected contextLoggerApplyLogger: string;
+    protected contextLoggerFormat: LoggerContextFormat;
     protected middlewareManager: ContextMiddlewareManager<CTX, ResOrNext, Next>;
     protected filterManager: FilterManager<CTX, ResOrNext, Next>;
     protected composeMiddleware: any;
@@ -49,7 +49,6 @@ export declare abstract class BaseFramework<APP extends IMidwayApplication<CTX>,
     abstract applicationInitialize(options: IMidwayBootstrapOptions): any;
     abstract getFrameworkType(): FrameworkType;
     abstract run(): Promise<void>;
-    setContextLoggerClass(BaseContextLogger: any): void;
     protected createContextLogger(ctx: CTX, name?: string): ILogger;
     stop(): Promise<void>;
     getAppDir(): string;
@@ -78,7 +77,6 @@ export declare abstract class BaseFramework<APP extends IMidwayApplication<CTX>,
     createLogger(name: string, option?: LoggerOptions): ILogger;
     getProjectName(): string;
     getFrameworkName(): string;
-    getDefaultContextLoggerClass(): any;
     useMiddleware(Middleware: CommonMiddlewareUnion<CTX, ResOrNext, Next>): void;
     getMiddleware(): ContextMiddlewareManager<CTX, ResOrNext, Next>;
     useFilter(Filter: CommonFilterUnion<CTX, ResOrNext, Next>): void;

package/dist/baseFramework.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseFramework = void 0;
 const interface_1 = require("./interface");
 const decorator_1 = require("@midwayjs/decorator");
-const logger_1 = require("@midwayjs/logger");
 const requestContainer_1 = require("./context/requestContainer");
 const environmentService_1 = require("./service/environmentService");
 const configService_1 = require("./service/configService");
@@ -32,12 +31,11 @@ class BaseFramework {
         this.composeMiddleware = null;
     }
     async init() {
-        var _a, _b, _c;
+        var _a, _b;
         this.configurationOptions = (_a = this.configure()) !== null && _a !== void 0 ? _a : {};
-        this.BaseContextLoggerClass =
-            (_b = this.configurationOptions.ContextLoggerClass) !== null && _b !== void 0 ? _b : this.getDefaultContextLoggerClass();
-        this.ContextLoggerApplyLogger =
-            (_c = this.configurationOptions.ContextLoggerApplyLogger) !== null && _c !== void 0 ? _c : 'appLogger';
+        this.contextLoggerApplyLogger =
+            (_b = this.configurationOptions.contextLoggerApplyLogger) !== null && _b !== void 0 ? _b : 'appLogger';
+        this.contextLoggerFormat = this.configurationOptions.contextLoggerFormat;
         this.logger = this.loggerService.getLogger('coreLogger');
         this.appLogger = this.loggerService.getLogger('appLogger');
         return this;
@@ -86,12 +84,11 @@ class BaseFramework {
     getApplication() {
         return this.app;
     }
-    setContextLoggerClass(BaseContextLogger) {
-        this.BaseContextLoggerClass = BaseContextLogger;
-    }
     createContextLogger(ctx, name) {
-        const appLogger = this.getLogger(name !== null && name !== void 0 ? name : this.ContextLoggerApplyLogger);
-        return new this.BaseContextLoggerClass(ctx, appLogger);
+        const appLogger = this.getLogger(name !== null && name !== void 0 ? name : this.contextLoggerApplyLogger);
+        return appLogger.createContextLogger(ctx, {
+            contextFormat: this.contextLoggerFormat,
+        });
     }
     async stop() {
         await this.beforeStop();
@@ -162,9 +159,6 @@ class BaseFramework {
                 };
                 return ctx;
             },
-            setContextLoggerClass: (BaseContextLogger) => {
-                return this.setContextLoggerClass(BaseContextLogger);
-            },
             addConfigObject: (obj) => {
                 this.configService.addObject(obj);
             },
@@ -249,9 +243,6 @@ class BaseFramework {
     getFrameworkName() {
         return this.getFrameworkType().name;
     }
-    getDefaultContextLoggerClass() {
-        return logger_1.MidwayContextLogger;
-    }
     useMiddleware(Middleware) {
         this.middlewareManager.insertLast(Middleware);
     }

package/dist/context/container.js

@@ -228,6 +228,7 @@ class MidwayContainer {
             configuration.load(module);
             for (const ns of configuration.getNamespaceList()) {
                 this.namespaceSet.add(ns);
+                debug(`[core]: load configuration in namespace="${ns}" complete`);
             }
         }
     }

package/dist/context/managedResolverFactory.d.ts

@@ -52,5 +52,6 @@ export declare class ManagedResolverFactory {
      */
     depthFirstSearch(identifier: string, definition: IObjectDefinition, depth?: string[]): boolean;
     private getObjectEventTarget;
+    private checkSingletonInvokeRequest;
 }
 //# sourceMappingURL=managedResolverFactory.d.ts.map

package/dist/context/managedResolverFactory.js

@@ -113,6 +113,7 @@ class ManagedResolverFactory {
         if (definition.properties) {
             const keys = definition.properties.propertyKeys();
             for (const key of keys) {
+                this.checkSingletonInvokeRequest(definition, key);
                 try {
                     inst[key] = this.resolveManaged(definition.properties.get(key), key);
                 }
@@ -202,13 +203,7 @@ class ManagedResolverFactory {
         if (definition.properties) {
             const keys = definition.properties.propertyKeys();
             for (const key of keys) {
-                if (definition.isSingletonScope() && this.context.hasDefinition(key)) {
-                    const propertyDefinition = this.context.registry.getDefinition(key);
-                    if (propertyDefinition.isRequestScope() &&
-                        !propertyDefinition.allowDowngrade) {
-                        throw new error_1.MidwaySingletonInjectRequestError(definition.path.name, propertyDefinition.path.name);
-                    }
-                }
+                this.checkSingletonInvokeRequest(definition, key);
                 try {
                     inst[key] = await this.resolveManagedAsync(definition.properties.get(key), key);
                 }
@@ -378,6 +373,19 @@ class ManagedResolverFactory {
         }
         return this.context.objectCreateEventTarget;
     }
+    checkSingletonInvokeRequest(definition, key) {
+        if (definition.isSingletonScope()) {
+            const managedRef = definition.properties.get(key);
+            if (this.context.hasDefinition(managedRef === null || managedRef === void 0 ? void 0 : managedRef.name)) {
+                const propertyDefinition = this.context.registry.getDefinition(managedRef.name);
+                if (propertyDefinition.isRequestScope() &&
+                    !propertyDefinition.allowDowngrade) {
+                    throw new error_1.MidwaySingletonInjectRequestError(definition.path.name, propertyDefinition.path.name);
+                }
+            }
+        }
+        return true;
+    }
 }
 exports.ManagedResolverFactory = ManagedResolverFactory;
 //# sourceMappingURL=managedResolverFactory.js.map

package/dist/error/framework.js

@@ -87,7 +87,7 @@ class MidwayUseWrongMethodError extends base_1.MidwayError {
 exports.MidwayUseWrongMethodError = MidwayUseWrongMethodError;
 class MidwaySingletonInjectRequestError extends base_1.MidwayError {
     constructor(singletonScopeName, requestScopeName) {
-        const text = `${singletonScopeName} with singleton scope can't implicitly inject ${requestScopeName} with request scope directly, please add @Scope(ScopeEnum.Request, { allowDowngrade: true }) in ${requestScopeName}.`;
+        const text = `${singletonScopeName} with singleton scope can't implicitly inject ${requestScopeName} with request scope directly, please add "@Scope(ScopeEnum.Request, { allowDowngrade: true })" in ${requestScopeName} or use "ctx.requestContext.getAsync(${requestScopeName})".`;
         super(text, exports.FrameworkErrorEnum.SINGLETON_INJECT_REQUEST);
     }
 }

package/dist/interface.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { ObjectIdentifier, IManagedInstance, IMethodAspect, ScopeEnum, FrameworkType } from '@midwayjs/decorator';
-import { ILogger, LoggerOptions } from '@midwayjs/logger';
+import { ILogger, LoggerOptions, LoggerContextFormat } from '@midwayjs/logger';
 import * as EventEmitter from 'events';
 import { ContextMiddlewareManager } from './common/middlewareManager';
 import _default from './config/config.default';
@@ -203,7 +203,7 @@ export declare type ParameterHandlerFunction = (options: {
     originArgs: Array<any>;
     originParamType: any;
     parameterIndex: number;
-}) => IMethodAspect;
+}) => any;
 export interface IIdentifierRelationShip {
     saveClassRelation(module: any, namespace?: string): any;
     saveFunctionRelation(ObjectIdentifier: any, uuid: any): any;
@@ -427,8 +427,8 @@ export interface IMidwayBootstrapOptions {
 export interface IConfigurationOptions {
     logger?: ILogger;
     appLogger?: ILogger;
-    ContextLoggerClass?: any;
-    ContextLoggerApplyLogger?: string;
+    contextLoggerApplyLogger?: string;
+    contextLoggerFormat?: LoggerContextFormat;
 }
 export interface IMidwayFramework<APP extends IMidwayApplication<CTX>, CTX extends IMidwayContext, CONFIG extends IConfigurationOptions, ResOrNext = unknown, Next = unknown> {
     app: APP;
@@ -450,7 +450,6 @@ export interface IMidwayFramework<APP extends IMidwayApplication<CTX>, CTX exten
     getCoreLogger(): ILogger;
     createLogger(name: string, options: LoggerOptions): ILogger;
     getProjectName(): string;
-    getDefaultContextLoggerClass(): any;
     useMiddleware(Middleware: CommonMiddlewareUnion<CTX, ResOrNext, Next>): void;
     getMiddleware(): ContextMiddlewareManager<CTX, ResOrNext, Next>;
     applyMiddleware(lastMiddleware?: CommonMiddleware<CTX, ResOrNext, Next>): Promise<MiddlewareRespond<CTX, ResOrNext, Next>>;

package/dist/service/decoratorService.js

@@ -69,14 +69,20 @@ let MidwayDecoratorService = class MidwayDecoratorService {
                                         throw new error_1.MidwayCommonError(`Parameter Decorator "${key}" handler not found, please register first.`);
                                     }
                                     const paramTypes = (0, decorator_1.getMethodParamTypes)(Clzz, propertyName);
-                                    newArgs[parameterIndex] = await parameterDecoratorHandler({
-                                        metadata,
-                                        propertyName,
-                                        parameterIndex,
-                                        target: Clzz,
-                                        originArgs: joinPoint.args,
-                                        originParamType: paramTypes[parameterIndex],
-                                    });
+                                    try {
+                                        newArgs[parameterIndex] = await parameterDecoratorHandler({
+                                            metadata,
+                                            propertyName,
+                                            parameterIndex,
+                                            target: Clzz,
+                                            originArgs: joinPoint.args,
+                                            originParamType: paramTypes[parameterIndex],
+                                        });
+                                    }
+                                    catch (err) {
+                                        // ignore
+                                        debug(`[core]: Parameter decorator throw error and use origin args, ${err.stack}`);
+                                    }
                                 }
                                 joinPoint.args = newArgs;
                             },

package/dist/service/lifeCycleService.js

@@ -32,7 +32,7 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
             }
             else {
                 // 普通类写法
-                debug(`[core]: run ${cycle.target.name} init`);
+                debug(`[core]: Lifecycle run ${cycle.target.name} init`);
                 cycle.instance = await this.applicationContext.getAsync(cycle.target);
             }
             cycle.instance && lifecycleInstanceList.push(cycle);
@@ -80,7 +80,7 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
         if (Array.isArray(lifecycleInstanceOrList)) {
             for (const cycle of lifecycleInstanceOrList) {
                 if (typeof cycle.instance[lifecycle] === 'function') {
-                    debug(`[core]: run ${cycle.instance.constructor.name} ${lifecycle}`);
+                    debug(`[core]: Lifecycle run ${cycle.instance.constructor.name} ${lifecycle}`);
                     const result = await cycle.instance[lifecycle](this.applicationContext, this.frameworkService.getMainApp());
                     if (resultHandler) {
                         resultHandler(result);
@@ -90,7 +90,7 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
         }
         else {
             if (typeof lifecycleInstanceOrList[lifecycle] === 'function') {
-                debug(`[core]: run ${lifecycleInstanceOrList.constructor.name} ${lifecycle}`);
+                debug(`[core]: Lifecycle run ${lifecycleInstanceOrList.constructor.name} ${lifecycle}`);
                 const result = await lifecycleInstanceOrList[lifecycle](this.applicationContext, this.frameworkService.getMainApp());
                 if (resultHandler) {
                     resultHandler(result);
@@ -101,7 +101,7 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
     async runObjectLifeCycle(lifecycleInstanceList, lifecycle) {
         for (const cycle of lifecycleInstanceList) {
             if (typeof cycle.instance[lifecycle] === 'function') {
-                debug(`[core]: run ${cycle.instance.constructor.name} ${lifecycle}`);
+                debug(`[core]: Lifecycle run ${cycle.instance.constructor.name} ${lifecycle}`);
                 return this.applicationContext[lifecycle](cycle.instance[lifecycle].bind(cycle.instance));
             }
         }

package/dist/setup.js

@@ -11,6 +11,7 @@ const debug = util.debuglog('midway:debug');
 async function initializeGlobalApplicationContext(globalOptions) {
     var _a, _b, _c, _d;
     debug('[core]: start "initializeGlobalApplicationContext"');
+    debug(`[core]: bootstrap options = ${util.inspect(globalOptions)}`);
     const appDir = (_a = globalOptions.appDir) !== null && _a !== void 0 ? _a : '';
     const baseDir = (_b = globalOptions.baseDir) !== null && _b !== void 0 ? _b : '';
     // new container

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.0",
+  "version": "3.0.4",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,18 +21,18 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0",
+    "@midwayjs/decorator": "^3.0.4",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
-    "sinon": "12.0.1"
+    "sinon": "13.0.1"
   },
   "peerDependencies": {
     "@midwayjs/decorator": "*"
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
-    "@midwayjs/logger": "2.14.0",
+    "@midwayjs/logger": "^2.15.0",
     "class-transformer": "^0.5.1",
     "picomatch": "2.3.1"
   },
@@ -44,5 +44,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "55c26029bccf7bbb739fa1597e8f418dafa2caa0"
+  "gitHead": "c2a37dd026c7bf3e855f4498691f572ef61396e3"
 }