@modern-js/plugin-bff 2.68.12 → 2.68.13

package/dist/cjs/cli.js

@@ -74,7 +74,8 @@ const bffPlugin = () => ({
           sourceDirs,
           distDir,
           tsconfigPath,
-          moduleType
+          moduleType,
+          throwErrorInsteadOfExit: true
         });
       }
     };

package/dist/cjs/runtime/hono/adapter.js

@@ -78,6 +78,23 @@ class HonoAdapter {
         const handlers = this.wrapInArray(handler);
         (_this_apiServer = this.apiServer) === null || _this_apiServer === void 0 ? void 0 : _this_apiServer[method](path, ...handlers);
       });
+      this.apiServer.onError(async (err, c) => {
+        try {
+          const serverConfig = this.api.useConfigContext();
+          const onErrorHandler = serverConfig === null || serverConfig === void 0 ? void 0 : serverConfig.onError;
+          if (onErrorHandler) {
+            const result = await onErrorHandler(err, c);
+            if (result instanceof Response) {
+              return result;
+            }
+          }
+        } catch (configError) {
+          import_utils.logger.error(`Error in serverConfig.onError handler: ${configError}`);
+        }
+        return c.json({
+          message: (err === null || err === void 0 ? void 0 : err.message) || "[BFF] Internal Server Error"
+        }, (err === null || err === void 0 ? void 0 : err.status) || 500);
+      });
     };
     this.registerMiddleware = async (options) => {
       const { prefix } = options;

package/dist/cjs/utils/clientGenerator.js

@@ -129,6 +129,9 @@ async function setPackage(files, appDirectory, relativeDistPath) {
           ]
         };
       }, {
+        [`${API_DIR}/*`]: [
+          toPosixPath(`./${relativeDistPath}/${CLIENT_DIR}/*.d.ts`)
+        ],
         [RUNTIME_DIR]: [
           toPosixPath(`./${relativeDistPath}/${RUNTIME_DIR}/index.d.ts`)
         ],
@@ -148,12 +151,18 @@ async function setPackage(files, appDirectory, relativeDistPath) {
         }
       };
     }, {
+      [toPosixPath(`./${API_DIR}/*`)]: {
+        import: toPosixPath(`./${relativeDistPath}/${CLIENT_DIR}/*.js`),
+        types: toPosixPath(`./${relativeDistPath}/${CLIENT_DIR}/*.d.ts`)
+      },
       [toPosixPath(`./${PLUGIN_DIR}`)]: {
+        import: toPosixPath(`./${relativeDistPath}/${PLUGIN_DIR}/index.js`),
         require: toPosixPath(`./${relativeDistPath}/${PLUGIN_DIR}/index.js`),
         types: toPosixPath(`./${relativeDistPath}/${PLUGIN_DIR}/index.d.ts`)
       },
       [toPosixPath(`./${RUNTIME_DIR}`)]: {
         import: toPosixPath(`./${relativeDistPath}/${RUNTIME_DIR}/index.js`),
+        require: toPosixPath(`./${relativeDistPath}/${RUNTIME_DIR}/index.js`),
         types: toPosixPath(`./${relativeDistPath}/${RUNTIME_DIR}/index.d.ts`)
       }
     });

package/dist/cjs/utils/createHonoRoutes.js

