npm - @contember/engine-content-api - Versions diffs - 1.2.0-alpha.3 → 1.2.0-alpha.6 - Mend

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

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

Files changed (164) hide show

package/dist/tests/cases/integration/graphQlRequests/query/relations/manyHasManyOwning.test.js CHANGED Viewed

@@ -5,6 +5,79 @@ const test_1 = require("../../../../../src/test");
 const schema_definition_1 = require("@contember/schema-definition");
 const tags_1 = require("../../../../../src/tags");
 const testUuid_1 = require("../../../../../src/testUuid");
+(0, vitest_1.test)('Posts with filtered tags', async () => {
+    await (0, test_1.execute)({
+        schema: new schema_definition_1.SchemaBuilder()
+            .entity('Post', entity => entity.manyHasMany('tags', relation => relation.target('Tag')))
+            .entity('Tag', entity => entity.column('name'))
+            .buildSchema(),
+        query: (0, tags_1.GQL) `
+        query {
+          listPost {
+            id
+            tags(filter: {name: {eq: "Foo"}}) {
+				name
+            }
+          }
+        }
+			`,
+        executes: [
+            {
+                sql: (0, tags_1.SQL) `select "root_"."id" as "root_id",
+					         "root_"."id" as "root_id"
+				         from "public"."post" as "root_"`,
+                response: {
+                    rows: [{ root_id: (0, testUuid_1.testUuid)(1) }, { root_id: (0, testUuid_1.testUuid)(2) }],
+                },
+            },
+            {
+                sql: (0, tags_1.SQL) `select "junction_"."tag_id", "junction_"."post_id"  from "public"."post_tags" as "junction_" inner join  "public"."tag" as "root_" on  "junction_"."tag_id" = "root_"."id"  where "junction_"."post_id" in (?, ?) and "root_"."name" = ?`,
+                parameters: [(0, testUuid_1.testUuid)(1), (0, testUuid_1.testUuid)(2), 'Foo'],
+                response: {
+                    rows: [
+                        { post_id: (0, testUuid_1.testUuid)(1), tag_id: (0, testUuid_1.testUuid)(3) },
+                        { post_id: (0, testUuid_1.testUuid)(2), tag_id: (0, testUuid_1.testUuid)(3) },
+                    ],
+                },
+            },
+            {
+                sql: (0, tags_1.SQL) `
+					select "root_"."name" as "root_name",
+						"root_"."id" as "root_id"
+					from "public"."tag" as "root_"
+					where "root_"."id" in (?)`,
+                parameters: [(0, testUuid_1.testUuid)(3)],
+                response: {
+                    rows: [
+                        { root_id: (0, testUuid_1.testUuid)(3), root_name: 'foo' },
+                    ],
+                },
+            },
+        ],
+        return: {
+            data: {
+                listPost: [
+                    {
+                        id: (0, testUuid_1.testUuid)(1),
+                        tags: [
+                            {
+                                name: 'foo',
+                            },
+                        ],
+                    },
+                    {
+                        id: (0, testUuid_1.testUuid)(2),
+                        tags: [
+                            {
+                                name: 'foo',
+                            },
+                        ],
+                    },
+                ],
+            },
+        },
+    });
+});
 (0, vitest_1.test)('Posts with paginated tags (many has many owning)', async () => {
     await (0, test_1.execute)({
         schema: new schema_definition_1.SchemaBuilder()

package/dist/tests/cases/integration/graphQlRequests/query/relations/manyHasManyOwning.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"manyHasManyOwning.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/relations/manyHasManyOwning.test.ts"],"names":[],"mappings":";;AAAA,mCAA6B;AAC7B,kDAAiD;AACjD,oEAA4D;AAC5D,kDAAkD;AAClD,0DAAsD;~~AAEtD~~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"}
1	+ {"version":3,"file":"manyHasManyOwning.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/relations/manyHasManyOwning.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.js CHANGED Viewed

@@ -36,12 +36,7 @@ const testUuid_1 = require("../../../../../src/testUuid");
             },
         },
         variables: {
-            name_variable: {
-                definition: {
-                    type: schema_1.Acl.VariableType.condition,
-                },
-                value: [{ in: ['John', 'Jack'] }],
-            },
+            name_variable: { in: ['John', 'Jack'] },
         },
         executes: [
             ...(0, test_1.sqlTransaction)([
@@ -103,12 +98,7 @@ const testUuid_1 = require("../../../../../src/testUuid");
             },
         },
         variables: {
-            name_variable: {
-                definition: {
-                    type: schema_1.Acl.VariableType.condition,
-                },
-                value: [{ in: ['John', 'Jack'] }],
-            },
+            name_variable: { in: ['John', 'Jack'] },
         },
         executes: [
             ...(0, test_1.failedTransaction)([
@@ -123,10 +113,10 @@ const testUuid_1 = require("../../../../../src/testUuid");
                  ? :: text as "name",
                  "root_"."id"
                from "public"."author" as "root_"
-               where "root_"."id" = ? and false) update "public"."author"
+               where false) update "public"."author"
               set "name" = "newData_"."name" from "newData_"
               where "author"."id" = "newData_"."id" and false`,
-                    parameters: ['John', (0, testUuid_1.testUuid)(1)],
+                    parameters: ['John'],
                     response: 0,
                 },
             ]),
@@ -181,18 +171,8 @@ const testUuid_1 = require("../../../../../src/testUuid");
             },
         },
         variables: {
-            post_name_variable: {
-                definition: {
-                    type: schema_1.Acl.VariableType.condition,
-                },
-                value: [{ in: ['Lorem ipsum', 'Dolor sit'] }],
-            },
-            category_name_variable: {
-                definition: {
-                    type: schema_1.Acl.VariableType.condition,
-                },
-                value: [{ in: ['foo', 'bar'] }],
-            },
+            post_name_variable: { in: ['Lorem ipsum', 'Dolor sit'] },
+            category_name_variable: { in: ['foo', 'bar'] },
         },
         query: (0, tags_1.GQL) `mutation  {
           updatePost(by: {id: "${(0, testUuid_1.testUuid)(1)}"}, data: {categories: [

package/dist/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aclUpdate.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.ts"],"names":[],"mappings":";;AAAA,mCAA6B;AAC7B,kDAAoF;AACpF,oEAA4D;AAC5D,~~8CAA8C~~;~~AAC9C~~,kDAAkD;AAClD,0DAAsD;AAEtD,IAAA,aAAI,EAAC,aAAa,EAAE,KAAK,IAAI,EAAE;IAC9B,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,IAAI,iCAAa,EAAE;aACzB,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;aAC7E,WAAW,EAAE;QACf,KAAK,EAAE,IAAA,UAAG,EAAA;;wBAEY,IAAA,mBAAQ,EAAC,CAAC,CAAC;;;;;QAK3B;QACN,WAAW,EAAE;YACZ,MAAM,EAAE;gBACP,UAAU,EAAE;oBACX,cAAc,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE;iBACzC;gBACD,UAAU,EAAE;oBACX,MAAM,EAAE;wBACP,EAAE,EAAE,IAAI;wBACR,IAAI,EAAE,gBAAgB;qBACtB;oBACD,IAAI,EAAE;wBACL,EAAE,EAAE,IAAI;qBACR;iBACD;aACD;SACD;QACD,SAAS,EAAE;YACV,aAAa,EAAE~~;gBACd~~,~~UAAU,~~EAAE~~;oBACX~~,~~IAAI,~~EAAE,~~YAAG,CAAC,YAAY,CAAC,SAAS;iBAChC;gBACD,KAAK,~~EAAE,CAAC,~~EAAE,EAAE,EAAE,CAAC,~~MAAM,EAAE,MAAM,CAAC,EAAE~~,CAAC~~;~~aACjC~~;~~SACD;~~QACD,QAAQ,EAAE;YACT,GAAG,IAAA,qBAAc,EAAC;gBACjB;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA,8EAA8E;oBACtF,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;oBACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE;iBACzC;gBACD;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;;;;;oFAOuE;oBAC/E,UAAU,EAAE,CAAC,MAAM,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;oBACjE,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE;iBACzB;aACD,CAAC;SACF;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,YAAY,EAAE;oBACb,EAAE,EAAE,IAAI;iBACR;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;IACvC,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,IAAI,iCAAa,EAAE;aACzB,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;aAC7E,WAAW,EAAE;QACf,KAAK,EAAE,IAAA,UAAG,EAAA;;wBAEY,IAAA,mBAAQ,EAAC,CAAC,CAAC;;;;;QAK3B;QACN,WAAW,EAAE;YACZ,MAAM,EAAE;gBACP,UAAU,EAAE;oBACX,cAAc,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;iBACzC;gBACD,UAAU,EAAE;oBACX,MAAM,EAAE;wBACP,EAAE,EAAE,IAAI;wBACR,IAAI,EAAE,gBAAgB;qBACtB;oBACD,IAAI,EAAE;wBACL,EAAE,EAAE,IAAI;qBACR;iBACD;aACD;SACD;QACD,SAAS,EAAE;YACV,aAAa,EAAE~~;gBACd~~,~~UAAU,~~EAAE~~;oBACX~~,~~IAAI,~~EAAE,~~YAAG,CAAC,YAAY,CAAC,SAAS;iBAChC;gBACD,KAAK,~~EAAE,CAAC,~~EAAE,EAAE,EAAE,CAAC,~~MAAM,EAAE,MAAM,CAAC,EAAE~~,CAAC~~;~~aACjC~~;~~SACD;~~QACD,QAAQ,EAAE;YACT,GAAG,IAAA,wBAAiB,EAAC;gBACpB;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA,8EAA8E;oBACtF,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;oBACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE;iBACzC;gBACD;oBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;;;;;8DAOiD;oBACzD,UAAU,EAAE,CAAC,MAAM,~~EAAE,IAAA,mBAAQ,EAAC,~~CAAC~~,CAAC,CAAC~~;~~oBACjC~~,QAAQ,EAAE,CAAC;iBACX;aACD,CAAC;SACF;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,YAAY,EAAE;oBACb,EAAE,EAAE,KAAK;iBACT;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,YAAY,EAAE,KAAK,IAAI,EAAE;IAC7B,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,IAAI,iCAAa,EAAE;aACzB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CACnB,CAAC;aACC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;aACpD,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CAC9B,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CACrG,CACF;aACA,WAAW,EAAE;QACf,WAAW,EAAE;YACZ,IAAI,EAAE;gBACL,UAAU,EAAE;oBACX,mBAAmB,EAAE;wBACpB,IAAI,EAAE,oBAAoB;qBAC1B;iBACD;gBACD,UAAU,EAAE;oBACX,IAAI,EAAE;wBACL,EAAE,EAAE,IAAI;qBACR;oBACD,MAAM,EAAE;wBACP,EAAE,EAAE,IAAI;wBACR,UAAU,EAAE,qBAAqB;qBACjC;iBACD;aACD;YACD,QAAQ,EAAE;gBACT,UAAU,EAAE;oBACX,uBAAuB,EAAE;wBACxB,IAAI,EAAE,wBAAwB;qBAC9B;iBACD;gBACD,UAAU,EAAE;oBACX,IAAI,EAAE;wBACL,EAAE,EAAE,IAAI;qBACR;oBACD,MAAM,EAAE;wBACP,KAAK,EAAE,yBAAyB;qBAChC;iBACD;aACD;SACD;QACD,SAAS,EAAE;YACV,kBAAkB,EAAE~~;gBACnB~~,~~UAAU,~~EAAE~~;oBACX~~,~~IAAI,~~EAAE,~~YAAG,CAAC,YAAY,CAAC,SAAS;iBAChC;gBACD,KAAK,~~EAAE,CAAC,~~EAAE,EAAE,EAAE,CAAC,~~aAAa,EAAE,WAAW,CAAC,EAAE~~,CAAC~~;~~aAC7C;YACD~~,sBAAsB,EAAE~~;gBACvB~~,~~UAAU,~~EAAE~~;oBACX~~,~~IAAI,~~EAAE,~~YAAG,CAAC,YAAY,CAAC,SAAS;iBAChC;gBACD,KAAK,~~EAAE,CAAC,~~EAAE,EAAE,EAAE,CAAC,~~KAAK,EAAE,KAAK,CAAC,EAAE~~,CAAC~~;~~aAC/B~~;~~SACD;~~QACD,KAAK,EAAE,IAAA,UAAG,EAAA;iCACqB,IAAA,mBAAQ,EAAC,CAAC,CAAC;wBACpB,IAAA,mBAAQ,EAAC,CAAC,CAAC;2BACR,IAAA,mBAAQ,EAAC,CAAC,CAAC;;;;MAIhC;QACJ,QAAQ,EAAE,IAAA,qBAAc,EAAC;YACxB;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA,4EAA4E;gBACpF,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;gBACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE;aACzC;YACD;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA,gFAAgF;gBACxF,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;gBACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE;aACzC;YACD;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;;;;;;;;;;;;;;;;;;;qDAqByC;gBACjD,UAAU,EAAE,CAAC,aAAa,EAAE,WAAW,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;gBAChF,QAAQ,EAAE;oBACT,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;iBAC1C;aACD;YACD;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA,gFAAgF;gBACxF,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;gBACzB,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE;aACzC;YACD;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;;;;;;;;;;;;;;;;qDAkByC;gBACjD,UAAU,EAAE,CAAC,aAAa,EAAE,WAAW,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;gBAChF,QAAQ,EAAE;oBACT,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;iBACzC;aACD;SACD,CAAC;QACF,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,UAAU,EAAE;oBACX,EAAE,EAAE,IAAI;iBACR;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"aclUpdate.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/cases/unit/aclVariablesFactory.test.js CHANGED Viewed

@@ -17,12 +17,8 @@ const engine_api_tester_1 = require("@contember/engine-api-tester");
                     entities: {},
                 },
             },
-        }, {
-            identityId: (0, engine_api_tester_1.testUuid)(1),
-            personId: null,
-            memberships: [{ role: 'author', variables: [{ name: 'authorID', values: [(0, engine_api_tester_1.testUuid)(2)] }] }],
-        }), {
-            author__authorID: { definition, value: [(0, engine_api_tester_1.testUuid)(2)] },
+        }, [{ role: 'author', variables: [{ name: 'authorID', condition: { in: [(0, engine_api_tester_1.testUuid)(2)] } }] }]), {
+            author__authorID: { in: [(0, engine_api_tester_1.testUuid)(2)] },
         });
     });
     (0, vitest_1.it)('undefined variable', () => {
@@ -36,32 +32,8 @@ const engine_api_tester_1 = require("@contember/engine-api-tester");
                     entities: {},
                 },
             },
