Fix asyncIter to actually fetch next pages (#483)

* Fix asyncIter to actually fetch next pages * Add changeset * Fix asyncIter in legacy-client Tested changes
palantir · Jul 16, 2024 · 4824449 · 4824449
1 parent 8b91726
commit 4824449
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/.changeset/rare-timers-care.md b/.changeset/rare-timers-care.md
@@ -0,0 +1,5 @@
+---
+"@osdk/client": patch
+---
+
+Fix asyncIter to fetch subsequent pages
diff --git a/packages/client/src/objectSet/createObjectSet.ts b/packages/client/src/objectSet/createObjectSet.ts
@@ -16,10 +16,12 @@
 
 import type {
   ObjectOrInterfaceDefinition,
+  ObjectOrInterfacePropertyKeysFrom2,
   ObjectTypeDefinition,
 } from "@osdk/api";
 import type {
   BaseObjectSet,
+  FetchPageResult,
   LinkedType,
   LinkNames,
   MinimalObjectSet,
@@ -141,11 +143,15 @@ export function createObjectSet<Q extends ObjectOrInterfaceDefinition>(
     asyncIter: async function*(): AsyncIterableIterator<Osdk<Q, "$all">> {
       let $nextPageToken: string | undefined = undefined;
       do {
-        const result = await base.fetchPage({ $nextPageToken });
-
-        for (
-          const obj of result.data
-        ) {
+        const result: FetchPageResult<
+          Q,
+          ObjectOrInterfacePropertyKeysFrom2<Q>,
+          boolean,
+          "throw"
+        > = await base.fetchPage({ $nextPageToken });
+        $nextPageToken = result.nextPageToken;
+
+        for (const obj of result.data) {
           yield obj as Osdk<Q, "$all">;
         }
       } while ($nextPageToken != null);

diff --git a/packages/legacy-client/src/client/net/loadObjectsPage.ts b/packages/legacy-client/src/client/net/loadObjectsPage.ts
@@ -115,7 +115,7 @@ export async function* loadObjectsIterator<
 ): AsyncIterableIterator<T> {
   let pageToken: string | undefined = undefined;
   do {
-    const result = await loadObjectsPage(
+    const result: Result<Page<T>, LoadObjectSetError> = await loadObjectsPage(
       client,
       objectApiName,
       objectSetDefinition,
@@ -124,6 +124,7 @@ export async function* loadObjectsIterator<
       { pageToken },
     );
     if (result.type === "ok") {
+      pageToken = result.value.nextPageToken;
       for (
         const obj of result.value.data
       ) {