npm - @contember/engine-content-api - Versions diffs - 1.2.0-alpha.12 → 1.2.0-alpha.14 - Mend

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

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 (101) hide show

package/dist/tests/cases/integration/graphQlRequests/query/acl/differentRowAndFieldPredicate.test.js CHANGED Viewed

@@ -39,16 +39,18 @@ const permissions = {
         executes: [
             {
                 sql: (0, tags_1.SQL) `
-					select "root_"."id" as "root_id",
-						case when "root_"."username" = ? then "root_"."username" else null end as "root_username"
-					from "public"."author" as "root_"
-					where not("root_"."username" is null)
+					select
+					    "root_"."id" as "root_id",
+					    "root_"."username" = ? as "root___predicate_authorPredicate",
+					    "root_"."username" as "root_username"
+					from "public"."author" as "root_" where not("root_"."username" is null)
 				`,
                 parameters: ['johndoe'],
                 response: {
                     rows: [
                         {
                             root_id: (0, testUuid_1.testUuid)(1),
+                            root___predicate_authorPredicate: true,
                             root_username: 'johndoe',
                         },
                     ],
@@ -67,4 +69,49 @@ const permissions = {
         },
     });
 });
+(0, vitest_1.test)('different predicate on row and field level - false', async () => {
+    await (0, test_1.execute)({
+        schema: schema,
+        permissions: permissions,
+        variables: {},
+        query: (0, tags_1.GQL) `
+        query {
+          listAuthor {
+            id
+            username
+          }
+        }`,
+        executes: [
+            {
+                sql: (0, tags_1.SQL) `
+					select
+					    "root_"."id" as "root_id",
+					    "root_"."username" = ? as "root___predicate_authorPredicate",
+					    "root_"."username" as "root_username"
+					from "public"."author" as "root_" where not("root_"."username" is null)
+				`,
+                parameters: ['johndoe'],
+                response: {
+                    rows: [
+                        {
+                            root_id: (0, testUuid_1.testUuid)(1),
+                            root___predicate_authorPredicate: false,
+                            root_username: 'johndoe',
+                        },
+                    ],
+                },
+            },
+        ],
+        return: {
+            data: {
+                listAuthor: [
+                    {
+                        id: (0, testUuid_1.testUuid)(1),
+                        username: null,
+                    },
+                ],
+            },
+        },
+    });
+});
 //# sourceMappingURL=differentRowAndFieldPredicate.test.js.map

package/dist/tests/cases/integration/graphQlRequests/query/acl/differentRowAndFieldPredicate.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"differentRowAndFieldPredicate.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/acl/differentRowAndFieldPredicate.test.ts"],"names":[],"mappings":";;AAAA,oEAA4D;AAE5D,mCAA6B;AAC7B,kDAAiD;AACjD,kDAAkD;AAClD,0DAAsD;AAEtD,MAAM,MAAM,GAAG,IAAI,iCAAa,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;AAE5F,MAAM,WAAW,GAAoB;IACpC,MAAM,EAAE;QACP,UAAU,EAAE;YACX,eAAe,EAAE;gBAChB,QAAQ,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE;aAC3B;YACD,gBAAgB,EAAE;gBACjB,QAAQ,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;aAC3B;SACD;QACD,UAAU,EAAE;YACX,IAAI,EAAE;gBACL,EAAE,EAAE,kBAAkB;gBACtB,QAAQ,EAAE,iBAAiB;aAC3B;SACD;KACD;CACD,CAAA;AAED,IAAA,aAAI,EAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;IAC7D,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;UAMF;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA~~;;;;;KAKP~~;gBACD,UAAU,EAAE,CAAC,SAAS,CAAC;gBACvB,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,aAAa,EAAE,SAAS;yBACxB;qBACD;iBACD;aACD;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,UAAU,EAAE;oBACX;wBACC,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;wBACf,QAAQ,EAAE,SAAS;qBACnB;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"differentRowAndFieldPredicate.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/acl/differentRowAndFieldPredicate.test.ts"],"names":[],"mappings":";;AAAA,oEAA4D;AAE5D,mCAA6B;AAC7B,kDAAiD;AACjD,kDAAkD;AAClD,0DAAsD;AAEtD,MAAM,MAAM,GAAG,IAAI,iCAAa,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;AAE5F,MAAM,WAAW,GAAoB;IACpC,MAAM,EAAE;QACP,UAAU,EAAE;YACX,eAAe,EAAE;gBAChB,QAAQ,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE;aAC3B;YACD,gBAAgB,EAAE;gBACjB,QAAQ,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;aAC3B;SACD;QACD,UAAU,EAAE;YACX,IAAI,EAAE;gBACL,EAAE,EAAE,kBAAkB;gBACtB,QAAQ,EAAE,iBAAiB;aAC3B;SACD;KACD;CACD,CAAA;AAED,IAAA,aAAI,EAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;IAC7D,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;UAMF;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;;;;KAMP;gBACD,UAAU,EAAE,CAAC,SAAS,CAAC;gBACvB,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,gCAAgC,EAAE,IAAI;4BACtC,aAAa,EAAE,SAAS;yBACxB;qBACD;iBACD;aACD;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,UAAU,EAAE;oBACX;wBACC,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;wBACf,QAAQ,EAAE,SAAS;qBACnB;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAIF,IAAA,aAAI,EAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;IACrE,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;UAMF;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;;;;KAMP;gBACD,UAAU,EAAE,CAAC,SAAS,CAAC;gBACvB,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,gCAAgC,EAAE,KAAK;4BACvC,aAAa,EAAE,SAAS;yBACxB;qBACD;iBACD;aACD;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,UAAU,EAAE;oBACX;wBACC,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;wBACf,QAAQ,EAAE,IAAI;qBACd;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.js CHANGED Viewed

