@arcadeai/arcadejs 1.4.2 → 1.5.0

package/lib/zod/types.d.ts

@@ -1,5 +1,6 @@
+import type { Arcade } from "../../index.js";
 import { AuthorizationResponse } from "../../resources/shared.js";
-import { ExecuteToolResponse } from "../../resources/tools/tools.js";
+import { ExecuteToolResponse, ToolDefinition } from "../../resources/tools/tools.js";
 import { z } from 'zod';
 /**
  * Response returned when a tool requires authorization before execution
@@ -10,25 +11,65 @@ export interface ToolAuthorizationResponse {
     url: string;
     message: string;
 }
-/**
- * Represents a tool with Zod schema validation and execution capabilities.
- */
-export interface ZodTool {
-    name: string;
-    description: string | undefined;
-    parameters: z.ZodType;
-    output: z.ZodType | undefined;
-    execute: <T extends unknown>(input: T) => Promise<ExecuteToolResponse>;
-    executeOrAuthorize: <T extends unknown>(input: T) => Promise<ExecuteToolResponse | ToolAuthorizationResponse>;
-}
 /**
  * Schema definition for an Arcade tool, containing the tool's name,
  * description, and Zod-validated parameter structure.
  */
 export interface ZodToolSchema {
+    /** Qualified name of the tool */
     name: string;
-    description: string | undefined;
+    /** Optional, human-readable description */
+    description?: string | undefined;
+    /** Zod schema for validating tool parameters */
     parameters: z.ZodType;
+    /** Zod schema for validating tool output (if any) */
     output: z.ZodType | undefined;
 }
+/**
+ * Generic type for any tool execution function
+ */
+export type ToolExecuteFunction<TReturn> = (input: unknown) => Promise<TReturn>;
+/**
+ * A complete tool implementation with Zod validation and execution capabilities
+ */
+export interface ZodTool<TReturn = ExecuteToolResponse> extends ZodToolSchema {
+    execute: ToolExecuteFunction<TReturn>;
+}
+/**
+ * Arcade client
+ */
+export type ArcadeClient = Omit<Arcade, '_options'>;
+/**
+ * Input required to create a tool execution function
+ */
+export interface ToolExecuteFunctionFactoryInput {
+    /** Original tool definition from Arcade */
+    toolDefinition: ToolDefinition;
+    /** Zod-validated tool schema */
+    zodToolSchema: ZodToolSchema;
+    /** Arcade client instance */
+    client: ArcadeClient;
+    /** User ID for tool execution/authorization */
+    userId: string;
+}
+/**
+ * Base input type for tool creation functions
+ */
+export interface BaseToolCreationInput<TReturn = ExecuteToolResponse> {
+    client: ArcadeClient;
+    userId: string;
+    executeFactory?: (props: ToolExecuteFunctionFactoryInput) => ToolExecuteFunction<TReturn>;
+}
+/**
+ * Input required to create a single Zod tool
+ */
+export interface CreateZodToolInput<TReturn = ExecuteToolResponse> extends BaseToolCreationInput<TReturn> {
+    tool: ToolDefinition;
+}
+/**
+ * Input required to create multiple Zod tools
+ */
+export interface CreateMultipleZodToolsInput<TReturn = ExecuteToolResponse> extends BaseToolCreationInput<TReturn> {
+    tools: ToolDefinition[];
+}
 //# sourceMappingURL=types.d.ts.map

package/lib/zod/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/zod/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,sBAAsB,EAAE,IAAI,CAAC;IAC7B,sBAAsB,EAAE,qBAAqB,CAAC;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC;IACtB,MAAM,EAAE,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC;IAC9B,OAAO,EAAE,CAAC,CAAC,SAAS,OAAO,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACvE,kBAAkB,EAAE,CAAC,CAAC,SAAS,OAAO,EACpC,KAAK,EAAE,CAAC,KACL,OAAO,CAAC,mBAAmB,GAAG,yBAAyB,CAAC,CAAC;CAC/D;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC;IACtB,MAAM,EAAE,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC;CAC/B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/zod/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,sBAAsB,EAAE,IAAI,CAAC;IAC7B,sBAAsB,EAAE,qBAAqB,CAAC;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,gDAAgD;IAChD,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC;IACtB,qDAAqD;IACrD,MAAM,EAAE,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,OAAO,CAAC,OAAO,GAAG,mBAAmB,CAAE,SAAQ,aAAa;IAC3E,OAAO,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC;CACvC;AAED;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,+BAA+B;IAC9C,2CAA2C;IAC3C,cAAc,EAAE,cAAc,CAAC;IAC/B,gCAAgC;IAChC,aAAa,EAAE,aAAa,CAAC;IAC7B,6BAA6B;IAC7B,MAAM,EAAE,YAAY,CAAC;IACrB,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB,CAAC,OAAO,GAAG,mBAAmB;IAClE,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,+BAA+B,KAAK,mBAAmB,CAAC,OAAO,CAAC,CAAC;CAC3F;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB,CAAC,OAAO,GAAG,mBAAmB,CAAE,SAAQ,qBAAqB,CAAC,OAAO,CAAC;IACvG,IAAI,EAAE,cAAc,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,2BAA2B,CAAC,OAAO,GAAG,mBAAmB,CACxE,SAAQ,qBAAqB,CAAC,OAAO,CAAC;IACtC,KAAK,EAAE,cAAc,EAAE,CAAC;CACzB"}

package/lib/zod/zod.d.ts