-        }, {
-            identityId: (0, engine_api_tester_1.testUuid)(1),
-            personId: null,
-            memberships: [{ role: 'author', variables: [] }],
-        }), {
-            author__authorID: { definition, value: [] },
-        });
-    });
-    (0, vitest_1.it)('predefined', () => {
-        const definition = { type: schema_1.Acl.VariableType.predefined, value: 'identityID' };
-        vitest_1.assert.deepStrictEqual((0, src_1.createAclVariables)({
-            roles: {
-                author: {
-                    stages: '*',
-                    variables: {
-                        authorIdentity: definition,
-                    },
-                    entities: {},
-                },
-            },
-        }, {
-            identityId: (0, engine_api_tester_1.testUuid)(1),
-            personId: null,
-            memberships: [{ role: 'author', variables: [] }],
-        }), {
-            author__authorIdentity: { definition, value: [(0, engine_api_tester_1.testUuid)(1)] },
+        }, [{ role: 'author', variables: [] }]), {
+            author__authorID: { never: true },
         });
     });
 });

package/dist/tests/cases/unit/aclVariablesFactory.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aclVariablesFactory.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/aclVariablesFactory.test.ts"],"names":[],"mappings":";;AAAA,mCAA6C;AAC7C,sCAAiD;AACjD,8CAAuC;AACvC,oEAAuD;AAEvD,IAAA,iBAAQ,EAAC,sBAAsB,EAAE,GAAG,EAAE;IAErC,MAAM,UAAU,GAAuB,EAAE,IAAI,EAAE,YAAG,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAA;IAC9F,IAAA,WAAE,EAAC,yBAAyB,EAAE,GAAG,EAAE;QAClC,eAAM,CAAC,eAAe,CAAC,IAAA,wBAAkB,EAAC;YACzC,KAAK,EAAE;gBACN,MAAM,EAAE;oBACP,MAAM,EAAE,GAAG;oBACX,SAAS,EAAE;wBACV,QAAQ,EAAE,UAAU;qBACpB;oBACD,QAAQ,EAAE,EACT;iBACD;aACD;SACD,EAAE~~;YACF~~,~~UAAU~~,EAAE,~~IAAA~~,~~4BAAQ~~,~~EAAC,CAAC,CAAC;YACvB,~~QAAQ,EAAE,~~IAAI;YACd~~,~~WAAW,~~EAAE,CAAC,EAAE,IAAI,EAAE,~~QAAQ~~,EAAE,SAAS,EAAE,~~CAAC,~~EAAE,~~IAAI,~~EAAE,~~UAAU,~~EAAE,~~MAAM,EAAE,~~CAAC,IAAA,4BAAQ,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC~~;SAC3F~~,CAAC,EAAE;~~YACH~~,gBAAgB,EAAE,EAAE,~~UAAU,~~EAAE,~~KAAK,~~EAAE,CAAC,IAAA,4BAAQ,EAAC,CAAC,CAAC,CAAC,EAAE;~~SACtD~~,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAGF,IAAA,WAAE,EAAC,oBAAoB,EAAE,GAAG,EAAE;QAC7B,eAAM,CAAC,eAAe,CAAC,IAAA,wBAAkB,EAAC;YACzC,KAAK,EAAE;gBACN,MAAM,EAAE;oBACP,MAAM,EAAE,GAAG;oBACX,SAAS,EAAE;wBACV,QAAQ,EAAE,UAAU;qBACpB;oBACD,QAAQ,EAAE,EAAE;iBACZ;aACD;SACD,EAAE~~;YACF~~,~~UAAU,EAAE,IAAA,4BAAQ,EAAC,~~CAAC,~~CAAC;YACvB,QAAQ,~~EAAE,IAAI~~;YACd~~,~~WAAW,~~EAAE,~~CAAC,EAAE,IAAI,EAAE,~~QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC~~;SAChD~~,~~CAAC~~,EAAE;~~YACH~~,gBAAgB,EAAE,EAAE,~~UAAU,EAAE,~~KAAK,EAAE,~~EAAE,EAAE;SAC3C,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAGF,IAAA,WAAE,EAAC,YAAY,EAAE,GAAG,EAAE;QACrB,MAAM,UAAU,GAA2B,EAAE,~~IAAI,EAAE~~,YAAG,CAAC,YAAY,CAAC,UAAU,EAAE,KAAK,EAAE,YAAY,EAAE,CAAA~~;~~QACrG~~,~~eAAM,~~CAAC,eAAe,CAAC,IAAA,wBAAkB,EAAC;YACzC,KAAK,EAAE;gBACN,MAAM,EAAE;oBACP,MAAM,EAAE,GAAG;oBACX,SAAS,EAAE;wBACV,cAAc,EAAE,UAAU;qBAC1B;oBACD,QAAQ,EAAE,EAAE;iBACZ;aACD;SACD,EAAE;YACF,UAAU,EAAE,IAAA,4BAAQ,EAAC,CAAC,CAAC;YACvB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;SAChD,CAAC,EAAE;YACH,sBAAsB,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,IAAA,4BAAQ,EAAC,CAAC,CAAC,CAAC,EAAE;SAC5D,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"aclVariablesFactory.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/aclVariablesFactory.test.ts"],"names":[],"mappings":";;AAAA,mCAA6C;AAC7C,sCAAiD;AACjD,8CAAuC;AACvC,oEAAuD;AAEvD,IAAA,iBAAQ,EAAC,sBAAsB,EAAE,GAAG,EAAE;IAErC,MAAM,UAAU,GAAuB,EAAE,IAAI,EAAE,YAAG,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAA;IAC9F,IAAA,WAAE,EAAC,yBAAyB,EAAE,GAAG,EAAE;QAClC,eAAM,CAAC,eAAe,CAAC,IAAA,wBAAkB,EAAC;YACzC,KAAK,EAAE;gBACN,MAAM,EAAE;oBACP,MAAM,EAAE,GAAG;oBACX,SAAS,EAAE;wBACV,QAAQ,EAAE,UAAU;qBACpB;oBACD,QAAQ,EAAE,EACT;iBACD;aACD;SACD,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC,IAAA,4BAAQ,EAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE;YAC9F,gBAAgB,EAAE,EAAE,EAAE,EAAE,CAAC,IAAA,4BAAQ,EAAC,CAAC,CAAC,CAAC,EAAE;SACvC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAGF,IAAA,WAAE,EAAC,oBAAoB,EAAE,GAAG,EAAE;QAC7B,eAAM,CAAC,eAAe,CAAC,IAAA,wBAAkB,EAAC;YACzC,KAAK,EAAE;gBACN,MAAM,EAAE;oBACP,MAAM,EAAE,GAAG;oBACX,SAAS,EAAE;wBACV,QAAQ,EAAE,UAAU;qBACpB;oBACD,QAAQ,EAAE,EAAE;iBACZ;aACD;SACD,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CACrC,EAAE;YACF,gBAAgB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;SACjC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/unit/conditionOptimizer.test.d.ts ADDED Viewed

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

