@midwayjs/core 3.5.0 → 3.5.3

package/dist/common/dataSourceManager.js

@@ -115,10 +115,24 @@ class DataSourceManager {
 }
 exports.DataSourceManager = DataSourceManager;
 function globModels(globString, appDir) {
-    const cwd = (0, path_1.join)(appDir, globString);
+    let cwd;
+    let pattern;
+    if (globString.endsWith('**')) {
+        // 去掉尾部的 **，因为 glob 会自动添加
+        globString = globString.slice(0, -2);
+    }
+    if (/\*/.test(globString)) {
+        cwd = appDir;
+        pattern = [...interface_1.DEFAULT_PATTERN.map(p => (0, path_1.join)(globString, p))];
+        pattern.push(globString);
+    }
+    else {
+        pattern = [...interface_1.DEFAULT_PATTERN];
+        cwd = (0, path_1.join)(appDir, globString);
+    }
     const models = [];
     // string will be glob file
-    const files = (0, glob_1.run)(interface_1.DEFAULT_PATTERN, {
+    const files = (0, glob_1.run)(pattern, {
         cwd,
         ignore: interface_1.IGNORE_PATTERN,
     });

package/dist/service/aspectService.d.ts

@@ -1,4 +1,4 @@
-import { IMethodAspect } from '@midwayjs/decorator';
+import { AspectMetadata, IMethodAspect } from '@midwayjs/decorator';
 import { IMidwayContainer } from '../interface';
 export declare class MidwayAspectService {
     readonly applicationContext: IMidwayContainer;
@@ -7,7 +7,7 @@ export declare class MidwayAspectService {
      * load aspect method for container
      */
     loadAspect(): Promise<void>;
-    private addAspect;
+    addAspect(aspectIns: IMethodAspect, aspectData: AspectMetadata): Promise<void>;
     /**
      * intercept class method in prototype
      * @param Clz class you want to intercept

package/dist/util/retry.d.ts

@@ -7,6 +7,7 @@
 export declare function retryWithAsync<T extends (...args: any[]) => Promise<unknown>>(retryFn: T, retryTimes?: number, options?: {
     throwOriginError?: boolean;
     retryInterval?: number;
+    receiver?: any;
 }): (...args: Parameters<T>) => ReturnType<T>;
 /**
  * wrap sync function with retry
@@ -16,5 +17,6 @@ export declare function retryWithAsync<T extends (...args: any[]) => Promise<unk
  */
 export declare function retryWith<T extends (...args: any[]) => unknown>(retryFn: T, retryTimes?: number, options?: {
     throwOriginError?: boolean;
+    receiver?: any;
 }): (...args: Parameters<T>) => ReturnType<T>;
 //# sourceMappingURL=retry.d.ts.map

package/dist/util/retry.js

@@ -15,7 +15,7 @@ function retryWithAsync(retryFn, retryTimes = 1, options = {}) {
     return (async (...args) => {
         do {
             try {
-                return await retryFn(...args);
+                return await retryFn.bind(options.receiver || this)(...args);
             }
             catch (err) {
                 error = err;
@@ -45,7 +45,7 @@ function retryWith(retryFn, retryTimes = 1, options = {}) {
     return ((...args) => {
         do {
             try {
-                return retryFn(...args);
+                return retryFn.bind(options.receiver || this)(...args);
             }
             catch (err) {
                 error = err;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.5.0",
+  "version": "3.5.3",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -25,7 +25,7 @@
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
-    "pg": "^8.8.0",
+    "pg": "8.8.0",
     "raw-body": "2.5.1",
     "sinon": "14.0.0"
   },
@@ -46,5 +46,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "4200e30d1af97a7817c36899c4ffc41a7d97c06d"
+  "gitHead": "32356484664846984f6d3d65a3a75dea015e8dcc"
 }