@modern-js/plugin-express 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/js/node/plugin.js

@@ -1,163 +1,176 @@
-"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 stdin_exports = {};
+__export(stdin_exports, {
+  default: () => plugin_default
 });
-exports.default = void 0;
-var path = _interopRequireWildcard(require("path"));
-var _express = _interopRequireDefault(require("express"));
-var _cookieParser = _interopRequireDefault(require("cookie-parser"));
-var _utils = require("@modern-js/utils");
-var _finalhandler = _interopRequireDefault(require("finalhandler"));
-var _context = require("./context");
-var _registerRoutes = _interopRequireDefault(require("./registerRoutes"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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; }
-const debug = (0, _utils.createDebugger)('express');
-const findAppModule = async apiDir => {
-  const exts = ['.ts', '.js'];
-  const paths = exts.map(ext => path.resolve(apiDir, `app${ext}`));
+module.exports = __toCommonJS(stdin_exports);
+var path = __toESM(require("path"));
+var import_express = __toESM(require("express"));
+var import_cookie_parser = __toESM(require("cookie-parser"));
+var import_utils = require("@modern-js/utils");
+var import_finalhandler = __toESM(require("finalhandler"));
+var import_context = require("./context");
+var import_registerRoutes = __toESM(require("./registerRoutes"));
+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());
+  });
+};
+const debug = (0, import_utils.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 (await _utils.fs.pathExists(filename)) {
-      // 每次获取 app.ts 的时候，避免使用缓存的 app.ts
+    if (yield import_utils.fs.pathExists(filename)) {
       delete require.cache[filename];
-      return [(0, _utils.compatRequire)(filename), require(filename)];
+      return [(0, import_utils.compatRequire)(filename), require(filename)];
     }
   }
   return [];
-};
+});
 const initMiddlewares = (middleware, app) => {
-  middleware.forEach(middlewareItem => {
-    const middlewareFunc = typeof middlewareItem === 'string' ? (0, _utils.compatRequire)(middlewareItem) : middlewareItem;
+  middleware.forEach((middlewareItem) => {
+    const middlewareFunc = typeof middlewareItem === "string" ? (0, import_utils.compatRequire)(middlewareItem) : middlewareItem;
     app.use(middlewareFunc);
   });
 };
-const useRun = app => {
+const useRun = (app) => {
   app.use((req, res, next) => {
-    (0, _context.run)({
-      req,
-      res
-    }, next);
+    (0, import_context.run)({ req, res }, next);
   });
 };
-const initApp = app => {
-  app.use((0, _cookieParser.default)());
-  app.use(_express.default.text());
-  app.use(_express.default.urlencoded({
-    extended: true
-  }));
-  app.use(_express.default.json());
+const initApp = (app) => {
+  app.use((0, import_cookie_parser.default)());
+  app.use(import_express.default.text());
+  app.use(import_express.default.urlencoded({ extended: true }));
+  app.use(import_express.default.json());
   return app;
 };
-var _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) {
-          // console.warn('There is not api/app.ts.');
-          app = (0, _express.default)();
-        }
-        initApp(app);
-        if (config) {
-          const {
-            middleware
-          } = config;
-          initMiddlewares(middleware, app);
-        }
-        useRun(app);
-        (0, _registerRoutes.default)(app, apiHandlerInfos);
-        if (hooks) {
-          const {
-            afterLambdaRegisted
-          } = hooks;
-          if (afterLambdaRegisted) {
-            afterLambdaRegisted(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 = (0, import_express.default)();
           }
-        }
-      } else if (mode === 'function') {
-        app = (0, _express.default)();
-        initApp(app);
-        if (config) {
-          const {
-            middleware
-          } = config;
-          initMiddlewares(middleware, app);
-        }
-        useRun(app);
-        (0, _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);
+          initApp(app);
+          if (config) {
+            const { middleware } = config;
+            initMiddlewares(middleware, app);
           }
-          // finalhanlder will trigger 'finish' event
-          return (0, _finalhandler.default)(req, res, {})(null);
-          // return resolve();
-        };
-
-        res.on('finish', err => {
-          if (err) {
-            return reject(err);
+          useRun(app);
+          (0, import_registerRoutes.default)(app, apiHandlerInfos);
+          if (hooks) {
+            const { afterLambdaRegisted } = hooks;
+            if (afterLambdaRegisted) {
+              afterLambdaRegisted(app);
+            }
           }
-          return resolve();
+        } else if (mode === "function") {
+          app = (0, import_express.default)();
+          initApp(app);
+          if (config) {
+            const { middleware } = config;
+            initMiddlewares(middleware, 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);
         });
-        return app(req, res, handler);
       });
     },
-    prepareWebServer({
-      config
-    }, next) {
-      var _userConfig$server;
+    prepareWebServer({ config }, next) {
+      var _a2;
       const userConfig = api.useConfigContext();
-      if (userConfig !== null && userConfig !== void 0 && (_userConfig$server = userConfig.server) !== null && _userConfig$server !== void 0 && _userConfig$server.disableFrameworkExt) {
+      if ((_a2 = userConfig == null ? void 0 : userConfig.server) == null ? void 0 : _a2.disableFrameworkExt) {
         return next();
       }
-      const app = (0, _express.default)();
+      const app = (0, import_express.default)();
       initApp(app);
       if (config) {
-        const {
-          middleware
-        } = config;
-        debug('web middleware', middleware);
+        const { middleware } = config;
+        debug("web middleware", middleware);
         initMiddlewares(middleware, app);
       }
-      return ctx => new Promise((resolve, reject) => {
+      return (ctx) => new Promise((resolve, reject) => {
         const {
-          source: {
-            req,
-            res
-          }
+          source: { req, res }
         } = ctx;
-        const handler = err => {
+        const handler = (err) => {
           if (err) {
             return reject(err);
           }
           if (res.headersSent && res.statusCode !== 200) {
-            (0, _finalhandler.default)(req, res, {})(null);
+            (0, import_finalhandler.default)(req, res, {})(null);
           }
           return resolve();
         };
-
-        // when user call res.send
-        res.on('finish', err => {
+        res.on("finish", (err) => {
           if (err) {
             return reject(err);
           }
@@ -168,4 +181,3 @@ var _default = () => ({
     }
   })
 });
-exports.default = _default;

package/dist/js/node/registerRoutes.js

@@ -1,20 +1,32 @@
-"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 stdin_exports = {};
+__export(stdin_exports, {
+  default: () => registerRoutes_default
 });
-exports.default = void 0;
-require("reflect-metadata");
-var _utils = require("./utils");
+module.exports = __toCommonJS(stdin_exports);
+var import_reflect_metadata = require("reflect-metadata");
+var import_utils = require("./utils");
 const registerRoutes = (app, handlerInfos) => {
-  handlerInfos.forEach(({
-    routePath,
-    handler,
-    httpMethod
-  }) => {
-    const routeHandler = (0, _utils.createRouteHandler)(handler);
+  handlerInfos.forEach(({ routePath, handler, httpMethod }) => {
+    const routeHandler = (0, import_utils.createRouteHandler)(handler);
     const method = httpMethod.toLowerCase();
-    const routeMiddlwares = Reflect.getMetadata('middleware', handler) || [];
+    const routeMiddlwares = Reflect.getMetadata("middleware", handler) || [];
     if (routeMiddlwares.length > 0) {
       app[method](routePath, routeMiddlwares, routeHandler);
     } else {
@@ -22,5 +34,4 @@ const registerRoutes = (app, handlerInfos) => {
     }
   });
 };
-var _default = registerRoutes;
-exports.default = _default;
+var registerRoutes_default = registerRoutes;

package/dist/js/node/runtime/hook.js

@@ -1,8 +1,23 @@
-"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 stdin_exports = {};
+__export(stdin_exports, {
+  hook: () => hook
 });
-exports.hook = void 0;
-const hook = attacher => attacher;
-exports.hook = hook;
+module.exports = __toCommonJS(stdin_exports);
+const hook = (attacher) => attacher;

package/dist/js/node/runtime/index.js

@@ -1,47 +1,28 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {
-  useContext: true,
-  hook: 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 });
 };
-Object.defineProperty(exports, "hook", {
-  enumerable: true,
-  get: function () {
-    return _hook.hook;
-  }
-});
-Object.defineProperty(exports, "useContext", {
-  enumerable: true,
-  get: function () {
-    return _context.useContext;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  hook: () => import_hook.hook,
+  useContext: () => import_context.useContext
 });
-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];
-    }
-  });
-});
-var _context = require("../context");
-var _hook = require("./hook");
-var _operators = require("./operators");
-Object.keys(_operators).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _operators[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _operators[key];
-    }
-  });
-});
+module.exports = __toCommonJS(stdin_exports);
+__reExport(stdin_exports, require("@modern-js/bff-core"), module.exports);
+var import_context = require("../context");
+var import_hook = require("./hook");
+__reExport(stdin_exports, require("./operators"), module.exports);

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

@@ -1,61 +1,87 @@
-"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 stdin_exports = {};
+__export(stdin_exports, {
+  Middleware: () => Middleware,
+  Pipe: () => Pipe
 });
-exports.Pipe = exports.Middleware = void 0;
-var _context = require("../context");
-const Pipe = func => {
+module.exports = __toCommonJS(stdin_exports);
+var import_context = require("../context");
+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());
+  });
+};
+const Pipe = (func) => {
   return {
-    name: 'pipe',
-    // eslint-disable-next-line consistent-return
-    async execute(executeHelper, next) {
-      const {
-        inputs
-      } = executeHelper;
-      const ctx = (0, _context.useContext)();
-      const {
-        res
-      } = ctx;
-      if (typeof func === 'function') {
-        let isPiped = true;
-        const end = value => {
-          isPiped = false;
-          if (typeof value === 'function') {
-            value(res);
-            return;
-          }
-          // eslint-disable-next-line consistent-return
-          return value;
-        };
-        const output = await func(inputs, end);
-        if (!isPiped) {
-          if (output) {
-            return executeHelper.result = output;
-          } else {
-            // eslint-disable-next-line consistent-return
-            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;
+            }
           }
+          executeHelper.inputs = output;
+          yield next();
         }
-        executeHelper.inputs = output;
-        await next();
-      }
+      });
     }
   };
 };
-
-// eslint-disable-next-line @typescript-eslint/no-redeclare
-exports.Pipe = Pipe;
-const Middleware = middleware => {
+const Middleware = (middleware) => {
   return {
-    name: 'middleware',
+    name: "middleware",
     metadata(helper) {
-      const middlewares = helper.getMetadata('pipe') || [];
+      const middlewares = helper.getMetadata("pipe") || [];
       middlewares.push(middleware);
-      helper.setMetadata('middleware', middlewares);
+      helper.setMetadata("middleware", middlewares);
     }
   };
 };
-
-// eslint-disable-next-line @typescript-eslint/no-redeclare
-exports.Middleware = Middleware;