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

package/dist/tests/cases/unit/predicatesFactory.test.js

@@ -83,7 +83,13 @@ const permissions = {
         const predicateFactory = new acl_1.PredicateFactory(permissions, schema, new acl_1.VariableInjector(schema, {}));
         const image = schema.entities['Image'];
         const authorRelation = image.fields['authors'];
-        const predicate = predicateFactory.create(image, schema_1.Acl.Operation.read, undefined, authorRelation);
+        const predicate = predicateFactory.create(image, schema_1.Acl.Operation.read, undefined, {
+            type: 'manyHasOne',
+            entity: schema.entities.Author,
+            relation: schema.entities.Author.fields.image,
+            targetEntity: image,
+            targetRelation: authorRelation,
+        });
         vitest_1.assert.deepStrictEqual(predicate, {
             or: [
                 {

package/dist/tests/cases/unit/predicatesFactory.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"predicatesFactory.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/predicatesFactory.test.ts"],"names":[],"mappings":";;AAAA,0CAAqE;AACrE,oEAAsE;AACtE,8CAA8C;AAC9C,mCAA6C;AAE7C,IAAU,SAAS,CAmBlB;AAnBD,WAAU,SAAS;IAClB,MAAa,MAAM;QAAnB;YACC,SAAI,GAAG,oCAAG,CAAC,YAAY,EAAE,CAAA;YACzB,aAAQ,GAAG,oCAAG,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,CAAA;YACrC,UAAK,GAAG,oCAAG,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;QACzC,CAAC;KAAA;IAJY,gBAAM,SAIlB,CAAA;IAED,MAAa,OAAO;QAApB;YACC,UAAK,GAAG,oCAAG,CAAC,YAAY,EAAE,CAAA;YAC1B,aAAQ,GAAG,oCAAG,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,CAAA;YACrC,UAAK,GAAG,oCAAG,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;QAC1C,CAAC;KAAA;IAJY,iBAAO,UAInB,CAAA;IAED,MAAa,KAAK;QAAlB;YACC,QAAG,GAAG,oCAAG,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,CAAA;YAElC,aAAQ,GAAG,oCAAG,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC3C,YAAO,GAAG,oCAAG,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC1C,CAAC;KAAA;IALY,eAAK,QAKjB,CAAA;AACF,CAAC,EAnBS,SAAS,KAAT,SAAS,QAmBlB;AACD,MAAM,WAAW,GAAoB;IACpC,MAAM,EAAE;QACP,UAAU,EAAE;YACX,eAAe,EAAE;gBAChB,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;aACtB;SACD;QACD,UAAU,EAAE;YACX,IAAI,EAAE;gBACL,EAAE,EAAE,iBAAiB;gBACrB,IAAI,EAAE,iBAAiB;gBACvB,KAAK,EAAE,iBAAiB;aACxB;SACD;KACD;IACD,OAAO,EAAE;QACR,UAAU,EAAE;YACX,gBAAgB,EAAE;gBACjB,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;aACtB;SACD;QACD,UAAU,EAAE;YACX,IAAI,EAAE;gBACL,EAAE,EAAE,kBAAkB;gBACtB,KAAK,EAAE,kBAAkB;gBACzB,KAAK,EAAE,kBAAkB;aACzB;SACD;KACD;IACD,KAAK,EAAE;QACN,UAAU,EAAE;YACX,cAAc,EAAE;gBACf,EAAE,EAAE;oBACH,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;oBACvC,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;iBACxC;aACD;SACD;QACD,UAAU,EAAE;YACX,IAAI,EAAE;gBACL,EAAE,EAAE,gBAAgB;gBACpB,GAAG,EAAE,gBAAgB;aACrB;SACD;KACD;CACD,CAAA;AAED,IAAA,iBAAQ,EAAC,oBAAoB,EAAE,GAAG,EAAE;IACnC,MAAM,MAAM,GAAG,oCAAG,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;IAEzC,IAAA,WAAE,EAAC,wBAAwB,EAAE,GAAG,EAAE;QACjC,MAAM,gBAAgB,GAAG,IAAI,sBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,sBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAA;QACpG,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QACtC,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAsB,CAAA;QACnE,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE,YAAG,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,cAAc,CAAC,CAAA;QAC/F,eAAM,CAAC,eAAe,CAAC,SAAS,EAAE;YACjC,EAAE,EAAE;gBACH;oBACC,OAAO,EAAE;wBACR,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;qBACpB;iBACD;gBACD;oBACC,QAAQ,EAAE;wBACT,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;qBACtB;iBACD;aACD;SACD,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"predicatesFactory.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/predicatesFactory.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/cases/unit/predicatesInjector.test.js

@@ -1,9 +1,19 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const acl_1 = require("../../../src/acl");
 const schema_definition_1 = require("@contember/schema-definition");
 const schema_1 = require("@contember/schema");
 const vitest_1 = require("vitest");
+const WhereOptimizer_1 = require("../../../src/mapper/select/optimizer/WhereOptimizer");
+const ConditionOptimizer_1 = require("../../../src/mapper/select/optimizer/ConditionOptimizer");
+const schema_utils_1 = require("@contember/schema-utils");
+const engine_api_tester_1 = require("@contember/engine-api-tester");
 const schema = new schema_definition_1.SchemaBuilder()
     .enum('locale', ['cs', 'en'])
     .entity('Post', entityBuilder => entityBuilder.oneHasMany('locales', c => c.target('PostLocale')))
@@ -87,4 +97,99 @@ const permissions = {
         });
     });
 });
