@midwayjs/core 3.1.0 → 3.1.5

package/dist/common/serviceFactory.d.ts

@@ -6,6 +6,7 @@ export declare abstract class ServiceFactory<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>;
     abstract getName(): string;
     protected abstract createClient(config: any, clientName: any): Promise<T | void> | (T | void);

package/dist/common/serviceFactory.js

@@ -28,6 +28,9 @@ class ServiceFactory {
     get(id = 'default') {
         return this.clients.get(id);
     }
+    has(id) {
+        return this.clients.has(id);
+    }
     async createInstance(config, clientName) {
         // options.default will be merge in to options.clients[id]
         config = Object.assign({}, this.options['default'], config);

package/dist/config/config.default.js

@@ -13,8 +13,7 @@ exports.default = (appInfo) => {
                 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),
+                auditFileDir: '.audit',
             },
             clients: {
                 coreLogger: {

package/dist/context/container.js

@@ -79,7 +79,7 @@ class ContainerConfiguration {
         }
     }
     addImports(imports = []) {
-        var _a, _b, _c;
+        var _a;
         // 处理 imports
         for (let importPackage of imports) {
             if (!importPackage)
@@ -92,8 +92,8 @@ class ContainerConfiguration {
                 this.load(importPackage);
             }
             else if ('component' in importPackage) {
-                if ((_a = importPackage) === null || _a === void 0 ? void 0 : _a.enabledEnvironment) {
-                    if ((_c = (_b = importPackage) === null || _b === void 0 ? void 0 : _b.enabledEnvironment) === null || _c === void 0 ? void 0 : _c.includes(this.container
+                if (importPackage === null || importPackage === void 0 ? void 0 : importPackage.enabledEnvironment) {
+                    if ((_a = importPackage === null || importPackage === void 0 ? void 0 : importPackage.enabledEnvironment) === null || _a === void 0 ? void 0 : _a.includes(this.container
                         .get(environmentService_1.MidwayEnvironmentService)
                         .getCurrentEnvironment())) {
                         this.load(importPackage.component);
@@ -228,7 +228,6 @@ class MidwayContainer {
     }
     load(module) {
         var _a;
-        this.isLoad = true;
         if (module) {
             // load configuration
             const configuration = new ContainerConfiguration(this);
@@ -242,6 +241,7 @@ class MidwayContainer {
                 (0, extend_1.extend)(true, detectorOptionsMerged, detectorOptions);
             }
             (_a = this.fileDetector) === null || _a === void 0 ? void 0 : _a.setExtraDetectorOptions(detectorOptionsMerged);
+            this.isLoad = true;
         }
     }
     loadDefinitions() {

package/dist/error/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/service/frameworkService.js

@@ -94,12 +94,6 @@ let MidwayFrameworkService = class MidwayFrameworkService {
         }
         // init aspect module
         await this.aspectService.loadAspect();
-        // some preload module init
-        const modules = (0, decorator_1.listPreloadModule)();
-        for (const module of modules) {
-            // preload init context
-            await this.applicationContext.getAsync(module);
-        }
     }
     getMainApp() {
         var _a;

package/dist/service/loggerService.d.ts

@@ -1,13 +1,13 @@
 import { MidwayConfigService } from './configService';
 import { ServiceFactory } from '../common/serviceFactory';
-import { ILogger } from '@midwayjs/logger';
+import { ILogger, LoggerOptions } from '@midwayjs/logger';
 import { IMidwayContainer } from '../interface';
 export declare class MidwayLoggerService extends ServiceFactory<ILogger> {
     readonly applicationContext: IMidwayContainer;
     configService: MidwayConfigService;
     constructor(applicationContext: IMidwayContainer);
     protected init(): void;
-    protected createClient(config: any, name?: string): void;
+    protected createClient(config: LoggerOptions, name?: string): void;
     getName(): string;
     createLogger(name: any, config: any): ILogger;
     getLogger(name: string): ILogger;

package/dist/setup.js

@@ -72,7 +72,9 @@ async function initializeGlobalApplicationContext(globalOptions) {
         .concat(globalOptions.imports)
         .concat(globalOptions.configurationModule)) {
         // load configuration and component
-        applicationContext.load(configurationModule);
+        if (configurationModule) {
+            applicationContext.load(configurationModule);
+        }
     }
     // bind user code module
     applicationContext.ready();
@@ -92,9 +94,11 @@ async function initializeGlobalApplicationContext(globalOptions) {
     // it will be delay framework initialize in egg cluster mode
     if (!globalOptions.lazyInitializeFramework) {
         // init logger
-        await applicationContext.getAsync(_1.MidwayLoggerService, [
-            applicationContext,
-        ]);
+        const loggerService = await applicationContext.getAsync(_1.MidwayLoggerService, [applicationContext]);
+        if (loggerService.getLogger('appLogger')) {
+            // register global logger
+            applicationContext.registerObject('logger', loggerService.getLogger('appLogger'));
+        }
         // framework/config/plugin/logger/app decorator support
         await applicationContext.getAsync(_1.MidwayFrameworkService, [
             applicationContext,
@@ -104,6 +108,12 @@ async function initializeGlobalApplicationContext(globalOptions) {
         await applicationContext.getAsync(_1.MidwayLifeCycleService, [
             applicationContext,
         ]);
+        // some preload module init
+        const modules = (0, decorator_1.listPreloadModule)();
+        for (const module of modules) {
+            // preload init context
+            await applicationContext.getAsync(module);
+        }
     }
     return applicationContext;
 }

package/dist/util/index.d.ts

@@ -36,6 +36,7 @@ export declare function joinURLPath(...strArray: any[]): string;
  * 代理目标所有的原型方法，不包括构造器和内部隐藏方法
  * @param derivedCtor
  * @param constructors
+ * @param otherMethods
  * @since 2.0.0
  */
 export declare function delegateTargetPrototypeMethod(derivedCtor: any, constructors: any[], otherMethods?: string[]): void;

package/dist/util/index.js

@@ -112,6 +112,7 @@ exports.joinURLPath = joinURLPath;
  * 代理目标所有的原型方法，不包括构造器和内部隐藏方法
  * @param derivedCtor
  * @param constructors
+ * @param otherMethods
  * @since 2.0.0
  */
 function delegateTargetPrototypeMethod(derivedCtor, constructors, otherMethods) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.1.0",
+  "version": "3.1.5",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "2074c838e454a9673a044dbe065631dd9f944005"
+  "gitHead": "46a7851ad3ce6fc675bd7e1b7c9dff2c70009104"
 }