package/dist/tests/cases/unit/conditionOptimizer.test.d.ts.map ADDED Viewed

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

package/dist/tests/cases/unit/conditionOptimizer.test.js ADDED Viewed

@@ -0,0 +1,113 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const ConditionOptimizer_1 = require("../../../src/mapper/select/optimizer/ConditionOptimizer");
+(0, vitest_1.describe)('condition optimizer', () => {
+    const optimizer = new ConditionOptimizer_1.ConditionOptimizer();
+    (0, vitest_1.it)('remove OR when only 1', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            or: [{ eq: 1 }],
+        }), { eq: 1 });
+    });
+    (0, vitest_1.it)('keep OR when > 1', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            or: [{ eq: 1 }, { eq: 2 }],
+        }), {
+            or: [{ eq: 1 }, { eq: 2 }],
+        });
+    });
+    (0, vitest_1.it)('optimizes OR with never', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            or: [{ eq: 1 }, { never: true }],
+        }), { eq: 1 });
+    });
+    (0, vitest_1.it)('optimizes OR with always', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            or: [{ eq: 1 }, { always: true }],
+        }), true);
+    });
+    (0, vitest_1.it)('optimizes AND with never', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            and: [{ eq: 1 }, { never: true }],
+        }), false);
+    });
+    (0, vitest_1.it)('optimizes AND with always', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            and: [{ eq: 1 }, { always: true }],
+        }), { eq: 1 });
+    });
+    (0, vitest_1.it)('optimizes NOT with never', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            not: { never: true },
+        }), true);
+    });
+    (0, vitest_1.it)('optimizes NOT with always', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            not: { always: true },
+        }), false);
+    });
+    (0, vitest_1.it)('optimizes empty AND', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            and: [],
+        }), {});
+    });
+    (0, vitest_1.it)('optimizes empty OR', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            or: [],
+        }), {});
+    });
+    (0, vitest_1.it)('flattens AND', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            eq: 0,
+            and: [
+                { eq: 1 },
+                {
+                    eq: 2,
+                    and: [
+                        { eq: 3 },
+                        {
+                            eq: 4,
+                            and: [{ eq: 5 }, { eq: 6 }],
+                        },
+                    ],
+                },
+            ],
+        }), { and: [{ eq: 0 }, { eq: 1 }, { eq: 2 }, { eq: 3 }, { eq: 4 }, { eq: 5 }, { eq: 6 }] });
+    });
+    (0, vitest_1.it)('flattens OR', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            or: [
+                { eq: 1 },
+                {
+                    or: [
+                        { eq: 2 },
+                        { or: [{ eq: 3 }, { eq: 4 }] },
+                    ],
+                },
+            ],
+        }), { or: [{ eq: 1 }, { eq: 2 }, { eq: 3 }, { eq: 4 }] });
+    });
+    (0, vitest_1.it)('flattens NOT', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            not: { not: { not: { eq: 1 } } },
+        }), { not: { eq: 1 } });
+    });
+    (0, vitest_1.it)('combine AND and OR', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({
+            or: [
+                { and: [{ eq: 1 }, { eq: 2 }] },
+                { and: [{ eq: 3 }, { eq: 4 }], eq: 5 },
+            ],
+        }), { or: [
+                { and: [{ eq: 1 }, { eq: 2 }] },
+                { and: [{ eq: 3 }, { eq: 4 }, { eq: 5 }] },
+            ] });
+    });
+    (0, vitest_1.it)('remove conditions with null value', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({ eq: null }), {});
+    });
+    (0, vitest_1.it)('remove conditions with undefined value', () => {
+        vitest_1.assert.deepStrictEqual(optimizer.optimize({ eq: undefined }), {});
+    });
+});
+//# sourceMappingURL=conditionOptimizer.test.js.map

