@zapier/zapier-sdk-cli 0.6.4 → 0.6.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @zapier/zapier-sdk-cli
 
+## 0.6.5
+
+### Patch Changes
+
+- 8b2b6b6: Fix pagination numbering regression and async iteration
+
 ## 0.6.4
 
 ### Patch Changes

package/dist/cli.cjs

@@ -448,24 +448,24 @@ function getFormatMetadata(schema) {
 function getOutputSchema(schema) {
   return schema?._def?.outputSchema;
 }
-function formatItemsFromSchema(inputSchema, items) {
+function formatItemsFromSchema(inputSchema, items, startingNumber = 0) {
   const outputSchema = getOutputSchema(inputSchema);
   if (!outputSchema) {
-    formatItemsGeneric(items);
+    formatItemsGeneric(items, startingNumber);
     return;
   }
   const formatMeta = getFormatMetadata(outputSchema);
   if (!formatMeta) {
-    formatItemsGeneric(items);
+    formatItemsGeneric(items, startingNumber);
     return;
   }
   items.forEach((item, index) => {
-    formatSingleItem(item, index, formatMeta);
+    formatSingleItem(item, startingNumber + index, formatMeta);
   });
 }
-function formatSingleItem(item, index, formatMeta) {
+function formatSingleItem(item, itemNumber, formatMeta) {
   const formatted = formatMeta.format(item);
-  let titleLine = `${chalk3__default.default.gray(`${index + 1}.`)} ${chalk3__default.default.cyan(formatted.title)}`;
+  let titleLine = `${chalk3__default.default.gray(`${itemNumber + 1}.`)} ${chalk3__default.default.cyan(formatted.title)}`;
   if (formatted.subtitle) {
     titleLine += ` ${chalk3__default.default.gray(formatted.subtitle)}`;
   }
@@ -491,11 +491,13 @@ function applyStyle(value, style) {
       return chalk3__default.default.blue(value);
   }
 }
-function formatItemsGeneric(items) {
+function formatItemsGeneric(items, startingNumber = 0) {
   items.forEach((item, index) => {
     const itemObj = item;
     const name = itemObj.title || itemObj.name || itemObj.key || itemObj.id || "Item";
-    console.log(`${chalk3__default.default.gray(`${index + 1}.`)} ${chalk3__default.default.cyan(name)}`);
+    console.log(
+      `${chalk3__default.default.gray(`${startingNumber + index + 1}.`)} ${chalk3__default.default.cyan(name)}`
+    );
     if (itemObj.description) {
       console.log(`   ${chalk3__default.default.dim(itemObj.description)}`);
     }
@@ -679,7 +681,7 @@ function createCommandConfig(cliCommandName, sdkMethodName, schema, sdk2) {
       );
       if (isListCommand && hasPaginationParams && !shouldUseJson && !hasUserSpecifiedMaxItems) {
         const sdkObj = sdk2;
-        const sdkIterator = await sdkObj[sdkMethodName](resolvedParams);
+        const sdkIterator = sdkObj[sdkMethodName](resolvedParams);
         await handlePaginatedListWithAsyncIteration(
           sdkMethodName,
           sdkIterator,
@@ -863,9 +865,9 @@ async function handlePaginatedListWithAsyncIteration(sdkMethodName, sdkResult, s
         );
       }
       if (schema) {
-        formatItemsFromSchema(schema, items);
+        formatItemsFromSchema(schema, items, totalShown);
       } else {
-        formatItemsGeneric2(items);
+        formatItemsGeneric2(items, totalShown);
       }
       totalShown += items.length;
       console.log(
@@ -900,9 +902,9 @@ async function handlePaginatedListWithAsyncIteration(sdkMethodName, sdkResult, s
         return;
       }
       if (schema) {
-        formatItemsFromSchema(schema, items);
+        formatItemsFromSchema(schema, items, 0);
       } else {
-        formatItemsGeneric2(items);
+        formatItemsGeneric2(items, 0);
       }
       console.log(chalk3__default.default.green(`
 \u2705 Showing ${items.length} ${itemName}`));
@@ -949,11 +951,13 @@ function formatNonPaginatedResults(result, requestedMaxItems, userSpecifiedMaxIt
 \u{1F4C4} All available ${itemName} shown`));
   }
 }
-function formatItemsGeneric2(items) {
+function formatItemsGeneric2(items, startingNumber = 0) {
   items.forEach((item, index) => {
     const itemObj = item;
     const name = itemObj?.name || itemObj?.key || itemObj?.id || "Item";
-    console.log(`${chalk3__default.default.gray(`${index + 1}.`)} ${chalk3__default.default.cyan(String(name))}`);
+    console.log(
+      `${chalk3__default.default.gray(`${startingNumber + index + 1}.`)} ${chalk3__default.default.cyan(String(name))}`
+    );
     if (itemObj?.description) {
       console.log(`   ${chalk3__default.default.dim(String(itemObj.description))}`);
     }
@@ -1698,7 +1702,7 @@ function createZapierCliSdk(options = {}) {
 
 // package.json
 var package_default = {
-  version: "0.6.4"};
+  version: "0.6.5"};
 
 // src/cli.ts
 var program = new commander.Command();

package/dist/cli.mjs

@@ -415,24 +415,24 @@ function getFormatMetadata(schema) {
 function getOutputSchema(schema) {
   return schema?._def?.outputSchema;
 }
-function formatItemsFromSchema(inputSchema, items) {
+function formatItemsFromSchema(inputSchema, items, startingNumber = 0) {
   const outputSchema = getOutputSchema(inputSchema);
   if (!outputSchema) {
-    formatItemsGeneric(items);
+    formatItemsGeneric(items, startingNumber);
     return;
   }
   const formatMeta = getFormatMetadata(outputSchema);
   if (!formatMeta) {
-    formatItemsGeneric(items);
+    formatItemsGeneric(items, startingNumber);
     return;
   }
   items.forEach((item, index) => {
-    formatSingleItem(item, index, formatMeta);
+    formatSingleItem(item, startingNumber + index, formatMeta);
   });
 }
-function formatSingleItem(item, index, formatMeta) {
+function formatSingleItem(item, itemNumber, formatMeta) {
   const formatted = formatMeta.format(item);
-  let titleLine = `${chalk3.gray(`${index + 1}.`)} ${chalk3.cyan(formatted.title)}`;
+  let titleLine = `${chalk3.gray(`${itemNumber + 1}.`)} ${chalk3.cyan(formatted.title)}`;
   if (formatted.subtitle) {
     titleLine += ` ${chalk3.gray(formatted.subtitle)}`;
   }
@@ -458,11 +458,13 @@ function applyStyle(value, style) {
       return chalk3.blue(value);
   }
 }
-function formatItemsGeneric(items) {
+function formatItemsGeneric(items, startingNumber = 0) {
   items.forEach((item, index) => {
     const itemObj = item;
     const name = itemObj.title || itemObj.name || itemObj.key || itemObj.id || "Item";
-    console.log(`${chalk3.gray(`${index + 1}.`)} ${chalk3.cyan(name)}`);
+    console.log(
+      `${chalk3.gray(`${startingNumber + index + 1}.`)} ${chalk3.cyan(name)}`
+    );
     if (itemObj.description) {
       console.log(`   ${chalk3.dim(itemObj.description)}`);
     }
@@ -646,7 +648,7 @@ function createCommandConfig(cliCommandName, sdkMethodName, schema, sdk2) {
       );
       if (isListCommand && hasPaginationParams && !shouldUseJson && !hasUserSpecifiedMaxItems) {
         const sdkObj = sdk2;
-        const sdkIterator = await sdkObj[sdkMethodName](resolvedParams);
+        const sdkIterator = sdkObj[sdkMethodName](resolvedParams);
         await handlePaginatedListWithAsyncIteration(
           sdkMethodName,
           sdkIterator,
@@ -830,9 +832,9 @@ async function handlePaginatedListWithAsyncIteration(sdkMethodName, sdkResult, s
         );
       }
       if (schema) {
-        formatItemsFromSchema(schema, items);
+        formatItemsFromSchema(schema, items, totalShown);
       } else {
-        formatItemsGeneric2(items);
+        formatItemsGeneric2(items, totalShown);
       }
       totalShown += items.length;
       console.log(
@@ -867,9 +869,9 @@ async function handlePaginatedListWithAsyncIteration(sdkMethodName, sdkResult, s
         return;
       }
       if (schema) {
-        formatItemsFromSchema(schema, items);
+        formatItemsFromSchema(schema, items, 0);
       } else {
-        formatItemsGeneric2(items);
+        formatItemsGeneric2(items, 0);
       }
       console.log(chalk3.green(`
 \u2705 Showing ${items.length} ${itemName}`));
@@ -916,11 +918,13 @@ function formatNonPaginatedResults(result, requestedMaxItems, userSpecifiedMaxIt
 \u{1F4C4} All available ${itemName} shown`));
   }
 }
-function formatItemsGeneric2(items) {
+function formatItemsGeneric2(items, startingNumber = 0) {
   items.forEach((item, index) => {
     const itemObj = item;
     const name = itemObj?.name || itemObj?.key || itemObj?.id || "Item";
-    console.log(`${chalk3.gray(`${index + 1}.`)} ${chalk3.cyan(String(name))}`);
+    console.log(
+      `${chalk3.gray(`${startingNumber + index + 1}.`)} ${chalk3.cyan(String(name))}`
+    );
     if (itemObj?.description) {
       console.log(`   ${chalk3.dim(String(itemObj.description))}`);
     }
@@ -1665,7 +1669,7 @@ function createZapierCliSdk(options = {}) {
 
 // package.json
 var package_default = {
-  version: "0.6.4"};
+  version: "0.6.5"};
 
 // src/cli.ts
 var program = new Command();

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zapier/zapier-sdk-cli",
-    "version": "0.6.4",
+    "version": "0.6.5",
     "description": "Command line interface for Zapier SDK",
     "main": "dist/index.cjs",
     "module": "dist/index.mjs",

package/dist/src/utils/cli-generator.js

@@ -203,9 +203,9 @@ function createCommandConfig(cliCommandName, sdkMethodName, schema, sdk) {
                 hasPaginationParams &&
                 !shouldUseJson &&
                 !hasUserSpecifiedMaxItems) {
-                // Get the async iterator directly from the SDK method call
+                // Get the async iterable directly from the SDK method call (don't await it! that breaks the next page behavior)
                 const sdkObj = sdk;
-                const sdkIterator = await sdkObj[sdkMethodName](resolvedParams);
+                const sdkIterator = sdkObj[sdkMethodName](resolvedParams);
                 await handlePaginatedListWithAsyncIteration(sdkMethodName, sdkIterator, schema);
             }
             else {
@@ -391,10 +391,10 @@ async function handlePaginatedListWithAsyncIteration(sdkMethodName, sdkResult, s
             }
             // Format and display items using schema
             if (schema) {
-                formatItemsFromSchema(schema, items);
+                formatItemsFromSchema(schema, items, totalShown);
             }
             else {
-                formatItemsGeneric(items);
+                formatItemsGeneric(items, totalShown);
             }
             totalShown += items.length;
             console.log(chalk.green(`\n✅ Showing ${totalShown} ${itemName} (page ${pageCount})`));
@@ -428,10 +428,10 @@ async function handlePaginatedListWithAsyncIteration(sdkMethodName, sdkResult, s
                 return;
             }
             if (schema) {
-                formatItemsFromSchema(schema, items);
+                formatItemsFromSchema(schema, items, 0);
             }
             else {
-                formatItemsGeneric(items);
+                formatItemsGeneric(items, 0);
             }
             console.log(chalk.green(`\n✅ Showing ${items.length} ${itemName}`));
         }
@@ -476,12 +476,12 @@ function formatNonPaginatedResults(result, requestedMaxItems, userSpecifiedMaxIt
         console.log(chalk.gray(`\n📄 All available ${itemName} shown`));
     }
 }
-function formatItemsGeneric(items) {
+function formatItemsGeneric(items, startingNumber = 0) {
     // Fallback formatting for items without schema metadata
     items.forEach((item, index) => {
         const itemObj = item;
         const name = itemObj?.name || itemObj?.key || itemObj?.id || "Item";
-        console.log(`${chalk.gray(`${index + 1}.`)} ${chalk.cyan(String(name))}`);
+        console.log(`${chalk.gray(`${startingNumber + index + 1}.`)} ${chalk.cyan(String(name))}`);
         if (itemObj?.description) {
             console.log(`   ${chalk.dim(String(itemObj.description))}`);
         }

package/dist/src/utils/schema-formatter.d.ts

@@ -1,2 +1,2 @@
 import { z } from "zod";
-export declare function formatItemsFromSchema(inputSchema: z.ZodType, items: unknown[]): void;
+export declare function formatItemsFromSchema(inputSchema: z.ZodType, items: unknown[], startingNumber?: number): void;

package/dist/src/utils/schema-formatter.js

@@ -9,30 +9,30 @@ function getOutputSchema(schema) {
 // ============================================================================
 // Generic Schema-Driven Formatter
 // ============================================================================
-export function formatItemsFromSchema(inputSchema, items) {
+export function formatItemsFromSchema(inputSchema, items, startingNumber = 0) {
     // Get the output schema and its format metadata
     const outputSchema = getOutputSchema(inputSchema);
     if (!outputSchema) {
         // Fallback to generic formatting if no output schema
-        formatItemsGeneric(items);
+        formatItemsGeneric(items, startingNumber);
         return;
     }
     const formatMeta = getFormatMetadata(outputSchema);
     if (!formatMeta) {
         // Fallback to generic formatting if no format metadata
-        formatItemsGeneric(items);
+        formatItemsGeneric(items, startingNumber);
         return;
     }
     // Format each item using the schema metadata
     items.forEach((item, index) => {
-        formatSingleItem(item, index, formatMeta);
+        formatSingleItem(item, startingNumber + index, formatMeta);
     });
 }
-function formatSingleItem(item, index, formatMeta) {
+function formatSingleItem(item, itemNumber, formatMeta) {
     // Get the formatted item from the format function
     const formatted = formatMeta.format(item);
     // Build the main title line
-    let titleLine = `${chalk.gray(`${index + 1}.`)} ${chalk.cyan(formatted.title)}`;
+    let titleLine = `${chalk.gray(`${itemNumber + 1}.`)} ${chalk.cyan(formatted.title)}`;
     if (formatted.subtitle) {
         titleLine += ` ${chalk.gray(formatted.subtitle)}`;
     }
@@ -59,12 +59,12 @@ function applyStyle(value, style) {
             return chalk.blue(value);
     }
 }
-function formatItemsGeneric(items) {
+function formatItemsGeneric(items, startingNumber = 0) {
     // Fallback formatting for items without schema metadata
     items.forEach((item, index) => {
         const itemObj = item;
         const name = itemObj.title || itemObj.name || itemObj.key || itemObj.id || "Item";
-        console.log(`${chalk.gray(`${index + 1}.`)} ${chalk.cyan(name)}`);
+        console.log(`${chalk.gray(`${startingNumber + index + 1}.`)} ${chalk.cyan(name)}`);
         if (itemObj.description) {
             console.log(`   ${chalk.dim(itemObj.description)}`);
         }