@nocobase/plugin-error-handler 0.11.1-alpha.4 → 0.12.0-alpha.1

package/client.d.ts

@@ -1,3 +1,2 @@
-export * from './src/client';
-export { default } from './src/client';
-
+export * from './dist/client';
+export { default } from './dist/client';

package/client.js

@@ -1 +1 @@
-module.exports = require('./lib/client/index.js');
+module.exports = require('./dist/client/index.js');

package/dist/client/index.js

@@ -0,0 +1,11 @@
+(function(global, factory) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@nocobase/client")) : typeof define === "function" && define.amd ? define(["exports", "@nocobase/client"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["@nocobase/plugin-error-handler"] = {}, global["@nocobase/client"]));
+})(this, function(exports2, client) {
+  "use strict";
+  class ErrorHandlerPlugin extends client.Plugin {
+    async load() {
+    }
+  }
+  exports2.default = ErrorHandlerPlugin;
+  Object.defineProperties(exports2, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+});

package/{lib → dist}/index.d.ts

@@ -1 +1,2 @@
+export * from './server';
 export { default } from './server';

package/dist/index.js

@@ -0,0 +1,18 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var server = require('./server');
+
+
+
+Object.defineProperty(exports, 'default', {
+  enumerable: true,
+  get: function () { return server__namespace.default; }
+});
+Object.keys(server).forEach(function (k) {
+  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return server[k]; }
+  });
+});

package/dist/locale/en_US.js

@@ -0,0 +1,10 @@
+'use strict';
+
+var en_US_default = {
+  "unique violation": "{{field}} must be unique",
+  "notNull violation": "notNull violation",
+  "Validation error": "{{field}} validation error",
+  "notNull Violation": "{{field}} cannot be null"
+};
+
+module.exports = en_US_default;

package/dist/locale/es-ES.js

@@ -0,0 +1,10 @@
+'use strict';
+
+var es_ES_default = {
+  "unique violation": "{{field}} debe ser \xFAnico",
+  "notNull violation": "notNull violaci\xF3n",
+  "Validation error": "{{field}} error de validaci\xF3n",
+  "notNull Violation": "{{field}} no puede ser null"
+};
+
+module.exports = es_ES_default;

package/dist/locale/fr_FR.js

@@ -0,0 +1,10 @@
+'use strict';
+
+var fr_FR_default = {
+  "unique violation": "{{field}} doit \xEAtre unique",
+  "notNull violation": "Violation de contrainte notNull",
+  "Validation error": "Erreur de validation de {{field}}",
+  "notNull Violation": "{{field}} ne peut pas \xEAtre null"
+};
+
+module.exports = fr_FR_default;

package/dist/locale/ja_JP.js

@@ -0,0 +1,8 @@
+'use strict';
+
+var ja_JP_default = {
+  "unique violation": "{{field}} \u306F\u4E00\u610F\u3067\u306A\u304F\u3066\u306F\u306A\u308A\u307E\u305B\u3093",
+  "notNull Violation": "{{field}} \u306FNull\u306B\u3067\u304D\u307E\u305B\u3093"
+};
+
+module.exports = ja_JP_default;

package/dist/locale/pt-BR.js

@@ -0,0 +1,10 @@
+'use strict';
+
+var pt_BR_default = {
+  "unique violation": "{{field}} deve ser \xFAnico",
+  "notNull violation": "viola\xE7\xE3o de n\xE3o nulo",
+  "Validation error": "erro de valida\xE7\xE3o de {{field}}",
+  "notNull Violation": "{{field}} n\xE3o pode ser nulo"
+};
+
+module.exports = pt_BR_default;

package/dist/locale/zh_CN.js

@@ -0,0 +1,9 @@
+'use strict';
+
+var zh_CN_default = {
+  "unique violation": "{{field}} \u5B57\u6BB5\u503C\u662F\u552F\u4E00\u7684",
+  "notNull violation": "{{field}} \u5B57\u6BB5\u4E0D\u80FD\u4E3A\u7A7A",
+  "Validation error": "{{field}} \u5B57\u6BB5\u89C4\u5219\u9A8C\u8BC1\u5931\u8D25"
+};
+
+module.exports = zh_CN_default;

package/{src/server/error-handler.ts → dist/server/error-handler.js}