@@ -71,57 +71,49 @@ const handleResponseMeta = (c, handler) => {
   return null;
 };
 const createHonoHandler = (handler) => {
-  return async (c, next) => {
-    try {
-      const input = await getHonoInput(c);
-      if ((0, import_bff_core.isWithMetaHandler)(handler)) {
-        try {
-          const response = handleResponseMeta(c, handler);
-          if (response) {
-            return response;
-          }
-          if (c.finalized)
-            return;
-          const result = await handler(input);
-          if (result instanceof Response) {
-            return result;
-          }
-          return result && typeof result === "object" ? c.json(result) : c.body(result);
-        } catch (error) {
-          if (error instanceof import_bff_core.ValidationError) {
-            c.status(error.status);
-            return c.json({
-              message: error.message
-            });
-          }
-          throw error;
+  return async (c) => {
+    const input = await getHonoInput(c);
+    if ((0, import_bff_core.isWithMetaHandler)(handler)) {
+      try {
+        const response = handleResponseMeta(c, handler);
+        if (response) {
+          return response;
         }
-      } else {
-        var _routePath_match;
-        const routePath = c.req.routePath;
-        const paramNames = ((_routePath_match = routePath.match(/:\w+/g)) === null || _routePath_match === void 0 ? void 0 : _routePath_match.map((s) => s.slice(1))) || [];
-        const params = Object.fromEntries(paramNames.map((name) => [
-          name,
-          input.params[name]
-        ]));
-        const args = Object.values(params).concat(input);
-        try {
-          const body = await handler(...args);
-          if (c.finalized) {
-            return await Promise.resolve();
-          }
-          if (typeof body !== "undefined") {
-            if (body instanceof Response) {
-              return body;
-            }
-            return c.json(body);
-          }
-        } catch {
-          return next();
+        if (c.finalized)
+          return;
+        const result = await handler(input);
+        if (result instanceof Response) {
+          return result;
+        }
+        return result && typeof result === "object" ? c.json(result) : c.body(result);
+      } catch (error) {
+        if (error instanceof import_bff_core.ValidationError) {
+          c.status(error.status);
+          return c.json({
+            message: error.message
+          });
+        }
+        throw error;
+      }
+    } else {
+      var _routePath_match;
+      const routePath = c.req.routePath;
+      const paramNames = ((_routePath_match = routePath.match(/:\w+/g)) === null || _routePath_match === void 0 ? void 0 : _routePath_match.map((s) => s.slice(1))) || [];
+      const params = Object.fromEntries(paramNames.map((name) => [
+        name,
+        input.params[name]
+      ]));
+      const args = Object.values(params).concat(input);
+      const body = await handler(...args);
+      if (c.finalized) {
+        return await Promise.resolve();
+      }
+      if (typeof body !== "undefined") {
+        if (body instanceof Response) {
+          return body;
         }
+        return c.json(body);
       }
-    } catch (error) {
-      next();
     }
   };
 };

package/dist/esm/cli.js

@@ -69,7 +69,8 @@ var bffPlugin = function() {
                     sourceDirs,
                     distDir,
                     tsconfigPath,
-                    moduleType
+                    moduleType,
+                    throwErrorInsteadOfExit: true
                   })
                 ];
               case 3:

package/dist/esm/runtime/hono/adapter.js

@@ -1,9 +1,10 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
+import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { Hono } from "@modern-js/server-core";
-import { isProd } from "@modern-js/utils";
+import { isProd, logger } from "@modern-js/utils";
 import createHonoRoutes from "../../utils/createHonoRoutes";
 var before = [
   "custom-server-hook",
@@ -61,6 +62,64 @@ var HonoAdapter = /* @__PURE__ */ function() {
             path
           ].concat(_to_consumable_array(handlers)));
         });
+        _this.apiServer.onError(function() {
+          var _ref = _async_to_generator(function(err, c) {
+            var serverConfig, onErrorHandler, result, configError;
+            return _ts_generator(this, function(_state2) {
+              switch (_state2.label) {
+                case 0:
+                  _state2.trys.push([
+                    0,
+                    3,
+                    ,
+                    4
+                  ]);
+                  serverConfig = _this.api.useConfigContext();
+                  onErrorHandler = serverConfig === null || serverConfig === void 0 ? void 0 : serverConfig.onError;
+                  if (!onErrorHandler)
+                    return [
+                      3,
+                      2
+                    ];
+                  return [
+                    4,
+                    onErrorHandler(err, c)
+                  ];
+                case 1:
+                  result = _state2.sent();
+                  if (_instanceof(result, Response)) {
+                    return [
+                      2,
+                      result
+                    ];
+                  }
+                  _state2.label = 2;
+                case 2:
+                  return [
+                    3,
+                    4
+                  ];
+                case 3:
+                  configError = _state2.sent();
+                  logger.error("Error in serverConfig.onError handler: ".concat(configError));
+                  return [
+                    3,
+                    4
+                  ];
+                case 4:
+                  return [
+                    2,
+                    c.json({
+                      message: (err === null || err === void 0 ? void 0 : err.message) || "[BFF] Internal Server Error"
+                    }, (err === null || err === void 0 ? void 0 : err.status) || 500)
+                  ];
+              }
+            });
+          });
+          return function(err, c) {
+            return _ref.apply(this, arguments);
+          };
+        }());
         return [
           2
         ];

package/dist/esm/utils/clientGenerator.js

@@ -252,7 +252,9 @@ function _setPackage() {
               return _object_spread_props(_object_spread({}, acc), _define_property({}, toPosixPath("".concat(TYPE_PREFIX).concat(file.exportKey)), [
                 typeFilePath
               ]));
-            }, (_obj = {}, _define_property(_obj, RUNTIME_DIR, [
+            }, (_obj = {}, _define_property(_obj, "".concat(API_DIR, "/*"), [
+              toPosixPath("./".concat(relativeDistPath, "/").concat(CLIENT_DIR, "/*.d.ts"))
+            ]), _define_property(_obj, RUNTIME_DIR, [
               toPosixPath("./".concat(relativeDistPath, "/").concat(RUNTIME_DIR, "/index.d.ts"))
             ]), _define_property(_obj, PLUGIN_DIR, [
               toPosixPath("./".concat(relativeDistPath, "/").concat(PLUGIN_DIR, "/index.d.ts"))
@@ -265,11 +267,16 @@ function _setPackage() {
               import: jsFilePath,
               types: toPosixPath(jsFilePath.replace(/\.js$/, ".d.ts"))
             }));
-          }, (_obj1 = {}, _define_property(_obj1, toPosixPath("./".concat(PLUGIN_DIR)), {
+          }, (_obj1 = {}, _define_property(_obj1, toPosixPath("./".concat(API_DIR, "/*")), {
+            import: toPosixPath("./".concat(relativeDistPath, "/").concat(CLIENT_DIR, "/*.js")),
+            types: toPosixPath("./".concat(relativeDistPath, "/").concat(CLIENT_DIR, "/*.d.ts"))
+          }), _define_property(_obj1, toPosixPath("./".concat(PLUGIN_DIR)), {
+            import: toPosixPath("./".concat(relativeDistPath, "/").concat(PLUGIN_DIR, "/index.js")),
             require: toPosixPath("./".concat(relativeDistPath, "/").concat(PLUGIN_DIR, "/index.js")),
             types: toPosixPath("./".concat(relativeDistPath, "/").concat(PLUGIN_DIR, "/index.d.ts"))
           }), _define_property(_obj1, toPosixPath("./".concat(RUNTIME_DIR)), {
             import: toPosixPath("./".concat(relativeDistPath, "/").concat(RUNTIME_DIR, "/index.js")),
+            require: toPosixPath("./".concat(relativeDistPath, "/").concat(RUNTIME_DIR, "/index.js")),
             types: toPosixPath("./".concat(relativeDistPath, "/").concat(RUNTIME_DIR, "/index.d.ts"))
           }), _obj1));
           mergePackageJson(packageJson, addFiles, typesVersions, exports);

package/dist/esm/utils/createHonoRoutes.js

@@ -79,17 +79,11 @@ var handleResponseMeta = function(c, handler) {
 };
 var createHonoHandler = function(handler) {
   return function() {
-    var _ref = _async_to_generator(function(c, next) {
-      var input, response, result, error, _routePath_match, routePath, paramNames, params, args, body, e, error1;
+    var _ref = _async_to_generator(function(c) {
+      var input, response, result, error, _routePath_match, routePath, paramNames, params, args, body;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
-            _state.trys.push([
-              0,
-              13,
-              ,
-              14
-            ]);
             return [
               4,
               getHonoInput(c)
@@ -151,7 +145,7 @@ var createHonoHandler = function(handler) {
           case 5:
             return [
               3,
-              12
+              10
             ];
           case 6:
             routePath = c.req.routePath;
@@ -165,35 +159,27 @@ var createHonoHandler = function(handler) {
               ];
             }));
             args = Object.values(params).concat(input);
-            _state.label = 7;
-          case 7:
-            _state.trys.push([
-              7,
-              11,
-              ,
-              12
-            ]);
             return [
               4,
               handler.apply(void 0, _to_consumable_array(args))
             ];
-          case 8:
+          case 7:
             body = _state.sent();
             if (!c.finalized)
               return [
                 3,
-                10
+                9
               ];
             return [
               4,
               Promise.resolve()
             ];
-          case 9:
+          case 8:
             return [
               2,
               _state.sent()
             ];
-          case 10:
+          case 9:
             if (typeof body !== "undefined") {
               if (_instanceof(body, Response)) {
                 return [
@@ -206,36 +192,15 @@ var createHonoHandler = function(handler) {
                 c.json(body)
               ];
             }
-            return [
-              3,
-              12
-            ];
-          case 11:
-            e = _state.sent();
-            return [
-              2,
-              next()
-            ];
-          case 12:
-            return [
-              3,
-              14
-            ];
-          case 13:
-            error1 = _state.sent();
-            next();
-            return [
-              3,
-              14
-            ];
-          case 14:
+            _state.label = 10;
+          case 10:
             return [
               2
             ];
         }
       });
     });
-    return function(c, next) {
+    return function(c) {
       return _ref.apply(this, arguments);
     };
   }();

package/dist/esm-node/cli.js

@@ -40,7 +40,8 @@ const bffPlugin = () => ({
           sourceDirs,
           distDir,
           tsconfigPath,
-          moduleType
+          moduleType,
+          throwErrorInsteadOfExit: true
         });
       }
     };

package/dist/esm-node/runtime/hono/adapter.js

@@ -1,5 +1,5 @@
 import { Hono } from "@modern-js/server-core";
-import { isProd } from "@modern-js/utils";
+import { isProd, logger } from "@modern-js/utils";
 import createHonoRoutes from "../../utils/createHonoRoutes";
 const before = [
   "custom-server-hook",
@@ -45,6 +45,23 @@ class HonoAdapter {
         const handlers = this.wrapInArray(handler);
         (_this_apiServer = this.apiServer) === null || _this_apiServer === void 0 ? void 0 : _this_apiServer[method](path, ...handlers);
       });
+      this.apiServer.onError(async (err, c) => {
+        try {
+          const serverConfig = this.api.useConfigContext();
+          const onErrorHandler = serverConfig === null || serverConfig === void 0 ? void 0 : serverConfig.onError;
+          if (onErrorHandler) {
+            const result = await onErrorHandler(err, c);
+            if (result instanceof Response) {
+              return result;
+            }
+          }
+        } catch (configError) {
+          logger.error(`Error in serverConfig.onError handler: ${configError}`);
+        }
+        return c.json({
+          message: (err === null || err === void 0 ? void 0 : err.message) || "[BFF] Internal Server Error"
+        }, (err === null || err === void 0 ? void 0 : err.status) || 500);
+      });
     };
     this.registerMiddleware = async (options) => {
       const { prefix } = options;

package/dist/esm-node/utils/clientGenerator.js

@@ -94,6 +94,9 @@ async function setPackage(files, appDirectory, relativeDistPath) {
           ]
         };
       }, {
+        [`${API_DIR}/*`]: [
+          toPosixPath(`./${relativeDistPath}/${CLIENT_DIR}/*.d.ts`)
+        ],
         [RUNTIME_DIR]: [
           toPosixPath(`./${relativeDistPath}/${RUNTIME_DIR}/index.d.ts`)
         ],
@@ -113,12 +116,18 @@ async function setPackage(files, appDirectory, relativeDistPath) {
         }
       };
     }, {
+      [toPosixPath(`./${API_DIR}/*`)]: {
+        import: toPosixPath(`./${relativeDistPath}/${CLIENT_DIR}/*.js`),
+        types: toPosixPath(`./${relativeDistPath}/${CLIENT_DIR}/*.d.ts`)
+      },
       [toPosixPath(`./${PLUGIN_DIR}`)]: {
+        import: toPosixPath(`./${relativeDistPath}/${PLUGIN_DIR}/index.js`),
         require: toPosixPath(`./${relativeDistPath}/${PLUGIN_DIR}/index.js`),
         types: toPosixPath(`./${relativeDistPath}/${PLUGIN_DIR}/index.d.ts`)
       },
       [toPosixPath(`./${RUNTIME_DIR}`)]: {
         import: toPosixPath(`./${relativeDistPath}/${RUNTIME_DIR}/index.js`),
+        require: toPosixPath(`./${relativeDistPath}/${RUNTIME_DIR}/index.js`),
         types: toPosixPath(`./${relativeDistPath}/${RUNTIME_DIR}/index.d.ts`)
       }
     });

