@midwayjs/web 3.19.2 → 4.0.0-alpha.1

package/app/extend/context.js

@@ -11,7 +11,6 @@ module.exports = {
   get requestContext() {
     if (!this[rc]) {
       this[rc] = new MidwayRequestContainer(this, this.app.applicationContext);
-      this[rc].ready();
     }
     return this[rc];
   },

package/dist/base.js

@@ -33,8 +33,7 @@ function getFramework() {
     }
 }
 const createAppWorkerLoader = () => {
-    var _a;
-    const AppWorkerLoader = ((_a = require(getFramework())) === null || _a === void 0 ? void 0 : _a.AppWorkerLoader) || require('egg').AppWorkerLoader;
+    const AppWorkerLoader = require(getFramework())?.AppWorkerLoader || require('egg').AppWorkerLoader;
     class EggAppWorkerLoader extends AppWorkerLoader {
         constructor() {
             super(...arguments);
@@ -166,8 +165,7 @@ const createAppWorkerLoader = () => {
 };
 exports.createAppWorkerLoader = createAppWorkerLoader;
 const createAgentWorkerLoader = () => {
-    var _a;
-    const AppWorkerLoader = ((_a = require(getFramework())) === null || _a === void 0 ? void 0 : _a.AgentWorkerLoader) ||
+    const AppWorkerLoader = require(getFramework())?.AgentWorkerLoader ||
         require('egg').AgentWorkerLoader;
     class EggAgentWorkerLoader extends AppWorkerLoader {
         getEggPaths() {
@@ -238,7 +236,7 @@ const createAgentWorkerLoader = () => {
                 await (0, utils_1.initializeAgentApplicationContext)(this.app);
                 super.load();
                 debug('[egg]: start runAgent decorator');
-                const runInAgentModules = (0, core_1.listModule)(interface_1.RUN_IN_AGENT_KEY);
+                const runInAgentModules = core_1.DecoratorManager.listModule(interface_1.RUN_IN_AGENT_KEY);
                 for (const module of runInAgentModules) {
                     await this.app.applicationContext.getAsync(module);
                 }
@@ -262,8 +260,7 @@ const createAgentWorkerLoader = () => {
 };
 exports.createAgentWorkerLoader = createAgentWorkerLoader;
 const createEggApplication = () => {
-    var _a;
-    const Application = ((_a = require(getFramework())) === null || _a === void 0 ? void 0 : _a.Application) || require('egg').Application;
+    const Application = require(getFramework())?.Application || require('egg').Application;
     class EggApplication extends Application {
         constructor(options) {
             // eslint-disable-next-line constructor-super
@@ -289,8 +286,7 @@ const createEggApplication = () => {
             return router;
         }
         dumpConfig() {
-            var _a, _b;
-            if (((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.egg) === null || _b === void 0 ? void 0 : _b.dumpConfig) !== false) {
+            if (this.config?.egg?.dumpConfig !== false) {
                 super.dumpConfig();
             }
         }
@@ -299,8 +295,7 @@ const createEggApplication = () => {
 };
 exports.createEggApplication = createEggApplication;
 const createEggAgent = () => {
-    var _a;
-    const Agent = ((_a = require(getFramework())) === null || _a === void 0 ? void 0 : _a.Agent) || require('egg').Agent;
+    const Agent = require(getFramework())?.Agent || require('egg').Agent;
     class EggAgent extends Agent {
         constructor(options) {
             // eslint-disable-next-line constructor-super
@@ -319,8 +314,7 @@ const createEggAgent = () => {
             return this[LOGGERS];
         }
         dumpConfig() {
-            var _a, _b;
-            if (((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.egg) === null || _b === void 0 ? void 0 : _b.dumpConfig) !== false) {
+            if (this.config?.egg?.dumpConfig !== false) {
                 super.dumpConfig();
             }
         }

package/dist/cluster.js

@@ -1,5 +1,4 @@
 "use strict";
-var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@midwayjs/core");
 const path_1 = require("path");
@@ -13,7 +12,7 @@ function runInAgent() {
 process.env['EGG_CLUSTER_MODE'] = 'true';
 const isAgent = runInAgent();
 debug('[egg]: run with egg-scripts in worker and init midway container in cluster mode');
-const appDir = (_b = (_a = JSON.parse(process.argv[2])) === null || _a === void 0 ? void 0 : _a.baseDir) !== null && _b !== void 0 ? _b : process.cwd();
+const appDir = JSON.parse(process.argv[2])?.baseDir ?? process.cwd();
 let baseDir;
 if ((0, core_1.isTypeScriptEnvironment)()) {
     baseDir = (0, path_1.join)(appDir, 'src');

package/dist/config/config.default.js

@@ -24,11 +24,10 @@ exports.default = appInfo => {
     exports.egg = {
         dumpConfig: true,
         contextLoggerFormat: info => {
-            var _a, _b, _c;
             const ctx = info.ctx;
             // format: '[$userId/$ip/$traceId/$use_ms $method $url]'
             const userId = ctx.userId || '-';
-            const traceId = (_c = (_a = ctx.traceId) !== null && _a !== void 0 ? _a : (_b = ctx.tracer) === null || _b === void 0 ? void 0 : _b.traceId) !== null && _c !== void 0 ? _c : '-';
+            const traceId = ctx.traceId ?? ctx.tracer?.traceId ?? '-';
             const use = Date.now() - ctx.startTime;
             const label = userId +
                 '/' +

package/dist/configuration.js

@@ -36,6 +36,7 @@ let EggConfiguration = class EggConfiguration {
         // TODO flush egg logger and close it
     }
 };
+exports.EggConfiguration = EggConfiguration;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", Object)
@@ -45,7 +46,7 @@ __decorate([
     __metadata("design:type", Object)
 ], EggConfiguration.prototype, "appDir", void 0);
 __decorate([
-    (0, core_1.App)(),
+    (0, core_1.MainApp)(),
     __metadata("design:type", Object)
 ], EggConfiguration.prototype, "app", void 0);
 __decorate([
@@ -58,11 +59,10 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], EggConfiguration.prototype, "init", null);
-EggConfiguration = __decorate([
+exports.EggConfiguration = EggConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'egg',
         importConfigs: [(0, path_1.join)(__dirname, 'config')],
     })
 ], EggConfiguration);
-exports.EggConfiguration = EggConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/decorator.js

@@ -4,12 +4,12 @@ exports.RunInEggAgent = exports.AgentApp = void 0;
 const core_1 = require("@midwayjs/core");
 const interface_1 = require("./interface");
 function AgentApp() {
-    return (0, core_1.createCustomPropertyDecorator)(interface_1.EGG_AGENT_APP_KEY, {});
+    return core_1.DecoratorManager.createCustomPropertyDecorator(interface_1.EGG_AGENT_APP_KEY, {});
 }
 exports.AgentApp = AgentApp;
 function RunInEggAgent() {
     return function (target) {
-        (0, core_1.saveModule)(interface_1.RUN_IN_AGENT_KEY, target);
+        core_1.DecoratorManager.saveModule(interface_1.RUN_IN_AGENT_KEY, target);
     };
 }
 exports.RunInEggAgent = RunInEggAgent;

package/dist/framework/lifecycle.js

@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayWebLifeCycleService = void 0;
 const core_1 = require("@midwayjs/core");
+const functional_1 = require("@midwayjs/core/functional");
 const util_1 = require("util");
 const debug = (0, util_1.debuglog)('midway:debug');
 let MidwayWebLifeCycleService = class MidwayWebLifeCycleService {
@@ -20,10 +21,10 @@ let MidwayWebLifeCycleService = class MidwayWebLifeCycleService {
     }
     async init() {
         // run lifecycle
-        const cycles = (0, core_1.listModule)(core_1.CONFIGURATION_KEY);
+        const cycles = core_1.DecoratorManager.listModule(core_1.CONFIGURATION_KEY);
         debug(`[core]: Found Configuration length = ${cycles.length}`);
         for (const cycle of cycles) {
-            if (cycle.target instanceof core_1.FunctionalConfiguration) {
+            if (cycle.target instanceof functional_1.FunctionalConfiguration) {
                 // 函数式写法
                 cycle.instance = cycle.target;
             }
@@ -66,19 +67,19 @@ let MidwayWebLifeCycleService = class MidwayWebLifeCycleService {
         if (!this.configService.getConfiguration('debug.recordConfigMergeOrder')) {
             this.configService.clearConfigMergeOrder();
         }
-        // some preload module init
-        const modules = (0, core_1.listPreloadModule)();
+        // some pre-start module init
+        const modules = core_1.DecoratorManager.listPreStartModule();
         for (const module of modules) {
-            // preload init context
+            // pre-start init context
             await this.applicationContext.getAsync(module);
         }
     }
     async stop() {
         // stop lifecycle
-        const cycles = (0, core_1.listModule)(core_1.CONFIGURATION_KEY);
+        const cycles = core_1.DecoratorManager.listModule(core_1.CONFIGURATION_KEY);
         for (const cycle of cycles) {
             let inst;
-            if (cycle.target instanceof core_1.FunctionalConfiguration) {
+            if (cycle.target instanceof functional_1.FunctionalConfiguration) {
                 // 函数式写法
                 inst = cycle.target;
             }
@@ -121,6 +122,7 @@ let MidwayWebLifeCycleService = class MidwayWebLifeCycleService {
         }
     }
 };
+exports.MidwayWebLifeCycleService = MidwayWebLifeCycleService;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayFrameworkService)
@@ -135,10 +137,9 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], MidwayWebLifeCycleService.prototype, "init", null);
-MidwayWebLifeCycleService = __decorate([
+exports.MidwayWebLifeCycleService = MidwayWebLifeCycleService = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton),
     __metadata("design:paramtypes", [Object])
 ], MidwayWebLifeCycleService);
-exports.MidwayWebLifeCycleService = MidwayWebLifeCycleService;
 //# sourceMappingURL=lifecycle.js.map

package/dist/framework/web.d.ts

@@ -1,4 +1,4 @@
-import { BaseFramework, IMidwayBootstrapOptions, MidwayFrameworkType } from '@midwayjs/core';
+import { BaseFramework, IMidwayBootstrapOptions } from '@midwayjs/core';
 import { IMidwayWebConfigurationOptions, Application, Context } from '../interface';
 import { EggLogger } from 'egg';
 export declare class MidwayWebFramework extends BaseFramework<Application, Context, IMidwayWebConfigurationOptions> {
@@ -16,7 +16,6 @@ export declare class MidwayWebFramework extends BaseFramework<Application, Conte
     applicationInitialize(options: Partial<IMidwayBootstrapOptions>): Promise<void>;
     overwriteApplication(processType: any): void;
     loadMidwayController(): Promise<void>;
-    getFrameworkType(): MidwayFrameworkType;
     run(): Promise<void>;
     getLogger(name?: string): any;
     setContextLoggerClass(): void;

package/dist/framework/web.js

@@ -154,20 +154,15 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         // move egg router to last
         this.app.getMiddleware().findAndInsertLast('eggRouterMiddleware');
         await this.generator.loadMidwayController(newRouter => {
-            var _a;
             const dispatchFn = newRouter.middleware();
-            dispatchFn._name = `midwayController(${((_a = newRouter === null || newRouter === void 0 ? void 0 : newRouter.opts) === null || _a === void 0 ? void 0 : _a.prefix) || '/'})`;
+            dispatchFn._name = `midwayController(${newRouter?.opts?.prefix || '/'})`;
             this.app.useMiddleware(dispatchFn);
         });
         // restore use method
         this.app.use = this.app.originUse;
         debug(`[egg]: current middleware = ${this.middlewareManager.getNames()}`);
     }
-    getFrameworkType() {
-        return core_1.MidwayFrameworkType.WEB;
-    }
     async run() {
-        var _a;
         // cluster 模式加载路由需在 run 之前，因为 run 需要在拿到 server 之后执行
         if (!this.isClusterMode) {
             // load controller
@@ -205,7 +200,7 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
             this.getApplicationContext().registerObject(core_1.HTTP_SERVER_KEY, this.server);
             const eggConfig = this.configService.getConfiguration('egg');
             if (!this.isClusterMode && eggConfig) {
-                const customPort = (_a = process.env.MIDWAY_HTTP_PORT) !== null && _a !== void 0 ? _a : eggConfig.port;
+                const customPort = process.env.MIDWAY_HTTP_PORT ?? eggConfig.port;
                 if (customPort) {
                     new Promise(resolve => {
                         const args = [customPort];
@@ -257,12 +252,12 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         this.server = server;
     }
 };
+exports.MidwayWebFramework = MidwayWebFramework;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", Object)
 ], MidwayWebFramework.prototype, "appDir", void 0);
-MidwayWebFramework = __decorate([
+exports.MidwayWebFramework = MidwayWebFramework = __decorate([
     (0, core_1.Framework)()
 ], MidwayWebFramework);
-exports.MidwayWebFramework = MidwayWebFramework;
 //# sourceMappingURL=web.js.map

package/dist/interface.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Context as EggContext, Application as EggApplication } from 'egg';
 import { IMidwayContainer, IMidwayContext, IMidwayApplication, IConfigurationOptions, NextFunction as BaseNextFunction } from '@midwayjs/core';
 import { DefaultState, Middleware } from 'koa';

package/dist/logger.js

@@ -133,9 +133,8 @@ class MidwayLoggers extends Map {
         return logger;
     }
     disableConsole() {
-        var _a;
         for (const value of this.values()) {
-            if (value === null || value === void 0 ? void 0 : value['disableConsole']) {
+            if (value?.['disableConsole']) {
                 value.disableConsole();
             }
             else if (value.disable) {
@@ -145,7 +144,7 @@ class MidwayLoggers extends Map {
                 // v3
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
-                (_a = value.get('console')) === null || _a === void 0 ? void 0 : _a.level = 'none';
+                value.get('console') && (value.get('console').level = 'none');
             }
         }
     }
@@ -158,14 +157,13 @@ class MidwayLoggers extends Map {
         }
     }
     transformEggLogger(eggCustomLogger, midwayLoggerConfig) {
-        var _a, _b, _c, _d;
         const transformLoggerConfig = {
             midwayLogger: {
                 clients: {},
             },
         };
         for (const name in eggCustomLogger) {
-            const file = (_a = eggCustomLogger[name]) === null || _a === void 0 ? void 0 : _a.file;
+            const file = eggCustomLogger[name]?.file;
             if (!file) {
                 continue;
             }
@@ -179,15 +177,15 @@ class MidwayLoggers extends Map {
                         ? (0, path_1.join)(midwayLoggerConfig['dir'], '.audit')
                         : midwayLoggerConfig['auditFileDir'];
                 options.errorDir =
-                    (_b = midwayLoggerConfig['errorDir']) !== null && _b !== void 0 ? _b : midwayLoggerConfig['dir'];
+                    midwayLoggerConfig['errorDir'] ?? midwayLoggerConfig['dir'];
             }
             else {
                 // 相对路径，使用默认的 dir 即可
                 options.fileLogName = file;
             }
             transformLoggerConfig.midwayLogger.clients[name] = {
-                level: levelTransform((_c = eggCustomLogger[name]) === null || _c === void 0 ? void 0 : _c.level),
-                consoleLevel: levelTransform((_d = eggCustomLogger[name]) === null || _d === void 0 ? void 0 : _d.consoleLevel),
+                level: levelTransform(eggCustomLogger[name]?.level),
+                consoleLevel: levelTransform(eggCustomLogger[name]?.consoleLevel),
                 ...options,
             };
             cleanUndefinedProperty(transformLoggerConfig.midwayLogger.clients[name]);
@@ -200,8 +198,7 @@ const createLoggers = (app, processType) => {
     const loggers = new MidwayLoggers(app);
     // won't print to console after started, except for local and unittest
     app.ready(() => {
-        var _a;
-        if ((_a = app.config.logger) === null || _a === void 0 ? void 0 : _a.disableConsoleAfterReady) {
+        if (app.config.logger?.disableConsoleAfterReady) {
             loggers.disableConsole();
         }
     });

package/dist/utils.d.ts

@@ -4,5 +4,5 @@ export declare const parseNormalDir: (baseDir: string, isTypescript?: boolean) =
 };
 export declare const findLernaRoot: (findRoot?: string) => string;
 export declare const getCurrentDateString: (timestamp?: number) => string;
-export declare function initializeAgentApplicationContext(agent: any): Promise<import("@midwayjs/core").IMidwayContainer>;
+export declare function initializeAgentApplicationContext(agent: any): Promise<import("@midwayjs/core").IMidwayGlobalContainer>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.js

@@ -83,27 +83,26 @@ async function initializeAgentApplicationContext(agent) {
         // framework/config/plugin/logger/app decorator support
         // register base config hook
         decoratorService.registerPropertyHandler(core_2.CONFIG_KEY, (propertyName, meta) => {
-            var _a;
-            if (meta.identifier === core_2.ALL) {
+            if (meta.identifier === core_2.ALL_VALUE_KEY) {
                 return configService.getConfiguration();
             }
             else {
-                return configService.getConfiguration((_a = meta.identifier) !== null && _a !== void 0 ? _a : propertyName);
+                return configService.getConfiguration(meta.identifier ?? propertyName);
             }
         });
         // register @Logger decorator handler
         decoratorService.registerPropertyHandler(core_2.LOGGER_KEY, (propertyName, meta) => {
-            var _a;
-            return loggerService.getLogger((_a = meta.identifier) !== null && _a !== void 0 ? _a : propertyName);
-        });
-        decoratorService.registerPropertyHandler(core_2.PIPELINE_IDENTIFIER, (key, meta, instance) => {
-            var _a, _b;
-            return new core_1.MidwayPipelineService((_b = (_a = instance[core_1.REQUEST_OBJ_CTX_KEY]) === null || _a === void 0 ? void 0 : _a.requestContext) !== null && _b !== void 0 ? _b : this.applicationContext, meta.valves);
+            return loggerService.getLogger(meta.identifier ?? propertyName);
         });
         // register @App decorator handler
         decoratorService.registerPropertyHandler(core_2.APPLICATION_KEY, (propertyName, mete) => {
             return agent;
         });
+        // register @MainApp decorator handler
+        decoratorService.registerPropertyHandler(core_1.MAIN_APPLICATION_KEY, (key, target) => {
+            return agent;
+        });
+        // register @Plugin decorator handler
         decoratorService.registerPropertyHandler(core_2.PLUGIN_KEY, (key, target) => {
             return agent[key];
         });

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.19.2",
+  "version": "4.0.0-alpha.1",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --forceExit",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
     "link": "npm link"
   },
   "keywords": [
@@ -29,7 +29,8 @@
   "license": "MIT",
   "devDependencies": {
     "@midwayjs/logger": "^3.0.0",
-    "@midwayjs/mock": "^3.19.2",
+    "@midwayjs/mock": "^4.0.0-alpha.1",
+    "@types/koa": "2.15.0",
     "dayjs": "1.11.13",
     "egg-logger": "3.6.0",
     "egg-mock": "4.2.1",
@@ -38,16 +39,20 @@
     "egg-view-nunjucks": "2.3.0",
     "fake-egg": "1.0.0",
     "fs-extra": "11.2.0",
+    "is-type-of": "^2.1.0",
     "mm": "3.4.0",
+    "mz-modules": "^2.1.0",
     "pedding": "1.1.0",
     "react": "17.0.2",
-    "react-dom": "17.0.2"
+    "react-dom": "17.0.2",
+    "supertest": "6.3.3"
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.19.0",
+    "@midwayjs/core": "^4.0.0-alpha.1",
     "egg": "^2.28.0",
     "egg-cluster": "^1.27.1",
+    "egg-path-matching": "^2.1.0",
     "find-up": "5.0.0",
     "mkdirp": "1.0.4",
     "qs": "6.13.1"
@@ -60,5 +65,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "57fd034be94897fb819b0d9ef776de0b9923ab0f"
+  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
 }