Avoid duplicating __typename in generated EdgeQL

edgedb · Sep 4, 2024 · 3c1439c · 3c1439c
1 parent 3be27a5
commit 3c1439c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/integration-tests/lts/select.test.ts b/integration-tests/lts/select.test.ts
@@ -1119,6 +1119,23 @@ SELECT __scope_0_defaultPerson {
     >(true);
   });
 
+  test("polymorphic with explicit __typename is not duplicated", async () => {
+    const query = e.select(e.Movie.characters, (person) => ({
+      __typename: person.__type__.name,
+      ...e.is(e.Villain, { nemesis: true }),
+    }));
+
+    assert.equal(
+      query.toEdgeQL(),
+      `WITH
+  __scope_0_defaultPerson := DETACHED default::Movie.characters
+SELECT __scope_0_defaultPerson {
+  single __typename := __scope_0_defaultPerson.__type__.name,
+  [IS default::Villain].nemesis
+}`,
+    );
+  });
+
   test("polymorphic field in nested shape", async () => {
     const query = e.select(e.Movie, (movie) => ({
       title: true,

diff --git a/packages/generate/src/syntax/toEdgeQL.ts b/packages/generate/src/syntax/toEdgeQL.ts
@@ -1398,7 +1398,7 @@ function shapeToEdgeQL(
   if (lines.length === 0 && injectImplicitId) {
     addLine("id");
   }
-  if (hasPolyEl) {
+  if (hasPolyEl && !seen.has("__typename")) {
     addLine("__typename := .__type__.name");
   }
   return keysOnly ? `{${lines.join(", ")}}` : `{\n${lines.join(",\n")}\n}`;