@nocobase/plugin-error-handler 0.7.0-alpha.8 → 0.7.0-alpha.80

package/lib/error-handler.js

@@ -1,55 +1,80 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+
+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,
-                },
-            ],
-        };
-    }
-    middleware() {
-        const self = this;
-        return function errorHandler(ctx, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    yield next();
-                }
-                catch (err) {
-                    console.error(err);
-                    for (const handler of self.handlers) {
-                        if (handler.guard(err)) {
-                            return handler.render(err, ctx);
-                        }
-                    }
-                    self.defaultHandler(err, ctx);
-                }
-            });
-        };
-    }
+  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
+      }]
+    };
+  }
+
+  middleware() {
+    const self = this;
+    return /*#__PURE__*/function () {
+      var _errorHandler = _asyncToGenerator(function* (ctx, next) {
+        try {
+          yield next();
+        } catch (err) {
+          console.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;
-//# sourceMappingURL=error-handler.js.map
+
+exports.ErrorHandler = ErrorHandler;

package/lib/index.js

@@ -1,6 +1,13 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = void 0;
-var server_1 = require("./server");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return server_1.PluginErrorHandler; } });
-//# sourceMappingURL=index.js.map
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function get() {
+    return _server.PluginErrorHandler;
+  }
+});
+
+var _server = require("./server");

package/lib/locale/en_US.js

@@ -1,7 +1,11 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    'unique violation': '{{field}} must be unique',
-    'notNull Violation': '{{field}} cannot be null',
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  'unique violation': '{{field}} must be unique',
+  'notNull Violation': '{{field}} cannot be null'
 };
-//# sourceMappingURL=en_US.js.map
+exports.default = _default;

package/lib/locale/zh_CN.js

@@ -1,7 +1,11 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    'unique violation': '{{field}} 字段值是唯一的',
-    'notNull Violation': '{{field}} 字段不能为空',
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  'unique violation': '{{field}} 字段值是唯一的',
+  'notNull Violation': '{{field}} 字段不能为空'
 };
-//# sourceMappingURL=zh_CN.js.map
+exports.default = _default;

package/lib/server.js

@@ -1,70 +1,127 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.PluginErrorHandler = void 0;
-const compiler_1 = require("@formily/json-schema/lib/compiler");
-const server_1 = require("@nocobase/server");
-const lodash_1 = __importDefault(require("lodash"));
-const sequelize_1 = require("sequelize");
-const error_handler_1 = require("./error-handler");
-const en_US_1 = __importDefault(require("./locale/en_US"));
-const zh_CN_1 = __importDefault(require("./locale/zh_CN"));
-class PluginErrorHandler extends server_1.Plugin {
-    constructor() {
-        super(...arguments);
-        this.errorHandler = new error_handler_1.ErrorHandler();
-        this.i18nNs = 'error-handler';
-    }
-    getName() {
-        return this.getPackageName(__dirname);
-    }
-    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 = (0, compiler_1.compile)(field.options, { t: tFunc });
-            const title = lodash_1.default.get(fieldOptions, 'uiSchema.title', path);
-            return title;
-        };
-        this.errorHandler.register((err) => { var _a; return ((_a = err === null || err === void 0 ? void 0 : err.errors) === null || _a === void 0 ? void 0 : _a.length) && err instanceof sequelize_1.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() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.app.i18n.addResources('zh-CN', this.i18nNs, zh_CN_1.default);
-            this.app.i18n.addResources('en-US', this.i18nNs, en_US_1.default);
-            this.app.middleware.unshift(this.errorHandler.middleware());
-        });
-    }
+
+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';
+  }
+
+  getName() {
+    return this.getPackageName(__dirname);
+  }
+
+  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.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 = {
+        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.middleware.unshift(_this.errorHandler.middleware());
+    })();
+  }
+
 }
