@nocobase/plugin-data-source-manager 0.21.0-alpha.8 → 1.0.0-alpha.1

package/dist/externalVersion.js

@@ -1,7 +1,7 @@
 module.exports = {
-  "@nocobase/client": "0.21.0-alpha.8",
+  "@nocobase/client": "1.0.0-alpha.1",
   "react": "18.2.0",
-  "@nocobase/server": "0.21.0-alpha.8",
+  "@nocobase/server": "1.0.0-alpha.1",
   "lodash": "4.17.21",
   "@ant-design/icons": "5.2.6",
   "antd": "5.12.8",
@@ -10,10 +10,10 @@ module.exports = {
   "react-i18next": "11.18.6",
   "@formily/react": "2.3.0",
   "@emotion/css": "11.11.2",
-  "@nocobase/database": "0.21.0-alpha.8",
-  "@nocobase/utils": "0.21.0-alpha.8",
-  "@nocobase/plugin-acl": "0.21.0-alpha.8",
-  "@nocobase/acl": "0.21.0-alpha.8",
+  "@nocobase/database": "1.0.0-alpha.1",
+  "@nocobase/utils": "1.0.0-alpha.1",
+  "@nocobase/plugin-acl": "1.0.0-alpha.1",
+  "@nocobase/acl": "1.0.0-alpha.1",
   "sequelize": "6.35.2",
   "@formily/antd-v5": "1.1.9",
   "@formily/core": "2.3.0",

package/dist/server/migrations/20240301164024-migrate-acl-resources.js

@@ -22,6 +22,7 @@ __export(migrate_acl_resources_exports, {
 module.exports = __toCommonJS(migrate_acl_resources_exports);
 var import_server = require("@nocobase/server");
 var import_utils = require("@nocobase/utils");
+/* istanbul ignore file -- @preserve */
 class migrate_acl_resources_default extends import_server.Migration {
   on = "afterSync";
   // 'beforeLoad' or 'afterLoad'

package/dist/server/models/data-source.js

@@ -63,10 +63,7 @@ class DataSourceModel extends import_database.Model {
   async loadIntoACL(options) {
     const { app, acl } = options;
     const loadRoleIntoACL = async (model) => {
-      const pluginACL = app.pm.get("acl");
       await model.writeToAcl({
-        grantHelper: pluginACL.grantHelper,
-        associationFieldsActions: pluginACL.associationFieldsActions,
         acl
       });
     };
@@ -93,7 +90,8 @@ class DataSourceModel extends import_database.Model {
     const createOptions = this.get("options");
     const dataSource = app.dataSourceManager.factory.create(type, {
       ...createOptions,
-      name: this.get("key")
+      name: dataSourceKey,
+      logger: app.logger.child({ dataSourceKey })
     });
     if (loadAtAfterStart) {
       dataSource.on("loadMessage", ({ message }) => {

package/dist/server/models/data-sources-roles-model.d.ts

@@ -5,7 +5,5 @@ export declare class DataSourcesRolesModel extends Model {
     writeToAcl(options: {
         acl: ACL;
         transaction?: Transaction;
-        associationFieldsActions: any;
-        grantHelper: any;
     }): Promise<void>;
 }

package/dist/server/models/data-sources-roles-model.js

@@ -44,9 +44,7 @@ class DataSourcesRolesModel extends import_database.Model {
     for (const resource of resources) {
       await resource.writeToACL({
         acl,
-        transaction,
-        grantHelper: options.grantHelper,
-        associationFieldsActions: options.associationFieldsActions
+        transaction
       });
     }
   }

package/dist/server/plugin.js

@@ -303,31 +303,31 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
       this.app.setMaintainingMessage("Loading data sources...");
       await Promise.all(loadPromises);
     });
-    this.app.db.on("dataSourcesRolesResources.afterSaveWithAssociations", async (model, options) => {
-      const { transaction } = options;
-      const pluginACL = this.app.pm.get("acl");
-      const dataSource = this.app.dataSourceManager.dataSources.get(model.get("dataSourceKey"));
-      await model.writeToACL({
-        acl: dataSource.acl,
-        associationFieldsActions: pluginACL.associationFieldsActions,
-        transaction,
-        grantHelper: pluginACL.grantHelper
-      });
-    });
-    this.app.db.on("dataSourcesRolesResourcesActions.afterUpdateWithAssociations", async (model, options) => {
-      const { transaction } = options;
-      const resource = await model.getResource({
-        transaction
-      });
-      const pluginACL = this.app.pm.get("acl");
-      const dataSource = this.app.dataSourceManager.dataSources.get(resource.get("dataSourceKey"));
-      await resource.writeToACL({
-        acl: dataSource.acl,
-        associationFieldsActions: pluginACL.associationFieldsActions,
-        transaction,
-        grantHelper: pluginACL.grantHelper
-      });
-    });
+    this.app.db.on(
+      "dataSourcesRolesResources.afterSaveWithAssociations",
+      async (model, options) => {
+        const { transaction } = options;
+        const dataSource = this.app.dataSourceManager.dataSources.get(model.get("dataSourceKey"));
+        await model.writeToACL({
+          acl: dataSource.acl,
+          transaction
+        });
+      }
+    );
+    this.app.db.on(
+      "dataSourcesRolesResourcesActions.afterUpdateWithAssociations",
+      async (model, options) => {
+        const { transaction } = options;
+        const resource = await model.getResource({
+          transaction
+        });
+        const dataSource = this.app.dataSourceManager.dataSources.get(resource.get("dataSourceKey"));
+        await resource.writeToACL({
+          acl: dataSource.acl,
+          transaction
+        });
+      }
+    );
     this.app.db.on("dataSourcesRolesResources.afterDestroy", async (model, options) => {
       const dataSource = this.app.dataSourceManager.dataSources.get(model.get("dataSourceKey"));
       const roleName = model.get("roleName");
@@ -338,11 +338,8 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
     });
     this.app.db.on("dataSourcesRoles.afterSave", async (model, options) => {
       const { transaction } = options;
-      const pluginACL = this.app.pm.get("acl");
       const dataSource = this.app.dataSourceManager.dataSources.get(model.get("dataSourceKey"));
       await model.writeToAcl({
-        grantHelper: pluginACL.grantHelper,
-        associationFieldsActions: pluginACL.associationFieldsActions,
         acl: dataSource.acl,
         transaction
       });
@@ -359,7 +356,6 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
     });
     this.app.on("acl:writeResources", async ({ roleName, transaction }) => {
       const dataSource = this.app.dataSourceManager.dataSources.get("main");
-      const pluginACL = this.app.pm.get("acl");
       const dataSourceRole = await this.app.db.getRepository("dataSourcesRoles").findOne({
         filter: {
           dataSourceKey: "main",
@@ -368,8 +364,6 @@ class PluginDataSourceManagerServer extends import_server.Plugin {
         transaction
       });
       await dataSourceRole.writeToAcl({
-        grantHelper: pluginACL.grantHelper,
-        associationFieldsActions: pluginACL.associationFieldsActions,
         acl: dataSource.acl,
         transaction
       });

package/dist/server/services/type-interface-map.js

@@ -20,6 +20,7 @@ __export(type_interface_map_exports, {
   default: () => type_interface_map_default
 });
 module.exports = __toCommonJS(type_interface_map_exports);
+/* istanbul ignore file -- @preserve */
 const typeInterfaceMap = {
   array: "",
   belongsTo: "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-source-manager",
-  "version": "0.21.0-alpha.8",
+  "version": "1.0.0-alpha.1",
   "main": "dist/server/index.js",
   "displayName": "Data source manager",
   "displayName.zh-CN": "数据源管理",
@@ -9,12 +9,12 @@
   "homepage": "https://docs.nocobase.com/handbook/data-source-manager",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/data-source-manager",
   "peerDependencies": {
-    "@nocobase/client": "0.x",
-    "@nocobase/server": "0.x",
-    "@nocobase/test": "0.x"
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x"
   },
   "keywords": [
     "Data model tools"
   ],
-  "gitHead": "bed69485709bc8e268285b50debfc1ebfd7a30c7"
+  "gitHead": "c73b6d2032a6151fdfeebeb0ec923d766578c53c"
 }

package/dist/server/services/collection-manager.d.ts

@@ -1,6 +0,0 @@
-import { Database } from '@nocobase/database';
-export declare class CollectionManager {
-    private db;
-    constructor(db: Database);
-    findAndCount(): void;
-}

package/dist/server/services/collection-manager.js

@@ -1,33 +0,0 @@
-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 collection_manager_exports = {};
-__export(collection_manager_exports, {
-  CollectionManager: () => CollectionManager
-});
-module.exports = __toCommonJS(collection_manager_exports);
-class CollectionManager {
-  constructor(db) {
-    this.db = db;
-  }
-  findAndCount() {
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  CollectionManager
-});

package/dist/server/services/database-introspector.d.ts

@@ -1,70 +0,0 @@
-import { Database } from '@nocobase/database';
-type tableInfo = {
-    tableName: string;
-    schema?: string;
-};
-type GetCollectionOptions = {
-    tableInfo: tableInfo;
-    localOptions?: PartialCollectionOptions;
-};
-export type LocalData = {
-    [collectionName: string]: PartialCollectionOptions;
-};
-type GetCollectionsOptions = {
-    localData?: LocalData;
-};
-export type PartialCollectionOptions = Partial<Omit<CollectionOptions, 'fields'> & {
-    fields?: Partial<FieldOptions>[];
-}>;
-interface CollectionOptions {
-    name: string;
-    schema?: string;
-    tableName: string;
-    title?: string;
-    timestamps?: boolean;
-    filterTargetKey?: string;
-    fields: FieldOptions[];
-    unsupportedFields?: UnsupportedFieldOptions[];
-}
-interface UnsupportedFieldOptions {
-    rawType: string;
-    name: string;
-    supported: false;
-}
-interface FieldOptions {
-    name: string;
-    field: string;
-    rawType: string;
-    type: string;
-    description?: string;
-    interface?: string;
-    uiSchema?: any;
-    possibleTypes?: string[];
-    defaultValue?: any;
-    primaryKey: boolean;
-    unique: boolean;
-    allowNull?: boolean;
-    autoIncrement?: boolean;
-}
-export declare class DatabaseIntrospector {
-    private db;
-    constructor(db: Database);
-    getCollections(options?: GetCollectionsOptions): Promise<Array<CollectionOptions>>;
-    getCollection(options: GetCollectionOptions): Promise<CollectionOptions>;
-    loadCollection(options: CollectionOptions): void;
-    loadCollections(options: {
-        collections: CollectionOptions[];
-    }): void;
-    tableInfoToCollectionOptions(tableInfo: tableInfo): {
-        name: string;
-        schema?: string;
-        tableName: string;
-        title?: string;
-    };
-    private collectionOptionsByFields;
-    private mergeLocalDataIntoCollectionOptions;
-    private columnInfoToFieldOptions;
-    private getDefaultInterfaceByType;
-    private columnAttribute;
-}
-export {};

package/dist/server/services/database-introspector.js

@@ -1,235 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var database_introspector_exports = {};
-__export(database_introspector_exports, {
-  DatabaseIntrospector: () => DatabaseIntrospector
-});
-module.exports = __toCommonJS(database_introspector_exports);
-var import_database = require("@nocobase/database");
-var import_lodash = __toESM(require("lodash"));
-var import_type_interface_map = __toESM(require("./type-interface-map"));
-class DatabaseIntrospector {
-  constructor(db) {
-    this.db = db;
-  }
-  async getCollections(options = {}) {
-    const tableList = await this.db.sequelize.getQueryInterface().showAllTables();
-    const batchSize = 5;
-    const results = [];
-    for (let i = 0; i < tableList.length; i += batchSize) {
-      const batch = tableList.slice(i, i + batchSize);
-      const batchResults = await Promise.all(
-        batch.map(async (tableName) => {
-          var _a;
-          const tableInfo = {
-            tableName
-          };
-          const collectionOptions = this.tableInfoToCollectionOptions(tableInfo);
-          const localOptions = (_a = options.localData) == null ? void 0 : _a[collectionOptions.name];
-          try {
-            return await this.getCollection({
-              tableInfo,
-              localOptions
-            });
-          } catch (e) {
-            if (e.message.includes("No description found for")) {
-              return false;
-            }
-            throw e;
-          }
-        })
-      );
-      results.push(...batchResults);
-    }
-    return results.filter(Boolean);
-  }
-  async getCollection(options) {
-    const { tableInfo } = options;
-    const columnsInfo = await this.db.sequelize.getQueryInterface().describeTable(tableInfo);
-    const collectionOptions = this.tableInfoToCollectionOptions(tableInfo);
-    const constraints = await this.db.sequelize.getQueryInterface().showIndex(this.db.inDialect("postgres") ? tableInfo : tableInfo.tableName);
-    try {
-      const fields = Object.keys(columnsInfo).map((columnName) => {
-        return this.columnInfoToFieldOptions(columnsInfo, columnName, constraints);
-      });
-      const unsupportedFields = fields.filter((field) => {
-        return field.supported === false;
-      });
-      const supportFields = fields.filter((field) => {
-        return field.supported !== false;
-      });
-      const remoteCollectionInfo = {
-        ...collectionOptions,
-        ...this.collectionOptionsByFields(supportFields),
-        fields: supportFields
-      };
-      if (unsupportedFields.length) {
-        remoteCollectionInfo.unsupportedFields = unsupportedFields;
-      }
-      return this.mergeLocalDataIntoCollectionOptions(remoteCollectionInfo, options.localOptions);
-    } catch (e) {
-      throw new Error(`table ${tableInfo.tableName} introspection error: ${e.message}`);
-    }
-  }
-  loadCollection(options) {
-    this.db.collection({
-      ...options,
-      introspected: true
-    });
-  }
-  loadCollections(options) {
-    options.collections.forEach((collection) => {
-      this.loadCollection(collection);
-    });
-  }
-  tableInfoToCollectionOptions(tableInfo) {
-    return {
-      name: tableInfo.tableName,
-      title: tableInfo.tableName,
-      schema: tableInfo.schema,
-      tableName: tableInfo.tableName
-    };
-  }
-  collectionOptionsByFields(fields) {
-    const options = {
-      timestamps: false
-    };
-    const autoIncrementField = fields.find((field) => field.autoIncrement);
-    if (autoIncrementField) {
-      options.filterTargetKey = autoIncrementField.name;
-    }
-    const primaryKeys = fields.filter((field) => field.primaryKey);
-    if (!options.filterTargetKey && primaryKeys.length == 1) {
-      options.filterTargetKey = primaryKeys[0].name;
-    }
-    const uniques = fields.filter((field) => field.unique);
-    if (!options.filterTargetKey && uniques.length == 1) {
-      options.filterTargetKey = uniques[0].name;
-    }
-    return options;
-  }
-  mergeLocalDataIntoCollectionOptions(collectionOptions, localData) {
-    var _a;
-    if (!localData) {
-      return collectionOptions;
-    }
-    const collectionFields = collectionOptions.fields || [];
-    const localFieldsAsObject = import_lodash.default.keyBy(localData.fields, "name");
-    const newFields = collectionFields.map((field) => {
-      const localField = localFieldsAsObject[field.name];
-      if (!localField) {
-        return field;
-      }
-      return {
-        ...field,
-        ...localField
-      };
-    });
-    const localAssociationFields = (_a = localData.fields) == null ? void 0 : _a.filter((field) => {
-      return ["belongsTo", "belongsToMany", "hasMany", "hasOne"].includes(field.type);
-    });
-    if (localAssociationFields) {
-      newFields.push(...localAssociationFields);
-    }
-    return {
-      ...collectionOptions,
-      ...import_lodash.default.omit(localData, ["fields"]),
-      fields: newFields
-    };
-  }
-  columnInfoToFieldOptions(columnsInfo, columnName, indexes) {
-    const columnInfo = columnsInfo[columnName];
-    let fieldOptions = {
-      ...this.columnAttribute(columnsInfo, columnName, indexes),
-      ...import_database.ViewFieldInference.inferToFieldType({
-        dialect: this.db.options.dialect,
-        type: columnInfo.type,
-        name: columnName
-      }),
-      rawType: columnInfo.type,
-      name: columnName
-    };
-    const interfaceConfig = this.getDefaultInterfaceByType(columnsInfo, columnName, fieldOptions.type);
-    if (typeof interfaceConfig === "string") {
-      fieldOptions.interface = interfaceConfig;
-    } else {
-      fieldOptions = {
-        ...fieldOptions,
-        ...interfaceConfig
-      };
-    }
-    if (!fieldOptions.type) {
-      return {
-        rawType: columnInfo.type,
-        name: columnName,
-        supported: false
-      };
-    }
-    import_lodash.default.set(fieldOptions, "uiSchema.title", columnName);
-    return fieldOptions;
-  }
-  getDefaultInterfaceByType(columnsInfo, columnName, type) {
-    const interfaceConfig = import_type_interface_map.default[type];
-    if (typeof interfaceConfig === "function") {
-      return interfaceConfig(columnsInfo[columnName]);
-    }
-    return interfaceConfig;
-  }
-  columnAttribute(columnsInfo, columnName, indexes) {
-    const columnInfo = columnsInfo[columnName];
-    const attr = {
-      type: columnInfo.type,
-      allowNull: columnInfo.allowNull,
-      primaryKey: columnInfo.primaryKey,
-      unique: false
-    };
-    if (columnInfo.defaultValue && typeof columnInfo.defaultValue === "string") {
-      const isSerial = columnInfo.defaultValue.match(/^nextval\(/);
-      const isUUID = columnInfo.defaultValue.match(/^uuid_generate_v4\(/);
-      if (!isSerial && !isUUID) {
-        attr.defaultValue = columnInfo.defaultValue;
-      }
-      if (isSerial || isUUID) {
-        attr.autoIncrement = true;
-      }
-    }
-    for (const index of indexes) {
-      if (index.fields.length == 1 && index.fields[0].attribute == columnName && index.unique) {
-        attr.unique = true;
-      }
-    }
-    if (attr.primaryKey && columnName == "id") {
-      attr.autoIncrement = true;
-    }
-    return attr;
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  DatabaseIntrospector
-});