@nocobase/plugin-error-handler 0.21.0-alpha.1 → 0.21.0-alpha.10

package/dist/client/index.d.ts

@@ -1,5 +1,5 @@
 import { Plugin } from '@nocobase/client';
-declare class ErrorHandlerPlugin extends Plugin {
+declare class PluginErrorHandlerClient extends Plugin {
     load(): Promise<void>;
 }
-export default ErrorHandlerPlugin;
+export default PluginErrorHandlerClient;

package/dist/client/index.js

@@ -1 +1 @@
-(function(e,n){typeof exports=="object"&&typeof module!="undefined"?n(exports,require("@nocobase/client")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client"],n):(e=typeof globalThis!="undefined"?globalThis:e||self,n(e["@nocobase/plugin-error-handler"]={},e["@nocobase/client"]))})(this,function(e,n){"use strict";var l=(e,n,i)=>new Promise((d,u)=>{var r=o=>{try{t(i.next(o))}catch(s){u(s)}},c=o=>{try{t(i.throw(o))}catch(s){u(s)}},t=o=>o.done?d(o.value):Promise.resolve(o.value).then(r,c);t((i=i.apply(e,n)).next())});class i extends n.Plugin{load(){return l(this,null,function*(){})}}e.default=i,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+(function(e,n){typeof exports=="object"&&typeof module!="undefined"?n(exports,require("@nocobase/client")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client"],n):(e=typeof globalThis!="undefined"?globalThis:e||self,n(e["@nocobase/plugin-error-handler"]={},e["@nocobase/client"]))})(this,function(e,n){"use strict";var u=(e,n,i)=>new Promise((d,l)=>{var r=o=>{try{t(i.next(o))}catch(s){l(s)}},c=o=>{try{t(i.throw(o))}catch(s){l(s)}},t=o=>o.done?d(o.value):Promise.resolve(o.value).then(r,c);t((i=i.apply(e,n)).next())});class i extends n.Plugin{load(){return u(this,null,function*(){})}}e.default=i,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/externalVersion.js

@@ -1,7 +1,7 @@
 module.exports = {
-  "@nocobase/client": "0.21.0-alpha.1",
+  "@nocobase/client": "0.21.0-alpha.10",
   "@formily/json-schema": "2.3.0",
-  "@nocobase/database": "0.21.0-alpha.1",
-  "@nocobase/server": "0.21.0-alpha.1",
+  "@nocobase/database": "0.21.0-alpha.10",
+  "@nocobase/server": "0.21.0-alpha.10",
   "lodash": "4.17.21"
 };

package/dist/server/error-handler.js

@@ -30,10 +30,14 @@ class ErrorHandler {
   }
   defaultHandler(err, ctx) {
     ctx.status = err.statusCode || err.status || 500;
+    let message = err.message;
+    if (err.cause) {
+      message += `: ${err.cause.message}`;
+    }
     ctx.body = {
       errors: [
         {
-          message: err.message,
+          message,
           code: err.code
         }
       ]
@@ -46,6 +50,9 @@ class ErrorHandler {
         await next();
       } catch (err) {
         ctx.log.error(err.message, { method: "error-handler", err: err.stack });
+        if (err.statusCode) {
+          ctx.status = err.statusCode;
+        }
         for (const handler of self.handlers) {
           if (handler.guard(err)) {
             return handler.render(err, ctx);

package/dist/server/index.d.ts

@@ -1 +1 @@
-export { PluginErrorHandler as default } from './server';
+export { PluginErrorHandlerServer as default } from './server';

package/dist/server/index.js

@@ -17,7 +17,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var server_exports = {};
 __export(server_exports, {
-  default: () => import_server.PluginErrorHandler
+  default: () => import_server.PluginErrorHandlerServer
 });
 module.exports = __toCommonJS(server_exports);
 var import_server = require("./server");

package/dist/server/server.d.ts

@@ -1,6 +1,6 @@
 import { Plugin } from '@nocobase/server';
 import { ErrorHandler } from './error-handler';
-export declare class PluginErrorHandler extends Plugin {
+export declare class PluginErrorHandlerServer extends Plugin {
     errorHandler: ErrorHandler;
     i18nNs: string;
     beforeLoad(): void;

package/dist/server/server.js

@@ -27,7 +27,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var server_exports = {};
 __export(server_exports, {
-  PluginErrorHandler: () => PluginErrorHandler
+  PluginErrorHandlerServer: () => PluginErrorHandlerServer
 });
 module.exports = __toCommonJS(server_exports);
 var import_json_schema = require("@formily/json-schema");
@@ -37,7 +37,7 @@ var import_lodash = __toESM(require("lodash"));
 var import_error_handler = require("./error-handler");
 var import_en_US = __toESM(require("./locale/en_US"));
 var import_zh_CN = __toESM(require("./locale/zh_CN"));
-class PluginErrorHandler extends import_server.Plugin {
+class PluginErrorHandlerServer extends import_server.Plugin {
   errorHandler = new import_error_handler.ErrorHandler();
   i18nNs = "error-handler";
   beforeLoad() {
@@ -53,6 +53,9 @@ class PluginErrorHandler extends import_server.Plugin {
       const dataSource = ctx.app.dataSourceManager.dataSources.get(dataSourceKey);
       const database = dataSource ? dataSource.collectionManager.db : ctx.db;
       const collection = database.modelCollection.get(model);
+      if (!collection) {
+        return path;
+      }
       const field = collection.getField(path);
       const fieldOptions = import_json_schema.Schema.compile(field == null ? void 0 : field.options, { t: tFunc });
       const title = import_lodash.default.get(fieldOptions, "uiSchema.title", path);
@@ -86,5 +89,5 @@ class PluginErrorHandler extends import_server.Plugin {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  PluginErrorHandler
+  PluginErrorHandlerServer
 });

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "错误处理器",
   "description": "Handling application errors and exceptions.",
   "description.zh-CN": "处理应用程序中的错误和异常。",
-  "version": "0.21.0-alpha.1",
+  "version": "0.21.0-alpha.10",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -23,5 +23,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugin-error-handler"
   },
-  "gitHead": "afd2f3d1341b85ea9daa7b2667dd4ace1fafb7ff"
+  "gitHead": "98adf5ec996a4f359c6ca1c4a6ac837c43b6e268"
 }