-exports.PluginErrorHandler = PluginErrorHandler;
-//# sourceMappingURL=server.js.map
+
+exports.PluginErrorHandler = PluginErrorHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-error-handler",
-  "version": "0.7.0-alpha.8",
+  "version": "0.7.0-alpha.80",
   "description": "",
   "license": "Apache-2.0",
   "licenses": [
@@ -11,18 +11,14 @@
   ],
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
-  "scripts": {
-    "build": "rimraf -rf lib esm dist && npm run build:cjs && npm run build:esm",
-    "build:cjs": "tsc --project tsconfig.build.json",
-    "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
-  },
   "dependencies": {
-    "@nocobase/server": "0.7.0-alpha.8"
+    "@formily/json-schema": "^2.0.15",
+    "@nocobase/server": "0.7.0-alpha.80"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugin-error-handler"
   },
-  "gitHead": "f4a12279b43669f2c0dcb3c98b87ebf03d8dab0b"
+  "gitHead": "9ec196c514d958d2c32c0879def6b98f24bf92fc"
 }

package/src/server.ts

@@ -1,4 +1,4 @@
-import { compile } from '@formily/json-schema/lib/compiler';
+import { Schema } from '@formily/json-schema';
 import { Plugin } from '@nocobase/server';
 import lodash from 'lodash';
 import { BaseError } from 'sequelize';
@@ -27,7 +27,7 @@ export class PluginErrorHandler extends Plugin {
       const model = instance.constructor;
       const collection = this.db.modelCollection.get(model);
       const field = collection.getField(path);
-      const fieldOptions = compile(field.options, { t: tFunc });
+      const fieldOptions = Schema.compile(field.options, { t: tFunc });
       const title = lodash.get(fieldOptions, 'uiSchema.title', path);
       return title;
     };

package/esm/error-handler.d.ts

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

package/esm/error-handler.js

@@ -1,51 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-export 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,
-                },
-            ],
-        };
-    }
-    middleware() {
-        const self = this;
-        return function errorHandler(ctx, next) {
-            return __awaiter(this, void 0, void 0, function* () {
-                try {
-                    yield next();
-                }
-                catch (err) {
-                    console.error(err);
-                    for (const handler of self.handlers) {
-                        if (handler.guard(err)) {
-                            return handler.render(err, ctx);
-                        }
-                    }
-                    self.defaultHandler(err, ctx);
-                }
-            });
-        };
-    }
-}
-//# sourceMappingURL=error-handler.js.map

package/esm/error-handler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../src/error-handler.ts"],"names":[],"mappings":";;;;;;;;;AAAA,MAAM,OAAO,YAAY;IAAzB;QACE,aAAQ,GAAG,EAAE,CAAC;IAuChB,CAAC;IArCC,QAAQ,CAAC,KAAuB,EAAE,MAA0B;QAC1D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACjB,KAAK;YACL,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,cAAc,CAAC,GAAG,EAAE,GAAG;QACrB,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC;QACjD,GAAG,CAAC,IAAI,GAAG;YACT,MAAM,EAAE;gBACN;oBACE,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,IAAI,EAAE,GAAG,CAAC,IAAI;iBACf;aACF;SACF,CAAC;IACJ,CAAC;IAED,UAAU;QACR,MAAM,IAAI,GAAG,IAAI,CAAC;QAElB,OAAO,SAAe,YAAY,CAAC,GAAG,EAAE,IAAI;;gBAC1C,IAAI;oBACF,MAAM,IAAI,EAAE,CAAC;iBACd;gBAAC,OAAO,GAAG,EAAE;oBACZ,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACnB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;wBACnC,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;4BACtB,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;yBACjC;qBACF;oBAED,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;iBAC/B;YACH,CAAC;SAAA,CAAC;IACJ,CAAC;CACF","sourcesContent":["export class ErrorHandler {\n  handlers = [];\n\n  register(guard: (err) => boolean, render: (err, ctx) => void) {\n    this.handlers.push({\n      guard,\n      render,\n    });\n  }\n\n  defaultHandler(err, ctx) {\n    ctx.status = err.statusCode || err.status || 500;\n    ctx.body = {\n      errors: [\n        {\n          message: err.message,\n          code: err.code,\n        },\n      ],\n    };\n  }\n\n  middleware() {\n    const self = this;\n\n    return async function errorHandler(ctx, next) {\n      try {\n        await next();\n      } catch (err) {\n        console.error(err);\n        for (const handler of self.handlers) {\n          if (handler.guard(err)) {\n            return handler.render(err, ctx);\n          }\n        }\n\n        self.defaultHandler(err, ctx);\n      }\n    };\n  }\n}\n"]}