+var DeepFilterModel;
+(function (DeepFilterModel) {
+    DeepFilterModel.readerRole = schema_definition_1.AclDefinition.createRole('reader');
+    let Article = class Article {
+        constructor() {
+            this.isPublished = schema_definition_1.SchemaDefinition.boolColumn();
+            this.title = schema_definition_1.SchemaDefinition.stringColumn();
+            this.coverPhoto = schema_definition_1.SchemaDefinition.manyHasOne(ImageUse, 'articles');
+        }
+    };
+    Article = __decorate([
+        schema_definition_1.AclDefinition.allow(DeepFilterModel.readerRole, {
+            when: { isPublished: { eq: true } },
+            read: ['coverPhoto'],
+        })
+    ], Article);
+    DeepFilterModel.Article = Article;
+    let ImageUse = class ImageUse {
+        constructor() {
+            this.articles = schema_definition_1.SchemaDefinition.oneHasMany(Article, 'coverPhoto');
+            this.image = schema_definition_1.SchemaDefinition.manyHasOne(Image, 'uses');
+        }
+    };
+    ImageUse = __decorate([
+        schema_definition_1.AclDefinition.allow(DeepFilterModel.readerRole, {
+            when: { articles: schema_definition_1.AclDefinition.canRead('coverPhoto') },
+            read: true,
+        })
+    ], ImageUse);
+    DeepFilterModel.ImageUse = ImageUse;
+    let Image = class Image {
+        constructor() {
+            this.uses = schema_definition_1.SchemaDefinition.oneHasMany(ImageUse, 'image');
+            this.url = schema_definition_1.SchemaDefinition.stringColumn();
+            this.tags = schema_definition_1.SchemaDefinition.manyHasMany(Tag);
+        }
+    };
+    Image = __decorate([
+        schema_definition_1.AclDefinition.allow(DeepFilterModel.readerRole, {
+            when: { uses: schema_definition_1.AclDefinition.canRead('image') },
+            read: true,
+        })
+    ], Image);
+    DeepFilterModel.Image = Image;
+    let Tag = class Tag {
+        constructor() {
+            this.label = schema_definition_1.SchemaDefinition.stringColumn();
+        }
+    };
+    Tag = __decorate([
+        schema_definition_1.AclDefinition.allow(DeepFilterModel.readerRole, {
+            read: true,
+        })
+    ], Tag);
+    DeepFilterModel.Tag = Tag;
+})(DeepFilterModel || (DeepFilterModel = {}));
+(0, vitest_1.describe)('predicates injector elimination', () => {
+    const schema = (0, schema_definition_1.createSchema)(DeepFilterModel);
+    const permissions = new acl_1.PermissionFactory(schema.model).create(schema.acl, ['reader']);
+    const injector = new acl_1.PredicatesInjector(schema.model, new acl_1.PredicateFactory(permissions, schema.model, new acl_1.VariableInjector(schema.model, {})));
+    (0, vitest_1.it)('eliminates predicates in where', () => {
+        const injected = injector.inject(schema.model.entities.Article, {
+            coverPhoto: { image: { tags: { label: { eq: 'foo' } } } },
+        });
+        const optimizer = new WhereOptimizer_1.WhereOptimizer(schema.model, new ConditionOptimizer_1.ConditionOptimizer());
+        const result = optimizer.optimize(injected, schema.model.entities.Article);
+        vitest_1.assert.deepStrictEqual(result, { and: [{ coverPhoto: { image: { tags: { label: { eq: 'foo' } } } } }, { isPublished: { eq: true } }] });
+    });
+    (0, vitest_1.it)('eliminate back referencing predicate', () => {
+        const relation = (0, schema_utils_1.acceptFieldVisitor)(schema.model, schema.model.entities.Article, 'coverPhoto', {
+            visitColumn: () => {
+                throw new Error();
+            },
+            visitRelation: ctx => ctx,
+        });
+        const injected = injector.inject(schema.model.entities.ImageUse, {
+            articles: { id: { in: [(0, engine_api_tester_1.testUuid)(1)] } },
+        }, relation);
+        vitest_1.assert.deepStrictEqual(injected, {
+            and: [
+                {
+                    articles: {
+                        and: [
+                            { id: { in: [(0, engine_api_tester_1.testUuid)(1)] } },
+                            { id: { always: true } },
+                        ],
+                    },
+                },
+                {
+                    articles: { id: { always: true } },
+                },
+            ],
+        });
+    });
+});
 //# sourceMappingURL=predicatesInjector.test.js.map