@@ -60,26 +60,23 @@ const permissions = {
         }`,
         executes: [
             {
-                sql: (0, tags_1.SQL) `select
-                         "root_"."id" as "root_id",
-                         case when "root_"."locale" in (?) then "root_"."title" else null end as "root_title",
-                         "root_"."locale" in (?) as "root__meta_title_readable",
-                         false as "root__meta_title_updatable"
-                       from "public"."post_locale" as "root_"`,
-                parameters: ['cs', 'cs'],
+                sql: (0, tags_1.SQL) `SELECT
+							 "root_"."id" AS "root_id",
+							 "root_"."locale" IN (?) AS "root___predicate_localePredicate",
+							 "root_"."title" AS "root_title"
+						 FROM "public"."post_locale" AS "root_"`,
+                parameters: ['cs'],
                 response: {
                     rows: [
                         {
                             root_id: (0, testUuid_1.testUuid)(1),
                             root_title: null,
-                            root__meta_title_readable: false,
-                            root__meta_title_updatable: false,
+                            root___predicate_localePredicate: false,
                         },
                         {
                             root_id: (0, testUuid_1.testUuid)(2),
                             root_title: 'bar',
-                            root__meta_title_readable: true,
-                            root__meta_title_updatable: false,
+                            root___predicate_localePredicate: true,
                         },
                     ],
                 },
@@ -130,8 +127,9 @@ const permissions = {
         executes: [
             {
                 sql: (0, tags_1.SQL) `select