package/esm/index.d.ts

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

package/esm/index.js

@@ -1,2 +0,0 @@
-export { PluginErrorHandler as default } from './server';
-//# sourceMappingURL=index.js.map

package/esm/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,IAAI,OAAO,EAAE,MAAM,UAAU,CAAC","sourcesContent":["export { PluginErrorHandler as default } from './server';\n"]}

package/esm/locale/en_US.d.ts

@@ -1,5 +0,0 @@
-declare const _default: {
-    'unique violation': string;
-    'notNull Violation': string;
-};
-export default _default;

package/esm/locale/en_US.js

@@ -1,5 +0,0 @@
-export default {
-    'unique violation': '{{field}} must be unique',
-    'notNull Violation': '{{field}} cannot be null',
-};
-//# sourceMappingURL=en_US.js.map

package/esm/locale/en_US.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"en_US.js","sourceRoot":"","sources":["../../src/locale/en_US.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,kBAAkB,EAAE,0BAA0B;IAC9C,mBAAmB,EAAE,0BAA0B;CAChD,CAAC","sourcesContent":["export default {\n  'unique violation': '{{field}} must be unique',\n  'notNull Violation': '{{field}} cannot be null',\n};\n"]}

package/esm/locale/zh_CN.d.ts

@@ -1,5 +0,0 @@
-declare const _default: {
-    'unique violation': string;
-    'notNull Violation': string;
-};
-export default _default;

package/esm/locale/zh_CN.js

@@ -1,5 +0,0 @@
-export default {
-    'unique violation': '{{field}} 字段值是唯一的',
-    'notNull Violation': '{{field}} 字段不能为空',
-};
-//# sourceMappingURL=zh_CN.js.map

package/esm/locale/zh_CN.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"zh_CN.js","sourceRoot":"","sources":["../../src/locale/zh_CN.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,kBAAkB,EAAE,mBAAmB;IACvC,mBAAmB,EAAE,kBAAkB;CACxC,CAAC","sourcesContent":["export default {\n  'unique violation': '{{field}} 字段值是唯一的',\n  'notNull Violation': '{{field}} 字段不能为空',\n};\n"]}

package/esm/server.d.ts

@@ -1,10 +0,0 @@
-import { Plugin } from '@nocobase/server';
-import { ErrorHandler } from './error-handler';
-export declare class PluginErrorHandler extends Plugin {
-    getName(): string;
-    errorHandler: ErrorHandler;
-    i18nNs: string;
-    beforeLoad(): void;
-    registerSequelizeValidationErrorHandler(): void;
-    load(): Promise<void>;
-}

package/esm/server.js

