@modern-js/plugin-express 2.58.1 → 2.58.3

package/dist/cjs/plugin.js

@@ -32,11 +32,11 @@ __export(plugin_exports, {
 });
 module.exports = __toCommonJS(plugin_exports);
 var path = __toESM(require("path"));
-var import_express = __toESM(require("express"));
-var import_cookie_parser = __toESM(require("cookie-parser"));
+var import_node = require("@modern-js/server-core/node");
 var import_utils = require("@modern-js/utils");
+var import_cookie_parser = __toESM(require("cookie-parser"));
+var import_express = __toESM(require("express"));
 var import_finalhandler = __toESM(require("finalhandler"));
-var import_node = require("@modern-js/server-core/node");
 var import_context = require("./context");
 var import_registerRoutes = __toESM(require("./registerRoutes"));
 const findAppModule = async (apiDir) => {
@@ -49,18 +49,18 @@ const findAppModule = async (apiDir) => {
     if (await import_utils.fs.pathExists(filename)) {
       delete require.cache[filename];
       return [
-        (0, import_utils.compatRequire)(filename),
+        await (0, import_utils.compatibleRequire)(filename),
         require(filename)
       ];
     }
   }
   return [];
 };
-const initMiddlewares = (middleware, app) => {
-  middleware.forEach((middlewareItem) => {
-    const middlewareFunc = typeof middlewareItem === "string" ? (0, import_utils.compatRequire)(middlewareItem) : middlewareItem;
+const initMiddlewares = async (middleware, app) => {
+  for (const middlewareItem of middleware) {
+    const middlewareFunc = typeof middlewareItem === "string" ? await (0, import_utils.compatibleRequire)(middlewareItem) : middlewareItem;
     app.use(middlewareFunc);
-  });
+  }
 };
 const useRun = (app) => {
   app.use((req, res, next) => {
@@ -81,7 +81,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
     }
     initApp(app);
     if (middlewares && middlewares.length > 0) {
-      initMiddlewares(middlewares, app);
+      await initMiddlewares(middlewares, app);
     }
     useRun(app);
     (0, import_registerRoutes.default)(app, apiHandlerInfos);
@@ -95,7 +95,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
     app = (0, import_express.default)();
     initApp(app);
     if (middlewares && middlewares.length > 0) {
-      initMiddlewares(middlewares, app);
+      await initMiddlewares(middlewares, app);
     }
     useRun(app);
     (0, import_registerRoutes.default)(app, apiHandlerInfos);

package/dist/cjs/runtime/operators.js

@@ -26,7 +26,6 @@ var import_context = require("../context");
 const Pipe = (func) => {
   return {
     name: "pipe",
-    // eslint-disable-next-line consistent-return
     async execute(executeHelper, next) {
       const { inputs } = executeHelper;
       const ctx = (0, import_context.useContext)();

package/dist/cjs/utils.js

@@ -35,8 +35,8 @@ module.exports = __toCommonJS(utils_exports);
 var import_reflect_metadata = require("reflect-metadata");
 var import_bff_core = require("@modern-js/bff-core");
 var import_bff_runtime = require("@modern-js/bff-runtime");
-var import_type_is = __toESM(require("type-is"));
 var import_formidable = __toESM(require("formidable"));
+var import_type_is = __toESM(require("type-is"));
 const handleResponseMeta = (res, handler) => {
   const responseMeta = Reflect.getMetadata(import_bff_core.HttpMetadata.Response, handler);
   if (Array.isArray(responseMeta)) {

package/dist/esm/plugin.js

@@ -1,11 +1,11 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
-import express from "express";
+import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/node";
+import { fs, compatibleRequire, logger } from "@modern-js/utils";
 import cookieParser from "cookie-parser";
-import { fs, compatRequire, logger } from "@modern-js/utils";
+import express from "express";
 import finalhandler from "finalhandler";
-import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/node";
 import { run } from "./context";
 import registerRoutes from "./registerRoutes";
 var findAppModule = function() {
@@ -26,9 +26,9 @@ var findAppModule = function() {
         case 1:
           _state.trys.push([
             1,
-            6,
             7,
-            8
+            8,
+            9
           ]);
           _iterator = paths[Symbol.iterator]();
           _state.label = 2;
@@ -36,7 +36,7 @@ var findAppModule = function() {
           if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
             return [
               3,
-              5
+              6
             ];
           filename = _step.value;
           return [
@@ -44,37 +44,44 @@ var findAppModule = function() {
             fs.pathExists(filename)
           ];
         case 3:
-          if (_state.sent()) {
-            delete require.cache[filename];
+          if (!_state.sent())
             return [
-              2,
-              [
-                compatRequire(filename),
-                require(filename)
-              ]
+              3,
+              5
             ];
-          }
-          _state.label = 4;
+          delete require.cache[filename];
+          return [
+            4,
+            compatibleRequire(filename)
+          ];
         case 4:
+          return [
+            2,
+            [
+              _state.sent(),
+              require(filename)
+            ]
+          ];
+        case 5:
           _iteratorNormalCompletion = true;
           return [
             3,
             2
           ];
-        case 5:
+        case 6:
           return [
             3,
-            8
+            9
           ];
-        case 6:
+        case 7:
           err = _state.sent();
           _didIteratorError = true;
           _iteratorError = err;
           return [
             3,
-            8
+            9
           ];
-        case 7:
+        case 8:
           try {
             if (!_iteratorNormalCompletion && _iterator.return != null) {
               _iterator.return();
@@ -87,7 +94,7 @@ var findAppModule = function() {
           return [
             7
           ];
-        case 8:
+        case 9:
           return [
             2,
             []
@@ -99,12 +106,95 @@ var findAppModule = function() {
     return _ref.apply(this, arguments);
   };
 }();
-var initMiddlewares = function(middleware, app) {
-  middleware.forEach(function(middlewareItem) {
-    var middlewareFunc = typeof middlewareItem === "string" ? compatRequire(middlewareItem) : middlewareItem;
-    app.use(middlewareFunc);
+var initMiddlewares = function() {
+  var _ref = _async_to_generator(function(middleware, app) {
+    var _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, middlewareItem, middlewareFunc, _tmp, err;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+          _state.label = 1;
+        case 1:
+          _state.trys.push([
+            1,
+            8,
+            9,
+            10
+          ]);
+          _iterator = middleware[Symbol.iterator]();
+          _state.label = 2;
+        case 2:
+          if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
+            return [
+              3,
+              7
+            ];
+          middlewareItem = _step.value;
+          if (!(typeof middlewareItem === "string"))
+            return [
+              3,
+              4
+            ];
+          return [
+            4,
+            compatibleRequire(middlewareItem)
+          ];
+        case 3:
+          _tmp = _state.sent();
+          return [
+            3,
+            5
+          ];
+        case 4:
+          _tmp = middlewareItem;
+          _state.label = 5;
+        case 5:
+          middlewareFunc = _tmp;
+          app.use(middlewareFunc);
+          _state.label = 6;
+        case 6:
+          _iteratorNormalCompletion = true;
+          return [
+            3,
+            2
+          ];
+        case 7:
+          return [
+            3,
+            10
+          ];
+        case 8:
+          err = _state.sent();
+          _didIteratorError = true;
+          _iteratorError = err;
+          return [
+            3,
+            10
+          ];
+        case 9:
+          try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+              _iterator.return();
+            }
+          } finally {
+            if (_didIteratorError) {
+              throw _iteratorError;
+            }
+          }
+          return [
+            7
+          ];
+        case 10:
+          return [
+            2
+          ];
+      }
+    });
   });
-};
+  return function initMiddlewares2(middleware, app) {
+    return _ref.apply(this, arguments);
+  };
+}();
 var useRun = function(app) {
   app.use(function(req, res, next) {
     run({
@@ -123,7 +213,7 @@ var createApp = function() {
           if (!(mode === "framework"))
             return [
               3,
-              2
+              4
             ];
           return [
             4,
@@ -137,9 +227,19 @@ var createApp = function() {
             app = express();
           }
           initApp(app);
-          if (middlewares && middlewares.length > 0) {
-            initMiddlewares(middlewares, app);
-          }
+          if (!(middlewares && middlewares.length > 0))
+            return [
+              3,
+              3
+            ];
+          return [
+            4,
+            initMiddlewares(middlewares, app)
+          ];
+        case 2:
+          _state.sent();
+          _state.label = 3;
+        case 3:
           useRun(app);
           registerRoutes(app, apiHandlerInfos);
           if (hooks) {
@@ -150,22 +250,38 @@ var createApp = function() {
           }
           return [
             3,
-            3
+            8
           ];
-        case 2:
-          if (mode === "function") {
-            app = express();
-            initApp(app);
-            if (middlewares && middlewares.length > 0) {
-              initMiddlewares(middlewares, app);
-            }
-            useRun(app);
-            registerRoutes(app, apiHandlerInfos);
-          } else {
-            throw new Error("mode must be function or framework");
-          }
-          _state.label = 3;
-        case 3:
+        case 4:
+          if (!(mode === "function"))
+            return [
+              3,
+              7
+            ];
+          app = express();
+          initApp(app);
+          if (!(middlewares && middlewares.length > 0))
+            return [
+              3,
+              6
+            ];
+          return [
+            4,
+            initMiddlewares(middlewares, app)
+          ];
+        case 5:
+          _state.sent();
+          _state.label = 6;
+        case 6:
+          useRun(app);
+          registerRoutes(app, apiHandlerInfos);
+          return [
+            3,
+            8
+          ];
+        case 7:
+          throw new Error("mode must be function or framework");
+        case 8:
           if (render) {
             app.use(function() {
               var _ref2 = _async_to_generator(function(req, res, next) {

package/dist/esm/runtime/operators.js

@@ -4,66 +4,63 @@ import { useContext } from "../context";
 var Pipe = function(func) {
   return {
     name: "pipe",
-    execute: (
-      // eslint-disable-next-line consistent-return
-      function execute(executeHelper, next) {
-        return _async_to_generator(function() {
-          var inputs, ctx, res, isPiped, end, output;
-          return _ts_generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                inputs = executeHelper.inputs;
-                ctx = useContext();
-                res = ctx.res;
-                if (!(typeof func === "function"))
-                  return [
-                    3,
-                    3
-                  ];
-                isPiped = true;
-                end = function(value) {
-                  isPiped = false;
-                  if (typeof value === "function") {
-                    value(res);
-                    return;
-                  }
-                  return value;
-                };
+    execute: function execute(executeHelper, next) {
+      return _async_to_generator(function() {
+        var inputs, ctx, res, isPiped, end, output;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              inputs = executeHelper.inputs;
+              ctx = useContext();
+              res = ctx.res;
+              if (!(typeof func === "function"))
                 return [
-                  4,
-                  func(inputs, end)
+                  3,
+                  3
                 ];
-              case 1:
-                output = _state.sent();
-                if (!isPiped) {
-                  if (output) {
-                    return [
-                      2,
-                      executeHelper.result = output
-                    ];
-                  } else {
-                    return [
-                      2
-                    ];
-                  }
+              isPiped = true;
+              end = function(value) {
+                isPiped = false;
+                if (typeof value === "function") {
+                  value(res);
+                  return;
                 }
-                executeHelper.inputs = output;
-                return [
-                  4,
-                  next()
-                ];
-              case 2:
-                _state.sent();
-                _state.label = 3;
-              case 3:
-                return [
-                  2
-                ];
-            }
-          });
-        })();
-      }
-    )
+                return value;
+              };
+              return [
+                4,
+                func(inputs, end)
+              ];
+            case 1:
+              output = _state.sent();
+              if (!isPiped) {
+                if (output) {
+                  return [
+                    2,
+                    executeHelper.result = output
+                  ];
+                } else {
+                  return [
+                    2
+                  ];
+                }
+              }
+              executeHelper.inputs = output;
+              return [
+                4,
+                next()
+              ];
+            case 2:
+              _state.sent();
+              _state.label = 3;
+            case 3:
+              return [
+                2
+              ];
+          }
+        });
+      })();
+    }
   };
 };
 var Middleware = function(middleware) {

package/dist/esm/utils.js

@@ -5,10 +5,10 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import "reflect-metadata";
-import { httpMethods, isWithMetaHandler, isInputParamsDeciderHandler, HttpMetadata, ResponseMetaType, ValidationError } from "@modern-js/bff-core";
+import { HttpMetadata, ResponseMetaType, ValidationError, httpMethods, isInputParamsDeciderHandler, isWithMetaHandler } from "@modern-js/bff-core";
 import { isSchemaHandler } from "@modern-js/bff-runtime";
-import typeIs from "type-is";
 import formidable from "formidable";
+import typeIs from "type-is";
 var handleResponseMeta = function(res, handler) {
   var responseMeta = Reflect.getMetadata(HttpMetadata.Response, handler);
   if (Array.isArray(responseMeta)) {

package/dist/esm-node/plugin.js

@@ -1,9 +1,9 @@
 import * as path from "path";
-import express from "express";
+import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/node";
+import { fs, compatibleRequire, logger } from "@modern-js/utils";
 import cookieParser from "cookie-parser";
-import { fs, compatRequire, logger } from "@modern-js/utils";
+import express from "express";
 import finalhandler from "finalhandler";
-import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/node";
 import { run } from "./context";
 import registerRoutes from "./registerRoutes";
 const findAppModule = async (apiDir) => {
@@ -16,18 +16,18 @@ const findAppModule = async (apiDir) => {
     if (await fs.pathExists(filename)) {
       delete require.cache[filename];
       return [
-        compatRequire(filename),
+        await compatibleRequire(filename),
         require(filename)
       ];
     }
   }
   return [];
 };
-const initMiddlewares = (middleware, app) => {
-  middleware.forEach((middlewareItem) => {
-    const middlewareFunc = typeof middlewareItem === "string" ? compatRequire(middlewareItem) : middlewareItem;
+const initMiddlewares = async (middleware, app) => {
+  for (const middlewareItem of middleware) {
+    const middlewareFunc = typeof middlewareItem === "string" ? await compatibleRequire(middlewareItem) : middlewareItem;
     app.use(middlewareFunc);
-  });
+  }
 };
 const useRun = (app) => {
   app.use((req, res, next) => {
@@ -48,7 +48,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
     }
     initApp(app);
     if (middlewares && middlewares.length > 0) {
-      initMiddlewares(middlewares, app);
+      await initMiddlewares(middlewares, app);
     }
     useRun(app);
     registerRoutes(app, apiHandlerInfos);
@@ -62,7 +62,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
     app = express();
     initApp(app);
     if (middlewares && middlewares.length > 0) {
-      initMiddlewares(middlewares, app);
+      await initMiddlewares(middlewares, app);
     }
     useRun(app);
     registerRoutes(app, apiHandlerInfos);

package/dist/esm-node/runtime/operators.js

@@ -2,7 +2,6 @@ import { useContext } from "../context";
 const Pipe = (func) => {
   return {
     name: "pipe",
-    // eslint-disable-next-line consistent-return
     async execute(executeHelper, next) {
       const { inputs } = executeHelper;
       const ctx = useContext();

package/dist/esm-node/utils.js

@@ -1,8 +1,8 @@
 import "reflect-metadata";
-import { httpMethods, isWithMetaHandler, isInputParamsDeciderHandler, HttpMetadata, ResponseMetaType, ValidationError } from "@modern-js/bff-core";
+import { HttpMetadata, ResponseMetaType, ValidationError, httpMethods, isInputParamsDeciderHandler, isWithMetaHandler } from "@modern-js/bff-core";
 import { isSchemaHandler } from "@modern-js/bff-runtime";
-import typeIs from "type-is";
 import formidable from "formidable";
+import typeIs from "type-is";
 const handleResponseMeta = (res, handler) => {
   const responseMeta = Reflect.getMetadata(HttpMetadata.Response, handler);
   if (Array.isArray(responseMeta)) {

package/dist/types/cli/index.d.ts

@@ -1,4 +1,4 @@
-import type { CliPlugin } from '@modern-js/core';
 import type { AppTools } from '@modern-js/app-tools';
+import type { CliPlugin } from '@modern-js/core';
 export declare const expressPlugin: () => CliPlugin<AppTools>;
 export default expressPlugin;

package/dist/types/context.d.ts

@@ -1,4 +1,4 @@
-import { Request, Response } from 'express';
+import type { Request, Response } from 'express';
 export type Context = {
     req: Request;
     res: Response;

package/dist/types/plugin.d.ts

@@ -1,4 +1,4 @@
-import type { ServerManifest, ServerPlugin, InternalRequest } from '@modern-js/server-core';
+import type { InternalRequest, ServerManifest, ServerPlugin } from '@modern-js/server-core';
 declare global {
     namespace Express {
         interface Request {

package/dist/types/runtime/hook.d.ts

@@ -1,2 +1,2 @@
-import type { Request, Response, NextFunction } from 'express';
+import type { NextFunction, Request, Response } from 'express';
 export declare const hook: (attacher: (req: Request, res: Response, next: NextFunction) => void | Promise<void>) => (req: Request, res: Response, next: NextFunction) => void | Promise<void>;

package/dist/types/runtime/operators.d.ts

@@ -1,5 +1,5 @@
-import { Operator } from '@modern-js/bff-core';
-import { NextFunction } from '@modern-js/types';
+import type { Operator } from '@modern-js/bff-core';
+import type { NextFunction } from '@modern-js/types';
 import type { Request, Response } from 'express';
 export type EndFunction = ((func: (res: Response) => void) => void) & ((data: unknown) => void);
 type MaybeAsync<T> = T | Promise<T>;

package/dist/types/utils.d.ts

@@ -1,7 +1,7 @@
 import 'reflect-metadata';
-import { HttpMethod } from '@modern-js/bff-core';
+import { type HttpMethod } from '@modern-js/bff-core';
 import type { APIHandlerInfo } from '@modern-js/bff-core';
-import type { Request, Response, NextFunction } from 'express';
+import type { NextFunction, Request, Response } from 'express';
 type Handler = APIHandlerInfo['handler'];
 export declare const createRouteHandler: (handler: Handler) => (req: Request, res: Response, next: NextFunction) => Promise<void | Response<any, Record<string, any>>>;
 export declare const isNormalMethod: (httpMethod: HttpMethod) => httpMethod is HttpMethod;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.1",
+  "version": "2.58.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -23,6 +23,7 @@
   "exports": {
     "./types": "./types.d.ts",
     ".": {
+      "types": "./dist/types/cli/index.d.ts",
       "jsnext:source": "./src/cli/index.ts",
       "default": "./dist/cjs/cli/index.js"
     },
@@ -39,6 +40,7 @@
       "default": "./dist/esm/index.js"
     },
     "./runtime": {
+      "types": "./dist/types/runtime/index.d.ts",
       "default": "./dist/cjs/runtime/index.js"
     }
   },
@@ -49,11 +51,11 @@
     "formidable": "^1.2.2",
     "reflect-metadata": "^0.1.13",
     "type-is": "^1.6.18",
-    "@modern-js/bff-core": "2.58.1",
-    "@modern-js/bff-runtime": "2.58.1",
-    "@modern-js/server-core": "2.58.1",
-    "@modern-js/types": "2.58.1",
-    "@modern-js/utils": "2.58.1"
+    "@modern-js/bff-core": "2.58.3",
+    "@modern-js/server-core": "2.58.3",
+    "@modern-js/bff-runtime": "2.58.3",
+    "@modern-js/types": "2.58.3",
+    "@modern-js/utils": "2.58.3"
   },
   "devDependencies": {
     "@types/cookie-parser": "^1.4.2",
@@ -69,10 +71,10 @@
     "supertest": "^6.1.6",
     "typescript": "^5",
     "zod": "^3.22.3",
-    "@modern-js/app-tools": "2.58.1",
-    "@modern-js/core": "2.58.1",
-    "@scripts/build": "2.58.1",
-    "@scripts/jest-config": "2.58.1"
+    "@modern-js/app-tools": "2.58.3",
+    "@modern-js/core": "2.58.3",
+    "@scripts/jest-config": "2.58.3",
+    "@scripts/build": "2.58.3"
   },
   "peerDependencies": {
     "express": "^4.17.1"

package/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference path="./dist/types/index.d.ts" />
 
 declare module '@modern-js/runtime/express' {
-  import { Request, Response, RequestHandler } from 'express';
+  import type { Request, Response, RequestHandler } from 'express';
 
   type Context = { req: Request; res: Response };
 
@@ -15,13 +15,16 @@ declare module '@modern-js/runtime/express' {
   export * from '@modern-js/bff-core';
 }
 
-
 // Todo: remove on next version
 // For use with BFF, it will be removed on next version, and use @modern-js/runtime/express instead?
 declare module '@modern-js/runtime/server' {
-  import { Request, Response, RequestHandler } from 'express';
+  import type { Request, Response, RequestHandler } from 'express';
 
-  import type { AfterMatchContext, AfterRenderContext, NextFunction } from '@modern-js/types';
+  import type {
+    AfterMatchContext,
+    AfterRenderContext,
+    NextFunction,
+  } from '@modern-js/types';
 
   export type AfterRenderHook = (
     context: AfterRenderContext,