npm - @contember/engine-content-api - Versions diffs - 1.2.0-alpha.5 → 1.2.0-alpha.8 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (121) hide show

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

@@ -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 ADDED Viewed

@@ -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 ADDED Viewed

@@ -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 ADDED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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~~"}
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"}

package/dist/src/acl/PredicateFactory.js CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"PredicateFactory.js","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":";;;AAAA,8CAAqD;~~AAGrD~~,MAAM,+BAA+B,GAAG,CAAC,MAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAA;AAEhF,MAAa,gBAAgB;IAC5B,~~YAA6B~~,WAA4B,~~EAAmB~~,gBAAkC;~~QAAjF~~,gBAAW,GAAX,WAAW,CAAiB;~~QAAmB~~,qBAAgB,GAAhB,gBAAgB,CAAkB;~~IAAG~~,CAAC;~~IAE3G~~,6BAA6B,CACnC,MAAoB,EACpB,SAA6B,EAC7B,SAAiB;;QAEjB,MAAM,aAAa,GAAG,+BAA+B,CAAC,MAAM,CAAC,CAAA;QAC7D,MAAM,WAAW,GAAG,MAAA,MAAA,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,0CAAE,UAAU,0CAAG,SAAS,CAAC,CAAA;QAC1E,OAAO,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,SAAS,CAAC,OAAK,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,aAAa,CAAC,CAAA,CAAA;IACjE,CAAC;~~IAQM~~,MAAM,CAAC,MAAoB,EAAE,SAAwB,EAAE,UAAqB;~~QAClF~~,MAAM,iBAAiB,GAA0B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC9E,MAAM,cAAc,GAAgB,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAA;QAEzE,IAAI,CAAC,iBAAiB,EAAE;YACvB,OAAO,cAAc,CAAA;SACrB;QAED,IAAI,UAAoC,CAAA;QACxC,IAAI,SAAS,KAAK,YAAG,CAAC,SAAS,CAAC,MAAM,EAAE;YACvC,MAAM,eAAe,GAAG,iBAAiB,CAAC,UAAU,CAAC,MAAM,CAAA;YAC3D,IAAI,eAAe,KAAK,SAAS,IAAI,eAAe,KAAK,KAAK,EAAE;gBAC/D,OAAO,cAAc,CAAA;aACrB;YACD,IAAI,eAAe,KAAK,IAAI,EAAE;gBAC7B,OAAO,EAAE,CAAA;aACT;YACD,UAAU,GAAG,CAAC,eAAe,CAAC,CAAA;SAC9B;aAAM;YACN,IAAI,UAAU,KAAK,SAAS,EAAE;gBAC7B,UAAU,GAAG,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC,CAAA;aACtD;YACD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;YAChE,IAAI,gBAAgB,KAAK,SAAS,EAAE;gBACnC,OAAO,cAAc,CAAA;aACrB;YACD,MAAM,mBAAmB,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAA;YACpF,IAAI,mBAAmB,KAAK,KAAK,EAAE;gBAClC,OAAO,cAAc,CAAA;aACrB;YACD,UAAU,GAAG,mBAAmB,CAAA;SAChC;QAED,MAAM,eAAe,GAAkB,UAAU,CAAC,MAAM,CACvD,CAAC,MAAqB,EAAE,IAA4B,EAAiB,EAAE;YACtE,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gBACxC,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,IAAI,yBAAyB,IAAI,EAAE,CAAC,CAAA;aAC9D;YACD,MAAM,cAAc,GAAgB,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;YAC5G,OAAO,CAAC,GAAG,MAAM,EAAE,cAAc,CAAC,CAAA;QACnC,CAAC,EACD,EAAE,CACF,CAAA;QACD,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,OAAO,EAAE,CAAA;SACT;QACD,~~IAAI~~,eAAe,CAAC,MAAM,KAAK,CAAC,~~EAAE;YACjC~~,~~OAAO~~,eAAe,CAAC,CAAC,CAAC,~~CAAA;SACzB;QAED~~,~~OAAO~~,EAAE,GAAG,EAAE,eAAe,EAAE,CAAA;~~IAChC~~,CAAC;IAEO,qBAAqB,CAC5B,UAAoB,EACpB,gBAAsC;QAEtC,MAAM,UAAU,GAA6B,EAAE,CAAA;QAC/C,KAAK,IAAI,IAAI,IAAI,UAAU,EAAE;YAC5B,MAAM,cAAc,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;YAC7C,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,KAAK,EAAE;gBAC7D,OAAO,KAAK,CAAA;aACZ;YACD,IAAI,cAAc,KAAK,IAAI,EAAE;gBAC5B,SAAQ;aACR;YACD,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;gBACzC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;aAC/B;SACD;QACD,OAAO,UAAU,CAAA;IAClB,CAAC;CACD;~~AA3FD~~,~~4CA2FC~~"}
1	+ {"version":3,"file":"PredicateFactory.js","sourceRoot":"","sources":["../../../src/acl/PredicateFactory.ts"],"names":[],"mappings":"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"}

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

