@modern-js/plugin-express 1.5.6 → 1.6.1-beta.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @modern-js/plugin-express
 
+## 1.6.0
+
+### Minor Changes
+
+- 77a8e9e: feat: support bff operators
+
+### Patch Changes
+
+- f29e9ba: feat: simplify context usage, no longer depend on containers
+- Updated dependencies [77a8e9e]
+- Updated dependencies [2dacc89]
+- Updated dependencies [b220f1d]
+- Updated dependencies [7b9e302]
+- Updated dependencies [a90bc96]
+  - @modern-js/adapter-helpers@1.3.0
+  - @modern-js/bff-core@1.1.0
+  - @modern-js/bff-runtime@1.3.0
+  - @modern-js/types@1.5.5
+  - @modern-js/utils@1.7.9
+
 ## 1.5.6
 
 ### Patch Changes

package/dist/js/modern/plugin.js

@@ -1,8 +1,7 @@
 import * as path from 'path';
 import express from 'express';
 import cookieParser from 'cookie-parser';
-import { requireModule } from '@modern-js/bff-utils';
-import { fs, createDebugger } from '@modern-js/utils';
+import { fs, createDebugger, compatRequire } from '@modern-js/utils';
 import finalhandler from 'finalhandler';
 import { run } from "./context";
 import registerRoutes from "./registerRoutes";
