better-convex 0.3.1 → 0.4.0

package/dist/auth/index.d.ts

@@ -1,7 +1,7 @@
-import * as better_auth_adapters1 from "better-auth/adapters";
+import * as better_auth_adapters0 from "better-auth/adapters";
 import { DBAdapterDebugLogOption } from "better-auth/adapters";
 import { BetterAuthDBSchema } from "better-auth/db";
-import * as convex_server24 from "convex/server";
+import * as convex_server0 from "convex/server";
 import { DocumentByName, FunctionReference, GenericDataModel, GenericMutationCtx, GenericQueryCtx, GenericSchema, IdField, PaginationOptions, PaginationResult, SchemaDefinition, SystemFields, TableNamesInDataModel, internalMutationGeneric } from "convex/server";
 import * as convex_values0 from "convex/values";
 import { Infer } from "convex/values";
@@ -45,31 +45,31 @@ declare const createClient: <DataModel extends GenericDataModel, Schema$1 extend
 }) => {
   authFunctions: AuthFunctions;
   triggers: Triggers<DataModel, Schema$1> | undefined;
-  adapter: (ctx: GenericCtx<DataModel>, createAuthOptions: (ctx: any) => BetterAuthOptions) => better_auth_adapters1.AdapterFactory;
-  httpAdapter: (ctx: GenericCtx<DataModel>) => better_auth_adapters1.AdapterFactory;
+  adapter: (ctx: GenericCtx<DataModel>, createAuthOptions: (ctx: any) => BetterAuthOptions) => better_auth_adapters0.AdapterFactory;
+  httpAdapter: (ctx: GenericCtx<DataModel>) => better_auth_adapters0.AdapterFactory;
   triggersApi: () => {
-    beforeCreate: convex_server24.RegisteredMutation<"internal", {
-      data: any;
+    beforeCreate: convex_server0.RegisteredMutation<"internal", {
       model: string;
+      data: any;
     }, Promise<any>>;
-    beforeDelete: convex_server24.RegisteredMutation<"internal", {
+    beforeDelete: convex_server0.RegisteredMutation<"internal", {
       model: string;
       doc: any;
     }, Promise<any>>;
-    beforeUpdate: convex_server24.RegisteredMutation<"internal", {
-      update: any;
+    beforeUpdate: convex_server0.RegisteredMutation<"internal", {
       model: string;
+      update: any;
       doc: any;
     }, Promise<any>>;
-    onCreate: convex_server24.RegisteredMutation<"internal", {
+    onCreate: convex_server0.RegisteredMutation<"internal", {
       model: string;
       doc: any;
     }, Promise<void>>;
-    onDelete: convex_server24.RegisteredMutation<"internal", {
+    onDelete: convex_server0.RegisteredMutation<"internal", {
       model: string;
       doc: any;
     }, Promise<void>>;
-    onUpdate: convex_server24.RegisteredMutation<"internal", {
+    onUpdate: convex_server0.RegisteredMutation<"internal", {
       model: string;
       newDoc: any;
       oldDoc: any;
@@ -149,7 +149,7 @@ declare const httpAdapter: <DataModel extends GenericDataModel, Schema$1 extends
   authFunctions: AuthFunctions;
   debugLogs?: DBAdapterDebugLogOption;
   triggers?: Triggers<DataModel, Schema$1>;
-}) => better_auth_adapters1.AdapterFactory;
+}) => better_auth_adapters0.AdapterFactory;
 declare const dbAdapter: <DataModel extends GenericDataModel, Schema$1 extends SchemaDefinition<any, any>>(ctx: GenericCtx<DataModel>, createAuthOptions: (ctx: any) => BetterAuthOptions, {
   authFunctions,
   debugLogs,
@@ -160,34 +160,34 @@ declare const dbAdapter: <DataModel extends GenericDataModel, Schema$1 extends S
   schema: Schema$1;
   debugLogs?: DBAdapterDebugLogOption;
   triggers?: Triggers<DataModel, Schema$1>;
-}) => better_auth_adapters1.AdapterFactory;
+}) => better_auth_adapters0.AdapterFactory;
 //#endregion
 //#region src/auth/adapter-utils.d.ts
 declare const adapterWhereValidator: convex_values0.VObject<{
-  operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
   connector?: "AND" | "OR" | undefined;
-  value: string | number | boolean | string[] | number[] | null;
+  operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
   field: string;
+  value: string | number | boolean | string[] | number[] | null;
 }, {
   connector: convex_values0.VUnion<"AND" | "OR" | undefined, [convex_values0.VLiteral<"AND", "required">, convex_values0.VLiteral<"OR", "required">], "optional", never>;
   field: convex_values0.VString<string, "required">;
-  operator: convex_values0.VUnion<"eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
+  operator: convex_values0.VUnion<"lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
   value: convex_values0.VUnion<string | number | boolean | string[] | number[] | null, [convex_values0.VString<string, "required">, convex_values0.VFloat64<number, "required">, convex_values0.VBoolean<boolean, "required">, convex_values0.VArray<string[], convex_values0.VString<string, "required">, "required">, convex_values0.VArray<number[], convex_values0.VFloat64<number, "required">, "required">, convex_values0.VNull<null, "required">], "required", never>;
-}, "required", "operator" | "value" | "field" | "connector">;
+}, "required", "connector" | "field" | "operator" | "value">;
 declare const adapterArgsValidator: convex_values0.VObject<{
   limit?: number | undefined;
-  where?: {
-    operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
-    connector?: "AND" | "OR" | undefined;
-    value: string | number | boolean | string[] | number[] | null;
-    field: string;
-  }[] | undefined;
-  select?: string[] | undefined;
   offset?: number | undefined;
+  select?: string[] | undefined;
   sortBy?: {
     field: string;
     direction: "asc" | "desc";
   } | undefined;
+  where?: {
+    connector?: "AND" | "OR" | undefined;
+    operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
+    field: string;
+    value: string | number | boolean | string[] | number[] | null;
+  }[] | undefined;
   model: string;
 }, {
   limit: convex_values0.VFloat64<number | undefined, "optional">;
@@ -202,22 +202,22 @@ declare const adapterArgsValidator: convex_values0.VObject<{
     field: convex_values0.VString<string, "required">;
   }, "optional", "field" | "direction">;
   where: convex_values0.VArray<{
-    operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
     connector?: "AND" | "OR" | undefined;
-    value: string | number | boolean | string[] | number[] | null;
+    operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
     field: string;
+    value: string | number | boolean | string[] | number[] | null;
   }[] | undefined, convex_values0.VObject<{
-    operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
     connector?: "AND" | "OR" | undefined;
-    value: string | number | boolean | string[] | number[] | null;
+    operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
     field: string;
+    value: string | number | boolean | string[] | number[] | null;
   }, {
     connector: convex_values0.VUnion<"AND" | "OR" | undefined, [convex_values0.VLiteral<"AND", "required">, convex_values0.VLiteral<"OR", "required">], "optional", never>;
     field: convex_values0.VString<string, "required">;
-    operator: convex_values0.VUnion<"eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
+    operator: convex_values0.VUnion<"lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
     value: convex_values0.VUnion<string | number | boolean | string[] | number[] | null, [convex_values0.VString<string, "required">, convex_values0.VFloat64<number, "required">, convex_values0.VBoolean<boolean, "required">, convex_values0.VArray<string[], convex_values0.VString<string, "required">, "required">, convex_values0.VArray<number[], convex_values0.VFloat64<number, "required">, "required">, convex_values0.VNull<null, "required">], "required", never>;
-  }, "required", "operator" | "value" | "field" | "connector">, "optional">;
-}, "required", "limit" | "where" | "model" | "select" | "offset" | "sortBy" | "sortBy.field" | "sortBy.direction">;
+  }, "required", "connector" | "field" | "operator" | "value">, "optional">;
+}, "required", "limit" | "model" | "offset" | "select" | "sortBy" | "where" | "sortBy.field" | "sortBy.direction">;
 declare const hasUniqueFields: (betterAuthSchema: BetterAuthDBSchema, model: string, input: Record<string, any>) => boolean;
 declare const checkUniqueFields: <Schema$1 extends SchemaDefinition<any, any>>(ctx: GenericQueryCtx<GenericDataModel>, schema: Schema$1, betterAuthSchema: BetterAuthDBSchema, table: string, input: Record<string, any>, doc?: Record<string, any>) => Promise<void>;
 declare const selectFields: <T extends TableNamesInDataModel<GenericDataModel>, D extends DocumentByName<GenericDataModel, T>>(doc: D | null, select?: string[]) => Promise<D | null>;
