@contember/engine-content-api 1.2.0-alpha.3 → 1.2.0-alpha.6

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

@@ -0,0 +1,10 @@
+import { Input, Model } from '@contember/schema';
+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;
+}
+//# sourceMappingURL=EvaluatedPredicateReplacer.d.ts.map

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

@@ -0,0 +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"}

package/dist/src/acl/EvaluatedPredicateReplacer.js

@@ -0,0 +1,40 @@
+"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"));
+class EvaluatedPredicateReplacer {
+    constructor(evaluatedPredicate, sourceEntity, relation) {
+        this.evaluatedPredicate = evaluatedPredicate;
+        this.sourceEntity = sourceEntity;
+        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);
+            }
+            else if (key === 'and' || key === 'or') {
+                result[key] = value.map(it => this.replaceInternal(it, onRelation));
+            }
+            else if (key === this.relation.name && !onRelation) {
+                result[key] = this.replaceInternal(value, true);
+            }
+            else {
+                result[key] = value;
+            }
+        }
+        return result;
+    }
+}
+exports.EvaluatedPredicateReplacer = EvaluatedPredicateReplacer;
+//# sourceMappingURL=EvaluatedPredicateReplacer.js.map

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

@@ -0,0 +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"}

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

@@ -2,11 +2,13 @@ import { Acl, Input, Model } from '@contember/schema';
 import { VariableInjector } from './VariableInjector';
 export declare class PredicateFactory {
     private readonly permissions;
+    private readonly model;
     private readonly variableInjector;
-    constructor(permissions: Acl.Permissions, variableInjector: VariableInjector);
+    constructor(permissions: Acl.Permissions, model: Model.Schema, variableInjector: VariableInjector);
     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[]): Input.Where;
+    create(entity: Model.Entity, operation: Acl.Operation.update | Acl.Operation.read | Acl.Operation.create, fieldNames?: string[], overRelation?: Model.AnyRelation): Input.Where;
     private getRequiredPredicates;
+    private optimizePredicates;
 }
 //# 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;AAIrD,qBAAa,gBAAgB;IAChB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAAmB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAA/D,WAAW,EAAE,GAAG,CAAC,WAAW,EAAmB,gBAAgB,EAAE,gBAAgB;IAEvG,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,GACnB,KAAK,CAAC,KAAK;IAsDd,OAAO,CAAC,qBAAqB;CAmB7B"}
+{"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"}

package/dist/src/acl/PredicateFactory.js