@@ -1,63 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { compile } from '@formily/json-schema/lib/compiler';
-import { Plugin } from '@nocobase/server';
-import lodash from 'lodash';
-import { BaseError } from 'sequelize';
-import { ErrorHandler } from './error-handler';
-import enUS from './locale/en_US';
-import zhCN from './locale/zh_CN';
-export class PluginErrorHandler extends Plugin {
-    constructor() {
-        super(...arguments);
-        this.errorHandler = new ErrorHandler();
-        this.i18nNs = 'error-handler';
-    }
-    getName() {
-        return this.getPackageName(__dirname);
-    }
-    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 = compile(field.options, { t: tFunc });
-            const title = lodash.get(fieldOptions, 'uiSchema.title', path);
-            return title;
-        };
-        this.errorHandler.register((err) => { var _a; return ((_a = err === null || err === void 0 ? void 0 : err.errors) === null || _a === void 0 ? void 0 : _a.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;
-        });
-    }
-    load() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.app.i18n.addResources('zh-CN', this.i18nNs, zhCN);
-            this.app.i18n.addResources('en-US', this.i18nNs, enUS);
-            this.app.middleware.unshift(this.errorHandler.middleware());
-        });
-    }
-}
-//# sourceMappingURL=server.js.map

package/esm/server.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,IAAI,MAAM,gBAAgB,CAAC;AAClC,OAAO,IAAI,MAAM,gBAAgB,CAAC;AAElC,MAAM,OAAO,kBAAmB,SAAQ,MAAM;IAA9C;;QAKE,iBAAY,GAAiB,IAAI,YAAY,EAAE,CAAC;QAChD,WAAM,GAAW,eAAe,CAAC;IA2CnC,CAAC;IAhDC,OAAO;QACL,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAKD,UAAU;QACR,IAAI,CAAC,uCAAuC,EAAE,CAAC;IACjD,CAAC;IAED,uCAAuC;QACrC,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;YAC/C,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAO,IAAI,CAAC;aACb;YAED,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACtD,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC;YAC/D,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,QAAQ,CACxB,CAAC,GAAG,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,0CAAE,MAAM,KAAI,GAAG,YAAY,SAAS,CAAA,EAAA,EACxD,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACX,GAAG,CAAC,IAAI,GAAG;gBACT,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC7B,OAAO;wBACL,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE;4BAC5B,EAAE,EAAE,IAAI,CAAC,MAAM;4BACf,KAAK,EAAE,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;yBAC1D,CAAC;qBACH,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC;YACF,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;QACnB,CAAC,CACF,CAAC;IACJ,CAAC;IACK,IAAI;;YACR,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACvD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAEvD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC;QAC9D,CAAC;KAAA;CACF","sourcesContent":["import { compile } from '@formily/json-schema/lib/compiler';\nimport { Plugin } from '@nocobase/server';\nimport lodash from 'lodash';\nimport { BaseError } from 'sequelize';\nimport { ErrorHandler } from './error-handler';\nimport enUS from './locale/en_US';\nimport zhCN from './locale/zh_CN';\n\nexport class PluginErrorHandler extends Plugin {\n  getName(): string {\n    return this.getPackageName(__dirname);\n  }\n\n  errorHandler: ErrorHandler = new ErrorHandler();\n  i18nNs: string = 'error-handler';\n\n  beforeLoad() {\n    this.registerSequelizeValidationErrorHandler();\n  }\n\n  registerSequelizeValidationErrorHandler() {\n    const findFieldTitle = (instance, path, tFunc) => {\n      if (!instance) {\n        return path;\n      }\n\n      const model = instance.constructor;\n      const collection = this.db.modelCollection.get(model);\n      const field = collection.getField(path);\n      const fieldOptions = compile(field.options, { t: tFunc });\n      const title = lodash.get(fieldOptions, 'uiSchema.title', path);\n      return title;\n    };\n\n    this.errorHandler.register(\n      (err) => err?.errors?.length && err instanceof BaseError,\n      (err, ctx) => {\n        ctx.body = {\n          errors: err.errors.map((err) => {\n            return {\n              message: ctx.i18n.t(err.type, {\n                ns: this.i18nNs,\n                field: findFieldTitle(err.instance, err.path, ctx.i18n.t),\n              }),\n            };\n          }),\n        };\n        ctx.status = 400;\n      },\n    );\n  }\n  async load() {\n    this.app.i18n.addResources('zh-CN', this.i18nNs, zhCN);\n    this.app.i18n.addResources('en-US', this.i18nNs, enUS);\n\n    this.app.middleware.unshift(this.errorHandler.middleware());\n  }\n}\n"]}

