@zapier/zapier-sdk-cli 0.2.1 → 0.4.0

package/dist/index.js

@@ -1,3 +0,0 @@
-"use strict";
-// Main exports for the CLI package
-// All CLI functionality is now schema-driven via generateCLICommands

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@zapier/zapier-sdk-cli",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "description": "Command line interface for Zapier SDK",
+  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
@@ -29,19 +30,21 @@
     "ora": "^8.2.0",
     "pkce-challenge": "^5.0.0",
     "zod": "^3.25.67",
-    "@zapier/zapier-sdk": "0.2.1"
+    "@zapier/zapier-sdk-cli-login": "0.3.1",
+    "@zapier/zapier-sdk": "0.4.0"
   },
   "devDependencies": {
     "@types/express": "^5.0.3",
     "@types/inquirer": "^9.0.8",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/node": "^24.0.1",
+    "tsup": "^8.5.0",
     "typescript": "^5.8.3",
     "vitest": "^3.2.3"
   },
   "scripts": {
     "test": "vitest",
-    "build": "rm -rf dist && tsc --project tsconfig.build.json",
+    "build": "tsup",
     "clean": "rm -rf dist",
     "rebuild": "pnpm clean && pnpm build",
     "dev": "tsx src/cli.ts",

package/src/cli.ts

@@ -8,7 +8,7 @@ import {
   createLogoutCommand,
   createWhoamiCommand,
   createConfigPathCommand,
-} from "./commands";
+} from "./commands/index";
 
 const program = new Command();
 