package/dist/tests/cases/unit/conditionOptimizer.test.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/dist/tests/cases/unit/orderbyHelper.test.js CHANGED Viewed

@@ -12,6 +12,7 @@ const entity = {
     fields: {},
     unique: {},
     eventLog: { enabled: true },
+    indexes: {},
 };
 (0, vitest_1.describe)('order by helper', () => {
     (0, vitest_1.it)('set default order by without defined order', () => {

package/dist/tests/cases/unit/orderbyHelper.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"orderbyHelper.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/orderbyHelper.test.ts"],"names":[],"mappings":";;AAAA,8CAAgD;AAChD,gDAAmD;AACnD,kEAAyD;AACzD,mCAA6C;AAE7C,MAAM,MAAM,GAAiB;IAC5B,IAAI,EAAE,KAAK;IACX,OAAO,EAAE,IAAI;IACb,aAAa,EAAE,IAAI;IACnB,SAAS,EAAE,KAAK;IAChB,MAAM,EAAE,EAAE;IACV,MAAM,EAAE,EAAE;IACV,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;~~CAC3B~~,CAAA;AAED,IAAA,iBAAQ,EAAC,iBAAiB,EAAE,GAAG,EAAE;IAGhC,IAAA,WAAE,EAAC,4CAA4C,EAAE,GAAG,EAAE;QACrD,MAAM,UAAU,GAAG,IAAI,4BAAU,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;QAEjE,MAAM,cAAc,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,EAAE,cAAK,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAA;QAC3F,MAAM,OAAO,GAAG,sBAAa,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc,CAAC,CAAA;QACtF,eAAM,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE;YAC5C,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,cAAK,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE;YAC/C,EAAE,EAAE,EAAE,cAAK,CAAC,cAAc,CAAC,GAAG,EAAE;SAChC,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,IAAA,WAAE,EAAC,wDAAwD,EAAE,GAAG,EAAE;QACjE,MAAM,UAAU,GAAG,IAAI,4BAAU,CAChC,MAAM,EACN,MAAM,EACN,EAAE,EACF;YACC,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,cAAK,CAAC,cAAc,CAAC,GAAG,EAAE,EAAE,CAAC;SACrD,EACD,EAAE,EACF,EAAE,CACF,CAAA;QAED,MAAM,cAAc,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,SAAS,EAAE,cAAK,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAA;QAC3F,MAAM,OAAO,GAAG,sBAAa,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,cAAc,CAAC,CAAA;QACtF,eAAM,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,cAAK,CAAC,cAAc,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,cAAK,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAC7H,CAAC,CAAC,CAAA;IAEF,IAAA,WAAE,EAAC,oDAAoD,EAAE,GAAG,EAAE;QAC7D,MAAM,UAAU,GAAG,IAAI,4BAAU,CAChC,MAAM,EACN,MAAM,EACN,EAAE,EACF;YACC,MAAM,EAAE,EAAE;YACV,KAAK,EAAE,EAAE;SACT,EACD,EAAE,EACF,EAAE,CACF,CAAA;QAED,MAAM,OAAO,GAAG,sBAAa,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,CAAA;QAC1E,eAAM,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,cAAK,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IACjF,CAAC,CAAC,CAAA;IAEF,IAAA,WAAE,EAAC,kCAAkC,EAAE,GAAG,EAAE;QAC3C,MAAM,UAAU,GAAG,IAAI,4BAAU,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;QAEjE,MAAM,OAAO,GAAG,sBAAa,CAAC,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,CAAA;QAC1E,eAAM,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACzC,CAAC,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"orderbyHelper.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/orderbyHelper.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/cases/unit/predicatesFactory.test.d.ts ADDED Viewed

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

package/dist/tests/cases/unit/predicatesFactory.test.d.ts.map ADDED Viewed

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

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

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

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

@@ -27,11 +27,14 @@ const permissions = {
             localePredicate: {
                 locale: 'localeVariable',
             },
+            localePredicate2: {
+                locale: 'localeVariable',
+            },
         },
         operations: {
             read: {
                 id: 'localePredicate',
-                title: 'localePredicate',
+                title: 'localePredicate2',
                 content: 'localePredicate',
             },
         },
@@ -39,34 +42,22 @@ const permissions = {
 };
 (0, vitest_1.describe)('Predicates injector', () => {
     const variables = {
-        localeVariable: {
-            definition: {
-                type: schema_1.Acl.VariableType.condition,
-            },
-            value: [{ in: ['cs'] }],
-        },
+        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'] },
@@ -75,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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"predicatesInjector.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/predicatesInjector.test.ts"],"names":[],"mappings":";;AAAA,0CAAyF;AACzF,oEAA4D;AAC5D,8CAA8C;AAC9C,mCAA6C;AAI7C,MAAM,MAAM,GAAG,IAAI,iCAAa,EAAE;KAChC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;KAC5B,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;KACjG,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,CAC9B,MAAM;KACJ,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;KAC/D,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;KACjE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CACxF;KACA,WAAW,EAAE,CAAA;AAEf,MAAM,WAAW,GAAoB;IACpC,IAAI,EAAE;QACL,UAAU,EAAE,EAAE;QACd,UAAU,EAAE;YACX,IAAI,EAAE;gBACL,EAAE,EAAE,IAAI;gBACR,OAAO,EAAE,IAAI;aACb;SACD;KACD;IACD,UAAU,EAAE;QACX,UAAU,EAAE;YACX,eAAe,EAAE;gBAChB,MAAM,EAAE,gBAAgB;aACxB;SACD;QACD,UAAU,EAAE;YACX,IAAI,EAAE;gBACL,EAAE,EAAE,iBAAiB;gBACrB,KAAK,EAAE,~~iBAAiB~~;~~gBACxB~~,OAAO,EAAE,iBAAiB;aAC1B;SACD;KACD;CACD,CAAA;AAED,IAAA,iBAAQ,EAAC,qBAAqB,EAAE,GAAG,EAAE;IAEpC,MAAM,SAAS,GAAqB;QACnC,cAAc,EAAE~~;YACf~~,~~UAAU,~~EAAE~~;gBACX~~,~~IAAI,~~EAAE,~~YAAG,CAAC,YAAY,CAAC,SAAS;aAChC;YACD,KAAK,~~EAAE,CAAC,~~EAAE,EAAE,EAAE,CAAC,~~IAAI,CAAC,EAAE~~,CAAC~~;~~SACvB;KACD~~,CAAA;IACD,IAAA,WAAE,EAAC,mBAAmB,EAAE,GAAG,EAAE;QAC5B,MAAM,QAAQ,GAAG,IAAI,wBAAkB,CACtC,MAAM,EACN,IAAI,sBAAgB,CAAC,WAAW,EAAE,IAAI,sBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,~~CAC1E~~,CAAA;QACD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAA;QAEjE,eAAM,CAAC,eAAe,CAAC,MAAM,EAAE;YAC9B,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE;SACtB,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,IAAA,WAAE,EAAC,sCAAsC,EAAE,GAAG,EAAE;QAC/C,MAAM,QAAQ,GAAG,IAAI,wBAAkB,CACtC,MAAM,EACN,IAAI,sBAAgB,CAAC,WAAW,EAAE,IAAI,sBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,~~CAC1E~~,CAAA;QACD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAErF,eAAM,CAAC,eAAe,CAAC,MAAM,EAAE;YAC9B,GAAG,EAAE;gBACJ;oBACC,~~GAAG,~~EAAE~~;wBACJ;4BACC~~,EAAE,EAAE,EAAE,EAAE,~~EAAE,~~CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;~~yBAClB~~;~~wBACD;4BACC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE;yBACtB;qBACD;iBACD;~~gBACD;oBACC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE;iBACtB;aACD;SACD,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,IAAA,WAAE,EAAC,4BAA4B,EAAE,GAAG,EAAE;QACrC,MAAM,QAAQ,GAAG,IAAI,wBAAkB,CACtC,MAAM,EACN,IAAI,sBAAgB,CAAC,WAAW,EAAE,IAAI,sBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,~~CAC1E~~,CAAA;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;QAEvF,eAAM,CAAC,eAAe,CAAC,MAAM,EAAE;YAC9B,GAAG,EAAE;gBACJ;oBACC,GAAG,EAAE;wBACJ;4BACC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;yBACpB;wBACD;4BACC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE;yBACtB;qBACD;iBACD;gBACD;oBACC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE;iBACtB;aACD;SACD,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
1	+ {"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 CHANGED Viewed

@@ -16,19 +16,8 @@ const vitest_1 = require("vitest");
             .buildSchema();
         const ids = ['91528a5c-839b-4114-9952-d661914a607f', '1e2f3937-a0b1-4105-8aae-6da8ac9fc146'];
         const injector = new acl_1.VariableInjector(schema, {
-            site: {
-                definition: {
-                    type: schema_1.Acl.VariableType.entity,
-                    entityName: 'Site',
-                },
-                value: ids,
-            },
-            locale: {
-                definition: {
-                    type: schema_1.Acl.VariableType.condition,
-                },
-                value: [{ eq: 'cs' }],
-            },
+            site: { in: ids },
+            locale: { eq: 'cs' },
         });
         const result = injector.inject(schema.entities['PostLocale'], {
             or: [

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

	@@ -1 +1 @@
1	- {"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~~;gBACL~~,~~UAAU,~~EAAE~~;oBACX~~,~~IAAI,~~EAAE,~~YAAG,CAAC,YAAY,CAAC,MAAM;oBAC7B,UAAU,~~EAAE,~~MAAM;iBAClB;gBACD~~,~~KAAK,~~EAAE~~,GAAG~~;~~aACV;YACD~~,MAAM,EAAE~~;gBACP~~,~~UAAU,~~EAAE~~;oBACX~~,~~IAAI,~~EAAE,~~YAAG,CAAC,YAAY,CAAC,SAAS;iBAChC;gBACD,KAAK,~~EAAE,~~CAAC,EAAE,EAAE,EAAE,~~IAAI,EAAE~~,CAAC~~;~~aACrB;SACD~~,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"}
1	+ {"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"}