package/dist/tests/cases/unit/predicatesInjector.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"predicatesInjector.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/predicatesInjector.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"predicatesInjector.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/predicatesInjector.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/cases/unit/whereBuilder.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=whereBuilder.test.d.ts.map

package/dist/tests/cases/unit/whereBuilder.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"whereBuilder.test.d.ts","sourceRoot":"","sources":["../../../../tests/cases/unit/whereBuilder.test.ts"],"names":[],"mappings":""}

package/dist/tests/cases/unit/whereBuilder.test.js

@@ -0,0 +1,131 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const ConditionOptimizer_1 = require("../../../src/mapper/select/optimizer/ConditionOptimizer");
+const schema_definition_1 = require("@contember/schema-definition");
+const WhereOptimizer_1 = require("../../../src/mapper/select/optimizer/WhereOptimizer");
+const mapper_1 = require("../../../src/mapper");
+const database_1 = require("@contember/database");
+var WhereBuilderModel;
+(function (WhereBuilderModel) {
+    class Author {
+        constructor() {
+            this.name = schema_definition_1.SchemaDefinition.stringColumn();
+            this.isPublic = schema_definition_1.SchemaDefinition.boolColumn().notNull();
+            this.articles = schema_definition_1.SchemaDefinition.oneHasMany(Article, 'author');
+        }
+    }
+    WhereBuilderModel.Author = Author;
+    class Article {
+        constructor() {
+            this.title = schema_definition_1.SchemaDefinition.stringColumn();
+            this.isPublic = schema_definition_1.SchemaDefinition.boolColumn().notNull();
+            this.author = schema_definition_1.SchemaDefinition.manyHasOne(Author, 'articles');
+            this.tags = schema_definition_1.SchemaDefinition.manyHasMany(Tag);
+        }
+    }
+    WhereBuilderModel.Article = Article;
+    class Tag {
+        constructor() {
+            this.name = schema_definition_1.SchemaDefinition.stringColumn();
+        }
+    }
+    WhereBuilderModel.Tag = Tag;
+})(WhereBuilderModel || (WhereBuilderModel = {}));
+const createWhere = (schema, where) => {
+    const pathFactory = new mapper_1.PathFactory();
+    const joinBuilder = new mapper_1.JoinBuilder(schema.model);
+    const conditionBuilder = new mapper_1.ConditionBuilder();
+    const whereOptimizer = new WhereOptimizer_1.WhereOptimizer(schema.model, new ConditionOptimizer_1.ConditionOptimizer());
+    const whereBuilder = new mapper_1.WhereBuilder(schema.model, joinBuilder, conditionBuilder, pathFactory, whereOptimizer, schema.settings.useExistsInHasManyFilter === true);
+    const qb = database_1.SelectBuilder.create()
+        .from('author', 'root_');
+    return whereBuilder.build(qb, schema.model.entities.Author, pathFactory.create([]), where).options.where.compile().sql;
+};
+(0, vitest_1.describe)('where builder', () => {
+    (0, vitest_1.it)('where on has-many relation with AND outside', () => {
+        const schema = (0, schema_definition_1.createSchema)(WhereBuilderModel);
+        const where = createWhere(schema, {
+            and: [
+                {
+                    articles: { isPublic: { eq: true } },
+                },
+                {
+                    articles: { title: { eq: 'Hello' } },
+                },
+            ],
+        });
+        vitest_1.assert.equal(where, ' where exists (select 1  from "__SCHEMA__"."article" as "root_articles"  where "root_"."id" = "root_articles"."author_id" and "root_articles"."is_public" = ?) and exists (select 1  from "__SCHEMA__"."article" as "root_articles"  where "root_"."id" = "root_articles"."author_id" and "root_articles"."title" = ?)');
+    });
+    (0, vitest_1.it)('where on has-many relation with AND inside', () => {
+        const schema = (0, schema_definition_1.createSchema)(WhereBuilderModel);
+        const where = createWhere(schema, {
+            articles: {
+                and: [
+                    { isPublic: { eq: true } },
+                    { title: { eq: 'Hello' } },
+                ],
+            },
+        });
+        vitest_1.assert.equal(where, ' where exists (select 1  from "__SCHEMA__"."article" as "root_articles"  where "root_"."id" = "root_articles"."author_id" and "root_articles"."is_public" = ? and "root_articles"."title" = ?)');
+    });
+    (0, vitest_1.it)('where on has-many relation with isNull', () => {
+        const schema = (0, schema_definition_1.createSchema)(WhereBuilderModel);
+        const where = createWhere(schema, {
+            articles: {
+                id: { isNull: true },
+            },
+        });
+        vitest_1.assert.equal(where, ' where exists (select 1  from (select "root_"."id") as "root_articles_tmp_" left join  "__SCHEMA__"."article" as "root_articles" on  "root_articles_tmp_"."id" = "root_articles"."author_id"  where "root_articles"."id" is null)');
+    });
+    (0, vitest_1.it)('where with nested has-many', () => {
+        const schema = { ...(0, schema_definition_1.createSchema)(WhereBuilderModel), settings: { useExistsInHasManyFilter: true } };
+        const where = createWhere(schema, {
+            articles: {
+                and: [
+                    { tags: { name: { eq: 'Hello' } } },
+                    { tags: { name: { eq: 'World' } } },
+                ],
+            },
+        });
+        compareWhere(where, `where exists (select 1
+				from "__SCHEMA__"."article" as "root_articles"
+				where "root_"."id" = "root_articles"."author_id"
+					and exists (select 1
+						from "__SCHEMA__"."article_tags" as "root_articles_tags_junction_"
+						inner join  "__SCHEMA__"."tag" as "root_articles_tags" on  "root_articles_tags_junction_"."tag_id" = "root_articles_tags"."id"
+						where "root_articles"."id" = "root_articles_tags_junction_"."article_id" and "root_articles_tags"."name" = ?)
+					and exists (select 1
+						from "__SCHEMA__"."article_tags" as "root_articles_tags_junction_"
+						inner join  "__SCHEMA__"."tag" as "root_articles_tags" on  "root_articles_tags_junction_"."tag_id" = "root_articles_tags"."id"
+						where "root_articles"."id" = "root_articles_tags_junction_"."article_id" and "root_articles_tags"."name" = ?))`);
+    });
+    (0, vitest_1.it)('where without nested has-many', () => {
+        const schema = { ...(0, schema_definition_1.createSchema)(WhereBuilderModel) };
+        const where = createWhere(schema, {
+            articles: {
+                and: [
+                    { tags: { name: { eq: 'Hello' } } },
+                    { tags: { name: { eq: 'World' } } },
+                ],
+            },
+        });
+        compareWhere(where, `where exists (select 1
+				from "__SCHEMA__"."article" as "root_articles"
+				left join "__SCHEMA__"."article_tags" as "root_articles_x_root_articles_tags" on "root_articles"."id" = "root_articles_x_root_articles_tags"."article_id"
+				left join "__SCHEMA__"."tag" as "root_articles_tags" on "root_articles_x_root_articles_tags"."tag_id" = "root_articles_tags"."id"
+				where "root_"."id" = "root_articles"."author_id" and "root_articles_tags"."name" = ? and "root_articles_tags"."name" = ?)`);
+    });
+});
+const compareWhere = (actual, expected) => {
+    const normalize = (s) => s.replaceAll(/\s+/g, ' ').trim();
+    try {
+        vitest_1.assert.equal(normalize(actual), normalize(expected));
+    }
+    catch (e) {
+        console.log(normalize(actual));
+        console.log(normalize(expected));
+        throw e;
+    }
+};
+//# sourceMappingURL=whereBuilder.test.js.map