package/src/commands/configPath.ts

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import { getConfigPath } from "@zapier/zapier-sdk";
+import { getConfigPath } from "@zapier/zapier-sdk-cli-login";
 
 export function createConfigPathCommand(): Command {
   return new Command("get-config-path")

package/src/commands/login.ts

@@ -1,6 +1,6 @@
 import { Command } from "commander";
 import login from "../utils/auth/login";
-import { getLoggedInUser } from "@zapier/zapier-sdk";
+import { getLoggedInUser } from "@zapier/zapier-sdk-cli-login";
 
 export function createLoginCommand(): Command {
   return new Command("login")

package/src/commands/logout.ts

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import { logout } from "@zapier/zapier-sdk";
+import { logout } from "@zapier/zapier-sdk-cli-login";
 
 export function createLogoutCommand(): Command {
   return new Command("logout")

package/src/commands/whoami.ts

@@ -1,5 +1,5 @@
 import { Command } from "commander";
-import { getLoggedInUser } from "@zapier/zapier-sdk";
+import { getLoggedInUser } from "@zapier/zapier-sdk-cli-login";
 import { spinPromise } from "../utils/spinner";
 
 export function createWhoamiCommand(): Command {

package/src/utils/auth/login.ts

@@ -14,7 +14,7 @@ import { spinPromise } from "../spinner";
 import log from "../log";
 import api from "../api/client";
 import getCallablePromise from "../getCallablePromise";
-import { updateLogin, logout } from "@zapier/zapier-sdk";
+import { updateLogin, logout } from "@zapier/zapier-sdk-cli-login";
 
 const findAvailablePort = (): Promise<number> => {
   return new Promise((resolve, reject) => {

package/tsconfig.json

@@ -13,7 +13,7 @@
     "outDir": "./dist",
     "baseUrl": ".",
     "paths": {
-      "@zapier/zapier-sdk": ["../zapier-sdk/src/index.ts"]
+      "@zapier/zapier-sdk": ["../zapier-sdk/dist/index.mjs"]
     }
   },
   "include": ["src/**/*"],

package/tsup.config.ts

@@ -0,0 +1,17 @@
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  entry: ["src/index.ts", "src/cli.ts"],
+  format: ["esm"],
+  dts: false,
+  clean: true,
+  splitting: false,
+  sourcemap: false,
+  outDir: "dist",
+  // Keep as .js for Node.js compatibility since package.json has type: module
+  outExtension({ format }) {
+    return {
+      js: ".js",
+    };
+  },
+});

package/dist/cli.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/dist/commands/configPath.d.ts

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

package/dist/commands/configPath.js

@@ -1,9 +0,0 @@
-import { Command } from "commander";
-import { getConfigPath } from "@zapier/zapier-sdk";
-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/commands/index.d.ts

@@ -1,4 +0,0 @@
-export { createLoginCommand } from "./login";
-export { createLogoutCommand } from "./logout";
-export { createWhoamiCommand } from "./whoami";
-export { createConfigPathCommand } from "./configPath";

package/dist/commands/index.js

@@ -1,4 +0,0 @@
-export { createLoginCommand } from "./login";
-export { createLogoutCommand } from "./logout";
-export { createWhoamiCommand } from "./whoami";
-export { createConfigPathCommand } from "./configPath";

package/dist/commands/login.d.ts

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

package/dist/commands/login.js

@@ -1,25 +0,0 @@
-import { Command } from "commander";
-import login from "../utils/auth/login";
-import { getLoggedInUser } from "@zapier/zapier-sdk";
-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/commands/logout.d.ts

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

package/dist/commands/logout.js

@@ -1,16 +0,0 @@
-import { Command } from "commander";
-import { logout } from "@zapier/zapier-sdk";
-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/commands/whoami.d.ts

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

package/dist/commands/whoami.js

@@ -1,17 +0,0 @@
-import { Command } from "commander";
-import { getLoggedInUser } from "@zapier/zapier-sdk";
-import { spinPromise } from "../utils/spinner";
-export function createWhoamiCommand() {
-    return new Command("whoami")
-        .description("Show current login status and user information")
-        .action(async () => {
-        try {
-            const user = await spinPromise(getLoggedInUser(), "Checking login status...");
-            console.log(`✅ Logged in as ${user.email} (Account ID: ${user.accountId})`);
-        }
-        catch {
-            console.log("❌ Not logged in. Use 'zapier-sdk login' to authenticate.");
-            process.exit(1);
-        }
-    });
-}

package/dist/utils/api/client.d.ts

@@ -1,15 +0,0 @@
-export interface ApiResponse<T = any> {
-    data: T;
-    status: number;
-}
-export declare const createApiClient: () => {
-    post: <T = any>(url: string, data: any, options?: {
-        headers?: Record<string, string>;
-    }) => Promise<ApiResponse<T>>;
-};
-declare const api: {
-    post: <T = any>(url: string, data: any, options?: {
-        headers?: Record<string, string>;
-    }) => Promise<ApiResponse<T>>;
-};
-export default api;

package/dist/utils/api/client.js

@@ -1,27 +0,0 @@
-export const createApiClient = () => {
-    const post = async (url, data, options = {}) => {
-        const { headers = {} } = options;
-        const response = await fetch(url, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/x-www-form-urlencoded",
-                Connection: "close",
-                ...headers,
-            },
-            body: new URLSearchParams(data),
-        });
-        if (!response.ok) {
-            throw new Error(`${response.status} ${response.statusText}`);
-        }
-        const responseData = await response.json();
-        return {
-            data: responseData,
-            status: response.status,
-        };
-    };
-    return {
-        post,
-    };
-};
-const api = createApiClient();
-export default api;

package/dist/utils/auth/login.d.ts

@@ -1,2 +0,0 @@
-declare const login: (timeoutMs?: number) => Promise<string>;
-export default login;

package/dist/utils/auth/login.js

@@ -1,134 +0,0 @@
-import open from "open";
-import crypto from "node:crypto";
-import express from "express";
-import pkceChallenge from "pkce-challenge";
-import { AUTH_MODE_HEADER, LOGIN_CLIENT_ID, LOGIN_PORTS, LOGIN_TIMEOUT_MS, ZAPIER_BASE, } from "../constants";
-import { spinPromise } from "../spinner";
-import log from "../log";
-import api from "../api/client";
-import getCallablePromise from "../getCallablePromise";
-import { updateLogin, logout } from "@zapier/zapier-sdk";
-const findAvailablePort = () => {
-    return new Promise((resolve, reject) => {
-        let portIndex = 0;
-        const tryPort = (port) => {
-            const server = express().listen(port, () => {
-                server.close();
-                resolve(port);
-            });
-            server.on("error", (err) => {
-                if (err.code === "EADDRINUSE") {
-                    if (portIndex < LOGIN_PORTS.length) {
-                        // Try next predefined port
-                        tryPort(LOGIN_PORTS[portIndex++]);
-                    }
-                    else {
-                        // All configured ports are busy
-                        reject(new Error(`All configured OAuth callback ports are busy: ${LOGIN_PORTS.join(", ")}. Please try again later or close applications using these ports.`));
-                    }
-                }
-                else {
-                    reject(err);
-                }
-            });
-        };
-        if (LOGIN_PORTS.length > 0) {
-            tryPort(LOGIN_PORTS[portIndex++]);
-        }
-        else {
-            reject(new Error("No OAuth callback ports configured"));
-        }
-    });
-};
-const generateRandomString = () => {
-    const array = new Uint32Array(28);
-    crypto.getRandomValues(array);
-    return Array.from(array, (dec) => ("0" + dec.toString(16)).substring(-2)).join("");
-};
-const login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
-    // Force logout
-    logout();
-    // Find an available port
-    const availablePort = await findAvailablePort();
-    const redirectUri = `http://localhost:${availablePort}/oauth`;
-    log.info(`Using port ${availablePort} for OAuth callback`);
-    const { promise: promisedCode, resolve: setCode } = getCallablePromise();
-    const app = express();
-    app.get("/oauth", (req, res) => {
-        setCode(String(req.query.code));
-        // Set headers to prevent keep-alive
-        res.setHeader("Connection", "close");
-        res.end("You can now close this tab and return to the CLI.");
-    });
-    const server = app.listen(availablePort);
-    // Track connections to force close them if needed
-    const connections = new Set();
-    server.on("connection", (conn) => {
-        connections.add(conn);
-        conn.on("close", () => connections.delete(conn));
-    });
-    // Set up signal handlers for graceful shutdown
-    const cleanup = () => {
-        server.close();
-        log.info("\n❌ Login cancelled by user");
-        process.exit(0);
-    };
-    process.on("SIGINT", cleanup);
-    process.on("SIGTERM", cleanup);
-    const { code_verifier: codeVerifier, code_challenge: codeChallenge } = await pkceChallenge();
-    const authUrl = `${ZAPIER_BASE}/oauth/authorize/?${new URLSearchParams({
-        response_type: "code",
-        client_id: LOGIN_CLIENT_ID,
-        redirect_uri: redirectUri,
-        scope: "internal offline_access",
-        state: generateRandomString(),
-        code_challenge: codeChallenge,
-        code_challenge_method: "S256",
-    }).toString()}`;
-    log.info("Opening your browser to log in.");
-    log.info("If it doesn't open, visit:", authUrl);
-    open(authUrl);
-    try {
-        await spinPromise(Promise.race([
-            promisedCode,
-            new Promise((_resolve, reject) => setTimeout(() => {
-                reject(new Error(`Login timed out after ${Math.round(timeoutMs / 1000)} seconds.`));
-            }, timeoutMs)),
-        ]), "Waiting for you to login and authorize");
-    }
-    finally {
-        // Remove signal handlers
-        process.off("SIGINT", cleanup);
-        process.off("SIGTERM", cleanup);
-        // Close server with timeout and force-close connections if needed
-        await new Promise((resolve) => {
-            const timeout = setTimeout(() => {
-                log.info("Server close timed out, forcing connection shutdown...");
-                // Force close all connections
-                connections.forEach((conn) => conn.destroy());
-                resolve();
-            }, 1000); // 1 second timeout
-            server.close(() => {
-                clearTimeout(timeout);
-                resolve();
-            });
-        });
-    }
-    log.info("Exchanging authorization code for tokens...");
-    const { data } = await api.post(`${ZAPIER_BASE}/oauth/token/`, {
-        grant_type: "authorization_code",
-        code: await promisedCode,
-        redirect_uri: redirectUri,
-        client_id: LOGIN_CLIENT_ID,
-        code_verifier: codeVerifier,
-    }, {
-        headers: {
-            [AUTH_MODE_HEADER]: "no",
-            "Content-Type": "application/x-www-form-urlencoded",
-        },
-    });
-    updateLogin(data);
-    log.info("Token exchange completed successfully");
-    return data.access_token;
-};
-export default login;

package/dist/utils/cli-generator.d.ts

@@ -1,3 +0,0 @@
-import { Command } from "commander";
-import { ZapierSdk } from "@zapier/zapier-sdk";
-export declare function generateCliCommands(program: Command, sdk: ZapierSdk): void;