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

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

@@ -27,11 +27,14 @@ const permissions = {
             localePredicate: {
                 locale: 'localeVariable',
             },
+            localePredicate2: {
+                locale: 'localeVariable',
+            },
         },
         operations: {
             read: {
                 id: 'localePredicate',
-                title: 'localePredicate',
+                title: 'localePredicate2',
                 content: 'localePredicate',
             },
         },
@@ -42,26 +45,19 @@ const permissions = {
         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, variables)));
+        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, variables)));
+        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'] },
@@ -70,7 +66,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, variables)));
+        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: [

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/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,81 @@
+"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' } },
+                ],
+            },
+        });
+    });
+});
+//# 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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"}