@nocobase/database 2.0.0-alpha.59 → 2.0.0-alpha.60

package/lib/relation-repository/multiple-relation-repository.d.ts

@@ -11,6 +11,7 @@ import { RelationRepository } from './relation-repository';
 import { AssociatedOptions, CountOptions, DestroyOptions, Filter, FindOptions, TargetKey, UpdateOptions, FirstOrCreateOptions } from './types';
 export declare abstract class MultipleRelationRepository extends RelationRepository {
     targetRepositoryFilterOptionsBySourceValue(): Promise<any>;
+    private normalizeScope;
     find(options?: FindOptions): Promise<any>;
     findAndCount(options?: FindOptions): Promise<[any[], number]>;
     count(options?: CountOptions): Promise<number>;

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

@@ -65,6 +65,16 @@ const _MultipleRelationRepository = class _MultipleRelationRepository extends im
       [this.association.foreignKey]: filterForeignKeyValue
     };
   }
+  normalizeScope(scope, model) {
+    const result = {};
+    for (const [key, value] of Object.entries(scope)) {
+      const attr = model.getAttributes()[key];
+      if (attr == null ? void 0 : attr.field) {
+        result[attr.field] = value;
+      }
+    }
+    return result;
+  }
   async find(options) {
     const targetRepository = this.targetCollection.repository;
     const association = this.association;
@@ -74,6 +84,9 @@ const _MultipleRelationRepository = class _MultipleRelationRepository extends im
       sourceKey: association.targetKey,
       realAs: association.through.model.name
     };
+    if (association.through.scope) {
+      oneFromTargetOptions["scope"] = this.normalizeScope(association.through.scope, association.through.model);
+    }
     const pivotAssoc = new import_sequelize.HasOne(association.target, association.through.model, oneFromTargetOptions);
     const appendFilter = {
       isPivotFilter: true,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.0.0-alpha.59",
+  "version": "2.0.0-alpha.60",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "2.0.0-alpha.59",
-    "@nocobase/utils": "2.0.0-alpha.59",
+    "@nocobase/logger": "2.0.0-alpha.60",
+    "@nocobase/utils": "2.0.0-alpha.60",
     "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": "ca9fca2a826b17735c6287bebf877b2da9a00e24"
+  "gitHead": "9113d61ce85b60b7ba3d0e5ca64182d92a15ece4"
 }