package/dist/esm-node/utils/createHonoRoutes.js

@@ -37,57 +37,49 @@ const handleResponseMeta = (c, handler) => {
   return null;
 };
 const createHonoHandler = (handler) => {
-  return async (c, next) => {
-    try {
-      const input = await getHonoInput(c);
-      if (isWithMetaHandler(handler)) {
-        try {
-          const response = handleResponseMeta(c, handler);
-          if (response) {
-            return response;
-          }
-          if (c.finalized)
-            return;
-          const result = await handler(input);
-          if (result instanceof Response) {
-            return result;
-          }
-          return result && typeof result === "object" ? c.json(result) : c.body(result);
-        } catch (error) {
-          if (error instanceof ValidationError) {
-            c.status(error.status);
-            return c.json({
-              message: error.message
-            });
-          }
-          throw error;
+  return async (c) => {
+    const input = await getHonoInput(c);
+    if (isWithMetaHandler(handler)) {
+      try {
+        const response = handleResponseMeta(c, handler);
+        if (response) {
+          return response;
         }
-      } else {
-        var _routePath_match;
-        const routePath = c.req.routePath;
-        const paramNames = ((_routePath_match = routePath.match(/:\w+/g)) === null || _routePath_match === void 0 ? void 0 : _routePath_match.map((s) => s.slice(1))) || [];
-        const params = Object.fromEntries(paramNames.map((name) => [
-          name,
-          input.params[name]
-        ]));
-        const args = Object.values(params).concat(input);
-        try {
-          const body = await handler(...args);
-          if (c.finalized) {
-            return await Promise.resolve();
-          }
-          if (typeof body !== "undefined") {
-            if (body instanceof Response) {
-              return body;
-            }
-            return c.json(body);
-          }
-        } catch {
-          return next();
+        if (c.finalized)
+          return;
+        const result = await handler(input);
+        if (result instanceof Response) {
+          return result;
+        }
+        return result && typeof result === "object" ? c.json(result) : c.body(result);
+      } catch (error) {
+        if (error instanceof ValidationError) {
+          c.status(error.status);
+          return c.json({
+            message: error.message
+          });
+        }
+        throw error;
+      }
+    } else {
+      var _routePath_match;
+      const routePath = c.req.routePath;
+      const paramNames = ((_routePath_match = routePath.match(/:\w+/g)) === null || _routePath_match === void 0 ? void 0 : _routePath_match.map((s) => s.slice(1))) || [];
+      const params = Object.fromEntries(paramNames.map((name) => [
+        name,
+        input.params[name]
+      ]));
+      const args = Object.values(params).concat(input);
+      const body = await handler(...args);
+      if (c.finalized) {
+        return await Promise.resolve();
+      }
+      if (typeof body !== "undefined") {
+        if (body instanceof Response) {
+          return body;
         }
+        return c.json(body);
       }
-    } catch (error) {
-      next();
     }
   };
 };

package/dist/types/utils/createHonoRoutes.d.ts

@@ -1,10 +1,10 @@
 import type { APIHandlerInfo } from '@modern-js/bff-core';
-import type { Context, Next } from '@modern-js/server-core';
+import type { Context } from '@modern-js/server-core';
 type Handler = APIHandlerInfo['handler'];
 declare const createHonoRoutes: (handlerInfos?: APIHandlerInfo[]) => {
     method: any;
     path: string;
-    handler: any[] | ((c: Context, next: Next) => Promise<void | Response>);
+    handler: any[] | ((c: Context) => Promise<void | Response>);
 }[];
-export declare const createHonoHandler: (handler: Handler) => (c: Context, next: Next) => Promise<void | Response>;
+export declare const createHonoHandler: (handler: Handler) => (c: Context) => Promise<void | Response>;
 export default createHonoRoutes;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.68.12",
+  "version": "2.68.13",
   "jsnext:source": "./src/cli.ts",
   "types": "./dist/types/cli.d.ts",
   "main": "./dist/cjs/cli.js",
@@ -76,14 +76,14 @@
     "@babel/core": "^7.26.0",
     "@swc/helpers": "^0.5.17",
     "type-is": "^1.6.18",
-    "@modern-js/bff-core": "2.68.12",
-    "@modern-js/create-request": "2.68.12",
-    "@modern-js/server-core": "2.68.12",
-    "@modern-js/server-utils": "2.68.12",
-    "@modern-js/utils": "2.68.12"
+    "@modern-js/bff-core": "2.68.13",
+    "@modern-js/create-request": "2.68.13",
+    "@modern-js/server-core": "2.68.13",
+    "@modern-js/server-utils": "2.68.13",
+    "@modern-js/utils": "2.68.13"
   },
   "devDependencies": {
-    "@rsbuild/core": "1.5.3",
+    "@rsbuild/core": "1.5.6",
     "@types/babel__core": "^7.20.5",
     "@types/jest": "^29",
     "@types/node": "^18",
@@ -94,12 +94,12 @@
     "typescript": "^5",
     "webpack": "^5.101.3",
     "zod": "^3.22.3",
-    "@modern-js/bff-runtime": "2.68.12",
-    "@modern-js/app-tools": "2.68.12",
-    "@modern-js/core": "2.68.12",
-    "@modern-js/plugin-v2": "2.68.12",
-    "@modern-js/runtime": "2.68.12",
-    "@modern-js/types": "2.68.12",
+    "@modern-js/app-tools": "2.68.13",
+    "@modern-js/bff-runtime": "2.68.13",
+    "@modern-js/core": "2.68.13",
+    "@modern-js/plugin-v2": "2.68.13",
+    "@modern-js/runtime": "2.68.13",
+    "@modern-js/types": "2.68.13",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0"
   },