@nocobase/plugin-data-source-main 1.2.12-alpha → 1.2.14-alpha

package/dist/externalVersion.js

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

package/dist/locale/en-US.json

@@ -1,3 +1,4 @@
 {
-  "field-name-exists": "Field name \"{{name}}\" already exists in collection \"{{collectionName}}\""
+  "field-name-exists": "Field name \"{{name}}\" already exists in collection \"{{collectionName}}\"",
+  "field-is-depended-on-by-other": "Can not delete field \"{{fieldName}}\" in \"{{fieldCollectionName}}\", it is used by field \"{{dependedFieldName}}\" in \"{{dependedFieldCollectionName}}\" as \"{{dependedFieldAs}}\""
 }

package/dist/locale/zh-CN.json

@@ -1,3 +1,4 @@
 {
-  "field-name-exists": "字段标识 \"{{name}}\" 已存在"
+  "field-name-exists": "字段标识 \"{{name}}\" 已存在",
+  "field-is-depended-on-by-other": "无法删除 \"{{fieldCollectionName}}\" 中的 \"{{fieldName}}\" 字段，它被 \"{{dependedFieldCollectionName}}\" 中的 \"{{dependedFieldName}}\" 字段用作 \"{{dependedFieldAs}}\""
 }

package/dist/server/errors/field-is-depended-on-by-other.d.ts

@@ -0,0 +1,12 @@
+type FieldIsDependedOnByOtherErrorOptions = {
+    fieldName: string;
+    fieldCollectionName: string;
+    dependedFieldName: string;
+    dependedFieldCollectionName: string;
+    dependedFieldAs: string;
+};
+export declare class FieldIsDependedOnByOtherError extends Error {
+    options: FieldIsDependedOnByOtherErrorOptions;
+    constructor(options: FieldIsDependedOnByOtherErrorOptions);
+}
+export {};

package/dist/server/errors/field-is-depended-on-by-other.js

@@ -0,0 +1,44 @@
+/**
+ * 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_is_depended_on_by_other_exports = {};
+__export(field_is_depended_on_by_other_exports, {
+  FieldIsDependedOnByOtherError: () => FieldIsDependedOnByOtherError
+});
+module.exports = __toCommonJS(field_is_depended_on_by_other_exports);
+class FieldIsDependedOnByOtherError extends Error {
+  constructor(options) {
+    super(
+      `Can't delete field ${options.fieldName} of ${options.fieldCollectionName}, it is used by field ${options.dependedFieldName} in collection ${options.dependedFieldCollectionName} as ${options.dependedFieldAs}`
+    );
+    this.options = options;
+    this.name = "FieldIsDependedOnByOtherError";
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FieldIsDependedOnByOtherError
+});

package/dist/server/hooks/beforeDestoryField.d.ts

@@ -0,0 +1,2 @@
+import { Database } from '@nocobase/database';
+export declare function beforeDestoryField(db: Database): (model: any, opts: any) => Promise<void>;

package/dist/server/hooks/beforeDestoryField.js

@@ -0,0 +1,80 @@
+/**
+ * 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 beforeDestoryField_exports = {};
+__export(beforeDestoryField_exports, {
+  beforeDestoryField: () => beforeDestoryField
+});
+module.exports = __toCommonJS(beforeDestoryField_exports);
+var import_field_is_depended_on_by_other = require("../errors/field-is-depended-on-by-other");
+function beforeDestoryField(db) {
+  return async (model, opts) => {
+    const { transaction } = opts;
+    const { name, type, collectionName } = model.get();
+    if (["belongsTo", "hasOne", "hasMany", "belongsToMany"].includes(type)) {
+      return;
+    }
+    const relatedFields = await db.getRepository("fields").find({
+      filter: {
+        $or: [
+          {
+            ["options.sourceKey"]: name,
+            collectionName
+          },
+          {
+            ["options.targetKey"]: name,
+            ["options.target"]: collectionName
+          }
+        ]
+      },
+      transaction
+    });
+    for (const field of relatedFields) {
+      const keys = [
+        {
+          name: "sourceKey",
+          condition: (associationField) => associationField.options["sourceKey"] === name && associationField.collectionName === collectionName
+        },
+        {
+          name: "targetKey",
+          condition: (associationField) => associationField.options["targetKey"] === name && associationField.options["target"] === collectionName
+        }
+      ];
+      const usedAs = keys.find((key) => key.condition(field))["name"];
+      throw new import_field_is_depended_on_by_other.FieldIsDependedOnByOtherError({
+        fieldName: name,
+        fieldCollectionName: collectionName,
+        dependedFieldName: field.get("name"),
+        dependedFieldCollectionName: field.get("collectionName"),
+        dependedFieldAs: usedAs
+      });
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  beforeDestoryField
+});

package/dist/server/models/collection.js

@@ -147,6 +147,9 @@ class CollectionModel extends import_database.MagicAttributeModel {
       } else if (field.get("through") && field.get("through") === name) {
         await field.destroy({ transaction });
       }
+      if (field.get("collectionName") === name) {
+        await field.destroy({ transaction });
+      }
     }
     await collection.removeFromDb(options);
   }

package/dist/server/server.js

@@ -54,6 +54,8 @@ 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");
+var import_beforeDestoryField = require("./hooks/beforeDestoryField");
+var import_field_is_depended_on_by_other = require("./errors/field-is-depended-on-by-other");
 class PluginDataSourceMainServer extends import_server.Plugin {
   schema;
   loadFilter = {};
@@ -99,7 +101,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       if (options.transaction) {
         removeOptions["transaction"] = options.transaction;
       }
-      const cascade = import_lodash.default.get(options, "context.action.params.cascade", false);
+      const cascade = options.cascade || import_lodash.default.get(options, "context.action.params.cascade", false);
       if (cascade === true || cascade === "true") {
         removeOptions["cascade"] = true;
       }
@@ -216,6 +218,7 @@ class PluginDataSourceMainServer extends import_server.Plugin {
         await collection.sync(syncOptions);
       }
     });
+    this.app.db.on("fields.beforeDestroy", (0, import_beforeDestoryField.beforeDestoryField)(this.app.db));
     this.app.db.on("fields.beforeDestroy", (0, import_hooks.beforeDestroyForeignKey)(this.app.db));
     const mutex = new import_async_mutex.Mutex();
     this.app.db.on("fields.beforeDestroy", async (model, options) => {
@@ -290,6 +293,26 @@ 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_is_depended_on_by_other.FieldIsDependedOnByOtherError,
+      (err, ctx) => {
+        ctx.status = 400;
+        ctx.body = {
+          errors: [
+            {
+              message: ctx.i18n.t("field-is-depended-on-by-other", {
+                fieldName: err.options.fieldName,
+                fieldCollectionName: err.options.fieldCollectionName,
+                dependedFieldName: err.options.dependedFieldName,
+                dependedFieldCollectionName: err.options.dependedFieldCollectionName,
+                dependedFieldAs: err.options.dependedFieldAs,
+                ns: "data-source-main"
+              })
+            }
+          ]
+        };
+      }
+    );
     errorHandlerPlugin.errorHandler.register(
       (err) => err instanceof import_field_name_exists_error.FieldNameExistsError,
       (err, ctx) => {

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.12-alpha",
+  "version": "1.2.14-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": "553231d4882496cb7f1f17fa7541899ce82a27ab",
+  "gitHead": "717c71eee8cec8d230f1856759d97d6a843f8be6",
   "keywords": [
     "Data sources"
   ]