@zapier/zapier-sdk-cli 0.40.0 → 0.41.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zapier/zapier-sdk-cli",
-    "version": "0.40.0",
+    "version": "0.41.0",
     "description": "Command line interface for Zapier SDK",
     "main": "dist/index.cjs",
     "module": "dist/index.mjs",

package/dist/src/cli.js

@@ -79,7 +79,7 @@ function buildCredentialsFromFlags() {
                 type: "client_credentials",
                 clientId: credentialsClientId,
                 clientSecret: credentialsClientSecret,
-                baseUrl: credentialsBaseUrl,
+                ...(credentialsBaseUrl && { baseUrl: credentialsBaseUrl }),
             };
         }
         else {
@@ -87,7 +87,7 @@ function buildCredentialsFromFlags() {
             return {
                 type: "pkce",
                 clientId: credentialsClientId,
-                baseUrl: credentialsBaseUrl,
+                ...(credentialsBaseUrl && { baseUrl: credentialsBaseUrl }),
             };
         }
     }
@@ -146,7 +146,7 @@ program.exitOverride();
     // Flush the exit telemetry event before we force-terminate. The async
     // transport needs an explicit await because process.on("exit") only
     // allows synchronous work.
-    await sdk.getContext().eventEmission.close(exitCode);
+    await sdk.context.eventEmission.close(exitCode);
     // Force exit after a short grace period. We can't rely on process.exitCode
     // alone because background handles (stdin, pending file closes) keep the
     // event loop alive indefinitely. The unref'd timer won't prevent natural

package/dist/src/generators/ast-generator.d.ts

@@ -1,4 +1,4 @@
-import type { GetSdkType, ListActionsPluginProvides, ListInputFieldsPluginProvides, ManifestPluginProvides, AppItem } from "@zapier/zapier-sdk";
+import type { ListActionsPluginProvides, ListInputFieldsPluginProvides, ManifestPluginProvides, AppItem } from "@zapier/zapier-sdk";
 interface GenerateTypesOptions {
     app: AppItem;
     connectionId?: string | number;
@@ -13,7 +13,7 @@ export declare class AstTypeGenerator {
      * Generate TypeScript types using AST for a specific app
      */
     generateTypes(options: GenerateTypesOptions & {
-        sdk: GetSdkType<ListActionsPluginProvides & ListInputFieldsPluginProvides & ManifestPluginProvides>;
+        sdk: ListActionsPluginProvides & ListInputFieldsPluginProvides & ManifestPluginProvides;
     }): Promise<string>;
     private createSourceFile;
     private createImportStatement;

package/dist/src/plugins/add/index.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin, GetSdkType, ListActionsPluginProvides, ListAppsPluginProvides, ListInputFieldsPluginProvides, ListConnectionsPluginProvides } from "@zapier/zapier-sdk";
+import type { Plugin, ListActionsPluginProvides, ListAppsPluginProvides, ListInputFieldsPluginProvides, ListConnectionsPluginProvides } from "@zapier/zapier-sdk";
 import { AddSchema, type AddOptions } from "./schemas";
 import { type GenerateAppTypesPluginProvides } from "../generateAppTypes";
 import { type BuildManifestPluginProvides } from "../buildManifest";
@@ -12,4 +12,4 @@ export interface AddPluginProvides {
         };
     };
 }
-export declare const addPlugin: Plugin<GetSdkType<ListAppsPluginProvides & ListActionsPluginProvides & ListInputFieldsPluginProvides & ListConnectionsPluginProvides & BuildManifestPluginProvides & GenerateAppTypesPluginProvides>, {}, AddPluginProvides>;
+export declare const addPlugin: Plugin<ListAppsPluginProvides & ListActionsPluginProvides & ListInputFieldsPluginProvides & ListConnectionsPluginProvides & BuildManifestPluginProvides & GenerateAppTypesPluginProvides, AddPluginProvides>;

package/dist/src/plugins/add/index.js

