fix(graphql): do not send references to union type function

sanity-io · Jan 21, 2025 · d5450d0 · d5450d0
1 parent 5376783
commit d5450d0
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 183 deletions.
diff --git a/packages/sanity/src/_internal/cli/actions/graphql/extractFromSanitySchema.ts b/packages/sanity/src/_internal/cli/actions/graphql/extractFromSanitySchema.ts
@@ -393,8 +393,24 @@ export function extractFromSanitySchema(
       return {type: getTypeName(candidates[0].type.name), ...base}
     }
 
-    const unionDefinition = getUnionDefinition(candidates, def, {grandParent: parent})
-    return {...unionDefinition, ...base}
+    const allTypeNames = candidates.map((c) => getTypeName(c.type.name))
+    const targetTypes = [...new Set(allTypeNames)].sort()
+    const name = targetTypes.join('Or')
+
+    // Register the union type if we haven't seen it before
+    if (!unionTypes.some((item) => item.name === name)) {
+      unionTypes.push({
+        kind: 'Union',
+        name,
+        types: targetTypes,
+      })
+    }
+
+    return {
+      type: name,
+      // references: targetTypes,
+      ...base,
+    }
   }
 
   function getArrayDefinition(
@@ -481,9 +497,7 @@ export function extractFromSanitySchema(
     }
 
     try {
-      if (guardPathName !== 'reference') {
-        unionRecursionGuards.add(guardPathName)
-      }
+      unionRecursionGuards.add(guardPathName)
 
       candidates.forEach((def, i) => {
         if (typeNeedsHoisting(def)) {

diff --git a/packages/sanity/test/cli/graphql/__snapshots__/extract.test.ts.snap b/packages/sanity/test/cli/graphql/__snapshots__/extract.test.ts.snap
@@ -1747,17 +1747,16 @@ exports[`GraphQL - Schema extraction > Should be able to extract schema with uni
     },
     {
       "fields": [],
-      "interfaces": undefined,
       "kind": "Union",
-      "name": "AOrB",
+      "name": "AOrBOrUnion",
       "types": [
         "A",
         "B",
+        "Union",
       ],
     },
     {
       "fields": [],
-      "interfaces": undefined,
       "kind": "Union",
       "name": "AOrUnion",
       "types": [
@@ -2556,7 +2555,6 @@ exports[`GraphQL - Schema extraction > Should be able to extract schema with uni
       "children": {
         "description": undefined,
         "isReference": true,
-        "references": undefined,
         "type": "AOrUnion",
       },
       "description": undefined,
@@ -2609,8 +2607,9 @@ exports[`GraphQL - Schema extraction > Should be able to extract schema with uni
             "references": [
               "A",
               "B",
+              "Union",
             ],
-            "type": "AOrB",
+            "type": "AOrBOrUnion",
           },
           "description": undefined,
           "fieldName": "body",