@contember/engine-content-api 1.2.0-alpha.12 → 1.2.0-alpha.14

package/dist/src/mapper/select/handlers/FieldsVisitor.js

@@ -14,18 +14,11 @@ class FieldsVisitor {
     }
     visitColumn({ entity, column }) {
         const columnPath = this.executionContext.path;
-        this.executionContext.addColumn(qb => {
-            const tableAlias = columnPath.back().alias;
-            const columnAlias = columnPath.alias;
-            const fieldPredicate = this.predicateFactory.shouldApplyCellLevelPredicate(entity, schema_1.Acl.Operation.read, column.name)
-                ? this.predicateFactory.create(entity, schema_1.Acl.Operation.read, [column.name])
-                : undefined;
-            if (!fieldPredicate || Object.keys(fieldPredicate).length === 0) {
-                return qb.select([tableAlias, column.columnName], columnAlias);
-            }
-            return this.whereBuilder.buildAdvanced(entity, columnPath.back(), fieldPredicate, cb => qb.select(expr => expr.case(caseExpr => caseExpr
-                .when(whenExpr => whenExpr.selectCondition(cb), thenExpr => thenExpr.select([tableAlias, column.columnName]))
-                .else(elseExpr => elseExpr.raw('null'))), columnAlias));
+        const tableAlias = columnPath.back().alias;
+        const columnAlias = columnPath.alias;
+        this.executionContext.addColumn({
+            query: qb => qb.select([tableAlias, column.columnName], columnAlias),
+            predicate: this.getRequiredPredicate(entity, column),
         });
     }
     visitManyHasManyInverse(relationContext) {
@@ -33,107 +26,141 @@ class FieldsVisitor {
         if (!field) {
             throw new Error();
         }
-        this.executionContext.addData(relationContext.entity.primary, async (ids) => this.relationFetcher.fetchManyHasManyGroups({
-            mapper: this.mapper,
-            field: field,
-            relationContext,
-            relationPath: this.relationPath,
-            ids: ids,
-        }), []);
+        this.executionContext.addData({
+            field: relationContext.entity.primary,
+            dataProvider: async (ids) => this.relationFetcher.fetchManyHasManyGroups({
+                mapper: this.mapper,
+                field: field,
+                relationContext,
+                relationPath: this.relationPath,
+                ids: ids,
+            }),
+            defaultValue: [],
+            predicate: this.getRequiredPredicate(relationContext.entity, relationContext.relation),
+        });
     }
     visitManyHasManyOwning(relationContext) {
         const field = this.executionContext.objectNode;
         if (!field) {
             throw new Error();
         }
-        this.executionContext.addData(relationContext.entity.primary, async (ids) => this.relationFetcher.fetchManyHasManyGroups({
-            mapper: this.mapper,
-            field: field,
-            relationContext,
-            relationPath: this.relationPath,
-            ids: ids,
-        }), []);
+        this.executionContext.addData({
+            field: relationContext.entity.primary,
+            dataProvider: async (ids) => this.relationFetcher.fetchManyHasManyGroups({
+                mapper: this.mapper,
+                field: field,
+                relationContext,
+                relationPath: this.relationPath,
+                ids: ids,
+            }),
+            defaultValue: [],
+            predicate: this.getRequiredPredicate(relationContext.entity, relationContext.relation),
+        });
     }
     visitOneHasMany(relationContext) {
         const field = this.executionContext.objectNode;
         if (!field) {
             throw new Error();
         }
-        this.executionContext.addData(relationContext.entity.primary, async (ids) => this.relationFetcher.fetchOneHasManyGroups({
-            mapper: this.mapper,
-            objectNode: field,
-            relationContext,
-            relationPath: this.relationPath,
-            ids: ids,
-        }), []);
+        this.executionContext.addData({
+            field: relationContext.entity.primary,
+            dataProvider: async (ids) => this.relationFetcher.fetchOneHasManyGroups({
+                mapper: this.mapper,
+                objectNode: field,
+                relationContext,
+                relationPath: this.relationPath,
+                ids: ids,
+            }),
+            defaultValue: [],
+            predicate: this.getRequiredPredicate(relationContext.entity, relationContext.relation),
+        });
     }
     visitOneHasOneInverse(relationContext) {
         const { entity, targetRelation, targetEntity } = relationContext;
-        this.executionContext.addData(entity.primary, async (ids) => {
-            const idsWhere = {
-                [targetRelation.name]: {
-                    [entity.primary]: {
-                        in: ids,
+        this.executionContext.addData({
+            field: entity.primary,
+            dataProvider: async (ids) => {
+                const idsWhere = {
+                    [targetRelation.name]: {
+                        [entity.primary]: {
+                            in: ids,
+                        },
                     },
-                },
-            };
-            const field = this.executionContext.objectNode;
-            if (!field) {
-                throw new Error();
-            }
-            const where = {
-                and: [idsWhere, field.args.filter].filter((it) => it !== undefined),
-            };
-            const objectWithWhere = field.withArg('filter', where);
-            return this.mapper.selectAssoc(targetEntity, objectWithWhere, [
-                ...this.relationPath,
-                relationContext,
-            ], targetRelation.name);
-        }, null);
+                };
+                const field = this.executionContext.objectNode;
+                if (!field) {
+                    throw new Error();
+                }
+                const where = {
+                    and: [idsWhere, field.args.filter].filter((it) => it !== undefined),
+                };
+                const objectWithWhere = field.withArg('filter', where);
+                return this.mapper.selectAssoc(targetEntity, objectWithWhere, [
+                    ...this.relationPath,
+                    relationContext,
+                ], targetRelation.name);
+            },
+            defaultValue: null,
+            predicate: this.getRequiredPredicate(relationContext.entity, relationContext.relation),
+        });
     }
     visitOneHasOneOwning(relationContext) {
         const { relation, targetEntity } = relationContext;
-        this.executionContext.addData(relation.name, async (ids) => {
-            const idsWhere = {
-                [targetEntity.primary]: {
-                    in: ids,
-                },
-            };
-            const objectNode = this.executionContext.objectNode;
-            if (!objectNode) {
-                throw new Error();
-            }
-            const where = {
-                and: [idsWhere, objectNode.args.filter].filter((it) => it !== undefined),
-            };
-            const objectWithWhere = objectNode.withArg('filter', where);
-            return this.mapper.selectAssoc(targetEntity, objectWithWhere, [
-                ...this.relationPath,
-                relationContext,
-            ], targetEntity.primary);
-        }, null);
+        this.executionContext.addData({
+            field: relation.name,
+            dataProvider: async (ids) => {
+                const idsWhere = {
+                    [targetEntity.primary]: {
+                        in: ids,
+                    },
+                };
+                const objectNode = this.executionContext.objectNode;
+                if (!objectNode) {
+                    throw new Error();
+                }
+                const where = {
+                    and: [idsWhere, objectNode.args.filter].filter((it) => it !== undefined),
+                };
+                const objectWithWhere = objectNode.withArg('filter', where);
+                return this.mapper.selectAssoc(targetEntity, objectWithWhere, [
+                    ...this.relationPath,
+                    relationContext,
+                ], targetEntity.primary);
+            },
+            defaultValue: null,
+            predicate: this.getRequiredPredicate(relationContext.entity, relationContext.relation),
+        });
     }
     visitManyHasOne(relationContext) {
         const { relation, targetEntity } = relationContext;
-        this.executionContext.addData(relation.name, async (ids) => {
-            const idsWhere = {
-                [targetEntity.primary]: {
-                    in: ids,
-                },
-            };
-            const objectNode = this.executionContext.objectNode;
-            if (!objectNode) {
-                throw new Error();
-            }
-            const where = {
-                and: [idsWhere, objectNode.args.filter].filter((it) => it !== undefined),
-            };
-            const objectWithWhere = objectNode.withArg('filter', where);
-            return this.mapper.selectAssoc(targetEntity, objectWithWhere, [
-                ...this.relationPath,
-                relationContext,
-            ], targetEntity.primary);
-        }, null);
+        this.executionContext.addData({
+            field: relation.name,
+            dataProvider: async (ids) => {
+                const idsWhere = {
+                    [targetEntity.primary]: {
+                        in: ids,
+                    },
+                };
+                const objectNode = this.executionContext.objectNode;
+                if (!objectNode) {
+                    throw new Error();
+                }
+                const where = {
+                    and: [idsWhere, objectNode.args.filter].filter((it) => it !== undefined),
+                };
+                const objectWithWhere = objectNode.withArg('filter', where);
+                return this.mapper.selectAssoc(targetEntity, objectWithWhere, [
+                    ...this.relationPath,
+                    relationContext,
+                ], targetEntity.primary);
+            },
+            defaultValue: null,
+            predicate: this.getRequiredPredicate(relationContext.entity, relationContext.relation),
+        });
+    }
+    getRequiredPredicate(entity, field) {
+        const fieldPredicate = this.predicateFactory.getFieldPredicate(entity, schema_1.Acl.Operation.read, field.name);
+        return fieldPredicate.isSameAsPrimary ? undefined : fieldPredicate.predicate;
     }
 }
 exports.FieldsVisitor = FieldsVisitor;

package/dist/src/mapper/select/handlers/FieldsVisitor.js.map

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

package/dist/src/mapper/select/handlers/MetaHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MetaHandler.d.ts","sourceRoot":"","sources":["../../../../../src/mapper/select/handlers/MetaHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAA;AAGjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAG9C,qBAAa,WAAY,YAAW,sBAAsB,CAAC,EAAE,CAAC;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY;IAAgB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAA7D,YAAY,EAAE,YAAY,EAAmB,gBAAgB,EAAE,gBAAgB;IAE5G,OAAO,CAAC,OAAO,EAAE,6BAA6B,GAAG,IAAI;IAkBrD,OAAO,CAAC,WAAW;CA2BnB"}
+{"version":3,"file":"MetaHandler.d.ts","sourceRoot":"","sources":["../../../../../src/mapper/select/handlers/MetaHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAA;AAGjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAG9C,qBAAa,WAAY,YAAW,sBAAsB,CAAC,EAAE,CAAC;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY;IAAgB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAA7D,YAAY,EAAE,YAAY,EAAmB,gBAAgB,EAAE,gBAAgB;IAE5G,OAAO,CAAC,OAAO,EAAE,6BAA6B,GAAG,IAAI;IAkBrD,OAAO,CAAC,WAAW;CAgBnB"}

package/dist/src/mapper/select/handlers/MetaHandler.js

@@ -25,20 +25,15 @@ class MetaHandler {
         }
     }
     addMetaFlag(context, fieldName, metaPath, operation) {
-        const { entity, path } = context;
+        const { entity } = context;
         if (entity.primary === fieldName) {
             return;
         }
-        const fieldPredicate = this.predicateFactory.create(entity, operation, [fieldName]);
-        context.addColumn(qb => {
-            return this.whereBuilder.buildAdvanced(entity, path.back(), fieldPredicate, cb => qb.select(expr => expr.selectCondition(condition => {
-                condition = cb(condition);
-                if (condition.isEmpty()) {
-                    return condition.raw('true');
-                }
-                return condition;
-            }), metaPath.alias));
-        }, metaPath);
+        const fieldPredicate = this.predicateFactory.getFieldPredicate(entity, operation, fieldName);
+        context.addColumn({
+            path: metaPath,
+            valueGetter: context.addPredicate(fieldPredicate.predicate),
+        });
     }
 }
 exports.MetaHandler = MetaHandler;

package/dist/src/mapper/select/handlers/MetaHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"MetaHandler.js","sourceRoot":"","sources":["../../../../../src/mapper/select/handlers/MetaHandler.ts"],"names":[],"mappings":";;;AAEA,8CAA8C;AAK9C,MAAa,WAAW;IACvB,YAA6B,YAA0B,EAAmB,gBAAkC;QAA/E,iBAAY,GAAZ,YAAY,CAAc;QAAmB,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAEhH,OAAO,CAAC,OAAsC;QAC7C,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;QACpC,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,KAAK,IAAI,SAAS,IAAI,UAAU,CAAC,MAAM,EAAE;YACxC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YAC5C,KAAK,IAAI,QAAQ,IAAK,SAAwB,CAAC,MAAM,EAAE;gBACtD,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAK,CAAC,SAAS,CAAC,SAAS,EAAE;oBAChD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;iBAC/F;gBACD,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;oBAC/C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;iBAC7F;aACD;SACD;IACF,CAAC;IAEO,WAAW,CAClB,OAAsC,EACtC,SAAiB,EACjB,QAAc,EACd,SAAoD;QAEpD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;QAChC,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE;YACjC,OAAM;SACN;QACD,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,CAAC,CAAA;QACnF,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;YACtB,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,EAAE,cAAc,EAAE,EAAE,CAAC,EAAE,CAChF,EAAE,CAAC,MAAM,CACR,IAAI,CAAC,EAAE,CACN,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;gBAChC,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;gBACzB,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE;oBACxB,OAAO,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;iBAC5B;gBACD,OAAO,SAAS,CAAA;YACjB,CAAC,CAAC,EACH,QAAQ,CAAC,KAAK,CACd,CACD,CAAA;QACF,CAAC,EAAE,QAAQ,CAAC,CAAA;IACb,CAAC;CACD;AAhDD,kCAgDC"}
+{"version":3,"file":"MetaHandler.js","sourceRoot":"","sources":["../../../../../src/mapper/select/handlers/MetaHandler.ts"],"names":[],"mappings":";;;AAEA,8CAA8C;AAK9C,MAAa,WAAW;IACvB,YAA6B,YAA0B,EAAmB,gBAAkC;QAA/E,iBAAY,GAAZ,YAAY,CAAc;QAAmB,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAEhH,OAAO,CAAC,OAAsC;QAC7C,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;QACpC,IAAI,CAAC,UAAU,EAAE;YAChB,MAAM,IAAI,KAAK,EAAE,CAAA;SACjB;QACD,KAAK,IAAI,SAAS,IAAI,UAAU,CAAC,MAAM,EAAE;YACxC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;YAC5C,KAAK,IAAI,QAAQ,IAAK,SAAwB,CAAC,MAAM,EAAE;gBACtD,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAK,CAAC,SAAS,CAAC,SAAS,EAAE;oBAChD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;iBAC/F;gBACD,IAAI,QAAQ,CAAC,IAAI,KAAK,cAAK,CAAC,SAAS,CAAC,QAAQ,EAAE;oBAC/C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;iBAC7F;aACD;SACD;IACF,CAAC;IAEO,WAAW,CAClB,OAAsC,EACtC,SAAiB,EACjB,QAAc,EACd,SAAoD;QAEpD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;QAC1B,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE;YACjC,OAAM;SACN;QACD,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;QAC5F,OAAO,CAAC,SAAS,CAAC;YACjB,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,SAAS,CAAC;SAC3D,CAAC,CAAA;IACH,CAAC;CACD;AArCD,kCAqCC"}

package/dist/src/mapper/select/optimizer/WhereOptimizer.d.ts

@@ -1,11 +1,15 @@
 import { Input, Model } from '@contember/schema';
 import { ConditionOptimizer } from './ConditionOptimizer';
+export interface WhereOptimizationHints {
+    relationPath?: Model.AnyRelationContext[];
+    evaluatedPredicates?: Input.OptionalWhere[];
+}
 export declare class WhereOptimizer {
     private readonly model;
     private readonly conditionOptimizer;
     private static eliminableRelations;
     constructor(model: Model.Schema, conditionOptimizer: ConditionOptimizer);
-    optimize(where: Input.OptionalWhere, entity: Model.Entity, relationPath?: Model.AnyRelationContext[]): Input.Where;
+    optimize(where: Input.OptionalWhere, entity: Model.Entity, { relationPath, evaluatedPredicates }?: WhereOptimizationHints): Input.OptionalWhere;
     private optimizeWhere;
     private optimizeOr;
     private optimizeAnd;

package/dist/src/mapper/select/optimizer/WhereOptimizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WhereOptimizer.d.ts","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereOptimizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAYzD,qBAAa,cAAc;IAIzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAJpC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAmG;gBAGnH,KAAK,EAAE,KAAK,CAAC,MAAM,EACnB,kBAAkB,EAAE,kBAAkB;IAIjD,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,GAAE,KAAK,CAAC,kBAAkB,EAAO,GAAG,KAAK,CAAC,KAAK;IAoB7H,OAAO,CAAC,aAAa;IAwBrB,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,aAAa;IAiBrB,OAAO,CAAC,iBAAiB;CAoCzB"}
+{"version":3,"file":"WhereOptimizer.d.ts","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereOptimizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAYzD,MAAM,WAAW,sBAAsB;IACtC,YAAY,CAAC,EAAE,KAAK,CAAC,kBAAkB,EAAE,CAAA;IACzC,mBAAmB,CAAC,EAAE,KAAK,CAAC,aAAa,EAAE,CAAA;CAC3C;AAID,qBAAa,cAAc;IAIzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAJpC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAmG;gBAGnH,KAAK,EAAE,KAAK,CAAC,MAAM,EACnB,kBAAkB,EAAE,kBAAkB;IAIjD,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,YAAiB,EAAE,mBAAwB,EAAE,GAAE,sBAA2B,GAAG,KAAK,CAAC,aAAa;IA+BpK,OAAO,CAAC,aAAa;IAiDrB,OAAO,CAAC,UAAU;IAYlB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,iBAAiB;CAqCzB"}

package/dist/src/mapper/select/optimizer/WhereOptimizer.js

@@ -9,7 +9,7 @@ class WhereOptimizer {
         this.model = model;
         this.conditionOptimizer = conditionOptimizer;
     }
-    optimize(where, entity, relationPath = []) {
+    optimize(where, entity, { relationPath = [], evaluatedPredicates = [] } = {}) {
         let processedRelationPath = [];
         for (const i in relationPath) {
             const el = relationPath[i];
@@ -17,34 +17,74 @@ class WhereOptimizer {
                 processedRelationPath = [];
             }
             else {
-                processedRelationPath.push({ ...el, canEliminate: true, isLast: Number(i) === relationPath.length });
+                processedRelationPath.push({ context: el, canEliminate: true, isLast: Number(i) === relationPath.length });
             }
-            processedRelationPath.push({ ...el, canEliminate: true, isLast: Number(i) === relationPath.length });
         }
-        const result = this.optimizeWhere(where, entity, processedRelationPath);
+        let result = this.optimizeWhere(where, entity, processedRelationPath);
         if (typeof result === 'boolean') {
             return { [entity.primary]: { [result ? 'always' : 'never']: true } };
         }
+        let changed = false;
+        for (const evaluated of evaluatedPredicates) {
+            const evaluatedPredicate = this.optimize(evaluated, entity);
+            const newResult = (0, WhereReplacer_1.replaceWhere)(result, evaluatedPredicate, { [entity.primary]: { always: true } });
+            if (newResult !== result) {
+                result = newResult;
+                changed = true;
+            }
+        }
+        if (changed) {
+            return this.optimize(result, entity);
+        }
         return result;
     }
     optimizeWhere(where, entity, relationPath) {
-        return this.optimizeAnd(Object.entries(where).map(([key, value]) => {
+        const operands = [];
+        for (const key in where) {
+            const value = where[key];
+            let operand = undefined;
             if (value === undefined || value === null) {
-                return undefined;
+                continue;
             }
             else if (key === 'and') {
-                return this.optimizeAnd(value.map(it => this.optimizeWhere(it, entity, relationPath)), entity, relationPath);
+                const innerOperands = [];
+                for (const innerValue of value) {
+                    const innerOperand = this.optimizeWhere(innerValue, entity, relationPath);
+                    if (innerOperand === false) {
+                        return false;
+                    }
+                    innerOperands.push(innerOperand);
+                }
+                operand = this.optimizeAnd(innerOperands, entity, relationPath);
             }
             else if (key === 'or') {
-                return this.optimizeOr(value.map(it => this.optimizeWhere(it, entity, relationPath)), entity, relationPath);
+                const innerOperands = [];
+                for (const innerValue of value) {
+                    const innerOperand = this.optimizeWhere(innerValue, entity, relationPath);
+                    if (innerOperand === true) {
+                        operand = true;
+                        break;
+                    }
+                    innerOperands.push(innerOperand);
+                }
+                if (operand !== true) {
+                    operand = this.optimizeOr(innerOperands, entity, relationPath);
+                }
             }
             else if (key === 'not') {
-                return (0, helpers_1.optimizeNot)(this.optimizeWhere(value, entity, relationPath));
+                operand = (0, helpers_1.optimizeNot)(this.optimizeWhere(value, entity, relationPath));
             }
             else {
-                return this.resolveFieldValue(entity, key, value, relationPath);
+                operand = this.resolveFieldValue(entity, key, value, relationPath);
             }
-        }), entity, relationPath);
+            if (operand === false) {
+                return false;
+            }
+            else if (operand !== undefined) {
+                operands.push(operand);
+            }
+        }
+        return this.optimizeAnd(operands, entity, relationPath);
     }
     optimizeOr(operands, entity, relationPath) {
         const optimized = (0, helpers_1.optimizeOr)(operands);
@@ -52,6 +92,9 @@ class WhereOptimizer {
             return optimized;
         }
         const result = this.crossOptimize(optimized.or, entity, { never: true }, relationPath);
+        if (result === optimized.or) {
+            return optimized;
+        }
         return (0, helpers_1.optimizeOr)(result);
     }
     optimizeAnd(operands, entity, relationPath) {
@@ -60,19 +103,28 @@ class WhereOptimizer {
             return optimized;
         }
         const result = this.crossOptimize(optimized.and, entity, { always: true }, relationPath);
+        if (result === optimized.and) {
+            return optimized;
+        }
         return (0, helpers_1.optimizeAnd)(result);
     }
     crossOptimize(operands, entity, replacement, relationPath) {
-        const result = [...operands];
+        let result = operands;
+        let copied = false;
         const count = result.length;
         for (let i = 0; i < count; i++) {
             for (let j = 0; j < count; j++) {
                 const a = result[j];
                 const b = result[i];
                 if (i !== j && typeof a !== 'boolean' && typeof b !== 'boolean') {
-                    const tracker = { count: 0 };
-                    const elResult = (0, WhereReplacer_1.replaceWhere)(a, b, { [entity.primary]: replacement }, tracker);
-                    result[j] = tracker.count > 0 ? this.optimizeWhere(elResult, entity, relationPath) : elResult;
+                    const elResult = (0, WhereReplacer_1.replaceWhere)(a, b, { [entity.primary]: replacement });
+                    if (elResult !== a) {
+                        if (!copied) {
+                            result = [...result];
+                            copied = true;
+                        }
+                        result[j] = this.optimizeWhere(elResult, entity, relationPath);
+                    }
                 }
             }
         }
@@ -89,22 +141,23 @@ class WhereOptimizer {
             },
             visitRelation: context => {
                 var _a;
-                const { targetEntity, relation } = context;
                 let where = value;
                 const newRelationPath = [...relationPath];
-                if (relationPath.length && ((_a = relationPath[relationPath.length - 1].targetRelation) === null || _a === void 0 ? void 0 : _a.name) === relation.name) {
+                const length = relationPath.length;
+                if (length > 0 && ((_a = relationPath[length - 1].context.targetRelation) === null || _a === void 0 ? void 0 : _a.name) === context.relation.name) {
                     const item = newRelationPath.pop();
-                    if ((item === null || item === void 0 ? void 0 : item.canEliminate) && (item.type === 'oneHasMany' || item.type === 'oneHasOneOwning' || item.type === 'oneHasOneInverse')) {
-                        where = (0, WhereReplacer_1.replaceWhere)(where, { [targetEntity.primary]: { isNull: true } }, { [targetEntity.primary]: { never: true } });
-                        where = (0, WhereReplacer_1.replaceWhere)(where, { [targetEntity.primary]: { isNull: false } }, { [targetEntity.primary]: { always: true } });
+                    const type = item.context.type;
+                    if ((item === null || item === void 0 ? void 0 : item.canEliminate) && (type === 'oneHasMany' || type === 'oneHasOneOwning' || type === 'oneHasOneInverse')) {
+                        where = (0, WhereReplacer_1.replaceWhere)(where, { [context.targetEntity.primary]: { isNull: true } }, { [context.targetEntity.primary]: { never: true } });
+                        where = (0, WhereReplacer_1.replaceWhere)(where, { [context.targetEntity.primary]: { isNull: false } }, { [context.targetEntity.primary]: { always: true } });
                     }
                 }
                 else {
                     // first level relation - we are sure root exists
-                    const canEliminate = relationPath.length === 0 || relationPath[relationPath.length - 1].isLast;
-                    newRelationPath.push({ ...context, isLast: false, canEliminate });
+                    const canEliminate = length === 0 || relationPath[length - 1].isLast;
+                    newRelationPath.push({ context, isLast: false, canEliminate });
                 }
-                const optimizedWhere = this.optimizeWhere(where, targetEntity, newRelationPath);
+                const optimizedWhere = this.optimizeWhere(where, context.targetEntity, newRelationPath);
                 if (typeof optimizedWhere === 'boolean') {
                     return optimizedWhere;
                 }

package/dist/src/mapper/select/optimizer/WhereOptimizer.js.map

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

package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts

@@ -1,6 +1,3 @@
 import { Input } from '@contember/schema';
-export interface ReplaceWhereResult {
-    count: number;
-}
-export declare const replaceWhere: (subject: Input.Where, find: Input.Where, replace: Input.Where, resultTracker?: ReplaceWhereResult) => Input.Where;
+export declare const replaceWhere: (subject: Input.OptionalWhere, find: Input.OptionalWhere, replace: Input.OptionalWhere) => Input.OptionalWhere;
 //# sourceMappingURL=WhereReplacer.d.ts.map

package/dist/src/mapper/select/optimizer/WhereReplacer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WhereReplacer.d.ts","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereReplacer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAGnD,MAAM,WAAW,kBAAkB;IAClC,KAAK,EAAE,MAAM,CAAA;CACb;AAED,eAAO,MAAM,YAAY,YAAa,MAAM,KAAK,QAAQ,MAAM,KAAK,WAAW,MAAM,KAAK,kBAAiB,kBAAkB,KAAkB,MAAM,KAmBpJ,CAAA"}
+{"version":3,"file":"WhereReplacer.d.ts","sourceRoot":"","sources":["../../../../../src/mapper/select/optimizer/WhereReplacer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAY,MAAM,mBAAmB,CAAA;AAGnD,eAAO,MAAM,YAAY,YAAa,MAAM,aAAa,QAAQ,MAAM,aAAa,WAAW,MAAM,aAAa,KAAG,MAAM,aAmC1H,CAAA"}

package/dist/src/mapper/select/optimizer/WhereReplacer.js

@@ -5,21 +5,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceWhere = void 0;
 const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
-const replaceWhere = (subject, find, replace, resultTracker = { count: 0 }) => {
+const replaceWhere = (subject, find, replace) => {
     if ((0, fast_deep_equal_1.default)(subject, find)) {
-        resultTracker.count++;
         return replace;
     }
-    const result = {};
-    for (const [key, value] of Object.entries(subject)) {
+    let result = subject;
+    let copied = false;
+    for (const key in subject) {
+        const value = subject[key];
         if (key === 'not') {
-            result['not'] = (0, exports.replaceWhere)(value, find, replace, resultTracker);
+            const newNot = (0, exports.replaceWhere)(value, find, replace);
+            if (newNot !== value) {
+                if (!copied) {
+                    result = { ...result };
+                }
+                result['not'] = newNot;
+            }
         }
         else if (key === 'and' || key === 'or') {
-            result[key] = value.map(it => (0, exports.replaceWhere)(it, find, replace, resultTracker));
-        }
-        else {
-            result[key] = value;
+            const items = [];
+            let itemChanged = false;
+            for (const el of value) {
+                const newEl = (0, exports.replaceWhere)(el, find, replace);
+                if (newEl !== el) {
+                    itemChanged = true;
+                }
+                items.push(newEl);
+            }
+            if (itemChanged) {
+                if (!copied) {
+                    result = { ...result };
+                }
+                result[key] = items;
+            }
         }
     }
     return result;