@@ -14,7 +13,8 @@ const findAppModule = async apiDir => {
 
   for (const filename of paths) {
     if (await fs.pathExists(filename)) {
-      return requireModule(filename);
+      delete require.cache[filename];
+      return compatRequire(filename);
     }
   }
 
@@ -23,7 +23,7 @@ const findAppModule = async apiDir => {
 
 const initMiddlewares = (middleware, app) => {
   middleware.forEach(middlewareItem => {
-    const middlewareFunc = typeof middlewareItem === 'string' ? requireModule(middlewareItem) : middlewareItem;
+    const middlewareFunc = typeof middlewareItem === 'string' ? compatRequire(middlewareItem) : middlewareItem;
     app.use(middlewareFunc);
   });
 };
@@ -50,7 +50,7 @@ const initApp = app => {
 export default (() => ({
   name: '@modern-js/plugin-express',
   pre: ['@modern-js/plugin-bff'],
-  setup: () => ({
+  setup: api => ({
     async prepareApiServer({
       pwd,
       mode,
@@ -58,6 +58,8 @@ export default (() => ({
     }) {
       let app;
       const apiDir = path.join(pwd, './api');
+      const appContext = api.useAppContext();
+      const apiHandlerInfos = appContext.apiHandlerInfos;
 
       if (mode === 'framework') {
         app = await findAppModule(apiDir);
@@ -77,7 +79,7 @@ export default (() => ({
         }
 
         useRun(app);
-        registerRoutes(app);
+        registerRoutes(app, apiHandlerInfos);
       } else if (mode === 'function') {
         app = express();
         initApp(app);
@@ -90,7 +92,7 @@ export default (() => ({
         }
 
         useRun(app);
-        registerRoutes(app);
+        registerRoutes(app, apiHandlerInfos);
       } else {
         throw new Error(`mode must be function or framework`);
       }

package/dist/js/modern/registerRoutes.js

@@ -1,111 +1,16 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+import 'reflect-metadata';
+import { createRouteHandler } from "./utils";
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { HttpMethod, useAPIHandlerInfos } from '@modern-js/bff-utils';
-import { isSchemaHandler } from '@modern-js/bff-runtime';
-import typeIs from 'type-is';
-import formidable from 'formidable';
-import { sortDynamicRoutes } from '@modern-js/adapter-helpers';
-import { createDebugger } from '@modern-js/utils';
-const debug = createDebugger('express');
-
-const registerRoutes = app => {
-  const handlerInfos = useAPIHandlerInfos();
-  sortDynamicRoutes(handlerInfos);
-  debug('handlerInfos', handlerInfos);
+const registerRoutes = (app, handlerInfos) => {
   handlerInfos.forEach(({
-    path,
+    routePath,
     handler,
-    method,
-    name
+    httpMethod
   }) => {
-    const wrappedHandler = async (req, res, next) => {
-      const input = await getInputFromRequest(req);
-
-      if (isSchemaHandler(handler)) {
-        const result = await handler(input);
-
-        if (result.type !== 'HandleSuccess') {
-          if (result.type === 'InputValidationError') {
-            res.status(400);
-          } else {
-            res.status(500);
-          }
-
-          return res.json(result.message);
-        } else {
-          res.status(200);
-          return res.json(result.value);
-        }
-      } else {
-        const args = Object.values(input.params).concat(input);
-
-        try {
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-expect-error
-          const body = await handler(...args); // this should never happen
-
-          if (res.headersSent) {
-            return await Promise.resolve();
-          }
-
-          return res.json(body);
-        } catch (e) {
-          return next(e);
-        }
-      }
-    };
-
-    Object.defineProperties(wrappedHandler, Object.getOwnPropertyDescriptors(handler));
-
-    if (isNormalMethod(method)) {
-      const routeName = method.toLowerCase();
-      app[routeName](path || name, wrappedHandler);
-    } else {
-      throw new Error(`Unknown HTTP Method: ${method}`);
-    }
+    const routeHandler = createRouteHandler(handler);
+    const method = httpMethod.toLowerCase();
+    app[method](routePath, routeHandler);
   });
 };
 
-const isNormalMethod = method => Object.keys(HttpMethod).includes(method);
-
-export default registerRoutes;
-
-const getInputFromRequest = async request => {
-  const draft = {
-    params: request.params,
-    query: request.query,
-    headers: request.headers,
-    cookies: request.headers.cookie
-  };
-
-  if (typeIs(request, ['application/json'])) {
-    draft.data = request.body;
-  } else if (typeIs(request, ['multipart/form-data'])) {
-    draft.formData = await resolveFormData(request);
-  } else if (typeIs(request, ['application/x-www-form-urlencoded'])) {
-    draft.formUrlencoded = request.body;
-  } else {
-    draft.body = request.body;
-  }
-
-  return draft;
-};
-
-const resolveFormData = request => {
-  const form = formidable({
-    multiples: true
-  });
-  return new Promise((resolve, reject) => {
-    form.parse(request, (err, fields, files) => {
-      if (err) {
-        reject(err);
-      }
-
-      resolve(_objectSpread(_objectSpread({}, fields), files));
-    });
-  });
-};
+export default registerRoutes;

package/dist/js/modern/runtime.js

@@ -1 +1,2 @@
-export { useContext } from "./context";
+export { useContext } from "./context";
+export * from '@modern-js/bff-core';

package/dist/js/modern/utils.js

@@ -0,0 +1,139 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import 'reflect-metadata';
+import { httpMethods, isWithMetaHandler, HttpMetadata, ResponseMetaType } from '@modern-js/bff-core';
+import { isSchemaHandler } from '@modern-js/bff-runtime';
+import typeIs from 'type-is';
+import formidable from 'formidable';
+
+const handleResponseMeta = (res, handler) => {
+  const responseMeta = Reflect.getMetadata(HttpMetadata.Response, handler);
+
+  if (Array.isArray(responseMeta)) {
+    for (const meta of responseMeta) {
+      const metaType = meta.type;
+      const metaValue = meta.value;
+
+      switch (metaType) {
+        case ResponseMetaType.Headers:
+          // eslint-disable-next-line @typescript-eslint/ban-types
+          for (const [key, value] of Object.entries(metaValue)) {
+            res.append(key, value);
+          }
+
+          break;
+
+        case ResponseMetaType.Redirect:
+          res.redirect(metaValue);
+          break;
+
+        case ResponseMetaType.StatusCode:
+          res.status(metaValue);
+          break;
+
+        default:
+          break;
+      }
+    }
+  }
+};
+
+export const createRouteHandler = handler => {
+  const apiHandler = async (req, res, next) => {
+    const input = await getInputFromRequest(req);
+
+    if (isWithMetaHandler(handler)) {
+      try {
+        handleResponseMeta(res, handler);
+        const result = await handler(input);
+        return res.json(result);
+      } catch (error) {
+        if (error instanceof Error) {
+          if (error.status) {
+            res.status(error.status);
+          } else {
+            res.status(500);
+          }
+
+          return res.json({
+            code: error.code,
+            message: error.message
+          });
+        }
+      }
+    } else if (isSchemaHandler(handler)) {
+      const result = await handler(input);
+
+      if (result.type !== 'HandleSuccess') {
+        if (result.type === 'InputValidationError') {
+          res.status(400);
+        } else {
+          res.status(500);
+        }
+
+        return res.json(result.message);
+      } else {
+        res.status(200);
+        return res.json(result.value);
+      }
+    } else {
+      const args = Object.values(input.params).concat(input);
+
+      try {
+        const body = await handler(...args); // this should never happen
+
+        if (res.headersSent) {
+          return await Promise.resolve();
+        }
+
+        return res.json(body);
+      } catch (e) {
+        return next(e);
+      }
+    }
+  };
+
+  Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
+  return apiHandler;
+};
+export const isNormalMethod = httpMethod => httpMethods.includes(httpMethod);
+
+const getInputFromRequest = async request => {
+  const draft = {
+    params: request.params,
+    query: request.query,
+    headers: request.headers,
+    cookies: request.headers.cookie
+  };
+
+  if (typeIs(request, ['application/json'])) {
+    draft.data = request.body;
+  } else if (typeIs(request, ['multipart/form-data'])) {
+    draft.formData = await resolveFormData(request);
+  } else if (typeIs(request, ['application/x-www-form-urlencoded'])) {
+    draft.formUrlencoded = request.body;
+  } else {
+    draft.body = request.body;
+  }
+
+  return draft;
+};
+
+const resolveFormData = request => {
+  const form = formidable({
+    multiples: true
+  });
+  return new Promise((resolve, reject) => {
+    form.parse(request, (err, fields, files) => {
+      if (err) {
+        reject(err);
+      }
+
+      resolve(_objectSpread(_objectSpread({}, fields), files));
+    });
+  });
+};

package/dist/js/node/plugin.js

@@ -11,8 +11,6 @@ var _express = _interopRequireDefault(require("express"));
 
 var _cookieParser = _interopRequireDefault(require("cookie-parser"));
 
-var _bffUtils = require("@modern-js/bff-utils");
-
 var _utils = require("@modern-js/utils");
 
 var _finalhandler = _interopRequireDefault(require("finalhandler"));
@@ -35,7 +33,8 @@ const findAppModule = async apiDir => {
 
   for (const filename of paths) {
     if (await _utils.fs.pathExists(filename)) {
-      return (0, _bffUtils.requireModule)(filename);
+      delete require.cache[filename];
+      return (0, _utils.compatRequire)(filename);
     }
   }
 
@@ -44,7 +43,7 @@ const findAppModule = async apiDir => {
 
 const initMiddlewares = (middleware, app) => {
   middleware.forEach(middlewareItem => {
-    const middlewareFunc = typeof middlewareItem === 'string' ? (0, _bffUtils.requireModule)(middlewareItem) : middlewareItem;
+    const middlewareFunc = typeof middlewareItem === 'string' ? (0, _utils.compatRequire)(middlewareItem) : middlewareItem;
     app.use(middlewareFunc);
   });
 };
@@ -71,7 +70,7 @@ const initApp = app => {
 var _default = () => ({
   name: '@modern-js/plugin-express',
   pre: ['@modern-js/plugin-bff'],
-  setup: () => ({
+  setup: api => ({
     async prepareApiServer({
       pwd,
       mode,
@@ -79,6 +78,8 @@ var _default = () => ({
     }) {
       let app;
       const apiDir = path.join(pwd, './api');
+      const appContext = api.useAppContext();
+      const apiHandlerInfos = appContext.apiHandlerInfos;
 
       if (mode === 'framework') {
         app = await findAppModule(apiDir);
@@ -98,7 +99,7 @@ var _default = () => ({
         }
 
         useRun(app);
-        (0, _registerRoutes.default)(app);
+        (0, _registerRoutes.default)(app, apiHandlerInfos);
       } else if (mode === 'function') {
         app = (0, _express.default)();
         initApp(app);
@@ -111,7 +112,7 @@ var _default = () => ({
         }
 
         useRun(app);
-        (0, _registerRoutes.default)(app);
+        (0, _registerRoutes.default)(app, apiHandlerInfos);
       } else {
         throw new Error(`mode must be function or framework`);
       }

package/dist/js/node/registerRoutes.js

@@ -5,123 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _bffUtils = require("@modern-js/bff-utils");
+require("reflect-metadata");
 
-var _bffRuntime = require("@modern-js/bff-runtime");
+var _utils = require("./utils");
 
-var _typeIs = _interopRequireDefault(require("type-is"));
-
-var _formidable = _interopRequireDefault(require("formidable"));
-
-var _adapterHelpers = require("@modern-js/adapter-helpers");
-
-var _utils = require("@modern-js/utils");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-const debug = (0, _utils.createDebugger)('express');
-
-const registerRoutes = app => {
-  const handlerInfos = (0, _bffUtils.useAPIHandlerInfos)();
-  (0, _adapterHelpers.sortDynamicRoutes)(handlerInfos);
-  debug('handlerInfos', handlerInfos);
+const registerRoutes = (app, handlerInfos) => {
   handlerInfos.forEach(({
-    path,
+    routePath,
     handler,
-    method,
-    name
+    httpMethod
   }) => {
-    const wrappedHandler = async (req, res, next) => {
-      const input = await getInputFromRequest(req);
-
-      if ((0, _bffRuntime.isSchemaHandler)(handler)) {
-        const result = await handler(input);
-
-        if (result.type !== 'HandleSuccess') {
-          if (result.type === 'InputValidationError') {
-            res.status(400);
-          } else {
-            res.status(500);
-          }
-
-          return res.json(result.message);
-        } else {
-          res.status(200);
-          return res.json(result.value);
-        }
-      } else {
-        const args = Object.values(input.params).concat(input);
-
-        try {
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-expect-error
-          const body = await handler(...args); // this should never happen
-
-          if (res.headersSent) {
-            return await Promise.resolve();
-          }
-
-          return res.json(body);
-        } catch (e) {
-          return next(e);
-        }
-      }
-    };
-
-    Object.defineProperties(wrappedHandler, Object.getOwnPropertyDescriptors(handler));
-
-    if (isNormalMethod(method)) {
-      const routeName = method.toLowerCase();
-      app[routeName](path || name, wrappedHandler);
-    } else {
-      throw new Error(`Unknown HTTP Method: ${method}`);
-    }
+    const routeHandler = (0, _utils.createRouteHandler)(handler);
+    const method = httpMethod.toLowerCase();
+    app[method](routePath, routeHandler);
   });
 };
 
-const isNormalMethod = method => Object.keys(_bffUtils.HttpMethod).includes(method);
-
 var _default = registerRoutes;
-exports.default = _default;
-
-const getInputFromRequest = async request => {
-  const draft = {
-    params: request.params,
-    query: request.query,
-    headers: request.headers,
-    cookies: request.headers.cookie
-  };
-
-  if ((0, _typeIs.default)(request, ['application/json'])) {
-    draft.data = request.body;
-  } else if ((0, _typeIs.default)(request, ['multipart/form-data'])) {
-    draft.formData = await resolveFormData(request);
-  } else if ((0, _typeIs.default)(request, ['application/x-www-form-urlencoded'])) {
-    draft.formUrlencoded = request.body;
-  } else {
-    draft.body = request.body;
-  }
-
-  return draft;
-};
-
-const resolveFormData = request => {
-  const form = (0, _formidable.default)({
-    multiples: true
-  });
-  return new Promise((resolve, reject) => {
-    form.parse(request, (err, fields, files) => {
-      if (err) {
-        reject(err);
-      }
-
-      resolve(_objectSpread(_objectSpread({}, fields), files));
-    });
-  });
-};
+exports.default = _default;

package/dist/js/node/runtime.js

@@ -3,6 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  useContext: true
+};
 Object.defineProperty(exports, "useContext", {
   enumerable: true,
   get: function () {
@@ -10,4 +13,18 @@ Object.defineProperty(exports, "useContext", {
   }
 });
 
-var _context = require("./context");
+var _context = require("./context");
+
+var _bffCore = require("@modern-js/bff-core");
+
+Object.keys(_bffCore).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _bffCore[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _bffCore[key];
+    }
+  });
+});

package/dist/js/node/utils.js

@@ -0,0 +1,157 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isNormalMethod = exports.createRouteHandler = void 0;
+
+require("reflect-metadata");
+
+var _bffCore = require("@modern-js/bff-core");
+
+var _bffRuntime = require("@modern-js/bff-runtime");
+
+var _typeIs = _interopRequireDefault(require("type-is"));
+
+var _formidable = _interopRequireDefault(require("formidable"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+const handleResponseMeta = (res, handler) => {
+  const responseMeta = Reflect.getMetadata(_bffCore.HttpMetadata.Response, handler);
+
+  if (Array.isArray(responseMeta)) {
+    for (const meta of responseMeta) {
+      const metaType = meta.type;
+      const metaValue = meta.value;
+
+      switch (metaType) {
+        case _bffCore.ResponseMetaType.Headers:
+          // eslint-disable-next-line @typescript-eslint/ban-types
+          for (const [key, value] of Object.entries(metaValue)) {
+            res.append(key, value);
+          }
+
+          break;
+
+        case _bffCore.ResponseMetaType.Redirect:
+          res.redirect(metaValue);
+          break;
+
+        case _bffCore.ResponseMetaType.StatusCode:
+          res.status(metaValue);
+          break;
+
+        default:
+          break;
+      }
+    }
+  }
+};
+
+const createRouteHandler = handler => {
+  const apiHandler = async (req, res, next) => {
+    const input = await getInputFromRequest(req);
+
+    if ((0, _bffCore.isWithMetaHandler)(handler)) {
+      try {
+        handleResponseMeta(res, handler);
+        const result = await handler(input);
+        return res.json(result);
+      } catch (error) {
+        if (error instanceof Error) {
+          if (error.status) {
+            res.status(error.status);
+          } else {
+            res.status(500);
+          }
+
+          return res.json({
+            code: error.code,
+            message: error.message
+          });
+        }
+      }
+    } else if ((0, _bffRuntime.isSchemaHandler)(handler)) {
+      const result = await handler(input);
+
+      if (result.type !== 'HandleSuccess') {
+        if (result.type === 'InputValidationError') {
+          res.status(400);
+        } else {
+          res.status(500);
+        }
+
+        return res.json(result.message);
+      } else {
+        res.status(200);
+        return res.json(result.value);
+      }
+    } else {
+      const args = Object.values(input.params).concat(input);
+
+      try {
+        const body = await handler(...args); // this should never happen
+
+        if (res.headersSent) {
+          return await Promise.resolve();
+        }
+
+        return res.json(body);
+      } catch (e) {
+        return next(e);
+      }
+    }
+  };
+
+  Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
+  return apiHandler;
+};
+
+exports.createRouteHandler = createRouteHandler;
+
+const isNormalMethod = httpMethod => _bffCore.httpMethods.includes(httpMethod);
+
+exports.isNormalMethod = isNormalMethod;
+
+const getInputFromRequest = async request => {
+  const draft = {
+    params: request.params,
+    query: request.query,
+    headers: request.headers,
+    cookies: request.headers.cookie
+  };
+
+  if ((0, _typeIs.default)(request, ['application/json'])) {
+    draft.data = request.body;
+  } else if ((0, _typeIs.default)(request, ['multipart/form-data'])) {
+    draft.formData = await resolveFormData(request);
+  } else if ((0, _typeIs.default)(request, ['application/x-www-form-urlencoded'])) {
+    draft.formUrlencoded = request.body;
+  } else {
+    draft.body = request.body;
+  }
+
+  return draft;
+};
+
+const resolveFormData = request => {
+  const form = (0, _formidable.default)({
+    multiples: true
+  });
+  return new Promise((resolve, reject) => {
+    form.parse(request, (err, fields, files) => {
+      if (err) {
+        reject(err);
+      }
+
+      resolve(_objectSpread(_objectSpread({}, fields), files));
+    });
+  });
+};

package/dist/types/plugin.d.ts

@@ -1,5 +1,4 @@
 import type { ServerPlugin } from '@modern-js/server-core';
-export declare type Mode = 'function' | 'framework';
 
 declare const _default: () => ServerPlugin;
 

package/dist/types/registerRoutes.d.ts

@@ -1,3 +1,5 @@
-import { Express } from 'express';
-declare const registerRoutes: (app: Express) => void;
+import 'reflect-metadata';
+import type { APIHandlerInfo } from '@modern-js/bff-core';
+import type { Express } from 'express';
+declare const registerRoutes: (app: Express, handlerInfos: APIHandlerInfo[]) => void;
 export default registerRoutes;

package/dist/types/runtime.d.ts

@@ -1 +1,2 @@
-export { useContext } from './context';
+export { useContext } from './context';
+export * from '@modern-js/bff-core';

package/dist/types/utils.d.ts

@@ -0,0 +1,8 @@
+import 'reflect-metadata';
+import { HttpMethod } from '@modern-js/bff-core';
+import type { APIHandlerInfo } from '@modern-js/bff-core';
+import type { Request, Response, NextFunction } from 'express';
+declare 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;
+export {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.5.6",
+  "version": "1.6.1-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -34,20 +34,21 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/adapter-helpers": "^1.2.6",
-    "@modern-js/bff-runtime": "^1.2.4",
-    "@modern-js/bff-utils": "^1.2.9",
-    "@modern-js/types": "^1.5.4",
-    "@modern-js/utils": "^1.7.6",
+    "@modern-js/adapter-helpers": "^1.3.0",
+    "@modern-js/bff-core": "^1.1.0",
+    "@modern-js/bff-runtime": "^1.3.0",
+    "@modern-js/types": "^1.5.5",
+    "@modern-js/utils": "^1.7.11",
     "cookie-parser": "^1.4.5",
     "finalhandler": "^1.1.2",
     "formidable": "^1.2.2",
+    "reflect-metadata": "^0.1.13",
     "type-is": "^1.6.18"
   },
   "devDependencies": {
-    "@modern-js/core": "1.11.2",
-    "@modern-js/server-core": "1.3.5",
-    "@modern-js/server-utils": "1.2.10",
+    "@modern-js/core": "1.12.4",
+    "@modern-js/server-core": "1.4.0",
+    "@modern-js/server-utils": "1.2.11",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/cookie-parser": "^1.4.2",
@@ -61,7 +62,8 @@
     "express": "^4.17.1",
     "jest": "^27",
     "supertest": "^6.1.6",
-    "typescript": "^4"
+    "typescript": "^4",
+    "zod": "^3.17.3"
   },
   "modernConfig": {
     "output": {
@@ -73,7 +75,8 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "wireit": {
     "build": {

package/types.d.ts

@@ -15,5 +15,7 @@ declare module '@modern-js/runtime/server' {
 
   export function hook(attacher: ExpressAttacher): ExpressAttacher;
 
+  export * from '@modern-js/bff-core';
+
   export * from '@modern-js/bff-runtime';
 }