@midwayjs/web 3.11.15 → 3.12.0

package/app/extend/context.js

@@ -1,7 +1,11 @@
 'use strict';
 const rc = Symbol('Context#RequestContext');
 const ctxLogger = Symbol('Context#ContextLogger');
-const { MidwayRequestContainer } = require('@midwayjs/core');
+const {
+  MidwayRequestContainer,
+  MidwayWebRouterService,
+  httpError,
+} = require('@midwayjs/core');
 
 module.exports = {
   get requestContext() {
@@ -37,4 +41,27 @@ module.exports = {
   getAttr(key) {
     return this.requestContext.getAttr(key);
   },
+
+  async forward(url) {
+    const routerService = this.requestContext.get(MidwayWebRouterService);
+    const matchedUrlRouteInfo = await routerService.getMatchedRouterInfo(
+      url,
+      this.method
+    );
+
+    if (matchedUrlRouteInfo) {
+      if (matchedUrlRouteInfo.controllerClz) {
+        // normal class controller router
+        const controllerInstance = await this.requestContext.getAsync(
+          matchedUrlRouteInfo.controllerClz
+        );
+        return controllerInstance[matchedUrlRouteInfo.method](this);
+      } else if (typeof matchedUrlRouteInfo.method === 'function') {
+        // dynamic router
+        return matchedUrlRouteInfo.method(this);
+      }
+    } else {
+      throw new httpError.NotFoundError(`Forward url ${url} Not Found`);
+    }
+  },
 };

package/dist/cluster.js

@@ -3,7 +3,6 @@ var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@midwayjs/core");
 const path_1 = require("path");
-const utils_1 = require("./utils");
 const util_1 = require("util");
 const debug = (0, util_1.debuglog)('midway:debug');
 function runInAgent() {
@@ -16,13 +15,13 @@ 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();
 let baseDir;
-if ((0, utils_1.isTypeScriptEnvironment)()) {
+if ((0, core_1.isTypeScriptEnvironment)()) {
     baseDir = (0, path_1.join)(appDir, 'src');
 }
 else {
     baseDir = (0, path_1.join)(appDir, 'dist');
 }
-(0, core_1.prepareGlobalApplicationContext)({
+(0, core_1.prepareGlobalApplicationContextSync)({
     appDir,
     baseDir,
     ignore: ['**/app/extend/**', '**/app/public/**'],

package/dist/utils.d.ts

@@ -1,4 +1,3 @@
-export declare function isTypeScriptEnvironment(): boolean;
 export declare const parseNormalDir: (baseDir: string, isTypescript?: boolean) => {
     baseDir: string;
     appDir: string;

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeAgentApplicationContext = exports.getCurrentDateString = exports.findLernaRoot = exports.parseNormalDir = exports.isTypeScriptEnvironment = void 0;
+exports.initializeAgentApplicationContext = exports.getCurrentDateString = exports.findLernaRoot = exports.parseNormalDir = void 0;
 const path_1 = require("path");
 const find_up_1 = require("find-up");
 const fs_1 = require("fs");
@@ -10,22 +10,13 @@ const web_1 = require("./framework/web");
 const util_1 = require("util");
 const interface_1 = require("./interface");
 const debug = (0, util_1.debuglog)('midway:debug');
-function isTypeScriptEnvironment() {
-    const TS_MODE_PROCESS_FLAG = process.env.MIDWAY_TS_MODE;
-    if ('false' === TS_MODE_PROCESS_FLAG) {
-        return false;
-    }
-    // eslint-disable-next-line node/no-deprecated-api
-    return TS_MODE_PROCESS_FLAG === 'true' || !!require.extensions['.ts'];
-}
-exports.isTypeScriptEnvironment = isTypeScriptEnvironment;
 const parseNormalDir = (baseDir, isTypescript = true) => {
     if (isTypescript) {
         // 这里要么就是 src 目录，要么就已经是根目录
         if (!(0, fs_1.existsSync)((0, path_1.join)(baseDir, 'package.json'))) {
             baseDir = (0, path_1.basename)(baseDir);
         }
-        const isTypeScriptEnv = isTypeScriptEnvironment();
+        const isTypeScriptEnv = (0, core_1.isTypeScriptEnvironment)();
         if (isTypeScriptEnv) {
             return {
                 baseDir: (0, path_1.join)(baseDir, process.env.MIDWAY_SOURCE_DIR || 'src'),

package/index.d.ts

@@ -29,6 +29,7 @@ declare module 'egg' {
 
   interface Context<ResponseBodyT = any> extends IMidwayBaseContext {
     getLogger(name?: string): ILogger;
+    forward: (url: string) => void;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.11.15",
+  "version": "3.12.0",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index",
   "typings": "index.d.ts",
@@ -29,7 +29,7 @@
   "license": "MIT",
   "devDependencies": {
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/mock": "^3.11.15",
+    "@midwayjs/mock": "^3.12.0",
     "dayjs": "1.11.9",
     "egg-logger": "2.9.1",
     "egg-mock": "4.2.1",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.11.15",
+    "@midwayjs/core": "^3.12.0",
     "egg": "^2.28.0",
     "egg-cluster": "^1.27.1",
     "find-up": "5.0.0",
@@ -59,5 +59,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "a4054247f3b9f4fc8ba51684c002606d849e0bd3"
+  "gitHead": "0e9a08cd078c4c4dedfa753a8c1025806cc0b0a2"
 }