@midwayjs/core 3.4.0 → 3.4.4

package/dist/common/fileDetector.d.ts

@@ -11,6 +11,7 @@ export declare class DirectoryFileDetector extends AbstractFileDetector<{
     pattern: string | string[];
     ignore: string | string[];
     namespace: string;
+    conflictCheck: boolean;
 }> {
     private directoryFilterArray;
     private duplicateModuleCheckSet;

package/dist/common/fileDetector.js

@@ -45,7 +45,7 @@ class DirectoryFileDetector extends AbstractFileDetector {
             });
             // 检查重复模块
             const checkDuplicatedHandler = (module, options) => {
-                if (decorator_1.Types.isClass(module)) {
+                if (this.extraDetectorOptions.conflictCheck && decorator_1.Types.isClass(module)) {
                     const name = (0, decorator_1.getProviderName)(module);
                     if (name) {
                         if (this.duplicateModuleCheckSet.has(name)) {

package/dist/common/filterManager.js

@@ -31,10 +31,11 @@ class FilterManager {
             const filter = await applicationContext.getAsync(FilterClass);
             const exceptionMetadata = (0, decorator_1.getClassMetadata)(decorator_1.CATCH_KEY, FilterClass);
             if (exceptionMetadata && exceptionMetadata.catchTargets) {
+                exceptionMetadata.catchOptions = exceptionMetadata.catchOptions || {};
                 for (const Exception of exceptionMetadata.catchTargets) {
                     this.exceptionMap.set(Exception, {
                         filter,
-                        catchOptions: exceptionMetadata.catchOptions || {},
+                        catchOptions: exceptionMetadata.catchOptions,
                     });
                     if (exceptionMetadata.catchOptions['matchPrototype']) {
                         this.protoMatchList.push(err => {

package/dist/context/container.js

@@ -53,13 +53,15 @@ class ContainerConfiguration {
                     namespace = configurationOptions.namespace;
                     this.namespaceList.push(namespace);
                 }
-                if (configurationOptions.detectorOptions) {
-                    this.detectorOptionsList.push(configurationOptions.detectorOptions);
-                }
+                this.detectorOptionsList.push({
+                    conflictCheck: configurationOptions.conflictCheck,
+                    ...configurationOptions.detectorOptions,
+                });
                 debug(`[core]: load configuration in namespace="${namespace}"`);
                 this.addImports(configurationOptions.imports);
                 this.addImportObjects(configurationOptions.importObjects);
                 this.addImportConfigs(configurationOptions.importConfigs);
+                this.addImportConfigFilter(configurationOptions.importConfigFilter);
                 this.bindConfigurationClass(configurationExport, namespace);
             }
         }
@@ -78,6 +80,11 @@ class ContainerConfiguration {
             }
         }
     }
+    addImportConfigFilter(importConfigFilter) {
+        if (importConfigFilter) {
+            this.container.get(configService_1.MidwayConfigService).addFilter(importConfigFilter);
+        }
+    }
     addImports(imports = []) {
         var _a;
         // 处理 imports

package/dist/service/configService.d.ts

@@ -14,6 +14,7 @@ export declare class MidwayConfigService implements IConfigService {
     protected isReady: boolean;
     protected externalObject: Record<string, unknown>[];
     protected appInfo: MidwayAppInfo;
+    protected configFilterList: Array<(config: Record<string, any>) => Record<string, any> | undefined>;
     protected environmentService: MidwayEnvironmentService;
     protected informationService: MidwayInformationService;
     protected init(): void;
@@ -27,6 +28,12 @@ export declare class MidwayConfigService implements IConfigService {
     private loadConfig;
     clearAllConfig(): void;
     clearConfigMergeOrder(): void;
+    /**
+     * add a config filter
+     * @param filter
+     */
+    addFilter(filter: (config: Record<string, any>) => Record<string, any>): void;
+    protected runWithFilter(config: Record<string, any>): Record<string, any>;
 }
 export {};
 //# sourceMappingURL=configService.d.ts.map

package/dist/service/configService.js

@@ -30,6 +30,7 @@ let MidwayConfigService = class MidwayConfigService {
         this.configMergeOrder = [];
         this.isReady = false;
         this.externalObject = [];
+        this.configFilterList = [];
     }
     init() {
         this.appInfo = {
@@ -80,6 +81,11 @@ let MidwayConfigService = class MidwayConfigService {
     }
     addObject(obj, reverse = false) {
         if (this.isReady) {
+            obj = this.runWithFilter(obj);
+            if (!obj) {
+                debug('[config]: Filter config and got undefined will be drop it');
+                return;
+            }
             this.configMergeOrder.push({
                 env: 'default',
                 extraPath: '',
@@ -131,6 +137,11 @@ let MidwayConfigService = class MidwayConfigService {
             if (!config) {
                 continue;
             }
+            config = this.runWithFilter(config);
+            if (!config) {
+                debug('[config]: Filter config and got undefined will be drop it');
+                continue;
+            }
             if (typeof filename === 'string') {
                 debug('[config]: Loaded config %s, %j', filename, config);
             }
@@ -147,8 +158,9 @@ let MidwayConfigService = class MidwayConfigService {
             (0, extend_1.extend)(true, target, config);
         }
         if (this.externalObject.length) {
-            for (const externalObject of this.externalObject) {
+            for (let externalObject of this.externalObject) {
                 if (externalObject) {
+                    externalObject = this.runWithFilter(externalObject);
                     debug('[config]: Loaded external object %j', externalObject);
                     (0, extend_1.extend)(true, target, externalObject);
                     this.configMergeOrder.push({
@@ -192,6 +204,21 @@ let MidwayConfigService = class MidwayConfigService {
     clearConfigMergeOrder() {
         this.configMergeOrder.length = 0;
     }
+    /**
+     * add a config filter
+     * @param filter
+     */
+    addFilter(filter) {
+        this.configFilterList.push(filter);
+    }
+    runWithFilter(config) {
+        for (const filter of this.configFilterList) {
+            debug(`[config]: Filter config by filter = "${filter.name || 'anonymous filter'}"`);
+            config = filter(config);
+            debug('[config]: Filter config result = %j', config);
+        }
+        return config;
+    }
 };
 __decorate([
     (0, decorator_1.Inject)(),

package/dist/service/webRouterService.js

@@ -95,7 +95,7 @@ let MidwayWebRouterService = class MidwayWebRouterService {
         }
         else {
             // 不同的 controller，可能会有相同的 prefix，一旦 options 不同，就要报错
-            if (middleware) {
+            if (middleware && middleware.length > 0) {
                 const originRoute = this.routesPriority.filter(el => {
                     return el.prefix === prefix;
                 })[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.4.0",
+  "version": "3.4.4",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.0",
+    "@midwayjs/decorator": "^3.4.4",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "e48ea9cb52c6e70ab25b68f1188006100eab8184"
+  "gitHead": "f6b5a3ff3d19ae2a0d33a5a14357bee2a8463767"
 }