@nocobase/database 0.17.0-alpha.7 → 0.18.0-alpha.1

package/lib/collection-importer.js

@@ -31,11 +31,11 @@ __export(collection_importer_exports, {
   ImporterReader: () => ImporterReader
 });
 module.exports = __toCommonJS(collection_importer_exports);
-var import_path = __toESM(require("path"));
+var import_utils = require("@nocobase/utils");
 var import_fs = require("fs");
 var import_promises = require("fs/promises");
 var import_lodash = require("lodash");
-var import_utils = require("@nocobase/utils");
+var import_path = __toESM(require("path"));
 const _ImporterReader = class _ImporterReader {
   directory;
   extensions;
@@ -59,8 +59,8 @@ const _ImporterReader = class _ImporterReader {
       }
       const ext = import_path.default.parse(fileName).ext.replace(".", "");
       return this.extensions.has(ext);
-    }).map((fileName) => {
-      const mod = (0, import_utils.requireModule)(import_path.default.join(this.directory, fileName));
+    }).map(async (fileName) => {
+      const mod = await (0, import_utils.importModule)(import_path.default.join(this.directory, fileName));
       return typeof mod === "function" ? mod() : mod;
     });
     return (await Promise.all(modules)).filter((module2) => (0, import_lodash.isPlainObject)(module2)).map((module2) => (0, import_lodash.cloneDeep)(module2));

package/lib/collection.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { ModelOptions, ModelStatic, QueryInterfaceDropTableOptions, SyncOptions, Transactionable } from 'sequelize';
+import { ModelOptions, ModelStatic, QueryInterfaceDropTableOptions, QueryInterfaceOptions, SyncOptions, Transactionable } from 'sequelize';
 import { Database } from './database';
 import { BelongsToField, Field, FieldOptions, HasManyField } from './fields';
 import { Model } from './model';
@@ -82,6 +82,7 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     setFields(fields: FieldOptions[], resetFields?: boolean): void;
     resetFields(): void;
     remove(): Collection<any, any>;
+    removeFieldFromDb(name: string, options?: QueryInterfaceOptions): Promise<void>;
     removeFromDb(options?: QueryInterfaceDropTableOptions): Promise<Collection<any, any>>;
     existsInDb(options?: Transactionable): Promise<boolean>;
     removeField(name: string): void | Field;

package/lib/collection.js

