fix(gate): make __typename returns the variant name on unions

src/typegate/src/engine/planner/mod.ts

@@ -178,7 +178,6 @@ export class Planner {
         }),
       );
       const unselectedVariants = new Set(selectableVariants.keys());
-
       if (unselectedVariants.size === 0 && selectionSet.selections.length > 0) {
         const path = this.formatPath(node.path);
         throw new Error(`at ${path}: Unexpected selections`);
@@ -238,6 +237,7 @@ export class Planner {
                     ...node,
                     path: parentPath,
                     typeIdx: idx,
+                    parentStage: stage,
                   },
                   outputType.properties,
                   stage,

src/typegate/src/engine/planner/parameter_transformer.ts

@@ -5,7 +5,10 @@
 import type { TypeGraph } from "../../typegraph/mod.ts";
 import { Type } from "../../typegraph/type_node.ts";
 import type { ParameterTransformNode } from "../../typegraph/types.ts";
-import { type ValidationContext, validationContext } from "../typecheck/common.ts";
+import {
+  type ValidationContext,
+  validationContext,
+} from "../typecheck/common.ts";
 import { generateListValidator } from "../typecheck/inline_validators/list.ts";
 import { generateNumberValidator } from "../typecheck/inline_validators/number.ts";
 import {
@@ -174,9 +177,11 @@
           return this.#compileSecretsInjection(typeIdx, nodeData.key);
         case "parent":
           return this.#compileParentInjection(typeIdx, nodeData.parentIdx);
+        case "static":
+          return this.#compileStaticInjection(typeIdx, nodeData.valueJson);
         default:
           throw new Error(
-            `Unknown source: ${nodeData.source} at ${this.#path}`,
+            `Unknown source: ${(nodeData as any).source} at ${this.#path}`,
           );
       }
     }
@@ -347,6 +352,15 @@
     return varName;
   }
 
+  #compileStaticInjection(_typeIdx: number, valueJson: string) {
+    // VALIDATION
+    // - the value is validated AOT with the typegraph
+
+    const varName = this.#createVarName();
+    this.#collector.push(`const ${varName} = ${valueJson};`);
+    return varName;
+  }
+
   #createVarName() {
     return `_var${++this.#latestVarIndex}`;
   }

src/typegate/src/runtimes/deno/deno.ts

@@ -166,12 +166,9 @@ export class DenoRuntime extends Runtime {
     verbose: boolean,
   ): ComputeStage[] {
     if (stage.props.node === "__typename") {
-      return [
-        stage.withResolver(() => {
-          const { parent: parentStage } = stage.props;
-          if (parentStage != null) {
-            return parentStage.props.outType.title;
-          }
+      const getTypename = () => {
+        const parentStage = stage.props.parent;
+        if (parentStage == null) {
           switch (stage.props.operationType) {
             case ast.OperationTypeNode.QUERY:
               return "Query";
@@ -182,7 +179,19 @@ export class DenoRuntime extends Runtime {
                 `Unsupported operation type '${stage.props.operationType}'`,
               );
           }
-        }),
+        }
+
+        const idSlice = stage.id().slice(parentStage.id().length);
+        if (idSlice.startsWith("$")) {
+          return idSlice.split(".")[0].slice(1);
+        }
+        return parentStage.props.outType.title;
+      };
+
+      const typename = getTypename();
+
+      return [
+        stage.withResolver(() => typename),
       ];
     }
 

src/typegraph/python/typegraph/t.py

@@ -624,7 +624,7 @@ def serialize_apply_param_node(node: ApplyParamNode) -> Any:
     if isinstance(node, ApplyFromArg):
         return {"source": "arg", "name": node.name}
     if isinstance(node, ApplyFromStatic):
-        return {"source": "static", "value": JsonLib.dumps(node.value)}
+        return {"source": "static", "value_json": JsonLib.dumps(node.value)}
     if isinstance(node, ApplyFromContext):
         return {"source": "context", "key": node.key}
     if isinstance(node, ApplyFromSecret):

tests/typename/typename.py

@@ -22,6 +22,16 @@ def typename(g: Graph):
         code="() => ({ id: 12 })",
     ).with_policy(public)
 
+    u8 = t.integer(min=0, max=255, name="U8")
+
+    color = t.either(
+        [
+            t.enum(["red", "green", "blue"]).rename("NamedColor"),
+            t.string(pattern=r"^#[0-9a-f]{6}$").rename("HexColor"),
+            t.struct({"r": u8, "g": u8, "b": u8}).rename("RgbColor"),
+        ]
+    )
+
     g.expose(
         denoUser=deno_user,
         randomUser=randomUser,
@@ -31,4 +41,17 @@ def typename(g: Graph):
             effect=effects.delete(),
         ).with_policy(public),
         createUser=prisma.create(prisma_user).with_policy(public),
+        getRgbColor=deno.identity(t.struct({"color": color}))
+        .apply(
+            {
+                "color": g.set(
+                    {
+                        "r": 255,
+                        "g": 0,
+                        "b": 0,
+                    }
+                )
+            }
+        )
+        .with_policy(public),
     )

