@nocobase/plugin-field-m2m-array 2.4.0-alpha.1 → 2.4.0-alpha.11

package/dist/externalVersion.js

@@ -11,13 +11,13 @@ module.exports = {
   "@formily/react": "2.3.7",
   "antd": "5.24.2",
   "react": "18.2.0",
-  "@nocobase/client": "2.4.0-alpha.1",
+  "@nocobase/client": "2.4.0-alpha.11",
   "react-router-dom": "6.30.1",
-  "@nocobase/utils": "2.4.0-alpha.1",
-  "@nocobase/client-v2": "2.4.0-alpha.1",
-  "@nocobase/flow-engine": "2.4.0-alpha.1",
-  "@nocobase/database": "2.4.0-alpha.1",
+  "@nocobase/utils": "2.4.0-alpha.11",
+  "@nocobase/client-v2": "2.4.0-alpha.11",
+  "@nocobase/flow-engine": "2.4.0-alpha.11",
+  "@nocobase/database": "2.4.0-alpha.11",
   "lodash": "4.18.1",
-  "@nocobase/server": "2.4.0-alpha.1",
-  "@nocobase/data-source-manager": "2.4.0-alpha.1"
+  "@nocobase/server": "2.4.0-alpha.11",
+  "@nocobase/data-source-manager": "2.4.0-alpha.11"
 };

package/dist/server/migrations/20261008000000-remove-self-source.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 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.
+ */
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    on: string;
+    up(): Promise<void>;
+    private hasValidAssociationKeys;
+}

package/dist/server/migrations/20261008000000-remove-self-source.js

@@ -0,0 +1,72 @@
+/**
+ * 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 remove_self_source_exports = {};
+__export(remove_self_source_exports, {
+  default: () => remove_self_source_default
+});
+module.exports = __toCommonJS(remove_self_source_exports);
+var import_server = require("@nocobase/server");
+var import_belongs_to_array_field = require("../belongs-to-array-field");
+const FOREIGN_KEY_TYPES = ["set", "array", "json", "jsonb"];
+class remove_self_source_default extends import_server.Migration {
+  on = "afterLoad";
+  // 'beforeLoad' or 'afterLoad'
+  async up() {
+    const fields = await this.db.getRepository("fields").find({
+      filter: {
+        type: "belongsToArray"
+      }
+    });
+    for (const field of fields) {
+      if (field.get("source") !== field.get("collectionName")) {
+        continue;
+      }
+      if (!await this.hasValidAssociationKeys(field)) {
+        continue;
+      }
+      field.set("source", void 0);
+      await field.save({ hooks: false });
+    }
+  }
+  async hasValidAssociationKeys(field) {
+    const fieldRepo = this.db.getRepository("fields");
+    const foreignField = await fieldRepo.findOne({
+      filter: { collectionName: field.get("collectionName"), name: field.get("foreignKey") }
+    });
+    const targetField = await fieldRepo.findOne({
+      filter: { collectionName: field.get("target"), name: field.get("targetKey") }
+    });
+    if (!foreignField || !targetField || !FOREIGN_KEY_TYPES.includes(foreignField.get("type"))) {
+      return false;
+    }
+    if (!this.db.inDialect("postgres") || foreignField.get("dataType") !== "array") {
+      return true;
+    }
+    const targetType = targetField.get("type");
+    return foreignField.get("elementType") === (import_belongs_to_array_field.elementTypeMap[targetType] || targetType);
+  }
+}

package/package.json

@@ -6,7 +6,7 @@
   "description": "Allows to create many to many relationships between two models by storing an array of unique keys of the target model.",
   "description.ru-RU": "Позволяет создавать отношения «многие ко многим» между двумя моделями, сохраняя массив уникальных ключей целевой модели.",
   "description.zh-CN": "支持通过在数组中存储目标表唯一键的方式建立多对多关系。",
-  "version": "2.4.0-alpha.1",
+  "version": "2.4.0-alpha.11",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "2.x",
@@ -18,5 +18,5 @@
     "Collection fields"
   ],
   "license": "Apache-2.0",
-  "gitHead": "82ecd3aed067e4cc98c32e7a0039b6e55cee76a7"
+  "gitHead": "99aeb1bc859eb31d9710073d761ac72c97341e9d"
 }