@@ -286,6 +286,63 @@ const _Collection = class _Collection extends import_events.EventEmitter {
   remove() {
     return this.context.database.removeCollection(this.name);
   }
+  async removeFieldFromDb(name, options) {
+    const field = this.getField(name);
+    if (!field) {
+      return;
+    }
+    const attribute = this.model.rawAttributes[name];
+    if (!attribute) {
+      field.remove();
+      return;
+    }
+    if (this.isInherited() && this.parentFields().has(name)) {
+      return;
+    }
+    if (this.model._virtualAttributes.has(this.name)) {
+      field.remove();
+      return;
+    }
+    if (this.model.primaryKeyAttributes.includes(this.name)) {
+      return;
+    }
+    if (this.model.options.timestamps !== false) {
+      let timestampsFields = ["createdAt", "updatedAt", "deletedAt"];
+      if (this.db.options.underscored) {
+        timestampsFields = timestampsFields.map((fieldName) => (0, import_utils.snakeCase)(fieldName));
+      }
+      if (timestampsFields.includes(field.columnName())) {
+        this.fields.delete(name);
+        return;
+      }
+    }
+    const sortable = this.options.sortable;
+    if (sortable) {
+      let sortField;
+      if (sortable === true) {
+        sortField = "sort";
+      } else if (typeof sortable === "string") {
+        sortField = sortable;
+      } else if (sortable.name) {
+        sortField = sortable.name || "sort";
+      }
+      if (field.name === sortField) {
+        return;
+      }
+    }
+    if (this.isView()) {
+      field.remove();
+      return;
+    }
+    const columnReferencesCount = import_lodash.default.filter(this.model.rawAttributes, (attr) => attr.field == field.columnName()).length;
+    if (await field.existsInDb({
+      transaction: options == null ? void 0 : options.transaction
+    }) && columnReferencesCount == 1) {
+      const queryInterface = this.db.sequelize.getQueryInterface();
+      await queryInterface.removeColumn(this.getTableNameWithSchema(), field.columnName(), options);
+    }
+    field.remove();
+  }
   async removeFromDb(options) {
     if (!this.isView() && await this.existsInDb({
       transaction: options == null ? void 0 : options.transaction

package/lib/database.js

@@ -362,7 +362,7 @@ const _Database = class _Database extends import_events.EventEmitter {
       filename = filename.substring(0, filename.lastIndexOf(".")) || filename;
       this.migrations.add({
         name: namespace ? `${namespace}/${filename}` : filename,
-        migration: (0, import_utils.requireModule)(file),
+        migration: file,
         context
       });
     }

package/lib/fields/field.d.ts

@@ -1,4 +1,4 @@
-import { DataType, ModelAttributeColumnOptions, ModelIndexesOptions, QueryInterfaceOptions, SyncOptions, Transactionable } from 'sequelize';
+import { DataType, ModelAttributeColumnOptions, ModelIndexesOptions, SyncOptions, Transactionable } from 'sequelize';
 import { Collection } from '../collection';
 import { Database } from '../database';
 import { ModelEventTypes } from '../types';
@@ -33,7 +33,6 @@ export declare abstract class Field {
     get(name: string): any;
     remove(): void | Field;
     columnName(): any;
-    removeFromDb(options?: QueryInterfaceOptions): Promise<void>;
     existsInDb(options?: Transactionable): Promise<boolean>;
     merge(obj: any): void;
     bind(): void;

package/lib/fields/field.js

@@ -86,62 +86,6 @@ const _Field = class _Field {
     }
     return this.name;
   }
-  async removeFromDb(options) {
-    const attribute = this.collection.model.rawAttributes[this.name];
-    if (!attribute) {
-      this.remove();
-      return;
-    }
-    if (this.collection.isInherited() && this.collection.parentFields().has(this.name)) {
-      return;
-    }
-    if (this.collection.model._virtualAttributes.has(this.name)) {
-      this.remove();
-      return;
-    }
-    if (this.collection.model.primaryKeyAttributes.includes(this.name)) {
-      return;
-    }
-    if (this.collection.model.options.timestamps !== false) {
-      let timestampsFields = ["createdAt", "updatedAt", "deletedAt"];
-      if (this.database.options.underscored) {
-        timestampsFields = timestampsFields.map((field) => (0, import_utils.snakeCase)(field));
-      }
-      if (timestampsFields.includes(this.columnName())) {
-        this.collection.fields.delete(this.name);
-        return;
-      }
-    }
-    const sortable = this.collection.options.sortable;
-    if (sortable) {
-      let sortField;
-      if (sortable === true) {
-        sortField = "sort";
-      } else if (typeof sortable === "string") {
-        sortField = sortable;
-      } else if (sortable.name) {
-        sortField = sortable.name || "sort";
-      }
-      if (this.name === sortField) {
-        return;
-      }
-    }
-    if (this.collection.isView()) {
-      this.remove();
-      return;
-    }
-    const columnReferencesCount = import_lodash.default.filter(
-      this.collection.model.rawAttributes,
-      (attr) => attr.field == this.columnName()
-    ).length;
-    if (await this.existsInDb({
-      transaction: options == null ? void 0 : options.transaction
-    }) && columnReferencesCount == 1) {
-      const queryInterface = this.database.sequelize.getQueryInterface();
-      await queryInterface.removeColumn(this.collection.getTableNameWithSchema(), this.columnName(), options);
-    }
-    this.remove();
-  }
   async existsInDb(options) {
     const opts = {
       transaction: options == null ? void 0 : options.transaction

package/lib/migration.d.ts

@@ -20,7 +20,7 @@ export declare class Migration {
 }
 export interface MigrationItem {
     name: string;
-    migration?: typeof Migration;
+    migration?: typeof Migration | string;
     context?: any;
     up?: any;
     down?: any;

package/lib/migration.js

@@ -1,6 +1,8 @@
+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 __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 migration_exports = {};
 __export(migration_exports, {
@@ -22,6 +32,8 @@ __export(migration_exports, {
   Migrations: () => Migrations
 });
 module.exports = __toCommonJS(migration_exports);
+var import_utils = require("@nocobase/utils");
+var import_lodash = __toESM(require("lodash"));
 const _Migration = class _Migration {
   name;
   context;
@@ -55,7 +67,7 @@ const _Migrations = class _Migrations {
   }
   add(item) {
     const Migration2 = item.migration;
-    if (Migration2) {
+    if (Migration2 && typeof Migration2 === "function") {
       const migration = new Migration2({ ...this.context, ...item.context });
       migration.name = item.name;
       this.items.push(migration);
@@ -65,7 +77,20 @@ const _Migrations = class _Migrations {
   }
   callback() {
     return async (ctx) => {
-      return this.items;
+      return await Promise.all(
+        import_lodash.default.sortBy(this.items, (item) => {
+          const keys = item.name.split("/");
+          return keys.pop() || item.name;
+        }).map(async (item) => {
+          if (typeof item.migration === "string") {
+            const Migration2 = await (0, import_utils.importModule)(item.migration);
+            const migration = new Migration2({ ...this.context, ...item.context });
+            migration.name = item.name;
+            return migration;
+          }
+          return item;
+        })
+      );
     };
   }
 };

package/lib/mock-database.js

@@ -34,11 +34,10 @@ __export(mock_database_exports, {
 });
 module.exports = __toCommonJS(mock_database_exports);
 var import_utils = require("@nocobase/utils");
-var import_path = require("path");
-var import_database = require("./database");
-var import_node_fetch = __toESM(require("node-fetch"));
-var import_path2 = __toESM(require("path"));
 var import_nanoid = require("nanoid");
+var import_node_fetch = __toESM(require("node-fetch"));
+var import_path = __toESM(require("path"));
+var import_database = require("./database");
 const _MockDatabase = class _MockDatabase extends import_database.Database {
   constructor(options) {
     super({
@@ -59,7 +58,7 @@ function getConfigByEnv() {
     port: process.env.DB_PORT,
     dialect: process.env.DB_DIALECT || "sqlite",
     logging: process.env.DB_LOGGING === "on" ? customLogger : false,
-    storage: process.env.DB_STORAGE && process.env.DB_STORAGE !== ":memory:" ? (0, import_path.resolve)(process.cwd(), process.env.DB_STORAGE) : ":memory:",
+    storage: (0, import_path.resolve)(process.cwd(), `storage/db-test/db-${(0, import_utils.uid)()}.sqlite`),
     define: {
       charset: "utf8mb4",
       collate: "utf8mb4_unicode_ci"
@@ -102,7 +101,7 @@ function mockDatabase(options = {}) {
       const instanceId = `d_${nanoid()}`;
       const databaseName = `${process.env["DB_TEST_PREFIX"]}_${instanceId}`;
       if (dbOptions.dialect === "sqlite") {
-        dbOptions.storage = import_path2.default.resolve(import_path2.default.dirname(dbOptions.storage), databaseName);
+        dbOptions.storage = import_path.default.resolve(import_path.default.dirname(dbOptions.storage), databaseName);
       } else {
         dbOptions.database = databaseName;
       }

package/lib/relation-repository/belongs-to-many-repository.d.ts

@@ -7,7 +7,6 @@ export declare class BelongsToManyRepository extends MultipleRelationRepository
     aggregate(options: AggregateOptions): Promise<any>;
     create(options?: CreateBelongsToManyOptions): Promise<any>;
     destroy(options?: TargetKey | TargetKey[] | DestroyOptions): Promise<boolean>;
-    protected setTargets(call: 'add' | 'set', options: TargetKey | TargetKey[] | PrimaryKeyWithThroughValues | PrimaryKeyWithThroughValues[] | AssociatedOptions): Promise<void>;
     add(options: TargetKey | TargetKey[] | PrimaryKeyWithThroughValues | PrimaryKeyWithThroughValues[] | AssociatedOptions): Promise<void>;
     set(options: TargetKey | TargetKey[] | PrimaryKeyWithThroughValues | PrimaryKeyWithThroughValues[] | AssociatedOptions): Promise<void>;
     toggle(options: TargetKey | {
@@ -17,5 +16,6 @@ export declare class BelongsToManyRepository extends MultipleRelationRepository
     extendFindOptions(findOptions: any): any;
     throughName(): any;
     throughModel(): any;
+    protected setTargets(call: 'add' | 'set', options: TargetKey | TargetKey[] | PrimaryKeyWithThroughValues | PrimaryKeyWithThroughValues[] | AssociatedOptions): Promise<void>;
 }
 export {};

package/lib/relation-repository/belongs-to-many-repository.js

@@ -78,7 +78,9 @@ const _BelongsToManyRepository = class _BelongsToManyRepository extends import_m
       through: values[this.throughName()],
       transaction: transaction2
     };
-    return sourceModel[createAccessor](values, createOptions);
+    const instance = await sourceModel[createAccessor](values, createOptions);
+    await (0, import_update_associations.updateAssociations)(instance, values, { ...options, transaction: transaction2 });
+    return instance;
   }
   async destroy(options) {
     const transaction2 = await this.getTransaction(options);
@@ -130,38 +132,6 @@ const _BelongsToManyRepository = class _BelongsToManyRepository extends import_m
     });
     return true;
   }
-  async setTargets(call, options) {
-    const handleKeys = this.convertTks(options);
-    const transaction2 = await this.getTransaction(options, false);
-    const sourceModel = await this.getSourceModel(transaction2);
-    const setObj = handleKeys.reduce((carry, item) => {
-      if (Array.isArray(item)) {
-        carry[item[0]] = item[1];
-      } else {
-        carry[item] = true;
-      }
-      return carry;
-    }, {});
-    const targetKeys = Object.keys(setObj);
-    const association = this.association;
-    const targetObjects = await this.targetModel.findAll({
-      where: {
-        [association["targetKey"]]: targetKeys
-      },
-      transaction: transaction2
-    });
-    await sourceModel[this.accessors()[call]](targetObjects, {
-      transaction: transaction2
-    });
-    for (const [id, throughValues] of Object.entries(setObj)) {
-      if (typeof throughValues === "object") {
-        const instance = await this.targetModel.findByPk(id, {
-          transaction: transaction2
-        });
-        await (0, import_update_associations.updateThroughTableValue)(instance, this.throughName(), throughValues, sourceModel, transaction2);
-      }
-    }
-  }
   async add(options) {
     await this.setTargets("add", options);
   }
@@ -203,6 +173,38 @@ const _BelongsToManyRepository = class _BelongsToManyRepository extends import_m
   throughModel() {
     return this.association.through.model;
   }
+  async setTargets(call, options) {
+    const handleKeys = this.convertTks(options);
+    const transaction2 = await this.getTransaction(options, false);
+    const sourceModel = await this.getSourceModel(transaction2);
+    const setObj = handleKeys.reduce((carry, item) => {
+      if (Array.isArray(item)) {
+        carry[item[0]] = item[1];
+      } else {
+        carry[item] = true;
+      }
+      return carry;
+    }, {});
+    const targetKeys = Object.keys(setObj);
+    const association = this.association;
+    const targetObjects = await this.targetModel.findAll({
+      where: {
+        [association["targetKey"]]: targetKeys
+      },
+      transaction: transaction2
+    });
+    await sourceModel[this.accessors()[call]](targetObjects, {
+      transaction: transaction2
+    });
+    for (const [id, throughValues] of Object.entries(setObj)) {
+      if (typeof throughValues === "object") {
+        const instance = await this.targetModel.findByPk(id, {
+          transaction: transaction2
+        });
+        await (0, import_update_associations.updateThroughTableValue)(instance, this.throughName(), throughValues, sourceModel, transaction2);
+      }
+    }
+  }
 };
 __name(_BelongsToManyRepository, "BelongsToManyRepository");
 __decorateClass([

package/lib/repository.js

@@ -310,7 +310,6 @@ const _Repository = class _Repository {
     const filter = _Repository.valuesToFilter(values, filterKeys);
     const instance = await this.findOne({ filter, transaction: transaction2 });
     if (instance) {
-      console.log(filter, instance.toJSON(), instance.get(this.collection.model.primaryKeyAttribute));
       return await this.update({
         filterByTk: instance.get(this.collection.filterTargetKey || this.collection.model.primaryKeyAttribute),
         values,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.17.0-alpha.7",
+  "version": "0.18.0-alpha.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.17.0-alpha.7",
-    "@nocobase/utils": "0.17.0-alpha.7",
+    "@nocobase/logger": "0.18.0-alpha.1",
+    "@nocobase/utils": "0.18.0-alpha.1",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -34,5 +34,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "91377a3abd1124f79fb3819f2d0e80905e091a32"
+  "gitHead": "0f5f1c0a37dc397a9dc4c8eec0c4ec20fd8107b0"
 }