-                         "root_"."id" as "root_id",
-                         case when "root_"."locale" in (?) then "root_"."title" else null end as "root_title"
+							 "root_"."id" as "root_id",
+							 "root_"."locale" in (?) as "root___predicate_localePredicate",
+							 "root_"."title" as "root_title"
                        from "public"."post_locale" as "root_"
                        where "root_"."title" = ? and "root_"."locale" in (?)`,
                 parameters: ['cs', 'foo', 'cs'],
@@ -140,7 +138,7 @@ const permissions = {
                         {
                             root_id: (0, testUuid_1.testUuid)(1),
                             root_title: 'foo',
-                            root_title__readable: true,
+                            root___predicate_localePredicate: true,
                         },
                     ],
                 },
@@ -211,10 +209,11 @@ const permissions = {
         }`,
         executes: [
             {
-                sql: (0, tags_1.SQL) `select
-                         "root_"."id" as "root_id",
-                         case when false then "root_"."title" else null end as "root_title"
-                       from "public"."post_locale" as "root_"`,
+                sql: (0, tags_1.SQL) `
+					select "root_"."id" as "root_id",
+					       false as "root___predicate_localePredicate",
+					       "root_"."title" as "root_title"
+					from "public"."post_locale" as "root_"`,
                 parameters: [],
                 response: {
                     rows: [],
@@ -263,23 +262,25 @@ const permissions = {
                 },
             },
             {
-                sql: (0, tags_1.SQL) `select
-                         "root_"."post_id" as "__grouping_key",
-                         "root_"."id" as "root_id",
-                         case when "root_"."locale" in (?) then "root_"."title" else null end as "root_title"
-                       from "public"."post_locale" as "root_"
-                       where "root_"."post_id" in (?, ?)`,
+                sql: (0, tags_1.SQL) `
+					select "root_"."post_id" as "__grouping_key",
+					       "root_"."id" as "root_id",
+					       "root_"."locale" in (?) as "root___predicate_localePredicate",
+					       "root_"."title" as "root_title"
+					from "public"."post_locale" as "root_" where "root_"."post_id" in (?, ?)`,
                 parameters: ['cs', (0, testUuid_1.testUuid)(1), (0, testUuid_1.testUuid)(2)],
                 response: {
                     rows: [
                         {
                             __grouping_key: (0, testUuid_1.testUuid)(1),
                             root_id: (0, testUuid_1.testUuid)(3),
-                            root_title: null,
+                            root___predicate_localePredicate: false,
+                            root_title: 'foo',
                         },
                         {
                             __grouping_key: (0, testUuid_1.testUuid)(2),
                             root_id: (0, testUuid_1.testUuid)(4),
+                            root___predicate_localePredicate: true,
                             root_title: 'bar',
                         },
                     ],

package/dist/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fieldRestrictedByLocale.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.ts"],"names":[],"mappings":";;AAAA,oEAA4D;AAC5D,8CAA8C;AAC9C,mCAA6B;AAC7B,kDAAiD;AACjD,kDAAkD;AAClD,0DAAsD;AAEtD,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,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;KACjH,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,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,IAAI;gBACR,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,iBAAiB;aACxB;SACD;KACD;CACD,CAAA;AAED,IAAA,aAAI,EAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;IACxC,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE;YACV,cAAc,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE;SAC9B;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;;;;;;UAYF;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA~~;;;;;8DAKkD~~;~~gBAC1D~~,UAAU,EAAE,CAAC,IAAI,~~EAAE,IAAI,~~CAAC;~~gBACxB~~,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,UAAU,EAAE,IAAI;4BAChB,~~yBAAyB~~,EAAE,KAAK;~~4BAChC,0BAA0B,EAAE,KAAK~~;~~yBACjC;~~wBACD;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,UAAU,EAAE,KAAK;4BACjB,~~yBAAyB~~,EAAE,IAAI;~~4BAC/B,0BAA0B,EAAE,KAAK~~;~~yBACjC;~~qBACD;iBACD;aACD;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,cAAc,EAAE;oBACf;wBACC,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;wBACf,KAAK,EAAE,IAAI;wBACX,KAAK,EAAE;4BACN,KAAK,EAAE;gCACN,QAAQ,EAAE,KAAK;gCACf,SAAS,EAAE,KAAK;6BAChB;yBACD;qBACD;oBACD;wBACC,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;wBACf,KAAK,EAAE,KAAK;wBACZ,KAAK,EAAE;4BACN,KAAK,EAAE;gCACN,QAAQ,EAAE,IAAI;gCACd,SAAS,EAAE,KAAK;6BAChB;yBACD;qBACD;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;IAC5C,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE;YACV,cAAc,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE;SAC9B;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;UAMF;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA~~;;;;6EAIiE~~;gBACzE,UAAU,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC;gBAC/B,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,UAAU,EAAE,KAAK;4BACjB,~~oBAAoB~~,EAAE,IAAI;~~yBAC1B~~;qBACD;iBACD;aACD;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,cAAc,EAAE;oBACf;wBACC,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;wBACf,KAAK,EAAE,KAAK;qBACZ;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;IACnC,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE;YACV,cAAc,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE;SAC9B;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;UAKF;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;4DAEgD;gBACxD,UAAU,EAAE,EAAE;gBACd,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;yBACpB;qBACD;iBACD;aACD;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,cAAc,EAAE;oBACf;wBACC,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;qBACf;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;IAC3C,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;UAMF;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA~~;;;8DAGkD~~;~~gBAC1D~~,UAAU,EAAE,EAAE;gBACd,QAAQ,EAAE;oBACT,IAAI,EAAE,EAAE;iBACR;aACD;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,cAAc,EAAE,EAAE;aAClB;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;IAC3C,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE;YACV,cAAc,EAAE,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE;SAC9B;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;;UAQF;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;uDAG2C;gBACnD,UAAU,EAAE,EAAE;gBACd,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;yBACpB;wBACD;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;yBACpB;qBACD;iBACD;aACD;YACD;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;;;~~yDAK6C~~;~~gBACrD~~,UAAU,EAAE,CAAC,IAAI,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;gBAC5C,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,cAAc,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BAC3B,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,UAAU,EAAE,~~IAAI~~;~~yBAChB~~;wBACD;4BACC,cAAc,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BAC3B,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,UAAU,EAAE,KAAK;yBACjB;qBACD;iBACD;aACD;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,QAAQ,EAAE;oBACT;wBACC,OAAO,EAAE;4BACR;gCACC,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;gCACf,KAAK,EAAE,IAAI;6BACX;yBACD;qBACD;oBACD;wBACC,OAAO,EAAE;4BACR;gCACC,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;gCACf,KAAK,EAAE,KAAK;6BACZ;yBACD;qBACD;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"fieldRestrictedByLocale.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.js CHANGED Viewed

@@ -83,17 +83,20 @@ const permissions = {
                 },
             },
             {
-                sql: (0, tags_1.SQL) `select
-                         "root_"."id" as "root_id",
-                         case when "root_country"."name" in (?) then "root_"."name" else null end as "root_name",
-                         "root_"."id" as "root_id"
-                       from "public"."author" as "root_" left join "public"."country" as "root_country" on "root_"."country_id" = "root_country"."id"
-                       where "root_"."id" in (?, ?)`,
+                sql: (0, tags_1.SQL) `SELECT
+							 "root_"."id" AS "root_id",
+							 "root_country"."name" IN (?) AS "root___predicate_countryPredicate",
+							 "root_"."name" AS "root_name",
+							 "root_"."id" AS "root_id"
+						 FROM "public"."author" AS "root_"
+						 LEFT JOIN "public"."country" AS "root_country" ON "root_"."country_id" = "root_country"."id"
+						 WHERE "root_"."id" IN (?, ?)`,
                 parameters: ['Czechia', (0, testUuid_1.testUuid)(3), (0, testUuid_1.testUuid)(4)],
                 response: {
                     rows: [
                         {
                             root_id: (0, testUuid_1.testUuid)(3),
+                            root___predicate_countryPredicate: true,
                             root_name: 'John',
                         },
                     ],

package/dist/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"nestedPredicate.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.ts"],"names":[],"mappings":";;AAAA,oEAA4D;AAC5D,8CAA8C;AAC9C,mCAA6B;AAC7B,kDAAiD;AACjD,kDAAkD;AAClD,0DAAsD;AAEtD,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,CAC/B,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CACtC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CACtB,CAAC;KACC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;KACpD,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,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,CAC9G,CACD,CACD;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,MAAM,EAAE,IAAI;aACZ;SACD;KACD;IACD,MAAM,EAAE;QACP,UAAU,EAAE;YACX,gBAAgB,EAAE;gBACjB,OAAO,EAAE;oBACR,IAAI,EAAE,iBAAiB;iBACvB;aACD;SACD;QACD,UAAU,EAAE;YACX,IAAI,EAAE;gBACL,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,kBAAkB;aACxB;SACD;KACD;IACD,OAAO,EAAE;QACR,UAAU,EAAE,EAAE;QACd,UAAU,EAAE;YACX,IAAI,EAAE;gBACL,EAAE,EAAE,IAAI;aACR;SACD;KACD;CACD,CAAA;AAED,IAAA,aAAI,EAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;IAC9C,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE;YACV,eAAe,EAAE,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE;SACpC;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;;UAQF;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;uDAG2C;gBACnD,UAAU,EAAE,EAAE;gBACd,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,WAAW,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;yBACxB;wBACD;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,WAAW,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;yBACxB;qBACD;iBACD;aACD;YACD;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA~~;;;;;oDAKwC~~;~~gBAChD~~,UAAU,EAAE,CAAC,SAAS,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;gBACjD,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,SAAS,EAAE,MAAM;yBACjB;qBACD;iBACD;aACD;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,QAAQ,EAAE;oBACT;wBACC,MAAM,EAAE;4BACP,IAAI,EAAE,MAAM;yBACZ;wBACD,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;qBACf;oBACD;wBACC,MAAM,EAAE,IAAI;wBACZ,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;qBACf;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"nestedPredicate.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.ts"],"names":[],"mappings":";;AAAA,oEAA4D;AAC5D,8CAA8C;AAC9C,mCAA6B;AAC7B,kDAAiD;AACjD,kDAAkD;AAClD,0DAAsD;AAEtD,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,CAC/B,aAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CACtC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CACtB,CAAC;KACC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;KACpD,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,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,CAC9G,CACD,CACD;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,MAAM,EAAE,IAAI;aACZ;SACD;KACD;IACD,MAAM,EAAE;QACP,UAAU,EAAE;YACX,gBAAgB,EAAE;gBACjB,OAAO,EAAE;oBACR,IAAI,EAAE,iBAAiB;iBACvB;aACD;SACD;QACD,UAAU,EAAE;YACX,IAAI,EAAE;gBACL,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,kBAAkB;aACxB;SACD;KACD;IACD,OAAO,EAAE;QACR,UAAU,EAAE,EAAE;QACd,UAAU,EAAE;YACX,IAAI,EAAE;gBACL,EAAE,EAAE,IAAI;aACR;SACD;KACD;CACD,CAAA;AAED,IAAA,aAAI,EAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;IAC9C,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE;YACV,eAAe,EAAE,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE;SACpC;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;;UAQF;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;uDAG2C;gBACnD,UAAU,EAAE,EAAE;gBACd,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,WAAW,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;yBACxB;wBACD;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,WAAW,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;yBACxB;qBACD;iBACD;aACD;YACD;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;;;;;oCAOwB;gBAChC,UAAU,EAAE,CAAC,SAAS,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;gBACjD,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,iCAAiC,EAAE,IAAI;4BACvC,SAAS,EAAE,MAAM;yBACjB;qBACD;iBACD;aACD;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,QAAQ,EAAE;oBACT;wBACC,MAAM,EAAE;4BACP,IAAI,EAAE,MAAM;yBACZ;wBACD,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;qBACf;oBACD;wBACC,MAAM,EAAE,IAAI;wBACZ,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;qBACf;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.d.ts ADDED Viewed

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

package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"rowPredicateSubset.test.d.ts","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.ts"],"names":[],"mappings":""}

package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.js ADDED Viewed

@@ -0,0 +1,109 @@
+"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 schema_definition_1 = require("@contember/schema-definition");
+const vitest_1 = require("vitest");
+const test_1 = require("../../../../../src/test");
+const tags_1 = require("../../../../../src/tags");
+const testUuid_1 = require("../../../../../src/testUuid");
+const src_1 = require("../../../../../../src");
+var RowPredicateSubset;
+(function (RowPredicateSubset) {
+    RowPredicateSubset.readerRole = schema_definition_1.AclDefinition.createRole('reader');
+    let Article = class Article {
+        constructor() {
+            this.isPublished = schema_definition_1.SchemaDefinition.boolColumn();
+            this.isUnlocked = schema_definition_1.SchemaDefinition.boolColumn();
+            this.title = schema_definition_1.SchemaDefinition.stringColumn();
+            this.content = schema_definition_1.SchemaDefinition.stringColumn();
+        }
+    };
+    Article = __decorate([
+        schema_definition_1.AclDefinition.allow(RowPredicateSubset.readerRole, {
+            when: {
+                isPublished: { eq: true },
+            },
+            read: ['isPublished', 'isUnlocked', 'title'],
+        }),
+        schema_definition_1.AclDefinition.allow(RowPredicateSubset.readerRole, {
+            when: {
+                and: [
+                    { isUnlocked: { eq: true } },
+                    { isPublished: { eq: true } },
+                ],
+            },
+            read: ['content'],
+        })
+    ], Article);
+    RowPredicateSubset.Article = Article;
+})(RowPredicateSubset || (RowPredicateSubset = {}));
+(0, vitest_1.test)('row level predicate includes main predicate', async () => {
+    const schema = (0, schema_definition_1.createSchema)(RowPredicateSubset);
+    const permissions = new src_1.PermissionFactory(schema.model).create(schema.acl, ['reader']);
+    await (0, test_1.execute)({
+        schema: schema.model,
+        permissions: permissions,
+        variables: {},
+        query: (0, tags_1.GQL) `
+        query {
+          listArticle {
+            id
+            title
+            content
+          }
+        }`,
+        executes: [
+            {
+                sql: (0, tags_1.SQL) `SELECT
+							 "root_"."id" AS "root_id",
+							 TRUE AS "root___predicate_isPublished_eq_true",
+							 "root_"."title" AS "root_title",
+							 "root_"."is_unlocked" = ? AS "root___predicate_and_isUnlocked_eq_true_isPubl",
+							 "root_"."content" AS "root_content"
+						 FROM "public"."article" AS "root_"
+						 WHERE "root_"."is_published" = ?`,
+                parameters: [true, true],
+                response: {
+                    rows: [
+                        {
+                            root_id: (0, testUuid_1.testUuid)(1),
+                            root___predicate_isPublished_eq_true: true,
+                            root_title: 'Hello',
+                            root___predicate_and_isUnlocked_eq_true_isPubl: false,
+                            root_content: 'Foo bar',
+                        },
+                        {
+                            root_id: (0, testUuid_1.testUuid)(2),
+                            root___predicate_isPublished_eq_true: true,
+                            root_title: 'Hello 2',
+                            root___predicate_and_isUnlocked_eq_true_isPubl: true,
+                            root_content: 'Lorem ipsum',
+                        },
+                    ],
+                },
+            },
+        ],
+        return: {
+            data: {
+                listArticle: [
+                    {
+                        id: (0, testUuid_1.testUuid)(1),
+                        title: 'Hello',
+                        content: null,
+                    },
+                    {
+                        id: (0, testUuid_1.testUuid)(2),
+                        title: 'Hello 2',
+                        content: 'Lorem ipsum',
+                    },
+                ],
+            },
+        },
+    });
+});
+//# sourceMappingURL=rowPredicateSubset.test.js.map

package/dist/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"rowPredicateSubset.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.ts"],"names":[],"mappings":";;;;;;;;AAAA,oEAA0G;AAE1G,mCAA6B;AAC7B,kDAAiD;AACjD,kDAAkD;AAClD,0DAAsD;AACtD,+CAAyD;AAGzD,IAAU,kBAAkB,CAuB3B;AAvBD,WAAU,kBAAkB;IACd,6BAAU,GAAG,iCAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IAgBlD,IAAa,OAAO,GAApB,MAAa,OAAO;QAApB;YACC,gBAAW,GAAG,oCAAG,CAAC,UAAU,EAAE,CAAA;YAC9B,eAAU,GAAG,oCAAG,CAAC,UAAU,EAAE,CAAA;YAC7B,UAAK,GAAG,oCAAG,CAAC,YAAY,EAAE,CAAA;YAC1B,YAAO,GAAG,oCAAG,CAAC,YAAY,EAAE,CAAA;QAC7B,CAAC;KAAA,CAAA;IALY,OAAO;QAfnB,iCAAG,CAAC,KAAK,CAAC,mBAAA,UAAU,EAAE;YACtB,IAAI,EAAE;gBACL,WAAW,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE;aACzB;YACD,IAAI,EAAE,CAAC,aAAa,EAAE,YAAY,EAAE,OAAO,CAAC;SAC5C,CAAC;QACD,iCAAG,CAAC,KAAK,CAAC,mBAAA,UAAU,EAAE;YACtB,IAAI,EAAE;gBACL,GAAG,EAAE;oBACJ,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;oBAC5B,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;iBAC7B;aACD;YACD,IAAI,EAAE,CAAC,SAAS,CAAC;SACjB,CAAC;OACW,OAAO,CAKnB;IALY,0BAAO,UAKnB,CAAA;AACF,CAAC,EAvBS,kBAAkB,KAAlB,kBAAkB,QAuB3B;AAID,IAAA,aAAI,EAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;IAC9D,MAAM,MAAM,GAAG,IAAA,gCAAY,EAAC,kBAAkB,CAAC,CAAA;IAE/C,MAAM,WAAW,GAAG,IAAI,uBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEtF,MAAM,IAAA,cAAO,EAAC;QACb,MAAM,EAAE,MAAM,CAAC,KAAK;QACpB,WAAW,EAAE,WAAW;QACxB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;UAOF;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;;;;;wCAO4B;gBACpC,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;gBACxB,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,oCAAoC,EAAE,IAAI;4BAC1C,UAAU,EAAE,OAAO;4BACnB,8CAA8C,EAAE,KAAK;4BACrD,YAAY,EAAE,SAAS;yBACvB;wBACD;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,oCAAoC,EAAE,IAAI;4BAC1C,UAAU,EAAE,SAAS;4BACrB,8CAA8C,EAAE,IAAI;4BACpD,YAAY,EAAE,aAAa;yBAC3B;qBACD;iBACD;aACD;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,WAAW,EAAE;oBACZ;wBACC,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;wBACf,KAAK,EAAE,OAAO;wBACd,OAAO,EAAE,IAAI;qBACb;oBACD;wBACC,EAAE,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;wBACf,KAAK,EAAE,SAAS;wBAChB,OAAO,EAAE,aAAa;qBACtB;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/tests/cases/integration/graphQlRequests/query/graphqlFeatures/alias.test.js CHANGED Viewed

@@ -77,15 +77,13 @@ const testUuid_1 = require("../../../../../src/testUuid");
         }`,
         executes: [
             {
-                sql: (0, tags_1.SQL) `select
-                     "root_"."id" as "root_idx",
-                     "root_"."name" as "root_name1",
-                     "root_"."name" as "root_name2",
-                     true as "root_meta_name1_readable1",
-                     true as "root_meta_name1_readable2",
-                     "root_"."name" = ? as "root_meta_name1_updatable1",
-                     "root_"."id" as "root_id"
-                   from "public"."author" as "root_"`,
+                sql: (0, tags_1.SQL) `SELECT
+							 "root_"."id" AS "root_idx",
+							 "root_"."name" AS "root_name1",
+							 "root_"."name" AS "root_name2",
+							 "root_"."name" = ? AS "root___predicate_name_eq",
+							 "root_"."id" AS "root_id"
+						 FROM "public"."author" AS "root_"`,
                 parameters: ['John'],
                 response: {
                     rows: [
@@ -94,9 +92,7 @@ const testUuid_1 = require("../../../../../src/testUuid");
                             root_idx: (0, testUuid_1.testUuid)(1),
                             root_name1: 'John',
                             root_name2: 'John',
-                            root_meta_name1_readable1: true,
-                            root_meta_name1_readable2: true,
-                            root_meta_name1_updatable1: false,
+                            root___predicate_name_eq: true,
                         },
                     ],
                 },
@@ -111,7 +107,7 @@ const testUuid_1 = require("../../../../../src/testUuid");
                             name1: {
                                 readable1: true,
                                 readable2: true,
-                                updatable1: false,
+                                updatable1: true,
                             },
                         },
                         name1: 'John',

package/dist/tests/cases/integration/graphQlRequests/query/graphqlFeatures/alias.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"alias.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/graphqlFeatures/alias.test.ts"],"names":[],"mappings":";;AAAA,mCAA6B;AAC7B,kDAAiD;AACjD,oEAA4D;AAC5D,8CAAyC;AACzC,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,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;aAChG,WAAW,EAAE;QACf,KAAK,EAAE,IAAA,UAAG,EAAA;;8BAEkB,IAAA,mBAAQ,EAAC,CAAC,CAAC;;;UAG/B;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;;4CAIgC;gBACxC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,EAAE;gBAC/C,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;aACzB;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,OAAO,EAAE;oBACR,OAAO,EAAE,OAAO;iBAChB;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,SAAS,EAAE,KAAK,IAAI,EAAE;IAC1B,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,WAAW,EAAE;YACZ,MAAM,EAAE;gBACP,UAAU,EAAE;oBACX,OAAO,EAAE;wBACR,IAAI,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;qBACpB;iBACD;gBACD,UAAU,EAAE;oBACX,IAAI,EAAE;wBACL,EAAE,EAAE,IAAI;wBACR,IAAI,EAAE,IAAI;qBACV;oBACD,MAAM,EAAE;wBACP,IAAI,EAAE,SAAS;qBACf;iBACD;aACD;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;;;;;;;;UAcF;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA~~;;;;;;;;qDAQyC~~;~~gBACjD~~,UAAU,EAAE,CAAC,MAAM,CAAC;gBACpB,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,QAAQ,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACrB,UAAU,EAAE,MAAM;4BAClB,UAAU,EAAE,MAAM;4BAClB,~~yBAAyB~~,EAAE,IAAI;~~4BAC/B,yBAAyB,EAAE,IAAI~~;~~4BAC/B,0BAA0B,EAAE,KAAK;yBACjC;~~qBACD;iBACD;aACD;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,UAAU,EAAE;oBACX;wBACC,GAAG,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;wBAChB,IAAI,EAAE;4BACL,KAAK,EAAE;gCACN,SAAS,EAAE,IAAI;gCACf,SAAS,EAAE,IAAI;gCACf,UAAU,EAAE,~~KAAK~~;~~6BACjB~~;yBACD;wBACD,KAAK,EAAE,MAAM;wBACb,KAAK,EAAE,MAAM;qBACb;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"alias.test.js","sourceRoot":"","sources":["../../../../../../../tests/cases/integration/graphQlRequests/query/graphqlFeatures/alias.test.ts"],"names":[],"mappings":";;AAAA,mCAA6B;AAC7B,kDAAiD;AACjD,oEAA4D;AAC5D,8CAAyC;AACzC,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,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,cAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;aAChG,WAAW,EAAE;QACf,KAAK,EAAE,IAAA,UAAG,EAAA;;8BAEkB,IAAA,mBAAQ,EAAC,CAAC,CAAC;;;UAG/B;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;;4CAIgC;gBACxC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,EAAE;gBAC/C,UAAU,EAAE,CAAC,IAAA,mBAAQ,EAAC,CAAC,CAAC,CAAC;aACzB;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,OAAO,EAAE;oBACR,OAAO,EAAE,OAAO;iBAChB;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,IAAA,aAAI,EAAC,SAAS,EAAE,KAAK,IAAI,EAAE;IAC1B,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,WAAW,EAAE;YACZ,MAAM,EAAE;gBACP,UAAU,EAAE;oBACX,OAAO,EAAE;wBACR,IAAI,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;qBACpB;iBACD;gBACD,UAAU,EAAE;oBACX,IAAI,EAAE;wBACL,EAAE,EAAE,IAAI;wBACR,IAAI,EAAE,IAAI;qBACV;oBACD,MAAM,EAAE;wBACP,IAAI,EAAE,SAAS;qBACf;iBACD;aACD;SACD;QACD,KAAK,EAAE,IAAA,UAAG,EAAA;;;;;;;;;;;;;;UAcF;QACR,QAAQ,EAAE;YACT;gBACC,GAAG,EAAE,IAAA,UAAG,EAAA;;;;;;yCAM6B;gBACrC,UAAU,EAAE,CAAC,MAAM,CAAC;gBACpB,QAAQ,EAAE;oBACT,IAAI,EAAE;wBACL;4BACC,OAAO,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACpB,QAAQ,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;4BACrB,UAAU,EAAE,MAAM;4BAClB,UAAU,EAAE,MAAM;4BAClB,wBAAwB,EAAE,IAAI;yBAC9B;qBACD;iBACD;aACD;SACD;QACD,MAAM,EAAE;YACP,IAAI,EAAE;gBACL,UAAU,EAAE;oBACX;wBACC,GAAG,EAAE,IAAA,mBAAQ,EAAC,CAAC,CAAC;wBAChB,IAAI,EAAE;4BACL,KAAK,EAAE;gCACN,SAAS,EAAE,IAAI;gCACf,SAAS,EAAE,IAAI;gCACf,UAAU,EAAE,IAAI;6BAChB;yBACD;wBACD,KAAK,EAAE,MAAM;wBACb,KAAK,EAAE,MAAM;qBACb;iBACD;aACD;SACD;KACD,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

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

@@ -12,6 +12,8 @@ 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')))
@@ -152,10 +154,10 @@ var DeepFilterModel;
     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 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' } } } },
         });
@@ -163,5 +165,31 @@ var DeepFilterModel;
         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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"predicatesInjector.test.js","sourceRoot":"","sources":["../../../../tests/cases/unit/predicatesInjector.test.ts"],"names":[],"mappings":";;;;;;;;AAAA,0CAA4G;AAC5G,oEAAyH;AACzH,8CAA8C;AAC9C,mCAA6C;AAE7C,wFAAoF;AACpF,gGAA4F;~~AAI5F~~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~~IAAA,WAAE,EAAC,gCAAgC,EAAE,GAAG,EAAE;QACzC,~~MAAM,MAAM,GAAG,IAAA,gCAAY,EAAC,eAAe,CAAC,CAAA;~~QAC5C~~,MAAM,WAAW,GAAG,IAAI,uBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;~~QAEtF~~,MAAM,QAAQ,GAAG,IAAI,wBAAkB,CACtC,MAAM,CAAC,KAAK,EACZ,IAAI,sBAAgB,CAAC,WAAW,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,sBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CACvF,CAAA;~~QACD~~,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE;YAC/D,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;SACzD,CAAC,CAAA;QACF,MAAM,SAAS,GAAG,IAAI,+BAAc,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,uCAAkB,EAAE,CAAC,CAAA;QAC5E,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAE1E,eAAM,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;IACxI,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/whereOptimizer.test.js CHANGED Viewed

@@ -184,52 +184,52 @@ var TestModel;
     });
     (0, vitest_1.describe)('remove id predicates', () => {
         (0, vitest_1.it)('remove ID predicate when traversing from a relation - always', () => {
-            vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
-                image: { id: { isNull: false } },
-            }, model.entities.Author, [(0, schema_utils_1.acceptFieldVisitor)(model, 'Image', 'authors', {
+            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, [(0, schema_utils_1.acceptFieldVisitor)(model, 'Image', 'authors', {
-                    visitColumn: () => {
-                        throw new Error();
-                    },
-                    visitRelation: context => context,
-                })]), {
+            }, 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, []), {
+            }, model.entities.Image), {
                 id: { always: true },
             });
         });
         (0, vitest_1.it)('do not remove ID predicate when traversing from a has-many relation', () => {
-            vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
-                authors: { id: { isNull: false } },
-            }, model.entities.Image, [(0, schema_utils_1.acceptFieldVisitor)(model, 'Author', 'image', {
+            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', () => {
-            vitest_1.assert.deepStrictEqual(whereOptimizer.optimize({
-                articles: { author: { id: { isNull: false } } },
-            }, model.entities.Image, [
+            const relationPath = [
                 (0, schema_utils_1.acceptFieldVisitor)(model, 'Author', 'articles', {
                     visitColumn: () => {
                         throw new Error();
@@ -242,21 +242,24 @@ var TestModel;
                     },
                     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, []), {
+            }, 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, []), {
+            }, model.entities.Author), {
                 image: { authors: { image: { id: { isNull: false } } } },
             });
         });