@midwayjs/core 3.4.6 → 3.4.7

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

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.4.6",
+  "version": "3.4.7",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "36687482782bcf526efc2a4773c09e166820c1a8"
+  "gitHead": "3c60619a65c6776d99fbf0b30ac454d3cb6926b9"
 }