@midwayjs/core 3.0.4-beta.1 → 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,7 +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"`);
+                debug(`[core]: load configuration in namespace="${ns}" complete`);
             }
         }
     }

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';
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.4-beta.1",
+  "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.4-beta.1",
+    "@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": "52bc37e7a570806c121b33a0e8ac1cd084445f5d"
+  "gitHead": "c2a37dd026c7bf3e855f4498691f572ef61396e3"
 }