tests/typename/typename_test.ts

@@ -4,13 +4,12 @@
 import { recreateMigrations } from "../utils/migrations.ts";
 import { gql, Meta } from "../utils/mod.ts";
 
+const secrets = {
+  POSTGRES: "postgresql://postgres:password@localhost:5432/db?schema=typename",
+};
+
 Meta.test("Typename", async (t) => {
-  const e = await t.engine("typename/typename.py", {
-    secrets: {
-      POSTGRES:
-        "postgresql://postgres:password@localhost:5432/db?schema=typename",
-    },
-  });
+  const e = await t.engine("typename/typename.py", { secrets });
 
   await t.should("allow querying typename at root level", async () => {
     await gql`
@@ -26,12 +25,7 @@ Meta.test("Typename", async (t) => {
 });
 
 Meta.test("Typename in deno runtime", async (t) => {
-  const e = await t.engine("typename/typename.py", {
-    secrets: {
-      POSTGRES:
-        "postgresql://postgres:password@localhost:5432/db?schema=typename",
-    },
-  });
+  const e = await t.engine("typename/typename.py", { secrets });
 
   await t.should("allow querying typename in an object", async () => {
     await gql`
@@ -51,12 +45,7 @@ Meta.test("Typename in deno runtime", async (t) => {
 });
 
 Meta.test("Typename in random runtime", async (t) => {
-  const e = await t.engine("typename/typename.py", {
-    secrets: {
-      POSTGRES:
-        "postgresql://postgres:password@localhost:5432/db?schema=typename",
-    },
-  });
+  const e = await t.engine("typename/typename.py", { secrets });
 
   await t.should("allow querying typename in an object", async () => {
     await gql`
@@ -76,12 +65,7 @@ Meta.test("Typename in random runtime", async (t) => {
 });
 
 Meta.test("Typename in prisma runtime", async (t) => {
-  const e = await t.engine("typename/typename.py", {
-    secrets: {
-      POSTGRES:
-        "postgresql://postgres:password@localhost:5432/db?schema=typename",
-    },
-  });
+  const e = await t.engine("typename/typename.py", { secrets });
 
   await gql`
       mutation a {
@@ -112,3 +96,27 @@ Meta.test("Typename in prisma runtime", async (t) => {
       .on(e);
   });
 });
+
+Meta.test("Typename on union", async (t) => {
+  const e = await t.engine("typename/typename.py", { secrets });
+
+  await t.should("get variant type name", async () => {
+    await gql`
+      query {
+        getRgbColor {
+          color {
+            ... on RgbColor {
+              r g b __typename
+            }
+          }
+        }
+      }
+    `
+      .expectData({
+        getRgbColor: {
+          color: { r: 255, g: 0, b: 0, __typename: "RgbColor" },
+        },
+      })
+      .on(e);
+  });
+});