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

package/CHANGELOG.md

@@ -1,5 +1,94 @@
 # @modern-js/plugin-express
 
+## 2.0.0-beta.6
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- 8d24bed25b: fix: compat Hook API in /server namespace
+  fix: 在 @modern-js/runtime/server 命名空间下兼容 Hook API
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- Updated dependencies [7879e8f711]
+- Updated dependencies [6aca875011]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [2344eb26ed]
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [7b7d12cf8f]
+- Updated dependencies [7efeed4]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed5874c6]
+- Updated dependencies [87c1ff86b9]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [102d32e4ba]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06257]
+- Updated dependencies [bbe4c4ab64]
+- Updated dependencies [e4558a0bc4]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/types@2.0.0-beta.6
+  - @modern-js/utils@2.0.0-beta.6
+  - @modern-js/bff-core@2.0.0-beta.6
+  - @modern-js/bff-runtime@2.0.0-beta.6
+
+## 2.0.0-beta.4
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- 8d24bed25b: fix: compat Hook API in /server namespace
+  fix: 在 @modern-js/runtime/server 命名空间下兼容 Hook API
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- Updated dependencies [7879e8f]
+- Updated dependencies [6aca875]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [2344eb26ed]
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [7b7d12c]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed5874c6]
+- Updated dependencies [87c1ff86b9]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [102d32e4ba]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/types@2.0.0-beta.4
+  - @modern-js/utils@2.0.0-beta.4
+  - @modern-js/bff-core@2.0.0-beta.4
+  - @modern-js/bff-runtime@2.0.0-beta.4
+
 ## 2.0.0-beta.3
 
 ### Major Changes

package/dist/js/modern/cli/index.js

@@ -1,29 +1,25 @@
-import * as path from 'path';
-import { createRuntimeExportsUtils } from '@modern-js/utils';
-import { getRelativeRuntimePath } from '@modern-js/bff-core';
-export default (() => ({
-  name: '@modern-js/plugin-express',
-  setup: api => {
+import * as path from "path";
+import { createRuntimeExportsUtils } from "@modern-js/utils";
+import { getRelativeRuntimePath } from "@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 = createRuntimeExportsUtils(appContext.internalDirectory, 'server');
+        const { appDirectory } = appContext;
+        bffExportsUtils = createRuntimeExportsUtils(appContext.internalDirectory, "server");
         const serverRuntimePath = bffExportsUtils.getPath();
         const relativeRuntimePath = getRelativeRuntimePath(appDirectory, serverRuntimePath);
-        if (process.env.NODE_ENV === 'production') {
+        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
               }
             }
           };
@@ -31,17 +27,25 @@ export 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 = {
@@ -53,4 +57,7 @@ export default (() => ({
       }
     };
   }
-}));
+});
+export {
+  cli_default as default
+};

package/dist/js/modern/context.js

@@ -1,6 +1,6 @@
-import { createStorage } from '@modern-js/bff-core';
-const {
+import { createStorage } from "@modern-js/bff-core";
+const { run, useContext } = createStorage();
+export {
   run,
   useContext
-} = createStorage();
-export { run, useContext };
+};

package/dist/js/modern/index.js

@@ -1,3 +1,6 @@
 import plugin from "./plugin";
 export * from "./context";
-export default plugin;
+var src_default = plugin;
+export {
+  src_default as default
+};

package/dist/js/modern/plugin.js