@@ -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 CHANGED Viewed

	@@ -1 +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~~"}
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"}

package/dist/src/acl/PredicatesInjector.js CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"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;~~QAC7D~~,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;~~QACzD~~,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,CAAA;~~IAC5D~~,CAAC;IAEO,WAAW,CAClB,MAAoB,EACpB,UAAgC,EAChC,KAA0B;~~QAE1B~~,MAAM,eAAe,GAAgB,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,YAAG,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;~~QAEzG~~,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,CAAC,KAA0B,EAAE,MAAoB;~~QACrE~~,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,CAAC,CAAC,CAAA;~~SAC7G~~;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,CAAC,CAAC,CAAA;~~SAC3G~~;QACD,IAAI,KAAK,CAAC,GAAG,EAAE;YACd,WAAW,CAAC,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;~~SACvD~~;~~QACD~~,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;~~QAClF~~,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,OAAO,WAAW,CAAA;SAClB;QACD,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;YACzB,MAAM,YAAY,GAAG,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE;gBACnE,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI;gBACvB,aAAa,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,CAAC,YAAY;aACrD,CAAC,CAAA;YACF,IAAI,YAAY,EAAE;gBACjB,WAAW,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAgB,EAAE,YAAY,CAAC,CAAA;~~aAClF~~;iBAAM;gBACN,WAAW,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAA;aACjC;SACD;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,~~MAAM~~,EAAE,WAAW,CAAC,CAAA;~~IACrD~~,CAAC;~~CACD~~;~~AArDD~~,~~gDAqDC~~"}
1	+ {"version":3,"file":"PredicatesInjector.js","sourceRoot":"","sources":["../../../src/acl/PredicatesInjector.ts"],"names":[],"mappings":"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"}

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

