@nocobase/plugin-error-handler 0.9.1-alpha.2 → 0.9.2-alpha.2

package/lib/error-handler.js

@@ -4,29 +4,21 @@ 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 = {
@@ -35,12 +27,10 @@ class ErrorHandler {
         code: err.code
       }]
     };
-
     if (ctx.status === 500) {
       console.error(err);
     }
   }
-
   middleware() {
     const self = this;
     return /*#__PURE__*/function () {
@@ -49,14 +39,11 @@ class ErrorHandler {
           yield next();
         } catch (err) {
           ctx.log.error(err);
-
           var _iterator = _createForOfIteratorHelper(self.handlers),
-              _step;
-
+            _step;
           try {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
               const handler = _step.value;
-
               if (handler.guard(err)) {
                 return handler.render(err, ctx);
               }
@@ -66,19 +53,14 @@ class ErrorHandler {
           } finally {
             _iterator.f();
           }
-
           self.defaultHandler(err, ctx);
         }
       });
-
       function errorHandler(_x, _x2) {
         return _errorHandler.apply(this, arguments);
       }
-
       return errorHandler;
     }();
   }
-
 }
-
 exports.ErrorHandler = ErrorHandler;

package/lib/index.js

@@ -9,5 +9,4 @@ Object.defineProperty(exports, "default", {
     return _server.PluginErrorHandler;
   }
 });
-
 var _server = require("./server");

package/lib/locale/pt-BR.d.ts

@@ -0,0 +1,7 @@
+declare const _default: {
+    "unique violation": string;
+    "notNull violation": string;
+    "Validation error": string;
+    "notNull Violation": string;
+};
+export default _default;

package/lib/locale/pt-BR.js

@@ -0,0 +1,13 @@
+"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.js

@@ -4,92 +4,65 @@ 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 _server() {
   const data = require("@nocobase/server");
-
   _server = function _server() {
     return data;
   };
-
   return data;
 }
-
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 function _sequelize() {
   const data = require("sequelize");
-
   _sequelize = function _sequelize() {
     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 = _lodash().default.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 _sequelize().BaseError;
     }, (err, ctx) => {
       ctx.body = {
@@ -105,22 +78,16 @@ class PluginErrorHandler extends _server().Plugin {
       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/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@nocobase/plugin-error-handler",
-  "version": "0.9.1-alpha.2",
+  "version": "0.9.2-alpha.2",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
     "@formily/json-schema": "^2.0.15",
-    "@nocobase/server": "0.9.1-alpha.2"
+    "@nocobase/server": "0.9.2-alpha.2"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugin-error-handler"
   },
-  "gitHead": "d588a68eca4feed4642a4cb317301011266fe5c9"
+  "gitHead": "1a0de6908b2b1854bdf434fcafa8909cb65bb8a3"
 }

package/src/locale/pt-BR.ts

@@ -0,0 +1,6 @@
+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"
+};