@@ -2,10 +2,14 @@
 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 {
-    constructor(permissions, variableInjector) {
+    constructor(permissions, model, variableInjector) {
         this.permissions = permissions;
+        this.model = model;
         this.variableInjector = variableInjector;
     }
     shouldApplyCellLevelPredicate(entity, operation, fieldName) {
@@ -14,7 +18,7 @@ class PredicateFactory {
         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) {
+    create(entity, operation, fieldNames, overRelation) {
         const entityPermissions = this.permissions[entity.name];
         const neverCondition = { [entity.primary]: { never: true } };
         if (!entityPermissions) {
@@ -55,10 +59,8 @@ class PredicateFactory {
         if (predicatesWhere.length === 0) {
             return {};
         }
-        if (predicatesWhere.length === 1) {
-            return predicatesWhere[0];
-        }
-        return { and: predicatesWhere };
+        const where = predicatesWhere.length === 1 ? predicatesWhere[0] : { and: predicatesWhere };
+        return this.optimizePredicates(where, overRelation);
     }
     getRequiredPredicates(fieldNames, fieldPermissions) {
         const predicates = [];
@@ -76,6 +78,22 @@ class PredicateFactory {
         }
         return predicates;
     }
+    optimizePredicates(where, overRelation) {
+        if (!overRelation) {
+            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]);
+        if (Object.keys(sourcePredicate).length === 0) {
+            return where;
+        }
+        const replacer = new EvaluatedPredicateReplacer_1.EvaluatedPredicateReplacer(sourcePredicate, sourceEntity, overRelation);
+        return replacer.replace(where);
+    }
 }
 exports.PredicateFactory = PredicateFactory;
 //# sourceMappingURL=PredicateFactory.js.map

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): Input.OptionalWhere;
+    inject(entity: Model.Entity, where: Input.OptionalWhere, overRelation?: Model.AnyRelation): 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,GAAG,KAAK,CAAC,aAAa;IAKpF,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,aAAa;CA4BrB"}
+{"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"}

package/dist/src/acl/PredicatesInjector.js

@@ -8,12 +8,12 @@ class PredicatesInjector {
         this.schema = schema;
         this.predicateFactory = predicateFactory;
     }
-    inject(entity, where) {
-        const restrictedWhere = this.injectToWhere(where, entity);
-        return this.createWhere(entity, undefined, restrictedWhere);
+    inject(entity, where, overRelation) {
+        const restrictedWhere = this.injectToWhere(where, entity, true);
+        return this.createWhere(entity, undefined, restrictedWhere, overRelation);
     }
-    createWhere(entity, fieldNames, where) {
-        const predicatesWhere = this.predicateFactory.create(entity, schema_1.Acl.Operation.read, fieldNames);
+    createWhere(entity, fieldNames, where, overRelation) {
+        const predicatesWhere = this.predicateFactory.create(entity, schema_1.Acl.Operation.read, fieldNames, overRelation);
         const and = [where, predicatesWhere].filter(it => Object.keys(it).length > 0);
         if (and.length === 0) {
             return {};
@@ -23,16 +23,16 @@ class PredicatesInjector {
         }
         return { and: and };
     }
-    injectToWhere(where, entity) {
+    injectToWhere(where, entity, isRoot) {
         const resultWhere = {};
         if (where.and) {
-            resultWhere.and = where.and.filter((it) => !!it).map(it => this.injectToWhere(it, entity));
+            resultWhere.and = where.and.filter((it) => !!it).map(it => this.injectToWhere(it, entity, isRoot));
         }
         if (where.or) {
-            resultWhere.or = where.or.filter((it) => !!it).map(it => this.injectToWhere(it, entity));
+            resultWhere.or = where.or.filter((it) => !!it).map(it => this.injectToWhere(it, entity, isRoot));
         }
         if (where.not) {
-            resultWhere.not = this.injectToWhere(where.not, entity);
+            resultWhere.not = this.injectToWhere(where.not, entity, isRoot);
         }
         const fields = Object.keys(where).filter(it => !['and', 'or', 'not'].includes(it));
         if (fields.length === 0) {
@@ -44,13 +44,16 @@ class PredicatesInjector {
                 visitRelation: (_a, _b, targetEntity) => targetEntity,
             });
             if (targetEntity) {
-                resultWhere[field] = this.injectToWhere(where[field], targetEntity);
+                resultWhere[field] = this.injectToWhere(where[field], targetEntity, false);
             }
             else {
                 resultWhere[field] = where[field];
             }
         }
-        return this.createWhere(entity, fields, resultWhere);
+        const fieldsForPredicate = !isRoot
+            ? fields
+            : fields.filter(it => this.predicateFactory.shouldApplyCellLevelPredicate(entity, schema_1.Acl.Operation.read, it));
+        return this.createWhere(entity, fieldsForPredicate, resultWhere);
     }
 }
 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":"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"}

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

@@ -4,6 +4,5 @@ export declare class VariableInjector {
     private readonly variables;
     constructor(schema: Model.Schema, variables: Acl.VariablesMap);
     inject(entity: Model.Entity, where: Acl.PredicateDefinition): Input.Where;
-    private createCondition;
 }
 //# sourceMappingURL=VariableInjector.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"VariableInjector.d.ts","sourceRoot":"","sources":["../../../src/acl/VariableInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGrD,qBAAa,gBAAgB;IAChB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAhD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,SAAS,EAAE,GAAG,CAAC,YAAY;IAExF,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,mBAAmB,GAAG,KAAK,CAAC,KAAK;IAmBhF,OAAO,CAAC,eAAe;CAcvB"}
+{"version":3,"file":"VariableInjector.d.ts","sourceRoot":"","sources":["../../../src/acl/VariableInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAGrD,qBAAa,gBAAgB;IAChB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAhD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,SAAS,EAAE,GAAG,CAAC,YAAY;IAExF,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,mBAAmB,GAAG,KAAK,CAAC,KAAK;CAkBhF"}

package/dist/src/acl/VariableInjector.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VariableInjector = void 0;
-const schema_1 = require("@contember/schema");
 const schema_utils_1 = require("@contember/schema-utils");
 class VariableInjector {
     constructor(schema, variables) {
@@ -12,32 +11,21 @@ class VariableInjector {
         const predicateDefinitionProcessor = new schema_utils_1.PredicateDefinitionProcessor(this.schema);
         return predicateDefinitionProcessor.process(entity, where, {
             handleColumn: ({ value }) => {
+                var _a;
                 if (typeof value === 'string') {
-                    return this.createCondition(this.variables[value] || undefined);
+                    return (_a = this.variables[value]) !== null && _a !== void 0 ? _a : { never: true };
                 }
                 return value;
             },
             handleRelation: ({ value, targetEntity }) => {
+                var _a;
                 if (typeof value === 'string') {
-                    return { [targetEntity.primary]: this.createCondition(this.variables[value] || undefined) };
+                    return { [targetEntity.primary]: (_a = this.variables[value]) !== null && _a !== void 0 ? _a : { never: true } };
                 }
                 return value;
             },
         });
     }
-    createCondition(variable) {
-        if (variable === undefined || variable.value.length === 0) {
-            return { never: true };
-        }
-        const { value, definition } = variable;
-        if (definition.type === schema_1.Acl.VariableType.condition) {
-            if (value.length === 1) {
-                return value[0];
-            }
-            return { or: value };
-        }
-        return { in: value };
-    }
 }
 exports.VariableInjector = VariableInjector;
 //# sourceMappingURL=VariableInjector.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"VariableInjector.js","sourceRoot":"","sources":["../../../src/acl/VariableInjector.ts"],"names":[],"mappings":";;;AAAA,8CAAqD;AACrD,0DAAsE;AAEtE,MAAa,gBAAgB;IAC5B,YAA6B,MAAoB,EAAmB,SAA2B;QAAlE,WAAM,GAAN,MAAM,CAAc;QAAmB,cAAS,GAAT,SAAS,CAAkB;IAAG,CAAC;IAE5F,MAAM,CAAC,MAAoB,EAAE,KAA8B;QACjE,MAAM,4BAA4B,GAAG,IAAI,2CAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAElF,OAAO,4BAA4B,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE;YAC1D,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC9B,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,CAAA;iBAC/D;gBACD,OAAO,KAAwB,CAAA;YAChC,CAAC;YACD,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;gBAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC9B,OAAO,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,EAAE,CAAA;iBAC3F;gBACD,OAAO,KAAK,CAAA;YACb,CAAC;SACD,CAAC,CAAA;IACH,CAAC;IAEO,eAAe,CAAC,QAA0C;QACjE,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1D,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;SACtB;QAED,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAA;QACtC,IAAI,UAAU,CAAC,IAAI,KAAK,YAAG,CAAC,YAAY,CAAC,SAAS,EAAE;YACnD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,OAAO,KAAK,CAAC,CAAC,CAAoB,CAAA;aAClC;YACD,OAAO,EAAE,EAAE,EAAE,KAA0B,EAAE,CAAA;SACzC;QACD,OAAO,EAAE,EAAE,EAAE,KAA4B,EAAE,CAAA;IAC5C,CAAC;CACD;AApCD,4CAoCC"}
+{"version":3,"file":"VariableInjector.js","sourceRoot":"","sources":["../../../src/acl/VariableInjector.ts"],"names":[],"mappings":";;;AACA,0DAAsE;AAEtE,MAAa,gBAAgB;IAC5B,YAA6B,MAAoB,EAAmB,SAA2B;QAAlE,WAAM,GAAN,MAAM,CAAc;QAAmB,cAAS,GAAT,SAAS,CAAkB;IAAG,CAAC;IAE5F,MAAM,CAAC,MAAoB,EAAE,KAA8B;QACjE,MAAM,4BAA4B,GAAG,IAAI,2CAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAElF,OAAO,4BAA4B,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE;YAC1D,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;;gBAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC9B,OAAO,MAAA,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,mCAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;iBAC/C;gBACD,OAAO,KAAwB,CAAA;YAChC,CAAC;YACD,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE;;gBAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC9B,OAAO,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,MAAA,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,mCAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAA;iBAC3E;gBACD,OAAO,KAAK,CAAA;YACb,CAAC;SACD,CAAC,CAAA;IACH,CAAC;CACD;AArBD,4CAqBC"}

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

@@ -1,16 +1,5 @@
 import { Acl } from '@contember/schema';
-declare type Memberships = readonly {
-    role: string;
-    variables: readonly {
-        name: string;
-        values: readonly string[];
-    }[];
-}[];
-export declare const createAclVariables: (aclSchema: Acl.Schema, identity: {
-    identityId: string;
-    personId: string | null;
-    memberships: Memberships;
-}) => Acl.VariablesMap;
+import { ParsedMembership } from '@contember/schema-utils';
+export declare const createAclVariables: (aclSchema: Acl.Schema, memberships: readonly ParsedMembership[]) => Acl.VariablesMap;
 export declare const prefixVariable: (role: string, variableName: string) => string;
-export {};
 //# sourceMappingURL=VariableUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"VariableUtils.d.ts","sourceRoot":"","sources":["../../../src/acl/VariableUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAA;AAGvC,aAAK,WAAW,GAAG,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,EAAE,CAAA;CAAE,EAAE,CAAA;AAEjH,eAAO,MAAM,kBAAkB,cACnB,IAAI,MAAM,YACX;IACT,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,WAAW,EAAE,WAAW,CAAA;CACxB,KACC,IAAI,YA+BN,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,MAAM,gBAAgB,MAAM,WAA+B,CAAA"}
+{"version":3,"file":"VariableUtils.d.ts","sourceRoot":"","sources":["../../../src/acl/VariableUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAS,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAoB,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAG5E,eAAO,MAAM,kBAAkB,cACnB,IAAI,MAAM,eACR,SAAS,gBAAgB,EAAE,KACtC,IAAI,YAeN,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,MAAM,gBAAgB,MAAM,WAA+B,CAAA"}

package/dist/src/acl/VariableUtils.js

@@ -1,32 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prefixVariable = exports.createAclVariables = void 0;
-const schema_1 = require("@contember/schema");
 const schema_utils_1 = require("@contember/schema-utils");
-const createAclVariables = (aclSchema, identity) => {
-    const variablesEntries = identity.memberships.flatMap(membership => {
+const createAclVariables = (aclSchema, memberships) => {
+    const variablesEntries = memberships.flatMap(membership => {
         const roleVariables = (0, schema_utils_1.getRoleVariables)(membership.role, aclSchema);
-        const membershipVariablesMap = Object.fromEntries(membership.variables.map(it => [it.name, it.values]));
-        return Object.entries(roleVariables).map(([name, def]) => {
+        const membershipVariablesMap = Object.fromEntries(membership.variables.map(it => [it.name, it.condition]));
+        return Object.keys(roleVariables).map((name) => {
+            var _a;
             const prefixed = (0, exports.prefixVariable)(membership.role, name);
-            const value = (() => {
-                var _a, _b;
-                switch (def.type) {
-                    case schema_1.Acl.VariableType.entity:
-                        return (_a = membershipVariablesMap[name]) !== null && _a !== void 0 ? _a : [];
-                    case schema_1.Acl.VariableType.predefined:
-                        switch (def.value) {
-                            case 'identityID':
-                                return [identity.identityId];
-                            case 'personID':
-                                return identity.personId ? [identity.personId] : [];
-                        }
-                        throw new Error(`Unknown predefined variable ${def.value}`);
-                    case schema_1.Acl.VariableType.condition:
-                        return ((_b = membershipVariablesMap[name]) !== null && _b !== void 0 ? _b : []).map(it => JSON.parse(it));
-                }
-            })();
-            return [prefixed, { value: value, definition: def }];
+            return [prefixed, (_a = membershipVariablesMap[name]) !== null && _a !== void 0 ? _a : { never: true }];
         });
     });
     return Object.fromEntries(variablesEntries);

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

@@ -1 +1 @@
-{"version":3,"file":"VariableUtils.js","sourceRoot":"","sources":["../../../src/acl/VariableUtils.ts"],"names":[],"mappings":";;;AAAA,8CAAuC;AACvC,0DAA0D;AAInD,MAAM,kBAAkB,GAAG,CACjC,SAAqB,EACrB,QAIC,EACkB,EAAE;IAErB,MAAM,gBAAgB,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CACpD,UAAU,CAAC,EAAE;QACZ,MAAM,aAAa,GAAG,IAAA,+BAAgB,EAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAClE,MAAM,sBAAsB,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QAEvG,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAkC,EAAE;YACxF,MAAM,QAAQ,GAAG,IAAA,sBAAc,EAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACtD,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE;;gBACnB,QAAQ,GAAG,CAAC,IAAI,EAAE;oBACjB,KAAK,YAAG,CAAC,YAAY,CAAC,MAAM;wBAC3B,OAAO,MAAA,sBAAsB,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAA;oBAC1C,KAAK,YAAG,CAAC,YAAY,CAAC,UAAU;wBAC/B,QAAQ,GAAG,CAAC,KAAK,EAAE;4BAClB,KAAK,YAAY;gCAChB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;4BAC7B,KAAK,UAAU;gCACd,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;yBACpD;wBACD,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,CAAC,KAAK,EAAE,CAAC,CAAA;oBAC5D,KAAK,YAAG,CAAC,YAAY,CAAC,SAAS;wBAC9B,OAAO,CAAC,MAAA,sBAAsB,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;iBACtE;YACF,CAAC,CAAC,EAAE,CAAA;YACJ,OAAO,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAA;QACrD,CAAC,CAAC,CAAA;IACH,CAAC,CACD,CAAA;IAED,OAAO,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAA;AAC5C,CAAC,CAAA;AAtCY,QAAA,kBAAkB,sBAsC9B;AAEM,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,YAAoB,EAAE,EAAE,CAAC,GAAG,IAAI,KAAK,YAAY,EAAE,CAAA;AAAnF,QAAA,cAAc,kBAAqE"}
+{"version":3,"file":"VariableUtils.js","sourceRoot":"","sources":["../../../src/acl/VariableUtils.ts"],"names":[],"mappings":";;;AACA,0DAA4E;AAGrE,MAAM,kBAAkB,GAAG,CACjC,SAAqB,EACrB,WAAwC,EACrB,EAAE;IAErB,MAAM,gBAAgB,GAAG,WAAW,CAAC,OAAO,CAC3C,UAAU,CAAC,EAAE;QACZ,MAAM,aAAa,GAAG,IAAA,+BAAgB,EAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAClE,MAAM,sBAAsB,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAE1G,OAAO,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAA6B,EAAE;;YACzE,MAAM,QAAQ,GAAG,IAAA,sBAAc,EAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACtD,OAAO,CAAC,QAAQ,EAAE,MAAA,sBAAsB,CAAC,IAAI,CAAC,mCAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QACnE,CAAC,CAAC,CAAA;IACH,CAAC,CACD,CAAA;IAED,OAAO,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAA;AAC5C,CAAC,CAAA;AAlBY,QAAA,kBAAkB,sBAkB9B;AAEM,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,YAAoB,EAAE,EAAE,CAAC,GAAG,IAAI,KAAK,YAAY,EAAE,CAAA;AAAnF,QAAA,cAAc,kBAAqE"}

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

@@ -27,7 +27,7 @@ class HasManyToHasOneReducerExecutionHandler {
                 and: [objectNode.args.filter || {}, uniqueWhere],
             };
             const newObjectNode = objectNode.withArgs({ filter: whereWithParentId });
-            return context.mapper.select(targetEntity, newObjectNode, targetRelation.name);
+            return context.mapper.select(targetEntity, newObjectNode, targetRelation, targetRelation.name);
         }, null);
     }
     getRelationTarget(entity, relationName) {

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,CAAC,IAAI,CAAC,CAAA;QAC/E,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,EACiD,EAAE;gBACjE,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,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"}

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

@@ -1 +1 @@
-{"version":3,"file":"PaginatedHasManyCountVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAkB,MAAM,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,qBAAa,4BAA6B,YACzC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EAC3C,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAGlD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,GAAG,EAAE,KAAK,CAAC,YAAY,EAAE,EACzB,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAClD,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM;IAG1B,eAAe,CACpB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,EAClC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,GACtC,OAAO,CAAC,aAAa,CAAC;IAUnB,sBAAsB,CAC3B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,yBAAyB,EACzC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,0BAA0B,GAAG,IAAI,GACrD,OAAO,CAAC,aAAa,CAAC;IAgBnB,uBAAuB,CAC5B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,0BAA0B,EAC1C,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,yBAAyB,GAC7C,OAAO,CAAC,aAAa,CAAC;IAgBzB,WAAW,IAAI,KAAK;IAIpB,eAAe,IAAI,KAAK;IAIxB,qBAAqB,IAAI,KAAK;IAI9B,oBAAoB,IAAI,KAAK;CAG7B"}
+{"version":3,"file":"PaginatedHasManyCountVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,qBAAa,4BAA6B,YACzC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EAC3C,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAGlD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,GAAG,EAAE,KAAK,CAAC,YAAY,EAAE,EACzB,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAClD,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM;IAG1B,eAAe,CACpB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,EAClC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,GACtC,OAAO,CAAC,aAAa,CAAC;IAYnB,sBAAsB,CAC3B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,yBAAyB,EACzC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,0BAA0B,GAAG,IAAI,GACrD,OAAO,CAAC,aAAa,CAAC;IAcnB,uBAAuB,CAC5B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,0BAA0B,EAC1C,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,yBAAyB,GAC7C,OAAO,CAAC,aAAa,CAAC;IAczB,WAAW,IAAI,KAAK;IAIpB,eAAe,IAAI,KAAK;IAIxB,qBAAqB,IAAI,KAAK;IAI9B,oBAAoB,IAAI,KAAK;CAG7B"}

package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.js

@@ -9,23 +9,35 @@ class PaginatedHasManyCountVisitor {
         this.mapper = mapper;
     }
     async visitOneHasMany(entity, relation, targetEntity, targetRelation) {
-        return await this.relationFetcher.countOneHasManyGroups(this.mapper, this.objectNode.args.filter, targetEntity, targetRelation, this.ids);
+        return await this.relationFetcher.countOneHasManyGroups({
+            mapper: this.mapper,
+            filter: this.objectNode.args.filter,
+            targetEntity: targetEntity,
+            targetRelation: targetRelation,
+            ids: this.ids,
+        });
     }
     async visitManyHasManyOwning(entity, relation, targetEntity, targetRelation) {
-        const joiningTable = relation.joiningTable;
-        const columns = {
-            sourceColumn: joiningTable.joiningColumn,
-            targetColumn: joiningTable.inverseJoiningColumn,
-        };
-        return await this.relationFetcher.countManyHasManyGroups(this.mapper, this.objectNode.args.filter, targetEntity, relation, this.ids, columns);
+        return await this.relationFetcher.countManyHasManyGroups({
+            mapper: this.mapper,
+            filter: this.objectNode.args.filter,
+            targetEntity: targetEntity,
+            sourceRelation: relation,
+            targetRelation,
+            directionFrom: 'owning',
+            ids: this.ids,
+        });
     }
     async visitManyHasManyInverse(entity, relation, targetEntity, targetRelation) {
-        const joiningTable = targetRelation.joiningTable;
-        const columns = {
-            targetColumn: joiningTable.joiningColumn,
-            sourceColumn: joiningTable.inverseJoiningColumn,
-        };
-        return await this.relationFetcher.countManyHasManyGroups(this.mapper, this.objectNode.args.filter, targetEntity, targetRelation, this.ids, columns);
+        return await this.relationFetcher.countManyHasManyGroups({
+            mapper: this.mapper,
+            filter: this.objectNode.args.filter,
+            targetEntity: targetEntity,
+            sourceRelation: relation,
+            targetRelation,
+            directionFrom: 'inverse',
+            ids: this.ids,
+        });
     }
     visitColumn() {
         throw new Error();

package/dist/src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"PaginatedHasManyCountVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.ts"],"names":[],"mappings":";;;AAIA,MAAa,4BAA4B;IAIxC,YACkB,GAAyB,EACzB,UAAkD,EAClD,eAAgC,EAChC,MAAc;QAHd,QAAG,GAAH,GAAG,CAAsB;QACzB,eAAU,GAAV,UAAU,CAAwC;QAClD,oBAAe,GAAf,eAAe,CAAiB;QAChC,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAEJ,KAAK,CAAC,eAAe,CACpB,MAAoB,EACpB,QAAkC,EAClC,YAA0B,EAC1B,cAAwC;QAExC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAqB,CACtD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAC3B,YAAY,EACZ,cAAc,EACd,IAAI,CAAC,GAAG,CACR,CAAA;IACF,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC3B,MAAoB,EACpB,QAAyC,EACzC,YAA0B,EAC1B,cAAuD;QAEvD,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAA;QAC1C,MAAM,OAAO,GAAmB;YAC/B,YAAY,EAAE,YAAY,CAAC,aAAa;YACxC,YAAY,EAAE,YAAY,CAAC,oBAAoB;SAC/C,CAAA;QACD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAC3B,YAAY,EACZ,QAAQ,EACR,IAAI,CAAC,GAAG,EACR,OAAO,CACP,CAAA;IACF,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC5B,MAAoB,EACpB,QAA0C,EAC1C,YAA0B,EAC1B,cAA+C;QAE/C,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,CAAA;QAChD,MAAM,OAAO,GAAmB;YAC/B,YAAY,EAAE,YAAY,CAAC,aAAa;YACxC,YAAY,EAAE,YAAY,CAAC,oBAAoB;SAC/C,CAAA;QACD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAC3B,YAAY,EACZ,cAAc,EACd,IAAI,CAAC,GAAG,EACR,OAAO,CACP,CAAA;IACF,CAAC;IAED,WAAW;QACV,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,eAAe;QACd,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,qBAAqB;QACpB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,oBAAoB;QACnB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;CACD;AAnFD,oEAmFC"}
+{"version":3,"file":"PaginatedHasManyCountVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyCountVisitor.ts"],"names":[],"mappings":";;;AAIA,MAAa,4BAA4B;IAIxC,YACkB,GAAyB,EACzB,UAAkD,EAClD,eAAgC,EAChC,MAAc;QAHd,QAAG,GAAH,GAAG,CAAsB;QACzB,eAAU,GAAV,UAAU,CAAwC;QAClD,oBAAe,GAAf,eAAe,CAAiB;QAChC,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAEJ,KAAK,CAAC,eAAe,CACpB,MAAoB,EACpB,QAAkC,EAClC,YAA0B,EAC1B,cAAwC;QAExC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAqB,CACtD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM;YACnC,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,cAAc;YAC9B,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC3B,MAAoB,EACpB,QAAyC,EACzC,YAA0B,EAC1B,cAAuD;QAEvD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM;YACnC,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,QAAQ;YACxB,cAAc;YACd,aAAa,EAAE,QAAQ;YACvB,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC5B,MAAoB,EACpB,QAA0C,EAC1C,YAA0B,EAC1B,cAA+C;QAE/C,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM;YACnC,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,QAAQ;YACxB,cAAc;YACd,aAAa,EAAE,SAAS;YACxB,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,WAAW;QACV,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,eAAe;QACd,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,qBAAqB;QACpB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,oBAAoB;QACnB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;CACD;AAjFD,oEAiFC"}

package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PaginatedHasManyNodesVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAiC,MAAM,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAC3G,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,qBAAa,4BAA6B,YACzC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,EAClD,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAGzD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,GAAG,EAAE,KAAK,CAAC,YAAY,EAAE,EACzB,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAClD,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM;IAG1B,eAAe,CACpB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,EAClC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,GACtC,OAAO,CAAC,oBAAoB,CAAC;IAW1B,sBAAsB,CAC3B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,yBAAyB,EACzC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,0BAA0B,GAAG,IAAI,GACrD,OAAO,CAAC,oBAAoB,CAAC;IAiB1B,uBAAuB,CAC5B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,0BAA0B,EAC1C,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,yBAAyB,GAC7C,OAAO,CAAC,oBAAoB,CAAC;IAiBhC,WAAW,IAAI,KAAK;IAIpB,eAAe,IAAI,KAAK;IAIxB,qBAAqB,IAAI,KAAK;IAI9B,oBAAoB,IAAI,KAAK;CAG7B"}
+{"version":3,"file":"PaginatedHasManyNodesVisitor.d.ts","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAElD,qBAAa,4BAA6B,YACzC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,EAClD,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAGzD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,GAAG,EAAE,KAAK,CAAC,YAAY,EAAE,EACzB,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAClD,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM;IAG1B,eAAe,CACpB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,kBAAkB,EAClC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,kBAAkB,GACtC,OAAO,CAAC,oBAAoB,CAAC;IAa1B,sBAAsB,CAC3B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,yBAAyB,EACzC,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,0BAA0B,GAAG,IAAI,GACrD,OAAO,CAAC,oBAAoB,CAAC;IAc1B,uBAAuB,CAC5B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,0BAA0B,EAC1C,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,cAAc,EAAE,KAAK,CAAC,yBAAyB,GAC7C,OAAO,CAAC,oBAAoB,CAAC;IAchC,WAAW,IAAI,KAAK;IAIpB,eAAe,IAAI,KAAK;IAIxB,qBAAqB,IAAI,KAAK;IAI9B,oBAAoB,IAAI,KAAK;CAG7B"}

package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.js

@@ -9,23 +9,36 @@ class PaginatedHasManyNodesVisitor {
         this.mapper = mapper;
     }
     async visitOneHasMany(entity, relation, targetEntity, targetRelation) {
-        return await this.relationFetcher.fetchOneHasManyGroups(this.mapper, this.objectNode, targetEntity, relation, targetRelation, this.ids);
+        return await this.relationFetcher.fetchOneHasManyGroups({
+            mapper: this.mapper,
+            objectNode: this.objectNode,
+            targetEntity: targetEntity,
+            relation: relation,
+            targetRelation: targetRelation,
+            ids: this.ids,
+        });
     }
     async visitManyHasManyOwning(entity, relation, targetEntity, targetRelation) {
-        const joiningTable = relation.joiningTable;
-        const columns = {
-            sourceColumn: joiningTable.joiningColumn,
-            targetColumn: joiningTable.inverseJoiningColumn,
-        };
-        return await this.relationFetcher.fetchManyHasManyGroups(this.mapper, this.objectNode, targetEntity, relation, relation, columns, this.ids);
+        return await this.relationFetcher.fetchManyHasManyGroups({
+            mapper: this.mapper,
+            field: this.objectNode,
+            targetEntity: targetEntity,
+            sourceRelation: relation,
+            targetRelation,
+            directionFrom: 'owning',
+            ids: this.ids,
+        });
     }
     async visitManyHasManyInverse(entity, relation, targetEntity, targetRelation) {
-        const joiningTable = targetRelation.joiningTable;
-        const columns = {
-            targetColumn: joiningTable.joiningColumn,
-            sourceColumn: joiningTable.inverseJoiningColumn,
-        };
-        return await this.relationFetcher.fetchManyHasManyGroups(this.mapper, this.objectNode, targetEntity, relation, targetRelation, columns, this.ids);
+        return await this.relationFetcher.fetchManyHasManyGroups({
+            mapper: this.mapper,
+            field: this.objectNode,
+            targetEntity: targetEntity,
+            sourceRelation: relation,
+            targetRelation,
+            directionFrom: 'inverse',
+            ids: this.ids,
+        });
     }
     visitColumn() {
         throw new Error();

package/dist/src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"PaginatedHasManyNodesVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.ts"],"names":[],"mappings":";;;AAIA,MAAa,4BAA4B;IAIxC,YACkB,GAAyB,EACzB,UAAkD,EAClD,eAAgC,EAChC,MAAc;QAHd,QAAG,GAAH,GAAG,CAAsB;QACzB,eAAU,GAAV,UAAU,CAAwC;QAClD,oBAAe,GAAf,eAAe,CAAiB;QAChC,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAEJ,KAAK,CAAC,eAAe,CACpB,MAAoB,EACpB,QAAkC,EAClC,YAA0B,EAC1B,cAAwC;QAExC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAqB,CACtD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,UAAU,EACf,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,IAAI,CAAC,GAAG,CACR,CAAA;IACF,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC3B,MAAoB,EACpB,QAAyC,EACzC,YAA0B,EAC1B,cAAuD;QAEvD,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAA;QAC1C,MAAM,OAAO,GAAmB;YAC/B,YAAY,EAAE,YAAY,CAAC,aAAa;YACxC,YAAY,EAAE,YAAY,CAAC,oBAAoB;SAC/C,CAAA;QACD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,UAAU,EACf,YAAY,EACZ,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,IAAI,CAAC,GAAG,CACR,CAAA;IACF,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC5B,MAAoB,EACpB,QAA0C,EAC1C,YAA0B,EAC1B,cAA+C;QAE/C,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,CAAA;QAChD,MAAM,OAAO,GAAmB;YAC/B,YAAY,EAAE,YAAY,CAAC,aAAa;YACxC,YAAY,EAAE,YAAY,CAAC,oBAAoB;SAC/C,CAAA;QACD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,UAAU,EACf,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,OAAO,EACP,IAAI,CAAC,GAAG,CACR,CAAA;IACF,CAAC;IAED,WAAW;QACV,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,eAAe;QACd,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,qBAAqB;QACpB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,oBAAoB;QACnB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;CACD;AAtFD,oEAsFC"}
+{"version":3,"file":"PaginatedHasManyNodesVisitor.js","sourceRoot":"","sources":["../../../../src/extensions/paginatedHasMany/PaginatedHasManyNodesVisitor.ts"],"names":[],"mappings":";;;AAIA,MAAa,4BAA4B;IAIxC,YACkB,GAAyB,EACzB,UAAkD,EAClD,eAAgC,EAChC,MAAc;QAHd,QAAG,GAAH,GAAG,CAAsB;QACzB,eAAU,GAAV,UAAU,CAAwC;QAClD,oBAAe,GAAf,eAAe,CAAiB;QAChC,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAEJ,KAAK,CAAC,eAAe,CACpB,MAAoB,EACpB,QAAkC,EAClC,YAA0B,EAC1B,cAAwC;QAExC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAqB,CACtD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,YAAY,EAAE,YAAY;YAC1B,QAAQ,EAAE,QAAQ;YAClB,cAAc,EAAE,cAAc;YAC9B,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC3B,MAAoB,EACpB,QAAyC,EACzC,YAA0B,EAC1B,cAAuD;QAEvD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,UAAU;YACtB,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,QAAQ;YACxB,cAAc;YACd,aAAa,EAAE,QAAQ;YACvB,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC5B,MAAoB,EACpB,QAA0C,EAC1C,YAA0B,EAC1B,cAA+C;QAE/C,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,sBAAsB,CACvD;YACC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,IAAI,CAAC,UAAU;YACtB,YAAY,EAAE,YAAY;YAC1B,cAAc,EAAE,QAAQ;YACxB,cAAc;YACd,aAAa,EAAE,SAAS;YACxB,GAAG,EAAE,IAAI,CAAC,GAAG;SACb,CACD,CAAA;IACF,CAAC;IAED,WAAW;QACV,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,eAAe;QACd,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,qBAAqB;QACpB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;IAED,oBAAoB;QACnB,MAAM,IAAI,KAAK,EAAE,CAAA;IAClB,CAAC;CACD;AAlFD,oEAkFC"}

package/dist/src/input-validation/EntityRulesResolver.js

@@ -37,7 +37,7 @@ class EntityRulesResolver {
     }
     getEntityRules(entityName) {
         const definedRules = this.validationSchema[entityName] || {};
-        const fieldsNotNullFlag = (0, schema_utils_1.acceptEveryFieldVisitor)(this.model, entityName, new NotNullFieldsVisitor());
+        const fieldsNotNullFlag = (0, schema_utils_1.acceptEveryFieldVisitor)(this.model, entityName, new RequiredFieldsVisitor());
         const notNullFields = Object.keys((0, utils_1.filterObject)(fieldsNotNullFlag, (field, val) => val));
         return notNullFields.reduce((entityRules, field) => ({
             ...entityRules,
@@ -49,9 +49,9 @@ class EntityRulesResolver {
     }
 }
 exports.EntityRulesResolver = EntityRulesResolver;
-class NotNullFieldsVisitor {
+class RequiredFieldsVisitor {
     visitColumn(entity, column) {
-        return !column.nullable;
+        return !column.nullable && typeof column.default === 'undefined' && !column.sequence;
     }
     visitManyHasManyInverse() {
         return false;

package/dist/src/input-validation/EntityRulesResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntityRulesResolver.js","sourceRoot":"","sources":["../../../src/input-validation/EntityRulesResolver.ts"],"names":[],"mappings":";;;AAAA,oCAAkD;AAElD,0DAAqF;AACrF,oEAA8D;AAC9D,iDAAoD;AACpD,6CAAgD;AAEhD,MAAa,mBAAmB;IAC/B,YAA6B,gBAAmC,EAAmB,KAAmB;QAAzE,qBAAgB,GAAhB,gBAAgB,CAAmB;QAAmB,UAAK,GAAL,KAAK,CAAc;IAAG,CAAC;IAEnG,cAAc,CAAC,UAAkB;QACvC,OAAO,IAAA,iBAAS,EAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAClE,IAAA,iCAAkB,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE;gBACjD,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI;gBACvB,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI;gBACvB,YAAY,EAAE,GAAG,EAAE;oBAClB,MAAM,IAAI,8BAAiB,CAAC,0DAA0D,CAAC,CAAA;gBACxF,CAAC;aACD,CAAC,CAAA;YACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACzB,MAAM,YAAY,GAAG,kCAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBAChE,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;oBAC5C,MAAM,UAAU,GAAG,IAAA,iCAAkB,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE;wBAClE,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK;wBACxB,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI;qBACzB,CAAC,CAAA;oBACF,IAAI,UAAU,EAAE;wBACf,MAAM,IAAI,8BAAiB,CAAC,2DAA2D,CAAC,CAAA;qBACxF;iBACD;aACD;YACD,OAAO,KAAK,CAAA;QACb,CAAC,CAAC,CAAA;IACH,CAAC;IAEM,cAAc,CAAC,UAAkB;QACvC,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;QAC5D,MAAM,iBAAiB,GAAG,IAAA,sCAAuB,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,oBAAoB,EAAE,CAAC,CAAA;QACrG,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAA,oBAAY,EAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;QACvF,OAAO,aAAa,CAAC,MAAM,CAC1B,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YACxB,GAAG,WAAW;YACd,CAAC,KAAK,CAAC,EAAE;gBACR,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC7B,EAAE,SAAS,EAAE,mCAAe,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,EAAE;aACtF;SACD,CAAC,EACF,YAAY,CACZ,CAAA;IACF,CAAC;CACD;AA3CD,kDA2CC;AAED,MAAM,oBAAoB;IACzB,WAAW,CAAC,MAAoB,EAAE,MAAuB;QACxD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAA;IACxB,CAAC;IAED,uBAAuB;QACtB,OAAO,KAAK,CAAA;IACb,CAAC;IAED,sBAAsB;QACrB,OAAO,KAAK,CAAA;IACb,CAAC;IAED,eAAe,CAAC,MAAoB,EAAE,QAAkC;QACvE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAA;IAC1B,CAAC;IAED,eAAe;QACd,OAAO,KAAK,CAAA;IACb,CAAC;IAED,qBAAqB,CAAC,MAAoB,EAAE,QAAwC,EAAE,YAA0B;QAC/G,OAAO,CAAC,QAAQ,CAAC,QAAQ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAA;IAChD,CAAC;IAED,oBAAoB,CAAC,MAAoB,EAAE,QAAuC;QACjF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAA;IAC1B,CAAC;CACD"}
+{"version":3,"file":"EntityRulesResolver.js","sourceRoot":"","sources":["../../../src/input-validation/EntityRulesResolver.ts"],"names":[],"mappings":"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"}