@nocobase/plugin-data-source-main 1.0.0-alpha.14 → 1.0.0-alpha.16

package/dist/externalVersion.js

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

package/dist/server/migrations/20240517101001-fix-target-option-in-tree-collection.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;
+    appVersion: string;
+    up(): Promise<void>;
+}

package/dist/server/migrations/20240517101001-fix-target-option-in-tree-collection.js

@@ -0,0 +1,54 @@
+/**
+ * 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 fix_target_option_in_tree_collection_exports = {};
+__export(fix_target_option_in_tree_collection_exports, {
+  default: () => fix_target_option_in_tree_collection_default
+});
+module.exports = __toCommonJS(fix_target_option_in_tree_collection_exports);
+var import_server = require("@nocobase/server");
+class fix_target_option_in_tree_collection_default extends import_server.Migration {
+  on = "afterLoad";
+  // 'beforeLoad' or 'afterLoad'
+  appVersion = "<1.0.0-alpha.15";
+  async up() {
+    const treeCollections = await this.app.db.getRepository("collections").find({
+      appends: ["fields"],
+      filter: {
+        "options.tree": "adjacencyList"
+      }
+    });
+    for (const treeCollection of treeCollections) {
+      const fields = treeCollection.get("fields");
+      for (const field of fields) {
+        if (!["belongsTo", "hasMany", "belongsToMany", "hasOne"].includes(field.get("type")) && field.get("target")) {
+          field.set("target", void 0);
+          await field.save();
+        }
+      }
+    }
+  }
+}

package/dist/server/repositories/collection-repository.js

@@ -48,6 +48,7 @@ class CollectionRepository extends import_database.Repository {
     this.app = app;
   }
   async load(options = {}) {
+    this.database.logger.debug("loading collections...");
     const { filter, skipExist } = options;
     const instances = await this.find({ filter, appends: ["fields"] });
     const graphlib = import_utils.CollectionsGraph.graphlib();
@@ -90,8 +91,7 @@ class CollectionRepository extends import_database.Repository {
       if (import_lodash.default.isArray(skipField) && skipField.length) {
         lazyCollectionFields.set(instanceName, skipField);
       }
-      this.database.logger.debug(`load collection`, {
-        instanceName,
+      this.database.logger.trace(`load ${instanceName} collection`, {
         submodule: "CollectionRepository",
         method: "load"
       });
@@ -100,7 +100,7 @@ class CollectionRepository extends import_database.Repository {
     }
     const fieldWithSourceAttributes = /* @__PURE__ */ new Map();
     for (const viewCollectionName of viewCollections) {
-      this.database.logger.debug(`load collection fields`, {
+      this.database.logger.trace(`load collection fields`, {
         submodule: "CollectionRepository",
         method: "load",
         viewCollectionName
@@ -122,7 +122,7 @@ class CollectionRepository extends import_database.Repository {
       await nameMap[viewCollectionName].loadFields({ skipField });
     }
     for (const [collectionName, skipField] of lazyCollectionFields) {
-      this.database.logger.debug(`load collection fields`, {
+      this.database.logger.trace(`load collection fields`, {
         submodule: "CollectionRepository",
         method: "load",
         collectionName
@@ -131,7 +131,7 @@ class CollectionRepository extends import_database.Repository {
       await nameMap[collectionName].loadFields({ includeFields: skipField });
     }
     for (const [collectionName, skipField] of fieldWithSourceAttributes) {
-      this.database.logger.debug(`load collection fields`, {
+      this.database.logger.trace(`load collection fields`, {
         submodule: "CollectionRepository",
         method: "load",
         collectionName
@@ -139,6 +139,7 @@ class CollectionRepository extends import_database.Repository {
       this.app.setMaintainingMessage(`load ${collectionName} collection fields`);
       await nameMap[collectionName].loadFields({ includeFields: skipField });
     }
+    this.database.logger.debug("collections loaded");
   }
   async db2cm(collectionName) {
     const collection = this.database.getCollection(collectionName);

package/dist/server/server.js

@@ -52,7 +52,6 @@ var import_beforeCreateForValidateField = require("./hooks/beforeCreateForValida
 var import_beforeCreateForViewCollection = require("./hooks/beforeCreateForViewCollection");
 var import_models = require("./models");
 var import_collections = __toESM(require("./resourcers/collections"));
-var import_sql = __toESM(require("./resourcers/sql"));
 var import_views = __toESM(require("./resourcers/views"));
 class PluginDataSourceMainServer extends import_server.Plugin {
   schema;
@@ -259,10 +258,6 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       name: `pm.data-source-manager.collection-view `,
       actions: ["dbViews:*"]
     });
-    this.app.acl.registerSnippet({
-      name: `pm.data-source-manager.collection-sql `,
-      actions: ["sqlCollection:*"]
-    });
   }
   async load() {
     await this.importCollections(import_path.default.resolve(__dirname, "./collections"));
@@ -285,7 +280,6 @@ class PluginDataSourceMainServer extends import_server.Plugin {
       await next();
     });
     this.app.resource(import_views.default);
-    this.app.resource(import_sql.default);
     this.app.actions(import_collections.default);
     const handleFieldSource = (fields) => {
       var _a;

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.0.0-alpha.14",
+  "version": "1.0.0-alpha.16",
   "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": "829078819e5b9720a4c2501c340a301315c0d029",
+  "gitHead": "2a80f1804e0f0972d40e1a201310b192914849d0",
   "keywords": [
     "Data sources"
   ]

package/dist/server/resourcers/sql.d.ts

@@ -1,18 +0,0 @@
-/**
- * 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 { Context, Next } from '@nocobase/actions';
-declare const _default: {
-    name: string;
-    actions: {
-        execute: (ctx: Context, next: Next) => Promise<void>;
-        setFields: (ctx: Context, next: Next) => Promise<void>;
-        update: (ctx: Context, next: Next) => Promise<void>;
-    };
-};
-export default _default;

package/dist/server/resourcers/sql.js

@@ -1,115 +0,0 @@
-/**
- * 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 sql_exports = {};
-__export(sql_exports, {
-  default: () => sql_default
-});
-module.exports = __toCommonJS(sql_exports);
-var import_database = require("@nocobase/database");
-const updateCollection = async (ctx, transaction) => {
-  const { filterByTk, values } = ctx.action.params;
-  const repo = ctx.db.getRepository("collections");
-  const collection = await repo.findOne({
-    filter: {
-      name: filterByTk
-    },
-    transaction
-  });
-  const existFields = await collection.getFields({ transaction });
-  const deletedFields = existFields.filter((field) => {
-    var _a;
-    return !((_a = values.fields) == null ? void 0 : _a.find((f) => f.name === field.name));
-  });
-  for (const field of deletedFields) {
-    await field.destroy({ transaction });
-  }
-  const upRes = await repo.update({
-    filterByTk,
-    values,
-    updateAssociationValues: ["fields"],
-    transaction
-  });
-  return { collection, upRes };
-};
-var sql_default = {
-  name: "sqlCollection",
-  actions: {
-    execute: async (ctx, next) => {
-      let { sql } = ctx.action.params.values || {};
-      if (!sql) {
-        ctx.throw(400, ctx.t("Please enter a SQL statement"));
-      }
-      sql = sql.trim().split(";").shift();
-      if (!/^select/i.test(sql) && !/^with([\s\S]+)select([\s\S]+)/i.test(sql)) {
-        ctx.throw(400, ctx.t("Only supports SELECT statements or WITH clauses"));
-      }
-      const tmpCollection = new import_database.SqlCollection({ name: "tmp", sql }, { database: ctx.db });
-      const model = tmpCollection.model;
-      const data = await model.findAll({ attributes: ["*"], limit: 5, raw: true });
-      let fields = {};
-      try {
-        fields = model.inferFields();
-      } catch (err) {
-        ctx.logger.warn(`resource: sql-collection, action: execute, error: ${err}`);
-        fields = {};
-      }
-      const sources = Array.from(new Set(Object.values(fields).map((field) => field.collection)));
-      ctx.body = { data, fields, sources };
-      await next();
-    },
-    setFields: async (ctx, next) => {
-      const transaction = await ctx.app.db.sequelize.transaction();
-      try {
-        const {
-          upRes: [collection]
-        } = await updateCollection(ctx, transaction);
-        await collection.loadFields({
-          transaction
-        });
-        await transaction.commit();
-      } catch (e) {
-        await transaction.rollback();
-        throw e;
-      }
-      await next();
-    },
-    update: async (ctx, next) => {
-      const transaction = await ctx.app.db.sequelize.transaction();
-      try {
-        const { upRes } = await updateCollection(ctx, transaction);
-        const [collection] = upRes;
-        await collection.load({ transaction, resetFields: true });
-        await transaction.commit();
-        ctx.body = upRes;
-      } catch (e) {
-        await transaction.rollback();
-        throw e;
-      }
-      await next();
-    }
-  }
-};