@midwayjs/core 3.0.0-beta.16 → 3.0.0-beta.17

package/dist/common/applicationManager.d.ts

@@ -6,7 +6,6 @@ export declare class MidwayApplicationManager {
     addFramework(namespace: any, framework: IMidwayFramework<any, any, any>): void;
     getFramework(namespaceOrFrameworkType: string | FrameworkType): IMidwayFramework<any, any, any, unknown, unknown>;
     getApplication(namespaceOrFrameworkType: string | FrameworkType): IMidwayApplication;
-    getApplications(namespaces: Array<string | FrameworkType>): IMidwayApplication[];
-    getWebLikeApplication(): IMidwayApplication[];
+    getApplications(namespaces?: Array<string | FrameworkType>): IMidwayApplication[];
 }
 //# sourceMappingURL=applicationManager.d.ts.map

package/dist/common/applicationManager.js

@@ -46,16 +46,20 @@ let MidwayApplicationManager = class MidwayApplicationManager {
         }
     }
     getApplications(namespaces) {
-        return namespaces
-            .map(namespace => {
-            return this.getApplication(namespace);
-        })
-            .filter(app => {
-            return !!app;
-        });
-    }
-    getWebLikeApplication() {
-        return this.getApplications(['express', 'koa', 'egg', 'faas']);
+        if (!namespaces) {
+            return Array.from(this.globalFrameworkMap.values()).map(framework => {
+                return framework.getApplication();
+            });
+        }
+        else {
+            return namespaces
+                .map(namespace => {
+                return this.getApplication(namespace);
+            })
+                .filter(app => {
+                return !!app;
+            });
+        }
     }
 };
 MidwayApplicationManager = __decorate([

package/dist/common/fileDetector.js

@@ -47,7 +47,7 @@ class DirectoryFileDetector extends AbstractFileDetector {
                                 continue;
                             }
                         }
-                        else if (decorator_1.TYPES.isRegExp(resolveFilter.pattern)) {
+                        else if (decorator_1.Types.isRegExp(resolveFilter.pattern)) {
                             if (resolveFilter.pattern.test(file)) {
                                 const exports = resolveFilter.ignoreRequire
                                     ? undefined

package/dist/common/webRouterCollector.js

@@ -232,7 +232,7 @@ class WebRouterCollector {
         return urlMatchList
             .map(item => {
             const urlString = item.url.toString();
-            const weightArr = decorator_1.TYPES.isRegExp(item.url)
+            const weightArr = decorator_1.Types.isRegExp(item.url)
                 ? urlString.split('\\/')
                 : urlString.split('/');
             let weight = 0;

package/dist/context/container.js

@@ -144,16 +144,16 @@ class ContainerConfiguration {
     }
     getConfigurationExport(exports) {
         const mods = [];
-        if (decorator_1.TYPES.isClass(exports) ||
-            decorator_1.TYPES.isFunction(exports) ||
+        if (decorator_1.Types.isClass(exports) ||
+            decorator_1.Types.isFunction(exports) ||
             exports instanceof configuration_1.FunctionalConfiguration) {
             mods.push(exports);
         }
         else {
             for (const m in exports) {
                 const module = exports[m];
-                if (decorator_1.TYPES.isClass(module) ||
-                    decorator_1.TYPES.isFunction(module) ||
+                if (decorator_1.Types.isClass(module) ||
+                    decorator_1.Types.isFunction(module) ||
                     module instanceof configuration_1.FunctionalConfiguration) {
                     mods.push(module);
                 }
@@ -240,13 +240,13 @@ class MidwayContainer {
         (_a = this.fileDetector) === null || _a === void 0 ? void 0 : _a.run(this);
     }
     bindClass(exports, options) {
-        if (decorator_1.TYPES.isClass(exports) || decorator_1.TYPES.isFunction(exports)) {
+        if (decorator_1.Types.isClass(exports) || decorator_1.Types.isFunction(exports)) {
             this.bindModule(exports, options);
         }
         else {
             for (const m in exports) {
                 const module = exports[m];
-                if (decorator_1.TYPES.isClass(module) || decorator_1.TYPES.isFunction(module)) {
+                if (decorator_1.Types.isClass(module) || decorator_1.Types.isFunction(module)) {
                     this.bindModule(module, options);
                 }
             }
@@ -254,7 +254,7 @@ class MidwayContainer {
     }
     bind(identifier, target, options) {
         var _a;
-        if (decorator_1.TYPES.isClass(identifier) || decorator_1.TYPES.isFunction(identifier)) {
+        if (decorator_1.Types.isClass(identifier) || decorator_1.Types.isFunction(identifier)) {
             return this.bindModule(identifier, target);
         }
         if (this.registry.hasDefinition(identifier)) {
@@ -262,13 +262,13 @@ class MidwayContainer {
             return;
         }
         let definition;
-        if (decorator_1.TYPES.isClass(target)) {
+        if (decorator_1.Types.isClass(target)) {
             definition = new objectDefinition_1.ObjectDefinition();
             definition.name = (0, decorator_1.getProviderName)(target);
         }
         else {
             definition = new functionDefinition_1.FunctionDefinition();
-            if (!decorator_1.TYPES.isAsyncFunction(target)) {
+            if (!decorator_1.Types.isAsyncFunction(target)) {
                 definition.asynchronous = false;
             }
             definition.name = definition.id;
@@ -315,6 +315,10 @@ class MidwayContainer {
             debugBind(`  register scope = ${objDefOptions.scope}`);
             definition.scope = objDefOptions.scope;
         }
+        if (objDefOptions.allowDowngrade) {
+            debugBind(`  register allowDowngrade = ${objDefOptions.allowDowngrade}`);
+            definition.allowDowngrade = objDefOptions.allowDowngrade;
+        }
         this.objectCreateEventTarget.emit(interface_1.ObjectLifeCycleEvent.BEFORE_BIND, target, {
             context: this,
             definition,
@@ -327,7 +331,7 @@ class MidwayContainer {
         }
     }
     bindModule(module, options) {
-        if (decorator_1.TYPES.isClass(module)) {
+        if (decorator_1.Types.isClass(module)) {
             const providerId = (0, decorator_1.getProviderUUId)(module);
             if (providerId) {
                 this.identifierMapping.saveClassRelation(module, options === null || options === void 0 ? void 0 : options.namespace);
@@ -343,7 +347,7 @@ class MidwayContainer {
                 if (!info.scope) {
                     info.scope = decorator_1.ScopeEnum.Request;
                 }
-                const uuid = (0, decorator_1.generateRandomId)();
+                const uuid = decorator_1.Utils.generateRandomId();
                 this.identifierMapping.saveFunctionRelation(info.id, uuid);
                 this.bind(uuid, module, {
                     scope: info.scope,

package/dist/context/managedResolverFactory.js

@@ -202,6 +202,13 @@ class ManagedResolverFactory {
         if (definition.properties) {
             const keys = definition.properties.propertyKeys();
             for (const key of keys) {
+                if (definition.isSingletonScope() && this.context.hasDefinition(key)) {
+                    const propertyDefinition = this.context.registry.getDefinition(key);
+                    if (propertyDefinition.isRequestScope() &&
+                        !propertyDefinition.allowDowngrade) {
+                        throw new error_1.MidwaySingletonInjectRequestError(definition.path.name, propertyDefinition.path.name);
+                    }
+                }
                 try {
                     inst[key] = await this.resolveManagedAsync(definition.properties.get(key), key);
                 }

package/dist/definitions/functionDefinition.d.ts

@@ -18,6 +18,7 @@ export declare class FunctionDefinition implements IObjectDefinition {
     asynchronous: boolean;
     handlerProps: any[];
     createFrom: any;
+    allowDowngrade: boolean;
     protected innerAutowire: boolean;
     protected innerScope: ScopeEnum;
     getAttr(key: ObjectIdentifier): any;

package/dist/definitions/functionDefinition.js

@@ -23,6 +23,7 @@ class FunctionDefinition {
         this.namespace = '';
         this.asynchronous = true;
         this.handlerProps = [];
+        this.allowDowngrade = false;
         // 函数工厂创建的对象默认不需要自动装配
         this.innerAutowire = false;
         this.innerScope = decorator_1.ScopeEnum.Singleton;

package/dist/definitions/objectCreator.js

@@ -65,7 +65,7 @@ class ObjectCreator {
         let inst;
         if (this.definition.constructMethod) {
             const fn = Clzz[this.definition.constructMethod];
-            if (decorator_1.TYPES.isAsyncFunction(fn)) {
+            if (decorator_1.Types.isAsyncFunction(fn)) {
                 inst = await fn.apply(Clzz, args);
             }
             else {
@@ -86,13 +86,13 @@ class ObjectCreator {
         const inst = obj;
         // after properties set then do init
         if (this.definition.initMethod && inst[this.definition.initMethod]) {
-            if (decorator_1.TYPES.isGeneratorFunction(inst[this.definition.initMethod]) ||
-                decorator_1.TYPES.isAsyncFunction(inst[this.definition.initMethod])) {
+            if (decorator_1.Types.isGeneratorFunction(inst[this.definition.initMethod]) ||
+                decorator_1.Types.isAsyncFunction(inst[this.definition.initMethod])) {
                 throw new error_1.MidwayUseWrongMethodError('context.get', 'context.getAsync', this.definition.id);
             }
             else {
                 const rt = inst[this.definition.initMethod].call(inst);
-                if (decorator_1.TYPES.isPromise(rt)) {
+                if (decorator_1.Types.isPromise(rt)) {
                     throw new error_1.MidwayUseWrongMethodError('context.get', 'context.getAsync', this.definition.id);
                 }
             }
@@ -107,7 +107,7 @@ class ObjectCreator {
         const inst = obj;
         if (this.definition.initMethod && inst[this.definition.initMethod]) {
             const initFn = inst[this.definition.initMethod];
-            if (decorator_1.TYPES.isAsyncFunction(initFn)) {
+            if (decorator_1.Types.isAsyncFunction(initFn)) {
                 await initFn.call(inst);
             }
             else {
@@ -140,7 +140,7 @@ class ObjectCreator {
     async doDestroyAsync(obj) {
         if (this.definition.destroyMethod && obj[this.definition.destroyMethod]) {
             const fn = obj[this.definition.destroyMethod];
-            if (decorator_1.TYPES.isAsyncFunction(fn)) {
+            if (decorator_1.Types.isAsyncFunction(fn)) {
                 await fn.call(obj);
             }
             else {

package/dist/definitions/objectDefinition.d.ts

@@ -20,6 +20,7 @@ export declare class ObjectDefinition implements IObjectDefinition {
     namespace: string;
     handlerProps: any[];
     createFrom: any;
+    allowDowngrade: boolean;
     constructor();
     set asynchronous(asynchronous: boolean);
     isAsync(): boolean;

package/dist/definitions/objectDefinition.js

@@ -23,6 +23,7 @@ class ObjectDefinition {
         this.properties = new properties_1.ObjectProperties();
         this.namespace = '';
         this.handlerProps = [];
+        this.allowDowngrade = false;
         this.creator = new objectCreator_1.ObjectCreator(this);
     }
     set asynchronous(asynchronous) {

package/dist/error/framework.d.ts

@@ -11,6 +11,7 @@ export declare const FrameworkErrorEnum: {
     readonly MISSING_RESOLVER: "MIDWAY_10007";
     readonly DUPLICATE_ROUTER: "MIDWAY_10008";
     readonly USE_WRONG_METHOD: "MIDWAY_10009";
+    readonly SINGLETON_INJECT_REQUEST: "MIDWAY_10010";
 };
 export declare class MidwayCommonError extends MidwayError {
     constructor(message: string);
@@ -42,4 +43,7 @@ export declare class MidwayDuplicateRouteError extends MidwayError {
 export declare class MidwayUseWrongMethodError extends MidwayError {
     constructor(wrongMethod: string, replacedMethod: string, describeKey?: string);
 }
+export declare class MidwaySingletonInjectRequestError extends MidwayError {
+    constructor(singletonScopeName: string, requestScopeName: string);
+}
 //# sourceMappingURL=framework.d.ts.map

package/dist/error/framework.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayUseWrongMethodError = exports.MidwayDuplicateRouteError = exports.MidwayResolverMissingError = exports.MidwayConfigMissingError = exports.MidwayFeatureNotImplementedError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = exports.FrameworkErrorEnum = void 0;
+exports.MidwaySingletonInjectRequestError = exports.MidwayUseWrongMethodError = exports.MidwayDuplicateRouteError = exports.MidwayResolverMissingError = exports.MidwayConfigMissingError = exports.MidwayFeatureNotImplementedError = exports.MidwayFeatureNoLongerSupportedError = exports.MidwayDefinitionNotFoundError = exports.MidwayParameterError = exports.MidwayCommonError = exports.FrameworkErrorEnum = void 0;
 const base_1 = require("./base");
 exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
     UNKNOWN: 10000,
@@ -13,6 +13,7 @@ exports.FrameworkErrorEnum = (0, base_1.registerErrorCode)('midway', {
     MISSING_RESOLVER: 10007,
     DUPLICATE_ROUTER: 10008,
     USE_WRONG_METHOD: 10009,
+    SINGLETON_INJECT_REQUEST: 10010,
 });
 class MidwayCommonError extends base_1.MidwayError {
     constructor(message) {
@@ -84,4 +85,11 @@ class MidwayUseWrongMethodError extends base_1.MidwayError {
     }
 }
 exports.MidwayUseWrongMethodError = MidwayUseWrongMethodError;
+class MidwaySingletonInjectRequestError extends base_1.MidwayError {
+    constructor(singletonScopeName, requestScopeName) {
+        const text = `${singletonScopeName} with singleton scope can't implicitly inject ${requestScopeName} with request scope directly, please add @Scope(ScopeEnum.Request, { allowDowngrade: true }) in ${requestScopeName}.`;
+        super(text, exports.FrameworkErrorEnum.SINGLETON_INJECT_REQUEST);
+    }
+}
+exports.MidwaySingletonInjectRequestError = MidwaySingletonInjectRequestError;
 //# sourceMappingURL=framework.js.map

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export { BaseFramework } from './baseFramework';
 export * from './context/providerWrapper';
 export * from './common/constants';
 export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, deprecatedOutput, transformRequestObjectByType, pathMatching, wrapMiddleware, } from './util/';
+export { extend } from './util/extend';
 export * from './util/pathFileUtil';
 export * from './util/webRouterParam';
 export * from './common/webRouterCollector';

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.wrapMiddleware = exports.pathMatching = 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.extend = 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");
@@ -29,6 +29,8 @@ Object.defineProperty(exports, "deprecatedOutput", { enumerable: true, get: func
 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; } });
+var extend_1 = require("./util/extend");
+Object.defineProperty(exports, "extend", { enumerable: true, get: function () { return extend_1.extend; } });
 __exportStar(require("./util/pathFileUtil"), exports);
 __exportStar(require("./util/webRouterParam"), exports);
 __exportStar(require("./common/webRouterCollector"), exports);

package/dist/interface.d.ts

@@ -56,34 +56,33 @@ export declare enum ObjectLifeCycleEvent {
     AFTER_INIT = "afterObjectInit",
     BEFORE_DESTROY = "beforeObjectDestroy"
 }
+interface ObjectLifeCycleOptions {
+    context: IMidwayContainer;
+    definition: IObjectDefinition;
+}
+export interface ObjectBeforeBindOptions extends ObjectLifeCycleOptions {
+    replaceCallback: (newDefinition: IObjectDefinition) => void;
+}
+export interface ObjectBeforeCreatedOptions extends ObjectLifeCycleOptions {
+    constructorArgs: any[];
+}
+export interface ObjectCreatedOptions<T> extends ObjectLifeCycleOptions {
+    replaceCallback: (ins: T) => void;
+}
+export interface ObjectInitOptions extends ObjectLifeCycleOptions {
+}
+export interface ObjectBeforeDestroyOptions extends ObjectLifeCycleOptions {
+}
 /**
  * Object Lifecycle
  * 对象生命周期
  */
 export interface IObjectLifeCycle {
-    onBeforeBind(fn: (Clzz: any, options: {
-        context: IMidwayContainer;
-        definition: IObjectDefinition;
-        replaceCallback: (newDefinition: IObjectDefinition) => void;
-    }) => void): any;
-    onBeforeObjectCreated(fn: (Clzz: any, options: {
-        context: IMidwayContainer;
-        definition: IObjectDefinition;
-        constructorArgs: any[];
-    }) => void): any;
-    onObjectCreated<T>(fn: (ins: T, options: {
-        context: IMidwayContainer;
-        definition: IObjectDefinition;
-        replaceCallback: (ins: T) => void;
-    }) => void): any;
-    onObjectInit<T>(fn: (ins: T, options: {
-        context: IMidwayContainer;
-        definition: IObjectDefinition;
-    }) => void): any;
-    onBeforeObjectDestroy<T>(fn: (ins: T, options: {
-        context: IMidwayContainer;
-        definition: IObjectDefinition;
-    }) => void): any;
+    onBeforeBind(fn: (Clzz: any, options: ObjectBeforeBindOptions) => void): any;
+    onBeforeObjectCreated(fn: (Clzz: any, options: ObjectBeforeCreatedOptions) => void): any;
+    onObjectCreated<T>(fn: (ins: T, options: ObjectCreatedOptions<T>) => void): any;
+    onObjectInit<T>(fn: (ins: T, options: ObjectInitOptions) => void): any;
+    onBeforeObjectDestroy<T>(fn: (ins: T, options: ObjectBeforeDestroyOptions) => void): any;
 }
 /**
  * Object Definition
@@ -127,6 +126,7 @@ export interface IObjectDefinition {
         metadata: any;
     }>;
     createFrom: 'framework' | 'file' | 'module';
+    allowDowngrade: boolean;
 }
 export interface IObjectCreator {
     load(): any;
@@ -295,7 +295,7 @@ export declare type NextFunction = () => Promise<any>;
  * Common middleware definition
  */
 export interface IMiddleware<CTX, R, N = unknown> {
-    resolve: (app?: IMidwayApplication) => FunctionMiddleware<CTX, R, N>;
+    resolve: (app?: IMidwayApplication) => FunctionMiddleware<CTX, R, N> | Promise<FunctionMiddleware<CTX, R, N>>;
     match?: (ctx?: CTX) => boolean;
     ignore?: (ctx?: CTX) => boolean;
 }
@@ -412,7 +412,11 @@ export interface IMidwayBootstrapOptions {
     appDir?: string;
     applicationContext?: IMidwayContainer;
     preloadModules?: any[];
+    /**
+     * @deprecated please use 'imports'
+     */
     configurationModule?: any | any[];
+    imports?: any | any[];
     moduleDetector?: 'file' | IFileDetector | false;
     logger?: boolean | ILogger;
     ignore?: string[];

package/dist/service/aspectService.js

@@ -64,7 +64,7 @@ let MidwayAspectService = class MidwayAspectService {
      */
     interceptPrototypeMethod(Clz, methodName, aspectObject) {
         const originMethod = Clz.prototype[methodName];
-        if (decorator_1.TYPES.isAsyncFunction(Clz.prototype[methodName])) {
+        if (decorator_1.Types.isAsyncFunction(Clz.prototype[methodName])) {
             Clz.prototype[methodName] = async function (...args) {
                 var _a, _b, _c;
                 let error, result;

package/dist/service/configService.js

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayConfigService = void 0;
-const extend = require("extend2");
 const path_1 = require("path");
 const util_1 = require("../util");
 const fs_1 = require("fs");
@@ -18,6 +17,7 @@ const decorator_1 = require("@midwayjs/decorator");
 const util = require("util");
 const environmentService_1 = require("./environmentService");
 const informationService_1 = require("./informationService");
+const extend_1 = require("../util/extend");
 const debug = util.debuglog('midway:debug');
 let MidwayConfigService = class MidwayConfigService {
     constructor() {
@@ -74,7 +74,7 @@ let MidwayConfigService = class MidwayConfigService {
     }
     addObject(obj) {
         if (this.isReady) {
-            extend(true, this.configuration, obj);
+            (0, extend_1.extend)(true, this.configuration, obj);
         }
         else {
             this.externalObject.push(obj);
@@ -107,7 +107,7 @@ let MidwayConfigService = class MidwayConfigService {
         const target = {};
         for (const filename of [...defaultSet, ...currentEnvSet]) {
             let config = await this.loadConfig(filename);
-            if (decorator_1.TYPES.isFunction(config)) {
+            if (decorator_1.Types.isFunction(config)) {
                 // eslint-disable-next-line prefer-spread
                 config = config.apply(null, [this.appInfo, target]);
             }
@@ -120,13 +120,13 @@ let MidwayConfigService = class MidwayConfigService {
             else {
                 debug('[config]: Loaded config %j', config);
             }
-            extend(true, target, config);
+            (0, extend_1.extend)(true, target, config);
         }
         if (this.externalObject.length) {
             for (const externalObject of this.externalObject) {
                 if (externalObject) {
                     debug('[config]: Loaded external object %j', externalObject);
-                    extend(true, target, externalObject);
+                    (0, extend_1.extend)(true, target, externalObject);
                 }
             }
         }

package/dist/service/middlewareService.d.ts

@@ -3,7 +3,7 @@ export declare class MidwayMiddlewareService<T, R, N = unknown> {
     readonly applicationContext: IMidwayContainer;
     constructor(applicationContext: IMidwayContainer);
     compose(middleware: Array<CommonMiddleware<T, R, N> | string>, app: IMidwayApplication, name?: string): Promise<{
-        (context: any, next?: any): Promise<any>;
+        (context: T, next?: any): Promise<any>;
         _name: string;
     }>;
 }

package/dist/service/middlewareService.js

@@ -23,14 +23,14 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
         }
         const newMiddlewareArr = [];
         for (let fn of middleware) {
-            if (decorator_1.TYPES.isClass(fn) || typeof fn === 'string') {
+            if (decorator_1.Types.isClass(fn) || typeof fn === 'string') {
                 if (typeof fn === 'string' &&
                     !this.applicationContext.hasDefinition(fn)) {
                     throw new error_1.MidwayCommonError('Middleware definition not found in midway container');
                 }
                 const classMiddleware = await this.applicationContext.getAsync(fn);
                 if (classMiddleware) {
-                    fn = classMiddleware.resolve(app);
+                    fn = await classMiddleware.resolve(app);
                     if (!classMiddleware.match && !classMiddleware.ignore) {
                         if (!fn.name) {
                             fn._name = classMiddleware.constructor.name;
@@ -88,11 +88,11 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
                             index,
                         })).then(result => {
                             // need to set body
-                            if (context.body && !result) {
-                                result = context.body;
+                            if (context['body'] && !result) {
+                                result = context['body'];
                             }
-                            else if (result && context.body !== result) {
-                                context.body = result;
+                            else if (result && context['body'] !== result) {
+                                context['body'] = result;
                             }
                             return result;
                         });

package/dist/setup.js

@@ -64,12 +64,14 @@ async function initializeGlobalApplicationContext(globalOptions) {
     await applicationContext.getAsync(_1.MidwayDecoratorService, [
         applicationContext,
     ]);
-    if (!globalOptions.configurationModule) {
-        globalOptions.configurationModule = [
+    if (!globalOptions.imports) {
+        globalOptions.imports = [
             (0, _1.safeRequire)((0, path_1.join)(globalOptions.baseDir, 'configuration')),
         ];
     }
-    for (const configurationModule of [].concat(globalOptions.configurationModule)) {
+    for (const configurationModule of []
+        .concat(globalOptions.imports)
+        .concat(globalOptions.configurationModule)) {
         // load configuration and component
         applicationContext.load(configurationModule);
     }

package/dist/util/extend.d.ts

@@ -0,0 +1,2 @@
+export declare function extend(...args: any[]): any;
+//# sourceMappingURL=extend.d.ts.map

package/dist/util/extend.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extend = void 0;
+/**
+ * fork from https://github.com/eggjs/extend2
+ */
+const decorator_1 = require("@midwayjs/decorator");
+function extend(...args) {
+    let options, name, src, copy, clone;
+    let target = args[0];
+    let i = 1;
+    const length = args.length;
+    let deep = false;
+    // Handle a deep copy situation
+    if (typeof target === 'boolean') {
+        deep = target;
+        target = args[1] || {};
+        // skip the boolean and the target
+        i = 2;
+    }
+    else if ((typeof target !== 'object' && typeof target !== 'function') ||
+        target == null) {
+        target = {};
+    }
+    for (; i < length; ++i) {
+        options = args[i];
+        // Only deal with non-null/undefined values
+        if (options == null)
+            continue;
+        // Extend the base object
+        for (name in options) {
+            if (name === '__proto__')
+                continue;
+            src = target[name];
+            copy = options[name];
+            // Prevent never-ending loop
+            if (target === copy)
+                continue;
+            // Recurse if we're merging plain objects
+            if (deep && copy && decorator_1.Types.isPlainObject(copy)) {
+                clone = src && decorator_1.Types.isPlainObject(src) ? src : {};
+                // Never move original objects, clone them
+                target[name] = extend(deep, clone, copy);
+                // Don't bring in undefined values
+            }
+            else if (typeof copy !== 'undefined') {
+                target[name] = copy;
+            }
+        }
+    }
+    // Return the modified object
+    return target;
+}
+exports.extend = extend;
+//# sourceMappingURL=extend.js.map

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.0-beta.16",
+  "version": "3.0.0-beta.17",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "link": "npm link"
   },
   "keywords": [
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.16",
+    "@midwayjs/decorator": "^3.0.0-beta.17",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
@@ -34,7 +34,6 @@
     "@midwayjs/glob": "^1.0.2",
     "@midwayjs/logger": "2.14.0",
     "class-transformer": "^0.5.1",
-    "extend2": "^1.0.0",
     "picomatch": "2.3.1"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
@@ -45,5 +44,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "43a32745ac45164dfef1494cba979f9652a6692b"
+  "gitHead": "17a8b5bd3d0b0b21f24dd2f165b5df9097fc3ec4"
 }