fix: always show pagination token when more results exist

package.json

@@ -93,7 +93,7 @@
     "@aws-sdk/credential-providers": "^3.1024.0",
     "@smithy/shared-ini-file-loader": "^4.4.7",
     "@tigrisdata/iam": "^1.4.1",
-    "@tigrisdata/storage": "^2.16.2",
+    "@tigrisdata/storage": "^3.0.0",
     "commander": "^14.0.3",
     "enquirer": "^2.4.1",
     "jose": "^6.2.2",

src/lib/access-keys/list.ts

@@ -1,7 +1,7 @@
 import { getIAMConfig } from '@auth/iam.js';
 import { listAccessKeys } from '@tigrisdata/iam';
 import { failWithError } from '@utils/exit.js';
-import { formatOutput, formatPaginatedOutput } from '@utils/format.js';
+import { formatPaginatedOutput } from '@utils/format.js';
 import {
   msg,
   printEmpty,
@@ -17,7 +17,7 @@ export default async function list(options: Record<string, unknown>) {
   printStart(context);
 
   const format = getFormat(options);
-  const { limit, pageToken, isPaginated } = getPaginationOptions(options);
+  const { limit, pageToken } = getPaginationOptions(options);
 
   const config = await getIAMConfig(context);
 
@@ -52,15 +52,13 @@ export default async function list(options: Record<string, unknown>) {
 
   const nextToken = data.paginationToken || undefined;
 
-  const output = isPaginated
-    ? formatPaginatedOutput(keys, format!, 'keys', 'key', columns, {
-        paginationToken: nextToken,
-      })
-    : formatOutput(keys, format!, 'keys', 'key', columns);
+  const output = formatPaginatedOutput(keys, format!, 'keys', 'key', columns, {
+    paginationToken: nextToken,
+  });
 
   console.log(output);
 
-  if (isPaginated && format !== 'json' && format !== 'xml') {
+  if (format !== 'json' && format !== 'xml') {
     printPaginationHint(nextToken);
   }
 

src/lib/buckets/list.ts

@@ -28,7 +28,7 @@ export default async function list(options: Record<string, unknown>) {
   }
 
   const { data, error } = await listBuckets({
-    ...(forksOf || !isPaginated
+    ...(forksOf
       ? {}
       : {
           ...(limit !== undefined ? { limit } : {}),
@@ -57,7 +57,7 @@ export default async function list(options: Record<string, unknown>) {
       failWithError(context, infoError);
     }
 
-    if (!bucketInfo.hasForks) {
+    if (!bucketInfo.forkInfo?.hasChildren) {
       printEmpty(context);
       return;
     }
@@ -67,7 +67,10 @@ export default async function list(options: Record<string, unknown>) {
     for (const bucket of data.buckets) {
       if (bucket.name === forksOf) continue;
       const { data: info } = await getBucketInfo(bucket.name, { config });
-      if (info?.sourceBucketName === forksOf) {
+      const isChildOf = info?.forkInfo?.parents?.some(
+        (p) => p.bucketName === forksOf
+      );
+      if (isChildOf) {
         forks.push({ name: bucket.name, created: bucket.creationDate });
       }
     }
@@ -99,15 +102,18 @@ export default async function list(options: Record<string, unknown>) {
 
   const nextToken = data.paginationToken || undefined;
 
-  const output = isPaginated
-    ? formatPaginatedOutput(buckets, format!, 'buckets', 'bucket', columns, {
-        paginationToken: nextToken,
-      })
-    : formatOutput(buckets, format!, 'buckets', 'bucket', columns);
+  const output = formatPaginatedOutput(
+    buckets,
+    format!,
+    'buckets',
+    'bucket',
+    columns,
+    { paginationToken: nextToken }
+  );
 
   console.log(output);
 
-  if (isPaginated && format !== 'json' && format !== 'xml') {
+  if (format !== 'json' && format !== 'xml') {
     printPaginationHint(nextToken);
   }
 

src/lib/forks/list.ts

@@ -28,7 +28,7 @@ export default async function list(options: Record<string, unknown>) {
     failWithError(context, infoError);
   }
 
-  if (!bucketInfo.hasForks) {
+  if (!bucketInfo.forkInfo?.hasChildren) {
     printEmpty(context);
     return;
   }
@@ -47,7 +47,10 @@ export default async function list(options: Record<string, unknown>) {
     if (bucket.name === name) continue;
 
     const { data: info } = await getBucketInfo(bucket.name, { config });
-    if (info?.sourceBucketName === name) {
+    const isChildOf = info?.forkInfo?.parents?.some(
+      (p) => p.bucketName === name
+    );
+    if (isChildOf) {
       forks.push({
         name: bucket.name,
         created: bucket.creationDate,

src/lib/iam/policies/list.ts

@@ -1,7 +1,7 @@
 import { getOAuthIAMConfig } from '@auth/iam.js';
 import { listPolicies } from '@tigrisdata/iam';
 import { failWithError } from '@utils/exit.js';
-import { formatOutput, formatPaginatedOutput } from '@utils/format.js';
+import { formatPaginatedOutput } from '@utils/format.js';
 import {
   msg,
   printEmpty,
@@ -17,7 +17,7 @@ export default async function list(options: Record<string, unknown>) {
   printStart(context);
 
   const format = getFormat(options);
-  const { limit, pageToken, isPaginated } = getPaginationOptions(options);
+  const { limit, pageToken } = getPaginationOptions(options);
 
   const iamConfig = await getOAuthIAMConfig(context);
 
@@ -62,15 +62,18 @@ export default async function list(options: Record<string, unknown>) {
 
   const nextToken = data.paginationToken || undefined;
 
-  const output = isPaginated
-    ? formatPaginatedOutput(policies, format!, 'policies', 'policy', columns, {
-        paginationToken: nextToken,
-      })
-    : formatOutput(policies, format!, 'policies', 'policy', columns);
+  const output = formatPaginatedOutput(
+    policies,
+    format!,
+    'policies',
+    'policy',
+    columns,
+    { paginationToken: nextToken }
+  );
 
   console.log(output);
 
-  if (isPaginated && format !== 'json' && format !== 'xml') {
+  if (format !== 'json' && format !== 'xml') {
     printPaginationHint(nextToken);
   }
 

src/lib/ls.ts

@@ -1,8 +1,9 @@
 import { getStorageConfig } from '@auth/provider.js';
 import { list, listBuckets } from '@tigrisdata/storage';
 import { exitWithError } from '@utils/exit.js';
-import { formatOutput, formatSize } from '@utils/format.js';
-import { getFormat, getOption } from '@utils/options.js';
+import { formatPaginatedOutput, formatSize } from '@utils/format.js';
+import { printPaginationHint } from '@utils/messages.js';
+import { getFormat, getOption, getPaginationOptions } from '@utils/options.js';
 import { parseAnyPath } from '@utils/path.js';
 
 export default async function ls(options: Record<string, unknown>) {
@@ -13,11 +14,16 @@ export default async function ls(options: Record<string, unknown>) {
     'snapshot',
   ]);
   const format = getFormat(options);
+  const { limit, pageToken } = getPaginationOptions(options);
 
   if (!pathString) {
     // No path provided, list all buckets
     const config = await getStorageConfig();
-    const { data, error } = await listBuckets({ config });
+    const { data, error } = await listBuckets({
+      ...(limit !== undefined ? { limit } : {}),
+      ...(pageToken ? { paginationToken: pageToken } : {}),
+      config,
+    });
 
     if (error) {
       exitWithError(error);
@@ -28,12 +34,28 @@ export default async function ls(options: Record<string, unknown>) {
       created: bucket.creationDate,
     }));
 
-    const output = formatOutput(buckets, format!, 'buckets', 'bucket', [
+    const columns = [
       { key: 'name', header: 'Name' },
       { key: 'created', header: 'Created' },
-    ]);
+    ];
+
+    const nextToken = data.paginationToken || undefined;
+
+    const output = formatPaginatedOutput(
+      buckets,
+      format!,
+      'buckets',
+      'bucket',
+      columns,
+      { paginationToken: nextToken }
+    );
 
     console.log(output);
+
+    if (format !== 'json' && format !== 'xml') {
+      printPaginationHint(nextToken);
+    }
+
     return;
   }
 
@@ -51,6 +73,8 @@ export default async function ls(options: Record<string, unknown>) {
   const { data, error } = await list({
     prefix,
     ...(snapshotVersion ? { snapshotVersion } : {}),
+    ...(limit !== undefined ? { limit } : {}),
+    ...(pageToken ? { paginationToken: pageToken } : {}),
     config: {
       ...config,
       bucket,
@@ -84,11 +108,26 @@ export default async function ls(options: Record<string, unknown>) {
         item.key !== '' && arr.findIndex((i) => i.key === item.key) === index
     );
 
-  const output = formatOutput(objects, format!, 'objects', 'object', [
+  const columns = [
     { key: 'key', header: 'Key' },
     { key: 'size', header: 'Size' },
     { key: 'modified', header: 'Modified' },
-  ]);
+  ];
+
+  const nextToken = data.paginationToken || undefined;
+
+  const output = formatPaginatedOutput(
+    objects,
+    format!,
+    'objects',
+    'object',
+    columns,
+    { paginationToken: nextToken }
+  );
 
   console.log(output);
+
+  if (format !== 'json' && format !== 'xml') {
+    printPaginationHint(nextToken);
+  }
 }

src/lib/objects/list.ts

@@ -1,11 +1,7 @@
 import { getStorageConfig } from '@auth/provider.js';
 import { list } from '@tigrisdata/storage';
 import { failWithError } from '@utils/exit.js';
-import {
-  formatOutput,
-  formatPaginatedOutput,
-  formatSize,
-} from '@utils/format.js';
+import { formatPaginatedOutput, formatSize } from '@utils/format.js';
 import {
   msg,
   printEmpty,
@@ -29,7 +25,7 @@ export default async function listObjects(options: Record<string, unknown>) {
     'snapshotVersion',
     'snapshot',
   ]);
-  const { limit, pageToken, isPaginated } = getPaginationOptions(options);
+  const { limit, pageToken } = getPaginationOptions(options);
 
   if (!bucketArg) {
     failWithError(context, 'Bucket name is required');
@@ -75,15 +71,18 @@ export default async function listObjects(options: Record<string, unknown>) {
 
   const nextToken = data.paginationToken || undefined;
 
-  const output = isPaginated
-    ? formatPaginatedOutput(objects, format!, 'objects', 'object', columns, {
-        paginationToken: nextToken,
-      })
-    : formatOutput(objects, format!, 'objects', 'object', columns);
+  const output = formatPaginatedOutput(
+    objects,
+    format!,
+    'objects',
+    'object',
+    columns,
+    { paginationToken: nextToken }
+  );
 
   console.log(output);
 
-  if (isPaginated && format !== 'json' && format !== 'xml') {
+  if (format !== 'json' && format !== 'xml') {
     printPaginationHint(nextToken);
   }