[DECO-330] Fix repo list pagination (#229)

Co-authored-by: Fabian Jakobs <[email protected]>

Author: kartikgupta-db

packages/databricks-sdk-js/src/decorators.test.ts

@@ -4,6 +4,7 @@ import assert from "node:assert";
 import {ListRequest, ListReposResponse} from "./apis/repos";
 import {paginated} from "./decorators";
 import {CancellationToken} from "./types";
+import {Context} from "./context";
 
 describe(__filename, () => {
     it("should paginate", async () => {
@@ -60,7 +61,7 @@ describe(__filename, () => {
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 _req: ListRequest,
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                _token: CancellationToken
+                _context: Context
             ): Promise<ListReposResponse> {
                 this.count += 1;
                 if (this.count === 3) {
@@ -79,7 +80,7 @@ describe(__filename, () => {
         }
 
         const t = new Test();
-        await t.getRepos({}, token);
+        await t.getRepos({}, new Context({cancellationToken: token}));
         assert.equal(t.count, 3);
     });
 });

packages/databricks-sdk-js/src/decorators.ts

@@ -1,4 +1,4 @@
-import {CancellationToken} from "./types";
+import {Context} from "./context";
 
 /**
  * Wraps an API client function that uses pagination and calles it iteratively to
@@ -15,12 +15,12 @@ export function paginated<REQ, RES>(
     ): PropertyDescriptor {
         const childFunction = descriptor.value as (
             req: REQ,
-            token?: CancellationToken
+            context?: Context
         ) => Promise<RES>;
 
         descriptor.value = async function (
             req: REQ,
-            token?: CancellationToken
+            context?: Context
         ): Promise<RES> {
             const results = [];
             let response: RES;
@@ -31,9 +31,12 @@ export function paginated<REQ, RES>(
                 } else {
                     delete req[paginationKey];
                 }
-                response = await childFunction.call(this, req, token);
+                response = await childFunction.call(this, req, context);
 
-                if (token && token.isCancellationRequested) {
+                if (
+                    context?.cancellationToken &&
+                    context?.cancellationToken.isCancellationRequested
+                ) {
                     return response;
                 }
 
@@ -43,8 +46,9 @@ export function paginated<REQ, RES>(
                 paginationToken = response[paginationKey];
             } while (paginationToken);
 
-            (response[itemsKey] as any) = results;
-            return response;
+            const anyResponse = response as any;
+            anyResponse[itemsKey] = results;
+            return anyResponse;
         };
         return descriptor;
     };

packages/databricks-sdk-js/src/services/Repos.ts

@@ -23,12 +23,13 @@ export class Repos {
         @context context?: Context
     ): Promise<RepoList> {
         const reposApi = new ReposService(this.client);
+        const response = await reposApi.list(req, context);
         return {
             repos:
-                (await reposApi.list(req, context)).repos?.map(
+                response.repos?.map(
                     (details) => new Repo(this.client, details)
                 ) ?? [],
-            next_page_token: req["next_page_token"],
+            next_page_token: response["next_page_token"],
         };
     }
 }