@midwayjs/core 3.19.0 → 4.0.0-alpha.1

package/dist/service/decoratorService.js

@@ -16,6 +16,7 @@ const aspectService_1 = require("./aspectService");
 const error_1 = require("../error");
 const util = require("util");
 const types_1 = require("../util/types");
+const metadataManager_1 = require("../decorator/metadataManager");
 const debug = util.debuglog('midway:debug');
 let MidwayDecoratorService = class MidwayDecoratorService {
     constructor(applicationContext) {
@@ -28,9 +29,11 @@ let MidwayDecoratorService = class MidwayDecoratorService {
     init() {
         // add custom method decorator listener
         this.applicationContext.onBeforeBind(Clzz => {
+            debug(`[core]: Bind class ${Clzz.name} in decorator service`);
             // find custom method decorator metadata, include method decorator information array
-            const methodDecoratorMetadataList = (0, decorator_1.getClassMetadata)(decorator_1.INJECT_CUSTOM_METHOD, Clzz);
+            const methodDecoratorMetadataList = metadataManager_1.MetadataManager.getMetadata(decorator_1.CUSTOM_METHOD_INJECT_KEY, Clzz);
             if (methodDecoratorMetadataList) {
+                debug(`[core]: Find method decorator metadata in ${Clzz.name}`);
                 // loop it, save this order for decorator run
                 for (const meta of methodDecoratorMetadataList) {
                     const { propertyName, key, metadata, options } = meta;
@@ -52,8 +55,9 @@ let MidwayDecoratorService = class MidwayDecoratorService {
                 }
             }
             // find custom param decorator metadata
-            const parameterDecoratorMetadata = (0, decorator_1.getClassMetadata)(decorator_1.INJECT_CUSTOM_PARAM, Clzz);
+            const parameterDecoratorMetadata = metadataManager_1.MetadataManager.getOwnPropertiesWithMetadata(decorator_1.CUSTOM_PARAM_INJECT_KEY, Clzz);
             if (parameterDecoratorMetadata) {
+                debug(`[core]: Find parameter decorator metadata in ${Clzz.name}`);
                 // loop it, save this order for decorator run
                 for (const methodName of Object.keys(parameterDecoratorMetadata)) {
                     // add aspect implementation first
@@ -78,7 +82,7 @@ let MidwayDecoratorService = class MidwayDecoratorService {
                                             return originArgs[parameterIndex];
                                         };
                                     }
-                                    const paramTypes = (0, decorator_1.getMethodParamTypes)(Clzz, propertyName);
+                                    const paramTypes = metadataManager_1.MetadataManager.getMethodParamTypes(Clzz, propertyName);
                                     let skipPipes = false;
                                     try {
                                         newArgs[parameterIndex] = await parameterDecoratorHandler({
@@ -93,7 +97,7 @@ let MidwayDecoratorService = class MidwayDecoratorService {
                                     }
                                     catch (err) {
                                         skipPipes = true;
-                                        if ((options === null || options === void 0 ? void 0 : options.throwError) === true) {
+                                        if (options?.throwError === true) {
                                             throw err;
                                         }
                                         else {
@@ -106,7 +110,7 @@ let MidwayDecoratorService = class MidwayDecoratorService {
                                     }
                                     const pipes = [
                                         ...(this.parameterDecoratorPipes.get(key) || []),
-                                        ...((options === null || options === void 0 ? void 0 : options.pipes) || []),
+                                        ...(options?.pipes || []),
                                     ];
                                     for (const pipe of pipes) {
                                         let transform;
@@ -124,7 +128,7 @@ let MidwayDecoratorService = class MidwayDecoratorService {
                                             throw new error_1.MidwayParameterError('Pipe must be a function or implement PipeTransform interface');
                                         }
                                         newArgs[parameterIndex] = await transform(newArgs[parameterIndex], {
-                                            metaType: (0, decorator_1.transformTypeFromTSDesign)(paramTypes[parameterIndex]),
+                                            metaType: metadataManager_1.MetadataManager.transformTypeFromTSDesign(paramTypes[parameterIndex]),
                                             metadata,
                                             target: joinPoint.target,
                                             methodName: joinPoint.methodName,
@@ -182,8 +186,8 @@ let MidwayDecoratorService = class MidwayDecoratorService {
         if (prop && getterHandler) {
             if (prop.propertyName) {
                 Object.defineProperty(instance, prop.propertyName, {
-                    get: () => { var _a; return getterHandler(prop.propertyName, (_a = prop.metadata) !== null && _a !== void 0 ? _a : {}, instance); },
-                    configurable: true,
+                    get: () => getterHandler(prop.propertyName, prop.metadata ?? {}, instance),
+                    configurable: true, // 继承对象有可能会有相同属性，这里需要配置成 true
                     enumerable: true,
                 });
             }
@@ -195,6 +199,7 @@ let MidwayDecoratorService = class MidwayDecoratorService {
         }
     }
 };
+exports.MidwayDecoratorService = MidwayDecoratorService;
 __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", aspectService_1.MidwayAspectService)
@@ -205,10 +210,9 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], MidwayDecoratorService.prototype, "init", null);
-MidwayDecoratorService = __decorate([
+exports.MidwayDecoratorService = MidwayDecoratorService = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(interface_1.ScopeEnum.Singleton),
     __metadata("design:paramtypes", [Object])
 ], MidwayDecoratorService);
-exports.MidwayDecoratorService = MidwayDecoratorService;
 //# sourceMappingURL=decoratorService.js.map

package/dist/service/environmentService.js

@@ -36,9 +36,9 @@ let MidwayEnvironmentService = class MidwayEnvironmentService {
         return typeof process['pkg'] !== 'undefined';
     }
 };
-MidwayEnvironmentService = __decorate([
+exports.MidwayEnvironmentService = MidwayEnvironmentService;
+exports.MidwayEnvironmentService = MidwayEnvironmentService = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(interface_1.ScopeEnum.Singleton)
 ], MidwayEnvironmentService);
-exports.MidwayEnvironmentService = MidwayEnvironmentService;
 //# sourceMappingURL=environmentService.js.map

package/dist/service/frameworkService.d.ts

@@ -1,24 +1,25 @@
-import { IMidwayContainer, IMidwayFramework, MidwayFrameworkType } from '../interface';
+import { IMidwayFramework, IMidwayGlobalContainer } from '../interface';
 import { MidwayConfigService } from './configService';
 import { MidwayLoggerService } from './loggerService';
 import { MidwayDecoratorService } from './decoratorService';
 import { MidwayAspectService } from './aspectService';
 import { MidwayApplicationManager } from '../common/applicationManager';
 export declare class MidwayFrameworkService {
-    readonly applicationContext: IMidwayContainer;
+    readonly applicationContext: IMidwayGlobalContainer;
     readonly globalOptions: any;
     configService: MidwayConfigService;
     loggerService: MidwayLoggerService;
     aspectService: MidwayAspectService;
     decoratorService: MidwayDecoratorService;
     applicationManager: MidwayApplicationManager;
-    constructor(applicationContext: IMidwayContainer, globalOptions: any);
+    constructor(applicationContext: IMidwayGlobalContainer, globalOptions: any);
     private mainFramework;
     private globalFrameworkList;
     protected init(): Promise<void>;
     getMainApp(): any;
+    setMainApp(namespace: string): void;
     getMainFramework(): IMidwayFramework<any, any, any, unknown, unknown>;
-    getFramework(namespaceOrFrameworkType: string | MidwayFrameworkType): IMidwayFramework<any, any, any, unknown, unknown>;
+    getFramework(namespace: string): IMidwayFramework<any, any, any, unknown, unknown>;
     runFramework(): Promise<void>;
     stopFramework(): Promise<void>;
 }

package/dist/service/frameworkService.js

@@ -15,13 +15,11 @@ const interface_1 = require("../interface");
 const configService_1 = require("./configService");
 const loggerService_1 = require("./loggerService");
 const baseFramework_1 = require("../baseFramework");
-const pipelineService_1 = require("./pipelineService");
 const decoratorService_1 = require("./decoratorService");
 const aspectService_1 = require("./aspectService");
 const applicationManager_1 = require("../common/applicationManager");
 const util = require("util");
 const error_1 = require("../error");
-const constants_1 = require("../constants");
 const performanceManager_1 = require("../common/performanceManager");
 const debug = util.debuglog('midway:debug');
 let MidwayFrameworkService = class MidwayFrameworkService {
@@ -31,25 +29,18 @@ let MidwayFrameworkService = class MidwayFrameworkService {
         this.globalFrameworkList = [];
     }
     async init() {
-        var _a, _b;
         // register base config hook
         this.decoratorService.registerPropertyHandler(decorator_1.CONFIG_KEY, (propertyName, meta) => {
-            var _a;
-            if (meta.identifier === decorator_1.ALL) {
+            if (meta.identifier === decorator_1.ALL_VALUE_KEY) {
                 return this.configService.getConfiguration();
             }
             else {
-                return this.configService.getConfiguration((_a = meta.identifier) !== null && _a !== void 0 ? _a : propertyName);
+                return this.configService.getConfiguration(meta.identifier ?? propertyName);
             }
         });
         // register @Logger decorator handler
         this.decoratorService.registerPropertyHandler(decorator_1.LOGGER_KEY, (propertyName, meta) => {
-            var _a;
-            return this.loggerService.getLogger((_a = meta.identifier) !== null && _a !== void 0 ? _a : propertyName);
-        });
-        this.decoratorService.registerPropertyHandler(decorator_1.PIPELINE_IDENTIFIER, (key, meta, instance) => {
-            var _a, _b;
-            return new pipelineService_1.MidwayPipelineService((_b = (_a = instance[constants_1.REQUEST_OBJ_CTX_KEY]) === null || _a === void 0 ? void 0 : _a.requestContext) !== null && _b !== void 0 ? _b : this.applicationContext, meta.valves);
+            return this.loggerService.getLogger(meta.identifier ?? propertyName);
         });
         // register @App decorator handler
         this.decoratorService.registerPropertyHandler(decorator_1.APPLICATION_KEY, (propertyName, meta) => {
@@ -64,9 +55,12 @@ let MidwayFrameworkService = class MidwayFrameworkService {
                 return this.getMainApp();
             }
         });
+        // register @MainApp decorator handler
+        this.decoratorService.registerPropertyHandler(decorator_1.MAIN_APPLICATION_KEY, (propertyName, meta) => {
+            return this.getMainApp();
+        });
         this.decoratorService.registerPropertyHandler(decorator_1.PLUGIN_KEY, (propertyName, meta) => {
-            var _a;
-            return this.getMainApp()[(_a = meta.identifier) !== null && _a !== void 0 ? _a : propertyName];
+            return this.getMainApp()[meta.identifier ?? propertyName];
         });
         this.decoratorService.registerPropertyHandler(decorator_1.FACTORY_SERVICE_CLIENT_KEY, (propertyName, meta) => {
             const factory = this.applicationContext.get(meta.serviceFactoryClz);
@@ -83,13 +77,13 @@ let MidwayFrameworkService = class MidwayFrameworkService {
                 }
             }
         });
-        let frameworks = (0, decorator_1.listModule)(decorator_1.FRAMEWORK_KEY);
+        let frameworks = decorator_1.DecoratorManager.listModule(decorator_1.FRAMEWORK_KEY);
         // filter proto
         frameworks = filterProtoFramework(frameworks);
         debug(`[core]: Found Framework length = ${frameworks.length}`);
         if (frameworks.length) {
             for (const frameworkClz of frameworks) {
-                if (!this.applicationContext.hasDefinition((0, decorator_1.getProviderUUId)(frameworkClz))) {
+                if (!this.applicationContext.hasDefinition(decorator_1.DecoratorManager.getProviderUUId(frameworkClz))) {
                     debug(`[core]: Found Framework "${frameworkClz.name}" but missing definition, skip initialize.`);
                     continue;
                 }
@@ -110,11 +104,16 @@ let MidwayFrameworkService = class MidwayFrameworkService {
                     debug(`[core]: Found Framework "${frameworkInstance.getFrameworkName()}" and delay initialize.`);
                 }
                 // app init
-                const definition = this.applicationContext.registry.getDefinition((0, decorator_1.getProviderUUId)(frameworkClz));
+                const definition = this.applicationContext.registry.getDefinition(decorator_1.DecoratorManager.getProviderUUId(frameworkClz));
                 // set framework namespace here
-                frameworkInstance.setNamespace(definition === null || definition === void 0 ? void 0 : definition.namespace);
+                frameworkInstance.setNamespace(definition?.namespace);
                 // link framework to application manager
-                this.applicationManager.addFramework((_a = definition === null || definition === void 0 ? void 0 : definition.namespace) !== null && _a !== void 0 ? _a : frameworkInstance.getFrameworkName(), frameworkInstance);
+                this.applicationManager.addFramework(frameworkInstance.getFrameworkName() ?? definition?.namespace, frameworkInstance);
+                // Namespace associates unique framework
+                if (definition?.namespace &&
+                    !this.applicationManager.hasFramework(definition.namespace)) {
+                    this.applicationManager.addFramework(definition.namespace, frameworkInstance);
+                }
                 this.globalFrameworkList.push(frameworkInstance);
             }
             let mainNs;
@@ -126,28 +125,31 @@ let MidwayFrameworkService = class MidwayFrameworkService {
              */
             const namespaceList = this.applicationContext.getNamespaceList();
             for (const namespace of namespaceList) {
-                const framework = this.applicationManager.getApplication(namespace);
-                if (framework) {
+                const frameworkApp = this.applicationManager.getApplication(namespace);
+                if (frameworkApp) {
                     mainNs = namespace;
                     break;
                 }
             }
             global['MIDWAY_MAIN_FRAMEWORK'] = this.mainFramework =
-                (_b = this.applicationManager.getFramework(mainNs)) !== null && _b !== void 0 ? _b : this.globalFrameworkList[0];
+                this.applicationManager.getFramework(mainNs) ??
+                    this.globalFrameworkList[0];
             debug(`[core]: Current main Framework is "${mainNs}".`);
         }
         // init aspect module
         await this.aspectService.loadAspect();
     }
     getMainApp() {
-        var _a;
-        return (_a = this.mainFramework) === null || _a === void 0 ? void 0 : _a.getApplication();
+        return this.mainFramework?.getApplication();
+    }
+    setMainApp(namespace) {
+        this.mainFramework = this.applicationManager.getFramework(namespace);
     }
     getMainFramework() {
         return this.mainFramework;
     }
-    getFramework(namespaceOrFrameworkType) {
-        return this.applicationManager.getFramework(namespaceOrFrameworkType);
+    getFramework(namespace) {
+        return this.applicationManager.getFramework(namespace);
     }
     async runFramework() {
         const namespaceList = this.applicationContext.getNamespaceList();
@@ -173,6 +175,7 @@ let MidwayFrameworkService = class MidwayFrameworkService {
         }));
     }
 };
+exports.MidwayFrameworkService = MidwayFrameworkService;
 __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", configService_1.MidwayConfigService)
@@ -199,12 +202,11 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], MidwayFrameworkService.prototype, "init", null);
-MidwayFrameworkService = __decorate([
+exports.MidwayFrameworkService = MidwayFrameworkService = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(interface_1.ScopeEnum.Singleton),
     __metadata("design:paramtypes", [Object, Object])
 ], MidwayFrameworkService);
-exports.MidwayFrameworkService = MidwayFrameworkService;
 function filterProtoFramework(frameworks) {
     const frameworkProtoArr = [];
     // 这里把继承的框架父类都找出来，然后排除掉，只取第一层

package/dist/service/healthService.js

@@ -70,8 +70,8 @@ let MidwayHealthService = class MidwayHealthService {
         const failedResult = checkResult.find(item => !item.status);
         return {
             status: !failedResult,
-            namespace: failedResult === null || failedResult === void 0 ? void 0 : failedResult.namespace,
-            reason: failedResult === null || failedResult === void 0 ? void 0 : failedResult.reason,
+            namespace: failedResult?.namespace,
+            reason: failedResult?.reason,
             results: checkResult,
         };
     }
@@ -79,6 +79,7 @@ let MidwayHealthService = class MidwayHealthService {
         this.healthCheckTimeout = timeout;
     }
 };
+exports.MidwayHealthService = MidwayHealthService;
 __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", configService_1.MidwayConfigService)
@@ -87,9 +88,8 @@ __decorate([
     (0, decorator_1.ApplicationContext)(),
     __metadata("design:type", Object)
 ], MidwayHealthService.prototype, "applicationContext", void 0);
-MidwayHealthService = __decorate([
+exports.MidwayHealthService = MidwayHealthService = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(interface_1.ScopeEnum.Singleton)
 ], MidwayHealthService);
-exports.MidwayHealthService = MidwayHealthService;
 //# sourceMappingURL=healthService.js.map

package/dist/service/informationService.js

@@ -49,14 +49,14 @@ let MidwayInformationService = class MidwayInformationService {
         return this.pkg;
     }
     getProjectName() {
-        var _a;
-        return ((_a = this.pkg) === null || _a === void 0 ? void 0 : _a['name']) || '';
+        return this.pkg?.['name'] || '';
     }
     getRoot() {
         const isDevelopmentEnv = (0, util_1.isDevelopmentEnvironment)((0, util_1.getCurrentEnvironment)());
         return isDevelopmentEnv ? this.getAppDir() : this.getHome();
     }
 };
+exports.MidwayInformationService = MidwayInformationService;
 __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", String)
@@ -71,9 +71,8 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], MidwayInformationService.prototype, "init", null);
-MidwayInformationService = __decorate([
+exports.MidwayInformationService = MidwayInformationService = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(interface_1.ScopeEnum.Singleton)
 ], MidwayInformationService);
-exports.MidwayInformationService = MidwayInformationService;
 //# sourceMappingURL=informationService.js.map

package/dist/service/lifeCycleService.js

@@ -12,12 +12,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayLifeCycleService = void 0;
 const interface_1 = require("../interface");
 const decorator_1 = require("../decorator");
-const configuration_1 = require("../functional/configuration");
 const frameworkService_1 = require("./frameworkService");
 const configService_1 = require("./configService");
 const util_1 = require("util");
 const mockService_1 = require("./mockService");
 const healthService_1 = require("./healthService");
+const metadataManager_1 = require("../decorator/metadataManager");
 const performanceManager_1 = require("../common/performanceManager");
 const debug = (0, util_1.debuglog)('midway:debug');
 let MidwayLifeCycleService = class MidwayLifeCycleService {
@@ -29,10 +29,10 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
         // exec simulator init
         await this.mockService.initSimulation();
         // run lifecycle
-        const cycles = (0, decorator_1.listModule)(decorator_1.CONFIGURATION_KEY);
+        const cycles = decorator_1.DecoratorManager.listModule(decorator_1.CONFIGURATION_KEY);
         debug(`[core]: Found Configuration length = ${cycles.length}`);
         for (const cycle of cycles) {
-            if (cycle.target instanceof configuration_1.FunctionalConfiguration) {
+            if (metadataManager_1.MetadataManager.hasOwnMetadata(decorator_1.CONFIGURATION_OBJECT_KEY, cycle.target)) {
                 // 函数式写法
                 cycle.instance = cycle.target;
             }
@@ -75,18 +75,7 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
     async stop() {
         await this.mockService.runSimulatorTearDown();
         // stop lifecycle
-        const cycles = (0, decorator_1.listModule)(decorator_1.CONFIGURATION_KEY) || [];
-        for (const cycle of cycles.reverse()) {
-            let inst;
-            if (cycle.target instanceof configuration_1.FunctionalConfiguration) {
-                // 函数式写法
-                inst = cycle.target;
-            }
-            else {
-                inst = await this.applicationContext.getAsync(cycle.target);
-            }
-            await this.runContainerLifeCycle(inst, 'onStop');
-        }
+        await this.runContainerLifeCycle(this.lifecycleInstanceList.reverse(), 'onStop');
         // stop framework
         await this.frameworkService.stopFramework();
     }
@@ -140,6 +129,7 @@ let MidwayLifeCycleService = class MidwayLifeCycleService {
         return this.lifecycleInstanceList;
     }
 };
+exports.MidwayLifeCycleService = MidwayLifeCycleService;
 __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", frameworkService_1.MidwayFrameworkService)
@@ -162,10 +152,9 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], MidwayLifeCycleService.prototype, "init", null);
-MidwayLifeCycleService = __decorate([
+exports.MidwayLifeCycleService = MidwayLifeCycleService = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(interface_1.ScopeEnum.Singleton),
     __metadata("design:paramtypes", [Object])
 ], MidwayLifeCycleService);
-exports.MidwayLifeCycleService = MidwayLifeCycleService;
 //# sourceMappingURL=lifeCycleService.js.map

package/dist/service/loggerService.js

@@ -25,7 +25,6 @@ let MidwayLoggerService = class MidwayLoggerService extends serviceFactory_1.Ser
         this.aliasLoggerMap = new Map();
     }
     init() {
-        var _a;
         const loggerFactory = this.configService.getConfiguration('loggerFactory');
         // load logger factory from user config first
         this.loggerFactory =
@@ -42,7 +41,7 @@ let MidwayLoggerService = class MidwayLoggerService extends serviceFactory_1.Ser
         // init logger
         this.initClients(this.configService.getConfiguration('midwayLogger'));
         // alias inject logger
-        (_a = this.applicationContext) === null || _a === void 0 ? void 0 : _a.registerObject('logger', this.getLogger('appLogger'));
+        this.applicationContext?.registerObject('logger', this.getLogger('appLogger'));
     }
     createClient(config, name) {
         if (config.aliasName) {
@@ -93,6 +92,7 @@ let MidwayLoggerService = class MidwayLoggerService extends serviceFactory_1.Ser
         return Array.from(this.clients.keys());
     }
 };
+exports.MidwayLoggerService = MidwayLoggerService;
 __decorate([
     (0, decorator_1.Inject)(),
     __metadata("design:type", configService_1.MidwayConfigService)
@@ -103,10 +103,9 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], MidwayLoggerService.prototype, "init", null);
-MidwayLoggerService = __decorate([
+exports.MidwayLoggerService = MidwayLoggerService = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(interface_1.ScopeEnum.Singleton),
     __metadata("design:paramtypes", [Object, Object])
 ], MidwayLoggerService);
-exports.MidwayLoggerService = MidwayLoggerService;
 //# sourceMappingURL=loggerService.js.map

package/dist/service/middlewareService.js

@@ -22,23 +22,22 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
         this.applicationContext = applicationContext;
     }
     async compose(middleware, app, name) {
-        var _a;
         if (!Array.isArray(middleware)) {
             throw new error_1.MidwayParameterError('Middleware stack must be an array');
         }
         const newMiddlewareArr = [];
         for (let fn of middleware) {
-            if (types_1.Types.isClass(fn) || typeof fn === 'string' || (fn === null || fn === void 0 ? void 0 : fn['middleware'])) {
-                let mw = (_a = fn === null || fn === void 0 ? void 0 : fn['middleware']) !== null && _a !== void 0 ? _a : fn;
-                const mwConfig = fn === null || fn === void 0 ? void 0 : fn['options'];
-                let mwName = fn === null || fn === void 0 ? void 0 : fn['name'];
+            if (types_1.Types.isClass(fn) || typeof fn === 'string' || fn?.['middleware']) {
+                let mw = fn?.['middleware'] ?? fn;
+                const mwConfig = fn?.['options'];
+                let mwName = fn?.['name'];
                 if (typeof mw === 'string' &&
                     !this.applicationContext.hasDefinition(mw)) {
                     throw new error_1.MidwayCommonError(`Middleware definition of "${mw}" not found in midway container`);
                 }
                 const classMiddleware = await this.applicationContext.getAsync(mw);
                 if (classMiddleware) {
-                    mwName = mwName !== null && mwName !== void 0 ? mwName : classMiddleware.constructor.name;
+                    mwName = mwName ?? classMiddleware.constructor.name;
                     mw = await classMiddleware.resolve(app, mwConfig);
                     if (!mw) {
                         // for middleware enabled
@@ -139,10 +138,10 @@ let MidwayMiddlewareService = class MidwayMiddlewareService {
         return composeFn;
     }
 };
-MidwayMiddlewareService = __decorate([
+exports.MidwayMiddlewareService = MidwayMiddlewareService;
+exports.MidwayMiddlewareService = MidwayMiddlewareService = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(interface_1.ScopeEnum.Singleton),
     __metadata("design:paramtypes", [Object])
 ], MidwayMiddlewareService);
-exports.MidwayMiddlewareService = MidwayMiddlewareService;
 //# sourceMappingURL=middlewareService.js.map

package/dist/service/mockService.js

@@ -166,7 +166,7 @@ let MidwayMockService = MidwayMockService_1 = class MidwayMockService {
         return descriptor;
     }
     async initSimulation(group = 'default') {
-        const simulationModule = (0, decorator_1.listModule)(decorator_1.MOCK_KEY);
+        const simulationModule = decorator_1.DecoratorManager.listModule(decorator_1.MOCK_KEY);
         for (const module of simulationModule) {
             const instance = await this.applicationContext.getAsync(module);
             if (await instance.enableCondition()) {
@@ -176,48 +176,43 @@ let MidwayMockService = MidwayMockService_1 = class MidwayMockService {
         }
     }
     async runSimulatorSetup() {
-        var _a;
         for (const simulator of this.simulatorList) {
-            await ((_a = simulator.setup) === null || _a === void 0 ? void 0 : _a.call(simulator));
+            await simulator.setup?.();
         }
     }
     async runSimulatorTearDown() {
-        var _a;
         // reverse loop and not change origin simulatorList
         for (let i = this.simulatorList.length - 1; i >= 0; i--) {
             const simulator = this.simulatorList[i];
-            await ((_a = simulator.tearDown) === null || _a === void 0 ? void 0 : _a.call(simulator));
+            await simulator.tearDown?.();
         }
     }
     async runSimulatorAppSetup(app) {
-        var _a;
         for (const simulator of this.simulatorList) {
-            await ((_a = simulator.appSetup) === null || _a === void 0 ? void 0 : _a.call(simulator, app));
+            await simulator.appSetup?.(app);
         }
     }
     async runSimulatorAppTearDown(app) {
-        var _a;
         // reverse loop and not change origin simulatorList
         for (let i = this.simulatorList.length - 1; i >= 0; i--) {
             const simulator = this.simulatorList[i];
-            await ((_a = simulator.appTearDown) === null || _a === void 0 ? void 0 : _a.call(simulator, app));
+            await simulator.appTearDown?.(app);
         }
     }
     async runSimulatorContextSetup(ctx, app) {
-        var _a;
         for (const simulator of this.simulatorList) {
-            await ((_a = simulator.contextSetup) === null || _a === void 0 ? void 0 : _a.call(simulator, ctx, app));
+            await simulator.contextSetup?.(ctx, app);
         }
     }
     async runSimulatorContextTearDown(ctx, app) {
-        var _a;
         // reverse loop and not change origin simulatorList
         for (let i = this.simulatorList.length - 1; i >= 0; i--) {
             const simulator = this.simulatorList[i];
-            await ((_a = simulator === null || simulator === void 0 ? void 0 : simulator.contextTearDown) === null || _a === void 0 ? void 0 : _a.call(simulator, ctx, app));
+            await simulator?.contextTearDown?.(ctx, app);
         }
     }
 };
+exports.MidwayMockService = MidwayMockService;
 /**
  * Prepare mocks before the service is initialized
  */
@@ -234,10 +229,9 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], MidwayMockService.prototype, "restoreAll", null);
-MidwayMockService = MidwayMockService_1 = __decorate([
+exports.MidwayMockService = MidwayMockService = MidwayMockService_1 = __decorate([
     (0, decorator_1.Provide)(),
     (0, decorator_1.Scope)(interface_1.ScopeEnum.Singleton),
     __metadata("design:paramtypes", [Object])
 ], MidwayMockService);
-exports.MidwayMockService = MidwayMockService;
 //# sourceMappingURL=mockService.js.map

package/dist/service/slsFunctionService.d.ts

@@ -1,4 +1,4 @@
-import { MidwayWebRouterService, RouterCollectorOptions, RouterInfo, RouterPriority } from './webRouterService';
+import { MidwayWebRouterService, RouterCollectorOptions, RouterInfo } from './webRouterService';
 import { FaaSMetadata } from '../interface';
 export declare class MidwayServerlessFunctionService extends MidwayWebRouterService {
     readonly options: RouterCollectorOptions;
@@ -9,17 +9,4 @@ export declare class MidwayServerlessFunctionService extends MidwayWebRouterServ
     getFunctionList(): Promise<RouterInfo[]>;
     addServerlessFunction(func: (...args: any[]) => Promise<any>, triggerOptions: FaaSMetadata.TriggerMetadata, functionOptions?: FaaSMetadata.ServerlessFunctionOptions): void;
 }
-/**
- * @deprecated use built-in MidwayWebRouterService first
- */
-export declare class WebRouterCollector {
-    private baseDir;
-    private options;
-    private proxy;
-    constructor(baseDir?: string, options?: RouterCollectorOptions);
-    protected init(): Promise<void>;
-    getRoutePriorityList(): Promise<RouterPriority[]>;
-    getRouterTable(): Promise<Map<string, RouterInfo[]>>;
-    getFlattenRouterTable(): Promise<RouterInfo[]>;
-}
 //# sourceMappingURL=slsFunctionService.d.ts.map