@nocobase/database 1.4.0-alpha.8 → 1.4.0-beta.1

package/lib/collection.d.ts

@@ -95,6 +95,7 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     findField(callback: (field: Field) => boolean): any;
     hasField(name: string): boolean;
     getField<F extends Field>(name: string): F;
+    getFieldByField(field: string): Field;
     getFields(): any[];
     addField(name: string, options: FieldOptions): Field;
     checkFieldType(name: string, options: FieldOptions): void;

package/lib/collection.js

@@ -113,6 +113,9 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     var _a;
     const targetKey = (_a = this.options) == null ? void 0 : _a.filterTargetKey;
     if (Array.isArray(targetKey)) {
+      if (targetKey.length === 1) {
+        return targetKey[0];
+      }
       return targetKey;
     }
     if (targetKey && this.model.getAttributes()[targetKey]) {
@@ -258,6 +261,9 @@ const _Collection = class _Collection extends import_events.EventEmitter {
   getField(name) {
     return this.fields.get(name);
   }
+  getFieldByField(field) {
+    return this.findField((f) => f.options.field === field);
+  }
   getFields() {
     return [...this.fields.values()];
   }

package/lib/interfaces/to-many-interface.js

@@ -36,6 +36,7 @@ const _ToManyInterface = class _ToManyInterface extends import_base_interface.Ba
     if (!str) {
       return null;
     }
+    str = `${str}`.trim();
     const items = str.split(",");
     const { filterKey, targetCollection, transaction } = ctx;
     const targetInstances = await targetCollection.repository.find({
@@ -45,7 +46,7 @@ const _ToManyInterface = class _ToManyInterface extends import_base_interface.Ba
       transaction
     });
     items.forEach((item) => {
-      if (!targetInstances.find((targetInstance) => targetInstance[filterKey] === item)) {
+      if (!targetInstances.find((targetInstance) => targetInstance[filterKey] == item)) {
         throw new Error(`"${item}" not found in ${targetCollection.model.name} ${filterKey}`);
       }
     });

package/lib/relation-repository/multiple-relation-repository.js

@@ -99,13 +99,19 @@ const _MultipleRelationRepository = class _MultipleRelationRepository extends im
     ];
   }
   async count(options) {
+    var _a;
     const transaction2 = await this.getTransaction(options);
     const sourceModel = await this.getSourceModel(transaction2);
     if (!sourceModel) return 0;
     const queryOptions = this.buildQueryOptions(options);
+    const include = (_a = queryOptions.include) == null ? void 0 : _a.filter((item) => {
+      var _a2;
+      const association = (_a2 = this.targetModel.associations) == null ? void 0 : _a2[item.association];
+      return (association == null ? void 0 : association.associationType) !== "BelongsToArray";
+    });
     const count = await sourceModel[this.accessors().get]({
       where: queryOptions.where,
-      include: queryOptions.include,
+      include,
       includeIgnoreAttributes: false,
       attributes: [
         [

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "1.4.0-alpha.8",
+  "version": "1.4.0-beta.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "1.4.0-alpha.8",
-    "@nocobase/utils": "1.4.0-alpha.8",
+    "@nocobase/logger": "1.4.0-beta.1",
+    "@nocobase/utils": "1.4.0-beta.1",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "aa36bd20b2028c5e133a59e922c2f1ab22c86dde"
+  "gitHead": "1ece4e558ba445088dbb658bd458eb0004295326"
 }