fix: querying nodes by id and operator different than eq (#9101)

* make special case condition for querying by id more strict

* add basic tests for run-sift

* fix typo

Author: pieh

packages/gatsby/src/schema/__tests__/run-sift.js

@@ -0,0 +1,115 @@
+const runSift = require(`../run-sift`)
+const {
+  GraphQLObjectType,
+  GraphQLNonNull,
+  GraphQLID,
+  GraphQLString,
+} = require(`graphql`)
+const { connectionFromArray } = require(`graphql-skip-limit`)
+
+jest.mock(`../node-tracking`, () => {
+  return {
+    trackInlineObjectsInRootNode: () => jest.fn(),
+  }
+})
+
+jest.mock(`../../redux/actions/add-page-dependency`, () => {
+  return {
+    createPageDependency: jest.fn(),
+  }
+})
+
+const mockNodes = [
+  {
+    id: `id_1`,
+    string: `foo`,
+  },
+  {
+    id: `id_2`,
+    string: `bar`,
+  },
+  {
+    id: `id_3`,
+    string: `baz`,
+  },
+]
+
+jest.mock(`../../redux`, () => {
+  return {
+    getNode: id => mockNodes.find(node => node.id === id),
+  }
+})
+
+describe(`run-sift`, () => {
+  const typeName = `test`
+  const type = new GraphQLObjectType({
+    name: typeName,
+    fields: () => {
+      return {
+        id: new GraphQLNonNull(GraphQLID),
+        string: GraphQLString,
+      }
+    },
+  })
+  const nodes = mockNodes
+
+  describe(`filters by just id correctly`, () => {
+    it(`eq operator`, async () => {
+      const args = {
+        filter: {
+          id: { eq: `id_2` },
+        },
+      }
+
+      const resultSingular = await runSift({
+        type,
+        nodes,
+        typeName,
+        args,
+        connection: false,
+      })
+
+      const resultConnection = await runSift({
+        type,
+        nodes,
+        typeName,
+        args,
+        connection: true,
+      })
+      delete resultConnection.totalCount
+
+      expect(resultSingular).toEqual(nodes[1])
+      expect(resultConnection).toEqual(connectionFromArray([nodes[1]], args))
+    })
+
+    it(`non-eq operator`, async () => {
+      const args = {
+        filter: {
+          id: { ne: `id_2` },
+        },
+      }
+
+      const resultSingular = await runSift({
+        type,
+        nodes,
+        typeName,
+        args,
+        connection: false,
+      })
+
+      const resultConnection = await runSift({
+        type,
+        nodes,
+        typeName,
+        args,
+        connection: true,
+      })
+      delete resultConnection.totalCount
+
+      expect(resultSingular).toEqual(nodes[0])
+      expect(resultConnection).toEqual(
+        connectionFromArray([nodes[0], nodes[2]], args)
+      )
+    })
+  })
+})

packages/gatsby/src/schema/run-sift.js

@@ -143,11 +143,14 @@ module.exports = ({
     })
   }
 
-  // If the the query only has a filter for an "id", then we'll just grab
-  // that ID and return it.
+  // If the the query for single node only has a filter for an "id"
+  // using "eq" operator, then we'll just grab that ID and return it.
   if (
+    !connection &&
     Object.keys(fieldsToSift).length === 1 &&
-    Object.keys(fieldsToSift)[0] === `id`
+    Object.keys(fieldsToSift)[0] === `id` &&
+    Object.keys(siftArgs[0].id).length === 1 &&
+    Object.keys(siftArgs[0].id)[0] === `$eq`
   ) {
     const nodePromise = resolveRecursive(
       getNode(siftArgs[0].id[`$eq`]),