fix(gatsby): Fix filtering on resolvable children (#19586)

gatsbyjs · Nov 18, 2019 · 7b500f4 · 7b500f4
1 parent d5adbbb
commit 7b500f4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/packages/gatsby/src/schema/node-model.js b/packages/gatsby/src/schema/node-model.js
@@ -557,7 +557,7 @@ async function resolveRecursive(
  fieldsToResolve
 ) {
  const gqlFields = getFields(schema, type, node)
- let resolvedFields = {}
+ const resolvedFields = {}
  for (const fieldName of Object.keys(fieldsToResolve)) {
  const fieldToResolve = fieldsToResolve[fieldName]
  const queryField = queryFields[fieldName]
@@ -667,7 +667,7 @@ const determineResolvableFields = (
  const gqlField = gqlFields[fieldName]
  const gqlFieldType = getNamedType(gqlField.type)
  const typeComposer = schemaComposer.getAnyTC(type.name)
- let possibleTCs = [
+ const possibleTCs = [
  typeComposer,
  ...nodeTypeNames.map(name => schemaComposer.getAnyTC(name)),
  ]

diff --git a/packages/gatsby/src/schema/schema.js b/packages/gatsby/src/schema/schema.js
@@ -184,11 +184,7 @@ const processTypeComposer = async ({
  fieldExtensions,
  parentSpan,
  })
- await determineSearchableFields({
- schemaComposer,
- typeComposer,
- parentSpan,
- })
+
  if (typeComposer.hasInterface(`Node`)) {
  await addNodeInterfaceFields({ schemaComposer, typeComposer, parentSpan })
  await addImplicitConvenienceChildrenFields({
@@ -197,6 +193,14 @@ const processTypeComposer = async ({
  nodeStore,
  parentSpan,
  })
+ }
+ await determineSearchableFields({
+ schemaComposer,
+ typeComposer,
+ parentSpan,
+ })
+
+ if (typeComposer.hasInterface(`Node`)) {
  await addTypeToRootQuery({ schemaComposer, typeComposer, parentSpan })
  }
  } else if (typeComposer instanceof InterfaceTypeComposer) {