@modern-js/plugin-express 2.0.0-beta.3 → 2.0.0-beta.6

package/dist/js/modern/utils.js

@@ -1,11 +1,44 @@
-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, ValidationError } from '@modern-js/bff-core';
-import { isSchemaHandler } from '@modern-js/bff-runtime';
-import typeIs from 'type-is';
-import formidable from 'formidable';
+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";
+import typeIs from "type-is";
+import formidable from "formidable";
 const handleResponseMeta = (res, handler) => {
   const responseMeta = Reflect.getMetadata(HttpMetadata.Response, handler);
   if (Array.isArray(responseMeta)) {
@@ -14,7 +47,6 @@ const handleResponseMeta = (res, handler) => {
       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);
           }
@@ -31,24 +63,22 @@ const handleResponseMeta = (res, handler) => {
     }
   }
 };
-export const createRouteHandler = handler => {
-  const apiHandler = async (req, res, next) => {
-    const input = await getInputFromRequest(req);
+const createRouteHandler = (handler) => {
+  const apiHandler = (req, res, next) => __async(void 0, null, function* () {
+    const input = yield getInputFromRequest(req);
     if (isWithMetaHandler(handler)) {
       try {
         handleResponseMeta(res, handler);
         if (res.headersSent) {
           return;
         }
-        const result = await handler(input);
-        if (result && typeof result === 'object') {
-          // eslint-disable-next-line consistent-return
+        const result = yield handler(input);
+        if (result && typeof result === "object") {
           return res.json(result);
         }
       } catch (error) {
         if (error instanceof ValidationError) {
           res.status(error.status);
-          // eslint-disable-next-line consistent-return
           return res.json({
             message: error.message
           });
@@ -56,63 +86,62 @@ export const createRouteHandler = handler => {
         throw error;
       }
     } else if (isSchemaHandler(handler)) {
-      const result = await handler(input);
-      if (result.type !== 'HandleSuccess') {
-        if (result.type === 'InputValidationError') {
+      const result1 = yield handler(input);
+      if (result1.type !== "HandleSuccess") {
+        if (result1.type === "InputValidationError") {
           res.status(400);
         } else {
           res.status(500);
         }
-        // eslint-disable-next-line consistent-return
-        return res.json(result.message);
+        return res.json(result1.message);
       } else {
         res.status(200);
-        // eslint-disable-next-line consistent-return
-        return res.json(result.value);
+        return res.json(result1.value);
       }
     } else {
       const args = Object.values(input.params).concat(input);
       try {
-        const body = await handler(...args);
-
-        // this should never happen
+        const body = yield handler(...args);
         if (res.headersSent) {
-          // eslint-disable-next-line consistent-return
-          return await Promise.resolve();
+          return yield Promise.resolve();
         }
-        if (typeof body !== 'undefined') {
-          // eslint-disable-next-line consistent-return
+        if (typeof body !== "undefined") {
           return res.json(body);
         }
       } catch (e) {
-        // eslint-disable-next-line consistent-return
         return next(e);
       }
     }
-  };
+  });
   Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
   return apiHandler;
 };
-export const isNormalMethod = httpMethod => httpMethods.includes(httpMethod);
-const getInputFromRequest = async request => {
+const isNormalMethod = (httpMethod) => httpMethods.includes(httpMethod);
+const getInputFromRequest = (request) => __async(void 0, null, function* () {
   const draft = {
     params: request.params,
     query: request.query,
     headers: request.headers,
     cookies: request.headers.cookie
   };
-  if (typeIs(request, ['application/json'])) {
+  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'])) {
+  } else if (typeIs(request, [
+    "multipart/form-data"
+  ])) {
+    draft.formData = yield 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 resolveFormData = (request) => {
   const form = formidable({
     multiples: true
   });
@@ -121,7 +150,11 @@ const resolveFormData = request => {
       if (err) {
         reject(err);
       }
-      resolve(_objectSpread(_objectSpread({}, fields), files));
+      resolve(__spreadValues(__spreadValues({}, fields), files));
     });
   });
-};
+};
+export {
+  createRouteHandler,
+  isNormalMethod
+};

package/dist/js/node/cli/index.js

@@ -1,37 +1,53 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cli_exports = {};
+__export(cli_exports, {
+  default: () => cli_default
 });
-exports.default = void 0;
-var path = _interopRequireWildcard(require("path"));
-var _utils = require("@modern-js/utils");
-var _bffCore = require("@modern-js/bff-core");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var _default = () => ({
-  name: '@modern-js/plugin-express',
-  setup: api => {
+module.exports = __toCommonJS(cli_exports);
+var path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_bff_core = require("@modern-js/bff-core");
+var cli_default = () => ({
+  name: "@modern-js/plugin-express",
+  setup: (api) => {
     let bffExportsUtils;
-    const {
-      useAppContext
-    } = api;
-    const runtimeModulePath = path.resolve(__dirname, '../runtime');
+    const { useAppContext } = api;
+    const runtimeModulePath = path.resolve(__dirname, "../runtime");
     return {
       config() {
         const appContext = useAppContext();
-        const {
-          appDirectory
-        } = appContext;
-        bffExportsUtils = (0, _utils.createRuntimeExportsUtils)(appContext.internalDirectory, 'server');
+        const { appDirectory } = appContext;
+        bffExportsUtils = (0, import_utils.createRuntimeExportsUtils)(appContext.internalDirectory, "server");
         const serverRuntimePath = bffExportsUtils.getPath();
-        const relativeRuntimePath = (0, _bffCore.getRelativeRuntimePath)(appDirectory, serverRuntimePath);
-        if (process.env.NODE_ENV === 'production') {
+        const relativeRuntimePath = (0, import_bff_core.getRelativeRuntimePath)(appDirectory, serverRuntimePath);
+        if (process.env.NODE_ENV === "production") {
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': relativeRuntimePath,
-                '@modern-js/runtime/express': relativeRuntimePath
+                "@modern-js/runtime/server": relativeRuntimePath,
+                "@modern-js/runtime/express": relativeRuntimePath
               }
             }
           };
@@ -39,17 +55,25 @@ var _default = () => ({
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': serverRuntimePath,
-                '@modern-js/runtime/express': serverRuntimePath
+                "@modern-js/runtime/server": serverRuntimePath,
+                "@modern-js/runtime/express": serverRuntimePath
               }
             }
           };
         }
       },
+      collectServerPlugins({ plugins }) {
+        plugins.push({
+          "@modern-js/plugin-express": "@modern-js/plugin-express/server"
+        });
+        return {
+          plugins
+        };
+      },
       addRuntimeExports(input) {
         const currentFile = bffExportsUtils.getPath();
         const relativeRuntimeModulePath = path.relative(path.dirname(currentFile), runtimeModulePath);
-        const relativeFramePath = path.relative(path.dirname(currentFile), require.resolve('express'));
+        const relativeFramePath = path.relative(path.dirname(currentFile), require.resolve("express"));
         bffExportsUtils.addExport(`const pluginRuntime = require('${relativeRuntimeModulePath}');
            const express = require('${relativeFramePath}')
            module.exports = {
@@ -62,4 +86,5 @@ var _default = () => ({
     };
   }
 });
-exports.default = _default;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/node/context.js

@@ -1,13 +1,30 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var context_exports = {};
+__export(context_exports, {
+  run: () => run,
+  useContext: () => useContext
 });
-exports.useContext = exports.run = void 0;
-var _bffCore = require("@modern-js/bff-core");
-const {
+module.exports = __toCommonJS(context_exports);
+var import_bff_core = require("@modern-js/bff-core");
+const { run, useContext } = (0, import_bff_core.createStorage)();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
   run,
   useContext
-} = (0, _bffCore.createStorage)();
-exports.useContext = useContext;
-exports.run = run;
+});

package/dist/js/node/index.js

@@ -1,23 +1,34 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+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(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var src_exports = {};
+__export(src_exports, {
+  default: () => src_default
 });
-var _exportNames = {};
-exports.default = void 0;
-var _plugin = _interopRequireDefault(require("./plugin"));
-var _context = require("./context");
-Object.keys(_context).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _context[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _context[key];
-    }
-  });
-});
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var _default = _plugin.default;
-exports.default = _default;
+module.exports = __toCommonJS(src_exports);
+var import_plugin = __toESM(require("./plugin"));
+__reExport(src_exports, require("./context"), module.exports);
+var src_default = import_plugin.default;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});