@nocobase/plugin-data-source-main 1.2.4-alpha → 1.2.5-alpha

package/dist/externalVersion.js

@@ -8,14 +8,14 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.2.4-alpha",
-  "@nocobase/database": "1.2.4-alpha",
-  "@nocobase/plugin-error-handler": "1.2.4-alpha",
-  "@nocobase/server": "1.2.4-alpha",
+  "@nocobase/client": "1.2.5-alpha",
+  "@nocobase/database": "1.2.5-alpha",
+  "@nocobase/plugin-error-handler": "1.2.5-alpha",
+  "@nocobase/server": "1.2.5-alpha",
   "async-mutex": "0.3.2",
   "lodash": "4.17.21",
-  "@nocobase/test": "1.2.4-alpha",
-  "@nocobase/utils": "1.2.4-alpha",
+  "@nocobase/test": "1.2.5-alpha",
+  "@nocobase/utils": "1.2.5-alpha",
   "sequelize": "6.35.2",
   "dayjs": "1.11.10"
 };

package/dist/locale/en-US.json

@@ -0,0 +1,3 @@
+{
+  "field-name-exists": "Field name \"{{name}}\" already exists in collection \"{{collectionName}}\""
+}

package/dist/locale/zh-CN.json

@@ -0,0 +1,3 @@
+{
+  "field-name-exists": "字段标识 \"{{name}}\" 已存在"
+}

package/dist/server/errors/field-name-exists-error.d.ts

@@ -0,0 +1,13 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare class FieldNameExistsError extends Error {
+    value: string;
+    collectionName: string;
+    constructor(value: string, collectionName: string);
+}

package/dist/server/errors/field-name-exists-error.js

@@ -0,0 +1,45 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var field_name_exists_error_exports = {};
+__export(field_name_exists_error_exports, {
+  FieldNameExistsError: () => FieldNameExistsError
+});
+module.exports = __toCommonJS(field_name_exists_error_exports);
+class FieldNameExistsError extends Error {
+  value;
+  collectionName;
+  constructor(value, collectionName) {
+    super(`Field name "${value}" already exists in collection "${collectionName}"`);
+    this.value = value;
+    this.collectionName = collectionName;
+    this.name = "FieldNameExistsError";
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FieldNameExistsError
+});

package/dist/server/server.js

@@ -53,6 +53,7 @@ var import_beforeCreateForViewCollection = require("./hooks/beforeCreateForViewC
 var import_models = require("./models");
 var import_collections = __toESM(require("./resourcers/collections"));
 var import_views = __toESM(require("./resourcers/views"));
+var import_field_name_exists_error = require("./errors/field-name-exists-error");
 class PluginDataSourceMainServer extends import_server.Plugin {
   schema;
   loadFilter = {};
@@ -132,6 +133,24 @@ class PluginDataSourceMainServer extends import_server.Plugin {
     });
     this.app.db.on("fields.beforeCreate", (0, import_beforeCreateForValidateField.beforeCreateForValidateField)(this.app.db));
     this.app.db.on("fields.afterCreate", (0, import_hooks.afterCreateForReverseField)(this.app.db));
+    this.app.db.on("fields.beforeCreate", async (model, options) => {
+      const { transaction } = options;
+      const collectionName = model.get("collectionName");
+      const name = model.get("name");
+      if (!collectionName || !name) {
+        return;
+      }
+      const exists = await this.app.db.getRepository("fields").findOne({
+        filter: {
+          collectionName,
+          name
+        },
+        transaction
+      });
+      if (exists) {
+        throw new import_field_name_exists_error.FieldNameExistsError(name, collectionName);
+      }
+    });
     this.app.db.on("fields.beforeUpdate", (0, import_beforeCreateForValidateField.beforeUpdateForValidateField)(this.app.db));
     this.app.db.on("fields.beforeUpdate", async (model, options) => {
       const newValue = options.values;
@@ -271,6 +290,23 @@ class PluginDataSourceMainServer extends import_server.Plugin {
         return ctx.throw(400, ctx.t(`The value of ${Object.keys(err.fields)} field duplicated`));
       }
     );
+    errorHandlerPlugin.errorHandler.register(
+      (err) => err instanceof import_field_name_exists_error.FieldNameExistsError,
+      (err, ctx) => {
+        ctx.status = 400;
+        ctx.body = {
+          errors: [
+            {
+              message: ctx.i18n.t("field-name-exists", {
+                name: err.value,
+                collectionName: err.collectionName,
+                ns: "data-source-main"
+              })
+            }
+          ]
+        };
+      }
+    );
     this.app.resourcer.use(async (ctx, next) => {
       if (ctx.action.resourceName === "collections.fields" && ["create", "update"].includes(ctx.action.actionName)) {
         ctx.action.mergeParams({

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "数据源：主数据库",
   "description": "NocoBase main database, supports relational databases such as MySQL, PostgreSQL, SQLite and so on.",
   "description.zh-CN": "NocoBase 主数据库，支持 MySQL、PostgreSQL、SQLite 等关系型数据库。",
-  "version": "1.2.4-alpha",
+  "version": "1.2.5-alpha",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/data-source-main",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/data-source-main",
@@ -22,7 +22,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "bacfa9133d38339862eee143c516432c2327099e",
+  "gitHead": "ca7baa2d4dffe0e2c02f676b96ff841f3ee31e7e",
   "keywords": [
     "Data sources"
   ]