@zapier/connectors-sdk 0.1.0-experimental.2 → 0.1.0-experimental.4

package/dist/index.cjs

@@ -368,8 +368,8 @@ function ensureConnectionValue(scriptName, slotName, connectionKey, value) {
   return value;
 }
 async function buildContext(definition, opts, connectionResolvers) {
-  const hasConnection = "connection" in opts && opts.connection !== void 0;
-  const hasConnections = "connections" in opts && opts.connections !== void 0;
+  const hasConnection = opts !== void 0 && "connection" in opts && opts.connection !== void 0;
+  const hasConnections = opts !== void 0 && "connections" in opts && opts.connections !== void 0;
   if (definition.connection === void 0 && definition.connections === void 0) {
     if (hasConnection || hasConnections) {
       throw new Error(
@@ -378,6 +378,11 @@ async function buildContext(definition, opts, connectionResolvers) {
     }
     return {};
   }
+  if (opts === void 0) {
+    throw new Error(
+      `ToolDefinition "${definition.name}": \`RunOptions\` is required \u2014 pass \`{ connection: ... }\` or \`{ connections: ... }\`.`
+    );
+  }
   if (hasConnection && hasConnections) {
     throw new Error(
       `ToolDefinition "${definition.name}": \`RunOptions\` sets both \`connection\` and \`connections\`. Use one or the other.`
@@ -395,7 +400,7 @@ async function buildContext(definition, opts, connectionResolvers) {
       definition.name,
       void 0,
       connectionKey,
-      opts.connection
+      "connection" in opts ? opts.connection : void 0
     );
     const fetch = await resolveSlotFetch(
       definition.name,
@@ -412,12 +417,12 @@ async function buildContext(definition, opts, connectionResolvers) {
       `ToolDefinition "${definition.name}" is multi-connection (slots: ${declaredSlots.join(", ")}) \u2014 call with \`{ connections: { ... } }\`, not \`{ connection: ... }\`.`
     );
   }
-  if (!hasConnections) {
+  const provided = opts.connections;
+  if (provided === void 0) {
     throw new Error(
       `ToolDefinition "${definition.name}" is multi-connection \u2014 \`RunOptions.connections\` is required.`
     );
   }
-  const provided = opts.connections;
   const unknown = Object.keys(provided).filter(
     (s) => !declaredSlots.includes(s)
   );
@@ -516,24 +521,9 @@ function toResponsesTool(definition) {
 
 // src/define-connector.ts
 function wrapScriptWithResolvers(definition, connectionResolvers) {
-  const authorRun = definition.run;
   const wrappedRun = async (input, opts) => {
-    const validated = definition.inputSchema.parse(input);
-    if (definition.connection === void 0 && definition.connections === void 0) {
-      if (opts !== void 0 && (opts.connection !== void 0 || opts.connections !== void 0)) {
-        throw new Error(
-          `ToolDefinition "${definition.name}" is credential-free \u2014 \`RunOptions\` must not include \`connection\` or \`connections\`.`
-        );
-      }
-      return authorRun(validated);
-    }
-    if (opts === void 0) {
-      throw new Error(
-        `ToolDefinition "${definition.name}": \`RunOptions\` is required \u2014 pass \`{ connection: ... }\` or \`{ connections: ... }\`.`
-      );
-    }
     const ctx = await buildContext(definition, opts, connectionResolvers);
-    return authorRun(validated, ctx);
+    return definition.run(input, ctx);
   };
   return { ...definition, run: wrappedRun };
 }
@@ -612,6 +602,12 @@ function defineTool(config) {
       validateConnectionKey(config.name, value);
     }
   }
+  const authorRun = config.run;
+  const wrappedRun = async (input, ctx) => {
+    const validated = config.inputSchema.parse(input);
+    const result = await authorRun(validated, ctx);
+    return config.outputSchema.parse(result);
+  };
   const base = {
     kind: "tool",
     name: config.name,
@@ -620,9 +616,8 @@ function defineTool(config) {
     inputSchema: config.inputSchema,
     outputSchema: config.outputSchema,
     annotations: config.annotations,
-    statements: config.statements,
     inputDependencies: config.inputDependencies,
-    run: config.run
+    run: wrappedRun
   };
   if (hasSingular) base.connection = config.connection;
   if (hasPlural) base.connections = config.connections;
@@ -931,7 +926,7 @@ async function handleIfScriptMainBody(wrappedScript, connectionResolvers, io) {
     );
     return;
   }
-  const raw = positional ?? await new Response(io.stdin).text();
+  const raw = positional ?? await readStdinInput(io.stdin, wrappedScript.name);
   if (raw.trim().length === 0) {
     throw new Error(
       `Missing JSON input for "${wrappedScript.name}". Pass it as a positional argument or via stdin.`
@@ -943,6 +938,14 @@ async function handleIfScriptMainBody(wrappedScript, connectionResolvers, io) {
   const result = await wrappedScript.run(input, runOpts);
   io.stdout.write(JSON.stringify(result, null, 2) + "\n");
 }
+async function readStdinInput(stdin, scriptName) {
+  if (stdin.isTTY) {
+    throw new Error(
+      `Missing JSON input for "${scriptName}". Pass it as a positional argument or pipe it via stdin.`
+    );
+  }
+  return new Response(stdin).text();
+}
 function buildHelpText(definition, connectionResolvers, opts = {}) {
   const lines = [];
   const description = definition.description.split("\n")[0]?.trim() ?? "";

package/dist/index.d.cts

@@ -30,24 +30,6 @@ type Replace<S extends string, From extends string, To extends string> = S exten
  */
 type EnvFromKey<K extends string> = Uppercase<Replace<K, "-", "_">>;
 
-/**
- * A Zapier policy statement. Carried on the `ToolDefinition` for in-process
- * governance consumers (policy engines that wrap `script.run` before HTTP).
- * Not propagated to MCP `_meta` — only `inputDependencies` is published over
- * the wire (`_meta["zapier:inputDependencies"]`) by `toMcpTool` /
- * `toMcpServerTool`.
- */
-interface Statement {
-    effect: "allow" | "ask" | "deny";
-    permissions: ReadonlyArray<string>;
-    resources: ReadonlyArray<string>;
-    conditions?: ReadonlyArray<{
-        path: ReadonlyArray<string>;
-        operator: string;
-        value: unknown;
-    }>;
-    label?: string;
-}
 /**
  * Single-credential resolver: the resolver's `name` IS the credential
  * descriptor. `resolve` receives the credential as a plain `string` —
@@ -160,12 +142,19 @@ interface RunOptionsMulti<TSlots extends string = string, TPerSlot extends Recor
     connections: TPerSlot;
 }
 type RunOptions<TSlots extends string = string, TValue = ConnectionValue, TPerSlot extends Record<TSlots, ConnectionValue> = Record<TSlots, ConnectionValue>> = RunOptionsNone | RunOptionsSingle<TValue> | RunOptionsMulti<TSlots, TPerSlot>;
+/** Author-facing context for a credential-free script. */
+interface ContextNone {
+    fetch?: undefined;
+    connections?: undefined;
+}
 /** Author-facing context for a single-connection script. */
 interface ContextSingle {
     fetch: typeof globalThis.fetch;
+    connections?: never;
 }
 /** Author-facing context for a multi-connection script. */
 interface ContextMulti<TSlots extends string = string> {
+    fetch?: never;
     connections: Record<TSlots, typeof globalThis.fetch>;
 }
 type AnyInputDependencies$1 = Readonly<Record<string, unknown>>;
@@ -178,23 +167,22 @@ interface DefineToolConfigBase<TIn extends z.ZodType, TOut extends z.ZodType, TI
     inputSchema: TIn;
     outputSchema: TOut;
     annotations: _modelcontextprotocol_sdk_types_js.Tool["annotations"];
-    statements?: ReadonlyArray<Statement>;
     inputDependencies?: TInputDependencies;
 }
 interface DefineToolConfigNone<TIn extends z.ZodType, TOut extends z.ZodType, TInputDependencies extends AnyInputDependencies$1 | undefined, TName extends string> extends DefineToolConfigBase<TIn, TOut, TInputDependencies, TName> {
     connection?: never;
     connections?: never;
-    run: (input: z.infer<TIn>) => Promise<z.infer<TOut>>;
+    run: (input: z.infer<TIn>, ctx?: ContextNone) => Promise<unknown>;
 }
 interface DefineToolConfigSingle<TIn extends z.ZodType, TOut extends z.ZodType, TInputDependencies extends AnyInputDependencies$1 | undefined, TName extends string, TKey extends string> extends DefineToolConfigBase<TIn, TOut, TInputDependencies, TName> {
     connection: TKey;
     connections?: never;
-    run: (input: z.infer<TIn>, ctx: ContextSingle) => Promise<z.infer<TOut>>;
+    run: (input: z.infer<TIn>, ctx: ContextSingle) => Promise<unknown>;
 }
 interface DefineToolConfigMulti<TIn extends z.ZodType, TOut extends z.ZodType, TInputDependencies extends AnyInputDependencies$1 | undefined, TName extends string, TSlots extends string, TKey extends string> extends DefineToolConfigBase<TIn, TOut, TInputDependencies, TName> {
     connection?: never;
     connections: Record<TSlots, TKey>;
-    run: (input: z.infer<TIn>, ctx: ContextMulti<TSlots>) => Promise<z.infer<TOut>>;
+    run: (input: z.infer<TIn>, ctx: ContextMulti<TSlots>) => Promise<unknown>;
 }
 interface ToolDefinitionBase<TIn extends z.ZodType, TOut extends z.ZodType, TInputDependencies extends AnyInputDependencies$1 | undefined, TName extends string> {
     readonly kind: "tool";
@@ -204,14 +192,12 @@ interface ToolDefinitionBase<TIn extends z.ZodType, TOut extends z.ZodType, TInp
     inputSchema: TIn;
     outputSchema: TOut;
     readonly annotations: _modelcontextprotocol_sdk_types_js.Tool["annotations"];
-    readonly statements: ReadonlyArray<Statement> | undefined;
     inputDependencies: InputDependenciesValue<TInputDependencies>;
 }
 interface ToolDefinitionNone<TIn extends z.ZodType = z.ZodType, TOut extends z.ZodType = z.ZodType, TInputDependencies extends AnyInputDependencies$1 | undefined = undefined, TName extends string = string> extends ToolDefinitionBase<TIn, TOut, TInputDependencies, TName> {
     readonly connection?: undefined;
     readonly connections?: undefined;
-    /** Author's run; the wrapper passes `input` directly. */
-    run: (input: z.infer<TIn>) => Promise<z.infer<TOut>>;
+    run: (input: z.infer<TIn>, ctx?: ContextNone) => Promise<z.infer<TOut>>;
 }
 interface ToolDefinitionSingle<TIn extends z.ZodType = z.ZodType, TOut extends z.ZodType = z.ZodType, TInputDependencies extends AnyInputDependencies$1 | undefined = undefined, TName extends string = string, TKey extends string = string> extends ToolDefinitionBase<TIn, TOut, TInputDependencies, TName> {
     readonly connection: TKey;

package/dist/index.d.ts

@@ -30,24 +30,6 @@ type Replace<S extends string, From extends string, To extends string> = S exten
  */
 type EnvFromKey<K extends string> = Uppercase<Replace<K, "-", "_">>;
 
-/**
- * A Zapier policy statement. Carried on the `ToolDefinition` for in-process
- * governance consumers (policy engines that wrap `script.run` before HTTP).
- * Not propagated to MCP `_meta` — only `inputDependencies` is published over
- * the wire (`_meta["zapier:inputDependencies"]`) by `toMcpTool` /
- * `toMcpServerTool`.
- */
-interface Statement {
-    effect: "allow" | "ask" | "deny";
-    permissions: ReadonlyArray<string>;
-    resources: ReadonlyArray<string>;
-    conditions?: ReadonlyArray<{
-        path: ReadonlyArray<string>;
-        operator: string;
-        value: unknown;
-    }>;
-    label?: string;
-}
 /**
  * Single-credential resolver: the resolver's `name` IS the credential
  * descriptor. `resolve` receives the credential as a plain `string` —
@@ -160,12 +142,19 @@ interface RunOptionsMulti<TSlots extends string = string, TPerSlot extends Recor
     connections: TPerSlot;
 }
 type RunOptions<TSlots extends string = string, TValue = ConnectionValue, TPerSlot extends Record<TSlots, ConnectionValue> = Record<TSlots, ConnectionValue>> = RunOptionsNone | RunOptionsSingle<TValue> | RunOptionsMulti<TSlots, TPerSlot>;
+/** Author-facing context for a credential-free script. */
+interface ContextNone {
+    fetch?: undefined;
+    connections?: undefined;
+}
 /** Author-facing context for a single-connection script. */
 interface ContextSingle {
     fetch: typeof globalThis.fetch;
+    connections?: never;
 }
 /** Author-facing context for a multi-connection script. */
 interface ContextMulti<TSlots extends string = string> {
+    fetch?: never;
     connections: Record<TSlots, typeof globalThis.fetch>;
 }
 type AnyInputDependencies$1 = Readonly<Record<string, unknown>>;
@@ -178,23 +167,22 @@ interface DefineToolConfigBase<TIn extends z.ZodType, TOut extends z.ZodType, TI
     inputSchema: TIn;
     outputSchema: TOut;
     annotations: _modelcontextprotocol_sdk_types_js.Tool["annotations"];
-    statements?: ReadonlyArray<Statement>;
     inputDependencies?: TInputDependencies;
 }
 interface DefineToolConfigNone<TIn extends z.ZodType, TOut extends z.ZodType, TInputDependencies extends AnyInputDependencies$1 | undefined, TName extends string> extends DefineToolConfigBase<TIn, TOut, TInputDependencies, TName> {
     connection?: never;
     connections?: never;
-    run: (input: z.infer<TIn>) => Promise<z.infer<TOut>>;
+    run: (input: z.infer<TIn>, ctx?: ContextNone) => Promise<unknown>;
 }
 interface DefineToolConfigSingle<TIn extends z.ZodType, TOut extends z.ZodType, TInputDependencies extends AnyInputDependencies$1 | undefined, TName extends string, TKey extends string> extends DefineToolConfigBase<TIn, TOut, TInputDependencies, TName> {
     connection: TKey;
     connections?: never;
-    run: (input: z.infer<TIn>, ctx: ContextSingle) => Promise<z.infer<TOut>>;
+    run: (input: z.infer<TIn>, ctx: ContextSingle) => Promise<unknown>;
 }
 interface DefineToolConfigMulti<TIn extends z.ZodType, TOut extends z.ZodType, TInputDependencies extends AnyInputDependencies$1 | undefined, TName extends string, TSlots extends string, TKey extends string> extends DefineToolConfigBase<TIn, TOut, TInputDependencies, TName> {
     connection?: never;
     connections: Record<TSlots, TKey>;
-    run: (input: z.infer<TIn>, ctx: ContextMulti<TSlots>) => Promise<z.infer<TOut>>;
+    run: (input: z.infer<TIn>, ctx: ContextMulti<TSlots>) => Promise<unknown>;
 }
 interface ToolDefinitionBase<TIn extends z.ZodType, TOut extends z.ZodType, TInputDependencies extends AnyInputDependencies$1 | undefined, TName extends string> {
     readonly kind: "tool";
@@ -204,14 +192,12 @@ interface ToolDefinitionBase<TIn extends z.ZodType, TOut extends z.ZodType, TInp
     inputSchema: TIn;
     outputSchema: TOut;
     readonly annotations: _modelcontextprotocol_sdk_types_js.Tool["annotations"];
-    readonly statements: ReadonlyArray<Statement> | undefined;
     inputDependencies: InputDependenciesValue<TInputDependencies>;
 }
 interface ToolDefinitionNone<TIn extends z.ZodType = z.ZodType, TOut extends z.ZodType = z.ZodType, TInputDependencies extends AnyInputDependencies$1 | undefined = undefined, TName extends string = string> extends ToolDefinitionBase<TIn, TOut, TInputDependencies, TName> {
     readonly connection?: undefined;
     readonly connections?: undefined;
-    /** Author's run; the wrapper passes `input` directly. */
-    run: (input: z.infer<TIn>) => Promise<z.infer<TOut>>;
+    run: (input: z.infer<TIn>, ctx?: ContextNone) => Promise<z.infer<TOut>>;
 }
 interface ToolDefinitionSingle<TIn extends z.ZodType = z.ZodType, TOut extends z.ZodType = z.ZodType, TInputDependencies extends AnyInputDependencies$1 | undefined = undefined, TName extends string = string, TKey extends string = string> extends ToolDefinitionBase<TIn, TOut, TInputDependencies, TName> {
     readonly connection: TKey;

package/dist/index.js

@@ -263,8 +263,8 @@ function ensureConnectionValue(scriptName, slotName, connectionKey, value) {
   return value;
 }
 async function buildContext(definition, opts, connectionResolvers) {
-  const hasConnection = "connection" in opts && opts.connection !== void 0;
-  const hasConnections = "connections" in opts && opts.connections !== void 0;
+  const hasConnection = opts !== void 0 && "connection" in opts && opts.connection !== void 0;
+  const hasConnections = opts !== void 0 && "connections" in opts && opts.connections !== void 0;
   if (definition.connection === void 0 && definition.connections === void 0) {
     if (hasConnection || hasConnections) {
       throw new Error(
@@ -273,6 +273,11 @@ async function buildContext(definition, opts, connectionResolvers) {
     }
     return {};
   }
+  if (opts === void 0) {
+    throw new Error(
+      `ToolDefinition "${definition.name}": \`RunOptions\` is required \u2014 pass \`{ connection: ... }\` or \`{ connections: ... }\`.`
+    );
+  }
   if (hasConnection && hasConnections) {
     throw new Error(
       `ToolDefinition "${definition.name}": \`RunOptions\` sets both \`connection\` and \`connections\`. Use one or the other.`
@@ -290,7 +295,7 @@ async function buildContext(definition, opts, connectionResolvers) {
       definition.name,
       void 0,
       connectionKey,
-      opts.connection
+      "connection" in opts ? opts.connection : void 0
     );
     const fetch = await resolveSlotFetch(
       definition.name,
@@ -307,12 +312,12 @@ async function buildContext(definition, opts, connectionResolvers) {
       `ToolDefinition "${definition.name}" is multi-connection (slots: ${declaredSlots.join(", ")}) \u2014 call with \`{ connections: { ... } }\`, not \`{ connection: ... }\`.`
     );
   }
-  if (!hasConnections) {
+  const provided = opts.connections;
+  if (provided === void 0) {
     throw new Error(
       `ToolDefinition "${definition.name}" is multi-connection \u2014 \`RunOptions.connections\` is required.`
     );
   }
-  const provided = opts.connections;
   const unknown = Object.keys(provided).filter(
     (s) => !declaredSlots.includes(s)
   );
@@ -411,24 +416,9 @@ function toResponsesTool(definition) {
 
 // src/define-connector.ts
 function wrapScriptWithResolvers(definition, connectionResolvers) {
-  const authorRun = definition.run;
   const wrappedRun = async (input, opts) => {
-    const validated = definition.inputSchema.parse(input);
-    if (definition.connection === void 0 && definition.connections === void 0) {
-      if (opts !== void 0 && (opts.connection !== void 0 || opts.connections !== void 0)) {
-        throw new Error(
-          `ToolDefinition "${definition.name}" is credential-free \u2014 \`RunOptions\` must not include \`connection\` or \`connections\`.`
-        );
-      }
-      return authorRun(validated);
-    }
-    if (opts === void 0) {
-      throw new Error(
-        `ToolDefinition "${definition.name}": \`RunOptions\` is required \u2014 pass \`{ connection: ... }\` or \`{ connections: ... }\`.`
-      );
-    }
     const ctx = await buildContext(definition, opts, connectionResolvers);
-    return authorRun(validated, ctx);
+    return definition.run(input, ctx);
   };
   return { ...definition, run: wrappedRun };
 }
@@ -507,6 +497,12 @@ function defineTool(config) {
       validateConnectionKey(config.name, value);
     }
   }
+  const authorRun = config.run;
+  const wrappedRun = async (input, ctx) => {
+    const validated = config.inputSchema.parse(input);
+    const result = await authorRun(validated, ctx);
+    return config.outputSchema.parse(result);
+  };
   const base = {
     kind: "tool",
     name: config.name,
@@ -515,9 +511,8 @@ function defineTool(config) {
     inputSchema: config.inputSchema,
     outputSchema: config.outputSchema,
     annotations: config.annotations,
-    statements: config.statements,
     inputDependencies: config.inputDependencies,
-    run: config.run
+    run: wrappedRun
   };
   if (hasSingular) base.connection = config.connection;
   if (hasPlural) base.connections = config.connections;
@@ -826,7 +821,7 @@ async function handleIfScriptMainBody(wrappedScript, connectionResolvers, io) {
     );
     return;
   }
-  const raw = positional ?? await new Response(io.stdin).text();
+  const raw = positional ?? await readStdinInput(io.stdin, wrappedScript.name);
   if (raw.trim().length === 0) {
     throw new Error(
       `Missing JSON input for "${wrappedScript.name}". Pass it as a positional argument or via stdin.`
@@ -838,6 +833,14 @@ async function handleIfScriptMainBody(wrappedScript, connectionResolvers, io) {
   const result = await wrappedScript.run(input, runOpts);
   io.stdout.write(JSON.stringify(result, null, 2) + "\n");
 }
+async function readStdinInput(stdin, scriptName) {
+  if (stdin.isTTY) {
+    throw new Error(
+      `Missing JSON input for "${scriptName}". Pass it as a positional argument or pipe it via stdin.`
+    );
+  }
+  return new Response(stdin).text();
+}
 function buildHelpText(definition, connectionResolvers, opts = {}) {
   const lines = [];
   const description = definition.description.split("\n")[0]?.trim() ?? "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zapier/connectors-sdk",
-  "version": "0.1.0-experimental.2",
+  "version": "0.1.0-experimental.4",
   "description": "SDK for building Zapier connectors. Provides the authoring primitives and execution surfaces for connector scripts.",
   "license": "Elastic-2.0",
   "type": "module",
@@ -24,9 +24,6 @@
     "README.md",
     "LICENSE"
   ],
-  "scripts": {
-    "build": "tsup"
-  },
   "peerDependencies": {
     "@modelcontextprotocol/sdk": "^1.0.0",
     "@zapier/zapier-sdk": "^0.59.0",
@@ -44,5 +41,8 @@
     "type": "git",
     "url": "https://gitlab.com/zapier/team-agents-platform/connectors.git",
     "directory": "packages/connectors-sdk"
+  },
+  "scripts": {
+    "build": "tsup"
   }
-}
+}