@nocobase/plugin-error-handler 2.1.0-alpha.7 → 2.1.0-alpha.8

package/dist/externalVersion.js

@@ -8,9 +8,7 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-alpha.7",
-  "@formily/json-schema": "2.3.7",
-  "@nocobase/database": "2.1.0-alpha.7",
-  "@nocobase/server": "2.1.0-alpha.7",
+  "@nocobase/client": "2.1.0-alpha.8",
+  "@nocobase/server": "2.1.0-alpha.8",
   "lodash": "4.17.21"
 };

package/dist/server/server.d.ts

@@ -13,5 +13,6 @@ export declare class PluginErrorHandlerServer extends Plugin {
     i18nNs: string;
     beforeLoad(): void;
     registerSequelizeValidationErrorHandler(): void;
+    registerSQLErrorHandler(): void;
     load(): Promise<void>;
 }

package/dist/server/server.js

@@ -39,7 +39,6 @@ __export(server_exports, {
   PluginErrorHandlerServer: () => PluginErrorHandlerServer
 });
 module.exports = __toCommonJS(server_exports);
-var import_json_schema = require("@formily/json-schema");
 var import_server = require("@nocobase/server");
 var import_lodash = __toESM(require("lodash"));
 var import_error_handler = require("./error-handler");
@@ -48,9 +47,10 @@ class PluginErrorHandlerServer extends import_server.Plugin {
   i18nNs = "error-handler";
   beforeLoad() {
     this.registerSequelizeValidationErrorHandler();
+    this.registerSQLErrorHandler();
   }
   registerSequelizeValidationErrorHandler() {
-    const findFieldTitle = (instance, path, tFunc, ctx) => {
+    const findFieldTitle = (instance, path, ctx) => {
       if (!instance) {
         return path;
       }
@@ -63,9 +63,11 @@ class PluginErrorHandlerServer extends import_server.Plugin {
         return path;
       }
       const field = collection.getField(path);
-      const fieldOptions = import_json_schema.Schema.compile(field == null ? void 0 : field.options, { t: tFunc });
+      const fieldOptions = field == null ? void 0 : field.options;
       const title = import_lodash.default.get(fieldOptions, "uiSchema.title", path);
-      return title;
+      const re = /{{\s*t\(\s*(['"`])([^'"`]+)\1\s*\)\s*}}/g;
+      const parsed = re.exec(title);
+      return (parsed == null ? void 0 : parsed[2]) || title;
     };
     this.errorHandler.register(
       (err) => {
@@ -76,7 +78,7 @@ class PluginErrorHandlerServer extends import_server.Plugin {
         ctx.body = {
           errors: err.errors.map((err2) => {
             const t = ctx.i18n.t;
-            const title = findFieldTitle(err2.instance, err2.path, t, ctx);
+            const title = findFieldTitle(err2.instance, err2.path, ctx);
             return {
               message: t(err2.type, {
                 ns: this.i18nNs,
@@ -88,6 +90,8 @@ class PluginErrorHandlerServer extends import_server.Plugin {
         ctx.status = 400;
       }
     );
+  }
+  registerSQLErrorHandler() {
     const unwrapSqlError = (error) => {
       var _a;
       return ((_a = error == null ? void 0 : error.original) == null ? void 0 : _a.parent) ?? (error == null ? void 0 : error.parent) ?? (error == null ? void 0 : error.original) ?? error;

package/package.json

@@ -6,7 +6,7 @@
   "description.ru-RU": "Обработка ошибок и исключений приложения.",
   "description": "Handling application errors and exceptions.",
   "description.zh-CN": "处理应用程序中的错误和异常。",
-  "version": "2.1.0-alpha.7",
+  "version": "2.1.0-alpha.8",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/error-handler",
@@ -28,5 +28,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugin-error-handler"
   },
-  "gitHead": "fe825ef778c0d9a941e8517d6443ffc012238391"
+  "gitHead": "eda3bfb9df40d4394905e178f1c5331adbec4e76"
 }