@@ -1,29 +1,27 @@
-export class ErrorHandler {
-  handlers = [];
+'use strict';
 
-  register(guard: (err) => boolean, render: (err, ctx) => void) {
+class ErrorHandler {
+  handlers = [];
+  register(guard, render) {
     this.handlers.push({
       guard,
-      render,
+      render
     });
   }
-
   defaultHandler(err, ctx) {
     ctx.status = err.statusCode || err.status || 500;
     ctx.body = {
       errors: [
         {
           message: err.message,
-          code: err.code,
-        },
-      ],
+          code: err.code
+        }
+      ]
     };
-
     if (ctx.status === 500) {
       console.error(err);
     }
   }
-
   middleware() {
     const self = this;
     return async function errorHandler(ctx, next) {
@@ -31,15 +29,15 @@ export class ErrorHandler {
         await next();
       } catch (err) {
         ctx.log.error(err);
-
         for (const handler of self.handlers) {
           if (handler.guard(err)) {
             return handler.render(err, ctx);
           }
         }
-
         self.defaultHandler(err, ctx);
       }
     };
   }
 }
+
+exports.ErrorHandler = ErrorHandler;

package/dist/server/index.js

@@ -0,0 +1,7 @@
+'use strict';
+
+var server = require('./server');
+
+
+
+module.exports = server.PluginErrorHandler;

package/dist/server/locale/en_US.js

@@ -0,0 +1,10 @@
+'use strict';
+
+var en_US_default = {
+  "unique violation": "{{field}} must be unique",
+  "notNull violation": "notNull violation",
+  "Validation error": "{{field}} validation error",
+  "notNull Violation": "{{field}} cannot be null"
+};
+
+module.exports = en_US_default;

package/dist/server/locale/es-ES.js

@@ -0,0 +1,10 @@
+'use strict';
+
+var es_ES_default = {
+  "unique violation": "{{field}} debe ser \xFAnico",
+  "notNull violation": "notNull violaci\xF3n",
+  "Validation error": "{{field}} error de validaci\xF3n",
+  "notNull Violation": "{{field}} no puede ser null"
+};
+
+module.exports = es_ES_default;

package/dist/server/locale/fr_FR.js

@@ -0,0 +1,10 @@
+'use strict';
+
+var fr_FR_default = {
+  "unique violation": "{{field}} doit \xEAtre unique",
+  "notNull violation": "Violation de contrainte notNull",
+  "Validation error": "Erreur de validation de {{field}}",
+  "notNull Violation": "{{field}} ne peut pas \xEAtre null"
+};
+
+module.exports = fr_FR_default;

package/dist/server/locale/ja_JP.js

@@ -0,0 +1,8 @@
+'use strict';
+
+var ja_JP_default = {
+  "unique violation": "{{field}} \u306F\u4E00\u610F\u3067\u306A\u304F\u3066\u306F\u306A\u308A\u307E\u305B\u3093",
+  "notNull Violation": "{{field}} \u306FNull\u306B\u3067\u304D\u307E\u305B\u3093"
+};
+
+module.exports = ja_JP_default;

package/dist/server/locale/pt-BR.js

@@ -0,0 +1,10 @@
+'use strict';
+
+var pt_BR_default = {
+  "unique violation": "{{field}} deve ser \xFAnico",
+  "notNull violation": "viola\xE7\xE3o de n\xE3o nulo",
+  "Validation error": "erro de valida\xE7\xE3o de {{field}}",
+  "notNull Violation": "{{field}} n\xE3o pode ser nulo"
+};
+
+module.exports = pt_BR_default;

package/dist/server/locale/zh_CN.js

@@ -0,0 +1,9 @@
+'use strict';
+
+var zh_CN_default = {
+  "unique violation": "{{field}} \u5B57\u6BB5\u503C\u662F\u552F\u4E00\u7684",
+  "notNull violation": "{{field}} \u5B57\u6BB5\u4E0D\u80FD\u4E3A\u7A7A",
+  "Validation error": "{{field}} \u5B57\u6BB5\u89C4\u5219\u9A8C\u8BC1\u5931\u8D25"
+};
+
+module.exports = zh_CN_default;

package/dist/server/server.js

