@zapier/zapier-sdk-cli 0.13.9 → 0.13.11

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { Command } from 'commander';
 import { z } from 'zod';
-import { createFunction, OutputPropertySchema, DEFAULT_CONFIG_PATH, createZapierSdkWithoutRegistry, registryPlugin, toSnakeCase, ZapierError, formatErrorMessage, getOsInfo, getPlatformVersions, getCiPlatform, isCi, isPositional, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
+import { createFunction, OutputPropertySchema, DEFAULT_CONFIG_PATH, createZapierSdkWithoutRegistry, registryPlugin, ZapierValidationError, ZapierUnknownError, toSnakeCase, ZapierError, formatErrorMessage, getOsInfo, getPlatformVersions, getCiPlatform, isCi, isPositional, getReleaseId, getCurrentTimestamp, generateEventId } from '@zapier/zapier-sdk';
 import inquirer from 'inquirer';
 import chalk3 from 'chalk';
 import util from 'util';
@@ -9,13 +9,13 @@ import open from 'open';
 import crypto from 'crypto';
 import express from 'express';
 import pkceChallenge from 'pkce-challenge';
-import { getLoggedInUser, logout, ZAPIER_BASE, LOGIN_CLIENT_ID, AUTH_MODE_HEADER, updateLogin, getConfigPath } from '@zapier/zapier-sdk-cli-login';
+import { getLoggedInUser, logout, getAuthTokenUrl, getAuthAuthorizeUrl, ZAPIER_AUTH_CLIENT_ID, AUTH_MODE_HEADER, updateLogin, getConfigPath } from '@zapier/zapier-sdk-cli-login';
 import ora from 'ora';
 import { startMcpServerAsProcess } from '@zapier/zapier-sdk-mcp';
 import { buildSync } from 'esbuild';
 import * as fs from 'fs';
 import * as path from 'path';
-import { join, resolve } from 'path';
+import { resolve, join } from 'path';
 import { mkdir, writeFile, access } from 'fs/promises';
 import * as ts from 'typescript';
 
@@ -1218,28 +1218,28 @@ var client_default = api;
 
 // src/utils/getCallablePromise.ts
 var getCallablePromise = () => {
-  let resolve3 = () => {
+  let resolve4 = () => {
   };
   let reject = () => {
   };
   const promise = new Promise((_resolve, _reject) => {
-    resolve3 = _resolve;
+    resolve4 = _resolve;
     reject = _reject;
   });
   return {
     promise,
-    resolve: resolve3,
+    resolve: resolve4,
     reject
   };
 };
 var getCallablePromise_default = getCallablePromise;
 var findAvailablePort = () => {
-  return new Promise((resolve3, reject) => {
+  return new Promise((resolve4, reject) => {
     let portIndex = 0;
     const tryPort = (port) => {
       const server = express().listen(port, () => {
         server.close();
-        resolve3(port);
+        resolve4(port);
       });
       server.on("error", (err) => {
         if (err.code === "EADDRINUSE") {
@@ -1272,7 +1272,15 @@ var generateRandomString = () => {
     (dec) => ("0" + dec.toString(16)).substring(-2)
   ).join("");
 };
-var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
+var login = async ({
+  timeoutMs = LOGIN_TIMEOUT_MS,
+  baseUrl: baseUrl2,
+  authBaseUrl: authBaseUrl2,
+  authClientId: authClientId2
+}) => {
+  const authOptions = { baseUrl: baseUrl2, authBaseUrl: authBaseUrl2 };
+  const tokenUrl = getAuthTokenUrl(authOptions);
+  const authorizeUrl = getAuthAuthorizeUrl(authOptions);
   logout();
   const availablePort = await findAvailablePort();
   const redirectUri = `http://localhost:${availablePort}/oauth`;
@@ -1298,9 +1306,9 @@ var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
   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({
+  const authUrl = `${authorizeUrl}?${new URLSearchParams({
     response_type: "code",
-    client_id: LOGIN_CLIENT_ID,
+    client_id: authClientId2 || ZAPIER_AUTH_CLIENT_ID,
     redirect_uri: redirectUri,
     scope: "internal offline_access",
     state: generateRandomString(),
@@ -1329,26 +1337,26 @@ var login = async (timeoutMs = LOGIN_TIMEOUT_MS) => {
   } finally {
     process.off("SIGINT", cleanup);
     process.off("SIGTERM", cleanup);
-    await new Promise((resolve3) => {
+    await new Promise((resolve4) => {
       const timeout = setTimeout(() => {
         log_default.info("Server close timed out, forcing connection shutdown...");
         connections.forEach((conn) => conn.destroy());
-        resolve3();
+        resolve4();
       }, 1e3);
       server.close(() => {
         clearTimeout(timeout);
-        resolve3();
+        resolve4();
       });
     });
   }
   log_default.info("Exchanging authorization code for tokens...");
   const { data } = await client_default.post(
-    `${ZAPIER_BASE}/oauth/token/`,
+    tokenUrl,
     {
       grant_type: "authorization_code",
       code: await promisedCode,
       redirect_uri: redirectUri,
-      client_id: LOGIN_CLIENT_ID,
+      client_id: authClientId2 || ZAPIER_AUTH_CLIENT_ID,
       code_verifier: codeVerifier
     },
     {
@@ -1369,7 +1377,7 @@ var LoginSchema = z.object({
 
 // package.json
 var package_default = {
-  version: "0.13.9"};
+  version: "0.13.11"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -1427,23 +1435,35 @@ function buildCliCommandExecutedEvent({
 
 // src/plugins/login/index.ts
 var CLI_COMMAND_EXECUTED_EVENT_SUBJECT = "platform.sdk.CliCommandExecutedEvent";
-var loginWithSdk = createFunction(async function loginWithSdk2(options) {
-  const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
-  if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
-    throw new Error("Timeout must be a positive number");
-  }
-  await login_default(timeoutSeconds * 1e3);
-  const user = await getLoggedInUser();
-  console.log(`\u2705 Successfully logged in as ${user.email}`);
-  setTimeout(() => process.exit(0), 100);
-}, LoginSchema);
+var loginWithSdk = createFunction(
+  async (options) => {
+    const timeoutSeconds = options.timeout ? parseInt(options.timeout, 10) : 300;
+    if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
+      throw new Error("Timeout must be a positive number");
+    }
+    await login_default({
+      timeoutMs: timeoutSeconds * 1e3,
+      baseUrl: options.baseUrl,
+      authBaseUrl: options.authBaseUrl,
+      authClientId: options.authClientId
+    });
+    const user = await getLoggedInUser();
+    console.log(`\u2705 Successfully logged in as ${user.email}`);
+    setTimeout(() => process.exit(0), 100);
+  }
+);
 var loginPlugin = ({ context }) => {
   const loginWithTelemetry = async (options) => {
     const startTime = Date.now();
     let success = false;
     let errorMessage = null;
     try {
-      await loginWithSdk(options);
+      await loginWithSdk({
+        ...options,
+        baseUrl: context.options?.baseUrl,
+        authBaseUrl: context.options?.authBaseUrl,
+        authClientId: context.options?.authClientId
+      });
       success = true;
     } catch (error) {
       success = false;
@@ -1760,14 +1780,6 @@ var addPlugin = ({ sdk: sdk2 }) => {
     if (successfulApps.length > 0) {
       console.log(`\u2705 Added ${successfulApps.length} app(s) to manifest`);
     }
-    const allErrors = [...manifestResult.errors, ...typesResult.errors];
-    if (allErrors.length > 0) {
-      console.warn(`
-\u26A0\uFE0F ${allErrors.length} error(s) occurred:`);
-      allErrors.forEach(({ appKey, error }) => {
-        console.warn(`  - ${appKey}: ${error}`);
-      });
-    }
   }, AddSchema);
   return {
     add,
@@ -2387,17 +2399,12 @@ var generateAppTypesPlugin = ({ sdk: sdk2 }) => {
       appKeys,
       authenticationIds,
       skipWrite = false,
-      typesOutputDirectory,
+      typesOutputDirectory = await detectTypesOutputDirectory(),
       onProgress
     } = options;
-    if (!skipWrite && !typesOutputDirectory) {
-      throw new Error(
-        "typesOutputDirectory is required when skipWrite is false"
-      );
-    }
+    const resolvedTypesOutput = resolve(typesOutputDirectory);
     const result = {
-      typeDefinitions: {},
-      errors: []
+      typeDefinitions: {}
     };
     onProgress?.({ type: "apps_lookup_start", count: appKeys.length });
     const appsIterator = sdk2.listApps({ appKeys }).items();
@@ -2425,8 +2432,8 @@ var generateAppTypesPlugin = ({ sdk: sdk2 }) => {
         count: authentications.length
       });
     }
-    if (!skipWrite && typesOutputDirectory) {
-      await mkdir(typesOutputDirectory, { recursive: true });
+    if (!skipWrite && resolvedTypesOutput) {
+      await mkdir(resolvedTypesOutput, { recursive: true });
     }
     if (!skipWrite) {
       result.writtenFiles = {};
@@ -2439,17 +2446,18 @@ var generateAppTypesPlugin = ({ sdk: sdk2 }) => {
       });
       try {
         if (!app.version) {
-          const error = `Invalid implementation ID format: ${app.implementation_id}. Expected format: <implementationName>@<version>`;
-          result.errors.push({
-            appKey: app.key,
-            error
-          });
+          const errorMessage = `Invalid implementation ID format: ${app.implementation_id}. Expected format: <implementationName>@<version>`;
           onProgress?.({
             type: "app_processing_error",
             appKey: app.key,
-            error
+            error: errorMessage
+          });
+          throw new ZapierValidationError(errorMessage, {
+            details: {
+              appKey: app.key,
+              implementationId: app.implementation_id
+            }
           });
-          continue;
         }
         let authenticationId;
         if (authentications.length > 0) {
@@ -2472,56 +2480,47 @@ var generateAppTypesPlugin = ({ sdk: sdk2 }) => {
           }
         }
         const manifestKey = getManifestKey(app);
-        try {
-          const generator = new AstTypeGenerator();
-          const typeDefinitionString = await generator.generateTypes({
-            app,
-            authenticationId,
-            sdk: sdk2
-          });
-          result.typeDefinitions[manifestKey] = typeDefinitionString;
+        const generator = new AstTypeGenerator();
+        const typeDefinitionString = await generator.generateTypes({
+          app,
+          authenticationId,
+          sdk: sdk2
+        });
+        result.typeDefinitions[manifestKey] = typeDefinitionString;
+        onProgress?.({
+          type: "type_generated",
+          manifestKey,
+          sizeBytes: typeDefinitionString.length
+        });
+        if (!skipWrite && resolvedTypesOutput && result.writtenFiles) {
+          const filePath = join(resolvedTypesOutput, `${manifestKey}.d.ts`);
+          await writeFile(filePath, typeDefinitionString, "utf8");
+          result.writtenFiles[manifestKey] = filePath;
           onProgress?.({
-            type: "type_generated",
+            type: "file_written",
             manifestKey,
-            sizeBytes: typeDefinitionString.length
-          });
-          if (!skipWrite && typesOutputDirectory && result.writtenFiles) {
-            const filePath = join(typesOutputDirectory, `${manifestKey}.d.ts`);
-            await writeFile(filePath, typeDefinitionString, "utf8");
-            result.writtenFiles[manifestKey] = filePath;
-            onProgress?.({
-              type: "file_written",
-              manifestKey,
-              filePath
-            });
-          }
-          onProgress?.({
-            type: "app_processing_complete",
-            appKey: app.key
-          });
-        } catch (error) {
-          const errorMessage = `Failed to generate types: ${error}`;
-          result.errors.push({
-            appKey: app.key,
-            error: errorMessage
-          });
-          onProgress?.({
-            type: "app_processing_error",
-            appKey: app.key,
-            error: errorMessage
+            filePath
           });
         }
-      } catch (error) {
-        const errorMessage = `Failed to process app: ${error}`;
-        result.errors.push({
-          appKey: app.key,
-          error: errorMessage
+        onProgress?.({
+          type: "app_processing_complete",
+          appKey: app.key
         });
+      } catch (error) {
+        const errorMessage = `Failed to process app ${app.key}: ${error instanceof Error ? error.message : String(error)}`;
         onProgress?.({
           type: "app_processing_error",
           appKey: app.key,
           error: errorMessage
         });
+        if (error instanceof ZapierValidationError) {
+          throw error;
+        } else {
+          throw new ZapierUnknownError(errorMessage, {
+            cause: error
+            // Works for both Error and non-Error
+          });
+        }
       }
     }
     return result;
@@ -2556,9 +2555,6 @@ var BuildManifestSchema = z.object({
 var buildManifestPlugin = ({ sdk: sdk2, context }) => {
   const buildManifest = createFunction(async function buildManifest2(options) {
     const { appKeys, skipWrite = false, configPath, onProgress } = options;
-    const result = {
-      errors: []
-    };
     onProgress?.({ type: "apps_lookup_start", count: appKeys.length });
     const appsIterator = sdk2.listApps({ appKeys }).items();
     const apps = [];
@@ -2568,7 +2564,7 @@ var buildManifestPlugin = ({ sdk: sdk2, context }) => {
     }
     onProgress?.({ type: "apps_lookup_complete", count: apps.length });
     if (apps.length === 0) {
-      return result;
+      return {};
     }
     let updatedManifest;
     for (const app of apps) {
@@ -2601,20 +2597,23 @@ var buildManifestPlugin = ({ sdk: sdk2, context }) => {
         });
         onProgress?.({ type: "app_processing_complete", appKey: app.key });
       } catch (error) {
-        const errorMessage = `Failed to process app: ${error}`;
-        result.errors.push({
-          appKey: app.key,
-          error: errorMessage
-        });
+        const errorMessage = `Failed to process app ${app.key}: ${error instanceof Error ? error.message : String(error)}`;
         onProgress?.({
           type: "app_processing_error",
           appKey: app.key,
           error: errorMessage
         });
+        if (error instanceof ZapierValidationError) {
+          throw error;
+        } else {
+          throw new ZapierUnknownError(errorMessage, {
+            cause: error
+            // Works for both Error and non-Error
+          });
+        }
       }
     }
-    result.manifest = updatedManifest;
-    return result;
+    return { manifest: updatedManifest };
   }, BuildManifestSchema);
   return {
     buildManifest,
@@ -2638,14 +2637,32 @@ function createZapierCliSdk(options = {}) {
 
 // package.json with { type: 'json' }
 var package_default2 = {
-  version: "0.13.9"};
+  version: "0.13.11"};
 
 // src/cli.ts
 var program = new Command();
-program.name("zapier-sdk").description("CLI for Zapier SDK").version(package_default2.version, "-v, --version", "display version number").option("--debug", "Enable debug logging");
+program.name("zapier-sdk").description("CLI for Zapier SDK").version(package_default2.version, "-v, --version", "display version number").option("--debug", "Enable debug logging").option("--base-url <url>", "Base URL for Zapier API endpoints").option(
+  "--auth-base-url <url>",
+  "Base URL for Zapier authentication endpoints"
+).option("--auth-client-id <id>", "OAuth client ID for Zapier authentication").option(
+  "--tracking-base-url <url>",
+  "Base URL for Zapier tracking endpoints"
+);
 var isDebugMode = process.env.DEBUG === "true" || process.argv.includes("--debug");
+var baseUrlIndex = process.argv.indexOf("--base-url");
+var authBaseUrlIndex = process.argv.indexOf("--auth-base-url");
+var authClientIdIndex = process.argv.indexOf("--auth-client-id");
+var trackingBaseUrlIndex = process.argv.indexOf("--tracking-base-url");
+var baseUrl = baseUrlIndex !== -1 ? process.argv[baseUrlIndex + 1] : void 0;
+var authBaseUrl = authBaseUrlIndex !== -1 ? process.argv[authBaseUrlIndex + 1] : void 0;
+var authClientId = authClientIdIndex !== -1 ? process.argv[authClientIdIndex + 1] : void 0;
+var trackingBaseUrl = trackingBaseUrlIndex !== -1 ? process.argv[trackingBaseUrlIndex + 1] : void 0;
 var sdk = createZapierCliSdk({
-  debug: isDebugMode
+  debug: isDebugMode,
+  baseUrl,
+  authBaseUrl,
+  authClientId,
+  trackingBaseUrl
 });
 generateCliCommands(program, sdk);
 program.parse();