@zapier/zapier-sdk-cli 0.12.1 → 0.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zapier/zapier-sdk-cli",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "description": "Command line interface for Zapier SDK",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -42,9 +42,9 @@
     "ora": "^8.2.0",
     "pkce-challenge": "^5.0.0",
     "zod": "^3.25.67",
-    "@zapier/zapier-sdk-mcp": "0.3.12",
+    "@zapier/zapier-sdk": "0.13.0",
     "@zapier/zapier-sdk-cli-login": "0.3.2",
-    "@zapier/zapier-sdk": "0.12.1"
+    "@zapier/zapier-sdk-mcp": "0.3.13"
   },
   "devDependencies": {
     "@types/express": "^5.0.3",

package/src/plugins/add/ast-generator.ts

@@ -1,15 +1,15 @@
 import * as ts from "typescript";
 import type {
   Action,
-  ActionField,
+  InputFieldItem,
   GetSdkType,
   ListActionsPluginProvides,
   ListInputFieldsPluginProvides,
   ManifestPluginProvides,
 } from "@zapier/zapier-sdk";
 
-interface ActionWithActionFields extends Omit<Action, "inputFields" | "type"> {
-  inputFields: ActionField[];
+interface ActionWithInputFields extends Omit<Action, "inputFields" | "type"> {
+  inputFields: InputFieldItem[];
   app_key: string;
   action_type: Action["type"];
   title: string;
@@ -61,7 +61,7 @@ export class AstTypeGenerator {
     }
 
     // Fetch input fields for each action
-    const actionsWithFields: ActionWithActionFields[] = [];
+    const actionsWithFields: ActionWithInputFields[] = [];
 
     if (authenticationId) {
       for (const action of actions) {
@@ -73,19 +73,7 @@ export class AstTypeGenerator {
             authenticationId: authenticationId,
           });
 
-          const fields = fieldsResult.data.map(
-            (field: unknown): ActionField => {
-              const fieldObj = field as {
-                is_required?: boolean;
-                required?: boolean;
-                [key: string]: unknown;
-              };
-              return {
-                ...fieldObj,
-                required: fieldObj.is_required || fieldObj.required || false,
-              } as ActionField;
-            },
-          );
+          const fields = fieldsResult.data as InputFieldItem[];
           actionsWithFields.push({
             ...action,
             inputFields: fields,
@@ -144,7 +132,7 @@ export class AstTypeGenerator {
 
   private createSourceFile(
     appKey: string,
-    actions: ActionWithActionFields[],
+    actions: ActionWithInputFields[],
     version?: string,
   ): ts.SourceFile {
     const appName = this.capitalize(appKey);
@@ -329,31 +317,31 @@ Usage:
   }
 
   private groupActionsByType(
-    actions: ActionWithActionFields[],
-  ): Record<string, ActionWithActionFields[]> {
+    actions: ActionWithInputFields[],
+  ): Record<string, ActionWithInputFields[]> {
     return actions.reduce(
-      (acc, action) => {
+      (acc: Record<string, ActionWithInputFields[]>, action) => {
         if (!acc[action.action_type]) {
           acc[action.action_type] = [];
         }
         acc[action.action_type].push(action);
         return acc;
       },
-      {} as Record<string, ActionWithActionFields[]>,
+      {} as Record<string, ActionWithInputFields[]>,
     );
   }
 
   private createInputInterface(
     appName: string,
-    action: ActionWithActionFields,
+    action: ActionWithInputFields,
   ): ts.InterfaceDeclaration {
     const inputTypeName = `${appName}${this.capitalize(action.action_type)}${this.capitalize(
       this.sanitizeActionName(action.key),
     )}Inputs`;
 
-    const properties = action.inputFields.map((field) => {
+    const properties = action.inputFields.map((field: InputFieldItem) => {
       const fieldType = this.mapFieldTypeToTypeNode(field);
-      const isOptional = !field.required;
+      const isOptional = !field.is_required;
 
       let property = this.factory.createPropertySignature(
         undefined,
@@ -364,12 +352,12 @@ Usage:
         fieldType,
       );
 
-      // Add JSDoc comment if helpText exists
-      if (field.helpText) {
+      // Add JSDoc comment if description exists
+      if (field.description) {
         property = ts.addSyntheticLeadingComment(
           property,
           ts.SyntaxKind.MultiLineCommentTrivia,
-          `* ${this.escapeComment(field.helpText)} `,
+          `* ${this.escapeComment(field.description)} `,
           true,
         );
       }
@@ -389,7 +377,7 @@ Usage:
   private createActionInterface(
     appName: string,
     actionType: string,
-    typeActions: ActionWithActionFields[],
+    typeActions: ActionWithInputFields[],
   ): ts.InterfaceDeclaration {
     const typeName = `${appName}${this.capitalize(actionType)}Actions`;
 
@@ -506,7 +494,7 @@ Usage:
 
   private createAppProxyInterface(
     appName: string,
-    actionsByType: Record<string, ActionWithActionFields[]>,
+    actionsByType: Record<string, ActionWithInputFields[]>,
   ): ts.InterfaceDeclaration {
     const properties = [
       ...Object.keys(actionsByType).map((actionType) =>
@@ -646,33 +634,12 @@ Usage:
     );
   }
 
-  private mapFieldTypeToTypeNode(field: ActionField): ts.TypeNode {
-    // Handle choices (enum-like fields)
-    if (field.choices && field.choices.length > 0) {
-      const choiceValues = field.choices
-        .filter(
-          (choice) =>
-            choice.value !== undefined &&
-            choice.value !== null &&
-            choice.value !== "",
-        )
-        .map((choice) =>
-          typeof choice.value === "string"
-            ? this.factory.createLiteralTypeNode(
-                this.factory.createStringLiteral(choice.value),
-              )
-            : this.factory.createLiteralTypeNode(
-                this.factory.createNumericLiteral(String(choice.value)),
-              ),
-        );
-
-      if (choiceValues.length > 0) {
-        return this.factory.createUnionTypeNode(choiceValues);
-      }
-    }
+  private mapFieldTypeToTypeNode(field: InputFieldItem): ts.TypeNode {
+    // TODO: Handle choices when needed - choices are handled separately through listInputFieldChoices
 
     // Map Zapier field types to TypeScript types
-    switch (field.type?.toLowerCase()) {
+    // Handle the new enum types from InputFieldItem.value_type
+    switch (field.value_type?.toLowerCase()) {
       case "string":
       case "text":
       case "email":

package/src/utils/schema-formatter.ts

@@ -1,25 +1,10 @@
 import chalk from "chalk";
 import type { z } from "zod";
 import util from "util";
+import type { FormattedItem, FormatMetadata } from "@zapier/zapier-sdk";
 // These functions are internal to SDK, implementing basic formatting fallback
 // TODO: Consider exposing these utilities or implementing proper CLI formatting
 
-interface FormattedItem {
-  title: string;
-  id?: string;
-  key?: string;
-  description?: string;
-  data?: unknown; // Optional: if provided, use formatJsonOutput instead of details
-  details: Array<{
-    text: string;
-    style: "normal" | "dim" | "accent" | "warning" | "success";
-  }>;
-}
-
-interface FormatMetadata {
-  format: (item: unknown) => FormattedItem;
-}
-
 function getFormatMetadata(schema: unknown): FormatMetadata | undefined {
   return (schema as { _def?: { formatMeta?: FormatMetadata } })?._def
     ?.formatMeta;
@@ -84,6 +69,8 @@ function formatSingleItem(formatted: FormattedItem, itemNumber: number): void {
   // Generate subtitle from id or key
   if (formatted.id) {
     titleLine += ` ${chalk.gray(`(ID: ${formatted.id})`)}`;
+  } else if (formatted.keys) {
+    titleLine += ` ${chalk.gray(`(${formatted.keys.join(", ")})`)}`;
   } else if (formatted.key) {
     titleLine += ` ${chalk.gray(`(${formatted.key})`)}`;
   }