@@ -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 CHANGED Viewed

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

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

	@@ -1 +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"}
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,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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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~~"}
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;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 CHANGED Viewed

	@@ -1 +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"}
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,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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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~~"}
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;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/ValidationDataSelector.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ValidationDataSelector.d.ts","sourceRoot":"","sources":["../../../src/input-validation/ValidationDataSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAAE,YAAY,~~EAAuB~~,MAAM,gBAAgB,CAAA;~~AAClE~~,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEvD,qBAAa,sBAAsB;IACtB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAgB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAArD,KAAK,EAAE,KAAK,CAAC,MAAM,EAAmB,eAAe,EAAE,eAAe;IAEtF,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW;IAI9E,MAAM,CAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,KAAK,EAAE,KAAK,CAAC,WAAW,EACxB,YAAY,EAAE,YAAY,GACxB,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;CAY/B"}
1	+ {"version":3,"file":"ValidationDataSelector.d.ts","sourceRoot":"","sources":["../../../src/input-validation/ValidationDataSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEvD,qBAAa,sBAAsB;IACtB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAgB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAArD,KAAK,EAAE,KAAK,CAAC,MAAM,EAAmB,eAAe,EAAE,eAAe;IAEtF,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW;IAI9E,MAAM,CAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,KAAK,EAAE,KAAK,CAAC,WAAW,EACxB,YAAY,EAAE,YAAY,GACxB,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;CAY/B"}

package/dist/src/input-validation/ValidationDataSelector.js CHANGED Viewed

@@ -14,7 +14,7 @@ class ValidationDataSelector {
             return {};
         }
         const queryAst = this.queryAstFactory.create(entity.name, dependencies).withArg('by', where);
-        const node = await mapper.selectUnique(entity, queryAst);
+        const node = await mapper.selectUnique(entity, queryAst, null);
         if (!node) {
             return null;
         }

package/dist/src/input-validation/ValidationDataSelector.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ValidationDataSelector.js","sourceRoot":"","sources":["../../../src/input-validation/ValidationDataSelector.ts"],"names":[],"mappings":";;;AAKA,MAAa,sBAAsB;IAClC,YAA6B,KAAmB,EAAmB,eAAgC;QAAtE,UAAK,GAAL,KAAK,CAAc;QAAmB,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAEhG,KAAK,CAAC,eAAe,CAAC,MAAc,EAAE,MAAoB,EAAE,KAAwB;QAC1F,OAAO,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAC7C,CAAC;IAEM,KAAK,CAAC,MAAM,CAClB,MAAc,EACd,MAAoB,EACpB,KAAwB,EACxB,YAA0B;QAE1B,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3C,OAAO,EAAE,CAAA;SACT;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QAC5F,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;~~QACxD~~,IAAI,CAAC,IAAI,EAAE;YACV,OAAO,IAAI,CAAA;SACX;QAED,OAAO,IAAI,CAAA;IACZ,CAAC;CACD;AAxBD,wDAwBC"}
1	+ {"version":3,"file":"ValidationDataSelector.js","sourceRoot":"","sources":["../../../src/input-validation/ValidationDataSelector.ts"],"names":[],"mappings":";;;AAKA,MAAa,sBAAsB;IAClC,YAA6B,KAAmB,EAAmB,eAAgC;QAAtE,UAAK,GAAL,KAAK,CAAc;QAAmB,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAEhG,KAAK,CAAC,eAAe,CAAC,MAAc,EAAE,MAAoB,EAAE,KAAwB;QAC1F,OAAO,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAC7C,CAAC;IAEM,KAAK,CAAC,MAAM,CAClB,MAAc,EACd,MAAoB,EACpB,KAAwB,EACxB,YAA0B;QAE1B,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3C,OAAO,EAAE,CAAA;SACT;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QAC5F,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,EAAE;YACV,OAAO,IAAI,CAAA;SACX;QAED,OAAO,IAAI,CAAA;IACZ,CAAC;CACD;AAxBD,wDAwBC"}

package/dist/src/mapper/Mapper.d.ts CHANGED Viewed

@@ -34,10 +34,10 @@ export declare class Mapper {
     readonly constraintHelper: ConstraintHelper;
     constructor(schema: Model.Schema, db: database.Client, predicatesInjector: PredicatesInjector, selectBuilderFactory: SelectBuilderFactory, uniqueWhereExpander: UniqueWhereExpander, whereBuilder: WhereBuilder, junctionTableManager: JunctionTableManager, deleteExecutor: DeleteExecutor, updater: Updater, inserter: Inserter, pathFactory: PathFactory);
     selectField(entity: Model.Entity, where: Input.UniqueWhere, fieldName: string): Promise<any>;
-    select(entity: Model.Entity, input: ObjectNode<Input.ListQueryInput>): Promise<SelectResultObject[]>;
-    select(entity: Model.Entity, input: ObjectNode<Input.ListQueryInput>, indexBy: string): Promise<SelectIndexedResultObjects>;
-    selectUnique(entity: Model.Entity, query: ObjectNode<Input.UniqueQueryInput>): Promise<SelectResultObject | null>;
-    selectGrouped(entity: Model.Entity, input: ObjectNode<Input.ListQueryInput>, relation: Model.JoiningColumnRelation & Model.Relation): Promise<import("./select").SelectGroupedObjects>;
+    select(entity: Model.Entity, input: ObjectNode<Input.ListQueryInput>, overRelation: Model.AnyRelation | null): Promise<SelectResultObject[]>;
+    select(entity: Model.Entity, input: ObjectNode<Input.ListQueryInput>, overRelation: Model.AnyRelation | null, indexBy: string): Promise<SelectIndexedResultObjects>;
+    selectUnique(entity: Model.Entity, query: ObjectNode<Input.UniqueQueryInput>, overRelation: Model.AnyRelation | null): Promise<SelectResultObject | null>;
+    selectGrouped(entity: Model.Entity, input: ObjectNode<Input.ListQueryInput>, relation: Model.JoiningColumnRelation & Model.AnyRelation): Promise<import("./select").SelectGroupedObjects>;
     private selectRows;
     count(entity: Model.Entity, filter: Input.OptionalWhere): Promise<any>;
     countGrouped(entity: Model.Entity, filter: Input.OptionalWhere, relation: Model.JoiningColumnRelation & Model.Relation): Promise<Record<string, number>>;

package/dist/src/mapper/Mapper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Mapper.d.ts","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEhD,OAAO,EAAkB,0BAA0B,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AACtC,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAiB,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AACjE,OAAO,EAA8B,kBAAkB,EAAE,MAAM,UAAU,CAAA;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAGnC,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAGtD,qBAAa,MAAM;IAOjB,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,EAAE,EAAE,QAAQ,CAAC,MAAM;IACnC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAhB7B,OAAO,CAAC,eAAe,CAA+C;IACtE,SAAgB,eAAe,yBAA+B;IAC9D,SAAgB,KAAK,QAAc;IACnC,SAAgB,gBAAgB,EAAE,gBAAgB,CAAA;gBAGhC,MAAM,EAAE,KAAK,CAAC,MAAM,EACrB,EAAE,EAAE,QAAQ,CAAC,MAAM,EAClB,kBAAkB,EAAE,kBAAkB,EACtC,oBAAoB,EAAE,oBAAoB,EAC1C,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,YAAY,EAC1B,oBAAoB,EAAE,oBAAoB,EAC1C,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW;IAK7B,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM;IAa7E,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;~~IACpG~~,MAAM,CAClB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EACvC,OAAO,EAAE,MAAM,GACb,OAAO,CAAC,0BAA0B,CAAC;~~IAmBzB~~,YAAY,CACxB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,gBAAgB,CAAC,~~GACvC~~,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAQxB,aAAa,CACzB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,EACvC,QAAQ,EAAE,KAAK,CAAC,qBAAqB,GAAG,KAAK,CAAC,~~QAAQ~~;~~YAYzC~~,UAAU;~~IAkBX~~,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,aAAa;IAWvD,YAAY,CACxB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,MAAM,EAAE,KAAK,CAAC,aAAa,EAC3B,QAAQ,EAAE,KAAK,CAAC,qBAAqB,GAAG,KAAK,CAAC,QAAQ,GACpD,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAiBrB,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAYtF,MAAM,CAClB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,EAAE,EAAE,KAAK,CAAC,WAAW,EACrB,IAAI,EAAE,KAAK,CAAC,eAAe,EAC3B,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,GAC1B,OAAO,CAAC,kBAAkB,CAAC;IAajB,cAAc,CAC1B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,EAAE,EAAE,KAAK,CAAC,WAAW,EACrB,eAAe,EAAE,MAAM,EAAE,EACzB,SAAS,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,GACzC,OAAO,CAAC,kBAAkB,CAAC;IAUjB,MAAM,CAClB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,EAAE,EAAE,KAAK,CAAC,WAAW,EACrB,MAAM,EAAE,KAAK,CAAC,eAAe,EAC7B,MAAM,EAAE,KAAK,CAAC,eAAe,EAC7B,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,GAC1B,OAAO,CAAC,kBAAkB,CAAC;IAgBjB,MAAM,CAClB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,EAAE,EAAE,KAAK,CAAC,WAAW,GAAG,cAAc,EACtC,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,GAC1B,OAAO,CAAC,kBAAkB,CAAC;IAOjB,eAAe,CAC3B,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,QAAQ,EAAE,KAAK,CAAC,yBAAyB,EACzC,aAAa,EAAE,KAAK,CAAC,YAAY,EACjC,cAAc,EAAE,KAAK,CAAC,YAAY,GAChC,OAAO,CAAC,kBAAkB,CAAC;IAUjB,kBAAkB,CAC9B,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,QAAQ,EAAE,KAAK,CAAC,yBAAyB,EACzC,aAAa,EAAE,KAAK,CAAC,YAAY,EACjC,cAAc,EAAE,KAAK,CAAC,YAAY,GAChC,OAAO,CAAC,kBAAkB,CAAC;IAUjB,eAAe,CAC3B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,KAAK,EAAE,KAAK,CAAC,WAAW,GAAG,cAAc,GACvC,OAAO,CAAC,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC;IAkB1C,OAAO,CAAC,SAAS;CAGjB;AAED,oBAAY,aAAa,GAAG,CAAC,EAAE,EAAE,MAAM,KAAK,MAAM,CAAA"}
1	+ {"version":3,"file":"Mapper.d.ts","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":"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"}

package/dist/src/mapper/Mapper.js CHANGED Viewed

@@ -40,7 +40,7 @@ class Mapper {
         const result = await builtQb.getResult(this.db);
         return result[0] !== undefined ? result[0][columnName] : undefined;
     }
-    async select(entity, input, indexBy) {
+    async select(entity, input, overRelation, indexBy) {
         const hydrator = new select_1.SelectHydrator();
         let qb = database_1.SelectBuilder.create();
         let indexByAlias = null;
@@ -49,14 +49,14 @@ class Mapper {
             indexByAlias = path.for(indexBy).alias;
             qb = qb.select([path.alias, (0, schema_utils_1.getColumnName)(this.schema, entity, indexBy)], indexByAlias);
         }
-        const rows = await this.selectRows(hydrator, qb, entity, input);
+        const rows = await this.selectRows(hydrator, qb, entity, input, overRelation);
         return await (indexByAlias !== null ? hydrator.hydrateAll(rows, indexByAlias) : hydrator.hydrateAll(rows));
     }
-    async selectUnique(entity, query) {
+    async selectUnique(entity, query, overRelation) {
         const uniqueWhere = this.uniqueWhereExpander.expand(entity, query.args.by);
         const where = query.args.filter ? { and: [uniqueWhere, query.args.filter] } : uniqueWhere;
         const queryExpanded = query.withArg('filter', where);
-        return (await this.select(entity, queryExpanded))[0] || null;
+        return (await this.select(entity, queryExpanded, overRelation))[0] || null;
     }
     async selectGrouped(entity, input, relation) {
         const hydrator = new select_1.SelectHydrator();
@@ -64,15 +64,15 @@ class Mapper {
         const path = this.pathFactory.create([]);
         const groupingKey = '__grouping_key';
         qb = qb.select([path.alias, relation.joiningColumn.columnName], groupingKey);
-        const rows = await this.selectRows(hydrator, qb, entity, input, relation.name);
+        const rows = await this.selectRows(hydrator, qb, entity, input, relation, relation.name);
         return await hydrator.hydrateGroups(rows, groupingKey);
     }
-    async selectRows(hydrator, qb, entity, input, groupBy) {
+    async selectRows(hydrator, qb, entity, input, overRelation, groupBy) {
         const inputWithOrder = select_2.OrderByHelper.appendDefaultOrderBy(entity, input, []);
         const path = this.pathFactory.create([]);
         const augmentedBuilder = qb.from(entity.tableName, path.alias).meta('path', [...input.path, input.alias]);
         const selector = this.selectBuilderFactory.create(augmentedBuilder, hydrator);
-        const filterWithPredicates = this.predicatesInjector.inject(entity, inputWithOrder.args.filter || {});
+        const filterWithPredicates = this.predicatesInjector.inject(entity, inputWithOrder.args.filter || {}, overRelation !== null && overRelation !== void 0 ? overRelation : undefined);
         const inputWithPredicates = inputWithOrder.withArg('filter', filterWithPredicates);
         selector.select(this, entity, inputWithPredicates, path, groupBy);
         return await selector.execute(this.db);

package/dist/src/mapper/Mapper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Mapper.js","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":";;;AACA,0DAAuD;AACvD,qCAAyF;AAGzF,kDAA2D;AAK3D,qCAAiE;AACjE,qCAAyE;AAGzE,6CAA0C;AAC1C,qCAAwC;AAGxC,oCAAgC;AAChC,qDAAiD;AACjD,kDAAsD;AACtD,4CAAsD;AAEtD,MAAa,MAAM;IAMlB,YACkB,MAAoB,EACrB,EAAmB,EAClB,kBAAsC,EACtC,oBAA0C,EAC1C,mBAAwC,EACxC,YAA0B,EAC1B,oBAA0C,EAC1C,cAA8B,EAC9B,OAAgB,EAChB,QAAkB,EAClB,WAAwB;QAVxB,WAAM,GAAN,MAAM,CAAc;QACrB,OAAE,GAAF,EAAE,CAAiB;QAClB,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,YAAO,GAAP,OAAO,CAAS;QAChB,aAAQ,GAAR,QAAQ,CAAU;QAClB,gBAAW,GAAX,WAAW,CAAa;QAhBlC,oBAAe,GAA6C,EAAE,CAAA;QACtD,oBAAe,GAAG,IAAI,+BAAsB,EAAE,CAAA;QAC9C,UAAK,GAAG,IAAI,aAAK,EAAE,CAAA;QAgBlC,IAAI,CAAC,gBAAgB,GAAG,IAAI,2BAAgB,CAAC,EAAE,CAAC,CAAA;IACjD,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,MAAoB,EAAE,KAAwB,EAAE,SAAiB;QACzF,MAAM,UAAU,GAAG,IAAA,4BAAa,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;QAEhE,MAAM,EAAE,GAAG,wBAAa,CAAC,MAAM,EAAE,CAAC,EAAE;aAClC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC;aAC/B,MAAM,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAA;QAC/B,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACpE,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAA;QAC/F,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAE/C,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACnE,CAAC;~~IAQM~~,KAAK,CAAC,MAAM,CAClB,MAAoB,EACpB,KAAuC,EACvC,OAAgB;QAEhB,MAAM,QAAQ,GAAG,IAAI,uBAAc,EAAE,CAAA;QACrC,IAAI,EAAE,GAAwC,wBAAa,CAAC,MAAM,EAAE,CAAA;QACpE,IAAI,YAAY,GAAkB,IAAI,CAAA;QACtC,IAAI,OAAO,EAAE;YACZ,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACxC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,CAAA;YACtC,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,IAAA,4BAAa,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,YAAY,CAAC,CAAA;SACvF;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;~~QAE/D~~,OAAO,MAAM,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3G,CAAC;IAEM,KAAK,CAAC,YAAY,CACxB,MAAoB,EACpB,KAAyC;~~QAEzC~~,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC1E,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAA;QACzF,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAuB,QAAQ,EAAE,KAAK,CAAC,CAAA;QAE1E,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;~~IAC7D~~,CAAC;IAEM,KAAK,CAAC,aAAa,CACzB,MAAoB,EACpB,KAAuC,EACvC,~~QAAsD~~;~~QAEtD~~,MAAM,QAAQ,GAAG,IAAI,uBAAc,EAAE,CAAA;QACrC,IAAI,EAAE,GAAwC,wBAAa,CAAC,MAAM,EAAE,CAAA;QACpE,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QACxC,MAAM,WAAW,GAAG,gBAAgB,CAAA;QACpC,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,CAAA;QAE5E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;~~QAC9E~~,OAAO,MAAM,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;IACvD,CAAC;IAEO,KAAK,CAAC,UAAU,CACvB,QAAwB,EACxB,EAAuC,EACvC,MAAoB,EACpB,KAAuC,EACvC,OAAgB;QAEhB,MAAM,cAAc,GAAG,sBAAa,CAAC,oBAAoB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;QAC5E,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QACxC,MAAM,gBAAgB,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;QAEzG,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAA;QAC7E,MAAM,oBAAoB,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;~~QACrG~~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~~AA3QD~~,~~wBA2QC~~"}
1	+ {"version":3,"file":"Mapper.js","sourceRoot":"","sources":["../../../src/mapper/Mapper.ts"],"names":[],"mappings":"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"}

package/dist/src/mapper/MapperContainer.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MapperContainer.d.ts","sourceRoot":"","sources":["../../../src/mapper/MapperContainer.ts"],"names":[],"mappings":"AAYA,OAAO,EAON,MAAM,EACN,aAAa,EAOb,MAAM,WAAW,CAAA;AAElB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAoC,MAAM,qBAAqB,CAAA;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;~~AAInD~~,aAAK,mBAAmB,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,GAAG,CAAC,YAAY,CAAA;IACnC,WAAW,EAAE,GAAG,CAAC,WAAW,CAAA;IAC5B,SAAS,EAAE,SAAS,CAAA;CACpB,CAAA;AAED,MAAM,WAAW,eAAe;IAC/B,aAAa,EAAE,aAAa,CAAA;CAC5B;AAED,eAAO,MAAM,qBAAqB,0DAA2D,mBAAmB;~~wBAqEjG~~,MAAM;EAgBpB,CAAA"}
1	+ {"version":3,"file":"MapperContainer.d.ts","sourceRoot":"","sources":["../../../src/mapper/MapperContainer.ts"],"names":[],"mappings":"AAYA,OAAO,EAON,MAAM,EACN,aAAa,EAOb,MAAM,WAAW,CAAA;AAElB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAoC,MAAM,qBAAqB,CAAA;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAMnD,aAAK,mBAAmB,GAAG;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,GAAG,CAAC,YAAY,CAAA;IACnC,WAAW,EAAE,GAAG,CAAC,WAAW,CAAA;IAC5B,SAAS,EAAE,SAAS,CAAA;CACpB,CAAA;AAED,MAAM,WAAW,eAAe;IAC/B,aAAa,EAAE,aAAa,CAAA;CAC5B;AAED,eAAO,MAAM,qBAAqB,0DAA2D,mBAAmB;wBAuEjG,MAAM;EAgBpB,CAAA"}