@contember/engine-content-api 1.2.0-alpha.8 → 1.2.0-beta.1

package/dist/src/acl/EvaluatedPredicateReplacer.d.ts

@@ -3,8 +3,7 @@ export declare class EvaluatedPredicateReplacer {
     private readonly evaluatedPredicate;
     private readonly sourceEntity;
     private readonly relation;
-    constructor(evaluatedPredicate: Input.Where, sourceEntity: Model.Entity, relation: Model.AnyRelation);
-    replace(where: Input.Where): Input.Where;
-    private replaceInternal;
+    constructor(evaluatedPredicate: Input.OptionalWhere, sourceEntity: Model.Entity, relation: Model.AnyRelation);
+    replace(where: Input.OptionalWhere): Input.OptionalWhere;
 }
 //# sourceMappingURL=EvaluatedPredicateReplacer.d.ts.map

package/dist/src/acl/EvaluatedPredicateReplacer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EvaluatedPredicateReplacer.d.ts","sourceRoot":"","sources":["../../../src/acl/EvaluatedPredicateReplacer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAG1D,qBAAa,0BAA0B;IAErC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAFR,kBAAkB,EAAE,KAAK,CAAC,KAAK,EAC/B,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,QAAQ,EAAE,KAAK,CAAC,WAAW;IAItC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK;IAI/C,OAAO,CAAC,eAAe;CAsBvB"}
+{"version":3,"file":"EvaluatedPredicateReplacer.d.ts","sourceRoot":"","sources":["../../../src/acl/EvaluatedPredicateReplacer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAG1D,qBAAa,0BAA0B;IAErC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAFR,kBAAkB,EAAE,KAAK,CAAC,aAAa,EACvC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,QAAQ,EAAE,KAAK,CAAC,WAAW;IAItC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa;CAoB/D"}

package/dist/src/acl/EvaluatedPredicateReplacer.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EvaluatedPredicateReplacer = void 0;
-const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
+const WhereReplacer_1 = require("../mapper/select/optimizer/WhereReplacer");
 class EvaluatedPredicateReplacer {
     constructor(evaluatedPredicate, sourceEntity, relation) {
         this.evaluatedPredicate = evaluatedPredicate;
@@ -12,22 +9,16 @@ class EvaluatedPredicateReplacer {
         this.relation = relation;
     }
     replace(where) {
-        return this.replaceInternal(where, false);
-    }
-    replaceInternal(where, onRelation) {
-        if (onRelation && (0, fast_deep_equal_1.default)(where, this.evaluatedPredicate)) {
-            return { [this.sourceEntity.primary]: { always: true } };
-        }
         const result = {};
         for (const [key, value] of Object.entries(where)) {
             if (key === 'not') {
-                result['not'] = this.replaceInternal(value, onRelation);
+                result['not'] = this.replace(value);
             }
             else if (key === 'and' || key === 'or') {
-                result[key] = value.map(it => this.replaceInternal(it, onRelation));
+                result[key] = value.map(it => this.replace(it));
             }
-            else if (key === this.relation.name && !onRelation) {
-                result[key] = this.replaceInternal(value, true);
+            else if (key === this.relation.name) {
+                result[key] = (0, WhereReplacer_1.replaceWhere)(value, this.evaluatedPredicate, { [this.sourceEntity.primary]: { always: true } });
             }
             else {
                 result[key] = value;

package/dist/src/acl/EvaluatedPredicateReplacer.js.map

@@ -1 +1 @@
-{"version":3,"file":"EvaluatedPredicateReplacer.js","sourceRoot":"","sources":["../../../src/acl/EvaluatedPredicateReplacer.ts"],"names":[],"mappings":";;;;;;AACA,sEAAuC;AAEvC,MAAa,0BAA0B;IACtC,YACkB,kBAA+B,EAC/B,YAA0B,EAC1B,QAA2B;QAF3B,uBAAkB,GAAlB,kBAAkB,CAAa;QAC/B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,aAAQ,GAAR,QAAQ,CAAmB;IAE7C,CAAC;IAEM,OAAO,CAAC,KAAkB;QAChC,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IAC1C,CAAC;IAEO,eAAe,CAAC,KAAkB,EAAE,UAAmB;QAC9D,IAAI,UAAU,IAAI,IAAA,yBAAS,EAAC,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAAE;YAC5D,OAAO,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAA;SACxD;QACD,MAAM,MAAM,GAA0B,EAAE,CAAA;QACxC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACjD,IAAI,GAAG,KAAK,KAAK,EAAE;gBAClB,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,KAAoB,EAAE,UAAU,CAAC,CAAA;aAEtE;iBAAM,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,IAAI,EAAE;gBACzC,MAAM,CAAC,GAAG,CAAC,GAAI,KAAuB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CAAA;aAEtF;iBAAM,IAAI,GAAG,KAAK,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;gBACrD,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,KAAoB,EAAE,IAAI,CAAC,CAAA;aAE9D;iBAAM;gBACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;aACnB;SAED;QACD,OAAO,MAAM,CAAA;IACd,CAAC;CACD;AAlCD,gEAkCC"}
+{"version":3,"file":"EvaluatedPredicateReplacer.js","sourceRoot":"","sources":["../../../src/acl/EvaluatedPredicateReplacer.ts"],"names":[],"mappings":";;;AACA,4EAAuE;AAEvE,MAAa,0BAA0B;IACtC,YACkB,kBAAuC,EACvC,YAA0B,EAC1B,QAA2B;QAF3B,uBAAkB,GAAlB,kBAAkB,CAAqB;QACvC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,aAAQ,GAAR,QAAQ,CAAmB;IAE7C,CAAC;IAEM,OAAO,CAAC,KAA0B;QACxC,MAAM,MAAM,GAAkC,EAAE,CAAA;QAChD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACjD,IAAI,GAAG,KAAK,KAAK,EAAE;gBAClB,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,KAA4B,CAAC,CAAA;aAE1D;iBAAM,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,IAAI,EAAE;gBACzC,MAAM,CAAC,GAAG,CAAC,GAAI,KAAuB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;aAElE;iBAAM,IAAI,GAAG,KAAK,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;gBACtC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,4BAAY,EAAC,KAAoB,EAAE,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;aAE5H;iBAAM;gBACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;aACnB;SAED;QACD,OAAO,MAAM,CAAA;IACd,CAAC;CAED;AA5BD,gEA4BC"}

package/dist/src/acl/PermissionFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PermissionFactory.d.ts","sourceRoot":"","sources":["../../../src/acl/PermissionFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAKxD,qBAAa,iBAAiB;IACjB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,KAAK,CAAC,MAAM;IAE1C,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,WAAW;IAgB1F,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,qCAAqC;IA8C7C,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,sBAAsB;IA+C9B,OAAO,CAAC,qBAAqB;IA2B7B,OAAO,CAAC,eAAe;CAyCvB"}
+{"version":3,"file":"PermissionFactory.d.ts","sourceRoot":"","sources":["../../../src/acl/PermissionFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAKxD,qBAAa,iBAAiB;IACjB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,KAAK,CAAC,MAAM;IAE1C,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,WAAW;IAgB1F,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,qCAAqC;IAmD7C,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,sBAAsB;IA+C9B,OAAO,CAAC,qBAAqB;IA2B7B,OAAO,CAAC,eAAe;CAyCvB"}

package/dist/src/acl/PermissionFactory.js

@@ -19,7 +19,7 @@ class PermissionFactory {
             }
             result = this.mergePermissions(result, rolePermissions);
         }
-        this.makePrimaryPredicatesUnionOfAllFields(result);
+        result = this.makePrimaryPredicatesUnionOfAllFields(result);
         return result;
     }
     prefixPredicatesWithRole(permissions, role) {
@@ -45,16 +45,17 @@ class PermissionFactory {
         }));
     }
     makePrimaryPredicatesUnionOfAllFields(permissions) {
-        for (let entityName in permissions) {
+        return (0, utils_1.mapObject)(permissions, (permission, entityName) => {
             const entity = (0, schema_utils_1.getEntity)(this.schema, entityName);
-            const entityPermissions = permissions[entityName];
-            const entityPredicates = entityPermissions.predicates;
+            const entityPredicates = { ...permission.predicates };
+            const entityOperations = { ...permission.operations };
             const operationNames = ['read', 'create', 'update'];
             for (let operation of operationNames) {
-                const fieldPermissions = entityPermissions.operations[operation];
-                if (fieldPermissions === undefined) {
+                if (!entityOperations[operation]) {
                     continue;
                 }
+                const fieldPermissions = { ...entityOperations[operation] };
+                entityOperations[operation] = fieldPermissions;
                 if (Object.values(fieldPermissions).some(it => it === true)) {
                     fieldPermissions[entity.primary] = true;
                 }
@@ -67,19 +68,22 @@ class PermissionFactory {
                     .filter(value => value !== false)
                     .filter((value, index, array) => array.indexOf(value) === index);
                 let idPermissions = fieldPermissions[entity.primary] || false;
-                const predicates = { ...entityPermissions.predicates };
                 for (let predicateReference of predicateReferences) {
-                    const [predicateDefinition, predicate] = this.mergePredicates(predicates, idPermissions, predicates, predicateReference);
+                    const [predicateDefinition, predicate] = this.mergePredicates(entityPredicates, idPermissions, entityPredicates, predicateReference);
                     if (typeof predicate !== 'string' || predicateDefinition === undefined) {
                         throw new Error('should not happen');
                     }
                     idPermissions = predicate;
-                    predicates[predicate] = predicateDefinition;
+                    entityPredicates[predicate] = predicateDefinition;
                 }
                 fieldPermissions[entity.primary] = idPermissions;
-                entityPredicates[idPermissions] = predicates[idPermissions];
+                entityPredicates[idPermissions] = entityPredicates[idPermissions];
             }
-        }
+            return {
+                operations: entityOperations,
+                predicates: entityPredicates,
+            };
+        });
     }
     mergePermissions(left, right) {
         const result = { ...left };

package/dist/src/acl/PermissionFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"PermissionFactory.js","sourceRoot":"","sources":["../../../src/acl/PermissionFactory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PermissionFactory.js","sourceRoot":"","sources":["../../../src/acl/PermissionFactory.ts"],"names":[],"mappings":";;;AACA,0DAAiF;AACjF,oCAAoC;AACpC,mDAAgD;AAEhD,MAAa,iBAAiB;IAC7B,YAA6B,MAAoB;QAApB,WAAM,GAAN,MAAM,CAAc;IAAG,CAAC;IAE9C,MAAM,CAAC,GAAe,EAAE,KAAwB,EAAE,MAAe;QACvE,IAAI,MAAM,GAAoB,EAAE,CAAA;QAChC,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;YACvB,MAAM,cAAc,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;YAC1D,IAAI,eAAe,GAAoB,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,IAAI,IAAI,CAAC,CAAA;YAC7G,IAAI,cAAc,CAAC,QAAQ,EAAE;gBAC5B,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,QAAQ,EAAE,MAAM,IAAI,IAAI,CAAC,CAAA;gBACtF,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAA;aAC9E;YACD,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;SACvD;QACD,MAAM,GAAG,IAAI,CAAC,qCAAqC,CAAC,MAAM,CAAC,CAAA;QAE3D,OAAO,MAAM,CAAA;IACd,CAAC;IAEO,wBAAwB,CAAC,WAA4B,EAAE,IAAY;QAC1E,OAAO,IAAA,iBAAS,EAAC,WAAW,EAAE,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;YAC1E,UAAU;YACV,UAAU,EAAE,IAAA,iBAAS,EAAC,UAAU,EAAE,SAAS,CAAC,EAAE;gBAC7C,MAAM,4BAA4B,GAAG,IAAI,2CAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBAClF,OAAO,4BAA4B,CAAC,OAAO,CAAC,IAAA,wBAAS,EAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE;oBAC1F,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;wBAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;4BAC9B,OAAO,IAAA,8BAAc,EAAC,IAAI,EAAE,KAAK,CAAC,CAAA;yBAClC;wBACD,OAAO,KAAK,CAAA;oBACb,CAAC;oBACD,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;wBAC7B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;4BAC9B,OAAO,IAAA,8BAAc,EAAC,IAAI,EAAE,KAAK,CAAC,CAAA;yBAClC;wBACD,OAAO,KAAK,CAAA;oBACb,CAAC;iBACD,CAAC,CAAA;YACH,CAAC,CAAC;SACF,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,qCAAqC,CAAC,WAA4B;QACzE,OAAO,IAAA,iBAAS,EAAC,WAAW,EAAE,CAAC,UAAU,EAAE,UAAU,EAAyB,EAAE;YAC/E,MAAM,MAAM,GAAG,IAAA,wBAAS,EAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;YACjD,MAAM,gBAAgB,GAA+B,EAAE,GAAG,UAAU,CAAC,UAAU,EAAE,CAAA;YACjF,MAAM,gBAAgB,GAAmC,EAAE,GAAG,UAAU,CAAC,UAAU,EAAE,CAAA;YAErF,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAU,CAAA;YAC5D,KAAK,IAAI,SAAS,IAAI,cAAc,EAAE;gBACrC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE;oBACjC,SAAQ;iBACR;gBACD,MAAM,gBAAgB,GAAmC,EAAE,GAAG,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAA;gBAC3F,gBAAgB,CAAC,SAAS,CAAC,GAAG,gBAAgB,CAAA;gBAE9C,IAAI,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE;oBAC5D,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;iBACvC;gBACD,IAAI,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;oBAC9C,SAAQ;iBACR;gBACD,MAAM,mBAAmB,GAAa,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC;qBACpE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,MAAM,CAAC,OAAO,CAAC;qBACzC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC;qBAC5B,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,KAAK,CAAC;qBAChC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAmB,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAA;gBAElF,IAAI,aAAa,GAAkB,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,CAAA;gBAE5E,KAAK,IAAI,kBAAkB,IAAI,mBAAmB,EAAE;oBACnD,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,eAAe,CAC5D,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EAChB,kBAAkB,CAClB,CAAA;oBACD,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,mBAAmB,KAAK,SAAS,EAAE;wBACvE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;qBACpC;oBACD,aAAa,GAAG,SAAS,CAAA;oBACzB,gBAAgB,CAAC,SAAS,CAAC,GAAG,mBAAmB,CAAA;iBACjD;gBACD,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,aAAa,CAAA;gBAChD,gBAAgB,CAAC,aAAuC,CAAC,GAAG,gBAAgB,CAAC,aAAuC,CAAC,CAAA;aACrH;YACD,OAAO;gBACN,UAAU,EAAE,gBAAgB;gBAC5B,UAAU,EAAE,gBAAgB;aAC5B,CAAA;QACF,CAAC,CAAC,CAAA;IACH,CAAC;IAEO,gBAAgB,CAAC,IAAqB,EAAE,KAAsB;QACrE,MAAM,MAAM,GAAG,EAAE,GAAG,IAAI,EAAE,CAAA;QAC1B,KAAK,IAAI,UAAU,IAAI,KAAK,EAAE;YAC7B,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,SAAS,EAAE;gBACrC,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;aACvF;iBAAM;gBACN,MAAM,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAA;aACtC;SACD;QACD,OAAO,MAAM,CAAA;IACd,CAAC;IAEO,sBAAsB,CAAC,IAA2B,EAAE,KAA4B;QACvF,IAAI,UAAU,GAA+B,EAAE,CAAA;QAC/C,MAAM,UAAU,GAAmC,EAAE,CAAA;QACrD,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,IAAI,KAAK,CAAC,UAAU,CAAC,aAAa,EAAE;YACpE,UAAU,CAAC,aAAa,GAAG,IAAI,CAAA;SAC/B;QAED,MAAM,cAAc,GAAuE;YAC1F,QAAQ;YACR,MAAM;YACN,QAAQ;SACR,CAAA;QAED,KAAK,IAAI,SAAS,IAAI,cAAc,EAAE;YACrC,MAAM,oBAAoB,GAAyB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,CAAA;YACnF,MAAM,qBAAqB,GAAyB,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,CAAA;YACrF,MAAM,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,GAAG,IAAI,CAAC,qBAAqB,CACzE,IAAI,CAAC,UAAU,EACf,oBAAoB,EACpB,KAAK,CAAC,UAAU,EAChB,qBAAqB,CACrB,CAAA;YACD,UAAU,GAAG,EAAE,GAAG,UAAU,EAAE,GAAG,mBAAmB,EAAE,CAAA;YACtD,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7C,UAAU,CAAC,SAAS,CAAC,GAAG,gBAAgB,CAAA;aACxC;SACD;QAED,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,eAAe,CAC5D,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,KAAK,EAC/B,KAAK,CAAC,UAAU,EAChB,KAAK,CAAC,UAAU,CAAC,MAAM,IAAI,KAAK,CAChC,CAAA;QACD,IAAI,SAAS,KAAK,IAAI,EAAE;YACvB,UAAU,CAAC,MAAM,GAAG,IAAI,CAAA;SACxB;aAAM,IAAI,mBAAmB,KAAK,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YAC9E,UAAU,CAAC,SAAS,CAAC,GAAG,mBAAmB,CAAA;YAC3C,UAAU,CAAC,MAAM,GAAG,SAAS,CAAA;SAC7B;QAED,OAAO;YACN,UAAU,EAAE,UAAU;YACtB,UAAU,EAAE,UAAU;SACtB,CAAA;IACF,CAAC;IAEO,qBAAqB,CAC5B,cAAgC,EAChC,oBAA0C,EAC1C,eAAiC,EACjC,qBAA2C;QAE3C,MAAM,MAAM,GAAmC,EAAE,CAAA;QACjD,MAAM,UAAU,GAA+B,EAAE,CAAA;QAEjD,KAAK,IAAI,KAAK,IAAI,EAAE,GAAG,oBAAoB,EAAE,GAAG,qBAAqB,EAAE,EAAE;YACxE,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC,eAAe,CAC5D,cAAc,EACd,oBAAoB,CAAC,KAAK,CAAC,IAAI,KAAK,EACpC,eAAe,EACf,qBAAqB,CAAC,KAAK,CAAC,IAAI,KAAK,CACrC,CAAA;YACD,IAAI,SAAS,KAAK,IAAI,EAAE;gBACvB,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;aACpB;iBAAM,IAAI,mBAAmB,KAAK,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;gBAC9E,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAA;gBACzB,UAAU,CAAC,SAAS,CAAC,GAAG,mBAAmB,CAAA;aAC3C;SACD;QAED,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;IAC5B,CAAC;IAEO,eAAe,CACtB,cAAgC,EAChC,aAA4B,EAC5B,eAAiC,EACjC,cAA6B;QAE7B,IAAI,aAAa,KAAK,IAAI,IAAI,cAAc,KAAK,IAAI,EAAE;YACtD,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;SACxB;QAED,IAAI,aAAa,KAAK,KAAK,IAAI,cAAc,KAAK,KAAK,EAAE;YACxD,MAAM,aAAa,GAA4B,cAAc,CAAC,aAAa,CAAC,CAAA;YAC5E,MAAM,cAAc,GAA4B,eAAe,CAAC,cAAc,CAAC,CAAA;YAC/E,IAAI,aAAa,KAAK,cAAc,EAAE;gBACrC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAA;aACrC;YAED,IAAI,aAAa,GAAG,WAAW,GAAG,aAAa,GAAG,IAAI,GAAG,cAAc,CAAA;YACvE,OAAO,cAAc,CAAC,aAAa,CAAC,EAAE;gBACrC,aAAa,IAAI,GAAG,CAAA;aACpB;YACD,OAAO;gBACN;oBACC,EAAE,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC;iBACR;gBAC5B,aAAa;aACb,CAAA;SACD;aAAM,IAAI,aAAa,KAAK,KAAK,EAAE;YACnC,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC,CAAA;SACrD;aAAM,IAAI,cAAc,KAAK,KAAK,EAAE;YACpC,IAAI,aAAa,GAAG,cAAc,CAAA;YAClC,IAAI,eAAe,KAAK,cAAc,EAAE;gBACvC,OAAO,cAAc,CAAC,aAAa,CAAC,EAAE;oBACrC,aAAa,IAAI,GAAG,CAAA;iBACpB;aACD;YACD,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC,CAAA;SACvD;aAAM;YACN,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;SACzB;IACF,CAAC;CACD;AA5ND,8CA4NC"}

package/dist/src/acl/PredicateFactory.d.ts

@@ -1,14 +1,20 @@
 import { Acl, Input, Model } from '@contember/schema';
 import { VariableInjector } from './VariableInjector';
+export interface FieldRequiredPredicate {
+    predicate: Acl.Predicate;
+    isSameAsPrimary: boolean;
+}
 export declare class PredicateFactory {
     private readonly permissions;
     private readonly model;
     private readonly variableInjector;
     constructor(permissions: Acl.Permissions, model: Model.Schema, variableInjector: VariableInjector);
+    getFieldPredicate(entity: Model.Entity, operation: Acl.Operation.update | Acl.Operation.read | Acl.Operation.create, fieldName: string): FieldRequiredPredicate;
     shouldApplyCellLevelPredicate(entity: Model.Entity, operation: Acl.Operation.read, fieldName: string): boolean;
-    create(entity: Model.Entity, operation: Acl.Operation.delete): Input.Where;
-    create(entity: Model.Entity, operation: Acl.Operation.update | Acl.Operation.read | Acl.Operation.create, fieldNames?: string[], overRelation?: Model.AnyRelation): Input.Where;
+    createDeletePredicate(entity: Model.Entity): Input.OptionalWhere<never>;
+    create(entity: Model.Entity, operation: Acl.Operation.update | Acl.Operation.read | Acl.Operation.create, fieldNames?: string[], relationContext?: Model.AnyRelationContext): Input.OptionalWhere;
+    buildPredicates(entity: Model.Entity, predicates: Acl.PredicateReference[], relationContext?: Model.AnyRelationContext): Input.OptionalWhere;
     private getRequiredPredicates;
-    private optimizePredicates;
+    optimizePredicates(where: Input.OptionalWhere, relationContext?: Model.AnyRelationContext): Input.OptionalWhere<never>;
 }
 //# sourceMappingURL=PredicateFactory.d.ts.map

package/dist/src/acl/PredicateFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PredicateFactory.d.ts","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAOrD,qBAAa,gBAAgB;IAE3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAFhB,WAAW,EAAE,GAAG,CAAC,WAAW,EAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,EACnB,gBAAgB,EAAE,gBAAgB;IAG7C,6BAA6B,CACnC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI,EAC7B,SAAS,EAAE,MAAM,GACf,OAAO;IAMH,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK;IAC1E,MAAM,CACZ,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,EAC3E,UAAU,CAAC,EAAE,MAAM,EAAE,EACrB,YAAY,CAAC,EAAE,KAAK,CAAC,WAAW,GAC9B,KAAK,CAAC,KAAK;IAmDd,OAAO,CAAC,qBAAqB;IAoB7B,OAAO,CAAC,kBAAkB;CAiB1B"}
+{"version":3,"file":"PredicateFactory.d.ts","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAKrD,MAAM,WAAW,sBAAsB;IACtC,SAAS,EAAE,GAAG,CAAC,SAAS,CAAA;IACxB,eAAe,EAAE,OAAO,CAAA;CACxB;AAED,qBAAa,gBAAgB;IAE3B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAFhB,WAAW,EAAE,GAAG,CAAC,WAAW,EAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,EACnB,gBAAgB,EAAE,gBAAgB;IAG7C,iBAAiB,CACvB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,EAC3E,SAAS,EAAE,MAAM,GACf,sBAAsB;IAclB,6BAA6B,CACnC,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI,EAC7B,SAAS,EAAE,MAAM,GACf,OAAO;IAMH,qBAAqB,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM;IAgB1C,MAAM,CACZ,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,EAC3E,UAAU,GAAE,MAAM,EAA8C,EAChE,eAAe,CAAC,EAAE,KAAK,CAAC,kBAAkB,GACxC,KAAK,CAAC,aAAa;IAuBf,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,kBAAkB,EAAE,EAAE,eAAe,CAAC,EAAE,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC,aAAa;IAqBnJ,OAAO,CAAC,qBAAqB;IAoBtB,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE,KAAK,CAAC,kBAAkB;CAYhG"}

package/dist/src/acl/PredicateFactory.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PredicateFactory = void 0;
 const schema_1 = require("@contember/schema");
-const schema_utils_1 = require("@contember/schema-utils");
-const exception_1 = require("../exception");
 const EvaluatedPredicateReplacer_1 = require("./EvaluatedPredicateReplacer");
 const getRowLevelPredicatePseudoField = (entity) => entity.primary;
 class PredicateFactory {
@@ -12,43 +10,61 @@ class PredicateFactory {
         this.model = model;
         this.variableInjector = variableInjector;
     }
+    getFieldPredicate(entity, operation, fieldName) {
+        var _a, _b, _c, _d;
+        const permissions = (_b = (_a = this.permissions[entity.name]) === null || _a === void 0 ? void 0 : _a.operations) === null || _b === void 0 ? void 0 : _b[operation];
+        const predicate = (_c = permissions === null || permissions === void 0 ? void 0 : permissions[fieldName]) !== null && _c !== void 0 ? _c : false;
+        const rowLevelField = getRowLevelPredicatePseudoField(entity);
+        const primaryPredicate = (_d = permissions === null || permissions === void 0 ? void 0 : permissions[rowLevelField]) !== null && _d !== void 0 ? _d : false;
+        const isSameAsPrimary = predicate === primaryPredicate;
+        return {
+            isSameAsPrimary,
+            predicate,
+        };
+    }
     shouldApplyCellLevelPredicate(entity, operation, fieldName) {
         var _a, _b;
         const rowLevelField = getRowLevelPredicatePseudoField(entity);
         const permissions = (_b = (_a = this.permissions[entity.name]) === null || _a === void 0 ? void 0 : _a.operations) === null || _b === void 0 ? void 0 : _b[operation];
         return (permissions === null || permissions === void 0 ? void 0 : permissions[fieldName]) !== (permissions === null || permissions === void 0 ? void 0 : permissions[rowLevelField]);
     }
-    create(entity, operation, fieldNames, overRelation) {
+    createDeletePredicate(entity) {
+        const neverCondition = { [entity.primary]: { never: true } };
+        const entityPermissions = this.permissions[entity.name];
+        if (!entityPermissions) {
+            return neverCondition;
+        }
+        const deletePredicate = entityPermissions.operations.delete;
+        if (deletePredicate === undefined || deletePredicate === false) {
+            return neverCondition;
+        }
+        if (deletePredicate === true) {
+            return {};
+        }
+        return this.buildPredicates(entity, [deletePredicate]);
+    }
+    create(entity, operation, fieldNames = [getRowLevelPredicatePseudoField(entity)], relationContext) {
         const entityPermissions = this.permissions[entity.name];
         const neverCondition = { [entity.primary]: { never: true } };
         if (!entityPermissions) {
             return neverCondition;
         }
-        let predicates;
-        if (operation === schema_1.Acl.Operation.delete) {
-            const deletePredicate = entityPermissions.operations.delete;
-            if (deletePredicate === undefined || deletePredicate === false) {
-                return neverCondition;
-            }
-            if (deletePredicate === true) {
-                return {};
-            }
-            predicates = [deletePredicate];
+        if (fieldNames === undefined) {
+            fieldNames = [getRowLevelPredicatePseudoField(entity)];
         }
-        else {
-            if (fieldNames === undefined) {
-                fieldNames = [getRowLevelPredicatePseudoField(entity)];
-            }
-            const fieldPermissions = entityPermissions.operations[operation];
-            if (fieldPermissions === undefined) {
-                return neverCondition;
-            }
-            const operationPredicates = this.getRequiredPredicates(fieldNames, fieldPermissions);
-            if (operationPredicates === false) {
-                return neverCondition;
-            }
-            predicates = operationPredicates;
+        const fieldPermissions = entityPermissions.operations[operation];
+        if (fieldPermissions === undefined) {
+            return neverCondition;
+        }
+        const operationPredicates = this.getRequiredPredicates(fieldNames, fieldPermissions);
+        if (operationPredicates === false) {
+            return neverCondition;
         }
+        return this.buildPredicates(entity, operationPredicates, relationContext);
+    }
+    buildPredicates(entity, predicates, relationContext) {
+        var _a;
+        const entityPermissions = (_a = this.permissions[entity.name]) !== null && _a !== void 0 ? _a : {};
         const predicatesWhere = predicates.reduce((result, name) => {
             if (!entityPermissions.predicates[name]) {
                 throw new Error(`${entity.name}: Undefined predicate ${name}`);
@@ -60,7 +76,7 @@ class PredicateFactory {
             return {};
         }
         const where = predicatesWhere.length === 1 ? predicatesWhere[0] : { and: predicatesWhere };
-        return this.optimizePredicates(where, overRelation);
+        return this.optimizePredicates(where, relationContext);
     }
     getRequiredPredicates(fieldNames, fieldPermissions) {
         const predicates = [];
@@ -78,20 +94,15 @@ class PredicateFactory {
         }
         return predicates;
     }
-    optimizePredicates(where, overRelation) {
-        if (!overRelation) {
+    optimizePredicates(where, relationContext) {
+        if (!relationContext || !relationContext.targetRelation) {
             return where;
         }
-        const otherSide = (0, schema_utils_1.isOwningRelation)(overRelation) ? overRelation.inversedBy : overRelation.ownedBy;
-        if (!otherSide) {
-            throw new exception_1.ImplementationException();
-        }
-        const sourceEntity = this.model.entities[overRelation.target];
-        const sourcePredicate = this.create(sourceEntity, schema_1.Acl.Operation.read, [otherSide]);
+        const sourcePredicate = this.create(relationContext.entity, schema_1.Acl.Operation.read, [relationContext.relation.name]);
         if (Object.keys(sourcePredicate).length === 0) {
             return where;
         }
-        const replacer = new EvaluatedPredicateReplacer_1.EvaluatedPredicateReplacer(sourcePredicate, sourceEntity, overRelation);
+        const replacer = new EvaluatedPredicateReplacer_1.EvaluatedPredicateReplacer(sourcePredicate, relationContext.entity, relationContext.targetRelation);
         return replacer.replace(where);
     }
 }

package/dist/src/acl/PredicateFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"PredicateFactory.js","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PredicateFactory.js","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":"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"}

package/dist/src/acl/PredicatesInjector.d.ts

@@ -4,7 +4,7 @@ export declare class PredicatesInjector {
     private readonly schema;
     private readonly predicateFactory;
     constructor(schema: Model.Schema, predicateFactory: PredicateFactory);
-    inject(entity: Model.Entity, where: Input.OptionalWhere, overRelation?: Model.AnyRelation): Input.OptionalWhere;
+    inject(entity: Model.Entity, where: Input.OptionalWhere, relationContext?: Model.AnyRelationContext): Input.OptionalWhere;
     private createWhere;
     private injectToWhere;
 }

package/dist/src/acl/PredicatesInjector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PredicatesInjector.d.ts","sourceRoot":"","sources":["../../../src/acl/PredicatesInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAE/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,qBAAa,kBAAkB;IAClB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAvD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,gBAAgB,EAAE,gBAAgB;IAE/F,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,YAAY,CAAC,EAAE,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,aAAa;IAKtH,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,aAAa;CAmCrB"}
+{"version":3,"file":"PredicatesInjector.d.ts","sourceRoot":"","sources":["../../../src/acl/PredicatesInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAE/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,qBAAa,kBAAkB;IAClB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAvD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,gBAAgB,EAAE,gBAAgB;IAE/F,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC,aAAa;IAKhI,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,aAAa;CAmCrB"}

package/dist/src/acl/PredicatesInjector.js

@@ -8,12 +8,13 @@ class PredicatesInjector {
         this.schema = schema;
         this.predicateFactory = predicateFactory;
     }
-    inject(entity, where, overRelation) {
+    inject(entity, where, relationContext) {
         const restrictedWhere = this.injectToWhere(where, entity, true);
-        return this.createWhere(entity, undefined, restrictedWhere, overRelation);
+        return this.createWhere(entity, undefined, restrictedWhere, relationContext);
     }
-    createWhere(entity, fieldNames, where, overRelation) {
-        const predicatesWhere = this.predicateFactory.create(entity, schema_1.Acl.Operation.read, fieldNames, overRelation);
+    createWhere(entity, fieldNames, where, relationContext) {
+        const predicatesWhere = this.predicateFactory.create(entity, schema_1.Acl.Operation.read, fieldNames, relationContext);
+        where = this.predicateFactory.optimizePredicates(where, relationContext);
         const and = [where, predicatesWhere].filter(it => Object.keys(it).length > 0);
         if (and.length === 0) {
             return {};
@@ -23,37 +24,31 @@ class PredicatesInjector {
         }
         return { and: and };
     }
-    injectToWhere(where, entity, isRoot) {
+    injectToWhere(where, entity, isRoot, relationContext) {
         const resultWhere = {};
         if (where.and) {
-            resultWhere.and = where.and.filter((it) => !!it).map(it => this.injectToWhere(it, entity, isRoot));
+            resultWhere.and = where.and.filter((it) => !!it).map(it => this.injectToWhere(it, entity, isRoot, relationContext));
         }
         if (where.or) {
-            resultWhere.or = where.or.filter((it) => !!it).map(it => this.injectToWhere(it, entity, isRoot));
+            resultWhere.or = where.or.filter((it) => !!it).map(it => this.injectToWhere(it, entity, isRoot, relationContext));
         }
         if (where.not) {
-            resultWhere.not = this.injectToWhere(where.not, entity, isRoot);
+            resultWhere.not = this.injectToWhere(where.not, entity, isRoot, relationContext);
         }
         const fields = Object.keys(where).filter(it => !['and', 'or', 'not'].includes(it));
         if (fields.length === 0) {
             return resultWhere;
         }
         for (let field of fields) {
-            const targetEntity = (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, field, {
-                visitColumn: () => null,
-                visitRelation: (_a, _b, targetEntity) => targetEntity,
+            resultWhere[field] = (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, field, {
+                visitColumn: () => where[field],
+                visitRelation: context => this.injectToWhere(where[field], context.targetEntity, false, context),
             });
-            if (targetEntity) {
-                resultWhere[field] = this.injectToWhere(where[field], targetEntity, false);
-            }
-            else {
-                resultWhere[field] = where[field];
-            }
         }
         const fieldsForPredicate = !isRoot
             ? fields
             : fields.filter(it => this.predicateFactory.shouldApplyCellLevelPredicate(entity, schema_1.Acl.Operation.read, it));
-        return this.createWhere(entity, fieldsForPredicate, resultWhere);
+        return this.createWhere(entity, fieldsForPredicate, resultWhere, relationContext);
     }
 }
 exports.PredicatesInjector = PredicatesInjector;

package/dist/src/acl/PredicatesInjector.js.map

@@ -1 +1 @@
-{"version":3,"file":"PredicatesInjector.js","sourceRoot":"","sources":["../../../src/acl/PredicatesInjector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PredicatesInjector.js","sourceRoot":"","sources":["../../../src/acl/PredicatesInjector.ts"],"names":[],"mappings":";;;AAAA,8CAA+D;AAC/D,0DAA4D;AAG5D,MAAa,kBAAkB;IAC9B,YAA6B,MAAoB,EAAmB,gBAAkC;QAAzE,WAAM,GAAN,MAAM,CAAc;QAAmB,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAEnG,MAAM,CAAC,MAAoB,EAAE,KAA0B,EAAE,eAA0C;QACzG,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC/D,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,CAAC,CAAA;IAC7E,CAAC;IAEO,WAAW,CAClB,MAAoB,EACpB,UAAgC,EAChC,KAA0B,EAC1B,eAA0C;QAE1C,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,YAAG,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,eAAe,CAAC,CAAA;QAC7G,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;QAExE,MAAM,GAAG,GAAG,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAC7E,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO,EAAE,CAAA;SACT;QACD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO,GAAG,CAAC,CAAC,CAAC,CAAA;SACb;QACD,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;IACpB,CAAC;IAEO,aAAa,CACpB,KAA0B,EAC1B,MAAoB,EACpB,MAAe,EACf,eAA0C;QAE1C,MAAM,WAAW,GAAkC,EAAE,CAAA;QACrD,IAAI,KAAK,CAAC,GAAG,EAAE;YACd,WAAW,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,EAAqB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC,CAAA;SACtI;QACD,IAAI,KAAK,CAAC,EAAE,EAAE;YACb,WAAW,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAqB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC,CAAA;SACpI;QACD,IAAI,KAAK,CAAC,GAAG,EAAE;YACd,WAAW,CAAC,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAA;SAChF;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAA;QAElF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,OAAO,WAAW,CAAA;SAClB;QACD,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;YACzB,WAAW,CAAC,KAAK,CAAC,GAAG,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE;gBACnE,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC;gBAC/B,aAAa,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAgB,EAAE,OAAO,CAAC,YAAY,EAAE,KAAK,EAAE,OAAO,CAAC;aAC/G,CAAC,CAAA;SACF;QACD,MAAM,kBAAkB,GAAG,CAAC,MAAM;YACjC,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,MAAM,EAAE,YAAG,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAA;QAE3G,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,kBAAkB,EAAE,WAAW,EAAE,eAAe,CAAC,CAAA;IAClF,CAAC;CAED;AA9DD,gDA8DC"}

package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.d.ts

@@ -7,6 +7,5 @@ export declare class HasManyToHasOneReducerExecutionHandler implements SelectExe
     private readonly uniqueWhereExpander;
     constructor(schema: Model.Schema, uniqueWhereExpander: UniqueWhereExpander);
     process(context: SelectExecutionHandlerContext<Input.UniqueQueryInput, HasManyToHasOneReducerExtension>): void;
-    private getRelationTarget;
 }
 //# sourceMappingURL=HasManyToHasOneReducerExecutionHandler.d.ts.map

package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HasManyToHasOneReducerExecutionHandler.d.ts","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGhD,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAA;AAEpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAA;AAE1E,qBAAa,sCAAuC,YAAW,sBAAsB,CAAC,KAAK,CAAC,gBAAgB,EAAE,+BAA+B,CAAC;IAEjI,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;gBAA1D,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,mBAAmB,EAAE,mBAAmB;IAE5G,OAAO,CAAC,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,gBAAgB,EAAE,+BAA+B,CAAC,GAAG,IAAI;IA2B9G,OAAO,CAAC,iBAAiB;CAqBzB"}
+{"version":3,"file":"HasManyToHasOneReducerExecutionHandler.d.ts","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGhD,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAA;AAEpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAA;AAE1E,qBAAa,sCAAuC,YAAW,sBAAsB,CAAC,KAAK,CAAC,gBAAgB,EAAE,+BAA+B,CAAC;IAEjI,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;gBAA1D,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,mBAAmB,EAAE,mBAAmB;IAE5G,OAAO,CAAC,OAAO,EAAE,6BAA6B,CAAC,KAAK,CAAC,gBAAgB,EAAE,+BAA+B,CAAC,GAAG,IAAI;CAyC9G"}

package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js

@@ -14,33 +14,36 @@ class HasManyToHasOneReducerExecutionHandler {
         if (!objectNode) {
             throw new Error();
         }
-        addData(entity.primary, async (ids) => {
-            const [targetEntity, targetRelation] = this.getRelationTarget(entity, objectNode.extensions.relationName);
-            const uniqueWhere = this.uniqueWhereExpander.expand(targetEntity, {
-                ...objectNode.args.by,
-                [targetRelation.name]: { [entity.primary]: ids },
-            });
-            if (Object.keys(uniqueWhere).length !== 2) {
-                throw new Error('HasManyToHasOneReducerExecutionHandler: only tuple unique keys are allowed');
-            }
-            const whereWithParentId = {
-                and: [objectNode.args.filter || {}, uniqueWhere],
-            };
-            const newObjectNode = objectNode.withArgs({ filter: whereWithParentId });
-            return context.mapper.select(targetEntity, newObjectNode, targetRelation, targetRelation.name);
-        }, null);
-    }
-    getRelationTarget(entity, relationName) {
-        return (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, relationName, {
-            visitColumn: () => {
-                throw new exception_1.ImplementationException('HasManyToHasOneReducerExecutionHandler: Not applicable for a column');
-            },
-            visitRelation: (entity, relation, targetEntity, targetRelation) => {
+        addData({
+            field: entity.primary,
+            dataProvider: async (ids) => {
+                const relationContext = (0, schema_utils_1.acceptFieldVisitor)(this.schema, entity, objectNode.extensions.relationName, {
+                    visitRelation: context => context,
+                    visitColumn: () => {
+                        throw new exception_1.ImplementationException('HasManyToHasOneReducerExecutionHandler: Not applicable for a column');
+                    },
+                });
+                const { targetEntity, targetRelation } = relationContext;
                 if (!targetRelation || !(0, utils_1.isIt)(targetRelation, 'joiningColumn')) {
                     throw new Error('HasManyToHasOneReducerExecutionHandler: only applicable for relations with joiningColumn');
                 }
-                return [targetEntity, targetRelation];
+                const uniqueWhere = this.uniqueWhereExpander.expand(targetEntity, {
+                    ...objectNode.args.by,
+                    [targetRelation.name]: { [entity.primary]: ids },
+                });
+                if (Object.keys(uniqueWhere).length !== 2) {
+                    throw new Error('HasManyToHasOneReducerExecutionHandler: only tuple unique keys are allowed');
+                }
+                const whereWithParentId = {
+                    and: [objectNode.args.filter || {}, uniqueWhere],
+                };
+                const newObjectNode = objectNode.withArgs({ filter: whereWithParentId });
+                return context.mapper.selectAssoc(targetEntity, newObjectNode, [
+                    ...context.relationPath,
+                    relationContext,
+                ], targetRelation.name);
             },
+            defaultValue: null,
         });
     }
 }

package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"HasManyToHasOneReducerExecutionHandler.js","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts"],"names":[],"mappings":";;;AACA,uCAAkC;AAClC,0DAA4D;AAE5D,+CAAyD;AAIzD,MAAa,sCAAsC;IAElD,YAA6B,MAAoB,EAAmB,mBAAwC;QAA/E,WAAM,GAAN,MAAM,CAAc;QAAmB,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAG,CAAC;IAEhH,OAAO,CAAC,OAA+F;QACtG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;QAC/C,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,OAAO,CACN,MAAM,CAAC,OAAO,EACd,KAAK,EAAE,GAAyB,EAAE,EAAE;YACnC,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,CAAA;YACzG,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE;gBACjE,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE;gBACrB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE;aAChD,CAAC,CAAA;YACF,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1C,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAA;aAC7F;YACD,MAAM,iBAAiB,GAAG;gBACzB,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,WAAW,CAAC;aAChD,CAAA;YACD,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,CAAuB,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAA;YAE9F,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,CAAC,IAAI,CAAC,CAAA;QAC/F,CAAC,EACD,IAAI,CACJ,CAAA;IACF,CAAC;IAEO,iBAAiB,CACxB,MAAoB,EACpB,YAAoB;QAEpB,OAAO,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE;YAC5D,WAAW,EAAE,GAAU,EAAE;gBACxB,MAAM,IAAI,mCAAuB,CAAC,qEAAqE,CAAC,CAAA;YACzG,CAAC;YACD,aAAa,EAAE,CACd,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,cAAc,EACoD,EAAE;gBACpE,IAAI,CAAC,cAAc,IAAI,CAAC,IAAA,YAAI,EAA8B,cAAc,EAAE,eAAe,CAAC,EAAE;oBAC3F,MAAM,IAAI,KAAK,CAAC,0FAA0F,CAAC,CAAA;iBAC3G;gBACD,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC,CAAA;YACtC,CAAC;SACD,CAAC,CAAA;IACH,CAAC;CACD;AApDD,wFAoDC"}
+{"version":3,"file":"HasManyToHasOneReducerExecutionHandler.js","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneReducerExecutionHandler.ts"],"names":[],"mappings":";;;AACA,uCAAkC;AAClC,0DAA4D;AAE5D,+CAAyD;AAIzD,MAAa,sCAAsC;IAElD,YAA6B,MAAoB,EAAmB,mBAAwC;QAA/E,WAAM,GAAN,MAAM,CAAc;QAAmB,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAG,CAAC;IAEhH,OAAO,CAAC,OAA+F;QACtG,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;QAC/C,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,OAAO,CAAC;YACP,KAAK,EAAE,MAAM,CAAC,OAAO;YACrB,YAAY,EAAE,KAAK,EAAE,GAAyB,EAAE,EAAE;gBAEjD,MAAM,eAAe,GAAG,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,YAAY,EAAE;oBACnG,aAAa,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO;oBACjC,WAAW,EAAE,GAAU,EAAE;wBACxB,MAAM,IAAI,mCAAuB,CAAC,qEAAqE,CAAC,CAAA;oBACzG,CAAC;iBACD,CAAC,CAAA;gBAEF,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,eAAe,CAAA;gBACxD,IAAI,CAAC,cAAc,IAAI,CAAC,IAAA,YAAI,EAA8B,cAAc,EAAE,eAAe,CAAC,EAAE;oBAC3F,MAAM,IAAI,KAAK,CAAC,0FAA0F,CAAC,CAAA;iBAC3G;gBAED,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE;oBACjE,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE;oBACrB,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE;iBAChD,CAAC,CAAA;gBACF,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC1C,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAA;iBAC7F;gBACD,MAAM,iBAAiB,GAAG;oBACzB,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,EAAE,WAAW,CAAC;iBAChD,CAAA;gBACD,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,CAAuB,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAA;gBAE9F,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,aAAa,EAAE;oBAC9D,GAAG,OAAO,CAAC,YAAY;oBACvB,eAAe;iBACf,EAAE,cAAc,CAAC,IAAI,CAAC,CAAA;YACxB,CAAC;YACD,YAAY,EAAE,IAAI;SAClB,CAAC,CAAA;IACH,CAAC;CACD;AA7CD,wFA6CC"}

package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.d.ts

@@ -15,6 +15,6 @@ export declare class HasManyToHasOneRelationReducerFieldVisitor implements Model
     visitManyHasOne(): {};
     visitManyHasManyInverse(): {};
     visitManyHasManyOwning(): {};
-    visitOneHasMany(entity: Model.Entity, relation: Model.AnyRelation, targetEntity: Model.Entity, targetRelation: Model.AnyRelation | null): FieldMap<HasManyToHasOneReducerExtension>;
+    visitOneHasMany({ entity, targetEntity, targetRelation, relation }: Model.OneHasManyContext): FieldMap<HasManyToHasOneReducerExtension>;
 }
 //# sourceMappingURL=HasManyToHasOneRelationReducerVisitor.d.ts.map

package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HasManyToHasOneRelationReducerVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAEN,kBAAkB,EAGlB,iBAAiB,EACjB,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAA;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAElD,qBAAa,0CAA2C,YACvD,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC,EAC9D,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC;IAGrE,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAHjB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,YAAY,EAC1B,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,iBAAiB;IAG/C,WAAW;IAIX,oBAAoB;IAIpB,qBAAqB;IAIrB,eAAe;IAIf,uBAAuB;IAIvB,sBAAsB;IAItB,eAAe,CACrB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,WAAW,EAC3B,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,WAAW,GAAG,IAAI;CAqDzC"}
+{"version":3,"file":"HasManyToHasOneRelationReducerVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAEN,kBAAkB,EAGlB,iBAAiB,EACjB,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAExC,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAA;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAElD,qBAAa,0CAA2C,YACvD,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC,EAC9D,KAAK,CAAC,qBAAqB,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC;IAGrE,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAHjB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,YAAY,EAAE,YAAY,EAC1B,kBAAkB,EAAE,kBAAkB,EACtC,iBAAiB,EAAE,iBAAiB;IAG/C,WAAW;IAIX,oBAAoB;IAIpB,qBAAqB;IAIrB,eAAe;IAIf,uBAAuB;IAIvB,sBAAsB;IAItB,eAAe,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,EAAE,KAAK,CAAC,iBAAiB;CAoDlG"}

package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.js

@@ -31,7 +31,7 @@ class HasManyToHasOneRelationReducerFieldVisitor {
     visitManyHasManyOwning() {
         return {};
     }
-    visitOneHasMany(entity, relation, targetEntity, targetRelation) {
+    visitOneHasMany({ entity, targetEntity, targetRelation, relation }) {
         if (!targetRelation) {
             return {};
         }

package/dist/src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"HasManyToHasOneRelationReducerVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HasManyToHasOneRelationReducerVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/hasManyToHasOneReducer/HasManyToHasOneRelationReducerVisitor.ts"],"names":[],"mappings":"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"}

package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.d.ts

@@ -6,10 +6,11 @@ export declare class PaginatedHasManyCountVisitor implements Model.ColumnVisitor
     private readonly objectNode;
     private readonly relationFetcher;
     private readonly mapper;
-    constructor(ids: Input.PrimaryValue[], objectNode: ObjectNode<Input.PaginationQueryInput>, relationFetcher: RelationFetcher, mapper: Mapper);
-    visitOneHasMany(entity: Model.Entity, relation: Model.OneHasManyRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasOneRelation): Promise<GroupedCounts>;
-    visitManyHasManyOwning(entity: Model.Entity, relation: Model.ManyHasManyOwningRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyInverseRelation | null): Promise<GroupedCounts>;
-    visitManyHasManyInverse(entity: Model.Entity, relation: Model.ManyHasManyInverseRelation, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyOwningRelation): Promise<GroupedCounts>;
+    private readonly relationPath;
+    constructor(ids: Input.PrimaryValue[], objectNode: ObjectNode<Input.PaginationQueryInput>, relationFetcher: RelationFetcher, mapper: Mapper, relationPath: Model.AnyRelationContext[]);
+    visitOneHasMany(relationContext: Model.OneHasManyContext): Promise<GroupedCounts>;
+    visitManyHasManyOwning(relationContext: Model.ManyHasManyOwningContext): Promise<GroupedCounts>;
+    visitManyHasManyInverse(relationContext: Model.ManyHasManyInverseContext): Promise<GroupedCounts>;
     visitColumn(): never;
     visitManyHasOne(): never;
     visitOneHasOneInverse(): never;