Fix json linkprops (#1314)

For some reason, when selected a `json` typed link property, the
internal `with` binding of the shape was being skipped, so it would
generate incorrect EdgeQL with a missing `with` binding.

Author: scotttrinh

integration-tests/lts/dbschema/default.esdl

@@ -24,6 +24,7 @@ module default {
 
   abstract link movie_character {
     property character_name -> str;
+    property meta -> json;
   }
 
   abstract type LivingThing {
@@ -85,6 +86,7 @@ module default {
     property a -> str;
     property b -> str;
     property c -> str;
+    property d -> json;
 
     constraint exclusive on ((  .plot_summary,    .slug  ));
     constraint exclusive on (((.a,.b,.c)));

integration-tests/lts/dbschema/migrations/00032-m1ikgbe.edgeql

@@ -0,0 +1,10 @@
+CREATE MIGRATION m1ikgbe45h3cygjmuxh3ze5rs5d66cqqcq2armmep3r3mjpgezca2a
+    ONTO m1hbukk7q7j6plwsmgronpimcotrc3uq2i457xronjbre6dt6ie23q
+{
+  ALTER ABSTRACT LINK default::movie_character {
+      CREATE PROPERTY meta: std::json;
+  };
+  ALTER TYPE default::Profile {
+      CREATE PROPERTY d: std::json;
+  };
+};

integration-tests/lts/interfaces.test.ts

@@ -45,6 +45,7 @@ export interface test_Profile extends BaseObject {
   a?: string | null;
   b?: string | null;
   c?: string | null;
+  d?: unknown | null;
 }
 interface test_Z extends BaseObject {
   xy?: W | X | Y | null;

integration-tests/lts/select.test.ts

@@ -754,9 +754,13 @@ describe("select", () => {
   test("link properties", async () => {
     const query = e.select(e.Movie, () => ({
       id: true,
+      profile: (p) => ({
+        d: true,
+      }),
       characters: () => ({
         name: true,
         "@character_name": true,
+        "@meta": true,
       }),
     }));
 
@@ -770,7 +774,11 @@ describe("select", () => {
           characters: {
             name: string;
             "@character_name": string | null;
+            "@meta": unknown;
           }[];
+          profile: {
+            d: unknown;
+          } | null;
         }[]
       >
     >(true);
@@ -1578,6 +1586,7 @@ SELECT __scope_0_defaultPerson {
   test("filter_single composite truple", async () => {
     const query = e.select(e.Profile, () => ({
       slug: true,
+      d: true,
       filter_single: {
         a: "adsf",
         b: "adsf",

integration-tests/lts/update.test.ts

@@ -303,7 +303,10 @@ describe("update", () => {
   test("exclude readonly props", () => {
     type updateProfileShape = UpdateShape<(typeof e)["Profile"]>;
     tc.assert<
-      tc.IsExact<keyof updateProfileShape, "plot_summary" | "a" | "b" | "c">
+      tc.IsExact<
+        keyof updateProfileShape,
+        "plot_summary" | "a" | "b" | "c" | "d"
+      >
     >(true);
   });
 

packages/generate/src/syntax/toEdgeQL.ts

@@ -397,7 +397,10 @@ function walkExprTree(
 
   const expr = _expr as SomeExpression;
 
-  if ((expr as any).__scopedFrom__ != null) {
+  if (
+    (expr as any).__scopedFrom__ != null &&
+    expr.__kind__ !== ExpressionKind.PathLeaf
+  ) {
     // If expr is marked as being a scoped copy of another expr, treat it as
     // an opaque reference and don't walk it. The enclosing select/update that
     // owns the scope will walk the actual unscoped expr.