@midwayjs/core 3.4.3 → 3.4.7

package/dist/common/dataSourceManager.d.ts

@@ -28,7 +28,7 @@ export declare abstract class DataSourceManager<T> {
     abstract getName(): string;
     protected abstract createDataSource(config: any, dataSourceName: string): Promise<T | void> | (T | void);
     protected abstract checkConnected(dataSource: T): Promise<boolean>;
-    protected destroyDataSource(dataSource: T): Promise<void>;
+    protected abstract destroyDataSource(dataSource: T): Promise<void>;
     stop(): Promise<void>;
 }
 export declare function globModels(globString: string, appDir: string): any[];

package/dist/common/dataSourceManager.js

@@ -9,7 +9,7 @@ const error_1 = require("../error");
 const glob_1 = require("@midwayjs/glob");
 const path_1 = require("path");
 const decorator_1 = require("@midwayjs/decorator");
-const DEFAULT_PATTERN = ['**/**.ts', '**/**.js'];
+const interface_1 = require("../interface");
 class DataSourceManager {
     constructor() {
         this.dataSource = new Map();
@@ -91,11 +91,11 @@ class DataSourceManager {
     getDataSourceNameByModel(modelOrRepository) {
         return this.modelMapping.get(modelOrRepository);
     }
-    async destroyDataSource(dataSource) { }
     async stop() {
-        for (const value of this.dataSource.values()) {
-            await this.destroyDataSource(value);
-        }
+        const arr = Array.from(this.dataSource.values());
+        await Promise.all(arr.map(dbh => {
+            return this.destroyDataSource(dbh);
+        }));
         this.dataSource.clear();
     }
 }
@@ -104,8 +104,9 @@ function globModels(globString, appDir) {
     const cwd = (0, path_1.join)(appDir, globString);
     const models = [];
     // string will be glob file
-    const files = (0, glob_1.run)(DEFAULT_PATTERN, {
+    const files = (0, glob_1.run)(interface_1.DEFAULT_PATTERN, {
         cwd,
+        ignore: interface_1.IGNORE_PATTERN,
     });
     for (const file of files) {
         const exports = require(file);

package/dist/common/fileDetector.js

@@ -4,6 +4,7 @@ exports.CustomModuleDetector = exports.DirectoryFileDetector = exports.AbstractF
 const decorator_1 = require("@midwayjs/decorator");
 const glob_1 = require("@midwayjs/glob");
 const error_1 = require("../error");
+const interface_1 = require("../interface");
 class AbstractFileDetector {
     constructor(options) {
         this.options = options;
@@ -14,9 +15,8 @@ class AbstractFileDetector {
     }
 }
 exports.AbstractFileDetector = AbstractFileDetector;
-const DEFAULT_PATTERN = ['**/**.ts', '**/**.tsx', '**/**.js'];
+const DEFAULT_GLOB_PATTERN = ['**/**.tsx'].concat(interface_1.DEFAULT_PATTERN);
 const DEFAULT_IGNORE_PATTERN = [
-    '**/**.d.ts',
     '**/logs/**',
     '**/run/**',
     '**/public/**',
@@ -27,7 +27,7 @@ const DEFAULT_IGNORE_PATTERN = [
     '**/**.test.ts',
     '**/**.test.js',
     '**/__test__/**',
-];
+].concat(interface_1.IGNORE_PATTERN);
 class DirectoryFileDetector extends AbstractFileDetector {
     constructor() {
         super(...arguments);
@@ -39,7 +39,7 @@ class DirectoryFileDetector extends AbstractFileDetector {
             .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 || []).concat(this.extraDetectorOptions.pattern || []), {
+            const fileResults = (0, glob_1.run)(DEFAULT_GLOB_PATTERN.concat(this.options.pattern || []).concat(this.extraDetectorOptions.pattern || []), {
                 cwd: dir,
                 ignore: DEFAULT_IGNORE_PATTERN.concat(this.options.ignore || []).concat(this.extraDetectorOptions.ignore || []),
             });

package/dist/common/middlewareManager.d.ts

@@ -60,6 +60,8 @@ export declare class ContextMiddlewareManager<CTX extends IMidwayContext, R, N>
      * @param middlewareOrNameOrIdx
      */
     remove(middlewareOrNameOrIdx: CommonMiddleware<CTX, R, N> | string | number): CommonMiddleware<CTX, R, N>;
+    push(...items: any[]): number;
+    unshift(...items: any[]): number;
     /**
      * get middleware name list
      */

package/dist/common/middlewareManager.js

@@ -170,6 +170,22 @@ class ContextMiddlewareManager extends Array {
             }
         }
     }
+    push(...items) {
+        items.forEach(item => {
+            if (typeof item !== 'string' && !this.getMiddlewareName(item)) {
+                item._name = 'anonymous';
+            }
+        });
+        return super.push(...items);
+    }
+    unshift(...items) {
+        items.forEach(item => {
+            if (typeof item !== 'string' && !this.getMiddlewareName(item)) {
+                item._name = 'anonymous';
+            }
+        });
+        return super.unshift(...items);
+    }
     /**
      * get middleware name list
      */

package/dist/context/container.js

@@ -61,6 +61,7 @@ class ContainerConfiguration {
                 this.addImports(configurationOptions.imports);
                 this.addImportObjects(configurationOptions.importObjects);
                 this.addImportConfigs(configurationOptions.importConfigs);
+                this.addImportConfigFilter(configurationOptions.importConfigFilter);
                 this.bindConfigurationClass(configurationExport, namespace);
             }
         }
@@ -79,6 +80,11 @@ class ContainerConfiguration {
             }
         }
     }
+    addImportConfigFilter(importConfigFilter) {
+        if (importConfigFilter) {
+            this.container.get(configService_1.MidwayConfigService).addFilter(importConfigFilter);
+        }
+    }
     addImports(imports = []) {
         var _a;
         // 处理 imports

package/dist/interface.d.ts

@@ -483,5 +483,7 @@ export interface MidwayConfig extends FileConfigOption<typeof _default> {
 }
 export declare const ASYNC_CONTEXT_KEY: unique symbol;
 export declare const ASYNC_CONTEXT_MANAGER_KEY = "MIDWAY_ASYNC_CONTEXT_MANAGER_KEY";
+export declare const DEFAULT_PATTERN: string[];
+export declare const IGNORE_PATTERN: string[];
 export {};
 //# sourceMappingURL=interface.d.ts.map

package/dist/interface.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ASYNC_CONTEXT_MANAGER_KEY = exports.ASYNC_CONTEXT_KEY = exports.MIDWAY_LOGGER_WRITEABLE_DIR = exports.MidwayProcessTypeEnum = exports.REQUEST_CTX_LOGGER_CACHE_KEY = exports.HTTP_SERVER_KEY = exports.REQUEST_OBJ_CTX_KEY = exports.REQUEST_CTX_KEY = exports.ObjectLifeCycleEvent = void 0;
+exports.IGNORE_PATTERN = exports.DEFAULT_PATTERN = exports.ASYNC_CONTEXT_MANAGER_KEY = exports.ASYNC_CONTEXT_KEY = exports.MIDWAY_LOGGER_WRITEABLE_DIR = exports.MidwayProcessTypeEnum = exports.REQUEST_CTX_LOGGER_CACHE_KEY = exports.HTTP_SERVER_KEY = exports.REQUEST_OBJ_CTX_KEY = exports.REQUEST_CTX_KEY = exports.ObjectLifeCycleEvent = void 0;
 var ObjectLifeCycleEvent;
 (function (ObjectLifeCycleEvent) {
     ObjectLifeCycleEvent["BEFORE_BIND"] = "beforeBind";
@@ -21,4 +21,13 @@ var MidwayProcessTypeEnum;
 exports.MIDWAY_LOGGER_WRITEABLE_DIR = 'MIDWAY_LOGGER_WRITEABLE_DIR';
 exports.ASYNC_CONTEXT_KEY = Symbol('ASYNC_CONTEXT_KEY');
 exports.ASYNC_CONTEXT_MANAGER_KEY = 'MIDWAY_ASYNC_CONTEXT_MANAGER_KEY';
+exports.DEFAULT_PATTERN = [
+    '**/**.ts',
+    '**/**.js',
+    '**/**.mts',
+    '**/**.mjs',
+    '**/**.cts',
+    '**/**.cjs'
+];
+exports.IGNORE_PATTERN = ['**/**.d.ts', '**/**.d.mts', '**/**.d.cts'];
 //# sourceMappingURL=interface.js.map

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/slsFunctionService.js

@@ -30,6 +30,7 @@ let MidwayServerlessFunctionService = class MidwayServerlessFunctionService exte
         for (const routerInfo of this.routes.values()) {
             for (const info of routerInfo) {
                 if (info.requestMethod === 'all') {
+                    info.functionTriggerMetadata = info.functionTriggerMetadata || {};
                     info.functionTriggerMetadata.method = [
                         'get',
                         'post',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.4.3",
+  "version": "3.4.7",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,12 +21,12 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.1",
+    "@midwayjs/decorator": "^3.4.4",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
     "raw-body": "2.5.1",
-    "sinon": "13.0.2"
+    "sinon": "14.0.0"
   },
   "peerDependencies": {
     "@midwayjs/decorator": "*"
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "0d79293f56d01a3ef3589e6a6ef53c582ac0c46f"
+  "gitHead": "3c60619a65c6776d99fbf0b30ac454d3cb6926b9"
 }