Append to previous result

Author: schmidt-sebastian

packages/firestore/src/local/query_engine.ts

@@ -39,7 +39,7 @@ import {
 } from '../model/field_index';
 import { debugAssert } from '../util/assert';
 import { getLogLevel, logDebug, LogLevel } from '../util/log';
-import { ValueIterable, values } from '../util/misc';
+import { Iterable } from '../util/misc';
 import { SortedSet } from '../util/sorted_set';
 
 import { IndexManager, IndexType } from './index_manager';
@@ -209,7 +209,7 @@ export class QueryEngine {
 
                     return this.appendRemainingResults(
                       transaction,
-                      values(indexedDocuments),
+                      previousResults,
                       query,
                       offset
                     ) as PersistencePromise<DocumentMap | null>;
@@ -373,7 +373,7 @@ export class QueryEngine {
    */
   private appendRemainingResults(
     transaction: PersistenceTransaction,
-    indexedResults: ValueIterable<Document>,
+    indexedResults: Iterable<Document>,
     query: Query,
     offset: IndexOffset
   ): PersistencePromise<DocumentMap> {

packages/firestore/src/util/misc.ts

@@ -68,6 +68,10 @@ export interface Equatable<T> {
   isEqual(other: T): boolean;
 }
 
+export interface Iterable<V> {
+  forEach: (cb: (v: V) => void) => void;
+}
+
 /** Helper to compare arrays using isEqual(). */
 export function arrayEquals<T>(
   left: T[],
@@ -87,19 +91,3 @@ export function immediateSuccessor(s: string): string {
   // Return the input string, with an additional NUL byte appended.
   return s + '\0';
 }
-
-export interface ValueIterable<V> {
-  forEach: (cb: (v: V) => void) => void;
-}
-
-/**
- * Exposes a `forEach(value)` method on objects that provide an
- * `forEach(key, value)` iterator.
- */
-export function values<K, V>(iterable: {
-  forEach: (cb: (k: K, v: V) => void) => void;
-}): ValueIterable<V> {
-  return {
-    forEach: cb => iterable.forEach((k, v) => cb(v))
-  };
-}