fix(cursor): optimization was wrong, can't use empty cursor for compl…

…etion
sesamecare · Apr 1, 2024 · 3d66c4e · 3d66c4e
1 parent 724ff53
commit 3d66c4e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/src/asDataGenerator.ts b/src/asDataGenerator.ts
@@ -8,11 +8,6 @@ export function asDataGenerator<T extends ResultWithCursor>(
 
   return {
     async *getGenerator(cursor: string | undefined) {
-      if (cursor === '') {
-        // The special empty string cursor indicates we should not fetch any more.
-        return;
-      }
-
       let currentCursor = cursor;
       let continueFetching = true;
 

diff --git a/src/multiSourcePager.ts b/src/multiSourcePager.ts
@@ -47,8 +47,6 @@ export async function multiSourcePager<Types extends Array<Source>>(
         index,
         key: dataSources[index].sortKey(item.value),
       });
-    } else {
-      cursors[index] = '';
     }
   }));
 
@@ -65,9 +63,7 @@ export async function multiSourcePager<Types extends Array<Source>>(
 
         // Fetch next item from the generator of the data source that the last item came from
         const nextResult = await generators[index].next();
-        if (nextResult.done) {
-          cursors[index] = '';
-        } else {
+        if (!nextResult.done) {
           queue.push({
             result: nextResult.value,
             index,

diff --git a/src/queuePager.spec.ts b/src/queuePager.spec.ts
@@ -82,12 +82,12 @@ describe('multi source pager', () => {
             "type": "letter",
           },
           {
-            "cursor": "WyIiLCIyMDIzLTAxLTA2VDAwOjAwOjAwLjAwMFojRkYiXQ==",
+            "cursor": "WyIyMDIzLTAxLTA1VDAwOjAwOjAwLjAwMFojRSIsIjIwMjMtMDEtMDZUMDA6MDA6MDAuMDAwWiNGRiJd",
             "data": "FF",
             "type": "letter",
           },
           {
-            "cursor": "WyIiLCIyMDIzLTAxLTA3VDAwOjAwOjAwLjAwMFojR0ciXQ==",
+            "cursor": "WyIyMDIzLTAxLTA1VDAwOjAwOjAwLjAwMFojRSIsIjIwMjMtMDEtMDdUMDA6MDA6MDAuMDAwWiNHRyJd",
             "data": "GG",
             "type": "letter",
           },
@@ -98,7 +98,7 @@ describe('multi source pager', () => {
       expect(p4.results).toMatchInlineSnapshot(`
         [
           {
-            "cursor": "WyIiLCIyMDIzLTAxLTA4VDAwOjAwOjAwLjAwMFojSEgiXQ==",
+            "cursor": "WyIyMDIzLTAxLTA1VDAwOjAwOjAwLjAwMFojRSIsIjIwMjMtMDEtMDhUMDA6MDA6MDAuMDAwWiNISCJd",
             "data": "HH",
             "type": "letter",
           },
@@ -137,17 +137,17 @@ describe('multi source pager', () => {
           "type": "letter",
         },
         {
-          "cursor": "WyIyMDIzLTAxLTAzVDAwOjAwOjAwLjAwMFojQyIsIiJd",
+          "cursor": "WyIyMDIzLTAxLTAzVDAwOjAwOjAwLjAwMFojQyIsIjIwMjMtMDEtMDJUMDA6MDA6MDAuMDAwWiNCQkIiXQ==",
           "data": "C",
           "type": "letter",
         },
         {
-          "cursor": "WyIyMDIzLTAxLTA0VDAwOjAwOjAwLjAwMFojRCIsIiJd",
+          "cursor": "WyIyMDIzLTAxLTA0VDAwOjAwOjAwLjAwMFojRCIsIjIwMjMtMDEtMDJUMDA6MDA6MDAuMDAwWiNCQkIiXQ==",
           "data": "D",
           "type": "letter",
         },
         {
-          "cursor": "WyIyMDIzLTAxLTA1VDAwOjAwOjAwLjAwMFojRSIsIiJd",
+          "cursor": "WyIyMDIzLTAxLTA1VDAwOjAwOjAwLjAwMFojRSIsIjIwMjMtMDEtMDJUMDA6MDA6MDAuMDAwWiNCQkIiXQ==",
           "data": "E",
           "type": "letter",
         },