@@ -245,7 +245,7 @@ declare const findOneHandler: (ctx: any, args: {
   model: string;
   select?: string[];
   where?: any[];
-}, schema: Schema, betterAuthSchema: any) => Promise<convex_server24.GenericDocument | null>;
+}, schema: Schema, betterAuthSchema: any) => Promise<convex_server0.GenericDocument | null>;
 declare const findManyHandler: (ctx: any, args: {
   model: string;
   paginationOpts: any;
@@ -256,7 +256,7 @@ declare const findManyHandler: (ctx: any, args: {
     field: string;
   };
   where?: any[];
-}, schema: Schema, betterAuthSchema: any) => Promise<convex_server24.PaginationResult<convex_server24.GenericDocument>>;
+}, schema: Schema, betterAuthSchema: any) => Promise<convex_server0.PaginationResult<convex_server0.GenericDocument>>;
 declare const updateOneHandler: (ctx: any, args: {
   input: {
     model: string;
@@ -279,8 +279,8 @@ declare const updateManyHandler: (ctx: any, args: {
   count: number;
   ids: any[];
   isDone: boolean;
-  continueCursor: convex_server24.Cursor;
-  splitCursor?: convex_server24.Cursor | null;
+  continueCursor: convex_server0.Cursor;
+  splitCursor?: convex_server0.Cursor | null;
   pageStatus?: "SplitRecommended" | "SplitRequired" | null;
 }>;
 declare const deleteOneHandler: (ctx: any, args: {
@@ -291,7 +291,7 @@ declare const deleteOneHandler: (ctx: any, args: {
   beforeDeleteHandle?: string;
   skipBeforeHooks?: boolean;
   onDeleteHandle?: string;
-}, schema: Schema, betterAuthSchema: any) => Promise<convex_server24.GenericDocument | undefined>;
+}, schema: Schema, betterAuthSchema: any) => Promise<convex_server0.GenericDocument | undefined>;
 declare const deleteManyHandler: (ctx: any, args: {
   input: {
     model: string;
@@ -305,8 +305,8 @@ declare const deleteManyHandler: (ctx: any, args: {
   count: number;
   ids: any[];
   isDone: boolean;
-  continueCursor: convex_server24.Cursor;
-  splitCursor?: convex_server24.Cursor | null;
+  continueCursor: convex_server0.Cursor;
+  splitCursor?: convex_server0.Cursor | null;
   pageStatus?: "SplitRecommended" | "SplitRequired" | null;
 }>;
 declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: Schema$1, createAuth: CreateAuth, options?: {
@@ -314,23 +314,23 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
   /** Skip input validation for smaller generated types. Since these are internal functions, validation is optional. */
   skipValidation?: boolean;
 }) => {
-  create: convex_server24.RegisteredMutation<"internal", {
+  create: convex_server0.RegisteredMutation<"internal", {
     select?: string[] | undefined;
     beforeCreateHandle?: string | undefined;
     onCreateHandle?: string | undefined;
     input: {
-      data: any;
       model: string;
+      data: any;
     } | {
+      model: string;
       data: {
         [x: string]: unknown;
         [x: number]: unknown;
         [x: symbol]: unknown;
       };
-      model: string;
     };
   }, Promise<any>>;
-  deleteMany: convex_server24.RegisteredMutation<"internal", {
+  deleteMany: convex_server0.RegisteredMutation<"internal", {
     beforeDeleteHandle?: string | undefined;
     onDeleteHandle?: string | undefined;
     paginationOpts: {
@@ -346,10 +346,10 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       model: string;
     } | {
       where?: {
-        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
-        value: string | number | boolean | string[] | number[] | null;
+        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         field: string;
+        value: string | number | boolean | string[] | number[] | null;
       }[] | undefined;
       model: string;
     };
@@ -357,11 +357,11 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
     count: number;
     ids: any[];
     isDone: boolean;
-    continueCursor: convex_server24.Cursor;
-    splitCursor?: convex_server24.Cursor | null;
+    continueCursor: convex_server0.Cursor;
+    splitCursor?: convex_server0.Cursor | null;
     pageStatus?: "SplitRecommended" | "SplitRequired" | null;
   }>>;
-  deleteOne: convex_server24.RegisteredMutation<"internal", {
+  deleteOne: convex_server0.RegisteredMutation<"internal", {
     beforeDeleteHandle?: string | undefined;
     onDeleteHandle?: string | undefined;
     input: {
@@ -369,28 +369,29 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       model: string;
     } | {
       where?: {
-        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
-        value: string | number | boolean | string[] | number[] | null;
+        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         field: string;
+        value: string | number | boolean | string[] | number[] | null;
       }[] | undefined;
       model: string;
     };
-  }, Promise<convex_server24.GenericDocument | undefined>>;
-  findMany: convex_server24.RegisteredQuery<"internal", {
-    limit?: number | undefined;
+  }, Promise<convex_server0.GenericDocument | undefined>>;
+  findMany: convex_server0.RegisteredQuery<"internal", {
     join?: any;
-    where?: {
-      operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
-      connector?: "AND" | "OR" | undefined;
-      value: string | number | boolean | string[] | number[] | null;
-      field: string;
-    }[] | undefined;
+    limit?: number | undefined;
     offset?: number | undefined;
     sortBy?: {
       field: string;
       direction: "asc" | "desc";
     } | undefined;
+    where?: {
+      connector?: "AND" | "OR" | undefined;
+      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
+      field: string;
+      value: string | number | boolean | string[] | number[] | null;
+    }[] | undefined;
+    model: string;
     paginationOpts: {
       id?: number;
       endCursor?: string | null;
@@ -399,20 +400,19 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
       numItems: number;
       cursor: string | null;
     };
-    model: string;
-  }, Promise<convex_server24.PaginationResult<convex_server24.GenericDocument>>>;
-  findOne: convex_server24.RegisteredQuery<"internal", {
+  }, Promise<convex_server0.PaginationResult<convex_server0.GenericDocument>>>;
+  findOne: convex_server0.RegisteredQuery<"internal", {
     join?: any;
+    select?: string[] | undefined;
     where?: {
-      operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
       connector?: "AND" | "OR" | undefined;
-      value: string | number | boolean | string[] | number[] | null;
+      operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
       field: string;
+      value: string | number | boolean | string[] | number[] | null;
     }[] | undefined;
-    select?: string[] | undefined;
     model: string;
-  }, Promise<convex_server24.GenericDocument | null>>;
-  updateMany: convex_server24.RegisteredMutation<"internal", {
+  }, Promise<convex_server0.GenericDocument | null>>;
+  updateMany: convex_server0.RegisteredMutation<"internal", {
     beforeUpdateHandle?: string | undefined;
     onUpdateHandle?: string | undefined;
     paginationOpts: {
@@ -425,54 +425,54 @@ declare const createApi: <Schema$1 extends SchemaDefinition<any, any>>(schema: S
     };
     input: {
       where?: any[] | undefined;
-      update: any;
       model: string;
+      update: any;
     } | {
       where?: {
-        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
-        value: string | number | boolean | string[] | number[] | null;
+        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         field: string;
+        value: string | number | boolean | string[] | number[] | null;
       }[] | undefined;
+      model: string;
       update: {
         [x: string]: unknown;
         [x: number]: unknown;
         [x: symbol]: unknown;
       };
-      model: string;
     };
   }, Promise<{
     count: number;
     ids: any[];
     isDone: boolean;
-    continueCursor: convex_server24.Cursor;
-    splitCursor?: convex_server24.Cursor | null;
+    continueCursor: convex_server0.Cursor;
+    splitCursor?: convex_server0.Cursor | null;
     pageStatus?: "SplitRecommended" | "SplitRequired" | null;
   }>>;
-  updateOne: convex_server24.RegisteredMutation<"internal", {
+  updateOne: convex_server0.RegisteredMutation<"internal", {
     beforeUpdateHandle?: string | undefined;
     onUpdateHandle?: string | undefined;
     input: {
       where?: any[] | undefined;
-      update: any;
       model: string;
+      update: any;
     } | {
       where?: {
-        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined;
         connector?: "AND" | "OR" | undefined;
-        value: string | number | boolean | string[] | number[] | null;
+        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
         field: string;
+        value: string | number | boolean | string[] | number[] | null;
       }[] | undefined;
+      model: string;
       update: {
         [x: string]: unknown;
         [x: number]: unknown;
         [x: symbol]: unknown;
       };
-      model: string;
     };
   }, Promise<any>>;
-  getLatestJwks: convex_server24.RegisteredAction<"internal", {}, Promise<any>>;
-  rotateKeys: convex_server24.RegisteredAction<"internal", {}, Promise<any>>;
+  getLatestJwks: convex_server0.RegisteredAction<"internal", {}, Promise<any>>;
+  rotateKeys: convex_server0.RegisteredAction<"internal", {}, Promise<any>>;
 };
 //#endregion
 //#region src/auth/helpers.d.ts

package/dist/auth-nextjs/index.d.ts

@@ -1,4 +1,4 @@
-import "../http-types-CZo9Xx5R.js";
+import "../http-types-B3tM9Old.js";
 import { CallerMeta, ConvexContext, LazyCaller } from "../server/index.js";
 import { GetTokenOptions } from "@convex-dev/better-auth/utils";
 

package/dist/crpc/index.d.ts

@@ -1,5 +1,5 @@
-import { a as HttpProcedureCall, c as InferHttpInput, i as HttpErrorCode, l as InferHttpOutput, n as HttpClientError, o as HttpRouteInfo, r as HttpClientFromRouter, s as HttpRouteMap, t as HttpClient, u as isHttpClientError } from "../http-types-CZo9Xx5R.js";
-import { C as PaginatedFnMeta, S as Meta, _ as ExtractPaginatedItem, a as ConvexInfiniteQueryMeta, b as InfiniteQueryInput, c as ConvexMutationKey, d as ConvexQueryMeta, f as ConvexQueryOptions, g as DecorateQuery, h as DecorateMutation, i as ConvexActionOptions, l as ConvexQueryHookOptions, m as DecorateInfiniteQuery, n as CRPCClient, o as ConvexInfiniteQueryOptions, p as DecorateAction, r as ConvexActionKey, s as ConvexInfiniteQueryOptionsWithRef, t as AuthType, u as ConvexQueryKey, v as FUNC_REF_SYMBOL, w as PaginationOpts, x as InfiniteQueryOptsParam, y as FnMeta } from "../types-U9pc_wi1.js";
+import { a as HttpProcedureCall, c as InferHttpInput, i as HttpErrorCode, l as InferHttpOutput, n as HttpClientError, o as HttpRouteInfo, r as HttpClientFromRouter, s as HttpRouteMap, t as HttpClient, u as isHttpClientError } from "../http-types-B3tM9Old.js";
+import { C as PaginatedFnMeta, S as Meta, _ as ExtractPaginatedItem, a as ConvexInfiniteQueryMeta, b as InfiniteQueryInput, c as ConvexMutationKey, d as ConvexQueryMeta, f as ConvexQueryOptions, g as DecorateQuery, h as DecorateMutation, i as ConvexActionOptions, l as ConvexQueryHookOptions, m as DecorateInfiniteQuery, n as CRPCClient, o as ConvexInfiniteQueryOptions, p as DecorateAction, r as ConvexActionKey, s as ConvexInfiniteQueryOptionsWithRef, t as AuthType, u as ConvexQueryKey, v as FUNC_REF_SYMBOL, w as PaginationOpts, x as InfiniteQueryOptsParam, y as FnMeta } from "../types-2L5nploW.js";
 import { FunctionArgs, FunctionReference } from "convex/server";
 
 //#region src/crpc/error.d.ts

package/dist/{http-types-CZo9Xx5R.d.ts → http-types-B3tM9Old.d.ts}

@@ -91,13 +91,14 @@ type InferHttpInput$1<T> = T extends UnsetMarker ? undefined : T extends z.ZodTy
  * Internal definition for HttpProcedureBuilder
  * Stores schema types directly (like QueryProcedureBuilder)
  */
-interface HttpProcedureBuilderDef<TCtx, TInput$1 extends UnsetMarker | z.ZodTypeAny, TOutput$1 extends UnsetMarker | z.ZodTypeAny, TParams$1 extends UnsetMarker | z.ZodTypeAny, TQuery$1 extends UnsetMarker | z.ZodTypeAny, TMeta extends ProcedureMeta, TMethod extends HttpMethod = HttpMethod> {
+interface HttpProcedureBuilderDef<TCtx, TInput$1 extends UnsetMarker | z.ZodTypeAny, TOutput$1 extends UnsetMarker | z.ZodTypeAny, TParams$1 extends UnsetMarker | z.ZodTypeAny, TQuery$1 extends UnsetMarker | z.ZodTypeAny, TMeta extends ProcedureMeta, TMethod extends HttpMethod = HttpMethod, TForm extends UnsetMarker | z.ZodTypeAny = UnsetMarker> {
   middlewares: AnyMiddleware[];
   meta: TMeta;
   inputSchema?: z.ZodTypeAny;
   outputSchema?: z.ZodTypeAny;
   paramsSchema?: z.ZodTypeAny;
   querySchema?: z.ZodTypeAny;
+  formSchema?: z.ZodTypeAny;
   route?: HttpRouteDefinition<TMethod>;
   functionConfig: {
     base: HttpActionConstructor;
@@ -109,13 +110,14 @@ interface HttpProcedureBuilderDef<TCtx, TInput$1 extends UnsetMarker | z.ZodType
     output: TOutput$1;
     params: TParams$1;
     query: TQuery$1;
+    form: TForm;
   };
 }
 type HttpActionConstructor = (handler: (ctx: GenericActionCtx<GenericDataModel>, request: Request) => Promise<Response>) => HttpActionHandler;
 interface HttpActionHandler {
   isHttp: true;
 }
-interface HttpProcedure<TInput$1 extends UnsetMarker | z.ZodTypeAny = any, TOutput$1 extends UnsetMarker | z.ZodTypeAny = any, TParams$1 extends UnsetMarker | z.ZodTypeAny = any, TQuery$1 extends UnsetMarker | z.ZodTypeAny = any, TMethod extends HttpMethod = HttpMethod> extends HttpActionHandler {
+interface HttpProcedure<TInput$1 extends UnsetMarker | z.ZodTypeAny = any, TOutput$1 extends UnsetMarker | z.ZodTypeAny = any, TParams$1 extends UnsetMarker | z.ZodTypeAny = any, TQuery$1 extends UnsetMarker | z.ZodTypeAny = any, TMethod extends HttpMethod = HttpMethod, TForm extends UnsetMarker | z.ZodTypeAny = any> extends HttpActionHandler {
   _crpcHttpRoute: HttpRouteDefinition<TMethod>;
   /** @internal Expose def for client-side type inference */
   _def: {
@@ -123,6 +125,7 @@ interface HttpProcedure<TInput$1 extends UnsetMarker | z.ZodTypeAny = any, TOutp
     outputSchema?: TOutput$1;
     paramsSchema?: TParams$1;
     querySchema?: TQuery$1;
+    formSchema?: TForm;
   };
 }
 /**
@@ -130,18 +133,21 @@ interface HttpProcedure<TInput$1 extends UnsetMarker | z.ZodTypeAny = any, TOutp
  * - ctx: context properties (userId, db, runQuery, etc.)
  * - input: parsed JSON body
  * - params: parsed path params
- * - query: parsed query params
+ * - searchParams: parsed query params
+ * - form: parsed form data
  * - c: Hono Context for Response helpers (c.json, c.text, c.redirect, c.header, c.req)
  */
-type HttpHandlerOpts<TCtx, TInput$1 extends UnsetMarker | z.ZodTypeAny, TParams$1 extends UnsetMarker | z.ZodTypeAny, TQuery$1 extends UnsetMarker | z.ZodTypeAny> = {
+type HttpHandlerOpts<TCtx, TInput$1 extends UnsetMarker | z.ZodTypeAny, TParams$1 extends UnsetMarker | z.ZodTypeAny, TSearchParams extends UnsetMarker | z.ZodTypeAny, TForm extends UnsetMarker | z.ZodTypeAny> = {
   ctx: TCtx;
   c: Context;
 } & (TInput$1 extends UnsetMarker ? object : {
   input: z.output<TInput$1>;
 }) & (TParams$1 extends UnsetMarker ? object : {
   params: z.output<TParams$1>;
-}) & (TQuery$1 extends UnsetMarker ? object : {
-  query: z.output<TQuery$1>;
+}) & (TSearchParams extends UnsetMarker ? object : {
+  searchParams: z.output<TSearchParams>;
+}) & (TForm extends UnsetMarker ? object : {
+  form: z.output<TForm>;
 });
 /**
  * Hono handler with cRPC route metadata attached

package/dist/react/index.d.ts

@@ -386,7 +386,7 @@ interface HttpRouteDefinition<TMethod extends HttpMethod = HttpMethod> {
 interface HttpActionHandler {
   isHttp: true;
 }
-interface HttpProcedure<TInput$1 extends UnsetMarker | z.ZodTypeAny = any, TOutput$1 extends UnsetMarker | z.ZodTypeAny = any, TParams$1 extends UnsetMarker | z.ZodTypeAny = any, TQuery$1 extends UnsetMarker | z.ZodTypeAny = any, TMethod extends HttpMethod = HttpMethod> extends HttpActionHandler {
+interface HttpProcedure<TInput$1 extends UnsetMarker | z.ZodTypeAny = any, TOutput$1 extends UnsetMarker | z.ZodTypeAny = any, TParams$1 extends UnsetMarker | z.ZodTypeAny = any, TQuery$1 extends UnsetMarker | z.ZodTypeAny = any, TMethod extends HttpMethod = HttpMethod, TForm$1 extends UnsetMarker | z.ZodTypeAny = any> extends HttpActionHandler {
   _crpcHttpRoute: HttpRouteDefinition<TMethod>;
   /** @internal Expose def for client-side type inference */
   _def: {
@@ -394,6 +394,7 @@ interface HttpProcedure<TInput$1 extends UnsetMarker | z.ZodTypeAny = any, TOutp
     outputSchema?: TOutput$1;
     paramsSchema?: TParams$1;
     querySchema?: TQuery$1;
+    formSchema?: TForm$1;
   };
 }
 //#endregion
@@ -626,10 +627,81 @@ type HttpRouteInfo = {
   method: string;
 };
 type HttpRouteMap = Record<string, HttpRouteInfo>;
+/** Form value types (matches Hono's FormValue) */
+type HttpFormValue = string | Blob;
+/**
+ * Hybrid input args: JSON body fields at root, explicit params/searchParams/form.
+ * - JSON body: spread at root level (tRPC-style)
+ * - Path params: { params: { id: '123' } }
+ * - Query params: { searchParams: { limit: '10' } }
+ * - Form data: { form: { file: blob } } - typed via .form() builder
+ * - Client options: { headers, fetch, init } - for per-call customization
+ */
+type HttpInputArgs = {
+  /** Path parameters (e.g., :id in /users/:id) */
+  params?: Record<string, string>;
+  /** Query string parameters */
+  searchParams?: Record<string, string | string[]>;
+  /** Form data body (Content-Type: multipart/form-data) - typed via .form() builder */
+  form?: Record<string, HttpFormValue | HttpFormValue[]>;
+  /** Custom fetch function (per-call override) */
+  fetch?: typeof fetch;
+  /** Standard RequestInit (per-call override) */
+  init?: RequestInit;
+  /** Additional headers (per-call override) */
+  headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+  /** Any other properties are JSON body fields */
+  [key: string]: unknown;
+};
+/**
+ * Client request options (matches Hono's ClientRequestOptions).
+ * Standard RequestInit in `init` takes highest priority and can override
+ * things that are set automatically like body, method, headers.
+ */
+type HttpClientOptions = {
+  /** Custom fetch function */
+  fetch?: typeof fetch;
+  /**
+   * Standard RequestInit - takes highest priority.
+   * Can override body, method, headers if needed.
+   */
+  init?: RequestInit;
+  /** Additional headers (or async function returning headers) */
+  headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+};
 /** Infer schema type or return empty object if UnsetMarker */
 type InferSchemaOrEmpty<T> = T extends UnsetMarker ? object : T extends z.ZodTypeAny ? z.infer<T> : object;
-/** Infer merged input from HttpProcedure */
+/** Infer merged input from HttpProcedure (flat - used internally) */
 type InferHttpInput<T> = T extends HttpProcedure<infer TInput, infer _TOutput, infer TParams, infer TQuery> ? Simplify<InferSchemaOrEmpty<TParams> & InferSchemaOrEmpty<TQuery> & InferSchemaOrEmpty<TInput>> : object;
+/**
+ * Extract string keys from a Zod object schema.
+ * Used for param/query which are always strings in URLs.
+ */
+type ZodObjectKeys<T> = T extends z.ZodObject<infer Shape> ? { [K in keyof Shape]: string } : Record<string, string>;
+/**
+ * Extract string or string[] keys from a Zod object schema.
+ * Query params can have array values.
+ */
+type ZodQueryKeys<T> = T extends z.ZodObject<infer Shape> ? { [K in keyof Shape]?: string | string[] } : Record<string, string | string[]>;
+/**
+ * Infer client-side args from HttpProcedure with proper nesting.
+ * - params: only present if TParams is defined, always strings (URL path params)
+ * - searchParams: only present if TQuery is defined, always strings (URL query params)
+ * - form: only present if TForm is defined, typed from schema
+ * - JSON body fields spread at root level (typed from schema)
+ * - Client options (fetch, init, headers) always optional for per-call overrides
+ */
+type InferHttpClientArgs<T> = T extends HttpProcedure<infer TInput, infer _TOutput, infer TParams, infer TQuery, infer _TMethod, infer TForm> ? Simplify<(TParams extends UnsetMarker ? object : {
+  params: ZodObjectKeys<TParams>;
+}) & (TQuery extends UnsetMarker ? object : {
+  searchParams: ZodQueryKeys<TQuery>;
+}) & (TForm extends UnsetMarker ? object : TForm extends z.ZodTypeAny ? {
+  form: z.infer<TForm>;
+} : object) & (TInput extends UnsetMarker ? object : TInput extends z.ZodTypeAny ? z.infer<TInput> : object) & {
+  fetch?: typeof fetch;
+  init?: RequestInit;
+  headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+}> : HttpInputArgs;
 /** Infer output type from HttpProcedure */
 type InferHttpOutput<T> = T extends HttpProcedure<infer _TInput, infer TOutput, infer _TParams, infer _TQuery> ? TOutput extends UnsetMarker ? unknown : TOutput extends z.ZodTypeAny ? z.infer<TOutput> : unknown : unknown;
 /** Query key with args (3-element) or prefix key without args (2-element) for invalidation */
@@ -637,25 +709,38 @@ type HttpQueryKey = readonly ['httpQuery', string, unknown] | readonly ['httpQue
 type HttpMutationKey = readonly ['httpMutation', string];
 type ReservedQueryOptions$1 = 'queryKey' | 'queryFn';
 type ReservedMutationOptions$1 = 'mutationFn';
-/** Variables type for mutations - void when no args required */
-type HttpMutationVariables<T extends HttpProcedure> = keyof InferHttpInput<T> extends never ? void : object extends InferHttpInput<T> ? InferHttpInput<T> | undefined : InferHttpInput<T>;
 /** Query options for GET HTTP endpoints - compatible with both useQuery and useSuspenseQuery */
 type HttpQueryOptsReturn<T extends HttpProcedure> = Omit<UseQueryOptions<InferHttpOutput<T>, Error, InferHttpOutput<T>, HttpQueryKey>, 'queryFn'> & {
   queryFn: () => Promise<InferHttpOutput<T>>;
 };
-/** Mutation options for POST/PUT/PATCH/DELETE HTTP endpoints */
-type HttpMutationOptsReturn<T extends HttpProcedure> = UseMutationOptions<InferHttpOutput<T>, DefaultError, HttpMutationVariables<T>>;
-/** Decorated GET procedure with queryOptions */
+/** Mutation options for POST/PUT/PATCH/DELETE HTTP endpoints - typed variables */
+type HttpMutationOptsReturn<T extends HttpProcedure> = UseMutationOptions<InferHttpOutput<T>, DefaultError, InferHttpClientArgs<T>>;
+/** Query options (TanStack Query only - client opts go in args) */
+type HttpQueryOptions<T extends HttpProcedure> = DistributiveOmit<HttpQueryOptsReturn<T>, ReservedQueryOptions$1>;
+/** Mutation options (TanStack Query only - client opts go in mutate args) */
+type HttpMutationOptions<T extends HttpProcedure> = DistributiveOmit<HttpMutationOptsReturn<T>, ReservedMutationOptions$1>;
+/**
+ * Decorated GET procedure with queryOptions and mutationOptions.
+ * - queryOptions: For cached data fetching (useQuery/useSuspenseQuery)
+ * - mutationOptions: For one-time actions like exports (useMutation)
+ */
 type DecorateHttpQuery<T extends HttpProcedure> = {
-  queryOptions: keyof InferHttpInput<T> extends never ? (args?: object, opts?: DistributiveOmit<HttpQueryOptsReturn<T>, ReservedQueryOptions$1>) => HttpQueryOptsReturn<T> : object extends InferHttpInput<T> ? (args?: InferHttpInput<T>, opts?: DistributiveOmit<HttpQueryOptsReturn<T>, ReservedQueryOptions$1>) => HttpQueryOptsReturn<T> : (args: InferHttpInput<T>, opts?: DistributiveOmit<HttpQueryOptsReturn<T>, ReservedQueryOptions$1>) => HttpQueryOptsReturn<T>;
+  queryOptions: keyof InferHttpInput<T> extends never ? (args?: InferHttpClientArgs<T>, opts?: HttpQueryOptions<T>) => HttpQueryOptsReturn<T> : object extends InferHttpInput<T> ? (args?: InferHttpClientArgs<T>, opts?: HttpQueryOptions<T>) => HttpQueryOptsReturn<T> : (args: InferHttpClientArgs<T>, opts?: HttpQueryOptions<T>) => HttpQueryOptsReturn<T>;
   /** Get query key for QueryClient methods (with args = exact match, without = prefix) */
-  queryKey: (args?: InferHttpInput<T>) => HttpQueryKey;
+  queryKey: (args?: InferHttpClientArgs<T>) => HttpQueryKey;
   /** Get query filter for QueryClient methods (e.g., invalidateQueries) */
-  queryFilter: (args?: InferHttpInput<T>, filters?: DistributiveOmit<QueryFilters, 'queryKey'>) => QueryFilters;
+  queryFilter: (args?: InferHttpClientArgs<T>, filters?: DistributiveOmit<QueryFilters, 'queryKey'>) => QueryFilters;
+  /** Mutation options for GET endpoints (exports, downloads - no caching) */
+  mutationOptions: (opts?: HttpMutationOptions<T>) => HttpMutationOptsReturn<T>;
+  /** Get mutation key for QueryClient methods */
+  mutationKey: () => HttpMutationKey;
 };
-/** Decorated POST/PUT/PATCH/DELETE procedure with mutationOptions */
+/**
+ * Decorated POST/PUT/PATCH/DELETE procedure with mutationOptions.
+ * The mutationFn receives typed args inferred from server schemas.
+ */
 type DecorateHttpMutation<T extends HttpProcedure> = {
-  mutationOptions: (opts?: DistributiveOmit<HttpMutationOptsReturn<T>, ReservedMutationOptions$1>) => HttpMutationOptsReturn<T>;
+  mutationOptions: (opts?: HttpMutationOptions<T>) => HttpMutationOptsReturn<T>;
   /** Get mutation key for QueryClient methods */
   mutationKey: () => HttpMutationKey;
 };
@@ -664,7 +749,7 @@ type DecorateHttpMutation<T extends HttpProcedure> = {
  * Maps each procedure to queryOptions (GET) or mutationOptions (POST/etc).
  * Uses infer to extract the method type literal for proper GET/non-GET distinction.
  */
-type HttpCRPCClient<T extends HttpRouterRecord> = { [K in keyof T]: T[K] extends HttpProcedure<infer _TInput, infer _TOutput, infer _TParams, infer _TQuery, infer TMethod> ? TMethod extends 'GET' ? DecorateHttpQuery<T[K]> : DecorateHttpMutation<T[K]> : T[K] extends CRPCHttpRouter<infer R> ? HttpCRPCClient<R> : T[K] extends HttpRouterRecord ? HttpCRPCClient<T[K]> : never };
+type HttpCRPCClient<T extends HttpRouterRecord> = { [K in keyof T]: T[K] extends HttpProcedure<infer _TInput, infer _TOutput, infer _TParams, infer _TQuery, infer TMethod, infer _TForm> ? TMethod extends 'GET' ? DecorateHttpQuery<T[K]> : DecorateHttpMutation<T[K]> : T[K] extends CRPCHttpRouter<infer R> ? HttpCRPCClient<R> : T[K] extends HttpRouterRecord ? HttpCRPCClient<T[K]> : never };
 /**
  * HTTP Client type from a CRPCHttpRouter.
  * Use this when your type is the router object (with _def).
@@ -1057,4 +1142,4 @@ declare function useUploadMutationOptions<TGenerateUrlMutation extends FunctionR
   file: File;
 } & FunctionArgs<TGenerateUrlMutation>>;
 //#endregion
-export { AuthProvider, AuthStore, AuthStoreState, Authenticated, CRPCHttpOptions, ConvexProvider, ConvexQueryClient, ConvexQueryClientOptions, ConvexQueryClientSingletonOptions, ConvexReactClient, CreateCRPCContextOptions, FetchAccessTokenContext, FetchAccessTokenFn, HttpCRPCClient, HttpCRPCClientFromRouter, HttpMutationKey, HttpProxyOptions, HttpQueryKey, HttpRouteInfo, HttpRouteMap, MaybeAuthenticated, MaybeUnauthenticated, PaginationState, PaginationStatus, Unauthenticated, UseInfiniteQueryResult, createAuthMutations, createCRPCContext, createCRPCOptionsProxy, createHttpProxy, decodeJwtExp, getConvexQueryClientSingleton, getQueryClientSingleton, useAuth, useAuthGuard, useAuthState, useAuthStore, useAuthValue, useConvexActionOptions, useConvexActionQueryOptions, useConvexInfiniteQueryOptions, useConvexMutationOptions, useConvexQueryClient, useConvexQueryOptions, useFetchAccessToken, useFnMeta, useInfiniteQuery, useIsAuth, useMaybeAuth, useMeta, useUploadMutationOptions };
+export { AuthProvider, AuthStore, AuthStoreState, Authenticated, CRPCHttpOptions, ConvexProvider, ConvexQueryClient, ConvexQueryClientOptions, ConvexQueryClientSingletonOptions, ConvexReactClient, CreateCRPCContextOptions, FetchAccessTokenContext, FetchAccessTokenFn, HttpCRPCClient, HttpCRPCClientFromRouter, HttpClientOptions, HttpFormValue, HttpInputArgs, HttpMutationKey, HttpProxyOptions, HttpQueryKey, HttpRouteInfo, HttpRouteMap, MaybeAuthenticated, MaybeUnauthenticated, PaginationState, PaginationStatus, Unauthenticated, UseInfiniteQueryResult, createAuthMutations, createCRPCContext, createCRPCOptionsProxy, createHttpProxy, decodeJwtExp, getConvexQueryClientSingleton, getQueryClientSingleton, useAuth, useAuthGuard, useAuthState, useAuthStore, useAuthValue, useConvexActionOptions, useConvexActionQueryOptions, useConvexInfiniteQueryOptions, useConvexMutationOptions, useConvexQueryClient, useConvexQueryOptions, useFetchAccessToken, useFnMeta, useInfiniteQuery, useIsAuth, useMaybeAuth, useMeta, useUploadMutationOptions };

package/dist/react/index.js

@@ -26,46 +26,86 @@ var HttpClientError = class extends Error {
 
 //#endregion
 //#region src/react/http-proxy.ts
+/** Reserved keys that are not part of JSON body */
+const RESERVED_KEYS = new Set([
+	"params",
+	"searchParams",
+	"form",
+	"fetch",
+	"init",
+	"headers"
+]);
 /**
-* Extract path parameter names from a route path
-* e.g., '/users/:id/posts/:postId' -> ['id', 'postId']
+* Replace URL path parameters with actual values.
+* e.g., '/users/:id' with { id: '123' } -> '/users/123'
 */
-function extractPathParamNames(path) {
-	const matches = path.match(/:([a-zA-Z_][a-zA-Z0-9_]*)/g);
-	return matches ? matches.map((m) => m.slice(1)) : [];
+function replaceUrlParam(url, params) {
+	return url.replace(/:(\w+)/g, (_, key) => {
+		const value = params[key];
+		return value !== void 0 ? encodeURIComponent(value) : `:${key}`;
+	});
 }
 /**
-* Execute an HTTP request to a cRPC endpoint
+* Build URLSearchParams from query object.
+* Handles array values as multiple params with same key (like Hono).
+*/
+function buildSearchParams(query) {
+	const params = new URLSearchParams();
+	for (const [key, value] of Object.entries(query)) if (Array.isArray(value)) for (const v of value) params.append(key, v);
+	else if (value !== void 0 && value !== null) params.append(key, value);
+	return params;
+}
+/**
+* Hono-style HTTP request executor.
+* Processes args in the same way as Hono's ClientRequestImpl.fetch().
 */
 async function executeHttpRequest(opts) {
 	const { method, path } = opts.route;
-	const input = opts.input;
-	const pathParamNames = extractPathParamNames(path);
-	let url = opts.convexSiteUrl + path.replace(/:(\w+)/g, (_, key) => {
-		const value = input?.[key];
-		return value !== null && value !== void 0 ? encodeURIComponent(String(value)) : "";
-	});
-	const headers = typeof opts.headers === "function" ? await opts.headers() : opts.headers;
-	let body;
-	if (method === "GET") {
-		const queryInput = input ? Object.fromEntries(Object.entries(input).filter(([k]) => !pathParamNames.includes(k))) : {};
-		if (Object.keys(queryInput).length > 0) {
-			const params = new URLSearchParams();
-			for (const [key, value] of Object.entries(queryInput)) if (value !== void 0 && value !== null) params.append(key, String(value));
-			const queryString = params.toString();
-			if (queryString) url += `?${queryString}`;
-		}
+	const args = opts.args ?? {};
+	let rBody;
+	let cType;
+	if (args.form) {
+		const form = new FormData();
+		for (const [k, v] of Object.entries(args.form)) if (Array.isArray(v)) for (const v2 of v) form.append(k, v2);
+		else form.append(k, v);
+		rBody = form;
 	} else {
-		const bodyInput = input ? Object.fromEntries(Object.entries(input).filter(([k]) => !pathParamNames.includes(k))) : {};
-		if (Object.keys(bodyInput).length > 0) body = JSON.stringify(bodyInput);
+		const jsonBody = {};
+		for (const [key, value] of Object.entries(args)) if (!RESERVED_KEYS.has(key) && value !== void 0) jsonBody[key] = value;
+		if (Object.keys(jsonBody).length > 0) {
+			rBody = JSON.stringify(jsonBody);
+			cType = "application/json";
+		}
+	}
+	const argsClientOpts = {};
+	if (args.fetch) argsClientOpts.fetch = args.fetch;
+	if (args.init) argsClientOpts.init = args.init;
+	if (args.headers) argsClientOpts.headers = args.headers;
+	const mergedClientOpts = {
+		...opts.clientOpts,
+		...argsClientOpts
+	};
+	const resolvedBaseHeaders = typeof opts.baseHeaders === "function" ? await opts.baseHeaders() : opts.baseHeaders;
+	const headerValues = { ...typeof mergedClientOpts.headers === "function" ? await mergedClientOpts.headers() : mergedClientOpts.headers };
+	if (cType) headerValues["Content-Type"] = cType;
+	const finalHeaders = {};
+	if (resolvedBaseHeaders) {
+		for (const [key, value] of Object.entries(resolvedBaseHeaders)) if (value !== void 0) finalHeaders[key] = value;
+	}
+	Object.assign(finalHeaders, headerValues);
+	let url = opts.convexSiteUrl + path;
+	if (args.params) url = opts.convexSiteUrl + replaceUrlParam(path, args.params);
+	if (args.searchParams) {
+		const queryString = buildSearchParams(args.searchParams).toString();
+		if (queryString) url = `${url}?${queryString}`;
 	}
-	const response = await (opts.fetch ?? globalThis.fetch)(url, {
-		method,
-		headers: {
-			"Content-Type": "application/json",
-			...headers
-		},
-		body
+	const methodUpperCase = method.toUpperCase();
+	const setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
+	const response = await (mergedClientOpts.fetch ?? opts.baseFetch ?? globalThis.fetch)(url, {
+		body: setBody ? rBody : void 0,
+		method: methodUpperCase,
+		headers: finalHeaders,
+		...mergedClientOpts.init
 	});
 	if (!response.ok) {
 		const errorData = await response.json().catch(() => ({ error: {
@@ -101,8 +141,8 @@ function createRecursiveHttpProxy(opts, path = []) {
 		if (prop === "queryOptions") {
 			if (!route) throw new Error(`Unknown HTTP procedure: ${routeKey}`);
 			if (route.method !== "GET") throw new Error(`queryOptions is only available for GET endpoints, got ${route.method} for ${routeKey}`);
-			return (args, userOpts) => ({
-				...userOpts,
+			return (args, queryOpts) => ({
+				...queryOpts,
 				queryKey: [
 					"httpQuery",
 					routeKey,
@@ -114,9 +154,9 @@ function createRecursiveHttpProxy(opts, path = []) {
 							convexSiteUrl: opts.convexSiteUrl,
 							route,
 							procedureName: routeKey,
-							input: args,
-							headers: opts.headers,
-							fetch: opts.fetch
+							args,
+							baseHeaders: opts.headers,
+							baseFetch: opts.fetch
 						});
 					} catch (error) {
 						if (opts.onError && error instanceof HttpClientError) opts.onError(error);
@@ -145,9 +185,8 @@ function createRecursiveHttpProxy(opts, path = []) {
 		};
 		if (prop === "mutationOptions") {
 			if (!route) throw new Error(`Unknown HTTP procedure: ${routeKey}`);
-			if (route.method === "GET") throw new Error(`mutationOptions is not available for GET endpoints, use queryOptions for ${routeKey}`);
-			return (userOpts) => ({
-				...userOpts,
+			return (mutationOpts) => ({
+				...mutationOpts,
 				mutationKey: ["httpMutation", routeKey],
 				mutationFn: async (args) => {
 					try {
@@ -155,9 +194,9 @@ function createRecursiveHttpProxy(opts, path = []) {
 							convexSiteUrl: opts.convexSiteUrl,
 							route,
 							procedureName: routeKey,
-							input: args,
-							headers: opts.headers,
-							fetch: opts.fetch
+							args,
+							baseHeaders: opts.headers,
+							baseFetch: opts.fetch
 						});
 					} catch (error) {
 						if (opts.onError && error instanceof HttpClientError) opts.onError(error);

package/dist/rsc/index.d.ts

@@ -1,14 +1,69 @@
-import { E as HttpProcedure, U as UnsetMarker, f as DistributiveOmit, g as HttpRouterRecord, m as CRPCHttpRouter, p as Simplify } from "../http-types-CZo9Xx5R.js";
-import { S as Meta, n as CRPCClient } from "../types-U9pc_wi1.js";
+import { E as HttpProcedure, U as UnsetMarker, f as DistributiveOmit, g as HttpRouterRecord, m as CRPCHttpRouter, p as Simplify } from "../http-types-B3tM9Old.js";
+import { S as Meta, n as CRPCClient } from "../types-2L5nploW.js";
 import { DefaultError, QueryFilters, UseMutationOptions, UseQueryOptions } from "@tanstack/react-query";
 import { z } from "zod";
 
 //#region src/react/http-proxy.d.ts
 
+/** Form value types (matches Hono's FormValue) */
+type HttpFormValue = string | Blob;
+/**
+ * Hybrid input args: JSON body fields at root, explicit params/searchParams/form.
+ * - JSON body: spread at root level (tRPC-style)
+ * - Path params: { params: { id: '123' } }
+ * - Query params: { searchParams: { limit: '10' } }
+ * - Form data: { form: { file: blob } } - typed via .form() builder
+ * - Client options: { headers, fetch, init } - for per-call customization
+ */
+type HttpInputArgs = {
+  /** Path parameters (e.g., :id in /users/:id) */
+  params?: Record<string, string>;
+  /** Query string parameters */
+  searchParams?: Record<string, string | string[]>;
+  /** Form data body (Content-Type: multipart/form-data) - typed via .form() builder */
+  form?: Record<string, HttpFormValue | HttpFormValue[]>;
+  /** Custom fetch function (per-call override) */
+  fetch?: typeof fetch;
+  /** Standard RequestInit (per-call override) */
+  init?: RequestInit;
+  /** Additional headers (per-call override) */
+  headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+  /** Any other properties are JSON body fields */
+  [key: string]: unknown;
+};
 /** Infer schema type or return empty object if UnsetMarker */
 type InferSchemaOrEmpty<T> = T extends UnsetMarker ? object : T extends z.ZodTypeAny ? z.infer<T> : object;
-/** Infer merged input from HttpProcedure */
+/** Infer merged input from HttpProcedure (flat - used internally) */
 type InferHttpInput<T> = T extends HttpProcedure<infer TInput, infer _TOutput, infer TParams, infer TQuery> ? Simplify<InferSchemaOrEmpty<TParams> & InferSchemaOrEmpty<TQuery> & InferSchemaOrEmpty<TInput>> : object;
+/**
+ * Extract string keys from a Zod object schema.
+ * Used for param/query which are always strings in URLs.
+ */
+type ZodObjectKeys<T> = T extends z.ZodObject<infer Shape> ? { [K in keyof Shape]: string } : Record<string, string>;
+/**
+ * Extract string or string[] keys from a Zod object schema.
+ * Query params can have array values.
+ */
+type ZodQueryKeys<T> = T extends z.ZodObject<infer Shape> ? { [K in keyof Shape]?: string | string[] } : Record<string, string | string[]>;
+/**
+ * Infer client-side args from HttpProcedure with proper nesting.
+ * - params: only present if TParams is defined, always strings (URL path params)
+ * - searchParams: only present if TQuery is defined, always strings (URL query params)
+ * - form: only present if TForm is defined, typed from schema
+ * - JSON body fields spread at root level (typed from schema)
+ * - Client options (fetch, init, headers) always optional for per-call overrides
+ */
+type InferHttpClientArgs<T> = T extends HttpProcedure<infer TInput, infer _TOutput, infer TParams, infer TQuery, infer _TMethod, infer TForm> ? Simplify<(TParams extends UnsetMarker ? object : {
+  params: ZodObjectKeys<TParams>;
+}) & (TQuery extends UnsetMarker ? object : {
+  searchParams: ZodQueryKeys<TQuery>;
+}) & (TForm extends UnsetMarker ? object : TForm extends z.ZodTypeAny ? {
+  form: z.infer<TForm>;
+} : object) & (TInput extends UnsetMarker ? object : TInput extends z.ZodTypeAny ? z.infer<TInput> : object) & {
+  fetch?: typeof fetch;
+  init?: RequestInit;
+  headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+}> : HttpInputArgs;
 /** Infer output type from HttpProcedure */
 type InferHttpOutput<T> = T extends HttpProcedure<infer _TInput, infer TOutput, infer _TParams, infer _TQuery> ? TOutput extends UnsetMarker ? unknown : TOutput extends z.ZodTypeAny ? z.infer<TOutput> : unknown : unknown;
 /** Query key with args (3-element) or prefix key without args (2-element) for invalidation */
@@ -16,25 +71,38 @@ type HttpQueryKey = readonly ['httpQuery', string, unknown] | readonly ['httpQue
 type HttpMutationKey = readonly ['httpMutation', string];
 type ReservedQueryOptions = 'queryKey' | 'queryFn';
 type ReservedMutationOptions = 'mutationFn';
-/** Variables type for mutations - void when no args required */
-type HttpMutationVariables<T extends HttpProcedure> = keyof InferHttpInput<T> extends never ? void : object extends InferHttpInput<T> ? InferHttpInput<T> | undefined : InferHttpInput<T>;
 /** Query options for GET HTTP endpoints - compatible with both useQuery and useSuspenseQuery */
 type HttpQueryOptsReturn<T extends HttpProcedure> = Omit<UseQueryOptions<InferHttpOutput<T>, Error, InferHttpOutput<T>, HttpQueryKey>, 'queryFn'> & {
   queryFn: () => Promise<InferHttpOutput<T>>;
 };
-/** Mutation options for POST/PUT/PATCH/DELETE HTTP endpoints */
-type HttpMutationOptsReturn<T extends HttpProcedure> = UseMutationOptions<InferHttpOutput<T>, DefaultError, HttpMutationVariables<T>>;
-/** Decorated GET procedure with queryOptions */
+/** Mutation options for POST/PUT/PATCH/DELETE HTTP endpoints - typed variables */
+type HttpMutationOptsReturn<T extends HttpProcedure> = UseMutationOptions<InferHttpOutput<T>, DefaultError, InferHttpClientArgs<T>>;
+/** Query options (TanStack Query only - client opts go in args) */
+type HttpQueryOptions<T extends HttpProcedure> = DistributiveOmit<HttpQueryOptsReturn<T>, ReservedQueryOptions>;
+/** Mutation options (TanStack Query only - client opts go in mutate args) */
+type HttpMutationOptions<T extends HttpProcedure> = DistributiveOmit<HttpMutationOptsReturn<T>, ReservedMutationOptions>;
+/**
+ * Decorated GET procedure with queryOptions and mutationOptions.
+ * - queryOptions: For cached data fetching (useQuery/useSuspenseQuery)
+ * - mutationOptions: For one-time actions like exports (useMutation)
+ */
 type DecorateHttpQuery<T extends HttpProcedure> = {
-  queryOptions: keyof InferHttpInput<T> extends never ? (args?: object, opts?: DistributiveOmit<HttpQueryOptsReturn<T>, ReservedQueryOptions>) => HttpQueryOptsReturn<T> : object extends InferHttpInput<T> ? (args?: InferHttpInput<T>, opts?: DistributiveOmit<HttpQueryOptsReturn<T>, ReservedQueryOptions>) => HttpQueryOptsReturn<T> : (args: InferHttpInput<T>, opts?: DistributiveOmit<HttpQueryOptsReturn<T>, ReservedQueryOptions>) => HttpQueryOptsReturn<T>;
+  queryOptions: keyof InferHttpInput<T> extends never ? (args?: InferHttpClientArgs<T>, opts?: HttpQueryOptions<T>) => HttpQueryOptsReturn<T> : object extends InferHttpInput<T> ? (args?: InferHttpClientArgs<T>, opts?: HttpQueryOptions<T>) => HttpQueryOptsReturn<T> : (args: InferHttpClientArgs<T>, opts?: HttpQueryOptions<T>) => HttpQueryOptsReturn<T>;
   /** Get query key for QueryClient methods (with args = exact match, without = prefix) */
-  queryKey: (args?: InferHttpInput<T>) => HttpQueryKey;
+  queryKey: (args?: InferHttpClientArgs<T>) => HttpQueryKey;
   /** Get query filter for QueryClient methods (e.g., invalidateQueries) */
-  queryFilter: (args?: InferHttpInput<T>, filters?: DistributiveOmit<QueryFilters, 'queryKey'>) => QueryFilters;
+  queryFilter: (args?: InferHttpClientArgs<T>, filters?: DistributiveOmit<QueryFilters, 'queryKey'>) => QueryFilters;
+  /** Mutation options for GET endpoints (exports, downloads - no caching) */
+  mutationOptions: (opts?: HttpMutationOptions<T>) => HttpMutationOptsReturn<T>;
+  /** Get mutation key for QueryClient methods */
+  mutationKey: () => HttpMutationKey;
 };
-/** Decorated POST/PUT/PATCH/DELETE procedure with mutationOptions */
+/**
+ * Decorated POST/PUT/PATCH/DELETE procedure with mutationOptions.
+ * The mutationFn receives typed args inferred from server schemas.
+ */
 type DecorateHttpMutation<T extends HttpProcedure> = {
-  mutationOptions: (opts?: DistributiveOmit<HttpMutationOptsReturn<T>, ReservedMutationOptions>) => HttpMutationOptsReturn<T>;
+  mutationOptions: (opts?: HttpMutationOptions<T>) => HttpMutationOptsReturn<T>;
   /** Get mutation key for QueryClient methods */
   mutationKey: () => HttpMutationKey;
 };
@@ -43,7 +111,7 @@ type DecorateHttpMutation<T extends HttpProcedure> = {
  * Maps each procedure to queryOptions (GET) or mutationOptions (POST/etc).
  * Uses infer to extract the method type literal for proper GET/non-GET distinction.
  */
-type HttpCRPCClient<T extends HttpRouterRecord> = { [K in keyof T]: T[K] extends HttpProcedure<infer _TInput, infer _TOutput, infer _TParams, infer _TQuery, infer TMethod> ? TMethod extends 'GET' ? DecorateHttpQuery<T[K]> : DecorateHttpMutation<T[K]> : T[K] extends CRPCHttpRouter<infer R> ? HttpCRPCClient<R> : T[K] extends HttpRouterRecord ? HttpCRPCClient<T[K]> : never };
+type HttpCRPCClient<T extends HttpRouterRecord> = { [K in keyof T]: T[K] extends HttpProcedure<infer _TInput, infer _TOutput, infer _TParams, infer _TQuery, infer TMethod, infer _TForm> ? TMethod extends 'GET' ? DecorateHttpQuery<T[K]> : DecorateHttpMutation<T[K]> : T[K] extends CRPCHttpRouter<infer R> ? HttpCRPCClient<R> : T[K] extends HttpRouterRecord ? HttpCRPCClient<T[K]> : never };
 /**
  * HTTP Client type from a CRPCHttpRouter.
  * Use this when your type is the router object (with _def).

package/dist/server/index.d.ts

@@ -1,4 +1,4 @@
-import { A as ProcedureMeta, B as Overwrite, C as HttpActionHandler, D as HttpProcedureBuilderDef, E as HttpProcedure, F as MiddlewareBuilder, H as Simplify, I as MiddlewareFunction, L as MiddlewareMarker, M as AnyMiddlewareBuilder, N as IntersectIfDefined, O as HttpRouteDefinition, P as MergeZodObjects, R as MiddlewareNext, S as HttpActionConstructor, T as HttpMethod, U as UnsetMarker, V as ResolveIfSet, _ as HttpRouterWithHono, b as extractRouteMap, c as InferHttpInput$1, g as HttpRouterRecord, h as HttpRouterDef, j as AnyMiddleware, k as InferHttpInput, l as InferHttpOutput, m as CRPCHttpRouter, v as createHttpRouter, w as HttpHandlerOpts, x as CRPCHonoHandler, y as createHttpRouterFactory, z as MiddlewareResult } from "../http-types-CZo9Xx5R.js";
+import { A as ProcedureMeta, B as Overwrite, C as HttpActionHandler, D as HttpProcedureBuilderDef, E as HttpProcedure, F as MiddlewareBuilder, H as Simplify, I as MiddlewareFunction, L as MiddlewareMarker, M as AnyMiddlewareBuilder, N as IntersectIfDefined, O as HttpRouteDefinition, P as MergeZodObjects, R as MiddlewareNext, S as HttpActionConstructor, T as HttpMethod, U as UnsetMarker, V as ResolveIfSet, _ as HttpRouterWithHono, b as extractRouteMap, c as InferHttpInput$1, g as HttpRouterRecord, h as HttpRouterDef, j as AnyMiddleware, k as InferHttpInput, l as InferHttpOutput, m as CRPCHttpRouter, v as createHttpRouter, w as HttpHandlerOpts, x as CRPCHonoHandler, y as createHttpRouterFactory, z as MiddlewareResult } from "../http-types-B3tM9Old.js";
 import * as convex_server30 from "convex/server";
 import { FunctionReference, FunctionReturnType, GenericActionCtx, GenericDataModel, GenericMutationCtx, GenericQueryCtx } from "convex/server";
 import { EmptyObject } from "convex-helpers";
@@ -18,53 +18,55 @@ declare function handleHttpError(error: unknown): Response;
  * - Factory function creates implementation objects
  * - This preserves literal types like 'GET' through method chains
  */
-interface HttpProcedureBuilder<TInitialCtx, TCtx, TInput extends UnsetMarker | z.ZodTypeAny = UnsetMarker, TOutput extends UnsetMarker | z.ZodTypeAny = UnsetMarker, TParams extends UnsetMarker | z.ZodTypeAny = UnsetMarker, TQuery extends UnsetMarker | z.ZodTypeAny = UnsetMarker, TMeta extends ProcedureMeta = ProcedureMeta, TMethod extends HttpMethod = HttpMethod> {
-  _def: HttpProcedureBuilderDef<TCtx, TInput, TOutput, TParams, TQuery, TMeta, TMethod>;
+interface HttpProcedureBuilder<TInitialCtx, TCtx, TInput extends UnsetMarker | z.ZodTypeAny = UnsetMarker, TOutput extends UnsetMarker | z.ZodTypeAny = UnsetMarker, TParams extends UnsetMarker | z.ZodTypeAny = UnsetMarker, TQuery extends UnsetMarker | z.ZodTypeAny = UnsetMarker, TMeta extends ProcedureMeta = ProcedureMeta, TMethod extends HttpMethod = HttpMethod, TForm extends UnsetMarker | z.ZodTypeAny = UnsetMarker> {
+  _def: HttpProcedureBuilderDef<TCtx, TInput, TOutput, TParams, TQuery, TMeta, TMethod, TForm>;
   /** Add middleware to the procedure */
-  use<$ContextOverridesOut extends object>(middlewareOrBuilder: MiddlewareFunction<TCtx, TMeta, UnsetMarker, $ContextOverridesOut> | MiddlewareBuilder<TInitialCtx, TMeta, $ContextOverridesOut>): HttpProcedureBuilder<TInitialCtx, Overwrite<TCtx, $ContextOverridesOut>, TInput, TOutput, TParams, TQuery, TMeta, TMethod>;
+  use<$ContextOverridesOut extends object>(middlewareOrBuilder: MiddlewareFunction<TCtx, TMeta, UnsetMarker, $ContextOverridesOut> | MiddlewareBuilder<TInitialCtx, TMeta, $ContextOverridesOut>): HttpProcedureBuilder<TInitialCtx, Overwrite<TCtx, $ContextOverridesOut>, TInput, TOutput, TParams, TQuery, TMeta, TMethod, TForm>;
   /** Set procedure metadata (shallow merged when chained) */
-  meta(value: TMeta): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, TMethod>;
+  meta(value: TMeta): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, TMethod, TForm>;
   /** Define the route path and HTTP method */
-  route<M extends HttpMethod>(path: string, method: M): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, M>;
+  route<M extends HttpMethod>(path: string, method: M): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, M, TForm>;
   /** GET endpoint (Hono-style) */
-  get(path: string): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, 'GET'>;
+  get(path: string): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, 'GET', TForm>;
   /** POST endpoint (Hono-style) */
-  post(path: string): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, 'POST'>;
+  post(path: string): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, 'POST', TForm>;
   /** PUT endpoint (Hono-style) */
-  put(path: string): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, 'PUT'>;
+  put(path: string): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, 'PUT', TForm>;
   /** PATCH endpoint (Hono-style) */
-  patch(path: string): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, 'PATCH'>;
+  patch(path: string): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, 'PATCH', TForm>;
   /** DELETE endpoint (Hono-style) */
-  delete(path: string): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, 'DELETE'>;
+  delete(path: string): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, 'DELETE', TForm>;
   /** Define path parameter schema (for :param in path) */
-  params<TSchema extends z.ZodTypeAny>(schema: TSchema): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TSchema, TQuery, TMeta, TMethod>;
+  params<TSchema extends z.ZodTypeAny>(schema: TSchema): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TSchema, TQuery, TMeta, TMethod, TForm>;
   /** Define query parameter schema (?key=value) */
-  searchParams<TSchema extends z.ZodTypeAny>(schema: TSchema): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TSchema, TMeta, TMethod>;
+  searchParams<TSchema extends z.ZodTypeAny>(schema: TSchema): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TSchema, TMeta, TMethod, TForm>;
   /** Define request body schema (for POST/PUT/PATCH) */
-  input<TSchema extends z.ZodTypeAny>(schema: TSchema): HttpProcedureBuilder<TInitialCtx, TCtx, TSchema, TOutput, TParams, TQuery, TMeta, TMethod>;
+  input<TSchema extends z.ZodTypeAny>(schema: TSchema): HttpProcedureBuilder<TInitialCtx, TCtx, TSchema, TOutput, TParams, TQuery, TMeta, TMethod, TForm>;
   /** Define response schema */
-  output<TSchema extends z.ZodTypeAny>(schema: TSchema): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TSchema, TParams, TQuery, TMeta, TMethod>;
+  output<TSchema extends z.ZodTypeAny>(schema: TSchema): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TSchema, TParams, TQuery, TMeta, TMethod, TForm>;
+  /** Define form data schema (for multipart/form-data uploads) */
+  form<TSchema extends z.ZodTypeAny>(schema: TSchema): HttpProcedureBuilder<TInitialCtx, TCtx, TInput, TOutput, TParams, TQuery, TMeta, TMethod, TSchema>;
   /**
    * Define the handler for GET endpoints (maps to useQuery on client).
    * Handler receives Hono Context `c` for Response helpers (c.json, c.body, c.text).
    * Return Response for custom responses, or plain object for auto JSON serialization.
    */
-  query<TResult>(handler: (opts: HttpHandlerOpts<TCtx, TInput, TParams, TQuery>) => Promise<Response | (TOutput extends z.ZodTypeAny ? z.infer<TOutput> : TResult)>): HttpProcedure<TInput, TOutput, TParams, TQuery, TMethod>;
+  query<TResult>(handler: (opts: HttpHandlerOpts<TCtx, TInput, TParams, TQuery, TForm>) => Promise<Response | (TOutput extends z.ZodTypeAny ? z.infer<TOutput> : TResult)>): HttpProcedure<TInput, TOutput, TParams, TQuery, TMethod, TForm>;
   /**
    * Define the handler for POST/PUT/PATCH/DELETE endpoints (maps to useMutation on client).
    * Handler receives Hono Context `c` for Response helpers (c.json, c.body, c.text).
    * Return Response for custom responses, or plain object for auto JSON serialization.
    */
-  mutation<TResult>(handler: (opts: HttpHandlerOpts<TCtx, TInput, TParams, TQuery>) => Promise<Response | (TOutput extends z.ZodTypeAny ? z.infer<TOutput> : TResult)>): HttpProcedure<TInput, TOutput, TParams, TQuery, TMethod>;
+  mutation<TResult>(handler: (opts: HttpHandlerOpts<TCtx, TInput, TParams, TQuery, TForm>) => Promise<Response | (TOutput extends z.ZodTypeAny ? z.infer<TOutput> : TResult)>): HttpProcedure<TInput, TOutput, TParams, TQuery, TMethod, TForm>;
 }
 /**
  * Create initial HttpProcedureBuilder
  */
 declare function createHttpProcedureBuilder<TCtx, TMeta extends ProcedureMeta>(config: {
-  base: HttpProcedureBuilderDef<TCtx, UnsetMarker, UnsetMarker, UnsetMarker, UnsetMarker, TMeta, HttpMethod>['functionConfig']['base'];
+  base: HttpProcedureBuilderDef<TCtx, UnsetMarker, UnsetMarker, UnsetMarker, UnsetMarker, TMeta, HttpMethod, UnsetMarker>['functionConfig']['base'];
   createContext: (ctx: GenericActionCtx<GenericDataModel>) => TCtx;
   meta: TMeta;
-}): HttpProcedureBuilder<TCtx, TCtx, UnsetMarker, UnsetMarker, UnsetMarker, UnsetMarker, TMeta, HttpMethod>;
+}): HttpProcedureBuilder<TCtx, TCtx, UnsetMarker, UnsetMarker, UnsetMarker, UnsetMarker, TMeta, HttpMethod, UnsetMarker>;
 //#endregion
 //#region src/server/builder.d.ts
 /**

package/dist/server/index.js

@@ -239,13 +239,21 @@ function createProcedure(def, handler, _type) {
 				} else body = await request.json().catch(() => ({}));
 				parsedInput = def.inputSchema.parse(body);
 			}
+			let parsedForm;
+			if (def.formSchema && request.method !== "GET") {
+				const formData = await request.formData();
+				const formObj = {};
+				for (const [key, value] of formData.entries()) formObj[key] = value;
+				parsedForm = def.formSchema.parse(formObj);
+			}
 			const handlerOpts = {
 				ctx,
 				c
 			};
 			if (parsedInput !== void 0) handlerOpts.input = parsedInput;
 			if (parsedParams !== void 0) handlerOpts.params = parsedParams;
-			if (parsedQuery !== void 0) handlerOpts.query = parsedQuery;
+			if (parsedQuery !== void 0) handlerOpts.searchParams = parsedQuery;
+			if (parsedForm !== void 0) handlerOpts.form = parsedForm;
 			const result = await handler(handlerOpts);
 			if (result instanceof Response) return result;
 			const output = def.outputSchema ? def.outputSchema.parse(result) : result;
@@ -282,7 +290,8 @@ function createProcedure(def, handler, _type) {
 		inputSchema: def.inputSchema,
 		outputSchema: def.outputSchema,
 		paramsSchema: def.paramsSchema,
-		querySchema: def.querySchema
+		querySchema: def.querySchema,
+		formSchema: def.formSchema
 	};
 	procedure._honoHandler = honoHandler;
 	return procedure;
@@ -367,6 +376,9 @@ function createHttpBuilder(def) {
 		output(schema) {
 			return createNewHttpBuilder(def, { outputSchema: schema });
 		},
+		form(schema) {
+			return createNewHttpBuilder(def, { formSchema: schema });
+		},
 		query(handler) {
 			return createProcedure(def, handler, "query");
 		},

package/dist/{types-U9pc_wi1.d.ts → types-2L5nploW.d.ts}

@@ -1,4 +1,4 @@
-import { d as DeepPartial, f as DistributiveOmit, p as Simplify } from "./http-types-CZo9Xx5R.js";
+import { d as DeepPartial, f as DistributiveOmit, p as Simplify } from "./http-types-B3tM9Old.js";
 import { FunctionArgs, FunctionReference, FunctionReturnType } from "convex/server";
 import { DefaultError, QueryFilters, SkipToken, UseMutationOptions, UseQueryOptions } from "@tanstack/react-query";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-convex",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Better Convex - React Query integration and CLI tools for Convex",
   "keywords": [
     "convex",