Address PR feedback

firebase · Nov 15, 2022 · 202ac61 · 202ac61
1 parent 26a95f8
commit 202ac61
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/packages/database/src/core/view/filter/LimitedFilter.ts b/packages/database/src/core/view/filter/LimitedFilter.ts
@@ -125,18 +125,15 @@ export class LimitedFilter implements NodeFilter {
         let count = 0;
         while (iterator.hasNext() && count < this.limit_) {
           const next = iterator.getNext();
-          const inRange =
-            this.withinDirectionalStart(next) &&
-            this.withinDirectionalEnd(next);
-          if (inRange) {
-            filtered = filtered.updateImmediateChild(next.name, next.node);
-            count++;
-          } else if (!this.withinDirectionalStart(next)) {
+          if (!this.withinDirectionalStart(next)) {
             // if we have not reached the start, skip to the next element
             continue;
-          } else {
+          } else if (!this.withinDirectionalEnd(next)) {
             // if we have reached the end, stop adding elements
             break;
+          } else {
+            filtered = filtered.updateImmediateChild(next.name, next.node);
+            count++;
           }
         }
       } else {
@@ -300,15 +297,15 @@ export class LimitedFilter implements NodeFilter {
     this.reverse_ ? this.withinStartPost(node) : this.withinEndPost(node);
 
   private withinStartPost = (node: NamedNode) => {
-    const compareRes = this.index_.getCompare()(
+    const compareRes = this.index_.compare(
       this.rangedFilter_.getStartPost(),
       node
     );
     return this.startIsInclusive_ ? compareRes <= 0 : compareRes < 0;
   };
 
   private withinEndPost = (node: NamedNode) => {
-    const compareRes = this.index_.getCompare()(
+    const compareRes = this.index_.compare(
       node,
       this.rangedFilter_.getEndPost()
     );

diff --git a/packages/database/test/helpers/syncPointSpec.json b/packages/database/test/helpers/syncPointSpec.json
@@ -4216,7 +4216,7 @@
             "path": "",
             "type": "child_added",
             "name": "c",
-            "prevName": null,
+            "prevName": "b",
             "data": { "index": 9, "value": "c" }
           },
           {
@@ -4407,7 +4407,7 @@
             "path": "",
             "type": "child_added",
             "name": "d",
-            "prevName": null,
+            "prevName": "c",
             "data": { ".value": "d" }
           },
           {