package/dist/tests/cases/unit/whereBuilder.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"whereBuilder.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/whereBuilder.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/cases/unit/whereOptimizer.test.js

@@ -4,6 +4,7 @@ const vitest_1 = require("vitest");
 const ConditionOptimizer_1 = require("../../../src/mapper/select/optimizer/ConditionOptimizer");
 const schema_definition_1 = require("@contember/schema-definition");
 const WhereOptimizer_1 = require("../../../src/mapper/select/optimizer/WhereOptimizer");
+const schema_utils_1 = require("@contember/schema-utils");
 var TestModel;
 (function (TestModel) {
     class Author {
@@ -11,6 +12,7 @@ var TestModel;
             this.name = schema_definition_1.SchemaDefinition.stringColumn();
             this.isPublic = schema_definition_1.SchemaDefinition.boolColumn().notNull();
             this.image = schema_definition_1.SchemaDefinition.manyHasOne(Image, 'authors');
+            this.articles = schema_definition_1.SchemaDefinition.oneHasMany(Article, 'author');
         }
     }
     TestModel.Author = Author;
@@ -19,6 +21,7 @@ var TestModel;
             this.title = schema_definition_1.SchemaDefinition.stringColumn();
             this.isPublic = schema_definition_1.SchemaDefinition.boolColumn().notNull();
             this.image = schema_definition_1.SchemaDefinition.manyHasOne(Image, 'articles');
+            this.author = schema_definition_1.SchemaDefinition.manyHasOne(Author, 'articles');
         }
     }
     TestModel.Article = Article;
