From cf9c468116422c326da694d5a050a4ed745c0107 Mon Sep 17 00:00:00 2001 From: Kartik Choudhary Date: Tue, 21 Jul 2020 00:07:59 +0530 Subject: [PATCH 1/4] Update context.nodeModel.runQuery to return [] --- packages/gatsby/src/redux/__tests__/run-fast-filters.js | 2 +- packages/gatsby/src/redux/run-fast-filters.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gatsby/src/redux/__tests__/run-fast-filters.js b/packages/gatsby/src/redux/__tests__/run-fast-filters.js index 1581944bbab71..a895d8a26db07 100644 --- a/packages/gatsby/src/redux/__tests__/run-fast-filters.js +++ b/packages/gatsby/src/redux/__tests__/run-fast-filters.js @@ -187,7 +187,7 @@ describe(`fast filter tests`, () => { // `id-1` node is not of queried type, so results should be empty expect(resultSingular).toEqual([]) - expect(resultMany).toEqual(null) + expect(resultMany).toEqual([]) }) it(`non-eq operator`, async () => { diff --git a/packages/gatsby/src/redux/run-fast-filters.ts b/packages/gatsby/src/redux/run-fast-filters.ts index c5ea9f219a200..9798267a4bb09 100644 --- a/packages/gatsby/src/redux/run-fast-filters.ts +++ b/packages/gatsby/src/redux/run-fast-filters.ts @@ -420,7 +420,7 @@ function convertAndApplyFastFilters( if (firstOnly) { return [] } - return null + return [] } function filterToStats( From 8b06fb52fc29e4e48d09767226d1ae75e93b9797 Mon Sep 17 00:00:00 2001 From: Kartik Choudhary Date: Thu, 23 Jul 2020 04:11:40 +0000 Subject: [PATCH 2/4] Update run-fast-filters.ts Co-authored-by: Vladimir Razuvaev --- packages/gatsby/src/redux/run-fast-filters.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/gatsby/src/redux/run-fast-filters.ts b/packages/gatsby/src/redux/run-fast-filters.ts index 9798267a4bb09..4626101b5d2a8 100644 --- a/packages/gatsby/src/redux/run-fast-filters.ts +++ b/packages/gatsby/src/redux/run-fast-filters.ts @@ -417,9 +417,6 @@ function convertAndApplyFastFilters( stats.totalSiftHits++ } - if (firstOnly) { - return [] - } return [] } From ad3fce3fdf70deaf755266161917ba6932b65ee4 Mon Sep 17 00:00:00 2001 From: Kartik Choudhary Date: Thu, 23 Jul 2020 09:47:41 +0530 Subject: [PATCH 3/4] Update tests to expect [] --- .../gatsby/src/redux/__tests__/run-fast-filters.js | 2 +- packages/gatsby/src/schema/__tests__/run-query.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/gatsby/src/redux/__tests__/run-fast-filters.js b/packages/gatsby/src/redux/__tests__/run-fast-filters.js index a895d8a26db07..5af5c9d9e7aa7 100644 --- a/packages/gatsby/src/redux/__tests__/run-fast-filters.js +++ b/packages/gatsby/src/redux/__tests__/run-fast-filters.js @@ -353,7 +353,7 @@ describe(`fast filter tests`, () => { filtersCache: new Map(), }) - expect(resultMany).toBe(null) + expect(resultMany).toBe([]) }) it(`elemMatch on array of objects`, async () => { diff --git a/packages/gatsby/src/schema/__tests__/run-query.js b/packages/gatsby/src/schema/__tests__/run-query.js index 0e3b48e0d4838..2c5b36adaac5a 100644 --- a/packages/gatsby/src/schema/__tests__/run-query.js +++ b/packages/gatsby/src/schema/__tests__/run-query.js @@ -465,7 +465,7 @@ describe(`Filter fields`, () => { }) // Note: no coercion, so [8]=='8' is true but the comparison is strict - expect(result).toEqual(null) + expect(result).toEqual([]) }) }) @@ -746,7 +746,7 @@ describe(`Filter fields`, () => { // Nothing is lt null so zero nodes should match // (Note: this is different from `lte`, which does return nulls here!) - expect(result).toEqual(null) + expect(result).toEqual([]) expect( allNodes.filter(node => node.nil === needle).length ).toBeGreaterThan(0) // They should _exist_... @@ -941,7 +941,7 @@ describe(`Filter fields`, () => { // Nothing is gt null so zero nodes should match // (Note: this is different from `gte`, which does return nulls here!) - expect(result).toEqual(null) + expect(result).toEqual([]) expect( allNodes.filter(node => node.nil === needle).length ).toBeGreaterThan(0) // They should _exist_... @@ -1149,7 +1149,7 @@ describe(`Filter fields`, () => { name: { regex: `/"/` }, }) - expect(result).toEqual(null) + expect(result).toEqual([]) expect(allNodes.filter(node => node.name === `"`).length).toEqual(0) }) }) @@ -1433,7 +1433,7 @@ describe(`Filter fields`, () => { }, }) - expect(result).toEqual(null) + expect(result).toEqual([]) }) it(`handles the elemMatch operator for array of objects (1)`, async () => { From 9ad6818a65237e50372434868eee4137ce1abb36 Mon Sep 17 00:00:00 2001 From: Vladimir Razuvaev Date: Wed, 24 Feb 2021 20:12:18 +0700 Subject: [PATCH 4/4] fix test --- packages/gatsby/src/redux/__tests__/run-fast-filters.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gatsby/src/redux/__tests__/run-fast-filters.js b/packages/gatsby/src/redux/__tests__/run-fast-filters.js index 5af5c9d9e7aa7..7cf0c2bbb5650 100644 --- a/packages/gatsby/src/redux/__tests__/run-fast-filters.js +++ b/packages/gatsby/src/redux/__tests__/run-fast-filters.js @@ -353,7 +353,7 @@ describe(`fast filter tests`, () => { filtersCache: new Map(), }) - expect(resultMany).toBe([]) + expect(resultMany).toEqual([]) }) it(`elemMatch on array of objects`, async () => {