@@ -1,8 +1,6 @@
-import { ToolDefinition } from "../../resources/tools/tools.js";
-import { ZodTool, ZodToolSchema } from "./types.js";
+import { ExecuteToolResponse, ToolDefinition } from "../../resources/tools/tools.js";
+import { ZodTool, ZodToolSchema, ToolExecuteFunctionFactoryInput, CreateZodToolInput, CreateMultipleZodToolsInput, ToolExecuteFunction, ToolAuthorizationResponse } from "./types.js";
 import { z } from 'zod';
-import type { Arcade } from "../../index.js";
-type ArcadeClient = Omit<Arcade, '_options'>;
 /**
  * Checks if an error indicates that authorization for the tool is required
  */
@@ -23,35 +21,30 @@ export declare function convertOutputToZodSchema(output: ToolDefinition.Output):
  */
 export declare function convertSingleToolToSchema(tool: ToolDefinition): ZodToolSchema;
 /**
- * Converts OpenAI formatted tools to Zod-validated tool schemas
+ * Converts tools to Zod-validated tool schemas
  * @param tools - Array of formatted tools
  * @returns Array of Zod-validated tool schemas
  */
 export declare function toZodSchema(tools: ToolDefinition[]): ZodToolSchema[];
+/**
+ * Creates a tool execution function that will validate the input and execute the tool
+ */
+export declare function executeZodTool({ zodToolSchema, client, userId, }: ToolExecuteFunctionFactoryInput): ToolExecuteFunction<ExecuteToolResponse>;
+/**
+ * Creates a tool execution function that will execute the tool if it is authorized,
+ * otherwise it will return a ToolAuthorizationResponse
+ */
+export declare function executeOrAuthorizeZodTool({ zodToolSchema, toolDefinition, client, userId, }: ToolExecuteFunctionFactoryInput): ToolExecuteFunction<ExecuteToolResponse | ToolAuthorizationResponse>;
 /**
  * Converts a single tool to a full tool with execution capabilities
- * @param tool - The tool to convert
- * @param client - Arcade client instance
- * @param userId - User ID to use for the tool execution
- * @returns Zod-validated tool with execution methods
- * @throws ToolConversionError if the tool is invalid
  */
-export declare function createZodTool({ tool, client, userId, }: {
-    tool: ToolDefinition;
-    client: ArcadeClient;
-    userId: string;
-}): ZodTool;
+export declare function createZodTool<TReturn = ExecuteToolResponse>(props: CreateZodToolInput<TReturn>): ZodTool<TReturn>;
 /**
- * Converts formatted tools to full tools with execution capabilities
- * @param tools - Array of formatted tools
- * @param client - Arcade client instance
- * @param userId - User ID to use for the tool execution
- * @returns Array of Zod-validated tools with execution methods
- */
-export declare function toZod({ tools, client, userId, }: {
-    tools: ToolDefinition[];
-    client: ArcadeClient;
-    userId: string;
-}): ZodTool[];
-export {};
+ * Converts Arcade tools to zod tools with execution capabilities
+ */
+export declare function toZod<TReturn = ExecuteToolResponse>({ tools, client, userId, executeFactory: providedExecuteFactory, }: CreateMultipleZodToolsInput<TReturn>): ZodTool<TReturn>[];
+/**
+ * Creates a record of Zod-validated tools with configurable execute functions
+ */
+export declare function toZodToolSet<TReturn = ExecuteToolResponse>({ tools, client, userId, executeFactory: providedExecuteFactory, }: CreateMultipleZodToolsInput<TReturn>): Record<string, ZodTool<TReturn>>;
 //# sourceMappingURL=zod.d.ts.map