@@ -91,5 +94,175 @@ var TestModel;
             id: { never: true },
         });
     });
+    const A = { authors: { isPublic: { eq: true } } };
+    const B = { authors: { name: { eq: 'John' } } };
+    const C = { authors: { name: { eq: 'Jack' } } };
+    (0, vitest_1.it)('minimize: A || (A && B) => A', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            or: [
+                A,
+                { and: [A, B] },
+            ],
+        }, model.entities.Image), A);
+    });
+    (0, vitest_1.it)('minimize: (A && B) || A => A', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            or: [
+                { and: [A, B] },
+                A,
+            ],
+        }, model.entities.Image), A);
+    });
+    (0, vitest_1.it)('minimize: A && (A || B) => A', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            and: [
+                A,
+                { or: [A, B] },
+            ],
+        }, model.entities.Image), A);
+    });
+    (0, vitest_1.it)('minimize: (A || B) && A => A', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            and: [
+                { or: [A, B] },
+                A,
+            ],
+        }, model.entities.Image), A);
+    });
+    (0, vitest_1.it)('minimize: A && (!A || B) => A && B', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            and: [
+                A,
+                { or: [{ not: A }, B] },
+            ],
+        }, model.entities.Image), { and: [A, B] });
+    });
+    (0, vitest_1.it)('minimize: A || (!A && B) => A || B', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            or: [
+                A,
+                { and: [{ not: A }, B] },
+            ],
+        }, model.entities.Image), { or: [A, B] });
+    });
+    (0, vitest_1.it)('minimize: A || !A => 1', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            or: [
+                A,
+                { not: A },
+            ],
+        }, model.entities.Image), { id: { always: true } });
+    });
+    (0, vitest_1.it)('minimize: A && !A => 0', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            and: [
+                A,
+                { not: A },
+            ],
+        }, model.entities.Image), { id: { never: true } });
+    });
+    (0, vitest_1.it)('minimize: !A && !A => !A', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            and: [
+                { not: A },
+                { not: A },
+            ],
+        }, model.entities.Image), { not: A });
+    });
+    (0, vitest_1.it)('not minimize: (A && B) || (A && C)', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            or: [
+                { and: [A, B] },
+                { and: [A, C] },
+            ],
+        }, model.entities.Image), {
+            or: [
+                { and: [A, B] },
+                { and: [A, C] },
+            ],
+        });
+    });
+    (0, vitest_1.describe)('remove id predicates', () => {
+        (0, vitest_1.it)('remove ID predicate when traversing from a relation - always', () => {
+            const relationPath = [(0, schema_utils_1.acceptFieldVisitor)(model, 'Image', 'authors', {
+                    visitColumn: () => {
+                        throw new Error();
+                    },
+                    visitRelation: context => context,
+                })];
+            vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+                image: { id: { isNull: false } },
+            }, model.entities.Author, { relationPath }), {
+                id: { always: true },
+            });
+        });
+        (0, vitest_1.it)('remove ID predicate when traversing from a relation - never', () => {
+            vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+                image: { id: { isNull: true } },
+            }, model.entities.Author, { relationPath: [(0, schema_utils_1.acceptFieldVisitor)(model, 'Image', 'authors', {
+                        visitColumn: () => {
+                            throw new Error();
+                        },
+                        visitRelation: context => context,
+                    })] }), {
+                id: { never: true },
+            });
+        });
+        (0, vitest_1.it)('remove ID predicate when traversing in where', () => {
+            vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+                authors: { image: { id: { isNull: false } } },
+            }, model.entities.Image), {
+                id: { always: true },
+            });
+        });
+        (0, vitest_1.it)('do not remove ID predicate when traversing from a has-many relation', () => {
+            const relationPath = [(0, schema_utils_1.acceptFieldVisitor)(model, 'Author', 'image', {
+                    visitColumn: () => {
+                        throw new Error();
+                    },
+                    visitRelation: context => context,
+                })];
+            vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+                authors: { id: { isNull: false } },
+            }, model.entities.Image, { relationPath }), {
+                authors: { id: { isNull: false } },
+            });
+        });
+        (0, vitest_1.it)('do not remove ID predicate when traversing from a nested has-many relation', () => {
+            const relationPath = [
+                (0, schema_utils_1.acceptFieldVisitor)(model, 'Author', 'articles', {
+                    visitColumn: () => {
+                        throw new Error();
+                    },
+                    visitRelation: context => context,
+                }),
+                (0, schema_utils_1.acceptFieldVisitor)(model, 'Article', 'image', {
+                    visitColumn: () => {
+                        throw new Error();
+                    },
+                    visitRelation: context => context,
+                }),
+            ];
+            vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+                articles: { author: { id: { isNull: false } } },
+            }, model.entities.Image, { relationPath }), {
+                articles: { author: { id: { isNull: false } } },
+            });
+        });
+        (0, vitest_1.it)('do not remove ID predicate when traversing in where over has-many relation', () => {
+            vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+                image: { authors: { id: { isNull: false } } },
+            }, model.entities.Author), {
+                image: { authors: { id: { isNull: false } } },
+            });
+        });
+        (0, vitest_1.it)('do not remove ID predicate when traversing in where over has-many relation - nested', () => {
+            vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+                image: { authors: { image: { id: { isNull: false } } } },
+            }, model.entities.Author), {
+                image: { authors: { image: { id: { isNull: false } } } },
+            });
+        });
+    });
 });
 //# sourceMappingURL=whereOptimizer.test.js.map