package/lib/error-handler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../src/error-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,MAAa,YAAY;IAAzB;QACE,aAAQ,GAAG,EAAE,CAAC;IAuChB,CAAC;IArCC,QAAQ,CAAC,KAAuB,EAAE,MAA0B;QAC1D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACjB,KAAK;YACL,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,cAAc,CAAC,GAAG,EAAE,GAAG;QACrB,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC;QACjD,GAAG,CAAC,IAAI,GAAG;YACT,MAAM,EAAE;gBACN;oBACE,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,IAAI,EAAE,GAAG,CAAC,IAAI;iBACf;aACF;SACF,CAAC;IACJ,CAAC;IAED,UAAU;QACR,MAAM,IAAI,GAAG,IAAI,CAAC;QAElB,OAAO,SAAe,YAAY,CAAC,GAAG,EAAE,IAAI;;gBAC1C,IAAI;oBACF,MAAM,IAAI,EAAE,CAAC;iBACd;gBAAC,OAAO,GAAG,EAAE;oBACZ,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACnB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;wBACnC,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;4BACtB,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;yBACjC;qBACF;oBAED,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;iBAC/B;YACH,CAAC;SAAA,CAAC;IACJ,CAAC;CACF;AAxCD,oCAwCC","sourcesContent":["export class ErrorHandler {\n  handlers = [];\n\n  register(guard: (err) => boolean, render: (err, ctx) => void) {\n    this.handlers.push({\n      guard,\n      render,\n    });\n  }\n\n  defaultHandler(err, ctx) {\n    ctx.status = err.statusCode || err.status || 500;\n    ctx.body = {\n      errors: [\n        {\n          message: err.message,\n          code: err.code,\n        },\n      ],\n    };\n  }\n\n  middleware() {\n    const self = this;\n\n    return async function errorHandler(ctx, next) {\n      try {\n        await next();\n      } catch (err) {\n        console.error(err);\n        for (const handler of self.handlers) {\n          if (handler.guard(err)) {\n            return handler.render(err, ctx);\n          }\n        }\n\n        self.defaultHandler(err, ctx);\n      }\n    };\n  }\n}\n"]}

package/lib/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mCAAyD;AAAhD,iGAAA,kBAAkB,OAAW","sourcesContent":["export { PluginErrorHandler as default } from './server';\n"]}

package/lib/locale/en_US.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"en_US.js","sourceRoot":"","sources":["../../src/locale/en_US.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,kBAAkB,EAAE,0BAA0B;IAC9C,mBAAmB,EAAE,0BAA0B;CAChD,CAAC","sourcesContent":["export default {\n  'unique violation': '{{field}} must be unique',\n  'notNull Violation': '{{field}} cannot be null',\n};\n"]}

package/lib/locale/zh_CN.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"zh_CN.js","sourceRoot":"","sources":["../../src/locale/zh_CN.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,kBAAkB,EAAE,mBAAmB;IACvC,mBAAmB,EAAE,kBAAkB;CACxC,CAAC","sourcesContent":["export default {\n  'unique violation': '{{field}} 字段值是唯一的',\n  'notNull Violation': '{{field}} 字段不能为空',\n};\n"]}

