@zapier/zapier-sdk-cli 0.6.4 → 0.8.0

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

@@ -30,6 +30,15 @@ function formatJsonOutput(data) {
 // ============================================================================
 function analyzeZodSchema(schema) {
     const parameters = [];
+    // Handle ZodEffects (schemas with .refine(), .transform(), etc.)
+    if (schema._def &&
+        schema._def.typeName ===
+            "ZodEffects") {
+        // Get the underlying schema
+        const innerSchema = schema
+            ._def.schema;
+        return analyzeZodSchema(innerSchema);
+    }
     if (schema instanceof z.ZodObject) {
         const shape = schema.shape;
         for (const [key, fieldSchema] of Object.entries(shape)) {
@@ -45,15 +54,26 @@ function analyzeZodField(name, schema) {
     let baseSchema = schema;
     let required = true;
     let defaultValue = undefined;
-    // Unwrap optional and default wrappers
-    if (baseSchema instanceof z.ZodOptional) {
-        required = false;
-        baseSchema = baseSchema._def.innerType;
-    }
-    if (baseSchema instanceof z.ZodDefault) {
-        required = false;
-        defaultValue = baseSchema._def.defaultValue();
-        baseSchema = baseSchema._def.innerType;
+    // Unwrap optional, default, and nullable wrappers - keep unwrapping until we get to the base type
+    while (true) {
+        if (baseSchema instanceof z.ZodOptional) {
+            required = false;
+            baseSchema = baseSchema._def.innerType;
+        }
+        else if (baseSchema instanceof z.ZodDefault) {
+            required = false;
+            defaultValue = baseSchema._def.defaultValue();
+            baseSchema = baseSchema._def.innerType;
+        }
+        else if (baseSchema._def &&
+            baseSchema._def
+                .typeName === "ZodNullable") {
+            // nullable doesn't affect CLI required status, but we need to unwrap it to get the base type
+            baseSchema = baseSchema._def.innerType;
+        }
+        else {
+            break; // No more wrappers to unwrap
+        }
     }
     // Determine parameter type
     let paramType = "string";
@@ -203,9 +223,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 +411,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 +448,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 +496,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)}`);
         }