@@ -2,7 +2,7 @@ import { createFunction } from "@zapier/zapier-sdk";
 import { AddSchema } from "./schemas";
 import { detectTypesOutputDirectory } from "../../utils/directory-detection";
 import { resolve } from "path";
-export const addPlugin = ({ sdk }) => {
+export const addPlugin = (sdk) => {
     const add = createFunction(async function add(options) {
         const { apps: appKeys, connections: connectionIds, configPath, typesOutput = await detectTypesOutputDirectory(), } = options;
         const resolvedTypesOutput = resolve(typesOutput);

package/dist/src/plugins/buildManifest/index.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin, GetSdkType, GetContextType, ListAppsPluginProvides, ManifestPluginProvides } from "@zapier/zapier-sdk";
+import type { Plugin, ListAppsPluginProvides, ManifestPluginProvides } from "@zapier/zapier-sdk";
 import { BuildManifestSchema, type BuildManifestOptions, type BuildManifestResult } from "./schemas";
 export interface BuildManifestPluginProvides {
     buildManifest: (options: BuildManifestOptions) => Promise<BuildManifestResult>;
@@ -10,4 +10,4 @@ export interface BuildManifestPluginProvides {
         };
     };
 }
-export declare const buildManifestPlugin: Plugin<GetSdkType<ListAppsPluginProvides>, GetContextType<ManifestPluginProvides>, BuildManifestPluginProvides>;
+export declare const buildManifestPlugin: Plugin<ListAppsPluginProvides & ManifestPluginProvides, BuildManifestPluginProvides>;

package/dist/src/plugins/buildManifest/index.js

@@ -1,7 +1,7 @@
 import { createFunction, ZapierValidationError, ZapierUnknownError, } from "@zapier/zapier-sdk";
 import { BuildManifestSchema, } from "./schemas";
 import { createManifestEntry } from "../../utils/manifest-helpers";
-export const buildManifestPlugin = ({ sdk, context }) => {
+export const buildManifestPlugin = (sdk) => {
     const buildManifest = createFunction(async function buildManifest(options) {
         const { apps: appKeys, skipWrite = false, configPath, onProgress, } = options;
         onProgress?.({ type: "apps_lookup_start", count: appKeys.length });
@@ -31,7 +31,7 @@ export const buildManifestPlugin = ({ sdk, context }) => {
                     manifestKey: manifestEntry.implementationName,
                     version: manifestEntry.version || "",
                 });
-                const { key: updatedManifestKey, manifest } = await context.updateManifestEntry({
+                const { key: updatedManifestKey, manifest } = await sdk.context.updateManifestEntry({
                     appKey: app.key,
                     entry: manifestEntry,
                     configPath,

package/dist/src/plugins/bundleCode/index.d.ts

@@ -11,5 +11,4 @@ export interface BundleCodePluginProvides {
     };
 }
 export declare const bundleCodePlugin: Plugin<{}, // requires no existing SDK methods
-{}, // requires no context
 BundleCodePluginProvides>;

package/dist/src/plugins/cliOverrides/index.d.ts

@@ -14,9 +14,11 @@ interface CliOverridesProvides {
  * CLI-specific metadata overrides.
  * Adds "deprecated" category to fetch so it's hidden from CLI help.
  */
-export declare const cliOverridesPlugin: Plugin<{}, {
-    meta: {
-        fetch?: FetchMeta;
+export declare const cliOverridesPlugin: Plugin<{
+    context: {
+        meta: {
+            fetch?: FetchMeta;
+        };
     };
 }, CliOverridesProvides>;
 export {};

package/dist/src/plugins/cliOverrides/index.js

@@ -2,16 +2,19 @@
  * CLI-specific metadata overrides.
  * Adds "deprecated" category to fetch so it's hidden from CLI help.
  */
-export const cliOverridesPlugin = ({ context }) => {
-    if (!context.meta.fetch) {
+export const cliOverridesPlugin = (sdk) => {
+    if (!sdk.context.meta.fetch) {
         return { context: { meta: {} } };
     }
     return {
         context: {
             meta: {
                 fetch: {
-                    ...context.meta.fetch,
-                    categories: [...(context.meta.fetch.categories || []), "deprecated"],
+                    ...sdk.context.meta.fetch,
+                    categories: [
+                        ...(sdk.context.meta.fetch.categories || []),
+                        "deprecated",
+                    ],
                     deprecation: {
                         message: "This command is deprecated and will be removed soon. Use `curl` instead. Learn more: https://docs.zapier.com/sdk/cli-reference#curl",
                     },

package/dist/src/plugins/curl/index.d.ts

@@ -13,5 +13,5 @@ export interface CurlPluginProvides {
 type SdkWithFetch = FetchPluginProvides["fetch"] extends infer F ? {
     fetch: F;
 } : never;
-export declare const curlPlugin: Plugin<SdkWithFetch, {}, CurlPluginProvides>;
+export declare const curlPlugin: Plugin<SdkWithFetch, CurlPluginProvides>;
 export {};

package/dist/src/plugins/curl/index.js

@@ -3,7 +3,7 @@ import { promises as fs } from "fs";
 import { dirname } from "path";
 import { CurlSchema } from "./schemas";
 import { CurlExitError, parseHeaderLine, basicAuthHeader, deriveRemoteFilename, formatWriteOut, appendQueryParams, readAllStdin, resolveDataArgText, resolveDataArgBinary, buildFormData, } from "./utils";
-export const curlPlugin = ({ sdk, }) => {
+export const curlPlugin = (sdk) => {
     async function curl(options) {
         const { url: rawUrl, request, header = [], data = [], dataRaw = [], dataAscii = [], dataBinary = [], dataUrlencode = [], json, form = [], formString = [], get: forceGet, head: forceHead, location, include, output, remoteName, verbose, silent, showError, fail, failWithBody, writeOut, maxTime, user, compressed, connection: connectionParam, connectionId, } = options;
         const connection = connectionParam ?? connectionId;

package/dist/src/plugins/feedback/index.d.ts

@@ -10,4 +10,10 @@ export interface FeedbackPluginProvides {
         };
     };
 }
-export declare const feedbackPlugin: Plugin<{}, {}, FeedbackPluginProvides>;
+export declare const feedbackPlugin: Plugin<{
+    context: {
+        options?: {
+            debug?: boolean;
+        };
+    };
+}, FeedbackPluginProvides>;

package/dist/src/plugins/feedback/index.js

@@ -27,8 +27,8 @@ async function postWithRetry({ body, attemptsLeft, }) {
     }
     return response;
 }
-export const feedbackPlugin = ({ context, }) => {
-    const debug = context.options.debug;
+export const feedbackPlugin = (sdk) => {
+    const debug = sdk.context.options?.debug;
     const feedbackWithSdk = createFunction(async function feedback(options) {
         const user = await getLoggedInUser();
         const body = JSON.stringify({

package/dist/src/plugins/generateAppTypes/index.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin, GetSdkType, ListActionsPluginProvides, ListAppsPluginProvides, ListInputFieldsPluginProvides, ListConnectionsPluginProvides, ManifestPluginProvides } from "@zapier/zapier-sdk";
+import type { Plugin, ListActionsPluginProvides, ListAppsPluginProvides, ListInputFieldsPluginProvides, ListConnectionsPluginProvides, ManifestPluginProvides } from "@zapier/zapier-sdk";
 import { GenerateAppTypesSchema, type GenerateAppTypesOptions, type GenerateAppTypesResult } from "./schemas";
 export interface GenerateAppTypesPluginProvides {
     generateAppTypes: (options: GenerateAppTypesOptions) => Promise<GenerateAppTypesResult>;
@@ -10,4 +10,4 @@ export interface GenerateAppTypesPluginProvides {
         };
     };
 }
-export declare const generateAppTypesPlugin: Plugin<GetSdkType<ListAppsPluginProvides & ListActionsPluginProvides & ListInputFieldsPluginProvides & ListConnectionsPluginProvides & ManifestPluginProvides>, {}, GenerateAppTypesPluginProvides>;
+export declare const generateAppTypesPlugin: Plugin<ListAppsPluginProvides & ListActionsPluginProvides & ListInputFieldsPluginProvides & ListConnectionsPluginProvides & ManifestPluginProvides, GenerateAppTypesPluginProvides>;

package/dist/src/plugins/generateAppTypes/index.js

@@ -5,7 +5,7 @@ import { getManifestKey } from "../../utils/manifest-helpers";
 import { mkdir, writeFile } from "fs/promises";
 import { join, resolve } from "path";
 import { detectTypesOutputDirectory } from "../../utils/directory-detection";
-export const generateAppTypesPlugin = ({ sdk }) => {
+export const generateAppTypesPlugin = (sdk) => {
     const generateAppTypes = createFunction(async function generateAppTypes(options) {
         const { apps: appKeys, connections: connectionIds, skipWrite = false, typesOutputDirectory = await detectTypesOutputDirectory(), onProgress, } = options;
         const resolvedTypesOutput = resolve(typesOutputDirectory);

package/dist/src/plugins/getLoginConfigPath/index.d.ts

@@ -11,5 +11,4 @@ export interface GetLoginConfigPathPluginProvides {
     };
 }
 export declare const getLoginConfigPathPlugin: Plugin<{}, // requires no existing SDK methods
-{}, // requires no context
 GetLoginConfigPathPluginProvides>;

package/dist/src/plugins/init/index.d.ts

@@ -12,5 +12,5 @@ interface InitPluginProvides {
         };
     };
 }
-export declare const initPlugin: Plugin<{}, {}, InitPluginProvides>;
+export declare const initPlugin: Plugin<{}, InitPluginProvides>;
 export type { InitPluginProvides };

package/dist/src/plugins/login/index.d.ts

@@ -1,6 +1,6 @@
-import type { Plugin, ResolvedCredentials, EventEmissionContext } from "@zapier/zapier-sdk";
+import type { Plugin, ResolvedCredentials, EventEmissionProvides } from "@zapier/zapier-sdk";
 import { LoginSchema, type LoginOptions } from "./schemas";
-interface CliContext extends EventEmissionContext {
+interface CliContext {
     session_id?: string | null;
     selected_api?: string | null;
     app_id?: number | null;
@@ -18,5 +18,7 @@ interface LoginPluginProvides {
         };
     };
 }
-export declare const loginPlugin: Plugin<{}, CliContext, LoginPluginProvides>;
+export declare const loginPlugin: Plugin<EventEmissionProvides & {
+    context: CliContext;
+}, LoginPluginProvides>;
 export type { LoginPluginProvides };

package/dist/src/plugins/login/index.js

@@ -15,7 +15,7 @@ function toPkceCredentials(credentials) {
     }
     return undefined;
 }
-export const loginPlugin = ({ context, }) => {
+export const loginPlugin = (sdk) => {
     const loginFn = async (options) => {
         const timeoutSeconds = options.timeout
             ? parseInt(options.timeout, 10)
@@ -23,14 +23,14 @@ export const loginPlugin = ({ context, }) => {
         if (isNaN(timeoutSeconds) || timeoutSeconds <= 0) {
             throw new Error("Timeout must be a positive number");
         }
-        const resolvedCredentials = await context.resolveCredentials();
+        const resolvedCredentials = await sdk.context.resolveCredentials();
         const pkceCredentials = toPkceCredentials(resolvedCredentials);
         await login({
             timeoutMs: timeoutSeconds * 1000,
             credentials: pkceCredentials,
         });
         const user = await getLoggedInUser();
-        context.eventEmission.emit("platform.sdk.ApplicationLifecycleEvent", buildApplicationLifecycleEvent({ lifecycle_event_type: "login_success" }, { customuser_id: user.customUserId, account_id: user.accountId }));
+        sdk.context.eventEmission.emit("platform.sdk.ApplicationLifecycleEvent", buildApplicationLifecycleEvent({ lifecycle_event_type: "login_success" }, { customuser_id: user.customUserId, account_id: user.accountId }));
         console.log(`✅ Successfully logged in as ${user.email}`);
     };
     return {

package/dist/src/plugins/logout/index.d.ts

@@ -11,5 +11,5 @@ interface LogoutPluginProvides {
         };
     };
 }
-export declare const logoutPlugin: Plugin<{}, {}, LogoutPluginProvides>;
+export declare const logoutPlugin: Plugin<{}, LogoutPluginProvides>;
 export type { LogoutPluginProvides };

package/dist/src/plugins/mcp/index.d.ts

@@ -11,5 +11,11 @@ interface McpPluginProvides {
         };
     };
 }
-export declare const mcpPlugin: Plugin<{}, {}, McpPluginProvides>;
+export declare const mcpPlugin: Plugin<{
+    context: {
+        options?: {
+            debug?: boolean;
+        };
+    };
+}, McpPluginProvides>;
 export type { McpPluginProvides };

package/dist/src/plugins/mcp/index.js

@@ -1,12 +1,12 @@
 import { createFunction } from "@zapier/zapier-sdk";
 import { startMcpServer } from "@zapier/zapier-sdk-mcp";
 import { McpSchema } from "./schemas";
-export const mcpPlugin = ({ context }) => {
+export const mcpPlugin = (sdk) => {
     const mcpWithSdk = createFunction(async function mcpWithSdk(options) {
         // Pass through the SDK's debug option to the MCP server
         const mcpOptions = {
             ...options,
-            debug: context.options.debug,
+            debug: sdk.context.options?.debug,
         };
         return await startMcpServer(mcpOptions);
     }, McpSchema);

package/dist/src/types/sdk.d.ts

@@ -1,6 +1,5 @@
-import type { GetSdkType, ZapierSdk } from "@zapier/zapier-sdk";
+import type { ZapierSdk } from "@zapier/zapier-sdk";
 import type { BuildManifestPluginProvides } from "../plugins/buildManifest";
 import type { FeedbackPluginProvides } from "../plugins/feedback";
 import type { GenerateAppTypesPluginProvides } from "../plugins/generateAppTypes";
-export interface ZapierSdkCli extends GetSdkType<ZapierSdk & BuildManifestPluginProvides & FeedbackPluginProvides & GenerateAppTypesPluginProvides> {
-}
+export type ZapierSdkCli = ZapierSdk & BuildManifestPluginProvides & FeedbackPluginProvides & GenerateAppTypesPluginProvides;

package/dist/src/utils/cli-generator.js

@@ -607,9 +607,7 @@ function createCommandConfig(cliCommandName, functionInfo, sdk) {
                         selected_api: resolvedParams.app ?? null,
                     },
                 });
-                sdk
-                    .getContext()
-                    .eventEmission.emit(CLI_COMMAND_EXECUTED_EVENT_SUBJECT, event);
+                sdk.context.eventEmission.emit(CLI_COMMAND_EXECUTED_EVENT_SUBJECT, event);
             }
             catch {
                 // Never let telemetry failures affect command execution

package/dist/src/utils/parameter-resolver.js

@@ -387,7 +387,7 @@ export class SchemaParameterResolver {
                 if (!hasMore &&
                     promptConfig.choices &&
                     dynamicResolver.requireCapabilities) {
-                    const capContext = context.sdk.getContext();
+                    const capContext = context.sdk.context;
                     if (capContext.hasCapability) {
                         for (const cap of dynamicResolver.requireCapabilities) {
                             const enabled = await capContext.hasCapability(cap);