@zapier/zapier-sdk-cli 0.36.3 → 0.37.0

package/dist/src/cli.js

@@ -5,6 +5,8 @@ import { createZapierCliSdk } from "./sdk";
 import packageJson from "../package.json" with { type: "json" };
 import { ZapierCliError } from "./utils/errors";
 import { checkAndNotifyUpdates } from "./utils/version-checker";
+import { BaseSdkOptionsSchema } from "@zapier/zapier-sdk";
+import { z } from "zod";
 import { ReservedCliParameter, getReservedCliOption, } from "./utils/cli-options";
 const EXIT_GRACE_PERIOD_MS = 500;
 const program = new Command();
@@ -22,8 +24,24 @@ program
     .option("--credentials-base-url <url>", "Base URL for authentication endpoints")
     .option("--tracking-base-url <url>", "Base URL for Zapier tracking endpoints")
     .option("--max-network-retries <count>", "Max retries for rate-limited requests (default: 3)")
-    .option("--max-network-retry-delay-ms <ms>", "Max delay in ms to wait for rate limit retry (default: 60000)")
-    .helpOption(`${helpOption.short}, ${helpOption.flag}`, helpOption.description);
+    .option("--max-network-retry-delay-ms <ms>", "Max delay in ms to wait for rate limit retry (default: 60000)");
+// Dynamically register boolean flags from BaseSdkOptionsSchema
+const booleanFlags = [];
+for (const [key, fieldSchema] of Object.entries(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+BaseSdkOptionsSchema.shape)) {
+    let inner = fieldSchema;
+    if (inner instanceof z.ZodOptional) {
+        inner = inner._zod.def.innerType;
+    }
+    if (inner instanceof z.ZodBoolean && key !== "debug") {
+        const kebab = key.replace(/([A-Z])/g, "-$1").toLowerCase();
+        const description = fieldSchema._zod?.def?.description ?? "";
+        booleanFlags.push({ camelName: key, kebabFlag: `--${kebab}` });
+        program.option(`--${kebab}`, description);
+    }
+}
+program.helpOption(`${helpOption.short}, ${helpOption.flag}`, helpOption.description);
 // Check for debug flag early (support both flag and env var)
 const isDebugMode = process.env.DEBUG === "true" || process.argv.includes("--debug");
 // Helper to get flag value from argv
@@ -77,6 +95,13 @@ function buildCredentialsFromFlags() {
     return undefined;
 }
 const credentials = buildCredentialsFromFlags();
