@zapier/zapier-sdk-cli 0.13.9 → 0.13.10

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @zapier/zapier-sdk-cli
 
+## 0.13.10
+
+### Patch Changes
+
+- f56c6a0: Refactor buildManifest and generateAppTypes to throw proper errors, instead of returning an error property
+
 ## 0.13.9
 
 ### Patch Changes

package/dist/cli.cjs

@@ -1251,28 +1251,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__default.default().listen(port, () => {
         server.close();
-        resolve3(port);
+        resolve4(port);
       });
       server.on("error", (err) => {
         if (err.code === "EADDRINUSE") {
@@ -1362,15 +1362,15 @@ 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();
       });
     });
   }
@@ -1402,7 +1402,7 @@ var LoginSchema = zod.z.object({
 
 // package.json
 var package_default = {
-  version: "0.13.9"};
+  version: "0.13.10"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -1793,14 +1793,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,
@@ -2420,17 +2412,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 = path.resolve(typesOutputDirectory);
     const result = {
-      typeDefinitions: {},
-      errors: []
+      typeDefinitions: {}
     };
     onProgress?.({ type: "apps_lookup_start", count: appKeys.length });
     const appsIterator = sdk2.listApps({ appKeys }).items();
@@ -2458,8 +2445,8 @@ var generateAppTypesPlugin = ({ sdk: sdk2 }) => {
         count: authentications.length
       });
     }
-    if (!skipWrite && typesOutputDirectory) {
-      await promises.mkdir(typesOutputDirectory, { recursive: true });
+    if (!skipWrite && resolvedTypesOutput) {
+      await promises.mkdir(resolvedTypesOutput, { recursive: true });
     }
     if (!skipWrite) {
       result.writtenFiles = {};
@@ -2472,17 +2459,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 zapierSdk.ZapierValidationError(errorMessage, {
+            details: {
+              appKey: app.key,
+              implementationId: app.implementation_id
+            }
           });
-          continue;
         }
         let authenticationId;
         if (authentications.length > 0) {
@@ -2505,56 +2493,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 = path.join(resolvedTypesOutput, `${manifestKey}.d.ts`);
+          await promises.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 = path.join(typesOutputDirectory, `${manifestKey}.d.ts`);
-            await promises.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 zapierSdk.ZapierValidationError) {
+          throw error;
+        } else {
+          throw new zapierSdk.ZapierUnknownError(errorMessage, {
+            cause: error
+            // Works for both Error and non-Error
+          });
+        }
       }
     }
     return result;
@@ -2589,9 +2568,6 @@ var BuildManifestSchema = zod.z.object({
 var buildManifestPlugin = ({ sdk: sdk2, context }) => {
   const buildManifest = zapierSdk.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 = [];
@@ -2601,7 +2577,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) {
@@ -2634,20 +2610,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 zapierSdk.ZapierValidationError) {
+          throw error;
+        } else {
+          throw new zapierSdk.ZapierUnknownError(errorMessage, {
+            cause: error
+            // Works for both Error and non-Error
+          });
+        }
       }
     }
-    result.manifest = updatedManifest;
-    return result;
+    return { manifest: updatedManifest };
   }, BuildManifestSchema);
   return {
     buildManifest,
@@ -2671,7 +2650,7 @@ function createZapierCliSdk(options = {}) {
 
 // package.json with { type: 'json' }
 var package_default2 = {
-  version: "0.13.9"};
+  version: "0.13.10"};
 
 // src/cli.ts
 var program = new commander.Command();

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';
@@ -15,7 +15,7 @@ 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") {
@@ -1329,15 +1329,15 @@ 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();
       });
     });
   }
@@ -1369,7 +1369,7 @@ var LoginSchema = z.object({
 
 // package.json
 var package_default = {
-  version: "0.13.9"};
+  version: "0.13.10"};
 
 // src/telemetry/builders.ts
 function createCliBaseEvent(context = {}) {
@@ -1760,14 +1760,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 +2379,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 +2412,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 +2426,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 +2460,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 +2535,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 +2544,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 +2577,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,7 +2617,7 @@ function createZapierCliSdk(options = {}) {
 
 // package.json with { type: 'json' }
 var package_default2 = {
-  version: "0.13.9"};
+  version: "0.13.10"};
 
 // src/cli.ts
 var program = new Command();