@modern-js/plugin-koa 2.0.0-beta.3 → 2.0.0-beta.4

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # @modern-js/plugin-koa
 
+## 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,31 @@
-import * as path from 'path';
-import { createRuntimeExportsUtils } from '@modern-js/utils';
-import { getRelativeRuntimePath } from '@modern-js/bff-core';
-export default (() => ({
-  name: '@modern-js/plugin-koa',
-  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-koa",
+  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') {
+        const relativeRuntimePath = getRelativeRuntimePath(
+          appDirectory,
+          serverRuntimePath
+        );
+        if (process.env.NODE_ENV === "production") {
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': relativeRuntimePath,
-                '@modern-js/runtime/koa': relativeRuntimePath
+                "@modern-js/runtime/server": relativeRuntimePath,
+                "@modern-js/runtime/koa": relativeRuntimePath
               }
             }
           };
@@ -31,8 +33,8 @@ export default (() => ({
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': serverRuntimePath,
-                '@modern-js/runtime/koa': serverRuntimePath
+                "@modern-js/runtime/server": serverRuntimePath,
+                "@modern-js/runtime/koa": serverRuntimePath
               }
             }
           };
@@ -40,8 +42,14 @@ export default (() => ({
       },
       addRuntimeExports(input) {
         const currentFile = bffExportsUtils.getPath();
-        const relativeRuntimeModulePath = path.relative(path.dirname(currentFile), runtimeModulePath);
-        const relativeFramePath = path.relative(path.dirname(currentFile), require.resolve('koa'));
+        const relativeRuntimeModulePath = path.relative(
+          path.dirname(currentFile),
+          runtimeModulePath
+        );
+        const relativeFramePath = path.relative(
+          path.dirname(currentFile),
+          require.resolve("koa")
+        );
         bffExportsUtils.addExport(`const pluginRuntime = require('${relativeRuntimeModulePath}');
            const Koa = require('${relativeFramePath}')
            module.exports = {
@@ -53,4 +61,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,114 +1,124 @@
-import * as path from 'path';
-import Koa from 'koa';
-import Router from 'koa-router';
-import koaBody from 'koa-body';
-import { fs, compatRequire } from '@modern-js/utils';
+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 Koa from "koa";
+import Router from "koa-router";
+import koaBody from "koa-body";
+import { fs, compatRequire } from "@modern-js/utils";
 import { run } from "./context";
 import registerRoutes from "./registerRoutes";
-const findAppModule = async apiDir => {
-  const exts = ['.ts', '.js'];
-  const paths = exts.map(ext => path.join(apiDir, `app${ext}`));
+const findAppModule = (apiDir) => __async(void 0, null, function* () {
+  const exts = [".ts", ".js"];
+  const paths = exts.map((ext) => path.join(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);
     }
   }
   return null;
-};
+});
 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);
   });
 };
-export default (() => ({
-  name: '@modern-js/plugin-koa',
-  pre: ['@modern-js/plugin-bff'],
-  post: ['@modern-js/plugin-server'],
-  setup: api => ({
-    async prepareApiServer({
-      pwd,
-      config
-    }) {
-      let app;
-      const router = new Router();
-      const apiDir = path.join(pwd, './api');
-      const appContext = api.useAppContext();
-      const apiHandlerInfos = appContext.apiHandlerInfos;
-      const mode = appContext.apiMode;
-      if (mode === 'framework') {
-        app = await findAppModule(apiDir);
-        if (!(app instanceof Koa)) {
+var plugin_default = () => ({
+  name: "@modern-js/plugin-koa",
+  pre: ["@modern-js/plugin-bff"],
+  post: ["@modern-js/plugin-server"],
+  setup: (api) => ({
+    prepareApiServer(_0) {
+      return __async(this, arguments, function* ({ pwd, config }) {
+        let app;
+        const router = new Router();
+        const apiDir = path.join(pwd, "./api");
+        const appContext = api.useAppContext();
+        const apiHandlerInfos = appContext.apiHandlerInfos;
+        const mode = appContext.apiMode;
+        if (mode === "framework") {
+          app = yield findAppModule(apiDir);
+          if (!(app instanceof Koa)) {
+            app = new Koa();
+            app.use(
+              koaBody({
+                multipart: true
+              })
+            );
+          }
+          if (config) {
+            const { middleware } = config;
+            initMiddlewares(middleware, app);
+          }
+          app.use(run);
+          registerRoutes(router, apiHandlerInfos);
+        } else if (mode === "function") {
           app = new Koa();
-          app.use(koaBody({
-            multipart: true
-          }));
-        }
-        if (config) {
-          const {
-            middleware
-          } = config;
-          initMiddlewares(middleware, app);
-        }
-        app.use(run);
-        registerRoutes(router, apiHandlerInfos);
-      } else if (mode === 'function') {
-        app = new Koa();
-        app.use(koaBody({
-          multipart: true
-        }));
-        if (config) {
-          const {
-            middleware
-          } = config;
-          initMiddlewares(middleware, app);
+          app.use(
+            koaBody({
+              multipart: true
+            })
+          );
+          if (config) {
+            const { middleware } = config;
+            initMiddlewares(middleware, app);
+          }
+          app.use(run);
+          registerRoutes(router, apiHandlerInfos);
+        } else {
+          throw new Error(`mode must be function or framework`);
         }
-        app.use(run);
-        registerRoutes(router, apiHandlerInfos);
-      } else {
-        throw new Error(`mode must be function or framework`);
-      }
-      app.use(router.routes());
-      return (req, res) => {
-        return Promise.resolve(app.callback()(req, res));
-      };
+        app.use(router.routes());
+        return (req, res) => {
+          return Promise.resolve(app.callback()(req, res));
+        };
+      });
     },
-    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 = new Koa();
-      app.use(async (ctx, next) => {
-        await next();
+      app.use((ctx, next2) => __async(this, null, function* () {
+        yield next2();
         if (!ctx.body) {
-          // restore statusCode
           if (ctx.res.statusCode === 404 && !ctx.response._explicitStatus) {
             ctx.res.statusCode = 200;
           }
           ctx.respond = false;
         }
-      });
+      }));
       app.use(koaBody());
       if (config) {
-        const {
-          middleware
-        } = config;
+        const { middleware } = config;
         initMiddlewares(middleware, app);
       }
-      return ctx => {
+      return (ctx) => {
         const {
-          source: {
-            req,
-            res
-          }
+          source: { req, res }
         } = ctx;
-        app.on('error', err => {
+        app.on("error", (err) => {
           if (err) {
             throw err;
           }
@@ -117,4 +127,7 @@ export default (() => ({
       };
     }
   })
-}));
+});
+export {
+  plugin_default as default
+};

package/dist/js/modern/registerRoutes.js

@@ -1,13 +1,12 @@
 import { createRouteHandler } from "./utils";
 const registerRoutes = (router, handlerInfos) => {
-  handlerInfos.forEach(({
-    routePath,
-    handler,
-    httpMethod
-  }) => {
+  handlerInfos.forEach(({ routePath, handler, httpMethod }) => {
     const routeHandler = createRouteHandler(handler);
     const method = httpMethod.toLowerCase();
     router[method](routePath, routeHandler);
   });
 };
-export default registerRoutes;
+var registerRoutes_default = registerRoutes;
+export {
+  registerRoutes_default as default
+};

package/dist/js/modern/runtime.js

@@ -1,3 +1,7 @@
-export const hook = attacher => attacher;
-export { useContext } from "./context";
-export * from '@modern-js/bff-core';
+const hook = (attacher) => attacher;
+import { useContext } from "./context";
+export * from "@modern-js/bff-core";
+export {
+  hook,
+  useContext
+};

package/dist/js/modern/utils.js

@@ -1,28 +1,55 @@
-import { httpMethods, isWithMetaHandler, ResponseMetaType, HttpMetadata } from '@modern-js/bff-core';
-import { isSchemaHandler } from '@modern-js/bff-runtime';
-import typeIs from 'type-is';
+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 {
+  httpMethods,
+  isWithMetaHandler,
+  ResponseMetaType,
+  HttpMetadata
+} from "@modern-js/bff-core";
+import { isSchemaHandler } from "@modern-js/bff-runtime";
+import typeIs from "type-is";
 const handleResponseMeta = (ctx, handler) => {
-  const responseMeta = Reflect.getMetadata(HttpMetadata.Response, 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)) {
-            if (typeof value === 'string') {
+            if (typeof value === "string") {
               ctx.append(key, value);
             }
           }
           break;
         case ResponseMetaType.Redirect:
-          if (typeof metaValue === 'string') {
+          if (typeof metaValue === "string") {
             ctx.redirect(metaValue);
           }
           break;
         case ResponseMetaType.StatusCode:
-          if (typeof metaValue === 'number') {
+          if (typeof metaValue === "number") {
             ctx.status = metaValue;
           }
           break;
@@ -32,15 +59,14 @@ const handleResponseMeta = (ctx, handler) => {
     }
   }
 };
-export const createRouteHandler = handler => {
-  // eslint-disable-next-line consistent-return
-  const apiHandler = async ctx => {
-    const input = await getInputFromRequest(ctx);
+const createRouteHandler = (handler) => {
+  const apiHandler = (ctx) => __async(void 0, null, function* () {
+    const input = yield getInputFromRequest(ctx);
     if (isWithMetaHandler(handler)) {
       try {
         handleResponseMeta(ctx, handler);
-        const body = await handler(input);
-        if (typeof body !== 'undefined') {
+        const body = yield handler(input);
+        if (typeof body !== "undefined") {
           ctx.body = body;
         }
       } catch (error) {
@@ -57,9 +83,9 @@ export const createRouteHandler = handler => {
         }
       }
     } else if (isSchemaHandler(handler)) {
-      const result = await handler(input);
-      if (result.type !== 'HandleSuccess') {
-        if (result.type === 'InputValidationError') {
+      const result = yield handler(input);
+      if (result.type !== "HandleSuccess") {
+        if (result.type === "InputValidationError") {
           ctx.status = 400;
         } else {
           ctx.status = 500;
@@ -70,31 +96,38 @@ export const createRouteHandler = handler => {
       }
     } else {
       const args = Object.values(input.params).concat(input);
-      const body = await handler(...args);
-      if (typeof body !== 'undefined') {
+      const body = yield handler(...args);
+      if (typeof body !== "undefined") {
         ctx.body = body;
       }
     }
-  };
-  Object.defineProperties(apiHandler, Object.getOwnPropertyDescriptors(handler));
+  });
+  Object.defineProperties(
+    apiHandler,
+    Object.getOwnPropertyDescriptors(handler)
+  );
   return apiHandler;
 };
-export const isNormalMethod = httpMethod => httpMethods.includes(httpMethod);
-const getInputFromRequest = async ctx => {
+const isNormalMethod = (httpMethod) => httpMethods.includes(httpMethod);
+const getInputFromRequest = (ctx) => __async(void 0, null, function* () {
   const draft = {
     params: ctx.params,
     query: ctx.query,
     headers: ctx.headers,
     cookies: ctx.headers.cookie
   };
-  if (typeIs.is(ctx.request.type, ['application/json'])) {
+  if (typeIs.is(ctx.request.type, ["application/json"])) {
     draft.data = ctx.request.body;
-  } else if (typeIs.is(ctx.request.type, ['multipart/form-data'])) {
+  } else if (typeIs.is(ctx.request.type, ["multipart/form-data"])) {
     draft.formData = ctx.request.files;
-  } else if (typeIs.is(ctx.request.type, ['application/x-www-form-urlencoded'])) {
+  } else if (typeIs.is(ctx.request.type, ["application/x-www-form-urlencoded"])) {
     draft.formUrlencoded = ctx.request.body;
   } else {
     draft.body = ctx.request.body;
   }
   return draft;
-};
+});
+export {
+  createRouteHandler,
+  isNormalMethod
+};

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

@@ -1,37 +1,59 @@
-"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: () => 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-koa',
-  setup: api => {
+module.exports = __toCommonJS(stdin_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-koa",
+  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/koa': relativeRuntimePath
+                "@modern-js/runtime/server": relativeRuntimePath,
+                "@modern-js/runtime/koa": relativeRuntimePath
               }
             }
           };
@@ -39,8 +61,8 @@ var _default = () => ({
           return {
             source: {
               alias: {
-                '@modern-js/runtime/server': serverRuntimePath,
-                '@modern-js/runtime/koa': serverRuntimePath
+                "@modern-js/runtime/server": serverRuntimePath,
+                "@modern-js/runtime/koa": serverRuntimePath
               }
             }
           };
@@ -48,8 +70,14 @@ var _default = () => ({
       },
       addRuntimeExports(input) {
         const currentFile = bffExportsUtils.getPath();
-        const relativeRuntimeModulePath = path.relative(path.dirname(currentFile), runtimeModulePath);
-        const relativeFramePath = path.relative(path.dirname(currentFile), require.resolve('koa'));
+        const relativeRuntimeModulePath = path.relative(
+          path.dirname(currentFile),
+          runtimeModulePath
+        );
+        const relativeFramePath = path.relative(
+          path.dirname(currentFile),
+          require.resolve("koa")
+        );
         bffExportsUtils.addExport(`const pluginRuntime = require('${relativeRuntimeModulePath}');
            const Koa = require('${relativeFramePath}')
            module.exports = {
@@ -62,4 +90,3 @@ var _default = () => ({
     };
   }
 });
-exports.default = _default;