+// Extract boolean flags from argv
+const flagOverrides = {};
+for (const { camelName, kebabFlag } of booleanFlags) {
+    if (process.argv.includes(kebabFlag)) {
+        flagOverrides[camelName] = true;
+    }
+}
 // Create CLI SDK instance with all plugins and URL options
 const sdk = createZapierCliSdk({
     debug: isDebugMode,
@@ -85,6 +110,7 @@ const sdk = createZapierCliSdk({
     trackingBaseUrl,
     maxNetworkRetries,
     maxNetworkRetryDelayMs,
+    ...flagOverrides,
 });
 // Auth commands now handled by plugins
 // Generate CLI commands from SDK schemas (including CLI plugins)

package/dist/src/utils/parameter-resolver.js

@@ -3,7 +3,7 @@ import chalk from "chalk";
 import ora from "ora";
 import { z } from "zod";
 import { runWithTelemetryContext, } from "@zapier/zapier-sdk";
-import { isPositional } from "@zapier/zapier-sdk";
+import { isPositional, buildCapabilityMessage } from "@zapier/zapier-sdk";
 import { ZapierCliUserCancellationError, ZapierCliMissingParametersError, ZapierCliValidationError, } from "./errors";
 // Zod validation errors are structured objects; flatten them into a
 // readable "field: reason" string for CLI error messages.
@@ -146,9 +146,11 @@ export class SchemaParameterResolver {
                 else {
                     for (const param of orderedRequiredParams) {
                         try {
-                            const value = await this.resolveParameter(param, context, functionName);
-                            this.setNestedValue(resolvedParams, param.path, value);
-                            context.resolvedParams = resolvedParams;
+                            const value = await this.resolveParameter(param, context, functionName, { isOptional: !param.isRequired });
+                            if (param.isRequired || value !== undefined) {
+                                this.setNestedValue(resolvedParams, param.path, value);
+                                context.resolvedParams = resolvedParams;
+                            }
                         }
                         catch (error) {
                             if (this.isUserCancellation(error)) {
@@ -325,28 +327,116 @@ export class SchemaParameterResolver {
             }
             this.debugLog(`Fetching options for ${promptLabel}`);
             const fetchResult = await dynamicResolver.fetch(context.sdk, context.resolvedParams);
-            const items = Array.isArray(fetchResult)
-                ? fetchResult
-                : (fetchResult?.data ?? []);
-            const promptConfig = dynamicResolver.prompt(items, context.resolvedParams);
-            promptConfig.name = promptName;
-            // Inject a skip option for optional parameters
+            // Check if the result is an AsyncIterable of pages (from toIterable())
+            let pageIterator = null;
+            let items;
+            let hasMore = false;
+            if (fetchResult != null &&
+                typeof fetchResult === "object" &&
+                Symbol.asyncIterator in fetchResult) {
+                // Paginated: pull the first page from the iterator
+                pageIterator = fetchResult[Symbol.asyncIterator]();
+                const first = await pageIterator.next();
+                if (!first.done && first.value) {
+                    items = first.value.data;
+                    hasMore = first.value.nextCursor != null;
+                }
+                else {
+                    items = [];
+                }
+            }
+            else if (fetchResult != null &&
+                typeof fetchResult === "object" &&
+                "data" in fetchResult) {
+                const page = fetchResult;
+                items = page.data;
+                hasMore = page.nextCursor != null;
+                if (hasMore) {
+                    this.debugLog(`Resolver for ${promptLabel} has more pages but no iterator. ` +
+                        `Use toIterable() to enable "Load more..." support.`);
+                }
+            }
+            else {
+                items = fetchResult || [];
+                pageIterator = null;
+            }
+            const LOAD_MORE_SENTINEL = Symbol("LOAD_MORE");
+            const SKIP_SENTINEL = Symbol("SKIP");
+            let newItemsStartIndex = -1;
             this.stopSpinner();
-            if (isOptional && promptConfig.choices) {
-                const SKIP_SENTINEL = Symbol("SKIP");
-                promptConfig.choices = [
-                    { name: chalk.dim("(Skip)"), value: SKIP_SENTINEL },
-                    ...promptConfig.choices,
-                ];
+            while (true) {
+                const promptConfig = dynamicResolver.prompt(items, context.resolvedParams);
+                promptConfig.name = promptName;
+                if (isOptional && promptConfig.choices) {
+                    promptConfig.choices.unshift({
+                        name: chalk.dim("(Skip)"),
+                        value: SKIP_SENTINEL,
+                    });
+                }
+                // Add "Load more..." option if paginated
+                if (hasMore && pageIterator && promptConfig.choices) {
+                    promptConfig.choices.push({
+                        name: chalk.dim("(Load more...)"),
+                        value: LOAD_MORE_SENTINEL,
+                    });
+                }
+                // Show hints for capabilities that would expand results
+                if (!hasMore &&
+                    promptConfig.choices &&
+                    dynamicResolver.requireCapabilities) {
+                    const capContext = context.sdk.getContext();
+                    if (capContext.hasCapability) {
+                        for (const cap of dynamicResolver.requireCapabilities) {
+                            const enabled = await capContext.hasCapability(cap);
+                            if (!enabled) {
+                                promptConfig.choices.push({
+                                    name: chalk.dim(buildCapabilityMessage(cap)),
+                                    value: SKIP_SENTINEL,
+                                    disabled: true,
+                                });
+                            }
+                        }
+                    }
+                }
+                // After loading more, jump cursor to first new item.
+                // Offset by the number of injected choices before the data items (e.g. Skip).
+                if (newItemsStartIndex >= 0 && promptConfig.choices) {
+                    const injectedBefore = isOptional ? 1 : 0;
+                    const adjustedIndex = newItemsStartIndex + injectedBefore;
+                    if (promptConfig.choices[adjustedIndex]) {
+                        promptConfig.default = promptConfig.choices[adjustedIndex].value;
+                    }
+                    newItemsStartIndex = -1;
+                }
                 const answers = await inquirer.prompt([promptConfig]);
-                const value = answers[promptName];
-                if (value === SKIP_SENTINEL) {
+                let selected = answers[promptName];
+                if (selected === SKIP_SENTINEL) {
                     return undefined;
                 }
-                return value;
+                const wantsMore = Array.isArray(selected)
+                    ? selected.includes(LOAD_MORE_SENTINEL)
+                    : selected === LOAD_MORE_SENTINEL;
+                if (wantsMore && pageIterator) {
+                    if (Array.isArray(selected)) {
+                        selected = selected.filter((v) => v !== LOAD_MORE_SENTINEL);
+                    }
+                    const prevLength = items.length;
+                    this.startSpinner();
+                    this.debugLog("Fetching more options...");
+                    const next = await pageIterator.next();
+                    this.stopSpinner();
+                    if (!next.done && next.value) {
+                        items = [...items, ...next.value.data];
+                        hasMore = next.value.nextCursor != null;
+                        newItemsStartIndex = prevLength;
+                    }
+                    else {
+                        hasMore = false;
+                    }
+                    continue;
+                }
+                return selected;
             }
-            const answers = await inquirer.prompt([promptConfig]);
-            return answers[promptName];
         }
         else if (resolver.type === "fields") {
             if (isOptional && !inArrayContext) {