fix(gatsby): add fallback for resolveType (#32195) (#32265)

(cherry picked from commit dfef2fb) Co-authored-by: Vladimir Razuvaev <vladimir.razuvaev@gmail.com>
gatsbyjs · Jul 6, 2021 · 6bd5f9c · 6bd5f9c
1 parent 11c0d9f
commit 6bd5f9c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/packages/gatsby/src/schema/__tests__/build-schema.js b/packages/gatsby/src/schema/__tests__/build-schema.js
@@ -1043,6 +1043,25 @@ describe(`Build schema`, () => {
       expect(FizzBuzz.resolveType({ isFizz: false })).toEqual(`Buzz`)
     })
 
+    it(`falls back to default resolveType when merging with placeholder `, async () => {
+      createTypes(
+        [
+          buildObjectType({
+            name: `Foo`,
+            fields: { id: `ID!` },
+            interfaces: [`Bar`],
+          }),
+          `interface Bar { id: ID! }`,
+        ],
+        {
+          name: `default-site-plugin`,
+        }
+      )
+      const schema = await buildSchema()
+      const Bar = schema.getType(`Bar`)
+      expect(Bar.resolveType({ internal: { type: `Foo` } })).toEqual(`Foo`)
+    })
+
     it(`merges plugin-defined type (Type Builder) with overridable built-in type without warning`, async () => {
       createTypes(
         [

diff --git a/packages/gatsby/src/schema/schema.js b/packages/gatsby/src/schema/schema.js
@@ -1421,4 +1421,7 @@ const mergeResolveType = ({ typeComposer, type }) => {
   ) {
     typeComposer.setResolveType(type.getResolveType())
   }
+  if (!typeComposer.getResolveType()) {
+    typeComposer.setResolveType(node => node?.internal?.type)
+  }
 }