@modern-js/plugin-express 2.4.1-beta.0 → 2.6.0

package/CHANGELOG.md

@@ -1,12 +1,38 @@
 # @modern-js/plugin-express
 
-## 2.4.1-beta.0
+## 2.6.0
 
 ### Patch Changes
 
+- Updated dependencies [e1f799e]
+- Updated dependencies [7915ab3]
+- Updated dependencies [49fa0b1]
+- Updated dependencies [0fe658a]
+- Updated dependencies [62930b9]
+  - @modern-js/utils@2.6.0
+  - @modern-js/types@2.6.0
+  - @modern-js/bff-core@2.6.0
+  - @modern-js/bff-runtime@2.6.0
+
+## 2.5.0
+
+### Patch Changes
+
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
+- Updated dependencies [89ca6cc]
+- Updated dependencies [7cb8bb4]
+- Updated dependencies [30614fa]
+- Updated dependencies [1b0ce87]
 - Updated dependencies [11c053b]
-  - @modern-js/utils@2.4.1-beta.0
-  - @modern-js/bff-core@2.4.1-beta.0
+  - @modern-js/bff-core@2.5.0
+  - @modern-js/bff-runtime@2.5.0
+  - @modern-js/types@2.5.0
+  - @modern-js/utils@2.5.0
 
 ## 2.4.0
 

package/dist/{js/node → cjs}/cli/index.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/{js/node → cjs}/index.js

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/{js/node → cjs}/plugin.js

