@modern-js/plugin-koa 2.58.1 → 2.58.3

package/dist/cjs/plugin.js

@@ -32,11 +32,11 @@ __export(plugin_exports, {
 });
 module.exports = __toCommonJS(plugin_exports);
 var path = __toESM(require("path"));
+var import_node = require("@modern-js/server-core/node");
+var import_utils = require("@modern-js/utils");
 var import_koa = __toESM(require("koa"));
-var import_koa_router = __toESM(require("koa-router"));
 var import_koa_body = __toESM(require("koa-body"));
-var import_utils = require("@modern-js/utils");
-var import_node = require("@modern-js/server-core/node");
+var import_koa_router = __toESM(require("koa-router"));
 var import_context = require("./context");
 var import_registerRoutes = __toESM(require("./registerRoutes"));
 const findAppModule = async (apiDir) => {
@@ -48,16 +48,16 @@ const findAppModule = async (apiDir) => {
   for (const filename of paths) {
     if (await import_utils.fs.pathExists(filename)) {
       delete require.cache[filename];
-      return (0, import_utils.compatRequire)(filename);
+      return (0, import_utils.compatibleRequire)(filename);
     }
   }
   return null;
 };
-const initMiddlewares = (middleware, app) => {
-  middleware.forEach((middlewareItem) => {
-    const middlewareFunc = typeof middlewareItem === "string" ? (0, import_utils.compatRequire)(middlewareItem) : middlewareItem;
+const initMiddlewares = async (middleware, app) => {
+  for (const middlewareItem of middleware) {
+    const middlewareFunc = typeof middlewareItem === "string" ? await (0, import_utils.compatibleRequire)(middlewareItem) : middlewareItem;
     app.use(middlewareFunc);
-  });
+  }
 };
 const defaultErrorHandler = async (ctx, next) => {
   ctx.onerror = (err) => {
@@ -84,7 +84,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
       }));
     }
     if (middlewares && middlewares.length > 0) {
-      initMiddlewares(middlewares, app);
+      await initMiddlewares(middlewares, app);
     }
     app.use(import_context.run);
     (0, import_registerRoutes.default)(router, apiHandlerInfos);
@@ -95,7 +95,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
       multipart: true
     }));
     if (middlewares && middlewares.length > 0) {
-      initMiddlewares(middlewares, app);
+      await initMiddlewares(middlewares, app);
     }
     app.use(import_context.run);
     (0, import_registerRoutes.default)(router, apiHandlerInfos);

package/dist/esm/plugin.js

@@ -2,11 +2,11 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
+import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/node";
+import { fs, compatibleRequire, logger } from "@modern-js/utils";
 import Koa from "koa";
-import Router from "koa-router";
 import koaBody from "koa-body";
-import { fs, compatRequire, logger } from "@modern-js/utils";
-import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/node";
+import Router from "koa-router";
 import { run } from "./context";
 import registerRoutes from "./registerRoutes";
 var findAppModule = function() {
@@ -49,7 +49,7 @@ var findAppModule = function() {
             delete require.cache[filename];
             return [
               2,
-              compatRequire(filename)
+              compatibleRequire(filename)
             ];
           }
           _state.label = 4;
@@ -97,12 +97,95 @@ var findAppModule = function() {
     return _ref.apply(this, arguments);
   };
 }();
-var initMiddlewares = function(middleware, app) {
-  middleware.forEach(function(middlewareItem) {
-    var middlewareFunc = typeof middlewareItem === "string" ? compatRequire(middlewareItem) : middlewareItem;
-    app.use(middlewareFunc);
+var initMiddlewares = function() {
+  var _ref = _async_to_generator(function(middleware, app) {
+    var _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, middlewareItem, middlewareFunc, _tmp, err;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+          _state.label = 1;
+        case 1:
+          _state.trys.push([
+            1,
+            8,
+            9,
+            10
+          ]);
+          _iterator = middleware[Symbol.iterator]();
+          _state.label = 2;
+        case 2:
+          if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
+            return [
+              3,
+              7
+            ];
+          middlewareItem = _step.value;
+          if (!(typeof middlewareItem === "string"))
+            return [
+              3,
+              4
+            ];
+          return [
+            4,
+            compatibleRequire(middlewareItem)
+          ];
+        case 3:
+          _tmp = _state.sent();
+          return [
+            3,
+            5
+          ];
+        case 4:
+          _tmp = middlewareItem;
+          _state.label = 5;
+        case 5:
+          middlewareFunc = _tmp;
+          app.use(middlewareFunc);
+          _state.label = 6;
+        case 6:
+          _iteratorNormalCompletion = true;
+          return [
+            3,
+            2
+          ];
+        case 7:
+          return [
+            3,
+            10
+          ];
+        case 8:
+          err = _state.sent();
+          _didIteratorError = true;
+          _iteratorError = err;
+          return [
+            3,
+            10
+          ];
+        case 9:
+          try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+              _iterator.return();
+            }
+          } finally {
+            if (_didIteratorError) {
+              throw _iteratorError;
+            }
+          }
+          return [
+            7
+          ];
+        case 10:
+          return [
+            2
+          ];
+      }
+    });
   });