@@ -0,0 +1,62 @@
+'use strict';
+
+var jsonSchema = require('@formily/json-schema');
+var database = require('@nocobase/database');
+var server = require('@nocobase/server');
+var lodash = require('lodash');
+var errorHandler = require('./error-handler');
+var enUS = require('./locale/en_US');
+var zhCN = require('./locale/zh_CN');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var lodash__default = /*#__PURE__*/_interopDefault(lodash);
+var enUS__default = /*#__PURE__*/_interopDefault(enUS);
+var zhCN__default = /*#__PURE__*/_interopDefault(zhCN);
+
+class PluginErrorHandler extends server.Plugin {
+  errorHandler = new errorHandler.ErrorHandler();
+  i18nNs = "error-handler";
+  beforeLoad() {
+    this.registerSequelizeValidationErrorHandler();
+  }
+  registerSequelizeValidationErrorHandler() {
+    const findFieldTitle = (instance, path, tFunc) => {
+      if (!instance) {
+        return path;
+      }
+      const model = instance.constructor;
+      const collection = this.db.modelCollection.get(model);
+      const field = collection.getField(path);
+      const fieldOptions = jsonSchema.Schema.compile(field == null ? void 0 : field.options, { t: tFunc });
+      const title = lodash__default.default.get(fieldOptions, "uiSchema.title", path);
+      return title;
+    };
+    this.errorHandler.register(
+      (err) => {
+        var _a;
+        return ((_a = err == null ? void 0 : err.errors) == null ? void 0 : _a.length) && err instanceof database.BaseError;
+      },
+      (err, ctx) => {
+        ctx.body = {
+          errors: err.errors.map((err2) => {
+            return {
+              message: ctx.i18n.t(err2.type, {
+                ns: this.i18nNs,
+                field: findFieldTitle(err2.instance, err2.path, ctx.i18n.t)
+              })
+            };
+          })
+        };
+        ctx.status = 400;
+      }
+    );
+  }
+  async load() {
+    this.app.i18n.addResources("zh-CN", this.i18nNs, zhCN__default.default);
+    this.app.i18n.addResources("en-US", this.i18nNs, enUS__default.default);
+    this.app.use(this.errorHandler.middleware(), { before: "cors", tag: "errorHandler" });
+  }
+}
+
+exports.PluginErrorHandler = PluginErrorHandler;

package/package.json

@@ -1,36 +1,27 @@
 {
   "name": "@nocobase/plugin-error-handler",
   "displayName": "error handler",
-  "displayName.zh-CN": "错误处理",
-  "description": "Managing and handling errors and exceptions in an application.",
-  "description.zh-CN": "管理和处理应用程序中的错误和异常。",
-  "version": "0.11.1-alpha.4",
+  "displayName.zh-CN": "错误处理器",
+  "description": "Handling application errors and exceptions",
+  "description.zh-CN": "处理应用程序中的错误和异常",
+  "version": "0.12.0-alpha.1",
   "license": "AGPL-3.0",
-  "main": "./lib/server/index.js",
-  "files": [
-    "lib",
-    "src",
-    "README.md",
-    "README.zh-CN.md",
-    "CHANGELOG.md",
-    "server.js",
-    "server.d.ts",
-    "client.js",
-    "client.d.ts"
-  ],
+  "main": "./dist/server/index.js",
   "devDependencies": {
-    "@formily/json-schema": "2.2.26",
-    "@nocobase/client": "0.11.1-alpha.4",
-    "@nocobase/database": "0.11.1-alpha.4",
-    "@nocobase/server": "0.11.1-alpha.4",
-    "@nocobase/test": "0.11.1-alpha.4",
-    "@nocobase/utils": "0.11.1-alpha.4",
+    "@formily/json-schema": "2.x",
     "supertest": "^6.1.6"
   },
+  "peerDependencies": {
+    "@nocobase/client": "0.x",
+    "@nocobase/database": "0.x",
+    "@nocobase/server": "0.x",
+    "@nocobase/test": "0.x",
+    "@nocobase/utils": "0.x"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugin-error-handler"
   },
-  "gitHead": "d9b5bde913013f1057e1aab49587eb0ad3dcb06e"
+  "gitHead": "543dcc0216b7b1451b552b0f685bc3e0682f9d59"
 }

package/server.d.ts

@@ -1,3 +1,2 @@
-export * from './src/server';
-export { default } from './src/server';
-
+export * from './dist/server';
+export { default } from './dist/server';

package/server.js

@@ -1 +1 @@
-module.exports = require('./lib/server/index.js');
+module.exports = require('./dist/server/index.js');

package/lib/client/index.js

@@ -1,22 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
-    return data;
-  };
-  return data;
-}
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-class ErrorHandlerPlugin extends _client().Plugin {
-  load() {
-    return _asyncToGenerator(function* () {})();
-  }
-}
-var _default = ErrorHandlerPlugin;
-exports.default = _default;