package/lib/server.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAA4D;AAC5D,6CAA0C;AAC1C,oDAA4B;AAC5B,yCAAsC;AACtC,mDAA+C;AAC/C,2DAAkC;AAClC,2DAAkC;AAElC,MAAa,kBAAmB,SAAQ,eAAM;IAA9C;;QAKE,iBAAY,GAAiB,IAAI,4BAAY,EAAE,CAAC;QAChD,WAAM,GAAW,eAAe,CAAC;IA2CnC,CAAC;IAhDC,OAAO;QACL,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAKD,UAAU;QACR,IAAI,CAAC,uCAAuC,EAAE,CAAC;IACjD,CAAC;IAED,uCAAuC;QACrC,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;YAC/C,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAO,IAAI,CAAC;aACb;YAED,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACtD,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxC,MAAM,YAAY,GAAG,IAAA,kBAAO,EAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1D,MAAM,KAAK,GAAG,gBAAM,CAAC,GAAG,CAAC,YAAY,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC;YAC/D,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,QAAQ,CACxB,CAAC,GAAG,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,0CAAE,MAAM,KAAI,GAAG,YAAY,qBAAS,CAAA,EAAA,EACxD,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACX,GAAG,CAAC,IAAI,GAAG;gBACT,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC7B,OAAO;wBACL,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE;4BAC5B,EAAE,EAAE,IAAI,CAAC,MAAM;4BACf,KAAK,EAAE,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;yBAC1D,CAAC;qBACH,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC;YACF,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;QACnB,CAAC,CACF,CAAC;IACJ,CAAC;IACK,IAAI;;YACR,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,eAAI,CAAC,CAAC;YACvD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,eAAI,CAAC,CAAC;YAEvD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC;QAC9D,CAAC;KAAA;CACF;AAjDD,gDAiDC","sourcesContent":["import { compile } from '@formily/json-schema/lib/compiler';\nimport { Plugin } from '@nocobase/server';\nimport lodash from 'lodash';\nimport { BaseError } from 'sequelize';\nimport { ErrorHandler } from './error-handler';\nimport enUS from './locale/en_US';\nimport zhCN from './locale/zh_CN';\n\nexport class PluginErrorHandler extends Plugin {\n  getName(): string {\n    return this.getPackageName(__dirname);\n  }\n\n  errorHandler: ErrorHandler = new ErrorHandler();\n  i18nNs: string = 'error-handler';\n\n  beforeLoad() {\n    this.registerSequelizeValidationErrorHandler();\n  }\n\n  registerSequelizeValidationErrorHandler() {\n    const findFieldTitle = (instance, path, tFunc) => {\n      if (!instance) {\n        return path;\n      }\n\n      const model = instance.constructor;\n      const collection = this.db.modelCollection.get(model);\n      const field = collection.getField(path);\n      const fieldOptions = compile(field.options, { t: tFunc });\n      const title = lodash.get(fieldOptions, 'uiSchema.title', path);\n      return title;\n    };\n\n    this.errorHandler.register(\n      (err) => err?.errors?.length && err instanceof BaseError,\n      (err, ctx) => {\n        ctx.body = {\n          errors: err.errors.map((err) => {\n            return {\n              message: ctx.i18n.t(err.type, {\n                ns: this.i18nNs,\n                field: findFieldTitle(err.instance, err.path, ctx.i18n.t),\n              }),\n            };\n          }),\n        };\n        ctx.status = 400;\n      },\n    );\n  }\n  async load() {\n    this.app.i18n.addResources('zh-CN', this.i18nNs, zhCN);\n    this.app.i18n.addResources('en-US', this.i18nNs, enUS);\n\n    this.app.middleware.unshift(this.errorHandler.middleware());\n  }\n}\n"]}

package/tsconfig.build.json

@@ -1,9 +0,0 @@
-{
-  "extends": "../../../tsconfig.build.json",
-  "compilerOptions": {
-    "outDir": "./lib",
-    "declaration": true
-  },
-  "include": ["./src/**/*.ts", "./src/**/*.tsx"],
-  "exclude": ["./src/__tests__/*", "./esm/*", "./lib/*"]
-}

package/tsconfig.json

@@ -1,5 +0,0 @@
-{
-  "extends": "../../../tsconfig.json",
-  "include": ["./src/**/*.ts", "./src/**/*.tsx"],
-  "exclude": ["./esm/*", "./lib/*"]
-}