@midwayjs/core 3.0.9 → 3.0.13

package/dist/common/fileDetector.d.ts

@@ -1,8 +1,10 @@
 import { IFileDetector, IMidwayContainer } from '../interface';
 export declare abstract class AbstractFileDetector<T> implements IFileDetector {
     options: T;
+    extraDetectorOptions: T;
     constructor(options: any);
     abstract run(container: IMidwayContainer): any;
+    setExtraDetectorOptions(detectorOptions: T): void;
 }
 export declare class DirectoryFileDetector extends AbstractFileDetector<{
     loadDir: string | string[];

package/dist/common/fileDetector.js

@@ -6,6 +6,10 @@ const glob_1 = require("@midwayjs/glob");
 class AbstractFileDetector {
     constructor(options) {
         this.options = options;
+        this.extraDetectorOptions = {};
+    }
+    setExtraDetectorOptions(detectorOptions) {
+        this.extraDetectorOptions = detectorOptions;
     }
 }
 exports.AbstractFileDetector = AbstractFileDetector;
@@ -29,11 +33,13 @@ class DirectoryFileDetector extends AbstractFileDetector {
         this.directoryFilterArray = [];
     }
     run(container) {
-        const loadDirs = [].concat(this.options.loadDir || []);
+        const loadDirs = []
+            .concat(this.options.loadDir || [])
+            .concat(this.extraDetectorOptions.loadDir || []);
         for (const dir of loadDirs) {
-            const fileResults = (0, glob_1.run)(DEFAULT_PATTERN.concat(this.options.pattern || []), {
+            const fileResults = (0, glob_1.run)(DEFAULT_PATTERN.concat(this.options.pattern || []).concat(this.extraDetectorOptions.pattern || []), {
                 cwd: dir,
-                ignore: DEFAULT_IGNORE_PATTERN.concat(this.options.ignore || []),
+                ignore: DEFAULT_IGNORE_PATTERN.concat(this.options.ignore || []).concat(this.extraDetectorOptions.ignore || []),
             });
             for (const file of fileResults) {
                 if (this.directoryFilterArray.length) {

package/dist/context/container.js

@@ -14,6 +14,7 @@ const environmentService_1 = require("../service/environmentService");
 const configService_1 = require("../service/configService");
 const EventEmitter = require("events");
 const error_1 = require("../error");
+const extend_1 = require("../util/extend");
 const debug = util.debuglog('midway:debug');
 const debugBind = util.debuglog('midway:bind');
 class ContainerConfiguration {
@@ -21,6 +22,7 @@ class ContainerConfiguration {
         this.container = container;
         this.loadedMap = new WeakMap();
         this.namespaceList = [];
+        this.detectorOptionsList = [];
     }
     load(module) {
         let namespace = decorator_1.MAIN_MODULE_KEY;
@@ -51,6 +53,9 @@ class ContainerConfiguration {
                     namespace = configurationOptions.namespace;
                     this.namespaceList.push(namespace);
                 }
+                if (configurationOptions.detectorOptions) {
+                    this.detectorOptionsList.push(configurationOptions.detectorOptions);
+                }
                 debug(`[core]: load configuration in namespace="${namespace}"`);
                 this.addImports(configurationOptions.imports);
                 this.addImportObjects(configurationOptions.importObjects);
@@ -164,6 +169,9 @@ class ContainerConfiguration {
     getNamespaceList() {
         return this.namespaceList;
     }
+    getDetectorOptionsList() {
+        return this.detectorOptionsList;
+    }
 }
 class MidwayContainer {
     constructor(parent) {
@@ -219,6 +227,7 @@ class MidwayContainer {
         return this._namespaceSet;
     }
     load(module) {
+        var _a;
         this.isLoad = true;
         if (module) {
             // load configuration
@@ -228,6 +237,11 @@ class MidwayContainer {
                 this.namespaceSet.add(ns);
                 debug(`[core]: load configuration in namespace="${ns}" complete`);
             }
+            const detectorOptionsMerged = {};
+            for (const detectorOptions of configuration.getDetectorOptionsList()) {
+                (0, extend_1.extend)(true, detectorOptionsMerged, detectorOptions);
+            }
+            (_a = this.fileDetector) === null || _a === void 0 ? void 0 : _a.setExtraDetectorOptions(detectorOptionsMerged);
         }
     }
     loadDefinitions() {

package/dist/interface.d.ts

@@ -243,7 +243,8 @@ export interface IMidwayContainer extends IObjectFactory, IObjectLifeCycle {
  */
 export declare type IApplicationContext = IMidwayContainer;
 export interface IFileDetector {
-    run(container: IMidwayContainer): any;
+    run(container: IMidwayContainer, fileDetectorOptions?: Record<string, any>): any;
+    setExtraDetectorOptions(detectorOptions: Record<string, any>): any;
 }
 export interface IConfigService {
     add(configFilePaths: any[]): any;

package/dist/service/loggerService.js

@@ -21,7 +21,7 @@ const levelTransform = level => {
     switch (level) {
         case 'NONE':
         case Infinity: // egg logger 的 none 是这个等级
-            return null;
+            return 'none';
         case 0:
         case 'DEBUG':
         case 'debug':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.9",
+  "version": "3.0.13",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,11 +21,11 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.7",
+    "@midwayjs/decorator": "^3.0.10",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
-    "raw-body": "2.4.3",
+    "raw-body": "2.5.1",
     "sinon": "13.0.1"
   },
   "peerDependencies": {
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "6fbf54fb8840844c229d2cf11b30128c67cbeaf1"
+  "gitHead": "8c8338f4488ec65765c342dd5238ed3e61872b37"
 }