@midwayjs/web 3.5.1 → 3.6.0

package/dist/configuration.d.ts

@@ -1,5 +1,5 @@
-import { IMidwayWebApplication } from './interface';
 import { MidwayDecoratorService } from '@midwayjs/core';
+import { IMidwayWebApplication } from './interface';
 export declare class EggConfiguration {
     baseDir: any;
     appDir: any;

package/dist/configuration.js

@@ -10,12 +10,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EggConfiguration = void 0;
-const decorator_1 = require("@midwayjs/decorator");
 const core_1 = require("@midwayjs/core");
 const path_1 = require("path");
 let EggConfiguration = class EggConfiguration {
     init() {
-        this.decoratorService.registerParameterHandler(decorator_1.WEB_ROUTER_PARAM_KEY, options => {
+        this.decoratorService.registerParameterHandler(core_1.WEB_ROUTER_PARAM_KEY, options => {
             return (0, core_1.extractKoaLikeValue)(options.metadata.type, options.metadata.propertyData, options.originParamType)(options.originArgs[0], options.originArgs[1]);
         });
     }
@@ -38,29 +37,29 @@ let EggConfiguration = class EggConfiguration {
     }
 };
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", Object)
 ], EggConfiguration.prototype, "baseDir", void 0);
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", Object)
 ], EggConfiguration.prototype, "appDir", void 0);
 __decorate([
-    (0, decorator_1.App)(),
+    (0, core_1.App)(),
     __metadata("design:type", Object)
 ], EggConfiguration.prototype, "app", void 0);
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)
 ], EggConfiguration.prototype, "decoratorService", void 0);
 __decorate([
-    (0, decorator_1.Init)(),
+    (0, core_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
 ], EggConfiguration.prototype, "init", null);
 EggConfiguration = __decorate([
-    (0, decorator_1.Configuration)({
+    (0, core_1.Configuration)({
         namespace: 'egg',
         importConfigs: [(0, path_1.join)(__dirname, 'config')],
     })

package/dist/framework/lifecycle.js

@@ -11,8 +11,6 @@ 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 decorator_1 = require("@midwayjs/decorator");
-const configuration_1 = require("@midwayjs/core/dist/functional/configuration");
 const util_1 = require("util");
 const debug = (0, util_1.debuglog)('midway:debug');
 let MidwayWebLifeCycleService = class MidwayWebLifeCycleService {
@@ -22,10 +20,10 @@ let MidwayWebLifeCycleService = class MidwayWebLifeCycleService {
     }
     async init() {
         // run lifecycle
-        const cycles = (0, decorator_1.listModule)(decorator_1.CONFIGURATION_KEY);
+        const cycles = (0, core_1.listModule)(core_1.CONFIGURATION_KEY);
         debug(`[core]: Found Configuration length = ${cycles.length}`);
         for (const cycle of cycles) {
-            if (cycle.target instanceof configuration_1.FunctionalConfiguration) {
+            if (cycle.target instanceof core_1.FunctionalConfiguration) {
                 // 函数式写法
                 cycle.instance = cycle.target;
             }
@@ -69,7 +67,7 @@ let MidwayWebLifeCycleService = class MidwayWebLifeCycleService {
             this.configService.clearConfigMergeOrder();
         }
         // some preload module init
-        const modules = (0, decorator_1.listPreloadModule)();
+        const modules = (0, core_1.listPreloadModule)();
         for (const module of modules) {
             // preload init context
             await this.applicationContext.getAsync(module);
@@ -77,10 +75,10 @@ let MidwayWebLifeCycleService = class MidwayWebLifeCycleService {
     }
     async stop() {
         // stop lifecycle
-        const cycles = (0, decorator_1.listModule)(decorator_1.CONFIGURATION_KEY);
+        const cycles = (0, core_1.listModule)(core_1.CONFIGURATION_KEY);
         for (const cycle of cycles) {
             let inst;
-            if (cycle.target instanceof configuration_1.FunctionalConfiguration) {
+            if (cycle.target instanceof core_1.FunctionalConfiguration) {
                 // 函数式写法
                 inst = cycle.target;
             }
@@ -124,22 +122,22 @@ let MidwayWebLifeCycleService = class MidwayWebLifeCycleService {
     }
 };
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayFrameworkService)
 ], MidwayWebLifeCycleService.prototype, "frameworkService", void 0);
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayConfigService)
 ], MidwayWebLifeCycleService.prototype, "configService", void 0);
 __decorate([
-    (0, decorator_1.Init)(),
+    (0, core_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], MidwayWebLifeCycleService.prototype, "init", null);
 MidwayWebLifeCycleService = __decorate([
-    (0, decorator_1.Provide)(),
-    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton),
+    (0, core_1.Provide)(),
+    (0, core_1.Scope)(core_1.ScopeEnum.Singleton),
     __metadata("design:paramtypes", [Object])
 ], MidwayWebLifeCycleService);
 exports.MidwayWebLifeCycleService = MidwayWebLifeCycleService;

package/dist/framework/web.d.ts

@@ -1,5 +1,4 @@
-import { BaseFramework, IMidwayBootstrapOptions } from '@midwayjs/core';
-import { MidwayFrameworkType } from '@midwayjs/decorator';
+import { BaseFramework, IMidwayBootstrapOptions, MidwayFrameworkType } from '@midwayjs/core';
 import { IMidwayWebConfigurationOptions, Application, Context } from '../interface';
 import { EggLogger } from 'egg';
 export declare class MidwayWebFramework extends BaseFramework<Application, Context, IMidwayWebConfigurationOptions> {

package/dist/framework/web.js

@@ -11,7 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayWebFramework = void 0;
 const core_1 = require("@midwayjs/core");
-const decorator_1 = require("@midwayjs/decorator");
 const router_1 = require("@eggjs/router");
 const logger_1 = require("@midwayjs/logger");
 const path_1 = require("path");
@@ -165,7 +164,7 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
         debug(`[egg]: current middleware = ${this.middlewareManager.getNames()}`);
     }
     getFrameworkType() {
-        return decorator_1.MidwayFrameworkType.WEB;
+        return core_1.MidwayFrameworkType.WEB;
     }
     async run() {
         var _a;
@@ -254,11 +253,11 @@ let MidwayWebFramework = class MidwayWebFramework extends core_1.BaseFramework {
     }
 };
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", Object)
 ], MidwayWebFramework.prototype, "appDir", void 0);
 MidwayWebFramework = __decorate([
-    (0, decorator_1.Framework)()
+    (0, core_1.Framework)()
 ], MidwayWebFramework);
 exports.MidwayWebFramework = MidwayWebFramework;
 //# sourceMappingURL=web.js.map

package/dist/utils.js

@@ -5,7 +5,7 @@ const path_1 = require("path");
 const find_up_1 = require("find-up");
 const fs_1 = require("fs");
 const core_1 = require("@midwayjs/core");
-const decorator_1 = require("@midwayjs/decorator");
+const core_2 = require("@midwayjs/core");
 const web_1 = require("./framework/web");
 const util_1 = require("util");
 const debug = (0, util_1.debuglog)('midway:debug');
@@ -86,9 +86,9 @@ async function initializeAgentApplicationContext(agent) {
         const loggerService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayLoggerService);
         // framework/config/plugin/logger/app decorator support
         // register base config hook
-        decoratorService.registerPropertyHandler(decorator_1.CONFIG_KEY, (propertyName, meta) => {
+        decoratorService.registerPropertyHandler(core_2.CONFIG_KEY, (propertyName, meta) => {
             var _a;
-            if (meta.identifier === decorator_1.ALL) {
+            if (meta.identifier === core_2.ALL) {
                 return configService.getConfiguration();
             }
             else {
@@ -96,19 +96,19 @@ async function initializeAgentApplicationContext(agent) {
             }
         });
         // register @Logger decorator handler
-        decoratorService.registerPropertyHandler(decorator_1.LOGGER_KEY, (propertyName, meta) => {
+        decoratorService.registerPropertyHandler(core_2.LOGGER_KEY, (propertyName, meta) => {
             var _a;
             return loggerService.getLogger((_a = meta.identifier) !== null && _a !== void 0 ? _a : propertyName);
         });
-        decoratorService.registerPropertyHandler(decorator_1.PIPELINE_IDENTIFIER, (key, meta, instance) => {
+        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);
         });
         // register @App decorator handler
-        decoratorService.registerPropertyHandler(decorator_1.APPLICATION_KEY, (propertyName, mete) => {
+        decoratorService.registerPropertyHandler(core_2.APPLICATION_KEY, (propertyName, mete) => {
             return agent;
         });
-        decoratorService.registerPropertyHandler(decorator_1.PLUGIN_KEY, (key, target) => {
+        decoratorService.registerPropertyHandler(core_2.PLUGIN_KEY, (key, target) => {
             return agent[key];
         });
         // init aspect module

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index",
   "typings": "index.d.ts",
@@ -28,9 +28,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.11",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/mock": "^3.5.1",
+    "@midwayjs/mock": "^3.6.0",
     "axios": "0.27.2",
     "dayjs": "1.11.5",
     "egg-logger": "2.9.0",
@@ -47,7 +46,7 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.5.1",
+    "@midwayjs/core": "^3.6.0",
     "egg": "^2.28.0",
     "egg-cluster": "^1.27.1",
     "find-up": "5.0.0",
@@ -61,5 +60,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "3b63fc768617037644602dd5ad66d3734ce01b16"
+  "gitHead": "22643b0e8519766bb7c68b975930199fc136336e"
 }