From dacfdcd392bb3084b1c18e08b2aaefbd701d69fe Mon Sep 17 00:00:00 2001
From: Sebastian Schmidt <mrschmidt@google.com>
Date: Thu, 14 Apr 2022 16:17:07 -0600
Subject: [PATCH 1/2] Misc fixes for indexing

---
 .../src/local/indexeddb_index_manager.ts      | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/packages/firestore/src/local/indexeddb_index_manager.ts b/packages/firestore/src/local/indexeddb_index_manager.ts
index 41d5c83df70..2a9186352ac 100644
--- a/packages/firestore/src/local/indexeddb_index_manager.ts
+++ b/packages/firestore/src/local/indexeddb_index_manager.ts
@@ -372,23 +372,16 @@ export class IndexedDbIndexManager implements IndexManager {
           )
         : this.generateEmptyBound(indexId + 1);
 
-      indexRanges.push(
-        ...this.createRange(
-          lowerBound,
-          upperBound,
-          notInValues.map(
-            (
-              notIn // make non-nullable
-            ) =>
-              this.generateLowerBound(
-                indexId,
-                arrayValue,
-                notIn,
-                /* inclusive= */ true
-              )
-          )
+      let notInBound = notInValues.map(notIn =>
+        this.generateLowerBound(
+          indexId,
+          arrayValue,
+          notIn,
+          /* inclusive= */ true
         )
       );
+
+      indexRanges.push(...this.createRange(lowerBound, upperBound, notInBound));
     }
 
     return indexRanges;
@@ -918,7 +911,7 @@ export class IndexedDbIndexManager implements IndexManager {
     upper: IndexEntry,
     notInValues: IndexEntry[]
   ): IDBKeyRange[] {
-    // The notIb values need to be sorted and unique so that we can return a
+    // The notIn values need to be sorted and unique so that we can return a
     // sorted set of non-overlapping ranges.
     notInValues = notInValues
       .sort((l, r) => indexEntryComparator(l, r))

From 094c8eb16ac652df70056e0197274a3cc9ad1589 Mon Sep 17 00:00:00 2001
From: Sebastian Schmidt <mrschmidt@google.com>
Date: Fri, 15 Apr 2022 22:51:30 -0600
Subject: [PATCH 2/2] Update indexeddb_index_manager.ts

---
 packages/firestore/src/local/indexeddb_index_manager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/firestore/src/local/indexeddb_index_manager.ts b/packages/firestore/src/local/indexeddb_index_manager.ts
index 2a9186352ac..98bd84d4c6f 100644
--- a/packages/firestore/src/local/indexeddb_index_manager.ts
+++ b/packages/firestore/src/local/indexeddb_index_manager.ts
@@ -372,7 +372,7 @@ export class IndexedDbIndexManager implements IndexManager {
           )
         : this.generateEmptyBound(indexId + 1);
 
-      let notInBound = notInValues.map(notIn =>
+      const notInBound = notInValues.map(notIn =>
         this.generateLowerBound(
           indexId,
           arrayValue,