package/lib/index.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function get() {
-    return _server.default;
-  }
-});
-var _server = _interopRequireDefault(require("./server"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/locale/en_US.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  'unique violation': '{{field}} must be unique',
-  'notNull violation': 'notNull violation',
-  'Validation error': '{{field}} validation error',
-  'notNull Violation': '{{field}} cannot be null'
-};
-exports.default = _default;

package/lib/locale/es-ES.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  "unique violation": "{{field}} debe ser único",
-  "notNull violation": "notNull violación",
-  "Validation error": "{{field}} error de validación",
-  "notNull Violation": "{{field}} no puede ser null"
-};
-exports.default = _default;

package/lib/locale/fr_FR.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  'unique violation': '{{field}} doit être unique',
-  'notNull violation': 'Violation de contrainte notNull',
-  'Validation error': 'Erreur de validation de {{field}}',
-  'notNull Violation': '{{field}} ne peut pas être null'
-};
-exports.default = _default;

package/lib/locale/ja_JP.js

@@ -1,11 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  'unique violation': '{{field}} は一意でなくてはなりません',
-  'notNull Violation': '{{field}} はNullにできません'
-};
-exports.default = _default;

package/lib/locale/pt-BR.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  'unique violation': '{{field}} deve ser único',
-  'notNull violation': 'violação de não nulo',
-  'Validation error': 'erro de validação de {{field}}',
-  'notNull Violation': '{{field}} não pode ser nulo'
-};
-exports.default = _default;

package/lib/locale/zh_CN.js

@@ -1,12 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  'unique violation': '{{field}} 字段值是唯一的',
-  'notNull violation': '{{field}} 字段不能为空',
-  'Validation error': '{{field}} 字段规则验证失败'
-};
-exports.default = _default;

package/lib/server/error-handler.js

@@ -1,66 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ErrorHandler = void 0;
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-class ErrorHandler {
-  constructor() {
-    this.handlers = [];
-  }
-  register(guard, render) {
-    this.handlers.push({
-      guard,
-      render
-    });
-  }
-  defaultHandler(err, ctx) {
-    ctx.status = err.statusCode || err.status || 500;
-    ctx.body = {
-      errors: [{
-        message: err.message,
-        code: err.code
-      }]
-    };
-    if (ctx.status === 500) {
-      console.error(err);
-    }
-  }
-  middleware() {
-    const self = this;
-    return /*#__PURE__*/function () {
-      var _errorHandler = _asyncToGenerator(function* (ctx, next) {
-        try {
-          yield next();
-        } catch (err) {
-          ctx.log.error(err);
-          var _iterator = _createForOfIteratorHelper(self.handlers),
-            _step;
-          try {
-            for (_iterator.s(); !(_step = _iterator.n()).done;) {
-              const handler = _step.value;
-              if (handler.guard(err)) {
-                return handler.render(err, ctx);
-              }
-            }
-          } catch (err) {
-            _iterator.e(err);
-          } finally {
-            _iterator.f();
-          }
-          self.defaultHandler(err, ctx);
-        }
-      });
-      function errorHandler(_x, _x2) {
-        return _errorHandler.apply(this, arguments);
-      }
-      return errorHandler;
-    }();
-  }
-}
-exports.ErrorHandler = ErrorHandler;

package/lib/server/index.js

@@ -1,12 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function get() {
-    return _server.PluginErrorHandler;
-  }
-});
-var _server = require("./server");

package/lib/server/locale/en_US.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  'unique violation': '{{field}} must be unique',
-  'notNull violation': 'notNull violation',
-  'Validation error': '{{field}} validation error',
-  'notNull Violation': '{{field}} cannot be null'
-};
-exports.default = _default;

package/lib/server/locale/es-ES.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  "unique violation": "{{field}} debe ser único",
-  "notNull violation": "notNull violación",
-  "Validation error": "{{field}} error de validación",
-  "notNull Violation": "{{field}} no puede ser null"
-};
-exports.default = _default;

package/lib/server/locale/fr_FR.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  'unique violation': '{{field}} doit être unique',
-  'notNull violation': 'Violation de contrainte notNull',
-  'Validation error': 'Erreur de validation de {{field}}',
-  'notNull Violation': '{{field}} ne peut pas être null'
-};
-exports.default = _default;