@@ -17,30 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var plugin_exports = {};
 __export(plugin_exports, {
   default: () => plugin_default
@@ -54,14 +38,14 @@ var import_finalhandler = __toESM(require("finalhandler"));
 var import_context = require("./context");
 var import_registerRoutes = __toESM(require("./registerRoutes"));
 const debug = (0, import_utils.createDebugger)("express");
-const findAppModule = (apiDir) => __async(void 0, null, function* () {
+const findAppModule = async (apiDir) => {
   const exts = [
     ".ts",
     ".js"
   ];
   const paths = exts.map((ext) => path.resolve(apiDir, `app${ext}`));
   for (const filename of paths) {
-    if (yield import_utils.fs.pathExists(filename)) {
+    if (await import_utils.fs.pathExists(filename)) {
       delete require.cache[filename];
       return [
         (0, import_utils.compatRequire)(filename),
@@ -70,7 +54,7 @@ const findAppModule = (apiDir) => __async(void 0, null, function* () {
     }
   }
   return [];
-});
+};
 const initMiddlewares = (middleware, app) => {
   middleware.forEach((middlewareItem) => {
     const middlewareFunc = typeof middlewareItem === "string" ? (0, import_utils.compatRequire)(middlewareItem) : middlewareItem;
@@ -103,66 +87,64 @@ var plugin_default = () => ({
     "@modern-js/plugin-server"
   ],
   setup: (api) => ({
-    prepareApiServer(_0) {
-      return __async(this, arguments, function* ({ pwd, config }) {
-        let app;
-        const apiDir = path.join(pwd, "./api");
-        const appContext = api.useAppContext();
-        const apiHandlerInfos = appContext.apiHandlerInfos;
-        const mode = appContext.apiMode;
-        if (mode === "framework") {
-          const appModule = yield findAppModule(apiDir);
-          app = appModule[0];
-          const hooks = appModule[1];
-          if (!app || !app.use) {
-            app = (0, import_express.default)();
-          }
-          initApp(app);
-          if (config) {
-            const { middleware } = config;
-            initMiddlewares(middleware, app);
-          }
-          useRun(app);
-          (0, import_registerRoutes.default)(app, apiHandlerInfos);
-          if (hooks) {
-            const { afterLambdaRegisted } = hooks;
-            if (afterLambdaRegisted) {
-              afterLambdaRegisted(app);
-            }
-          }
-        } else if (mode === "function") {
+    async prepareApiServer({ pwd, config }) {
+      let app;
+      const apiDir = path.join(pwd, "./api");
+      const appContext = api.useAppContext();
+      const apiHandlerInfos = appContext.apiHandlerInfos;
+      const mode = appContext.apiMode;
+      if (mode === "framework") {
+        const appModule = await findAppModule(apiDir);
+        app = appModule[0];
+        const hooks = appModule[1];
+        if (!app || !app.use) {
           app = (0, import_express.default)();
-          initApp(app);
-          if (config) {
-            const { middleware: middleware1 } = config;
-            initMiddlewares(middleware1, app);
+        }
+        initApp(app);
+        if (config) {
+          const { middleware } = config;
+          initMiddlewares(middleware, app);
+        }
+        useRun(app);
+        (0, import_registerRoutes.default)(app, apiHandlerInfos);
+        if (hooks) {
+          const { afterLambdaRegisted } = hooks;
+          if (afterLambdaRegisted) {
+            afterLambdaRegisted(app);
           }
-          useRun(app);
-          (0, import_registerRoutes.default)(app, apiHandlerInfos);
-        } else {
-          throw new Error(`mode must be function or framework`);
         }
-        return (req, res) => new Promise((resolve, reject) => {
-          const handler = (err) => {
-            if (err) {
-              return reject(err);
-            }
-            return (0, import_finalhandler.default)(req, res, {})(null);
-          };
-          res.on("finish", (err) => {
-            if (err) {
-              return reject(err);
-            }
-            return resolve();
-          });
-          return app(req, res, handler);
+      } else if (mode === "function") {
+        app = (0, import_express.default)();
+        initApp(app);
+        if (config) {
+          const { middleware: middleware1 } = config;
+          initMiddlewares(middleware1, app);
+        }
+        useRun(app);
+        (0, import_registerRoutes.default)(app, apiHandlerInfos);
+      } else {
+        throw new Error(`mode must be function or framework`);
+      }
+      return (req, res) => new Promise((resolve, reject) => {
+        const handler = (err) => {
+          if (err) {
+            return reject(err);
+          }
+          return (0, import_finalhandler.default)(req, res, {})(null);
+        };
+        res.on("finish", (err) => {
+          if (err) {
+            return reject(err);
+          }
+          return resolve();
         });
+        return app(req, res, handler);
       });
     },
     prepareWebServer({ config }, next) {
-      var _a2;
+      var _a;
       const userConfig = api.useConfigContext();
-      if (!((_a2 = userConfig == null ? void 0 : userConfig.server) == null ? void 0 : _a2.enableFrameworkExt)) {
+      if (!((_a = userConfig == null ? void 0 : userConfig.server) == null ? void 0 : _a.enableFrameworkExt)) {
         return next();
       }
       const app = (0, import_express.default)();

package/dist/{js/node → cjs}/runtime/operators.js

@@ -15,26 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var operators_exports = {};
 __export(operators_exports, {
   Middleware: () => Middleware,
@@ -45,33 +25,32 @@ var import_context = require("../context");
 const Pipe = (func) => {
   return {
     name: "pipe",
-    execute(executeHelper, next) {
-      return __async(this, null, function* () {
-        const { inputs } = executeHelper;
-        const ctx = (0, import_context.useContext)();
-        const { res } = ctx;
-        if (typeof func === "function") {
-          let isPiped = true;
-          const end = (value) => {
-            isPiped = false;
-            if (typeof value === "function") {
-              value(res);
-              return;
-            }
-            return value;
-          };
-          const output = yield func(inputs, end);
-          if (!isPiped) {
-            if (output) {
-              return executeHelper.result = output;
-            } else {
-              return;
-            }
+    // eslint-disable-next-line consistent-return
+    async execute(executeHelper, next) {
+      const { inputs } = executeHelper;
+      const ctx = (0, import_context.useContext)();
+      const { res } = ctx;
+      if (typeof func === "function") {
+        let isPiped = true;
+        const end = (value) => {
+          isPiped = false;
+          if (typeof value === "function") {
+            value(res);
+            return;
+          }
+          return value;
+        };
+        const output = await func(inputs, end);
+        if (!isPiped) {
+          if (output) {
+            return executeHelper.result = output;
+          } else {
+            return;
           }
-          executeHelper.inputs = output;
-          yield next();
         }
-      });
+        executeHelper.inputs = output;
+        await next();
+      }
     }
   };
 };

package/dist/{js/node → cjs}/utils.js

@@ -2,22 +2,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -31,30 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var utils_exports = {};
 __export(utils_exports, {
   createRouteHandler: () => createRouteHandler,
@@ -91,15 +61,15 @@ const handleResponseMeta = (res, handler) => {
   }
 };
 const createRouteHandler = (handler) => {
-  const apiHandler = (req, res, next) => __async(void 0, null, function* () {
-    const input = yield getInputFromRequest(req);
+  const apiHandler = async (req, res, next) => {
+    const input = await getInputFromRequest(req);
     if ((0, import_bff_core.isWithMetaHandler)(handler)) {
       try {
         handleResponseMeta(res, handler);
         if (res.headersSent) {
           return;
         }
-        const result = yield handler(input);
+        const result = await handler(input);
         if (result && typeof result === "object") {
           return res.json(result);
         }
@@ -113,7 +83,7 @@ const createRouteHandler = (handler) => {
         throw error;
       }
     } else if ((0, import_bff_runtime.isSchemaHandler)(handler)) {
-      const result1 = yield handler(input);
+      const result1 = await handler(input);
       if (result1.type !== "HandleSuccess") {
         if (result1.type === "InputValidationError") {
           res.status(400);
@@ -128,9 +98,9 @@ const createRouteHandler = (handler) => {
     } else {
       const args = Object.values(input.params).concat(input);
       try {
-        const body = yield handler(...args);
+        const body = await handler(...args);
         if (res.headersSent) {
-          return yield Promise.resolve();
+          return await Promise.resolve();
         }
         if (typeof body !== "undefined") {
           return res.json(body);
@@ -139,12 +109,12 @@ const createRouteHandler = (handler) => {
         return next(e);
       }
     }
-  });
+  };
   Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
   return apiHandler;
 };
 const isNormalMethod = (httpMethod) => import_bff_core.httpMethods.includes(httpMethod);
-const getInputFromRequest = (request) => __async(void 0, null, function* () {
+const getInputFromRequest = async (request) => {
   const draft = {
     params: request.params,
     query: request.query,
@@ -158,7 +128,7 @@ const getInputFromRequest = (request) => __async(void 0, null, function* () {
   } else if ((0, import_type_is.default)(request, [
     "multipart/form-data"
   ])) {
-    draft.formData = yield resolveFormData(request);
+    draft.formData = await resolveFormData(request);
   } else if ((0, import_type_is.default)(request, [
     "application/x-www-form-urlencoded"
   ])) {
@@ -167,7 +137,7 @@ const getInputFromRequest = (request) => __async(void 0, null, function* () {
     draft.body = request.body;
   }
   return draft;
-});
+};
 const resolveFormData = (request) => {
   const form = (0, import_formidable.default)({
     multiples: true
@@ -177,7 +147,10 @@ const resolveFormData = (request) => {
       if (err) {
         reject(err);
       }
-      resolve(__spreadValues(__spreadValues({}, fields), files));
+      resolve({
+        ...fields,
+        ...files
+      });
     });
   });
 };

package/dist/{js/treeshaking → esm}/runtime/operators.js

@@ -126,7 +126,8 @@ import { useContext } from "../context";
 var Pipe = function(func) {
     return {
         name: "pipe",
-        execute: function execute(executeHelper, next) {
+        execute: // eslint-disable-next-line consistent-return
+        function execute(executeHelper, next) {
             return _asyncToGenerator(function() {
                 var inputs, ctx, res, isPiped, end, output;
                 return __generator(this, function(_state) {

package/dist/esm-node/plugin.js

@@ -0,0 +1,149 @@
+import * as path from "path";
+import express from "express";
+import cookieParser from "cookie-parser";
+import { fs, createDebugger, compatRequire } from "@modern-js/utils";
+import finalhandler from "finalhandler";
+import { run } from "./context";
+import registerRoutes from "./registerRoutes";
+const debug = createDebugger("express");
+const findAppModule = async (apiDir) => {
+  const exts = [
+    ".ts",
+    ".js"
+  ];
+  const paths = exts.map((ext) => path.resolve(apiDir, `app${ext}`));
+  for (const filename of paths) {
+    if (await fs.pathExists(filename)) {
+      delete require.cache[filename];
+      return [
+        compatRequire(filename),
+        require(filename)
+      ];
+    }
+  }
+  return [];
+};
+const initMiddlewares = (middleware, app) => {
+  middleware.forEach((middlewareItem) => {
+    const middlewareFunc = typeof middlewareItem === "string" ? compatRequire(middlewareItem) : middlewareItem;
+    app.use(middlewareFunc);
+  });
+};
+const useRun = (app) => {
+  app.use((req, res, next) => {
+    run({
+      req,
+      res
+    }, next);
+  });
+};
+const initApp = (app) => {
+  app.use(cookieParser());
+  app.use(express.text());
+  app.use(express.urlencoded({
+    extended: true
+  }));
+  app.use(express.json());
+  return app;
+};
+var plugin_default = () => ({
+  name: "@modern-js/plugin-express",
+  pre: [
+    "@modern-js/plugin-bff"
+  ],
+  post: [
+    "@modern-js/plugin-server"
+  ],
+  setup: (api) => ({
+    async prepareApiServer({ pwd, config }) {
+      let app;
+      const apiDir = path.join(pwd, "./api");
+      const appContext = api.useAppContext();
+      const apiHandlerInfos = appContext.apiHandlerInfos;
+      const mode = appContext.apiMode;
+      if (mode === "framework") {
+        const appModule = await findAppModule(apiDir);
+        app = appModule[0];
+        const hooks = appModule[1];
+        if (!app || !app.use) {
+          app = express();
+        }
+        initApp(app);
+        if (config) {
+          const { middleware } = config;
+          initMiddlewares(middleware, app);
+        }
+        useRun(app);
+        registerRoutes(app, apiHandlerInfos);
+        if (hooks) {
+          const { afterLambdaRegisted } = hooks;
+          if (afterLambdaRegisted) {
+            afterLambdaRegisted(app);
+          }
+        }
+      } else if (mode === "function") {
+        app = express();
+        initApp(app);
+        if (config) {
+          const { middleware: middleware1 } = config;
+          initMiddlewares(middleware1, app);
+        }
+        useRun(app);
+        registerRoutes(app, apiHandlerInfos);
+      } else {
+        throw new Error(`mode must be function or framework`);
+      }
+      return (req, res) => new Promise((resolve, reject) => {
+        const handler = (err) => {
+          if (err) {
+            return reject(err);
+          }
+          return finalhandler(req, res, {})(null);
+        };
+        res.on("finish", (err) => {
+          if (err) {
+            return reject(err);
+          }
+          return resolve();
+        });
+        return app(req, res, handler);
+      });
+    },
+    prepareWebServer({ config }, next) {
+      var _a;
+      const userConfig = api.useConfigContext();
+      if (!((_a = userConfig == null ? void 0 : userConfig.server) == null ? void 0 : _a.enableFrameworkExt)) {
+        return next();
+      }
+      const app = express();
+      initApp(app);
+      if (config) {
+        const { middleware } = config;
+        debug("web middleware", middleware);
+        initMiddlewares(middleware, app);
+      }
+      return (ctx) => new Promise((resolve, reject) => {
+        const { source: { req, res } } = ctx;
+        const handler = (err) => {
+          if (err) {
+            return reject(err);
+          }
+          if (res.headersSent && res.statusCode !== 200) {
+            finalhandler(req, res, {})(null);
+          }
+          return resolve();
+        };
+        res.on("finish", (err) => {
+          if (err) {
+            return reject(err);
+          }
+          return resolve();
+        });
+        return app(req, res, handler);
+      });
+    }
+  })
+});
+export {
+  plugin_default as default
+};

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

@@ -0,0 +1,47 @@
+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();
+      const { res } = ctx;
+      if (typeof func === "function") {
+        let isPiped = true;
+        const end = (value) => {
+          isPiped = false;
+          if (typeof value === "function") {
+            value(res);
+            return;
+          }
+          return value;
+        };
+        const output = await func(inputs, end);
+        if (!isPiped) {
+          if (output) {
+            return executeHelper.result = output;
+          } else {
+            return;
+          }
+        }
+        executeHelper.inputs = output;
+        await next();
+      }
+    }
+  };
+};
+const Middleware = (middleware) => {
+  return {
+    name: "middleware",
+    metadata(helper) {
+      const middlewares = helper.getMetadata("pipe") || [];
+      middlewares.push(middleware);
+      helper.setMetadata("middleware", middlewares);
+    }
+  };
+};
+export {
+  Middleware,
+  Pipe
+};

package/dist/{js/modern → esm-node}/utils.js

@@ -1,39 +1,3 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 import "reflect-metadata";
 import { httpMethods, isWithMetaHandler, HttpMetadata, ResponseMetaType, ValidationError } from "@modern-js/bff-core";
 import { isSchemaHandler } from "@modern-js/bff-runtime";
@@ -64,15 +28,15 @@ const handleResponseMeta = (res, handler) => {
   }
 };
 const createRouteHandler = (handler) => {
-  const apiHandler = (req, res, next) => __async(void 0, null, function* () {
-    const input = yield getInputFromRequest(req);
+  const apiHandler = async (req, res, next) => {
+    const input = await getInputFromRequest(req);
     if (isWithMetaHandler(handler)) {
       try {
         handleResponseMeta(res, handler);
         if (res.headersSent) {
           return;
         }
-        const result = yield handler(input);
+        const result = await handler(input);
         if (result && typeof result === "object") {
           return res.json(result);
         }
@@ -86,7 +50,7 @@ const createRouteHandler = (handler) => {
         throw error;
       }
     } else if (isSchemaHandler(handler)) {
-      const result1 = yield handler(input);
+      const result1 = await handler(input);
       if (result1.type !== "HandleSuccess") {
         if (result1.type === "InputValidationError") {
           res.status(400);
@@ -101,9 +65,9 @@ const createRouteHandler = (handler) => {
     } else {
       const args = Object.values(input.params).concat(input);
       try {
-        const body = yield handler(...args);
+        const body = await handler(...args);
         if (res.headersSent) {
-          return yield Promise.resolve();
+          return await Promise.resolve();
         }
         if (typeof body !== "undefined") {
           return res.json(body);
@@ -112,12 +76,12 @@ const createRouteHandler = (handler) => {
         return next(e);
       }
     }
-  });
+  };
   Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
   return apiHandler;
 };
 const isNormalMethod = (httpMethod) => httpMethods.includes(httpMethod);
-const getInputFromRequest = (request) => __async(void 0, null, function* () {
+const getInputFromRequest = async (request) => {
   const draft = {
     params: request.params,
     query: request.query,
@@ -131,7 +95,7 @@ const getInputFromRequest = (request) => __async(void 0, null, function* () {
   } else if (typeIs(request, [
     "multipart/form-data"
   ])) {
-    draft.formData = yield resolveFormData(request);
+    draft.formData = await resolveFormData(request);
   } else if (typeIs(request, [
     "application/x-www-form-urlencoded"
   ])) {
@@ -140,7 +104,7 @@ const getInputFromRequest = (request) => __async(void 0, null, function* () {
     draft.body = request.body;
   }
   return draft;
-});
+};
 const resolveFormData = (request) => {
   const form = formidable({
     multiples: true
@@ -150,7 +114,10 @@ const resolveFormData = (request) => {
       if (err) {
         reject(err);
       }
-      resolve(__spreadValues(__spreadValues({}, fields), files));
+      resolve({
+        ...fields,
+        ...files
+      });
     });
   });
 };

package/package.json

@@ -11,29 +11,28 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-beta.0",
+  "version": "2.6.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
-  "main": "./dist/js/node/cli/index.js",
-  "module": "./dist/js/treeshaking/cli/index.js",
-  "jsnext:modern": "./dist/js/modern/cli/index.js",
+  "main": "./dist/cjs/cli/index.js",
+  "module": "./dist/esm/cli/index.js",
   "exports": {
     "./types": "./types.d.ts",
     ".": {
       "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
+      "default": "./dist/cjs/cli/index.js"
     },
     "./cli": {
       "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
+      "default": "./dist/cjs/cli/index.js"
     },
     "./server": {
       "node": {
         "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
+        "import": "./dist/esm-node/index.js",
+        "require": "./dist/cjs/index.js"
       },
-      "default": "./dist/js/treeshaking/index.js"
+      "default": "./dist/esm/index.js"
     }
   },
   "dependencies": {
@@ -43,10 +42,10 @@
     "formidable": "^1.2.2",
     "reflect-metadata": "^0.1.13",
     "type-is": "^1.6.18",
-    "@modern-js/bff-core": "2.4.1-beta.0",
-    "@modern-js/bff-runtime": "2.4.0",
-    "@modern-js/types": "2.4.0",
-    "@modern-js/utils": "2.4.1-beta.0"
+    "@modern-js/bff-core": "2.6.0",
+    "@modern-js/bff-runtime": "2.6.0",
+    "@modern-js/types": "2.6.0",
+    "@modern-js/utils": "2.6.0"
   },
   "devDependencies": {
     "@types/cookie-parser": "^1.4.2",
@@ -62,11 +61,11 @@
     "supertest": "^6.1.6",
     "typescript": "^4",
     "zod": "^3.17.3",
-    "@modern-js/core": "2.4.1-beta.0",
-    "@modern-js/app-tools": "3.0.0-beta.0",
-    "@modern-js/server-core": "2.4.1-beta.0",
-    "@scripts/jest-config": "2.4.0",
-    "@scripts/build": "2.4.0"
+    "@modern-js/core": "2.6.0",
+    "@modern-js/app-tools": "2.6.0",
+    "@modern-js/server-core": "2.6.0",
+    "@scripts/jest-config": "2.6.0",
+    "@scripts/build": "2.6.0"
   },
   "peerDependencies": {
     "express": "^4.17.1"

package/dist/js/modern/plugin.js

@@ -1,171 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import * as path from "path";
-import express from "express";
-import cookieParser from "cookie-parser";
-import { fs, createDebugger, compatRequire } from "@modern-js/utils";
-import finalhandler from "finalhandler";
-import { run } from "./context";
-import registerRoutes from "./registerRoutes";
-const debug = createDebugger("express");
-const findAppModule = (apiDir) => __async(void 0, null, function* () {
-  const exts = [
-    ".ts",
-    ".js"
-  ];
-  const paths = exts.map((ext) => path.resolve(apiDir, `app${ext}`));
-  for (const filename of paths) {
-    if (yield fs.pathExists(filename)) {
-      delete require.cache[filename];
-      return [
-        compatRequire(filename),
-        require(filename)
-      ];
-    }
-  }
-  return [];
-});
-const initMiddlewares = (middleware, app) => {
-  middleware.forEach((middlewareItem) => {
-    const middlewareFunc = typeof middlewareItem === "string" ? compatRequire(middlewareItem) : middlewareItem;
-    app.use(middlewareFunc);
-  });
-};
-const useRun = (app) => {
-  app.use((req, res, next) => {
-    run({
-      req,
-      res
-    }, next);
-  });
-};
-const initApp = (app) => {
-  app.use(cookieParser());
-  app.use(express.text());
-  app.use(express.urlencoded({
-    extended: true
-  }));
-  app.use(express.json());
-  return app;
-};
-var plugin_default = () => ({
-  name: "@modern-js/plugin-express",
-  pre: [
-    "@modern-js/plugin-bff"
-  ],
-  post: [
-    "@modern-js/plugin-server"
-  ],
-  setup: (api) => ({
-    prepareApiServer(_0) {
-      return __async(this, arguments, function* ({ pwd, config }) {
-        let app;
-        const apiDir = path.join(pwd, "./api");
-        const appContext = api.useAppContext();
-        const apiHandlerInfos = appContext.apiHandlerInfos;
-        const mode = appContext.apiMode;
-        if (mode === "framework") {
-          const appModule = yield findAppModule(apiDir);
-          app = appModule[0];
-          const hooks = appModule[1];
-          if (!app || !app.use) {
-            app = express();
-          }
-          initApp(app);
-          if (config) {
-            const { middleware } = config;
-            initMiddlewares(middleware, app);
-          }
-          useRun(app);
-          registerRoutes(app, apiHandlerInfos);
-          if (hooks) {
-            const { afterLambdaRegisted } = hooks;
-            if (afterLambdaRegisted) {
-              afterLambdaRegisted(app);
-            }
-          }
-        } else if (mode === "function") {
-          app = express();
-          initApp(app);
-          if (config) {
-            const { middleware: middleware1 } = config;
-            initMiddlewares(middleware1, app);
-          }
-          useRun(app);
-          registerRoutes(app, apiHandlerInfos);
-        } else {
-          throw new Error(`mode must be function or framework`);
-        }
-        return (req, res) => new Promise((resolve, reject) => {
-          const handler = (err) => {
-            if (err) {
-              return reject(err);
-            }
-            return finalhandler(req, res, {})(null);
-          };
-          res.on("finish", (err) => {
-            if (err) {
-              return reject(err);
-            }
-            return resolve();
-          });
-          return app(req, res, handler);
-        });
-      });
-    },
-    prepareWebServer({ config }, next) {
-      var _a2;
-      const userConfig = api.useConfigContext();
-      if (!((_a2 = userConfig == null ? void 0 : userConfig.server) == null ? void 0 : _a2.enableFrameworkExt)) {
-        return next();
-      }
-      const app = express();
-      initApp(app);
-      if (config) {
-        const { middleware } = config;
-        debug("web middleware", middleware);
-        initMiddlewares(middleware, app);
-      }
-      return (ctx) => new Promise((resolve, reject) => {
-        const { source: { req, res } } = ctx;
-        const handler = (err) => {
-          if (err) {
-            return reject(err);
-          }
-          if (res.headersSent && res.statusCode !== 200) {
-            finalhandler(req, res, {})(null);
-          }
-          return resolve();
-        };
-        res.on("finish", (err) => {
-          if (err) {
-            return reject(err);
-          }
-          return resolve();
-        });
-        return app(req, res, handler);
-      });
-    }
-  })
-});
-export {
-  plugin_default as default
-};

package/dist/js/modern/runtime/operators.js

@@ -1,68 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import { useContext } from "../context";
-const Pipe = (func) => {
-  return {
-    name: "pipe",
-    execute(executeHelper, next) {
-      return __async(this, null, function* () {
-        const { inputs } = executeHelper;
-        const ctx = useContext();
-        const { res } = ctx;
-        if (typeof func === "function") {
-          let isPiped = true;
-          const end = (value) => {
-            isPiped = false;
-            if (typeof value === "function") {
-              value(res);
-              return;
-            }
-            return value;
-          };
-          const output = yield func(inputs, end);
-          if (!isPiped) {
-            if (output) {
-              return executeHelper.result = output;
-            } else {
-              return;
-            }
-          }
-          executeHelper.inputs = output;
-          yield next();
-        }
-      });
-    }
-  };
-};
-const Middleware = (middleware) => {
-  return {
-    name: "middleware",
-    metadata(helper) {
-      const middlewares = helper.getMetadata("pipe") || [];
-      middlewares.push(middleware);
-      helper.setMetadata("middleware", middlewares);
-    }
-  };
-};
-export {
-  Middleware,
-  Pipe
-};