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

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

@@ -0,0 +1,103 @@
+"use strict";
+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");
+var TestModel;
+(function (TestModel) {
+    class Author {
+        constructor() {
+            this.name = schema_definition_1.SchemaDefinition.stringColumn();
+            this.isPublic = schema_definition_1.SchemaDefinition.boolColumn().notNull();
+            this.image = schema_definition_1.SchemaDefinition.manyHasOne(Image, 'authors');
+        }
+    }
+    TestModel.Author = Author;
+    class Article {
+        constructor() {
+            this.title = schema_definition_1.SchemaDefinition.stringColumn();
+            this.isPublic = schema_definition_1.SchemaDefinition.boolColumn().notNull();
+            this.image = schema_definition_1.SchemaDefinition.manyHasOne(Image, 'articles');
+        }
+    }
+    TestModel.Article = Article;
+    class Image {
+        constructor() {
+            this.url = schema_definition_1.SchemaDefinition.stringColumn().notNull();
+            this.articles = schema_definition_1.SchemaDefinition.oneHasMany(Article, 'image');
+            this.authors = schema_definition_1.SchemaDefinition.oneHasMany(Author, 'image');
+        }
+    }
+    TestModel.Image = Image;
+})(TestModel || (TestModel = {}));
+const permissions = {
+    Author: {
+        predicates: {
+            authorPredicate: {
+                isPublic: { eq: true },
+            },
+        },
+        operations: {
+            read: {
+                id: 'authorPredicate',
+                name: 'authorPredicate',
+                image: 'authorPredicate',
+            },
+        },
+    },
+    Article: {
+        predicates: {
+            articlePredicate: {
+                isPublic: { eq: true },
+            },
+        },
+        operations: {
+            read: {
+                id: 'articlePredicate',
+                title: 'articlePredicate',
+                image: 'articlePredicate',
+            },
+        },
+    },
+    Image: {
+        predicates: {
+            imagePredicate: {
+                or: [
+                    { authors: { isPublic: { eq: true } } },
+                    { articles: { isPublic: { eq: true } } },
+                ],
+            },
+        },
+        operations: {
+            read: {
+                id: 'imagePredicate',
+                url: 'imagePredicate',
+            },
+        },
+    },
+};
+(0, vitest_1.describe)('Predicates factory', () => {
+    const schema = schema_definition_1.SchemaDefinition.createModel(TestModel);
+    (0, vitest_1.it)('eliminates a predicate', () => {
+        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);
+        vitest_1.assert.deepStrictEqual(predicate, {
+            or: [
+                {
+                    authors: {
+                        id: { always: true },
+                    },
+                },
+                {
+                    articles: {
+                        isPublic: { eq: true },
+                    },
+                },
+            ],
+        });
+    });
+});
+//# sourceMappingURL=predicatesFactory.test.js.map

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

@@ -0,0 +1 @@
+{"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,17 @@
 "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 = new schema_definition_1.SchemaBuilder()
     .enum('locale', ['cs', 'en'])
     .entity('Post', entityBuilder => entityBuilder.oneHasMany('locales', c => c.target('PostLocale')))
@@ -27,40 +35,37 @@ const permissions = {
             localePredicate: {
                 locale: 'localeVariable',
             },
+            localePredicate2: {
+                locale: 'localeVariable',
+            },
         },
         operations: {
             read: {
                 id: 'localePredicate',
-                title: 'localePredicate',
+                title: 'localePredicate2',
                 content: 'localePredicate',
             },
         },
     },
 };
 (0, vitest_1.describe)('Predicates injector', () => {
+    const variables = {
+        localeVariable: { in: ['cs'] },
+    };
     (0, vitest_1.it)('injects predicate', () => {
-        const injector = new acl_1.PredicatesInjector(schema, new acl_1.PredicateFactory(permissions, new acl_1.VariableInjector(schema, { localeVariable: ['cs'] })));
+        const injector = new acl_1.PredicatesInjector(schema, new acl_1.PredicateFactory(permissions, schema, new acl_1.VariableInjector(schema, variables)));
         const result = injector.inject(schema.entities['PostLocale'], {});
         vitest_1.assert.deepStrictEqual(result, {
             locale: { in: ['cs'] },
         });
     });
     (0, vitest_1.it)('merges predicate with explicit where', () => {
-        const injector = new acl_1.PredicatesInjector(schema, new acl_1.PredicateFactory(permissions, new acl_1.VariableInjector(schema, { localeVariable: ['cs'] })));
+        const injector = new acl_1.PredicatesInjector(schema, new acl_1.PredicateFactory(permissions, schema, new acl_1.VariableInjector(schema, variables)));
         const result = injector.inject(schema.entities['PostLocale'], { id: { in: [1, 2] } });
         vitest_1.assert.deepStrictEqual(result, {
             and: [
                 {
-                    and: [
-                        {
-                            id: { in: [1, 2] },
-                        },
-                        {
-                            locale: {
-                                in: ['cs'],
-                            },
-                        },
-                    ],
+                    id: { in: [1, 2] },
                 },
                 {
                     locale: { in: ['cs'] },
@@ -69,7 +74,7 @@ const permissions = {
         });
     });
     (0, vitest_1.it)('injects predicate to where', () => {
-        const injector = new acl_1.PredicatesInjector(schema, new acl_1.PredicateFactory(permissions, new acl_1.VariableInjector(schema, { localeVariable: ['cs'] })));
+        const injector = new acl_1.PredicatesInjector(schema, new acl_1.PredicateFactory(permissions, schema, new acl_1.VariableInjector(schema, variables)));
         const result = injector.inject(schema.entities['PostLocale'], { title: { eq: 'abc' } });
         vitest_1.assert.deepStrictEqual(result, {
             and: [
@@ -90,4 +95,73 @@ 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', () => {
+    (0, vitest_1.it)('eliminates predicates in where', () => {
+        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, {})));
+        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 } }] });
+    });
+});
 //# 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/variableInjector.test.js

