@nocobase/plugin-error-handler 2.0.0-beta.2 → 2.0.0-beta.21

package/dist/externalVersion.js

@@ -8,9 +8,9 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.0-beta.2",
+  "@nocobase/client": "2.0.0-beta.21",
   "@formily/json-schema": "2.3.7",
-  "@nocobase/database": "2.0.0-beta.2",
-  "@nocobase/server": "2.0.0-beta.2",
+  "@nocobase/database": "2.0.0-beta.21",
+  "@nocobase/server": "2.0.0-beta.21",
   "lodash": "4.17.21"
 };

package/dist/server/server.js

@@ -88,16 +88,48 @@ class PluginErrorHandlerServer extends import_server.Plugin {
         ctx.status = 400;
       }
     );
-    this.errorHandler.register(
-      (err) => {
-        const e = (err == null ? void 0 : err.original) || err;
-        if ((e == null ? void 0 : e.errno) === 1064) return true;
-        if ((e == null ? void 0 : e.code) === "42601") return true;
-        if ((e == null ? void 0 : e.code) === "SQLITE_ERROR" && /syntax error/i.test(e == null ? void 0 : e.message)) {
-          return true;
-        }
+    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;
+    };
+    const isSqlSyntaxError = (error) => {
+      const err = unwrapSqlError(error);
+      if (!err) {
         return false;
-      },
+      }
+      const message = typeof err.message === "string" ? err.message : "";
+      if ((err == null ? void 0 : err.errno) === 1064) {
+        return true;
+      }
+      if ((err == null ? void 0 : err.code) === "42601") {
+        return true;
+      }
+      if ((err == null ? void 0 : err.code) === "SQLITE_ERROR" && /syntax error/i.test(message)) {
+        return true;
+      }
+      return false;
+    };
+    const isSqlReferenceError = (error) => {
+      const err = unwrapSqlError(error);
+      if (!err) {
+        return false;
+      }
+      const message = typeof err.message === "string" ? err.message : "";
+      if ([1054, 1051, 1146, 1052].includes(err == null ? void 0 : err.errno)) {
+        return true;
+      }
+      if (["42703", "42P01", "42702"].includes(err == null ? void 0 : err.code)) {
+        return true;
+      }
+      if (/(unknown column|no such column|has no column named|no such table|unknown table|ambiguous column)/i.test(
+        message
+      )) {
+        return true;
+      }
+      return false;
+    };
+    this.errorHandler.register(
+      (err) => isSqlSyntaxError(err),
       (err, ctx) => {
         ctx.body = {
           errors: [
@@ -109,6 +141,19 @@ class PluginErrorHandlerServer extends import_server.Plugin {
         ctx.status = 500;
       }
     );
+    this.errorHandler.register(
+      (err) => isSqlReferenceError(err),
+      (err, ctx) => {
+        ctx.body = {
+          errors: [
+            {
+              message: "Invalid SQL column or table reference"
+            }
+          ]
+        };
+        ctx.status = 400;
+      }
+    );
   }
   async load() {
     this.app.use(this.errorHandler.middleware(), { after: "i18n", tag: "errorHandler", before: "cors" });

package/package.json

@@ -6,7 +6,7 @@
   "description.ru-RU": "Обработка ошибок и исключений приложения.",
   "description": "Handling application errors and exceptions.",
   "description.zh-CN": "处理应用程序中的错误和异常。",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.21",
   "license": "AGPL-3.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": "b77a33ee933ae6e09d2d5dce017ca15d8552d57b"
+  "gitHead": "3ea30685d9592934ec578c0b5e8def60a7fcc3c2"
 }