package/dist/tests/cases/unit/whereOptimizer.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"whereOptimizer.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/whereOptimizer.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"whereOptimizer.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/whereOptimizer.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/src/test.js

@@ -7,7 +7,7 @@ const testGraphql_1 = require("./testGraphql");
 const database_1 = require("@contember/database");
 const database_tester_1 = require("@contember/database-tester");
 const engine_api_tester_1 = require("@contember/engine-api-tester");
-const values_1 = require("graphql/execution/values");
+const graphql_1 = require("graphql");
 const tags_1 = require("./tags");
 const SQL_BEGIN = {
     sql: 'BEGIN;',
@@ -85,7 +85,7 @@ const execute = async (test) => {
             executionContainer: new src_1.ExecutionContainerFactory(schema, permissions, {
                 uuid: (0, engine_api_tester_1.createUuidGenerator)(),
                 now: () => new Date('2019-09-04 12:00'),
-            }, values_1.getArgumentValues, () => Promise.resolve()).create({
+            }, graphql_1.getArgumentValues, () => Promise.resolve()).create({
                 db,
                 identityVariables: test.variables || {},
             }),

package/dist/tests/src/test.js.map

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

package/dist/tests/src/testGraphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testGraphql.d.ts","sourceRoot":"","sources":["../../../tests/src/testGraphql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,aAAa,EAAE,MAAM,SAAS,CAAA;AAGhD,MAAM,WAAW,IAAI;IACpB,MAAM,EAAE,aAAa,CAAA;IACrB,OAAO,EAAE,GAAG,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,MAAM,EAAE,MAAM,CAAA;CACd;AAED,eAAO,MAAM,kBAAkB,SAAgB,IAAI,kBAelD,CAAA"}
+{"version":3,"file":"testGraphql.d.ts","sourceRoot":"","sources":["../../../tests/src/testGraphql.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,aAAa,EAAE,MAAM,SAAS,CAAA;AAGhD,MAAM,WAAW,IAAI;IACpB,MAAM,EAAE,aAAa,CAAA;IACrB,OAAO,EAAE,GAAG,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,MAAM,EAAE,MAAM,CAAA;CACd;AAED,eAAO,MAAM,kBAAkB,SAAgB,IAAI,kBAkBlD,CAAA"}

package/dist/tests/src/testGraphql.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeGraphQlTest = void 0;
+const logger_1 = require("@contember/logger");
 const graphql_1 = require("graphql");
 const vitest_1 = require("vitest");
 const executeGraphQlTest = async (test) => {
     var _a;
-    const rawResponse = await (0, graphql_1.graphql)({
-        schema: test.schema,
-        source: test.query,
-        contextValue: test.context,
-        variableValues: test.queryVariables,
+    const logger = (0, logger_1.createLogger)(new logger_1.NullLoggerHandler());
+    const rawResponse = await (0, logger_1.withLogger)(logger, () => {
+        return (0, graphql_1.graphql)({
+            schema: test.schema,
+            source: test.query,
+            contextValue: test.context,
+            variableValues: test.queryVariables,
+        });
     });
     const response = JSON.parse(JSON.stringify(rawResponse));
     if ('errors' in rawResponse) {

package/dist/tests/src/testGraphql.js.map

@@ -1 +1 @@
-{"version":3,"file":"testGraphql.js","sourceRoot":"","sources":["../../../tests/src/testGraphql.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAChD,mCAA+B;AAUxB,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAU,EAAE,EAAE;;IACtD,MAAM,WAAW,GAAG,MAAM,IAAA,iBAAO,EAAC;QACjC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,MAAM,EAAE,IAAI,CAAC,KAAK;QAClB,YAAY,EAAE,IAAI,CAAC,OAAO;QAC1B,cAAc,EAAE,IAAI,CAAC,cAAc;KACnC,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;IACxD,IAAI,QAAQ,IAAI,WAAW,EAAE;QAC5B,IAAI,CAAA,MAAA,WAAW,CAAC,MAAM,0CAAE,MAAM,MAAK,CAAC,IAAI,eAAe,IAAK,WAAW,CAAC,MAAc,CAAC,CAAC,CAAC,EAAE;YAC1F,MAAO,WAAW,CAAC,MAAc,CAAC,CAAC,CAAC,CAAC,aAAa,CAAA;SAClD;QACD,WAAW,CAAC,MAAM,GAAI,WAAW,CAAC,MAAc,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAO,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;KACzF;IACD,eAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;AAC9C,CAAC,CAAA;AAfY,QAAA,kBAAkB,sBAe9B"}
+{"version":3,"file":"testGraphql.js","sourceRoot":"","sources":["../../../tests/src/testGraphql.ts"],"names":[],"mappings":";;;AAAA,8CAA+E;AAC/E,qCAAgD;AAChD,mCAA+B;AAUxB,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAU,EAAE,EAAE;;IACtD,MAAM,MAAM,GAAG,IAAA,qBAAY,EAAC,IAAI,0BAAiB,EAAE,CAAC,CAAA;IACpD,MAAM,WAAW,GAAG,MAAM,IAAA,mBAAU,EAAC,MAAM,EAAE,GAAG,EAAE;QACjD,OAAO,IAAA,iBAAO,EAAC;YACd,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,KAAK;YAClB,YAAY,EAAE,IAAI,CAAC,OAAO;YAC1B,cAAc,EAAE,IAAI,CAAC,cAAc;SACnC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;IACxD,IAAI,QAAQ,IAAI,WAAW,EAAE;QAC5B,IAAI,CAAA,MAAA,WAAW,CAAC,MAAM,0CAAE,MAAM,MAAK,CAAC,IAAI,eAAe,IAAK,WAAW,CAAC,MAAc,CAAC,CAAC,CAAC,EAAE;YAC1F,MAAO,WAAW,CAAC,MAAc,CAAC,CAAC,CAAC,CAAC,aAAa,CAAA;SAClD;QACD,WAAW,CAAC,MAAM,GAAI,WAAW,CAAC,MAAc,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAO,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;KACzF;IACD,eAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;AAC9C,CAAC,CAAA;AAlBY,QAAA,kBAAkB,sBAkB9B"}