@midwayjs/core 3.0.0-beta.5 → 3.0.0-beta.9

package/CHANGELOG.md

@@ -3,6 +3,51 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09)
+
+
+### Bug Fixes
+
+* faas missing config in framework ([#1413](https://github.com/midwayjs/midway/issues/1413)) ([7ab16a2](https://github.com/midwayjs/midway/commit/7ab16a24b29d5254a762bfffcdf18385effdf639))
+
+
+
+
+
+# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08)
+
+
+### Bug Fixes
+
+* express routing middleware takes effect at the controller level ([#1364](https://github.com/midwayjs/midway/issues/1364)) ([b9272e0](https://github.com/midwayjs/midway/commit/b9272e0971003443304b0c53815be31a0061b4bd))
+
+
+
+
+
+# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
+
+
+### Bug Fixes
+
+* add app.keys ([#1395](https://github.com/midwayjs/midway/issues/1395)) ([c44afc6](https://github.com/midwayjs/midway/commit/c44afc6cc6764a959d1fa7ae04d60099282d156a))
+* middleware with ctx.body ([#1389](https://github.com/midwayjs/midway/issues/1389)) ([77af5c0](https://github.com/midwayjs/midway/commit/77af5c0b456f1843f4dcfd3dbfd2c0aa244c51bd))
+
+
+
+
+
+# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
+
+
+### Bug Fixes
+
+* class transformer method missing ([#1387](https://github.com/midwayjs/midway/issues/1387)) ([074e839](https://github.com/midwayjs/midway/commit/074e8393598dc95e2742f735df75a2191c5fe25d))
+
+
+
+
+
 # [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
 
 

package/README.md

@@ -5,7 +5,7 @@
 
 this is a sub package for midway.
 
-Document: [https://midwayjs.org/midway](https://midwayjs.org/midway)
+Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 

package/dist/baseFramework.js

@@ -215,7 +215,10 @@ class BaseFramework {
                 catch (err) {
                     returnResult = await this.filterManager.runErrorFilter(err, ctx);
                 }
-                return returnResult;
+                if (returnResult.error) {
+                    throw returnResult.error;
+                }
+                return returnResult.result;
             }));
             this.composeMiddleware = await this.middlewareService.compose(this.middlewareManager);
             await this.filterManager.init(this.applicationContext);

package/dist/common/middlewareManager.d.ts

@@ -1,11 +1,68 @@
 import { CommonMiddleware, CommonMiddlewareUnion, IMidwayContext } from '../interface';
 export declare class ContextMiddlewareManager<CTX extends IMidwayContext, R, N> extends Array<CommonMiddleware<CTX, R, N>> {
+    /**
+     * insert a middleware or middleware array to first
+     * @param middleware
+     */
     insertFirst(middleware: CommonMiddlewareUnion<CTX, R, N>): void;
-    insertBefore(middleware: CommonMiddlewareUnion<CTX, R, N>, idxOrBeforeMiddleware: number): any;
-    insertBefore(middleware: CommonMiddlewareUnion<CTX, R, N>, idxOrBeforeMiddleware: CommonMiddlewareUnion<CTX, R, N>): any;
-    insertAfter(middleware: CommonMiddlewareUnion<CTX, R, N>, idxOrAfterMiddleware: number): any;
-    insertAfter(middleware: CommonMiddlewareUnion<CTX, R, N>, idxOrAfterMiddleware: CommonMiddlewareUnion<CTX, R, N>): any;
+    /**
+     * insert a middleware or middleware array to last
+     * @param middleware
+     */
     insertLast(middleware: CommonMiddlewareUnion<CTX, R, N>): void;
-    private findItemIndex;
+    /**
+     * insert a middleware or middleware array to after another middleware
+     * @param middleware
+     * @param idxOrBeforeMiddleware
+     */
+    insertBefore(middleware: CommonMiddlewareUnion<CTX, R, N>, idxOrBeforeMiddleware: CommonMiddleware<CTX, R, N> | string | number): void;
+    /**
+     * insert a middleware or middleware array to after another middleware
+     * @param middleware
+     * @param idxOrAfterMiddleware
+     */
+    insertAfter(middleware: CommonMiddlewareUnion<CTX, R, N>, idxOrAfterMiddleware: CommonMiddleware<CTX, R, N> | string | number): void;
+    /**
+     * move a middleware after another middleware
+     * @param middlewareOrName
+     * @param afterMiddleware
+     */
+    findAndInsertAfter(middlewareOrName: CommonMiddleware<CTX, R, N> | string, afterMiddleware: CommonMiddleware<CTX, R, N> | string | number): void;
+    /**
+     * move a middleware before another middleware
+     * @param middlewareOrName
+     * @param beforeMiddleware
+     */
+    findAndInsertBefore(middlewareOrName: CommonMiddleware<CTX, R, N> | string, beforeMiddleware: CommonMiddleware<CTX, R, N> | string | number): void;
+    /**
+     * find middleware and move to first
+     * @param middlewareOrName
+     */
+    findAndInsertFirst(middlewareOrName: CommonMiddleware<CTX, R, N> | string): void;
+    /**
+     * find middleware and move to last
+     * @param middlewareOrName
+     */
+    findAndInsertLast(middlewareOrName: CommonMiddleware<CTX, R, N> | string): void;
+    /**
+     * find a middleware and return index
+     * @param middlewareOrName
+     */
+    findItemIndex(middlewareOrName: CommonMiddleware<CTX, R, N> | string | number): number;
+    findItem(middlewareOrName: CommonMiddleware<CTX, R, N> | string | number): CommonMiddleware<CTX, R, N>;
+    /**
+     * get name from middleware
+     * @param middleware
+     */
+    getMiddlewareName(middleware: CommonMiddleware<CTX, R, N>): string;
+    /**
+     * remove a middleware
+     * @param middlewareOrNameOrIdx
+     */
+    remove(middlewareOrNameOrIdx: CommonMiddleware<CTX, R, N> | string | number): CommonMiddleware<CTX, R, N>;
+    /**
+     * get middleware name list
+     */
+    getNames(): string[];
 }
 //# sourceMappingURL=middlewareManager.d.ts.map

package/dist/common/middlewareManager.js

@@ -2,6 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContextMiddlewareManager = void 0;
 class ContextMiddlewareManager extends Array {
+    /**
+     * insert a middleware or middleware array to first
+     * @param middleware
+     */
     insertFirst(middleware) {
         if (Array.isArray(middleware)) {
             this.unshift(...middleware);
@@ -10,6 +14,23 @@ class ContextMiddlewareManager extends Array {
             this.unshift(middleware);
         }
     }
+    /**
+     * insert a middleware or middleware array to last
+     * @param middleware
+     */
+    insertLast(middleware) {
+        if (Array.isArray(middleware)) {
+            this.push(...middleware);
+        }
+        else {
+            this.push(middleware);
+        }
+    }
+    /**
+     * insert a middleware or middleware array to after another middleware
+     * @param middleware
+     * @param idxOrBeforeMiddleware
+     */
     insertBefore(middleware, idxOrBeforeMiddleware) {
         if (typeof idxOrBeforeMiddleware !== 'number') {
             idxOrBeforeMiddleware = this.findItemIndex(idxOrBeforeMiddleware);
@@ -21,6 +42,11 @@ class ContextMiddlewareManager extends Array {
             this.splice(idxOrBeforeMiddleware, 0, middleware);
         }
     }
+    /**
+     * insert a middleware or middleware array to after another middleware
+     * @param middleware
+     * @param idxOrAfterMiddleware
+     */
     insertAfter(middleware, idxOrAfterMiddleware) {
         if (typeof idxOrAfterMiddleware !== 'number') {
             idxOrAfterMiddleware = this.findItemIndex(idxOrAfterMiddleware);
@@ -32,16 +58,125 @@ class ContextMiddlewareManager extends Array {
             this.splice(idxOrAfterMiddleware + 1, 0, middleware);
         }
     }
-    insertLast(middleware) {
-        if (Array.isArray(middleware)) {
-            this.push(...middleware);
+    /**
+     * move a middleware after another middleware
+     * @param middlewareOrName
+     * @param afterMiddleware
+     */
+    findAndInsertAfter(middlewareOrName, afterMiddleware) {
+        middlewareOrName = this.findItem(middlewareOrName);
+        afterMiddleware = this.findItem(afterMiddleware);
+        if (!middlewareOrName ||
+            !afterMiddleware ||
+            middlewareOrName === afterMiddleware) {
+            return;
+        }
+        if (afterMiddleware) {
+            const mw = this.remove(middlewareOrName);
+            if (mw) {
+                this.insertAfter(mw, afterMiddleware);
+            }
+        }
+    }
+    /**
+     * move a middleware before another middleware
+     * @param middlewareOrName
+     * @param beforeMiddleware
+     */
+    findAndInsertBefore(middlewareOrName, beforeMiddleware) {
+        middlewareOrName = this.findItem(middlewareOrName);
+        beforeMiddleware = this.findItem(beforeMiddleware);
+        if (!middlewareOrName ||
+            !beforeMiddleware ||
+            middlewareOrName === beforeMiddleware) {
+            return;
+        }
+        if (beforeMiddleware) {
+            const mw = this.remove(middlewareOrName);
+            if (mw) {
+                this.insertBefore(mw, beforeMiddleware);
+            }
+        }
+    }
+    /**
+     * find middleware and move to first
+     * @param middlewareOrName
+     */
+    findAndInsertFirst(middlewareOrName) {
+        const mw = this.remove(middlewareOrName);
+        if (mw) {
+            this.insertFirst(mw);
+        }
+    }
+    /**
+     * find middleware and move to last
+     * @param middlewareOrName
+     */
+    findAndInsertLast(middlewareOrName) {
+        const mw = this.remove(middlewareOrName);
+        if (mw) {
+            this.insertLast(mw);
+        }
+    }
+    /**
+     * find a middleware and return index
+     * @param middlewareOrName
+     */
+    findItemIndex(middlewareOrName) {
+        if (typeof middlewareOrName === 'number') {
+            return middlewareOrName;
+        }
+        else if (typeof middlewareOrName === 'string') {
+            return this.findIndex(item => this.getMiddlewareName(item) === middlewareOrName);
         }
         else {
-            this.push(middleware);
+            return this.findIndex(item => item === middlewareOrName);
+        }
+    }
+    findItem(middlewareOrName) {
+        if (typeof middlewareOrName === 'number') {
+            if (middlewareOrName >= 0 && middlewareOrName <= this.length - 1) {
+                return this[middlewareOrName];
+            }
+        }
+        else if (typeof middlewareOrName === 'string') {
+            return this.find(item => this.getMiddlewareName(item) === middlewareOrName);
+        }
+        else {
+            return middlewareOrName;
+        }
+    }
+    /**
+     * get name from middleware
+     * @param middleware
+     */
+    getMiddlewareName(middleware) {
+        var _a;
+        return (_a = middleware._name) !== null && _a !== void 0 ? _a : middleware.name;
+    }
+    /**
+     * remove a middleware
+     * @param middlewareOrNameOrIdx
+     */
+    remove(middlewareOrNameOrIdx) {
+        if (typeof middlewareOrNameOrIdx === 'number' &&
+            middlewareOrNameOrIdx !== -1) {
+            return this.splice(middlewareOrNameOrIdx, 1)[0];
+        }
+        else {
+            const idx = this.findItemIndex(middlewareOrNameOrIdx);
+            if (idx !== -1) {
+                return this.splice(idx, 1)[0];
+            }
         }
     }
-    findItemIndex(middleware) {
-        return this.findIndex(item => item === middleware);
+    /**
+     * get middleware name list
+     */
+    getNames() {
+        return this.map(item => {
+            return this.getMiddlewareName(item);
+        });
     }
 }
 exports.ContextMiddlewareManager = ContextMiddlewareManager;

package/dist/common/webGenerator.js

@@ -9,6 +9,8 @@ exports.WebControllerGenerator = void 0;
  */
 const decorator_1 = require("@midwayjs/decorator");
 const index_1 = require("../index");
+const util = require("util");
+const debug = util.debuglog('midway:debug');
 class WebControllerGenerator {
     constructor(applicationContext, frameworkType, logger) {
         this.applicationContext = applicationContext;
@@ -67,6 +69,7 @@ class WebControllerGenerator {
             // bind controller first
             this.applicationContext.bindClass(routerInfo.routerModule);
             (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`Load Controller "${routerInfo.controllerId}", prefix=${routerInfo.prefix}`);
+            debug(`[core:webGenerator]: Load Controller "${routerInfo.controllerId}", prefix=${routerInfo.prefix}`);
             // new router
             const newRouter = this.createRouter({
                 prefix: routerInfo.prefix,
@@ -97,6 +100,7 @@ class WebControllerGenerator {
                     this.generateController(routeInfo),
                 ];
                 (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`Load Router "${routeInfo.requestMethod.toUpperCase()} ${routeInfo.url}"`);
+                debug(`[core:webGenerator]: Load Router "${routeInfo.requestMethod.toUpperCase()} ${routeInfo.url}"`);
                 // apply controller from request context
                 // eslint-disable-next-line prefer-spread
                 newRouter[routeInfo.requestMethod].apply(newRouter, routerArgs);

package/dist/common/webRouterCollector.js

@@ -6,6 +6,7 @@ const util_1 = require("../util");
 const container_1 = require("../context/container");
 const fileDetector_1 = require("./fileDetector");
 const util = require("util");
+const error_1 = require("../error");
 const debug = util.debuglog('midway:debug');
 class WebRouterCollector {
     constructor(baseDir = '', options = {}) {
@@ -70,6 +71,9 @@ class WebRouterCollector {
         if (controllerIgnoreGlobalPrefix) {
             prefix = ignorePrefix;
         }
+        if (/\*/.test(prefix)) {
+            throw new error_1.MidwayCommonError(`Router prefix ${prefix} can't set string with *`);
+        }
         // set prefix
         if (!this.routes.has(prefix)) {
             this.routes.set(prefix, []);

package/dist/context/container.js

@@ -64,8 +64,13 @@ class ContainerConfiguration {
         });
     }
     addImportConfigs(importConfigs) {
-        if (importConfigs && importConfigs.length) {
-            this.container.get(configService_1.MidwayConfigService).add(importConfigs);
+        if (importConfigs) {
+            if (Array.isArray(importConfigs)) {
+                this.container.get(configService_1.MidwayConfigService).add(importConfigs);
+            }
+            else {
+                this.container.get(configService_1.MidwayConfigService).addObject(importConfigs);
+            }
         }
     }
     addImports(imports = []) {

package/dist/error/code.d.ts

@@ -54,6 +54,7 @@ export declare enum FrameworkErrorEnum {
     PARAM_TYPE = 10002,
     DEFINITION_NOT_FOUND = 10003,
     FEATURE_NO_LONGER_SUPPORTED = 10004,
-    VALIDATE_FAIL = 10005
+    VALIDATE_FAIL = 10005,
+    MISSING_CONFIG = 10006
 }
 //# sourceMappingURL=code.d.ts.map

package/dist/error/code.js

@@ -60,5 +60,6 @@ var FrameworkErrorEnum;
     FrameworkErrorEnum[FrameworkErrorEnum["DEFINITION_NOT_FOUND"] = 10003] = "DEFINITION_NOT_FOUND";
     FrameworkErrorEnum[FrameworkErrorEnum["FEATURE_NO_LONGER_SUPPORTED"] = 10004] = "FEATURE_NO_LONGER_SUPPORTED";
     FrameworkErrorEnum[FrameworkErrorEnum["VALIDATE_FAIL"] = 10005] = "VALIDATE_FAIL";
+    FrameworkErrorEnum[FrameworkErrorEnum["MISSING_CONFIG"] = 10006] = "MISSING_CONFIG";
 })(FrameworkErrorEnum = exports.FrameworkErrorEnum || (exports.FrameworkErrorEnum = {}));
 //# sourceMappingURL=code.js.map

package/dist/error/framework.d.ts

@@ -18,4 +18,7 @@ export declare class MidwayFeatureNoLongerSupportedError extends MidwayError {
 export declare class MidwayValidationError extends MidwayError {
     constructor(message: any, status: any, cause: any);
 }
+export declare class MidwayConfigMissingError extends MidwayError {
+    constructor(configKey: string);
+}
 //# sourceMappingURL=framework.d.ts.map

package/dist/error/framework.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayValidationError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = void 0;
+exports.MidwayConfigMissingError = exports.MidwayValidationError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = void 0;
 const base_1 = require("./base");
 const code_1 = require("./code");
 class MidwayCommonError extends base_1.MidwayError {
@@ -49,4 +49,10 @@ class MidwayValidationError extends base_1.MidwayError {
     }
 }
 exports.MidwayValidationError = MidwayValidationError;
+class MidwayConfigMissingError extends base_1.MidwayError {
+    constructor(configKey) {
+        super(`Can't found config key "${configKey}" in your config, please set it first`, code_1.FrameworkErrorEnum.MISSING_CONFIG);
+    }
+}
+exports.MidwayConfigMissingError = MidwayConfigMissingError;
 //# sourceMappingURL=framework.js.map

package/dist/index.d.ts

@@ -4,12 +4,11 @@ export { MidwayRequestContainer } from './context/requestContainer';
 export { BaseFramework } from './baseFramework';
 export * from './context/providerWrapper';
 export * from './common/constants';
-export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, deprecatedOutput, transformRequestObjectByType, } from './util/';
+export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, } from './util/';
 export * from './util/pathFileUtil';
 export * from './util/webRouterParam';
 export * from './common/webRouterCollector';
 export * from './common/triggerCollector';
-export { plainToClass, classToPlain } from 'class-transformer';
 export { createConfiguration } from './functional/configuration';
 export { MidwayConfigService } from './service/configService';
 export { MidwayEnvironmentService } from './service/environmentService';

package/dist/index.js

@@ -10,7 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayFrameworkType = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.classToPlain = exports.plainToClass = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
+exports.MidwayFrameworkType = exports.MidwayDecoratorService = exports.MidwayMiddlewareService = exports.MidwayLifeCycleService = exports.MidwayAspectService = exports.MidwayFrameworkService = exports.MidwayLoggerService = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.wrapMiddleware = exports.pathMatching = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = void 0;
 __exportStar(require("./interface"), exports);
 __exportStar(require("./context/container"), exports);
 var requestContainer_1 = require("./context/requestContainer");
@@ -27,13 +27,12 @@ Object.defineProperty(exports, "delegateTargetMethod", { enumerable: true, get:
 Object.defineProperty(exports, "delegateTargetProperties", { enumerable: true, get: function () { return util_1.delegateTargetProperties; } });
 Object.defineProperty(exports, "deprecatedOutput", { enumerable: true, get: function () { return util_1.deprecatedOutput; } });
 Object.defineProperty(exports, "transformRequestObjectByType", { enumerable: true, get: function () { return util_1.transformRequestObjectByType; } });
+Object.defineProperty(exports, "pathMatching", { enumerable: true, get: function () { return util_1.pathMatching; } });
+Object.defineProperty(exports, "wrapMiddleware", { enumerable: true, get: function () { return util_1.wrapMiddleware; } });
 __exportStar(require("./util/pathFileUtil"), exports);
 __exportStar(require("./util/webRouterParam"), exports);
 __exportStar(require("./common/webRouterCollector"), exports);
 __exportStar(require("./common/triggerCollector"), exports);
-var class_transformer_1 = require("class-transformer");
-Object.defineProperty(exports, "plainToClass", { enumerable: true, get: function () { return class_transformer_1.plainToClass; } });
-Object.defineProperty(exports, "classToPlain", { enumerable: true, get: function () { return class_transformer_1.classToPlain; } });
 var configuration_1 = require("./functional/configuration");
 Object.defineProperty(exports, "createConfiguration", { enumerable: true, get: function () { return configuration_1.createConfiguration; } });
 var configService_1 = require("./service/configService");

package/dist/interface.d.ts

@@ -400,9 +400,9 @@ export interface IMidwayBootstrapOptions {
     moduleDetector?: 'file' | IFileDetector | false;
     logger?: boolean | ILogger;
     ignore?: string[];
-    globalConfig?: {
+    globalConfig?: Array<{
         [environmentName: string]: Record<string, any>;
-    };
+    }> | Record<string, any>;
 }
 export interface IConfigurationOptions {
     logger?: ILogger;

package/dist/service/decoratorService.js

@@ -24,7 +24,27 @@ let MidwayDecoratorService = class MidwayDecoratorService {
     }
     async init() {
         // add custom method decorator listener
-        this.applicationContext.onBeforeBind((Clzz, options) => {
+        this.applicationContext.onBeforeBind(Clzz => {
+            // find custom method decorator metadata, include method decorator information array
+            const methodDecoratorMetadataList = (0, decorator_1.getClassMetadata)(decorator_1.INJECT_CUSTOM_METHOD, Clzz);
+            if (methodDecoratorMetadataList) {
+                // loop it, save this order for decorator run
+                for (const meta of methodDecoratorMetadataList) {
+                    const { propertyName, key, metadata } = meta;
+                    // add aspect implementation first
+                    this.aspectService.interceptPrototypeMethod(Clzz, propertyName, () => {
+                        const methodDecoratorHandler = this.methodDecoratorMap.get(key);
+                        if (!methodDecoratorHandler) {
+                            throw new error_1.MidwayCommonError(`Method Decorator "${key}" handler not found, please register first.`);
+                        }
+                        return this.methodDecoratorMap.get(key)({
+                            target: Clzz,
+                            propertyName,
+                            metadata,
+                        });
+                    });
+                }
+            }
             // find custom param decorator metadata
             const parameterDecoratorMetadata = (0, decorator_1.getClassMetadata)(decorator_1.INJECT_CUSTOM_PARAM, Clzz);
             if (parameterDecoratorMetadata) {
@@ -58,26 +78,6 @@ let MidwayDecoratorService = class MidwayDecoratorService {
                     });
                 }
             }
-            // find custom method decorator metadata, include method decorator information array
-            const methodDecoratorMetadataList = (0, decorator_1.getClassMetadata)(decorator_1.INJECT_CUSTOM_METHOD, Clzz);
-            if (methodDecoratorMetadataList) {
-                // loop it, save this order for decorator run
-                for (const meta of methodDecoratorMetadataList) {
-                    const { propertyName, key, metadata } = meta;
-                    // add aspect implementation first
-                    this.aspectService.interceptPrototypeMethod(Clzz, propertyName, () => {
-                        const methodDecoratorHandler = this.methodDecoratorMap.get(key);
-                        if (!methodDecoratorHandler) {
-                            throw new error_1.MidwayCommonError(`Method Decorator "${key}" handler not found, please register first.`);
-                        }
-                        return this.methodDecoratorMap.get(key)({
-                            target: Clzz,
-                            propertyName,
-                            metadata,
-                        });
-                    });
-                }
-            }
         });
         // add custom property decorator listener
         this.applicationContext.onObjectCreated((instance, options) => {

package/dist/service/middlewareService.d.ts

@@ -6,6 +6,6 @@ export declare class MidwayMiddlewareService<T, R, N = unknown> {
         (context: any, next?: any): Promise<any>;
         _name: string;
     }>;
+    getMiddlewareName(mw: any): any;
 }
-export declare function pathMatching(options: any): (ctx?: any) => any;
 //# sourceMappingURL=middlewareService.d.ts.map

package/dist/service/middlewareService.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pathMatching = exports.MidwayMiddlewareService = void 0;
+exports.MidwayMiddlewareService = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const error_1 = require("../error");
 const util_1 = require("../util");
@@ -32,14 +32,16 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                 if (classMiddleware) {
                     fn = classMiddleware.resolve();
                     if (!classMiddleware.match && !classMiddleware.ignore) {
-                        fn._name = classMiddleware.constructor.name;
+                        if (!fn.name) {
+                            fn._name = classMiddleware.constructor.name;
+                        }
                         // just got fn
                         newMiddlewareArr.push(fn);
                     }
                     else {
                         // wrap ignore and match
                         const mw = fn;
-                        const match = pathMatching({
+                        const match = (0, util_1.pathMatching)({
                             match: classMiddleware.match,
                             ignore: classMiddleware.ignore,
                         });
@@ -67,6 +69,7 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
          * @api public
          */
         const composeFn = (context, next) => {
+            const supportBody = (0, util_1.isIncludeProperty)(context, 'body');
             // last called middleware #
             let index = -1;
             return dispatch(0);
@@ -80,9 +83,25 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                 if (!fn)
                     return Promise.resolve();
                 try {
-                    return Promise.resolve(fn(context, dispatch.bind(null, i + 1), {
-                        index,
-                    }));
+                    if (supportBody) {
+                        return Promise.resolve(fn(context, dispatch.bind(null, i + 1), {
+                            index,
+                        })).then(result => {
+                            // need to set body
+                            if (context.body && !result) {
+                                result = context.body;
+                            }
+                            else if (result && context.body !== result) {
+                                context.body = result;
+                            }
+                            return result;
+                        });
+                    }
+                    else {
+                        return Promise.resolve(fn(context, dispatch.bind(null, i + 1), {
+                            index,
+                        }));
+                    }
                 }
                 catch (err) {
                     return Promise.reject(err);
@@ -94,6 +113,10 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
         }
         return composeFn;
     }
+    getMiddlewareName(mw) {
+        var _a;
+        return (_a = mw.name) !== null && _a !== void 0 ? _a : mw._name;
+    }
 };
 MidwayMiddlewareService = __decorate([
     (0, decorator_1.Provide)(),
@@ -101,19 +124,4 @@ MidwayMiddlewareService = __decorate([
     __metadata("design:paramtypes", [Object])
 ], MidwayMiddlewareService);
 exports.MidwayMiddlewareService = MidwayMiddlewareService;
-function pathMatching(options) {
-    options = options || {};
-    if (options.match && options.ignore)
-        throw new error_1.MidwayCommonError('options.match and options.ignore can not both present');
-    if (!options.match && !options.ignore)
-        return () => true;
-    const matchFn = options.match
-        ? (0, util_1.toPathMatch)(options.match)
-        : (0, util_1.toPathMatch)(options.ignore);
-    return function pathMatch(ctx) {
-        const matched = matchFn(ctx);
-        return options.match ? matched : !matched;
-    };
-}
-exports.pathMatching = pathMatching;
 //# sourceMappingURL=middlewareService.js.map

package/dist/setup.js

@@ -75,7 +75,12 @@ async function initializeGlobalApplicationContext(globalOptions) {
     // bind user code module
     await applicationContext.ready();
     if (globalOptions.globalConfig) {
-        configService.add([globalOptions.globalConfig]);
+        if (Array.isArray(globalOptions.globalConfig)) {
+            configService.add(globalOptions.globalConfig);
+        }
+        else {
+            configService.addObject(globalOptions.globalConfig);
+        }
     }
     // merge config
     await configService.load();

package/dist/util/index.d.ts

@@ -1,3 +1,4 @@
+import { FunctionMiddleware } from '../interface';
 /**
  * @since 2.0.0
  * @param env
@@ -73,4 +74,12 @@ 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;
+/**
+ * wrap function middleware with match and ignore
+ * @param mw
+ * @param options
+ */
+export declare function wrapMiddleware(mw: FunctionMiddleware<any, any>, options: any): (context: any, next: any, options?: any) => any;
+export declare function isIncludeProperty(obj: any, prop: string): boolean;
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
+exports.isIncludeProperty = exports.wrapMiddleware = exports.pathMatching = exports.toPathMatch = exports.transformRequestObjectByType = exports.deprecatedOutput = exports.getCurrentDateString = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
-const class_transformer_1 = require("class-transformer");
+const transformer = require("class-transformer");
 const pathToRegexp_1 = require("./pathToRegexp");
 const error_1 = require("../error");
 const debug = (0, util_1.debuglog)('midway:container:util');
@@ -205,7 +205,8 @@ const transformRequestObjectByType = (originValue, targetType) => {
                 return originValue;
             }
             else {
-                return (0, class_transformer_1.plainToClass)(targetType, originValue);
+                const transformToInstance = transformer['plainToClass'] || transformer['plainToInstance'];
+                return transformToInstance(targetType, originValue);
             }
     }
 };
@@ -236,4 +237,58 @@ function toPathMatch(pattern) {
     throw new error_1.MidwayCommonError('match/ignore pattern must be RegExp, Array or String, but got ' + pattern);
 }
 exports.toPathMatch = toPathMatch;
+function pathMatching(options) {
+    options = options || {};
+    if (options.match && options.ignore)
+        throw new error_1.MidwayCommonError('options.match and options.ignore can not both present');
+    if (!options.match && !options.ignore)
+        return () => true;
+    const matchFn = options.match
+        ? toPathMatch(options.match)
+        : toPathMatch(options.ignore);
+    return function pathMatch(ctx) {
+        const matched = matchFn(ctx);
+        return options.match ? matched : !matched;
+    };
+}
+exports.pathMatching = pathMatching;
+/**
+ * wrap function middleware with match and ignore
+ * @param mw
+ * @param options
+ */
+function wrapMiddleware(mw, options) {
+    // support options.enable
+    if (options.enable === false)
+        return null;
+    // support options.match and options.ignore
+    if (!options.match && !options.ignore)
+        return mw;
+    const match = pathMatching(options);
+    const fn = (ctx, next) => {
+        if (!match(ctx))
+            return next();
+        return mw(ctx, next);
+    };
+    fn._name = mw._name + 'middlewareWrapper';
+    return fn;
+}
+exports.wrapMiddleware = wrapMiddleware;
+function isOwnPropertyWritable(obj, prop) {
+    if (obj == null)
+        return false;
+    const type = typeof obj;
+    if (type !== 'object' && type !== 'function')
+        return false;
+    return !!Object.getOwnPropertyDescriptor(obj, prop);
+}
+function isIncludeProperty(obj, prop) {
+    while (obj) {
+        if (isOwnPropertyWritable(obj, prop))
+            return true;
+        obj = Object.getPrototypeOf(obj);
+    }
+    return false;
+}
+exports.isIncludeProperty = isIncludeProperty;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.9",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.5",
+    "@midwayjs/decorator": "^3.0.0-beta.9",
+    "koa": "^2.13.4",
     "midway-test-component": "*",
     "mm": "3",
     "sinon": "^7.2.2"
@@ -31,8 +32,8 @@
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
-    "@midwayjs/logger": "^3.0.0-beta.5",
-    "class-transformer": "^0.4.0",
+    "@midwayjs/logger": "^3.0.0-beta.9",
+    "class-transformer": "^0.5.1",
     "extend2": "^1.0.0",
     "picomatch": "^2.2.2",
     "reflect-metadata": "^0.1.13"
@@ -45,5 +46,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "ab0bf05ae6d13f6435db2f7223202be61d585a1b"
+  "gitHead": "d23e4a4fee58097b98461625c428a37d55535cec"
 }