package/lib/zod/zod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zod.d.ts","sourceRoot":"","sources":["../../src/lib/zod/zod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAA6B,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,KAAK,YAAY,GAAG,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAE7C;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAMlE;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,cAAc,CAAC,KAAK,GAAG,CAAC,CAAC,OAAO,CAmBxF;AAyCD;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,OAAO,CAMjF;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,cAAc,GAAG,aAAa,CAU7E;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,aAAa,EAAE,CAEpE;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,EAC5B,IAAI,EACJ,MAAM,EACN,MAAM,GACP,EAAE;IACD,IAAI,EAAE,cAAc,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAuDV;AAED;;;;;;GAMG;AACH,wBAAgB,KAAK,CAAC,EACpB,KAAK,EACL,MAAM,EACN,MAAM,GACP,EAAE;IACD,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,MAAM,EAAE,YAAY,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,EAAE,CAEZ"}
+{"version":3,"file":"zod.d.ts","sourceRoot":"","sources":["../../src/lib/zod/zod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClF,OAAO,EACL,OAAO,EACP,aAAa,EACb,+BAA+B,EAC/B,kBAAkB,EAClB,2BAA2B,EAC3B,mBAAmB,EACnB,yBAAyB,EAC1B,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAOlE;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,UAAU,EAAE,cAAc,CAAC,KAAK,GAAG,CAAC,CAAC,OAAO,CAmBxF;AA+BD;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,OAAO,CAMjF;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,cAAc,GAAG,aAAa,CAU7E;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,aAAa,EAAE,CAEpE;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,EAC7B,aAAa,EACb,MAAM,EACN,MAAM,GACP,EAAE,+BAA+B,GAAG,mBAAmB,CAAC,mBAAmB,CAAC,CAgB5E;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,EACxC,aAAa,EACb,cAAc,EACd,MAAM,EACN,MAAM,GACP,EAAE,+BAA+B,GAAG,mBAAmB,CAAC,mBAAmB,GAAG,yBAAyB,CAAC,CAwBxG;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,GAAG,mBAAmB,EACzD,KAAK,EAAE,kBAAkB,CAAC,OAAO,CAAC,GACjC,OAAO,CAAC,OAAO,CAAC,CAgBlB;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,OAAO,GAAG,mBAAmB,EAAE,EACnD,KAAK,EACL,MAAM,EACN,MAAM,EACN,cAAc,EAAE,sBAAsB,GACvC,EAAE,2BAA2B,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAK3D;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,GAAG,mBAAmB,EAAE,EAC1D,KAAK,EACL,MAAM,EACN,MAAM,EACN,cAAc,EAAE,sBAAsB,GACvC,EAAE,2BAA2B,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAUzE"}

package/lib/zod/zod.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toZod = exports.createZodTool = exports.toZodSchema = exports.convertSingleToolToSchema = exports.convertOutputToZodSchema = exports.convertParametersToZodSchema = exports.isAuthorizationRequiredError = void 0;
+exports.toZodToolSet = exports.toZod = exports.createZodTool = exports.executeOrAuthorizeZodTool = exports.executeZodTool = exports.toZodSchema = exports.convertSingleToolToSchema = exports.convertOutputToZodSchema = exports.convertParametersToZodSchema = exports.isAuthorizationRequiredError = void 0;
 const zod_1 = require("zod");
 /**
  * Checks if an error indicates that authorization for the tool is required
  */
 function isAuthorizationRequiredError(error) {
+    const errorMessage = error?.message?.toLowerCase() || '';
     return (error?.name === 'PermissionDeniedError' ||
-        error?.message?.includes('permission denied') ||
-        error?.message?.includes('authorization required'));
+        errorMessage.includes('permission denied') ||
+        errorMessage.includes('authorization required'));
 }
 exports.isAuthorizationRequiredError = isAuthorizationRequiredError;
 /**
@@ -34,33 +35,25 @@ exports.convertParametersToZodSchema = convertParametersToZodSchema;
  * Converts a value schema to Zod type
  */
 function convertValueSchemaToZod(schema) {
-    let baseType;
     switch (schema.val_type) {
         case 'string':
-            baseType = schema.enum ? zod_1.z.enum(schema.enum) : zod_1.z.string();
-            break;
+            return schema.enum ? zod_1.z.enum(schema.enum) : zod_1.z.string();
         case 'integer':
-            baseType = zod_1.z.number().int();
-            break;
+            return zod_1.z.number().int();
         case 'number':
-            baseType = zod_1.z.number();
-            break;
+            return zod_1.z.number();
         case 'boolean':
-            baseType = zod_1.z.boolean();
-            break;
+            return zod_1.z.boolean();
         case 'json':
-            baseType = zod_1.z.any();
-            break;
+            return zod_1.z.any();
         case 'array':
             if (!schema.inner_val_type) {
                 throw new Error('Array type must have inner_val_type specified');
             }
-            baseType = zod_1.z.array(convertValueSchemaToZod({ val_type: schema.inner_val_type }));
-            break;
+            return zod_1.z.array(convertValueSchemaToZod({ val_type: schema.inner_val_type }));
         default:
-            throw new Error(`Unsupported value type: ${schema.val_type}`);
+            return zod_1.z.any();
     }
-    return baseType;
 }
 /**
  * Converts Arcade Tool Output to Zod schema
@@ -91,7 +84,7 @@ function convertSingleToolToSchema(tool) {
 }
 exports.convertSingleToolToSchema = convertSingleToolToSchema;
 /**
- * Converts OpenAI formatted tools to Zod-validated tool schemas
+ * Converts tools to Zod-validated tool schemas
  * @param tools - Array of formatted tools
  * @returns Array of Zod-validated tool schemas
  */
@@ -99,74 +92,91 @@ function toZodSchema(tools) {
     return tools.map(convertSingleToolToSchema);
 }
 exports.toZodSchema = toZodSchema;
+/**
+ * Creates a tool execution function that will validate the input and execute the tool
+ */
+function executeZodTool({ zodToolSchema, client, userId, }) {
+    const { parameters, name: toolName } = zodToolSchema;
+    return async (input) => {
+        const validationResult = parameters.safeParse(input);
+        if (!validationResult.success) {
+            throw new Error(`Invalid input: ${validationResult.error.message}`);
+        }
+        const result = await client.tools.execute({
+            tool_name: toolName,
+            input: validationResult.data,
+            user_id: userId,
+        });
+        return result;
+    };
+}
+exports.executeZodTool = executeZodTool;
+/**
+ * Creates a tool execution function that will execute the tool if it is authorized,
+ * otherwise it will return a ToolAuthorizationResponse
+ */
+function executeOrAuthorizeZodTool({ zodToolSchema, toolDefinition, client, userId, }) {
+    const { name: toolName } = zodToolSchema;
+    return async (input) => {
+        try {
+            const result = await executeZodTool({ zodToolSchema, toolDefinition, client, userId })(input);
+            return result;
+        }
+        catch (error) {
+            if (error instanceof Error && isAuthorizationRequiredError(error)) {
+                const response = await client.tools.authorize({
+                    tool_name: toolName,
+                    user_id: userId,
+                });
+                return {
+                    authorization_required: true,
+                    authorization_response: response,
+                    url: response.url ?? '',
+                    message: `This tool requires authorization. Please visit the following URL to authorize the tool: ${response.url}`,
+                };
+            }
+            throw error;
+        }
+    };
+}
+exports.executeOrAuthorizeZodTool = executeOrAuthorizeZodTool;
 /**
  * Converts a single tool to a full tool with execution capabilities
- * @param tool - The tool to convert
- * @param client - Arcade client instance
- * @param userId - User ID to use for the tool execution
- * @returns Zod-validated tool with execution methods
- * @throws ToolConversionError if the tool is invalid
  */
