@nocobase/plugin-error-handler 1.5.0-beta.3 → 1.5.0-beta.30

package/dist/client/index.js

@@ -7,4 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-(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"}})});
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("@nocobase/client")):"function"==typeof define&&define.amd?define("@nocobase/plugin-error-handler",["@nocobase/client"],t):"object"==typeof exports?exports["@nocobase/plugin-error-handler"]=t(require("@nocobase/client")):e["@nocobase/plugin-error-handler"]=t(e["@nocobase/client"])}(self,function(e){return function(){"use strict";var t={772:function(t){t.exports=e}},n={};function r(e){var o=n[e];if(void 0!==o)return o.exports;var u=n[e]={exports:{}};return t[e](u,u.exports,r),u.exports}r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,{a:t}),t},r.d=function(e,t){for(var n in t)r.o(t,n)&&!r.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var o={};r.r(o);var u=r(772);function i(e,t,n,r,o,u,i){try{var c=e[u](i),a=c.value}catch(e){n(e);return}c.done?t(a):Promise.resolve(a).then(r,o)}function c(e,t,n){return(c=s()?Reflect.construct:function(e,t,n){var r=[null];r.push.apply(r,t);var o=new(Function.bind.apply(e,r));return n&&l(o,n.prototype),o}).apply(null,arguments)}function a(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function f(e){return(f=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function l(e,t){return(l=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function p(e){var t="function"==typeof Map?new Map:void 0;return(p=function(e){var n;if(null===e||(n=e,-1===Function.toString.call(n).indexOf("[native code]")))return e;if("function"!=typeof e)throw TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,r)}function r(){return c(e,arguments,f(this).constructor)}return r.prototype=Object.create(e.prototype,{constructor:{value:r,enumerable:!1,writable:!0,configurable:!0}}),l(r,e)})(e)}function s(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(s=function(){return!!e})()}var b=function(e){var t,n,r;function o(){var e,t,n;return!function(e,t){if(!(e instanceof t))throw TypeError("Cannot call a class as a function")}(this,o),e=this,t=o,n=arguments,t=f(t),function(e,t){return t&&("object"===function(e){return e&&"undefined"!=typeof Symbol&&e.constructor===Symbol?"symbol":typeof e}(t)||"function"==typeof t)?t:function(e){if(void 0===e)throw ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(e,s()?Reflect.construct(t,n||[],f(e).constructor):t.apply(e,n))}return!function(e,t){if("function"!=typeof t&&null!==t)throw TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&l(e,t)}(o,e),t=o,n=[{key:"load",value:function(){var e;return(e=function(){return function(e,t){var n,r,o,u,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return u={next:c(0),throw:c(1),return:c(2)},"function"==typeof Symbol&&(u[Symbol.iterator]=function(){return this}),u;function c(u){return function(c){return function(u){if(n)throw TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&u[0]?r.return:u[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,u[1])).done)return o;switch(r=0,o&&(u=[2&u[0],o.value]),u[0]){case 0:case 1:o=u;break;case 4:return i.label++,{value:u[1],done:!1};case 5:i.label++,r=u[1],u=[0];continue;case 7:u=i.ops.pop(),i.trys.pop();continue;default:if(!(o=(o=i.trys).length>0&&o[o.length-1])&&(6===u[0]||2===u[0])){i=0;continue}if(3===u[0]&&(!o||u[1]>o[0]&&u[1]<o[3])){i.label=u[1];break}if(6===u[0]&&i.label<o[1]){i.label=o[1],o=u;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(u);break}o[2]&&i.ops.pop(),i.trys.pop();continue}u=t.call(e,i)}catch(e){u=[6,e],r=0}finally{n=o=0}if(5&u[0])throw u[1];return{value:u[0]?u[1]:void 0,done:!0}}([u,c])}}}(this,function(e){return[2]})},function(){var t=this,n=arguments;return new Promise(function(r,o){var u=e.apply(t,n);function c(e){i(u,r,o,c,a,"next",e)}function a(e){i(u,r,o,c,a,"throw",e)}c(void 0)})})()}}],a(t.prototype,n),o}(p(u.Plugin));return o.default=b,o}()});

package/dist/externalVersion.js

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

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.5.0-beta.3",
+  "version": "1.5.0-beta.30",
   "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": "81afcf4affdb652faf4636e6d9351828ce8906be"
+  "gitHead": "40c48b2ecf3e2315a76dcb729dbda825b6a1331c"
 }