@@ -1,30 +1,55 @@
-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';
+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 = async apiDir => {
-  const exts = ['.ts', '.js'];
-  const paths = exts.map(ext => path.resolve(apiDir, `app${ext}`));
+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 (await fs.pathExists(filename)) {
-      // 每次获取 app.ts 的时候，避免使用缓存的 app.ts
+    if (yield fs.pathExists(filename)) {
       delete require.cache[filename];
-      return [compatRequire(filename), require(filename)];
+      return [
+        compatRequire(filename),
+        require(filename)
+      ];
     }
   }
   return [];
-};
+});
 const initMiddlewares = (middleware, app) => {
-  middleware.forEach(middlewareItem => {
-    const middlewareFunc = typeof middlewareItem === 'string' ? compatRequire(middlewareItem) : middlewareItem;
+  middleware.forEach((middlewareItem) => {
+    const middlewareFunc = typeof middlewareItem === "string" ? compatRequire(middlewareItem) : middlewareItem;
     app.use(middlewareFunc);
   });
 };
-const useRun = app => {
+const useRun = (app) => {
   app.use((req, res, next) => {
     run({
       req,
@@ -32,7 +57,7 @@ const useRun = app => {
     }, next);
   });
 };
-const initApp = app => {
+const initApp = (app) => {
   app.use(cookieParser());
   app.use(express.text());
   app.use(express.urlencoded({
@@ -41,103 +66,87 @@ const initApp = app => {
   app.use(express.json());
   return app;
 };
-export 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 = 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);
+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();
           }
-        }
-      } else if (mode === 'function') {
-        app = express();
-        initApp(app);
-        if (config) {
-          const {
-            middleware
-          } = config;
-          initMiddlewares(middleware, 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);
+          initApp(app);
+          if (config) {
+            const { middleware } = config;
+            initMiddlewares(middleware, app);
           }
-          // finalhanlder will trigger 'finish' event
-          return finalhandler(req, res, {})(null);
-          // return resolve();
-        };
-
-        res.on('finish', err => {
-          if (err) {
-            return reject(err);
+          useRun(app);
+          registerRoutes(app, apiHandlerInfos);
+          if (hooks) {
+            const { afterLambdaRegisted } = hooks;
+            if (afterLambdaRegisted) {
+              afterLambdaRegisted(app);
+            }
           }
-          return resolve();
+        } 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);
         });
-        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 = express();
       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) => {
-        const {
-          source: {
-            req,
-            res
-          }
-        } = ctx;
-        const handler = err => {
+      return (ctx) => new Promise((resolve, reject) => {
+        const { source: { req, res } } = ctx;
+        const handler = (err) => {
           if (err) {
             return reject(err);
           }
@@ -146,9 +155,7 @@ export default (() => ({
           }
           return resolve();
         };
-
-        // when user call res.send
-        res.on('finish', err => {
+        res.on("finish", (err) => {
           if (err) {
             return reject(err);
           }
@@ -158,4 +165,7 @@ export default (() => ({
       });
     }
   })
-}));
+});
+export {
+  plugin_default as default
+};

package/dist/js/modern/registerRoutes.js

@@ -1,14 +1,10 @@
-import 'reflect-metadata';
+import "reflect-metadata";
 import { createRouteHandler } from "./utils";
 const registerRoutes = (app, handlerInfos) => {
-  handlerInfos.forEach(({
-    routePath,
-    handler,
-    httpMethod
-  }) => {
+  handlerInfos.forEach(({ routePath, handler, httpMethod }) => {
     const routeHandler = 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 {
@@ -16,4 +12,7 @@ const registerRoutes = (app, handlerInfos) => {
     }
   });
 };
-export default registerRoutes;
+var registerRoutes_default = registerRoutes;
+export {
+  registerRoutes_default as default
+};

package/dist/js/modern/runtime/hook.js

@@ -1 +1,4 @@
-export const hook = attacher => attacher;
+const hook = (attacher) => attacher;
+export {
+  hook
+};

package/dist/js/modern/runtime/index.js

@@ -1,4 +1,8 @@
-export * from '@modern-js/bff-core';
-export { useContext } from "../context";
-export { hook } from "./hook";
-export * from "./operators";
+export * from "@modern-js/bff-core";
+import { useContext } from "../context";
+import { hook } from "./hook";
+export * from "./operators";
+export {
+  hook,
+  useContext
+};

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

@@ -1,54 +1,68 @@
+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";
-export const Pipe = func => {
+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;
-          }
-          // 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 = 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
-
-export 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
+export {
+  Middleware,
+  Pipe
+};