@midwayjs/core 3.10.15 → 3.11.1

package/dist/decorator/decoratorManager.js

@@ -7,6 +7,7 @@ const constant_1 = require("./constant");
 const types_1 = require("../util/types");
 const camelCase_1 = require("../util/camelCase");
 const util_1 = require("../util");
+const pathFileUtil_1 = require("../util/pathFileUtil");
 const debug = require('util').debuglog('midway:core');
 exports.PRELOAD_MODULE_KEY = 'INJECTION_PRELOAD_MODULE_KEY';
 exports.INJECT_CLASS_KEY_PREFIX = 'INJECTION_CLASS_META_DATA';
@@ -249,6 +250,13 @@ let manager = new DecoratorManager();
 if (typeof global === 'object') {
     if (global['MIDWAY_GLOBAL_DECORATOR_MANAGER']) {
         console.warn('DecoratorManager not singleton and please check @midwayjs/core version by "npm ls @midwayjs/core"');
+        const coreModulePathList = (0, pathFileUtil_1.getModuleRequirePathList)('@midwayjs/core');
+        if (coreModulePathList.length) {
+            console.info('The module may be located in:');
+            coreModulePathList.forEach((path, index) => {
+                console.info(`${index + 1}. ${path}`);
+            });
+        }
         manager = global['MIDWAY_GLOBAL_DECORATOR_MANAGER'];
     }
     else {

package/dist/interface.d.ts

@@ -243,6 +243,7 @@ export interface JoinPoint {
     target: any;
     args: any[];
     proceed?(...args: any[]): any;
+    proceedIsAsyncFunction?: boolean;
 }
 export interface AspectMetadata {
     aspectTarget: any;
@@ -619,13 +620,14 @@ export interface Context {
 }
 export type IMidwayContext<FrameworkContext = unknown> = Context & FrameworkContext;
 export type NextFunction = () => Promise<any>;
+export type IgnoreMatcher<CTX> = string | RegExp | ((ctx: CTX) => boolean);
 /**
  * Common middleware definition
  */
 export interface IMiddleware<CTX, R, N = unknown> {
     resolve: (app: IMidwayApplication) => FunctionMiddleware<CTX, R, N> | Promise<FunctionMiddleware<CTX, R, N>>;
-    match?: (ctx: CTX) => boolean;
-    ignore?: (ctx: CTX) => boolean;
+    match?: IgnoreMatcher<CTX> | IgnoreMatcher<CTX>[];
+    ignore?: IgnoreMatcher<CTX> | IgnoreMatcher<CTX>[];
 }
 export type FunctionMiddleware<CTX, R, N = unknown> = N extends true ? (req: CTX, res: R, next: N) => any : (context: CTX, next: R, options?: any) => any;
 export type ClassMiddleware<CTX, R, N> = new (...args: any[]) => IMiddleware<CTX, R, N>;

package/dist/service/aspectService.js

@@ -78,6 +78,7 @@ let MidwayAspectService = class MidwayAspectService {
                     target: this,
                     args: args,
                     proceed: newProceed,
+                    proceedIsAsyncFunction: true,
                 };
                 if (typeof aspectObject === 'function') {
                     aspectObject = aspectObject();
@@ -122,6 +123,7 @@ let MidwayAspectService = class MidwayAspectService {
                     target: this,
                     args: args,
                     proceed: newProceed,
+                    proceedIsAsyncFunction: false,
                 };
                 if (typeof aspectObject === 'function') {
                     aspectObject = aspectObject();

package/dist/service/middlewareService.js

@@ -15,12 +15,13 @@ const interface_1 = require("../interface");
 const error_1 = require("../error");
 const util_1 = require("../util");
 const types_1 = require("../util/types");
+const util_2 = require("util");
+const debug = (0, util_2.debuglog)('midway:debug');
 let MidwayMiddlewareService = class MidwayMiddlewareService {
     constructor(applicationContext) {
         this.applicationContext = applicationContext;
     }
     async compose(middleware, app, name) {
-        var _a, _b;
         if (!Array.isArray(middleware)) {
             throw new error_1.MidwayParameterError('Middleware stack must be an array');
         }
@@ -49,8 +50,9 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                         // wrap ignore and match
                         const mw = fn;
                         const match = (0, util_1.pathMatching)({
-                            match: (_a = classMiddleware.match) === null || _a === void 0 ? void 0 : _a.bind(classMiddleware),
-                            ignore: (_b = classMiddleware.ignore) === null || _b === void 0 ? void 0 : _b.bind(classMiddleware),
+                            match: classMiddleware.match,
+                            ignore: classMiddleware.ignore,
+                            thisResolver: classMiddleware,
                         });
                         fn = (ctx, next, options) => {
                             if (!match(ctx))
@@ -89,6 +91,9 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                     fn = next;
                 if (!fn)
                     return Promise.resolve();
+                const middlewareName = `${name ? `${name}.` : ''}${index} ${fn._name || fn.name || 'anonymous'}`;
+                const startTime = Date.now();
+                debug(`[middleware]: in ${middlewareName} +0`);
                 try {
                     if (supportBody) {
                         return Promise.resolve(fn(context, dispatch.bind(null, i + 1), {
@@ -105,16 +110,21 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                             else if (context['body'] !== undefined) {
                                 result = context['body'];
                             }
+                            debug(`[middleware]: out ${middlewareName} +${Date.now() - startTime} with body`);
                             return result;
                         });
                     }
                     else {
                         return Promise.resolve(fn(context, dispatch.bind(null, i + 1), {
                             index,
-                        }));
+                        })).then(result => {
+                            debug(`[middleware]: out ${middlewareName} +${Date.now() - startTime}`);
+                            return result;
+                        });
                     }
                 }
                 catch (err) {
+                    debug(`[middleware]: out ${middlewareName} +${Date.now() - startTime} with err ${err.message}`);
                     return Promise.reject(err);
                 }
             }

package/dist/util/index.d.ts

@@ -1,4 +1,4 @@
-import { FunctionMiddleware } from '../interface';
+import { FunctionMiddleware, IgnoreMatcher } from '../interface';
 import { camelCase, pascalCase } from './camelCase';
 import { randomUUID } from './uuid';
 import { safeParse, safeStringify } from './flatted';
@@ -85,7 +85,11 @@ export declare const deprecatedOutput: (message: string) => void;
  */
 export declare const transformRequestObjectByType: (originValue: any, targetType?: any) => any;
 export declare function toPathMatch(pattern: any): any;
-export declare function pathMatching(options: any): (ctx?: any) => any;
+export declare function pathMatching(options: {
+    match?: IgnoreMatcher<any> | IgnoreMatcher<any>[];
+    ignore?: IgnoreMatcher<any> | IgnoreMatcher<any>[];
+    thisResolver?: any;
+}): (ctx?: any) => boolean;
 /**
  * wrap function middleware with match and ignore
  * @param mw

package/dist/util/index.js

@@ -270,9 +270,32 @@ function pathMatching(options) {
         throw new error_1.MidwayCommonError('options.match and options.ignore can not both present');
     if (!options.match && !options.ignore)
         return () => true;
+    if (options.match && !Array.isArray(options.match)) {
+        options.match = [options.match];
+    }
+    if (options.ignore && !Array.isArray(options.ignore)) {
+        options.ignore = [options.ignore];
+    }
+    const createMatch = (ignoreMatcherArr) => {
+        const matchedArr = ignoreMatcherArr.map(item => {
+            if (options.thisResolver) {
+                return toPathMatch(item).bind(options.thisResolver);
+            }
+            return toPathMatch(item);
+        });
+        return ctx => {
+            for (let i = 0; i < matchedArr.length; i++) {
+                const matched = matchedArr[i](ctx);
+                if (matched) {
+                    return true;
+                }
+            }
+            return false;
+        };
+    };
     const matchFn = options.match
-        ? toPathMatch(options.match)
-        : toPathMatch(options.ignore);
+        ? createMatch(options.match)
+        : createMatch(options.ignore);
     return function pathMatch(ctx) {
         const matched = matchFn(ctx);
         return options.match ? matched : !matched;

package/dist/util/pathFileUtil.d.ts

@@ -7,4 +7,5 @@ export declare const PathFileUtil: {
     isPathEqual: typeof isPathEqual;
     getFileContentSync: typeof getFileContentSync;
 };
+export declare function getModuleRequirePathList(moduleName: string): string[];
 //# sourceMappingURL=pathFileUtil.d.ts.map

package/dist/util/pathFileUtil.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PathFileUtil = exports.getFileContentSync = exports.isPathEqual = exports.isPath = void 0;
+exports.getModuleRequirePathList = exports.PathFileUtil = exports.getFileContentSync = exports.isPathEqual = exports.isPath = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 function isPath(p) {
@@ -32,4 +32,31 @@ exports.PathFileUtil = {
     isPathEqual,
     getFileContentSync,
 };
+function getModuleRequirePathList(moduleName) {
+    const moduleNameList = [moduleName, moduleName.replace(/\//g, '_')];
+    let moduleNameMap = {};
+    const modulePathList = [];
+    Object.keys(require.cache || {}).forEach(moduleName => {
+        let moduleIndex = -1;
+        for (const moduleName of moduleNameList) {
+            const index = moduleName.indexOf(moduleName);
+            if (index !== -1) {
+                moduleIndex = index;
+                break;
+            }
+        }
+        if (moduleIndex === -1) {
+            return;
+        }
+        const modulePath = moduleName.slice(0, moduleIndex);
+        if (moduleNameMap[modulePath]) {
+            return;
+        }
+        moduleNameMap[modulePath] = true;
+        modulePathList.push(modulePath);
+    });
+    moduleNameMap = undefined;
+    return modulePathList;
+}
+exports.getModuleRequirePathList = getModuleRequirePathList;
 //# sourceMappingURL=pathFileUtil.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.10.15",
+  "version": "3.11.1",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -25,7 +25,7 @@
     "koa": "2.14.1",
     "mm": "3.2.1",
     "raw-body": "2.5.2",
-    "sinon": "15.0.1"
+    "sinon": "15.0.3"
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
@@ -42,5 +42,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "8d5fd0e58156612c675821134377208e4da710ad"
+  "gitHead": "bd9375874eb8cfaa49fbcfaa0497021cea06a394"
 }