package/lib/server/locale/ja_JP.js

@@ -1,11 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  'unique violation': '{{field}} は一意でなくてはなりません',
-  'notNull Violation': '{{field}} はNullにできません'
-};
-exports.default = _default;

package/lib/server/locale/pt-BR.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  'unique violation': '{{field}} deve ser único',
-  'notNull violation': 'violação de não nulo',
-  'Validation error': 'erro de validação de {{field}}',
-  'notNull Violation': '{{field}} não pode ser nulo'
-};
-exports.default = _default;

package/lib/server/locale/zh_CN.js

@@ -1,12 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  'unique violation': '{{field}} 字段值是唯一的',
-  'notNull violation': '{{field}} 字段不能为空',
-  'Validation error': '{{field}} 字段规则验证失败'
-};
-exports.default = _default;

package/lib/server/server.js

@@ -1,93 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.PluginErrorHandler = void 0;
-function _jsonSchema() {
-  const data = require("@formily/json-schema");
-  _jsonSchema = function _jsonSchema() {
-    return data;
-  };
-  return data;
-}
-function _database() {
-  const data = require("@nocobase/database");
-  _database = function _database() {
-    return data;
-  };
-  return data;
-}
-function _server() {
-  const data = require("@nocobase/server");
-  _server = function _server() {
-    return data;
-  };
-  return data;
-}
-function _utils() {
-  const data = require("@nocobase/utils");
-  _utils = function _utils() {
-    return data;
-  };
-  return data;
-}
-var _errorHandler = require("./error-handler");
-var _en_US = _interopRequireDefault(require("./locale/en_US"));
-var _zh_CN = _interopRequireDefault(require("./locale/zh_CN"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-class PluginErrorHandler extends _server().Plugin {
-  constructor(...args) {
-    super(...args);
-    this.errorHandler = new _errorHandler.ErrorHandler();
-    this.i18nNs = 'error-handler';
-  }
-  beforeLoad() {
-    this.registerSequelizeValidationErrorHandler();
-  }
-  registerSequelizeValidationErrorHandler() {
-    const findFieldTitle = (instance, path, tFunc) => {
-      if (!instance) {
-        return path;
-      }
-      const model = instance.constructor;
-      const collection = this.db.modelCollection.get(model);
-      const field = collection.getField(path);
-      const fieldOptions = _jsonSchema().Schema.compile(field === null || field === void 0 ? void 0 : field.options, {
-        t: tFunc
-      });
-      const title = _utils().lodash.get(fieldOptions, 'uiSchema.title', path);
-      return title;
-    };
-    this.errorHandler.register(err => {
-      var _err$errors;
-      return (err === null || err === void 0 ? void 0 : (_err$errors = err.errors) === null || _err$errors === void 0 ? void 0 : _err$errors.length) && err instanceof _database().BaseError;
-    }, (err, ctx) => {
-      ctx.body = {
-        errors: err.errors.map(err => {
-          return {
-            message: ctx.i18n.t(err.type, {
-              ns: this.i18nNs,
-              field: findFieldTitle(err.instance, err.path, ctx.i18n.t)
-            })
-          };
-        })
-      };
-      ctx.status = 400;
-    });
-  }
-  load() {
-    var _this = this;
-    return _asyncToGenerator(function* () {
-      _this.app.i18n.addResources('zh-CN', _this.i18nNs, _zh_CN.default);
-      _this.app.i18n.addResources('en-US', _this.i18nNs, _en_US.default);
-      _this.app.use(_this.errorHandler.middleware(), {
-        before: 'cors',
-        tag: 'errorHandler'
-      });
-    })();
-  }
-}
-exports.PluginErrorHandler = PluginErrorHandler;

package/src/client/index.ts

@@ -1,7 +0,0 @@
-import { Plugin } from '@nocobase/client';
-
-class ErrorHandlerPlugin extends Plugin {
-  async load() { }
-}
-
-export default ErrorHandlerPlugin;

package/src/index.ts

@@ -1 +0,0 @@
-export { default } from './server';

package/src/locale/en_US.ts

@@ -1,6 +0,0 @@
-export default {
-  'unique violation': '{{field}} must be unique',
-  'notNull violation': 'notNull violation',
-  'Validation error': '{{field}} validation error',
-  'notNull Violation': '{{field}} cannot be null',
-};

package/src/locale/es-ES.ts

@@ -1,6 +0,0 @@
-export default {
-  "unique violation": "{{field}} debe ser único",
-  "notNull violation": "notNull violación",
-  "Validation error": "{{field}} error de validación",
-  "notNull Violation": "{{field}} no puede ser null"
-};

package/src/locale/fr_FR.ts

@@ -1,6 +0,0 @@
-export default {
-  'unique violation': '{{field}} doit être unique',
-  'notNull violation': 'Violation de contrainte notNull',
-  'Validation error': 'Erreur de validation de {{field}}',
-  'notNull Violation': '{{field}} ne peut pas être null',
-};

package/src/locale/ja_JP.ts

@@ -1,4 +0,0 @@
-export default {
-  'unique violation': '{{field}} は一意でなくてはなりません',
-  'notNull Violation': '{{field}} はNullにできません',
-};

package/src/locale/pt-BR.ts

@@ -1,6 +0,0 @@
-export default {
-  'unique violation': '{{field}} deve ser único',
-  'notNull violation': 'violação de não nulo',
-  'Validation error': 'erro de validação de {{field}}',
-  'notNull Violation': '{{field}} não pode ser nulo',
-};

package/src/locale/zh_CN.ts

@@ -1,5 +0,0 @@
-export default {
-  'unique violation': '{{field}} 字段值是唯一的',
-  'notNull violation': '{{field}} 字段不能为空',
-  'Validation error': '{{field}} 字段规则验证失败',
-};

package/src/server/__tests__/render-error.test.ts

@@ -1,172 +0,0 @@
-import { Database } from '@nocobase/database';
-import { MockServer, mockServer } from '@nocobase/test';
-import supertest from 'supertest';
-import { PluginErrorHandler } from '../server';
-describe('create with exception', () => {
-  let app: MockServer;
-  beforeEach(async () => {
-    app = mockServer({
-      acl: false,
-    });
-    await app.cleanDb();
-    app.plugin(PluginErrorHandler, { name: 'error-handler' });
-  });
-
-  afterEach(async () => {
-    await app.destroy();
-  });
-
-  it('should handle not null error', async () => {
-    app.collection({
-      name: 'users',
-      fields: [
-        {
-          name: 'name',
-          type: 'string',
-          allowNull: false,
-        },
-      ],
-    });
-
-    await app.loadAndInstall();
-
-    const response = await app
-      .agent()
-      .resource('users')
-      .create({
-        values: {
-          title: 't1',
-        },
-      });
-
-    expect(response.statusCode).toEqual(400);
-
-    expect(response.body).toEqual({
-      errors: [
-        {
-          message: 'name cannot be null',
-        },
-      ],
-    });
-  });
-
-  it('should handle unique error', async () => {
-    app.collection({
-      name: 'users',
-      fields: [
-        {
-          name: 'name',
-          type: 'string',
-          unique: true,
-        },
-      ],
-    });
-
-    await app.loadAndInstall();
-
-    await app
-      .agent()
-      .resource('users')
-      .create({
-        values: {
-          name: 'u1',
-        },
-      });
-
-    const response = await app
-      .agent()
-      .resource('users')
-      .create({
-        values: {
-          name: 'u1',
-        },
-      });
-
-    expect(response.statusCode).toEqual(400);
-
-    expect(response.body).toEqual({
-      errors: [
-        {
-          message: 'name must be unique',
-        },
-      ],
-    });
-  });
-
-  it('should render error with field title', async () => {
-    app.collection({
-      name: 'users',
-      fields: [
-        {
-          name: 'name',
-          type: 'string',
-          allowNull: false,
-          uiSchema: {
-            title: '{{t("UserName")}}',
-          },
-        },
-      ],
-    });
-
-    await app.loadAndInstall();
-
-    const response = await app.agent().resource('users').create({});
-
-    expect(response.statusCode).toEqual(400);
-
-    expect(response.body).toEqual({
-      errors: [
-        {
-          message: 'UserName cannot be null',
-        },
-      ],
-    });
-  });
-
-  it('should handle unique error with raw sql', async () => {
-    const userCollection = app.collection({
-      name: 'users',
-      autoGenId: false,
-      timestamps: false,
-      fields: [
-        {
-          name: 'name',
-          type: 'string',
-          primaryKey: true,
-        },
-      ],
-    });
-
-    await app.loadAndInstall();
-
-    app.resourcer.define({
-      name: 'test',
-      actions: {
-        async test(ctx) {
-          const db: Database = ctx.db;
-
-          const sql = `INSERT INTO ${userCollection.model.tableName} (name)
-                   VALUES (:name)`;
-
-          await db.sequelize.query(sql, {
-            replacements: { name: ctx.action.params.values.name },
-            type: 'INSERT',
-          });
-        },
-      },
-    });
-
-    const agent = supertest.agent(app.callback());
-
-    await agent.post('/test:test').send({
-      name: 'u1',
-    });
-
-    const response = await agent.post('/test:test').send({
-      name: 'u1',
-    });
-
-    const body = response.body;
-    expect(body['errors'][0]['message']).toBeDefined();
-  });
-});

package/src/server/index.ts

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

package/src/server/locale/en_US.ts

@@ -1,6 +0,0 @@
-export default {
-  'unique violation': '{{field}} must be unique',
-  'notNull violation': 'notNull violation',
-  'Validation error': '{{field}} validation error',
-  'notNull Violation': '{{field}} cannot be null',
-};

package/src/server/locale/es-ES.ts

@@ -1,6 +0,0 @@
-export default {
-  "unique violation": "{{field}} debe ser único",
-  "notNull violation": "notNull violación",
-  "Validation error": "{{field}} error de validación",
-  "notNull Violation": "{{field}} no puede ser null"
-};

package/src/server/locale/fr_FR.ts

@@ -1,6 +0,0 @@
-export default {
-  'unique violation': '{{field}} doit être unique',
-  'notNull violation': 'Violation de contrainte notNull',
-  'Validation error': 'Erreur de validation de {{field}}',
-  'notNull Violation': '{{field}} ne peut pas être null',
-};

package/src/server/locale/ja_JP.ts

@@ -1,4 +0,0 @@
-export default {
-  'unique violation': '{{field}} は一意でなくてはなりません',
-  'notNull Violation': '{{field}} はNullにできません',
-};

package/src/server/locale/pt-BR.ts

@@ -1,6 +0,0 @@
-export default {
-  'unique violation': '{{field}} deve ser único',
-  'notNull violation': 'violação de não nulo',
-  'Validation error': 'erro de validação de {{field}}',
-  'notNull Violation': '{{field}} não pode ser nulo',
-};

package/src/server/locale/zh_CN.ts

@@ -1,5 +0,0 @@
-export default {
-  'unique violation': '{{field}} 字段值是唯一的',
-  'notNull violation': '{{field}} 字段不能为空',
-  'Validation error': '{{field}} 字段规则验证失败',
-};

package/src/server/server.ts

@@ -1,54 +0,0 @@
-import { Schema } from '@formily/json-schema';
-import { BaseError } from '@nocobase/database';
-import { Plugin } from '@nocobase/server';
-import { lodash } from '@nocobase/utils';
-import { ErrorHandler } from './error-handler';
-import enUS from './locale/en_US';
-import zhCN from './locale/zh_CN';
-
-export class PluginErrorHandler extends Plugin {
-  errorHandler: ErrorHandler = new ErrorHandler();
-  i18nNs = 'error-handler';
-
-  beforeLoad() {
-    this.registerSequelizeValidationErrorHandler();
-  }
-
-  registerSequelizeValidationErrorHandler() {
-    const findFieldTitle = (instance, path, tFunc) => {
-      if (!instance) {
-        return path;
-      }
-
-      const model = instance.constructor;
-      const collection = this.db.modelCollection.get(model);
-      const field = collection.getField(path);
-      const fieldOptions = Schema.compile(field?.options, { t: tFunc });
-      const title = lodash.get(fieldOptions, 'uiSchema.title', path);
-      return title;
-    };
-
-    this.errorHandler.register(
-      (err) => err?.errors?.length && err instanceof BaseError,
-      (err, ctx) => {
-        ctx.body = {
-          errors: err.errors.map((err) => {
-            return {
-              message: ctx.i18n.t(err.type, {
-                ns: this.i18nNs,
-                field: findFieldTitle(err.instance, err.path, ctx.i18n.t),
-              }),
-            };
-          }),
-        };
-        ctx.status = 400;
-      },
-    );
-  }
-
-  async load() {
-    this.app.i18n.addResources('zh-CN', this.i18nNs, zhCN);
-    this.app.i18n.addResources('en-US', this.i18nNs, enUS);
-    this.app.use(this.errorHandler.middleware(), { before: 'cors', tag: 'errorHandler' });
-  }
-}