Use safe access in access step (#448)

graphile · Aug 4, 2023 · cb859f8 · cb859f8
2 parents afb88f2 + 3af4310
commit cb859f8
Show file tree

Hide file tree

Showing 6 changed files with 243 additions and 180 deletions.
diff --git a/.changeset/hip-scissors-learn.md b/.changeset/hip-scissors-learn.md
@@ -0,0 +1,5 @@
+---
+"grafast": patch
+---
+
+Fix access step to use safe access pattern even when compiled
diff --git a/grafast/grafast/src/steps/access.ts b/grafast/grafast/src/steps/access.ts
@@ -35,7 +35,7 @@ function constructDestructureFunction(
 ): void {
   const n = path.length;
   /** 0 - slow mode; 1 - middle mode; 2 - turbo mode */
-  let mode: 0 | 1 | 2 = n > 50 ? 0 : n > 5 ? 1 : 2;
+  let mode: 0 | 1 | 2 = n > 50 || n < 1 ? 0 : n > 5 ? 1 : 2;
 
   for (let i = 0; i < n; i++) {
     const pathItem = path[i];
@@ -110,7 +110,7 @@ function constructDestructureFunction(
     }
     te.runInBatch<Factory>(
       te`function (fallback, ${te.join(names, ", ")}) {
-return (_meta, value) => value${te.join(access, "")}${
+return (_meta, value) => value?.${te.join(access, "?.")}${
         fallback === undefined ? te.blank : te.cache` ?? fallback`
       };
 }`,

diff --git a/postgraphile/postgraphile/__tests__/queries/v4/rbac.basic.json5 b/postgraphile/postgraphile/__tests__/queries/v4/rbac.basic.json5
@@ -32,6 +32,7 @@
     nodeId: "WyJwZW9wbGUiLDFd",
     personSecretByPersonId: null,
   },
+  nxPerson: null,
   leftArmById: {
     nodeId: "WyJsZWZ0X2FybXMiLDQyXQ==",
     id: 42,