fix(gatsby): Local file lookups in eq: $id queries (#34699) (#34717)

Co-authored-by: Michal Piechowiak <misiek.piechowiak@gmail.com> Co-authored-by: Lennart <lekoarts@gmail.com>
gatsbyjs · Feb 4, 2022 · 7c2f404 · 7c2f404
1 parent f9478d9
commit 7c2f404
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 10 deletions.
diff --git a/packages/gatsby/src/schema/__tests__/fixtures/queries.js b/packages/gatsby/src/schema/__tests__/fixtures/queries.js
@@ -1,3 +1,8 @@
+const os = require(`os`)
+const path = require(`path`)
+
+const dir = os.platform() === "win32" ? "C:/Users/test/site" : "/home/test/site"
+
 const nodes = [
   {
     id: `file1`,
@@ -8,6 +13,8 @@ const nodes = [
       contentDigest: `file1`,
     },
     name: `1.md`,
+    dir,
+    absolutePath: path.posix.join(dir, `1.md`)
   },
   {
     id: `file2`,
@@ -18,6 +25,8 @@ const nodes = [
       contentDigest: `file2`,
     },
     name: `2.md`,
+    dir,
+    absolutePath: path.posix.join(dir, `2.md`)
   },
   {
     id: `file3`,
@@ -28,6 +37,8 @@ const nodes = [
       contentDigest: `file3`,
     },
     name: `authors.yaml`,
+    dir,
+    absolutePath: path.posix.join(dir, `authors.yaml`)
   },
   {
     id: `md1`,
@@ -46,6 +57,7 @@ const nodes = [
       authors: [`author2@example.com`, `author1@example.com`],
       reviewer___NODE: `author2`,
       reviewerByEmail: `author2@example.com`,
+      fileRef: `2.md`
     },
   },
   {

diff --git a/packages/gatsby/src/schema/__tests__/queries.js b/packages/gatsby/src/schema/__tests__/queries.js
@@ -148,7 +148,7 @@ describe(`Query schema`, () => {
 
     const typeDefs = [
       `type Markdown implements Node { frontmatter: Frontmatter! }`,
-      `type Frontmatter { authors: [Author] }`,
+      `type Frontmatter { authors: [Author], fileRef: File @fileByRelativePath }`,
       `type Author implements Node { posts: [Markdown] }`,
     ]
     typeDefs.forEach(def =>
@@ -2108,6 +2108,38 @@ describe(`Query schema`, () => {
       }
     })
 
+    it(`@fileByRelativePath works`, async () => {
+      const query = `
+        {
+          markdown(id: { eq: "md1"}) {
+            frontmatter {
+              title
+              fileRef {
+                childMarkdown {
+                  frontmatter {
+                    title
+                  }
+                }
+              }
+            }
+          }
+        }
+      `
+      const results = await runQuery(query)
+
+      expect(results?.errors).toBeUndefined()
+      expect(results?.data?.markdown?.frontmatter?.title).toEqual(
+        `Markdown File 1`
+      )
+
+      // main assertion - markdown.frontmatter.fileRef is a file referenced by local path
+      // we want to make sure it finds node correctly (and doesn't crash)
+      expect(
+        results?.data?.markdown?.frontmatter?.fileRef?.childMarkdown
+          ?.frontmatter?.title
+      ).toEqual(`Markdown File 2`)
+    })
+
     describe(`doesn't try to use fast path if there are more or different filters than just id.eq`, () => {
       it(`using single filter different than id.eq`, async () => {
         const results = await runQuery(

diff --git a/packages/gatsby/src/schema/node-model.js b/packages/gatsby/src/schema/node-model.js
@@ -282,15 +282,10 @@ class LocalNodeModel {
         })
         runQueryActivity.start()
       }
-      let nodeFoundById = getDataStore().getNode(query.filter.id.eq)
-
-      // make sure our node is of compatible type
-      if (
-        nodeFoundById &&
-        !nodeTypeNames.includes(nodeFoundById.internal.type)
-      ) {
-        nodeFoundById = null
-      }
+      const nodeFoundById = this.getNodeById({
+        id: query.filter.id.eq,
+        type: gqlType,
+      })
 
       if (runQueryActivity) {
         runQueryActivity.end()