[eas-cli] paginated progress bar

* Upgrade eas-build dependencies

* update CHANGELOG.md

CHANGELOG.md

@@ -8,11 +8,19 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+### 🐛 Bug fixes
+
+### 🧹 Chores
+
+- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2316](https://github.com/expo/eas-cli/pull/2316) by [@expo-bot](https://github.com/expo-bot))
+
+## [7.8.0](https://github.com/expo/eas-cli/releases/tag/v7.8.0) - 2024-04-08
+
+### 🎉 New features
+
 - Add `auto`, `sdk-50` and `sdk-49` image tags. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic))
 - Add `--build-logger-level` flag to `eas build` command. ([#2313](https://github.com/expo/eas-cli/pull/2313) by [@szdziedzic](https://github.com/szdziedzic))
 
-### 🐛 Bug fixes
-
 ### 🧹 Chores
 
 - Deprecate the `default` image tag. ([#2298](https://github.com/expo/eas-cli/pull/2298) by [@szdziedzic](https://github.com/szdziedzic))

packages/eas-cli/package.json

@@ -28,7 +28,7 @@
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.92",
+    "@expo/steps": "1.0.95",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "^1.26.2",
     "@oclif/plugin-autocomplete": "^2.3.10",

packages/eas-cli/src/utils/__tests__/relay-test.ts

@@ -1,10 +1,15 @@
+import { PageInfo } from '../../graphql/generated';
 import { promptAsync } from '../../prompts';
 import {
   Connection,
+  Edge,
   FilterPagination,
   NEXT_PAGE_OPTION,
+  PAGE_SIZE,
   PREV_PAGE_OPTION,
+  PaginatedGetterAsync,
   QueryParams,
+  fetchEntireDatasetAsync,
   selectPaginatedAsync,
 } from '../relay';
 
@@ -780,3 +785,55 @@ describe(selectPaginatedAsync, () => {
     expect(getTitleAsync).toHaveBeenCalledWith(node3);
   });
 });
+
+describe(selectPaginatedAsync, () => {
+  const mockDataset = Array.from({ length: 50 }, (_, idx) => ({ id: idx + 1 }));
+  const testPaginatedGetterAsync: PaginatedGetterAsync<object> = async (
+    relayArgs: QueryParams
+  ): Promise<Connection<object>> => {
+    const startIdx = relayArgs.after ? Number(relayArgs.after) : 0;
+    const endIdx = startIdx + (relayArgs.first || PAGE_SIZE);
+    const hasNextPage = endIdx < mockDataset.length;
+    const hasPreviousPage = startIdx > 0;
+    const edges: Edge<object>[] = mockDataset
+      .slice(startIdx, endIdx)
+      .map(node => ({ cursor: String(node.id), node }));
+
+    const pageInfo: PageInfo = {
+      hasNextPage,
+      hasPreviousPage,
+      endCursor: hasNextPage ? String(endIdx) : undefined,
+    };
+
+    return {
+      edges,
+      pageInfo,
+    };
+  };
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('getting an entire paginated dataset', async () => {
+    const data = await fetchEntireDatasetAsync({
+      paginatedGetterAsync: testPaginatedGetterAsync,
+    });
+    expect(data).toEqual(mockDataset);
+  });
+  test('getting an empty paginated dataset', async () => {
+    const emptyPaginatedGetterAsync = async (): Promise<Connection<object>> => {
+      return {
+        edges: [],
+        pageInfo: {
+          hasNextPage: false,
+          hasPreviousPage: false,
+        },
+      };
+    };
+    const data = await fetchEntireDatasetAsync({
+      paginatedGetterAsync: emptyPaginatedGetterAsync,
+    });
+    expect(data).toEqual([]);
+  });
+});

packages/eas-cli/src/utils/relay.ts

@@ -1,4 +1,5 @@
 import assert from 'assert';
+import cliProgress from 'cli-progress';
 
 import { PageInfo } from '../graphql/generated';
 import { promptAsync } from '../prompts';
@@ -356,3 +357,51 @@ async function selectPaginatedInternalAsync<T>({
     return selectedItem as T;
   }
 }
+
+export type PaginatedGetterAsync<Node> = (relayArgs: QueryParams) => Promise<Connection<Node>>;
+export const PAGE_SIZE = 20;
+export async function fetchEntireDatasetAsync<Node>({
+  paginatedGetterAsync,
+  progressBarLabel,
+}: {
+  paginatedGetterAsync: PaginatedGetterAsync<Node>;
+  progressBarLabel?: string;
+}): Promise<Node[]> {
+  // No way to know the total count of items beforehand
+  let totalEstimatedWork = 10;
+  const queueProgressBar = new cliProgress.SingleBar(
+    { format: `|{bar}| ${progressBarLabel}` },
+    cliProgress.Presets.rect
+  );
+
+  const data: Node[] = [];
+  let cursor = undefined;
+  let didStartProgressBar = false;
+  let progress = 0;
+  while (true) {
+    const connection = await paginatedGetterAsync({ first: PAGE_SIZE, after: cursor });
+    const nodes = connection.edges.map(edge => edge.node);
+    const hasNextPage = connection.pageInfo.hasNextPage;
+    data.push(...nodes);
+    if (!hasNextPage) {
+      break;
+    }
+    cursor = connection.pageInfo.endCursor ?? undefined;
+    if (!didStartProgressBar) {
+      // only show the progress bar if user has more than 1 page of items
+      queueProgressBar.start(totalEstimatedWork, 0);
+      didStartProgressBar = true;
+    }
+    progress++;
+    queueProgressBar.update(progress);
+    if (progress >= totalEstimatedWork) {
+      totalEstimatedWork = 8 * totalEstimatedWork;
+      queueProgressBar.setTotal(totalEstimatedWork);
+    }
+  }
+  if (didStartProgressBar) {
+    queueProgressBar.update(totalEstimatedWork);
+    queueProgressBar.stop();
+  }
+  return data;
+}

yarn.lock

@@ -1462,15 +1462,6 @@
     slugify "^1.3.4"
     sucrase "^3.20.0"
 
-"@expo/[email protected]":
-  version "1.0.92"
-  resolved "https://registry.yarnpkg.com/@expo/eas-build-job/-/eas-build-job-1.0.92.tgz#e32a528a484b12292bc107c58a39374785ad65af"
-  integrity sha512-IcXt41YGN1Teo16PGCAHim745969jXKUTroQhZJiFAkam56xLoZeefvMBQUqS4bpustBkU1RBDU7bud5So/WQQ==
-  dependencies:
-    joi "^17.11.0"
-    semver "^7.5.4"
-    zod "^3.22.4"
-
 "@expo/[email protected]":
   version "1.0.95"
   resolved "https://registry.yarnpkg.com/@expo/eas-build-job/-/eas-build-job-1.0.95.tgz#182a4d90a3e7abe19efcc2c93f42405e007398fe"
@@ -1676,12 +1667,12 @@
   dependencies:
     cross-spawn "^7.0.3"
 
-"@expo/[email protected]2":
-  version "1.0.92"
-  resolved "https://registry.yarnpkg.com/@expo/steps/-/steps-1.0.92.tgz#79f760e176be82bbb9e678b88e2c343e9ae7c333"
-  integrity sha512-A/J6EGnqpw1928BPVMHwFyW+4UyCkdTYVAyCsHPTg4Pi76P0XFfhMdU5YQcgnZSWgum+CMMaN3AorDV52Mf11Q==
+"@expo/[email protected]5":
+  version "1.0.95"
+  resolved "https://registry.yarnpkg.com/@expo/steps/-/steps-1.0.95.tgz#7059be885351edd981aaf146a216206ae209bf7c"
+  integrity sha512-/z2ZlRD/yNqgyWkyPvXa7ygSZmPzwLVf1DXOMiES0buTlNA4v7pi4rtBy2kCcc7LoJKsDly6C+7HQaeTEq7FnA==
   dependencies:
-    "@expo/eas-build-job" "1.0.92"
+    "@expo/eas-build-job" "1.0.95"
     "@expo/logger" "1.0.57"
     "@expo/spawn-async" "^1.7.2"
     arg "^5.0.2"
@@ -12713,7 +12704,16 @@ string-length@^5.0.1:
     char-regex "^2.0.0"
     strip-ansi "^7.0.1"
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -12830,7 +12830,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -12844,6 +12844,13 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2"
@@ -14005,7 +14012,16 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", [email protected], wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+[email protected], wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==