-};
+  return function initMiddlewares2(middleware, app) {
+    return _ref.apply(this, arguments);
+  };
+}();
 var defaultErrorHandler = function() {
   var _ref = _async_to_generator(function(ctx, next) {
     return _ts_generator(this, function(_state) {
@@ -144,7 +227,7 @@ var createApp = function() {
           if (!(mode === "framework"))
             return [
               3,
-              2
+              4
             ];
           return [
             4,
@@ -159,32 +242,58 @@ var createApp = function() {
               multipart: true
             }));
           }
-          if (middlewares && middlewares.length > 0) {
-            initMiddlewares(middlewares, app);
-          }
-          app.use(run);
-          registerRoutes(router, apiHandlerInfos);
+          if (!(middlewares && middlewares.length > 0))
+            return [
+              3,
+              3
+            ];
           return [
-            3,
-            3
+            4,
+            initMiddlewares(middlewares, app)
           ];
         case 2:
-          if (mode === "function") {
-            app = new Koa();
-            app.use(defaultErrorHandler);
-            app.use(koaBody({
-              multipart: true
-            }));
-            if (middlewares && middlewares.length > 0) {
-              initMiddlewares(middlewares, app);
-            }
-            app.use(run);
-            registerRoutes(router, apiHandlerInfos);
-          } else {
-            throw new Error("mode must be function or framework");
-          }
+          _state.sent();
           _state.label = 3;
         case 3:
+          app.use(run);
+          registerRoutes(router, apiHandlerInfos);
+          return [
+            3,
+            8
+          ];
+        case 4:
+          if (!(mode === "function"))
+            return [
+              3,
+              7
+            ];
+          app = new Koa();
+          app.use(defaultErrorHandler);
+          app.use(koaBody({
+            multipart: true
+          }));
+          if (!(middlewares && middlewares.length > 0))
+            return [
+              3,
+              6
+            ];
+          return [
+            4,
+            initMiddlewares(middlewares, app)
+          ];
+        case 5:
+          _state.sent();
+          _state.label = 6;
+        case 6:
+          app.use(run);
+          registerRoutes(router, apiHandlerInfos);
+          return [
+            3,
+            8
+          ];
+        case 7:
+          throw new Error("mode must be function or framework");
+        case 8:
           app.use(router.routes());
           if (render) {
             app.use(function() {

package/dist/esm/utils.js

@@ -3,7 +3,7 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { httpMethods, isWithMetaHandler, ResponseMetaType, HttpMetadata } from "@modern-js/bff-core";
+import { HttpMetadata, ResponseMetaType, httpMethods, isWithMetaHandler } from "@modern-js/bff-core";
 import { isSchemaHandler } from "@modern-js/bff-runtime";
 import typeIs from "type-is";
 var handleResponseMeta = function(ctx, handler) {

package/dist/esm-node/plugin.js

@@ -1,9 +1,9 @@
 import * as path from "path";
+import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/node";
+import { fs, compatibleRequire, logger } from "@modern-js/utils";
 import Koa from "koa";
-import Router from "koa-router";
 import koaBody from "koa-body";
-import { fs, compatRequire, logger } from "@modern-js/utils";
-import { httpCallBack2HonoMid, sendResponse } from "@modern-js/server-core/node";
+import Router from "koa-router";
 import { run } from "./context";
 import registerRoutes from "./registerRoutes";
 const findAppModule = async (apiDir) => {
@@ -15,16 +15,16 @@ const findAppModule = async (apiDir) => {
   for (const filename of paths) {
     if (await fs.pathExists(filename)) {
       delete require.cache[filename];
-      return compatRequire(filename);
+      return compatibleRequire(filename);
     }
   }
   return null;
 };
-const initMiddlewares = (middleware, app) => {
-  middleware.forEach((middlewareItem) => {
-    const middlewareFunc = typeof middlewareItem === "string" ? compatRequire(middlewareItem) : middlewareItem;
+const initMiddlewares = async (middleware, app) => {
+  for (const middlewareItem of middleware) {
+    const middlewareFunc = typeof middlewareItem === "string" ? await compatibleRequire(middlewareItem) : middlewareItem;
     app.use(middlewareFunc);
-  });
+  }
 };
 const defaultErrorHandler = async (ctx, next) => {
   ctx.onerror = (err) => {
@@ -51,7 +51,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
       }));
     }
     if (middlewares && middlewares.length > 0) {
-      initMiddlewares(middlewares, app);
+      await initMiddlewares(middlewares, app);
     }
     app.use(run);
     registerRoutes(router, apiHandlerInfos);
@@ -62,7 +62,7 @@ const createApp = async ({ apiDir, middlewares, mode, apiHandlerInfos, render })
       multipart: true
     }));
     if (middlewares && middlewares.length > 0) {
-      initMiddlewares(middlewares, app);
+      await initMiddlewares(middlewares, app);
     }
     app.use(run);
     registerRoutes(router, apiHandlerInfos);

package/dist/esm-node/utils.js

@@ -1,4 +1,4 @@
-import { httpMethods, isWithMetaHandler, ResponseMetaType, HttpMetadata } from "@modern-js/bff-core";
+import { HttpMetadata, ResponseMetaType, httpMethods, isWithMetaHandler } from "@modern-js/bff-core";
 import { isSchemaHandler } from "@modern-js/bff-runtime";
 import typeIs from "type-is";
 const handleResponseMeta = (ctx, handler) => {

package/dist/types/cli/index.d.ts

@@ -1,4 +1,4 @@
-import type { CliPlugin } from '@modern-js/core';
 import type { AppTools } from '@modern-js/app-tools';
+import type { CliPlugin } from '@modern-js/core';
 export declare const koaPlugin: () => CliPlugin<AppTools>;
 export default koaPlugin;

package/dist/types/plugin.d.ts

@@ -1,5 +1,5 @@
 import type { ServerManifest, ServerPlugin } from '@modern-js/server-core';
-import { InternalRequest } from '@modern-js/server-core';
+import type { InternalRequest } from '@modern-js/server-core';
 declare module 'http' {
     interface IncomingMessage {
         __honoRequest?: InternalRequest;

package/dist/types/registerRoutes.d.ts

@@ -1,4 +1,4 @@
-import { APIHandlerInfo } from '@modern-js/bff-core';
-import Router from 'koa-router';
+import type { APIHandlerInfo } from '@modern-js/bff-core';
+import type Router from 'koa-router';
 declare const registerRoutes: (router: Router, handlerInfos: APIHandlerInfo[]) => void;
 export default registerRoutes;

package/dist/types/utils.d.ts

@@ -1,5 +1,5 @@
-import { HttpMethod, APIHandlerInfo } from '@modern-js/bff-core';
-import { Context } from 'koa';
+import { type APIHandlerInfo, type HttpMethod } from '@modern-js/bff-core';
+import type { Context } from 'koa';
 type Handler = APIHandlerInfo['handler'];
 export declare const createRouteHandler: (handler: Handler) => (ctx: Context) => Promise<{
     code: any;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.1",
+  "version": "2.58.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -33,6 +33,7 @@
       "default": "./dist/cjs/cli/index.js"
     },
     "./runtime": {
+      "types": "./dist/types/runtime/index.d.ts",
       "jsnext:source": "./src/runtime.ts",
       "default": "./dist/cjs/runtime.js"
     },
@@ -67,11 +68,11 @@
     "koa-body": "^4.2.0",
     "koa-router": "^10.0.0",
     "type-is": "^1.6.18",
-    "@modern-js/bff-core": "2.58.1",
-    "@modern-js/bff-runtime": "2.58.1",
-    "@modern-js/server-core": "2.58.1",
-    "@modern-js/types": "2.58.1",
-    "@modern-js/utils": "2.58.1"
+    "@modern-js/bff-core": "2.58.3",
+    "@modern-js/server-core": "2.58.3",
+    "@modern-js/types": "2.58.3",
+    "@modern-js/utils": "2.58.3",
+    "@modern-js/bff-runtime": "2.58.3"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -85,10 +86,10 @@
     "supertest": "^6.1.6",
     "typescript": "^5",
     "zod": "^3.22.3",
-    "@modern-js/app-tools": "2.58.1",
-    "@modern-js/core": "2.58.1",
-    "@scripts/build": "2.58.1",
-    "@scripts/jest-config": "2.58.1"
+    "@modern-js/core": "2.58.3",
+    "@scripts/build": "2.58.3",
+    "@scripts/jest-config": "2.58.3",
+    "@modern-js/app-tools": "2.58.3"
   },
   "peerDependencies": {
     "koa": "^2.13.4"

package/types.d.ts

@@ -1,7 +1,6 @@
 /// <reference path="./dist/types/index.d.ts" />
 declare module '@modern-js/runtime/koa' {
-
-  import { Context, Middleware } from 'koa';
+  import type { Context, Middleware } from 'koa';
 
   export type { Middleware as RequestHandler };
 
@@ -12,9 +11,12 @@ declare module '@modern-js/runtime/koa' {
 
 // Todo: remove on next version
 declare module '@modern-js/runtime/server' {
-
-  import { Context, Middleware } from 'koa';
-  import type { AfterMatchContext, AfterRenderContext, NextFunction } from '@modern-js/types';
+  import type { Context, Middleware } from 'koa';
+  import type {
+    AfterMatchContext,
+    AfterRenderContext,
+    NextFunction,
+  } from '@modern-js/types';
 
   export type AfterRenderHook = (
     context: AfterRenderContext,
@@ -26,7 +28,6 @@ declare module '@modern-js/runtime/server' {
     next: NextFunction,
   ) => void;
 
-
   type KoaOptions = {
     addMiddleware: (...input: Middleware[]) => void;
     afterRender: (hook: AfterRenderHook) => void;