@@ -14,9 +14,10 @@ const vitest_1 = require("vitest");
             .column('public', c => c.type(schema_1.Model.ColumnType.Bool))
             .manyHasOne('post', r => r.target('Post', e => e.manyHasOne('site', r => r.target('Site', e => e)))))
             .buildSchema();
+        const ids = ['91528a5c-839b-4114-9952-d661914a607f', '1e2f3937-a0b1-4105-8aae-6da8ac9fc146'];
         const injector = new acl_1.VariableInjector(schema, {
-            site: [1, 2],
-            locale: 'cs',
+            site: { in: ids },
+            locale: { eq: 'cs' },
         });
         const result = injector.inject(schema.entities['PostLocale'], {
             or: [
@@ -49,7 +50,7 @@ const vitest_1 = require("vitest");
                     and: [
                         {
                             post: {
-                                site: { id: { in: [1, 2] } },
+                                site: { id: { in: ids } },
                             },
                         },
                         {

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

@@ -1 +1 @@
-{"version":3,"file":"variableInjector.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/variableInjector.test.ts"],"names":[],"mappings":";;AAAA,0CAAmD;AACnD,oEAA4D;AAC5D,8CAAyC;AACzC,mCAA6C;AAE7C,IAAA,iBAAQ,EAAC,mBAAmB,EAAE,GAAG,EAAE;IAElC,IAAA,WAAE,EAAC,kBAAkB,EAAE,GAAG,EAAE;QAC3B,MAAM,MAAM,GAAG,IAAI,iCAAa,EAAE;aAChC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aAC5B,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CACzB,CAAC;aACC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;aAC5E,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aACnD,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACpD,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrG;aACA,WAAW,EAAE,CAAA;QAEf,MAAM,QAAQ,GAAG,IAAI,sBAAgB,CAAC,MAAM,EAAE;YAC7C,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YACZ,MAAM,EAAE,IAAI;SACZ,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAC7D,EAAE,EAAE;gBACH;oBACC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;iBACpB;gBACD;oBACC,GAAG,EAAE;wBACJ;4BACC,IAAI,EAAE;gCACL,IAAI,EAAE,MAAM;6BACZ;yBACD;wBACD;4BACC,MAAM,EAAE,QAAQ;yBAChB;wBACD;4BACC,GAAG,EAAE,KAAK;yBACV;qBACD;iBACD;aACD;SACD,CAAC,CAAA;QAEF,eAAM,CAAC,eAAe,CAAC,MAAM,EAAE;YAC9B,EAAE,EAAE;gBACH;oBACC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;iBACpB;gBACD;oBACC,GAAG,EAAE;wBACJ;4BACC,IAAI,EAAE;gCACL,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;6BAC5B;yBACD;wBACD;4BACC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;yBACpB;wBACD;4BACC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;yBACpB;qBACD;iBACD;aACD;SACD,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AAEH,CAAC,CAAC,CAAA"}
+{"version":3,"file":"variableInjector.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/variableInjector.test.ts"],"names":[],"mappings":";;AAAA,0CAAmD;AACnD,oEAA4D;AAC5D,8CAA8C;AAC9C,mCAA6C;AAE7C,IAAA,iBAAQ,EAAC,mBAAmB,EAAE,GAAG,EAAE;IAElC,IAAA,WAAE,EAAC,kBAAkB,EAAE,GAAG,EAAE;QAC3B,MAAM,MAAM,GAAG,IAAI,iCAAa,EAAE;aAChC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aAC5B,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CACzB,CAAC;aACC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;aAC5E,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aACnD,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACpD,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrG;aACA,WAAW,EAAE,CAAA;QAEf,MAAM,GAAG,GAAG,CAAC,sCAAsC,EAAE,sCAAsC,CAAC,CAAA;QAC5F,MAAM,QAAQ,GAAG,IAAI,sBAAgB,CAAC,MAAM,EAAE;YAC7C,IAAI,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE;YACjB,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;SACpB,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAC7D,EAAE,EAAE;gBACH;oBACC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;iBACpB;gBACD;oBACC,GAAG,EAAE;wBACJ;4BACC,IAAI,EAAE;gCACL,IAAI,EAAE,MAAM;6BACZ;yBACD;wBACD;4BACC,MAAM,EAAE,QAAQ;yBAChB;wBACD;4BACC,GAAG,EAAE,KAAK;yBACV;qBACD;iBACD;aACD;SACD,CAAC,CAAA;QAEF,eAAM,CAAC,eAAe,CAAC,MAAM,EAAE;YAC9B,EAAE,EAAE;gBACH;oBACC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;iBACpB;gBACD;oBACC,GAAG,EAAE;wBACJ;4BACC,IAAI,EAAE;gCACL,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE;6BACzB;yBACD;wBACD;4BACC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;yBACpB;wBACD;4BACC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;yBACpB;qBACD;iBACD;aACD;SACD,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AAEH,CAAC,CAAC,CAAA"}

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

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

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

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

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

@@ -0,0 +1,183 @@
+"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");
+var TestModel;
+(function (TestModel) {
+    class Author {
+        constructor() {
+            this.name = schema_definition_1.SchemaDefinition.stringColumn();
+            this.isPublic = schema_definition_1.SchemaDefinition.boolColumn().notNull();
+            this.image = schema_definition_1.SchemaDefinition.manyHasOne(Image, 'authors');
+        }
+    }
+    TestModel.Author = Author;
+    class Article {
+        constructor() {
+            this.title = schema_definition_1.SchemaDefinition.stringColumn();
+            this.isPublic = schema_definition_1.SchemaDefinition.boolColumn().notNull();
+            this.image = schema_definition_1.SchemaDefinition.manyHasOne(Image, 'articles');
+        }
+    }
+    TestModel.Article = Article;
+    class Image {
+        constructor() {
+            this.url = schema_definition_1.SchemaDefinition.stringColumn().notNull();
+            this.articles = schema_definition_1.SchemaDefinition.oneHasMany(Article, 'image');
+            this.authors = schema_definition_1.SchemaDefinition.oneHasMany(Author, 'image');
+        }
+    }
+    TestModel.Image = Image;
+})(TestModel || (TestModel = {}));
+(0, vitest_1.describe)('where optimized', () => {
+    const conditionOptimizer = new ConditionOptimizer_1.ConditionOptimizer();
+    const model = schema_definition_1.SchemaDefinition.createModel(TestModel);
+    const whereOptimizer = new WhereOptimizer_1.WhereOptimizer(model, conditionOptimizer);
+    (0, vitest_1.it)('removes unnecessary condition', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            or: [
+                {
+                    authors: { isPublic: { eq: true } },
+                },
+                {
+                    articles: { isPublic: { always: true } },
+                },
+            ],
+        }, model.entities.Image), {
+            id: { always: true },
+        });
+    });
+    (0, vitest_1.it)('keep condition', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            or: [
+                {
+                    authors: { isPublic: { eq: true } },
+                },
+            ],
+        }, model.entities.Image), {
+            authors: { isPublic: { eq: true } },
+        });
+    });
+    (0, vitest_1.it)('do not swap AND and a field', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            authors: {
+                and: [
+                    { isPublic: { eq: true } },
+                    { name: { eq: 'bar' } },
+                ],
+            },
+        }, model.entities.Image), {
+            authors: {
+                and: [
+                    { isPublic: { eq: true } },
+                    { name: { eq: 'bar' } },
+                ],
+            },
+        });
+    });
+    (0, vitest_1.it)('keep never', () => {
+        vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
+            and: [
+                {
+                    or: [
+                        { url: { never: true } },
+                        { url: { never: true } },
+                    ],
+                },
+            ],
+        }, model.entities.Image), {
+            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] },
+            ],
+        });
+    });
+});
+//# sourceMappingURL=whereOptimizer.test.js.map

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

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

package/dist/tests/src/testGraphql.js

@@ -4,10 +4,18 @@ exports.executeGraphQlTest = void 0;
 const graphql_1 = require("graphql");
 const vitest_1 = require("vitest");
 const executeGraphQlTest = async (test) => {
-    const rawResponse = await (0, graphql_1.graphql)(test.schema, test.query, null, test.context, test.queryVariables);
+    var _a;
+    const rawResponse = await (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) {
-        console.error(rawResponse.errors[0]);
+        if (((_a = rawResponse.errors) === null || _a === void 0 ? void 0 : _a.length) === 1 && 'originalError' in rawResponse.errors[0]) {
+            throw rawResponse.errors[0].originalError;
+        }
         rawResponse.errors = rawResponse.errors.map(({ message }) => ({ message }));
     }
     vitest_1.assert.deepStrictEqual(response, test.return);

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,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IACnG,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;IACxD,IAAI,QAAQ,IAAI,WAAW,EAAE;QAC5B,OAAO,CAAC,KAAK,CAAE,WAAW,CAAC,MAAc,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7C,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;AARY,QAAA,kBAAkB,sBAQ9B"}
+{"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"}