fix(gatsby): fix filtering by sub-fields of the field with custom resolver (#26644)

Author: vladar

packages/gatsby/src/schema/__tests__/node-model.js

@@ -558,6 +558,10 @@ describe(`NodeModel`, () => {
         {
           id: `id1`,
           title: `Foo`,
+          nested: {
+            foo: `foo1`,
+            bar: `bar1`,
+          },
           internal: {
             type: `Test`,
             contentDigest: `0`,
@@ -567,6 +571,10 @@ describe(`NodeModel`, () => {
           id: `id2`,
           title: `Bar`,
           hidden: false,
+          nested: {
+            foo: `foo2`,
+            bar: `bar2`,
+          },
           internal: {
             type: `Test`,
             contentDigest: `1`,
@@ -582,6 +590,14 @@ describe(`NodeModel`, () => {
       store.dispatch({
         type: `CREATE_TYPES`,
         payload: [
+          typeBuilders.buildObjectType({
+            name: `TestNested`,
+            fields: {
+              foo: { type: `String` },
+              bar: { type: `String` },
+            },
+          }),
+
           typeBuilders.buildObjectType({
             name: `Test`,
             interfaces: [`Node`],
@@ -604,6 +620,10 @@ describe(`NodeModel`, () => {
                 type: `Boolean!`,
                 resolve: parent => Boolean(parent.hidden),
               },
+              nested: {
+                type: `TestNested`,
+                resolve: source => source.nested,
+              },
             },
           }),
         ],
@@ -702,6 +722,39 @@ describe(`NodeModel`, () => {
       expect(result[0].id).toBe(`id1`)
       expect(result[1].id).toBe(`id2`)
     })
+
+    it(`merges query caches when filtering by nested field`, async () => {
+      // See https://github.com/gatsbyjs/gatsby/issues/26056
+      nodeModel.replaceFiltersCache()
+      const result1 = await nodeModel.runQuery(
+        {
+          query: {
+            filter: { nested: { foo: { eq: `foo1` } } },
+          },
+          firstOnly: false,
+          type: `Test`,
+        },
+        { path: `/` }
+      )
+      const result2 = await nodeModel.runQuery(
+        {
+          query: {
+            filter: { nested: { bar: { eq: `bar2` } } },
+          },
+          firstOnly: false,
+          type: `Test`,
+        },
+        { path: `/` }
+      )
+
+      expect(result1).toBeTruthy()
+      expect(result1.length).toBe(1)
+      expect(result1[0].id).toBe(`id1`)
+
+      expect(result2).toBeTruthy()
+      expect(result2.length).toBe(1)
+      expect(result2[0].id).toBe(`id2`)
+    })
   })
 
   describe(`node tracking`, () => {

packages/gatsby/src/schema/node-model.js

@@ -748,7 +748,8 @@ const determineResolvableFields = (
   schema,
   type,
   fields,
-  nodeTypeNames
+  nodeTypeNames,
+  isNestedType = false
 ) => {
   const fieldsToResolve = {}
   const gqlFields = type.getFields()
@@ -775,7 +776,8 @@ const determineResolvableFields = (
         schema,
         gqlFieldType,
         field,
-        toNodeTypeNames(schema, gqlFieldType)
+        toNodeTypeNames(schema, gqlFieldType),
+        true
       )
       if (!_.isEmpty(innerResolved)) {
         fieldsToResolve[fieldName] = innerResolved
@@ -785,6 +787,11 @@ const determineResolvableFields = (
     if (!fieldsToResolve[fieldName] && needsResolve) {
       fieldsToResolve[fieldName] = true
     }
+    if (!fieldsToResolve[fieldName] && isNestedType) {
+      // If parent field needs to be resolved - all nested fields should be added as well
+      // See https://github.com/gatsbyjs/gatsby/issues/26056
+      fieldsToResolve[fieldName] = true
+    }
   })
   return fieldsToResolve
 }