@zapier/zapier-sdk-cli 0.6.3 → 0.6.5

package/src/utils/cli-generator.ts

@@ -18,6 +18,11 @@ import inquirer from "inquirer";
 // ============================================================================
 
 function formatJsonOutput(data: unknown): void {
+  // Don't print anything for undefined results (commands that just perform actions)
+  if (data === undefined) {
+    return;
+  }
+
   // Show success message for action results
   if (
     data &&
@@ -302,12 +307,12 @@ function createCommandConfig(
         !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 as unknown as Record<
           string,
-          (params: unknown) => Promise<unknown>
+          (params: unknown) => Promise<unknown> & AsyncIterable<unknown>
         >;
-        const sdkIterator = await sdkObj[sdkMethodName](resolvedParams);
+        const sdkIterator = sdkObj[sdkMethodName](resolvedParams);
         await handlePaginatedListWithAsyncIteration(
           sdkMethodName,
           sdkIterator,
@@ -572,9 +577,9 @@ async function handlePaginatedListWithAsyncIteration(
 
       // Format and display items using schema
       if (schema) {
-        formatItemsFromSchema(schema as z.ZodType, items);
+        formatItemsFromSchema(schema as z.ZodType, items, totalShown);
       } else {
-        formatItemsGeneric(items);
+        formatItemsGeneric(items, totalShown);
       }
 
       totalShown += items.length;
@@ -615,9 +620,9 @@ async function handlePaginatedListWithAsyncIteration(
       }
 
       if (schema) {
-        formatItemsFromSchema(schema as z.ZodType, items);
+        formatItemsFromSchema(schema as z.ZodType, items, 0);
       } else {
-        formatItemsGeneric(items);
+        formatItemsGeneric(items, 0);
       }
 
       console.log(chalk.green(`\n✅ Showing ${items.length} ${itemName}`));
@@ -678,12 +683,17 @@ function formatNonPaginatedResults(
   }
 }
 
-function formatItemsGeneric(items: unknown[]): void {
+function formatItemsGeneric(
+  items: unknown[],
+  startingNumber: number = 0,
+): void {
   // Fallback formatting for items without schema metadata
   items.forEach((item, index) => {
     const itemObj = item as Record<string, unknown>;
     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/src/utils/schema-formatter.ts

@@ -32,38 +32,39 @@ function getOutputSchema(schema: unknown): unknown {
 export function formatItemsFromSchema(
   inputSchema: z.ZodType,
   items: unknown[],
+  startingNumber: number = 0,
 ): void {
   // 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: unknown,
-  index: number,
+  itemNumber: number,
   formatMeta: FormatMetadata,
 ): void {
   // 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)}`;
   }
@@ -94,7 +95,10 @@ function applyStyle(value: string, style: string): string {
   }
 }
 
-function formatItemsGeneric(items: unknown[]): void {
+function formatItemsGeneric(
+  items: unknown[],
+  startingNumber: number = 0,
+): void {
   // Fallback formatting for items without schema metadata
   items.forEach((item, index) => {
     const itemObj = item as {
@@ -106,7 +110,9 @@ function formatItemsGeneric(items: unknown[]): void {
     };
     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)}`);
     }

package/tsconfig.build.json

@@ -1,6 +1,18 @@
 {
-  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "paths": {}
-  }
+    "target": "ES2020",
+    "module": "esnext",
+    "declaration": true,
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "moduleResolution": "bundler"
+  },
+  "include": ["src/**/*"],
+  "exclude": ["dist", "node_modules", "src/**/*.test.ts", "src/**/*.spec.ts"]
 }

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "ES2020",
-    "module": "ES2020",
+    "module": "esnext",
     "moduleResolution": "bundler",
     "strict": true,
     "noUnusedLocals": true,
@@ -13,7 +13,7 @@
     "outDir": "./dist",
     "composite": true
   },
-  "include": ["src/**/*"],
+  "include": ["src/**/*", "package.json"],
   "exclude": ["node_modules", "dist", "**/*.test.ts"],
   "references": [{ "path": "../zapier-sdk" }]
 }

package/tsup.config.ts

@@ -2,16 +2,22 @@ import { defineConfig } from "tsup";
 
 export default defineConfig({
   entry: ["src/index.ts", "src/cli.ts"],
-  format: ["esm"],
-  dts: false,
+  format: ["cjs", "esm"],
+  dts: true,
   clean: true,
   splitting: false,
   sourcemap: false,
+  // Preserve tree shaking by maintaining individual module exports
+  treeshake: true,
+  // Output to separate directories for each format
   outDir: "dist",
-  // Keep as .js for Node.js compatibility since package.json has type: module
   outExtension({ format }) {
     return {
-      js: ".js",
+      js: format === "cjs" ? ".cjs" : ".mjs",
     };
   },
+  // Make the optional CLI login package external so it doesn't cause build issues
+  external: ["@zapier/zapier-sdk-cli-login"],
+  // Use the build-specific tsconfig for tsup
+  tsconfig: "tsconfig.build.json",
 });

package/bin/zsdk.js

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-
-// Import the CLI from the compiled TypeScript
-import "../dist/cli.js";

package/dist/src/commands/bundle-code/cli.d.ts

@@ -1,2 +0,0 @@
-import { Command } from "commander";
-export declare function createBundleCodeCommand(): Command;

package/dist/src/commands/bundle-code/cli.js

@@ -1,77 +0,0 @@
-import { Command } from "commander";
-import { BundleCodeSchema } from "./schemas";
-import { bundleCode } from "./index";
-import chalk from "chalk";
-import { analyzeZodSchema, convertCliArgsToSdkParams, } from "../../utils/cli-generator-utils";
-export function createBundleCodeCommand() {
-    const parameters = analyzeZodSchema(BundleCodeSchema);
-    const description = BundleCodeSchema.description ||
-        "Bundle TypeScript code into executable JavaScript";
-    const command = new Command("bundle-code").description(description);
-    // Add parameters to command using same logic as CLI generator
-    parameters.forEach((param) => {
-        // Convert camelCase to kebab-case for CLI display
-        const kebabName = param.name.replace(/([A-Z])/g, "-$1").toLowerCase();
-        if (param.hasResolver && param.required) {
-            // Required parameters with resolvers become optional positional arguments (resolver handles prompting)
-            command.argument(`[${kebabName}]`, param.description || `${kebabName} parameter`);
-        }
-        else if (param.required) {
-            // Required parameters without resolvers become required positional arguments
-            command.argument(`<${kebabName}>`, param.description || `${kebabName} parameter`);
-        }
-        else if (param.isPositional) {
-            // Optional parameters marked as positional become optional positional arguments
-            command.argument(`[${kebabName}]`, param.description || `${kebabName} parameter`);
-        }
-        else {
-            // Optional parameters become flags (whether they have resolvers or not)
-            const flags = [`--${kebabName}`];
-            if (param.type === "boolean") {
-                command.option(flags.join(", "), param.description);
-            }
-            else {
-                const flagSignature = flags.join(", ") + ` <${param.type}>`;
-                command.option(flagSignature, param.description || "", param.default);
-            }
-        }
-    });
-    // Add formatting options like other commands
-    command.option("--json", "Output raw JSON instead of formatted results");
-    command.action(async (...args) => {
-        try {
-            // The last argument is always the command object with parsed options
-            const commandObj = args[args.length - 1];
-            const options = commandObj.opts();
-            // Convert CLI args to SDK method parameters
-            const rawParams = convertCliArgsToSdkParams(parameters, args.slice(0, -1), options);
-            // No parameter resolution needed for bundle-code since it doesn't use SDK
-            if (!rawParams.input) {
-                throw new Error("Input file path is required");
-            }
-            console.log(chalk.blue(`📦 Bundling ${rawParams.input}...`));
-            // Call our implementation
-            const result = await bundleCode(rawParams);
-            if (options.json) {
-                console.log(JSON.stringify({ result }, null, 2));
-            }
-            else if (rawParams.output && !rawParams.string) {
-                console.log(chalk.green("✅ Bundle created successfully!"));
-                console.log(chalk.gray(`Output written to: ${rawParams.output}`));
-            }
-            else if (rawParams.string) {
-                console.log(chalk.green("✅ Bundle generated as string!"));
-                console.log("\n" + result);
-            }
-            else {
-                console.log(chalk.green("✅ Bundle completed!"));
-                console.log("\n" + result);
-            }
-        }
-        catch (error) {
-            console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
-            process.exit(1);
-        }
-    });
-    return command;
-}

package/dist/src/commands/bundle-code/index.d.ts

@@ -1,5 +0,0 @@
-import type { BundleCodeOptions } from "./schemas";
-/**
- * Bundle TypeScript code into executable JavaScript (CLI version)
- */
-export declare function bundleCode(options: BundleCodeOptions): Promise<string>;

package/dist/src/commands/configPath.d.ts

@@ -1,2 +0,0 @@
-import { Command } from "commander";
-export declare function createConfigPathCommand(): Command;

package/dist/src/commands/configPath.js

@@ -1,9 +0,0 @@
-import { Command } from "commander";
-import { getConfigPath } from "@zapier/zapier-sdk-cli-login";
-export function createConfigPathCommand() {
-    return new Command("get-config-path")
-        .description("Show the path to the configuration file")
-        .action(async () => {
-        console.log(`Configuration file: ${getConfigPath()}`);
-    });
-}

package/dist/src/commands/generate-types/cli.d.ts

@@ -1,2 +0,0 @@
-import { Command } from "commander";
-export declare function createGenerateTypesCommand(): Command;

package/dist/src/commands/generate-types/cli.js

@@ -1,84 +0,0 @@
-import { Command } from "commander";
-import { createZapierSdk } from "@zapier/zapier-sdk";
-import { GenerateTypesSchema } from "./schemas";
-import { generateTypes } from "./index";
-import chalk from "chalk";
-import { SchemaParameterResolver } from "../../utils/parameter-resolver";
-import { analyzeZodSchema, convertCliArgsToSdkParams, } from "../../utils/cli-generator-utils";
-export function createGenerateTypesCommand() {
-    const parameters = analyzeZodSchema(GenerateTypesSchema);
-    const description = GenerateTypesSchema.description ||
-        "Generate TypeScript SDK types for a specific app";
-    const command = new Command("generate-types").description(description);
-    // Add parameters to command using same logic as CLI generator
-    parameters.forEach((param) => {
-        // Convert camelCase to kebab-case for CLI display
-        const kebabName = param.name.replace(/([A-Z])/g, "-$1").toLowerCase();
-        if (param.hasResolver && param.required) {
-            // Required parameters with resolvers become optional positional arguments (resolver handles prompting)
-            command.argument(`[${kebabName}]`, param.description || `${kebabName} parameter`);
-        }
-        else if (param.required) {
-            // Required parameters without resolvers become required positional arguments
-            command.argument(`<${kebabName}>`, param.description || `${kebabName} parameter`);
-        }
-        else if (param.isPositional) {
-            // Optional parameters marked as positional become optional positional arguments
-            command.argument(`[${kebabName}]`, param.description || `${kebabName} parameter`);
-        }
-        else {
-            // Optional parameters become flags (whether they have resolvers or not)
-            const flags = [`--${kebabName}`];
-            if (param.type === "boolean") {
-                command.option(flags.join(", "), param.description);
-            }
-            else {
-                const flagSignature = flags.join(", ") + ` <${param.type}>`;
-                command.option(flagSignature, param.description || "", param.default);
-            }
-        }
-    });
-    // Add formatting options like other commands
-    command.option("--json", "Output raw JSON instead of formatted results");
-    command.action(async (...args) => {
-        try {
-            // The last argument is always the command object with parsed options
-            const commandObj = args[args.length - 1];
-            const options = commandObj.opts();
-            // Convert CLI args to SDK method parameters
-            const rawParams = convertCliArgsToSdkParams(parameters, args.slice(0, -1), options);
-            // Create SDK instance with manifest path if provided
-            const sdk = createZapierSdk({
-                manifestPath: rawParams.lockFilePath,
-            });
-            // Resolve missing parameters interactively using schema metadata
-            const resolver = new SchemaParameterResolver();
-            const resolvedParams = await resolver.resolveParameters(GenerateTypesSchema, rawParams, sdk);
-            const params = resolvedParams;
-            console.log(chalk.blue(`🔧 Generating TypeScript types for ${params.appKey}...`));
-            // Call our implementation
-            const generateTypesParams = {
-                appKey: params.appKey,
-                debug: params.debug ?? false,
-                authenticationId: params.authenticationId,
-                output: params.output,
-                sdk,
-            };
-            const result = await generateTypes(generateTypesParams);
-            if (options.json) {
-                console.log(JSON.stringify({ result }, null, 2));
-            }
-            else {
-                const output = params.output ||
-                    `./types/${params.appKey}.d.ts`;
-                console.log(chalk.green("✅ TypeScript types generated successfully!"));
-                console.log(chalk.gray(`Output written to: ${output}`));
-            }
-        }
-        catch (error) {
-            console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
-            process.exit(1);
-        }
-    });
-    return command;
-}

package/dist/src/commands/generate-types/index.d.ts

@@ -1,8 +0,0 @@
-import type { createZapierSdk } from "@zapier/zapier-sdk";
-import type { GenerateTypesOptions } from "./schemas";
-/**
- * Generate TypeScript types for a specific app (CLI version)
- */
-export declare function generateTypes(options: GenerateTypesOptions & {
-    sdk: ReturnType<typeof createZapierSdk>;
-}): Promise<string>;

package/dist/src/commands/index.d.ts

@@ -1,6 +0,0 @@
-export { createLoginCommand } from "./login";
-export { createLogoutCommand } from "./logout";
-export { createConfigPathCommand } from "./configPath";
-export { createGenerateTypesCommand } from "./generate-types/cli";
-export { createBundleCodeCommand } from "./bundle-code/cli";
-export { createMcpCommand } from "./mcp";

package/dist/src/commands/index.js

@@ -1,6 +0,0 @@
-export { createLoginCommand } from "./login";
-export { createLogoutCommand } from "./logout";
-export { createConfigPathCommand } from "./configPath";
-export { createGenerateTypesCommand } from "./generate-types/cli";
-export { createBundleCodeCommand } from "./bundle-code/cli";
-export { createMcpCommand } from "./mcp";

package/dist/src/commands/login.d.ts

@@ -1,2 +0,0 @@
-import { Command } from "commander";
-export declare function createLoginCommand(): Command;

package/dist/src/commands/login.js

@@ -1,25 +0,0 @@
-import { Command } from "commander";
-import login from "../utils/auth/login";
-import { getLoggedInUser } from "@zapier/zapier-sdk-cli-login";
-export function createLoginCommand() {
-    return new Command("login")
-        .description("Log in to Zapier to access your account")
-        .option("--timeout <seconds>", "Login timeout in seconds (default: 300)", "300")
-        .action(async (options) => {
-        try {
-            const timeoutSeconds = parseInt(options.timeout, 10);
-            if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
-                throw new Error("Timeout must be a positive number");
-            }
-            await login(timeoutSeconds * 1000); // Convert to milliseconds
-            const user = await getLoggedInUser();
-            console.log(`✅ Successfully logged in as ${user.email}`);
-            // Force immediate exit to prevent hanging (especially in development with tsx)
-            setTimeout(() => process.exit(0), 100);
-        }
-        catch (error) {
-            console.error("❌ Login failed:", error instanceof Error ? error.message : "Unknown error");
-            process.exit(1);
-        }
-    });
-}

package/dist/src/commands/logout.d.ts

@@ -1,2 +0,0 @@
-import { Command } from "commander";
-export declare function createLogoutCommand(): Command;

package/dist/src/commands/logout.js

@@ -1,16 +0,0 @@
-import { Command } from "commander";
-import { logout } from "@zapier/zapier-sdk-cli-login";
-export function createLogoutCommand() {
-    return new Command("logout")
-        .description("Log out of your Zapier account")
-        .action(async () => {
-        try {
-            logout();
-            console.log("✅ Successfully logged out");
-        }
-        catch (error) {
-            console.error("❌ Logout failed:", error instanceof Error ? error.message : "Unknown error");
-            process.exit(1);
-        }
-    });
-}

package/dist/src/commands/mcp.d.ts

@@ -1,2 +0,0 @@
-import { Command } from "commander";
-export declare function createMcpCommand(): Command;

package/dist/src/commands/mcp.js

@@ -1,11 +0,0 @@
-import { Command } from "commander";
-import { startMcpServerAsProcess } from "@zapier/zapier-sdk-mcp";
-export function createMcpCommand() {
-    const command = new Command("mcp");
-    command
-        .description("Start MCP server for Zapier SDK")
-        .option("--debug", "Enable debug logging")
-        .option("--port <port>", "Port to listen on (for future HTTP transport)")
-        .action(startMcpServerAsProcess);
-    return command;
-}

package/src/commands/bundle-code/cli.ts

@@ -1,118 +0,0 @@
-import { Command } from "commander";
-import { BundleCodeSchema } from "./schemas";
-import { bundleCode } from "./index";
-import chalk from "chalk";
-import {
-  analyzeZodSchema,
-  convertCliArgsToSdkParams,
-} from "../../utils/cli-generator-utils";
-
-export function createBundleCodeCommand(): Command {
-  const parameters = analyzeZodSchema(BundleCodeSchema);
-  const description =
-    BundleCodeSchema.description ||
-    "Bundle TypeScript code into executable JavaScript";
-
-  const command = new Command("bundle-code").description(description);
-
-  // Add parameters to command using same logic as CLI generator
-  parameters.forEach((param) => {
-    // Convert camelCase to kebab-case for CLI display
-    const kebabName = param.name.replace(/([A-Z])/g, "-$1").toLowerCase();
-
-    if (param.hasResolver && param.required) {
-      // Required parameters with resolvers become optional positional arguments (resolver handles prompting)
-      command.argument(
-        `[${kebabName}]`,
-        param.description || `${kebabName} parameter`,
-      );
-    } else if (param.required) {
-      // Required parameters without resolvers become required positional arguments
-      command.argument(
-        `<${kebabName}>`,
-        param.description || `${kebabName} parameter`,
-      );
-    } else if (param.isPositional) {
-      // Optional parameters marked as positional become optional positional arguments
-      command.argument(
-        `[${kebabName}]`,
-        param.description || `${kebabName} parameter`,
-      );
-    } else {
-      // Optional parameters become flags (whether they have resolvers or not)
-      const flags = [`--${kebabName}`];
-
-      if (param.type === "boolean") {
-        command.option(flags.join(", "), param.description);
-      } else {
-        const flagSignature = flags.join(", ") + ` <${param.type}>`;
-        command.option(
-          flagSignature,
-          param.description || "",
-          param.default as string | boolean | string[] | undefined,
-        );
-      }
-    }
-  });
-
-  // Add formatting options like other commands
-  command.option("--json", "Output raw JSON instead of formatted results");
-
-  command.action(async (...args: unknown[]) => {
-    try {
-      // The last argument is always the command object with parsed options
-      const commandObj = args[args.length - 1] as {
-        opts(): Record<string, unknown>;
-      };
-      const options = commandObj.opts();
-
-      // Convert CLI args to SDK method parameters
-      const rawParams = convertCliArgsToSdkParams(
-        parameters,
-        args.slice(0, -1),
-        options,
-      );
-
-      // No parameter resolution needed for bundle-code since it doesn't use SDK
-
-      if (!rawParams.input) {
-        throw new Error("Input file path is required");
-      }
-
-      console.log(chalk.blue(`📦 Bundling ${rawParams.input}...`));
-
-      // Call our implementation
-      const result = await bundleCode(
-        rawParams as {
-          string: boolean;
-          input: string;
-          minify: boolean;
-          target: string;
-          cjs: boolean;
-          output?: string | undefined;
-        },
-      );
-
-      if (options.json) {
-        console.log(JSON.stringify({ result }, null, 2));
-      } else if (rawParams.output && !rawParams.string) {
-        console.log(chalk.green("✅ Bundle created successfully!"));
-        console.log(chalk.gray(`Output written to: ${rawParams.output}`));
-      } else if (rawParams.string) {
-        console.log(chalk.green("✅ Bundle generated as string!"));
-        console.log("\n" + result);
-      } else {
-        console.log(chalk.green("✅ Bundle completed!"));
-        console.log("\n" + result);
-      }
-    } catch (error) {
-      console.error(
-        chalk.red("Error:"),
-        error instanceof Error ? error.message : "Unknown error",
-      );
-      process.exit(1);
-    }
-  });
-
-  return command;
-}

package/src/commands/configPath.ts

@@ -1,10 +0,0 @@
-import { Command } from "commander";
-import { getConfigPath } from "@zapier/zapier-sdk-cli-login";
-
-export function createConfigPathCommand(): Command {
-  return new Command("get-config-path")
-    .description("Show the path to the configuration file")
-    .action(async () => {
-      console.log(`Configuration file: ${getConfigPath()}`);
-    });
-}