-function createZodTool({ tool, client, userId, }) {
+function createZodTool(props) {
+    const { tool, client, userId, executeFactory: providedExecuteFactory } = props;
     const schema = convertSingleToolToSchema(tool);
     const { name, description, parameters, output } = schema;
+    const factoryToUse = providedExecuteFactory ??
+        executeZodTool;
     return {
         name,
         description,
         parameters,
         output,
-        execute: async (input) => {
-            const validationResult = parameters.safeParse(input);
-            if (!validationResult.success) {
-                throw new Error(`Invalid input: ${validationResult.error.message}`);
-            }
-            return client.tools.execute({
-                tool_name: name,
-                input: validationResult.data,
-                user_id: userId,
-            });
-        },
-        executeOrAuthorize: async (input) => {
-            const validationResult = parameters.safeParse(input);
-            if (!validationResult.success) {
-                throw new Error(`Invalid input: ${validationResult.error.message}`);
-            }
-            try {
-                return await client.tools.execute({
-                    tool_name: name,
-                    input: validationResult.data,
-                    user_id: userId,
-                });
-            }
-            catch (error) {
-                if (error instanceof Error && isAuthorizationRequiredError(error)) {
-                    const response = (await client.tools.authorize({
-                        tool_name: name,
-                        user_id: userId,
-                    }));
-                    return {
-                        authorization_required: true,
-                        authorization_response: response,
-                        url: response.url,
-                        message: 'This tool requires authorization. Please visit the following URL to authorize the tool: ' +
-                            response.url,
-                    };
-                }
-                throw error;
-            }
-        },
+        execute: factoryToUse({ toolDefinition: tool, zodToolSchema: schema, client, userId }),
     };
 }
 exports.createZodTool = createZodTool;
 /**
- * Converts formatted tools to full tools with execution capabilities
- * @param tools - Array of formatted tools
- * @param client - Arcade client instance
- * @param userId - User ID to use for the tool execution
- * @returns Array of Zod-validated tools with execution methods
+ * Converts Arcade tools to zod tools with execution capabilities
  */
-function toZod({ tools, client, userId, }) {
-    return tools.map((tool) => createZodTool({ tool, client, userId }));
+function toZod({ tools, client, userId, executeFactory: providedExecuteFactory, }) {
+    const factoryToUse = providedExecuteFactory ??
+        executeZodTool;
+    return tools.map((tool) => createZodTool({ tool, client, userId, executeFactory: factoryToUse }));
 }
 exports.toZod = toZod;
+/**
+ * Creates a record of Zod-validated tools with configurable execute functions
+ */
+function toZodToolSet({ tools, client, userId, executeFactory: providedExecuteFactory, }) {
+    const factoryToUse = providedExecuteFactory ??
+        executeZodTool;
+    return Object.fromEntries(tools.map((tool) => {
+        const zodTool = createZodTool({ tool, client, userId, executeFactory: factoryToUse });
+        return [zodTool.name, zodTool];
+    }));
+}
+exports.toZodToolSet = toZodToolSet;
 //# sourceMappingURL=zod.js.map

package/lib/zod/zod.js.map

@@ -1 +1 @@
-{"version":3,"file":"zod.js","sourceRoot":"","sources":["../../src/lib/zod/zod.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zod.js","sourceRoot":"","sources":["../../src/lib/zod/zod.ts"],"names":[],"mappings":"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"}

package/lib/zod/zod.mjs

@@ -3,9 +3,10 @@ import { z } from 'zod';
  * Checks if an error indicates that authorization for the tool is required
  */
 export function isAuthorizationRequiredError(error) {
+    const errorMessage = error?.message?.toLowerCase() || '';
     return (error?.name === 'PermissionDeniedError' ||
-        error?.message?.includes('permission denied') ||
-        error?.message?.includes('authorization required'));
+        errorMessage.includes('permission denied') ||
+        errorMessage.includes('authorization required'));
 }
 /**
  * Converts Arcade Tool Input to Zod schema
@@ -29,33 +30,25 @@ export function convertParametersToZodSchema(parameters) {
  * Converts a value schema to Zod type
  */
 function convertValueSchemaToZod(schema) {
-    let baseType;
     switch (schema.val_type) {
         case 'string':
-            baseType = schema.enum ? z.enum(schema.enum) : z.string();
-            break;
+            return schema.enum ? z.enum(schema.enum) : z.string();
         case 'integer':
-            baseType = z.number().int();
-            break;
+            return z.number().int();
         case 'number':
-            baseType = z.number();
-            break;
+            return z.number();
         case 'boolean':
-            baseType = z.boolean();
-            break;
+            return z.boolean();
         case 'json':
-            baseType = z.any();
-            break;
+            return z.any();
         case 'array':
             if (!schema.inner_val_type) {
                 throw new Error('Array type must have inner_val_type specified');
             }
-            baseType = z.array(convertValueSchemaToZod({ val_type: schema.inner_val_type }));
-            break;
+            return z.array(convertValueSchemaToZod({ val_type: schema.inner_val_type }));
         default:
-            throw new Error(`Unsupported value type: ${schema.val_type}`);
+            return z.any();
     }
-    return baseType;
 }
 /**
  * Converts Arcade Tool Output to Zod schema
@@ -84,79 +77,93 @@ export function convertSingleToolToSchema(tool) {
     };
 }
 /**
- * Converts OpenAI formatted tools to Zod-validated tool schemas
+ * Converts tools to Zod-validated tool schemas
  * @param tools - Array of formatted tools
  * @returns Array of Zod-validated tool schemas
  */
 export function toZodSchema(tools) {
     return tools.map(convertSingleToolToSchema);
 }
+/**
+ * Creates a tool execution function that will validate the input and execute the tool
+ */
+export function executeZodTool({ zodToolSchema, client, userId, }) {
+    const { parameters, name: toolName } = zodToolSchema;
+    return async (input) => {
+        const validationResult = parameters.safeParse(input);
+        if (!validationResult.success) {
+            throw new Error(`Invalid input: ${validationResult.error.message}`);
+        }
+        const result = await client.tools.execute({
+            tool_name: toolName,
+            input: validationResult.data,
+            user_id: userId,
+        });
+        return result;
+    };
+}
+/**
+ * Creates a tool execution function that will execute the tool if it is authorized,
+ * otherwise it will return a ToolAuthorizationResponse
+ */
+export function executeOrAuthorizeZodTool({ zodToolSchema, toolDefinition, client, userId, }) {
+    const { name: toolName } = zodToolSchema;
+    return async (input) => {
+        try {
+            const result = await executeZodTool({ zodToolSchema, toolDefinition, client, userId })(input);
+            return result;
+        }
+        catch (error) {
+            if (error instanceof Error && isAuthorizationRequiredError(error)) {
+                const response = await client.tools.authorize({
+                    tool_name: toolName,
+                    user_id: userId,
+                });
+                return {
+                    authorization_required: true,
+                    authorization_response: response,
+                    url: response.url ?? '',
+                    message: `This tool requires authorization. Please visit the following URL to authorize the tool: ${response.url}`,
+                };
+            }
+            throw error;
+        }
+    };
+}
 /**
  * Converts a single tool to a full tool with execution capabilities
- * @param tool - The tool to convert
- * @param client - Arcade client instance
- * @param userId - User ID to use for the tool execution
- * @returns Zod-validated tool with execution methods
- * @throws ToolConversionError if the tool is invalid
  */
-export function createZodTool({ tool, client, userId, }) {
+export function createZodTool(props) {
+    const { tool, client, userId, executeFactory: providedExecuteFactory } = props;
     const schema = convertSingleToolToSchema(tool);
     const { name, description, parameters, output } = schema;
+    const factoryToUse = providedExecuteFactory ??
+        executeZodTool;
     return {
         name,
         description,
         parameters,
         output,
-        execute: async (input) => {
-            const validationResult = parameters.safeParse(input);
-            if (!validationResult.success) {
-                throw new Error(`Invalid input: ${validationResult.error.message}`);
-            }
-            return client.tools.execute({
-                tool_name: name,
-                input: validationResult.data,
-                user_id: userId,
-            });
-        },
-        executeOrAuthorize: async (input) => {
-            const validationResult = parameters.safeParse(input);
-            if (!validationResult.success) {
-                throw new Error(`Invalid input: ${validationResult.error.message}`);
-            }
-            try {
-                return await client.tools.execute({
-                    tool_name: name,
-                    input: validationResult.data,
-                    user_id: userId,
-                });
-            }
-            catch (error) {
-                if (error instanceof Error && isAuthorizationRequiredError(error)) {
-                    const response = (await client.tools.authorize({
-                        tool_name: name,
-                        user_id: userId,
-                    }));
-                    return {
-                        authorization_required: true,
-                        authorization_response: response,
-                        url: response.url,
-                        message: 'This tool requires authorization. Please visit the following URL to authorize the tool: ' +
-                            response.url,
-                    };
-                }
-                throw error;
-            }
-        },
+        execute: factoryToUse({ toolDefinition: tool, zodToolSchema: schema, client, userId }),
     };
 }
 /**
- * Converts formatted tools to full tools with execution capabilities
- * @param tools - Array of formatted tools
- * @param client - Arcade client instance
- * @param userId - User ID to use for the tool execution
- * @returns Array of Zod-validated tools with execution methods
+ * Converts Arcade tools to zod tools with execution capabilities
+ */
+export function toZod({ tools, client, userId, executeFactory: providedExecuteFactory, }) {
+    const factoryToUse = providedExecuteFactory ??
+        executeZodTool;
+    return tools.map((tool) => createZodTool({ tool, client, userId, executeFactory: factoryToUse }));
+}
+/**
+ * Creates a record of Zod-validated tools with configurable execute functions
  */
-export function toZod({ tools, client, userId, }) {
-    return tools.map((tool) => createZodTool({ tool, client, userId }));
+export function toZodToolSet({ tools, client, userId, executeFactory: providedExecuteFactory, }) {
+    const factoryToUse = providedExecuteFactory ??
+        executeZodTool;
+    return Object.fromEntries(tools.map((tool) => {
+        const zodTool = createZodTool({ tool, client, userId, executeFactory: factoryToUse });
+        return [zodTool.name, zodTool];
+    }));
 }
 //# sourceMappingURL=zod.mjs.map

package/lib/zod/zod.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"zod.mjs","sourceRoot":"","sources":["../../src/lib/zod/zod.ts"],"names":[],"mappings":"OAEO,EAAE,CAAC,EAAE,MAAM,KAAK;AAKvB;;GAEG;AACH,MAAM,UAAU,4BAA4B,CAAC,KAAY;IACvD,OAAO,CACL,KAAK,EAAE,IAAI,KAAK,uBAAuB;QACvC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,mBAAmB,CAAC;QAC7C,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,wBAAwB,CAAC,CACnD,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,4BAA4B,CAAC,UAAgC;IAC3E,IAAI,CAAC,UAAU,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QACnE,OAAO,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;KACrB;IAED,MAAM,SAAS,GAA8B,EAAE,CAAC;IAEhD,KAAK,MAAM,KAAK,IAAI,UAAU,CAAC,UAAU,EAAE;QACzC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;QAC/C,IAAI,OAAO,GAAG,uBAAuB,CAAC,YAAY,CAAC,CAAC;QAEpD,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;SAC9B;QAED,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;KAC3B;IAED,OAAO,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AAC7B,CAAC;AAED;;GAEG;AACH,SAAS,uBAAuB,CAAC,MAIhC;IACC,IAAI,QAAmB,CAAC;IAExB,QAAQ,MAAM,CAAC,QAAQ,EAAE;QACvB,KAAK,QAAQ;YACX,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAA6B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YACnF,MAAM;QACR,KAAK,SAAS;YACZ,QAAQ,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC;YAC5B,MAAM;QACR,KAAK,QAAQ;YACX,QAAQ,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;YACtB,MAAM;QACR,KAAK,SAAS;YACZ,QAAQ,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YACvB,MAAM;QACR,KAAK,MAAM;YACT,QAAQ,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YACnB,MAAM;QACR,KAAK,OAAO;YACV,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;gBAC1B,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;aAClE;YACD,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;YACjF,MAAM;QACR;YACE,MAAM,IAAI,KAAK,CAAC,2BAA2B,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;KACjE;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAC,MAA6B;IACpE,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;QACxB,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC;KAChB;IAED,OAAO,uBAAuB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AACtD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CAAC,IAAoB;IAC5D,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC5D,MAAM,aAAa,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,OAAO;QACL,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;QACxC,WAAW;QACX,UAAU,EAAE,aAAa;QACzB,MAAM,EAAE,SAAS;KAClB,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,KAAuB;IACjD,OAAO,KAAK,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;AAC9C,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAAC,EAC5B,IAAI,EACJ,MAAM,EACN,MAAM,GAKP;IACC,MAAM,MAAM,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAEzD,OAAO;QACL,IAAI;QACJ,WAAW;QACX,UAAU;QACV,MAAM;QACN,OAAO,EAAE,KAAK,EAAE,KAAiC,EAAgC,EAAE;YACjF,MAAM,gBAAgB,GAAG,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACrD,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;gBAC7B,MAAM,IAAI,KAAK,CAAC,kBAAkB,gBAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aACrE;YAED,OAAO,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;gBAC1B,SAAS,EAAE,IAAI;gBACf,KAAK,EAAE,gBAAgB,CAAC,IAAI;gBAC5B,OAAO,EAAE,MAAM;aAChB,CAAC,CAAC;QACL,CAAC;QACD,kBAAkB,EAAE,KAAK,EACvB,KAAiC,EACyB,EAAE;YAC5D,MAAM,gBAAgB,GAAG,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACrD,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;gBAC7B,MAAM,IAAI,KAAK,CAAC,kBAAkB,gBAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aACrE;YAED,IAAI;gBACF,OAAO,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;oBAChC,SAAS,EAAE,IAAI;oBACf,KAAK,EAAE,gBAAgB,CAAC,IAAI;oBAC5B,OAAO,EAAE,MAAM;iBAChB,CAAC,CAAC;aACJ;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,KAAK,YAAY,KAAK,IAAI,4BAA4B,CAAC,KAAK,CAAC,EAAE;oBACjE,MAAM,QAAQ,GAAG,CAAC,MAAM,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;wBAC7C,SAAS,EAAE,IAAI;wBACf,OAAO,EAAE,MAAM;qBAChB,CAAC,CAAoB,CAAC;oBAEvB,OAAO;wBACL,sBAAsB,EAAE,IAAI;wBAC5B,sBAAsB,EAAE,QAAQ;wBAChC,GAAG,EAAE,QAAQ,CAAC,GAAG;wBACjB,OAAO,EACL,0FAA0F;4BAC1F,QAAQ,CAAC,GAAG;qBACf,CAAC;iBACH;gBACD,MAAM,KAAK,CAAC;aACb;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,KAAK,CAAC,EACpB,KAAK,EACL,MAAM,EACN,MAAM,GAKP;IACC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC"}
+{"version":3,"file":"zod.mjs","sourceRoot":"","sources":["../../src/lib/zod/zod.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcadeai/arcadejs",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "The official TypeScript library for the Arcade API",
   "author": "Arcade <dev@arcade.dev>",
   "types": "./index.d.ts",

package/src/lib/zod/types.ts

@@ -1,5 +1,6 @@
+import type { Arcade } from '../../index';
 import { AuthorizationResponse } from '../../resources/shared';
-import { ExecuteToolResponse } from '../../resources/tools/tools';
+import { ExecuteToolResponse, ToolDefinition } from '../../resources/tools/tools';
 import { z } from 'zod';
 
 /**
@@ -13,26 +14,71 @@ export interface ToolAuthorizationResponse {
 }
 
 /**
- * Represents a tool with Zod schema validation and execution capabilities.
+ * Schema definition for an Arcade tool, containing the tool's name,
+ * description, and Zod-validated parameter structure.
  */
-export interface ZodTool {
+export interface ZodToolSchema {
+  /** Qualified name of the tool */
   name: string;
-  description: string | undefined;
+  /** Optional, human-readable description */
+  description?: string | undefined;
+  /** Zod schema for validating tool parameters */
   parameters: z.ZodType;
+  /** Zod schema for validating tool output (if any) */
   output: z.ZodType | undefined;
-  execute: <T extends unknown>(input: T) => Promise<ExecuteToolResponse>;
-  executeOrAuthorize: <T extends unknown>(
-    input: T,
-  ) => Promise<ExecuteToolResponse | ToolAuthorizationResponse>;
 }
 
 /**
- * Schema definition for an Arcade tool, containing the tool's name,
- * description, and Zod-validated parameter structure.
+ * Generic type for any tool execution function
  */
-export interface ZodToolSchema {
-  name: string;
-  description: string | undefined;
-  parameters: z.ZodType;
-  output: z.ZodType | undefined;
+export type ToolExecuteFunction<TReturn> = (input: unknown) => Promise<TReturn>;
+
+/**
+ * A complete tool implementation with Zod validation and execution capabilities
+ */
+export interface ZodTool<TReturn = ExecuteToolResponse> extends ZodToolSchema {
+  execute: ToolExecuteFunction<TReturn>;
+}
+
+/**
+ * Arcade client
+ */
+export type ArcadeClient = Omit<Arcade, '_options'>;
+
+/**
+ * Input required to create a tool execution function
+ */
+export interface ToolExecuteFunctionFactoryInput {
+  /** Original tool definition from Arcade */
+  toolDefinition: ToolDefinition;
+  /** Zod-validated tool schema */
+  zodToolSchema: ZodToolSchema;
+  /** Arcade client instance */
+  client: ArcadeClient;
+  /** User ID for tool execution/authorization */
+  userId: string;
+}
+
+/**
+ * Base input type for tool creation functions
+ */
+export interface BaseToolCreationInput<TReturn = ExecuteToolResponse> {
+  client: ArcadeClient;
+  userId: string;
+  executeFactory?: (props: ToolExecuteFunctionFactoryInput) => ToolExecuteFunction<TReturn>;
+}
+
+/**
+ * Input required to create a single Zod tool
+ */
+export interface CreateZodToolInput<TReturn = ExecuteToolResponse> extends BaseToolCreationInput<TReturn> {
+  tool: ToolDefinition;
+}
+
+/**
+ * Input required to create multiple Zod tools
+ */
+export interface CreateMultipleZodToolsInput<TReturn = ExecuteToolResponse>
+  extends BaseToolCreationInput<TReturn> {
+  tools: ToolDefinition[];
 }

package/src/lib/zod/zod.ts

@@ -1,18 +1,24 @@
 import { ExecuteToolResponse, ToolDefinition } from '../../resources/tools/tools';
-import { ToolAuthorizationResponse, ZodTool, ZodToolSchema } from './types';
+import {
+  ZodTool,
+  ZodToolSchema,
+  ToolExecuteFunctionFactoryInput,
+  CreateZodToolInput,
+  CreateMultipleZodToolsInput,
+  ToolExecuteFunction,
+  ToolAuthorizationResponse,
+} from './types';
 import { z } from 'zod';
-import type { Arcade } from '../../index';
-
-type ArcadeClient = Omit<Arcade, '_options'>;
 
 /**
  * Checks if an error indicates that authorization for the tool is required
  */
 export function isAuthorizationRequiredError(error: Error): boolean {
+  const errorMessage = error?.message?.toLowerCase() || '';
   return (
     error?.name === 'PermissionDeniedError' ||
-    error?.message?.includes('permission denied') ||
-    error?.message?.includes('authorization required')
+    errorMessage.includes('permission denied') ||
+    errorMessage.includes('authorization required')
   );
 }
 
@@ -48,35 +54,25 @@ function convertValueSchemaToZod(schema: {
   inner_val_type?: string | null;
   enum?: string[] | null;
 }): z.ZodType {
-  let baseType: z.ZodType;
-
   switch (schema.val_type) {
     case 'string':
-      baseType = schema.enum ? z.enum(schema.enum as [string, ...string[]]) : z.string();
-      break;
+      return schema.enum ? z.enum(schema.enum as [string, ...string[]]) : z.string();
     case 'integer':
-      baseType = z.number().int();
-      break;
+      return z.number().int();
     case 'number':
-      baseType = z.number();
-      break;
+      return z.number();
     case 'boolean':
-      baseType = z.boolean();
-      break;
+      return z.boolean();
     case 'json':
-      baseType = z.any();
-      break;
+      return z.any();
     case 'array':
       if (!schema.inner_val_type) {
         throw new Error('Array type must have inner_val_type specified');
       }
-      baseType = z.array(convertValueSchemaToZod({ val_type: schema.inner_val_type }));
-      break;
+      return z.array(convertValueSchemaToZod({ val_type: schema.inner_val_type }));
     default:
-      throw new Error(`Unsupported value type: ${schema.val_type}`);
+      return z.any();
   }
-
-  return baseType;
 }
 
 /**
@@ -109,7 +105,7 @@ export function convertSingleToolToSchema(tool: ToolDefinition): ZodToolSchema {
 }
 
 /**
- * Converts OpenAI formatted tools to Zod-validated tool schemas
+ * Converts tools to Zod-validated tool schemas
  * @param tools - Array of formatted tools
  * @returns Array of Zod-validated tool schemas
  */
@@ -118,93 +114,119 @@ export function toZodSchema(tools: ToolDefinition[]): ZodToolSchema[] {
 }
 
 /**
- * Converts a single tool to a full tool with execution capabilities
- * @param tool - The tool to convert
- * @param client - Arcade client instance
- * @param userId - User ID to use for the tool execution
- * @returns Zod-validated tool with execution methods
- * @throws ToolConversionError if the tool is invalid
+ * Creates a tool execution function that will validate the input and execute the tool
+ */
+export function executeZodTool({
+  zodToolSchema,
+  client,
+  userId,
+}: ToolExecuteFunctionFactoryInput): ToolExecuteFunction<ExecuteToolResponse> {
+  const { parameters, name: toolName } = zodToolSchema;
+
+  return async (input: unknown): Promise<ExecuteToolResponse> => {
+    const validationResult = parameters.safeParse(input);
+    if (!validationResult.success) {
+      throw new Error(`Invalid input: ${validationResult.error.message}`);
+    }
+
+    const result = await client.tools.execute({
+      tool_name: toolName,
+      input: validationResult.data,
+      user_id: userId,
+    });
+    return result;
+  };
+}
+
+/**
+ * Creates a tool execution function that will execute the tool if it is authorized,
+ * otherwise it will return a ToolAuthorizationResponse
  */
-export function createZodTool({
-  tool,
+export function executeOrAuthorizeZodTool({
+  zodToolSchema,
+  toolDefinition,
   client,
   userId,
-}: {
-  tool: ToolDefinition;
-  client: ArcadeClient;
-  userId: string;
-}): ZodTool {
+}: ToolExecuteFunctionFactoryInput): ToolExecuteFunction<ExecuteToolResponse | ToolAuthorizationResponse> {
+  const { name: toolName } = zodToolSchema;
+
+  return async (input: unknown) => {
+    try {
+      const result = await executeZodTool({ zodToolSchema, toolDefinition, client, userId })(input);
+      return result;
+    } catch (error) {
+      if (error instanceof Error && isAuthorizationRequiredError(error)) {
+        const response = await client.tools.authorize({
+          tool_name: toolName,
+          user_id: userId,
+        });
+
+        return {
+          authorization_required: true,
+          authorization_response: response,
+          url: response.url ?? '',
+          message: `This tool requires authorization. Please visit the following URL to authorize the tool: ${response.url}`,
+        };
+      }
+      throw error;
+    }
+  };
+}
+
+/**
+ * Converts a single tool to a full tool with execution capabilities
+ */
+export function createZodTool<TReturn = ExecuteToolResponse>(
+  props: CreateZodToolInput<TReturn>,
+): ZodTool<TReturn> {
+  const { tool, client, userId, executeFactory: providedExecuteFactory } = props;
   const schema = convertSingleToolToSchema(tool);
   const { name, description, parameters, output } = schema;
 
+  const factoryToUse =
+    providedExecuteFactory ??
+    (executeZodTool as unknown as (props: ToolExecuteFunctionFactoryInput) => ToolExecuteFunction<TReturn>);
+
   return {
     name,
     description,
     parameters,
     output,
-    execute: async (input: z.infer<typeof parameters>): Promise<ExecuteToolResponse> => {
-      const validationResult = parameters.safeParse(input);
-      if (!validationResult.success) {
-        throw new Error(`Invalid input: ${validationResult.error.message}`);
-      }
-
-      return client.tools.execute({
-        tool_name: name,
-        input: validationResult.data,
-        user_id: userId,
-      });
-    },
-    executeOrAuthorize: async (
-      input: z.infer<typeof parameters>,
-    ): Promise<ExecuteToolResponse | ToolAuthorizationResponse> => {
-      const validationResult = parameters.safeParse(input);
-      if (!validationResult.success) {
-        throw new Error(`Invalid input: ${validationResult.error.message}`);
-      }
-
-      try {
-        return await client.tools.execute({
-          tool_name: name,
-          input: validationResult.data,
-          user_id: userId,
-        });
-      } catch (error) {
-        if (error instanceof Error && isAuthorizationRequiredError(error)) {
-          const response = (await client.tools.authorize({
-            tool_name: name,
-            user_id: userId,
-          })) as { url: string };
-
-          return {
-            authorization_required: true,
-            authorization_response: response,
-            url: response.url,
-            message:
-              'This tool requires authorization. Please visit the following URL to authorize the tool: ' +
-              response.url,
-          };
-        }
-        throw error;
-      }
-    },
+    execute: factoryToUse({ toolDefinition: tool, zodToolSchema: schema, client, userId }),
   };
 }
 
 /**
- * Converts formatted tools to full tools with execution capabilities
- * @param tools - Array of formatted tools
- * @param client - Arcade client instance
- * @param userId - User ID to use for the tool execution
- * @returns Array of Zod-validated tools with execution methods
+ * Converts Arcade tools to zod tools with execution capabilities
  */
-export function toZod({
+export function toZod<TReturn = ExecuteToolResponse>({
   tools,
   client,
   userId,
-}: {
-  tools: ToolDefinition[];
-  client: ArcadeClient;
-  userId: string;
-}): ZodTool[] {
-  return tools.map((tool) => createZodTool({ tool, client, userId }));
+  executeFactory: providedExecuteFactory,
+}: CreateMultipleZodToolsInput<TReturn>): ZodTool<TReturn>[] {
+  const factoryToUse =
+    providedExecuteFactory ??
+    (executeZodTool as unknown as (props: ToolExecuteFunctionFactoryInput) => ToolExecuteFunction<TReturn>);
+  return tools.map((tool) => createZodTool<TReturn>({ tool, client, userId, executeFactory: factoryToUse }));
+}
+
+/**
+ * Creates a record of Zod-validated tools with configurable execute functions
+ */
+export function toZodToolSet<TReturn = ExecuteToolResponse>({
+  tools,
+  client,
+  userId,
+  executeFactory: providedExecuteFactory,
+}: CreateMultipleZodToolsInput<TReturn>): Record<string, ZodTool<TReturn>> {
+  const factoryToUse =
+    providedExecuteFactory ??
+    (executeZodTool as unknown as (props: ToolExecuteFunctionFactoryInput) => ToolExecuteFunction<TReturn>);
+  return Object.fromEntries(
+    tools.map((tool) => {
+      const zodTool = createZodTool<TReturn>({ tool, client, userId, executeFactory: factoryToUse });
+      return [zodTool.name, zodTool];
+    }),
+  );
 }

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = '1.4.2'; // x-release-please-version
+export const VERSION = '1.5.0'; // x-release-please-version

package/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "1.4.2";
+export declare const VERSION = "1.5.0";
 //# sourceMappingURL=version.d.ts.map

package/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = '1.4.2'; // x-release-please-version
+exports.VERSION = '1.5.0'; // x-release-please-version
 //# sourceMappingURL=version.js.map

package/version.mjs

@@ -1,2 +1,2 @@
-export const VERSION = '1.4.2'; // x-release-please-version
+export const VERSION = '1.5.0'; // x-release-please-version
 //# sourceMappingURL=version.mjs.map