@nocobase/database 2.0.0-alpha.52 → 2.0.0-alpha.54

package/lib/collection.js

@@ -295,6 +295,7 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     this.model.options.modelName = this.options.name;
     if (!autoGenId) {
       this.model.removeAttribute("id");
+      this.model.autoIncrementAttribute = null;
     }
     this.model.database = this.context.database;
     this.model.collection = this;

package/lib/database.js

@@ -438,7 +438,7 @@ const _Database = class _Database extends import_events.EventEmitter {
     this.emit("beforeDefineCollection", options);
     const collection = this.collectionFactory.createCollection(options);
     this.collections.set(collection.name, collection);
-    this.emit("afterDefineCollection", collection);
+    this.emit("afterDefineCollection", collection, { fieldModels: options.fieldModels });
     return collection;
   }
   getTablePrefix() {
@@ -487,6 +487,9 @@ const _Database = class _Database extends import_events.EventEmitter {
   }
   removeCollection(name) {
     const collection = this.collections.get(name);
+    if (!collection) {
+      return;
+    }
     this.emit("beforeRemoveCollection", collection);
     collection.resetFields();
     const result = this.collections.delete(name);

package/lib/eager-loading/eager-loading-tree.js

@@ -78,7 +78,7 @@ const queryParentSQL = /* @__PURE__ */ __name((options) => {
   return `WITH RECURSIVE cte AS (
       SELECT ${q(targetKeyField)}, ${q(foreignKeyField)}
       FROM ${tableName}
-      WHERE ${q(targetKeyField)} IN (${nodeIds.join(",")})
+      WHERE ${q(targetKeyField)} IN ('${nodeIds.join("','")}')
       UNION ALL
       SELECT t.${q(targetKeyField)}, t.${q(foreignKeyField)}
       FROM ${tableName} AS t

package/lib/fields/field.js

@@ -131,12 +131,16 @@ const _Field = class _Field {
     Object.assign(this.options, obj);
   }
   bind() {
+    var _a;
     const { model } = this.context.collection;
     model.rawAttributes[this.name] = this.toSequelize();
     model.refreshAttributes();
     if (this.options.index) {
       this.context.collection.addIndex([this.name]);
     }
+    if (((_a = this.options) == null ? void 0 : _a.autoIncrement) === true && !model.autoIncrementAttribute) {
+      model._findAutoIncrementAttribute();
+    }
   }
   unbind() {
     const { model } = this.context.collection;

package/lib/fields/snowflake-id-field.js

@@ -49,9 +49,17 @@ const _SnowflakeIdField = class _SnowflakeIdField extends import_field.Field {
     }
   }
   init() {
-    const { name } = this.options;
-    this.listener = (instance) => this.setId(name, instance);
+    const { name, autoFill } = this.options;
+    this.listener = (instance) => {
+      if (autoFill === false) {
+        return;
+      }
+      this.setId(name, instance);
+    };
     this.bulkListener = async (instances) => {
+      if (autoFill === false) {
+        return;
+      }
       for (const instance of instances) {
         this.setId(name, instance);
       }

package/lib/options-parser.d.ts

@@ -26,7 +26,9 @@ export declare class OptionsParser {
     static appendInheritInspectAttribute(include: any, collection: any): any;
     isAssociation(key: string): boolean;
     isAssociationPath(path: string): boolean;
-    filterByTkToWhereOption(): {};
+    filterByTkToWhereOption(): string | number | import("./repository").MultiTargetKey[] | {
+        [x: string]: import("./repository").TargetKey;
+    };
     toSequelizeParams(options?: {
         parseSort?: boolean;
     }): any;

package/lib/options-parser.js

@@ -41,9 +41,9 @@ __export(options_parser_exports, {
 });
 module.exports = __toCommonJS(options_parser_exports);
 var import_lodash = __toESM(require("lodash"));
+var import_qs = __toESM(require("qs"));
 var import_sequelize = require("sequelize");
 var import_filter_parser = __toESM(require("./filter-parser"));
-var import_qs = __toESM(require("qs"));
 const debug = require("debug")("noco-database");
 const _OptionsParser = class _OptionsParser {
   options;
@@ -96,14 +96,21 @@ const _OptionsParser = class _OptionsParser {
     if (!filterByTkOption) {
       return {};
     }
-    if (import_lodash.default.isPlainObject(this.options.filterByTk)) {
-      const where = {};
-      for (const [key, value] of Object.entries(filterByTkOption)) {
-        where[key] = value;
-      }
-      return where;
+    if (Array.isArray(filterByTkOption) && filterByTkOption.length === 0) {
+      return {};
     }
     const filterTargetKey = this.context.targetKey || this.collection.filterTargetKey;
+    if (Array.isArray(filterByTkOption) && Array.isArray(filterTargetKey)) {
+      if (!filterByTkOption.every(import_lodash.default.isPlainObject)) {
+        throw new Error("filterByTk array item must be plain object");
+      }
+      return {
+        [import_sequelize.Op.or]: filterByTkOption
+      };
+    }
+    if (import_lodash.default.isPlainObject(filterByTkOption)) {
+      return filterByTkOption;
+    }
     if (Array.isArray(filterTargetKey)) {
       throw new Error("multi filter target key value must be object");
     }

package/lib/repository.d.ts

@@ -30,7 +30,7 @@ export interface FilterAble {
 }
 export type BaseTargetKey = string | number;
 export type MultiTargetKey = Record<string, BaseTargetKey>;
-export type TargetKey = BaseTargetKey | MultiTargetKey;
+export type TargetKey = BaseTargetKey | MultiTargetKey | MultiTargetKey[];
 export type TK = TargetKey | TargetKey[];
 type FieldValue = string | number | bigint | boolean | Date | Buffer | null | FieldValue[] | FilterWithOperator;
 type Operators = keyof typeof operators & keyof WhereOperators;

package/lib/repository.js

@@ -71,8 +71,8 @@ var import_hasmany_repository = require("./relation-repository/hasmany-repositor
 var import_hasone_repository = require("./relation-repository/hasone-repository");
 var import_update_associations = require("./update-associations");
 var import_update_guard = require("./update-guard");
-var import_filter_utils = require("./utils/filter-utils");
 var import_utils2 = require("./utils");
+var import_filter_utils = require("./utils/filter-utils");
 var import_sequelize2 = require("sequelize");
 const debug = require("debug")("noco-database");
 const transaction = (0, import_transaction_decorator.transactionWrapperBuilder)(function() {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.0.0-alpha.52",
+  "version": "2.0.0-alpha.54",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "2.0.0-alpha.52",
-    "@nocobase/utils": "2.0.0-alpha.52",
+    "@nocobase/logger": "2.0.0-alpha.54",
+    "@nocobase/utils": "2.0.0-alpha.54",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -39,5 +39,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "b32992d8baeb4ca6616d839ca2f9c023d49476a9"
+  "gitHead": "68c84deaabba0ebec7407bf7245376b8d843449c"
 }