@nocobase/plugin-error-handler 1.6.0-alpha.3 → 1.6.0-alpha.31

package/dist/externalVersion.js

@@ -8,9 +8,9 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.0-alpha.3",
+  "@nocobase/client": "1.6.0-alpha.31",
   "@formily/json-schema": "2.3.0",
-  "@nocobase/database": "1.6.0-alpha.3",
-  "@nocobase/server": "1.6.0-alpha.3",
+  "@nocobase/database": "1.6.0-alpha.31",
+  "@nocobase/server": "1.6.0-alpha.31",
   "lodash": "4.17.21"
 };

package/dist/locale/it-IT.json

@@ -0,0 +1,6 @@
+{
+  "unique violation": "{{field}} già esiste",
+  "notNull violation": "{{field}} non può essere vuoto",
+  "Validation error": "{{field}} errore di convalida",
+  "notNull Violation": "{{field}} non può essere vuoto"
+}

package/dist/server/error-handler.d.ts

@@ -10,5 +10,6 @@ export declare class ErrorHandler {
     handlers: any[];
     register(guard: (err: any) => boolean, render: (err: any, ctx: any) => void): void;
     defaultHandler(err: any, ctx: any): void;
-    middleware(): (ctx: any, next: any) => Promise<any>;
+    renderError(err: any, ctx: any): any;
+    middleware(): (ctx: any, next: any) => Promise<void>;
 }

package/dist/server/error-handler.js

@@ -52,6 +52,14 @@ class ErrorHandler {
       ]
     };
   }
+  renderError(err, ctx) {
+    for (const handler of this.handlers) {
+      if (handler.guard(err)) {
+        return handler.render(err, ctx);
+      }
+    }
+    this.defaultHandler(err, ctx);
+  }
   middleware() {
     const self = this;
     return async function errorHandler(ctx, next) {
@@ -62,12 +70,7 @@ class ErrorHandler {
         if (err.statusCode) {
           ctx.status = err.statusCode;
         }
-        for (const handler of self.handlers) {
-          if (handler.guard(err)) {
-            return handler.render(err, ctx);
-          }
-        }
-        self.defaultHandler(err, ctx);
+        self.renderError(err, ctx);
       }
     };
   }

package/dist/server/index.d.ts

@@ -7,3 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 export { PluginErrorHandlerServer as default } from './server';
+export { ErrorHandler } from './error-handler';

package/dist/server/index.js

@@ -26,7 +26,13 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var server_exports = {};
 __export(server_exports, {
+  ErrorHandler: () => import_error_handler.ErrorHandler,
   default: () => import_server.PluginErrorHandlerServer
 });
 module.exports = __toCommonJS(server_exports);
 var import_server = require("./server");
+var import_error_handler = require("./error-handler");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ErrorHandler
+});

package/dist/server/server.js

@@ -40,7 +40,6 @@ __export(server_exports, {
 });
 module.exports = __toCommonJS(server_exports);
 var import_json_schema = require("@formily/json-schema");
-var import_database = require("@nocobase/database");
 var import_server = require("@nocobase/server");
 var import_lodash = __toESM(require("lodash"));
 var import_error_handler = require("./error-handler");
@@ -71,7 +70,7 @@ class PluginErrorHandlerServer extends import_server.Plugin {
     this.errorHandler.register(
       (err) => {
         var _a;
-        return ((_a = err == null ? void 0 : err.errors) == null ? void 0 : _a.length) && err instanceof import_database.BaseError;
+        return ((_a = err == null ? void 0 : err.errors) == null ? void 0 : _a.length) && (err.name === "SequelizeValidationError" || err.name === "SequelizeUniqueConstraintError");
       },
       (err, ctx) => {
         ctx.body = {

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "错误处理器",
   "description": "Handling application errors and exceptions.",
   "description.zh-CN": "处理应用程序中的错误和异常。",
-  "version": "1.6.0-alpha.3",
+  "version": "1.6.0-alpha.31",
   "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": "205b4aca5556d5af70679fa401394943a9e51670"
+  "gitHead": "2f118f0a0691dd51c437f208b1166258a615b6a8"
 }