fluent-convex 0.8.0 → 0.8.1

package/dist/ConvexBuilder.d.ts

@@ -5,10 +5,10 @@ import type { ConvexMiddleware } from "./middleware";
 import type { QueryCtx, MutationCtx, ActionCtx, Context, EmptyObject } from "./types";
 export declare class ConvexBuilder<TDataModel extends GenericDataModel = GenericDataModel> {
     private def;
-    constructor(def: ConvexBuilderDef<undefined, undefined, undefined, "public">);
-    query(): ConvexBuilderWithFunctionKind<TDataModel, "query", QueryCtx<TDataModel>, QueryCtx<TDataModel>>;
-    mutation(): ConvexBuilderWithFunctionKind<TDataModel, "mutation", MutationCtx<TDataModel>, MutationCtx<TDataModel>>;
-    action(): ConvexBuilderWithFunctionKind<TDataModel, "action", ActionCtx<TDataModel>, ActionCtx<TDataModel>>;
+    constructor(def: ConvexBuilderDef);
+    query(): ConvexBuilderWithFunctionKind<TDataModel, "query", QueryCtx<TDataModel>>;
+    mutation(): ConvexBuilderWithFunctionKind<TDataModel, "mutation", MutationCtx<TDataModel>>;
+    action(): ConvexBuilderWithFunctionKind<TDataModel, "action", ActionCtx<TDataModel>>;
     $context<U extends Context>(): {
         middleware<UOutContext extends Context>(middleware: ConvexMiddleware<U, UOutContext>): ConvexMiddleware<U, UOutContext>;
     };

package/dist/ConvexBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConvexBuilder.d.ts","sourceRoot":"","sources":["../src/ConvexBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EACV,QAAQ,EACR,WAAW,EACX,SAAS,EACT,OAAO,EACP,WAAW,EACZ,MAAM,SAAS,CAAC;AAEjB,qBAAa,aAAa,CACxB,UAAU,SAAS,gBAAgB,GAAG,gBAAgB;IAEtD,OAAO,CAAC,GAAG,CAA8D;gBAGvE,GAAG,EAAE,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC;IAKlE,KAAK,IAAI,6BAA6B,CACpC,UAAU,EACV,OAAO,EACP,QAAQ,CAAC,UAAU,CAAC,EACpB,QAAQ,CAAC,UAAU,CAAC,CACrB;IAYD,QAAQ,IAAI,6BAA6B,CACvC,UAAU,EACV,UAAU,EACV,WAAW,CAAC,UAAU,CAAC,EACvB,WAAW,CAAC,UAAU,CAAC,CACxB;IAYD,MAAM,IAAI,6BAA6B,CACrC,UAAU,EACV,QAAQ,EACR,SAAS,CAAC,UAAU,CAAC,EACrB,SAAS,CAAC,UAAU,CAAC,CACtB;IAYD,QAAQ,CAAC,CAAC,SAAS,OAAO,KAAK;QAC7B,UAAU,CAAC,WAAW,SAAS,OAAO,EACpC,UAAU,EAAE,gBAAgB,CAAC,CAAC,EAAE,WAAW,CAAC,GAC3C,gBAAgB,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;KACrC;IAWD,UAAU,CAAC,WAAW,SAAS,OAAO,EACpC,UAAU,EAAE,gBAAgB,CAAC,WAAW,EAAE,WAAW,CAAC,GACrD,gBAAgB,CAAC,WAAW,EAAE,WAAW,CAAC;IAC7C,UAAU,CAAC,UAAU,SAAS,OAAO,EAAE,WAAW,SAAS,OAAO,EAChE,UAAU,EAAE,gBAAgB,CAAC,UAAU,EAAE,WAAW,CAAC,GACpD,gBAAgB,CAAC,UAAU,EAAE,WAAW,CAAC;CAM7C"}
+{"version":3,"file":"ConvexBuilder.d.ts","sourceRoot":"","sources":["../src/ConvexBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EACV,QAAQ,EACR,WAAW,EACX,SAAS,EACT,OAAO,EACP,WAAW,EACZ,MAAM,SAAS,CAAC;AAEjB,qBAAa,aAAa,CACxB,UAAU,SAAS,gBAAgB,GAAG,gBAAgB;IAEtD,OAAO,CAAC,GAAG,CAAmB;gBAElB,GAAG,EAAE,gBAAgB;IAIjC,KAAK,IAAI,6BAA6B,CACpC,UAAU,EACV,OAAO,EACP,QAAQ,CAAC,UAAU,CAAC,CACrB;IAWD,QAAQ,IAAI,6BAA6B,CACvC,UAAU,EACV,UAAU,EACV,WAAW,CAAC,UAAU,CAAC,CACxB;IAWD,MAAM,IAAI,6BAA6B,CACrC,UAAU,EACV,QAAQ,EACR,SAAS,CAAC,UAAU,CAAC,CACtB;IAWD,QAAQ,CAAC,CAAC,SAAS,OAAO,KAAK;QAC7B,UAAU,CAAC,WAAW,SAAS,OAAO,EACpC,UAAU,EAAE,gBAAgB,CAAC,CAAC,EAAE,WAAW,CAAC,GAC3C,gBAAgB,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;KACrC;IAWD,UAAU,CAAC,WAAW,SAAS,OAAO,EACpC,UAAU,EAAE,gBAAgB,CAAC,WAAW,EAAE,WAAW,CAAC,GACrD,gBAAgB,CAAC,WAAW,EAAE,WAAW,CAAC;IAC7C,UAAU,CAAC,UAAU,SAAS,OAAO,EAAE,WAAW,SAAS,OAAO,EAChE,UAAU,EAAE,gBAAgB,CAAC,UAAU,EAAE,WAAW,CAAC,GACpD,gBAAgB,CAAC,UAAU,EAAE,WAAW,CAAC;CAM7C"}

package/dist/ConvexBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConvexBuilder.js","sourceRoot":"","sources":["../src/ConvexBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAUhF,MAAM,OAAO,aAAa;IAGhB,GAAG,CAA8D;IAEzE,YACE,GAAgE;QAEhE,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED,KAAK;QAMH,OAAO,IAAI,6BAA6B,CAKtC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,YAAY,EAAE,OAAO;SACtB,CAAC,CAAC;IACL,CAAC;IAED,QAAQ;QAMN,OAAO,IAAI,6BAA6B,CAKtC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,YAAY,EAAE,UAAU;SACzB,CAAC,CAAC;IACL,CAAC;IAED,MAAM;QAMJ,OAAO,IAAI,6BAA6B,CAKtC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,YAAY,EAAE,QAAQ;SACvB,CAAC,CAAC;IACL,CAAC;IAED,QAAQ;QAKN,gFAAgF;QAChF,OAAO;YACL,UAAU,CACR,UAA4C;gBAE5C,OAAO,UAAU,CAAC;YACpB,CAAC;SACF,CAAC;IACJ,CAAC;IAQD,UAAU,CACR,UAAqD;QAErD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF"}
+{"version":3,"file":"ConvexBuilder.js","sourceRoot":"","sources":["../src/ConvexBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAUhF,MAAM,OAAO,aAAa;IAGhB,GAAG,CAAmB;IAE9B,YAAY,GAAqB;QAC/B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED,KAAK;QAKH,OAAO,IAAI,6BAA6B,CAItC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,YAAY,EAAE,OAAO;SACtB,CAAC,CAAC;IACL,CAAC;IAED,QAAQ;QAKN,OAAO,IAAI,6BAA6B,CAItC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,YAAY,EAAE,UAAU;SACzB,CAAC,CAAC;IACL,CAAC;IAED,MAAM;QAKJ,OAAO,IAAI,6BAA6B,CAItC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,YAAY,EAAE,QAAQ;SACvB,CAAC,CAAC;IACL,CAAC;IAED,QAAQ;QAKN,gFAAgF;QAChF,OAAO;YACL,UAAU,CACR,UAA4C;gBAE5C,OAAO,UAAU,CAAC;YACpB,CAAC;SACF,CAAC;IACJ,CAAC;IAQD,UAAU,CACR,UAAqD;QAErD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF"}

package/dist/ConvexBuilderWithFunctionKind.d.ts

@@ -1,25 +1,20 @@
 import type { GenericDataModel } from "convex/server";
 import { ConvexBuilderWithHandler } from "./ConvexBuilderWithHandler";
-import { InferredArgs } from "./types";
-import { ExpectedReturnType } from "./types";
+import { InferredArgs, InferredHandlerReturn } from "./types";
 import { ConvexBuilderDef } from "./types";
 import { CallableBuilder } from "./types";
 import type { ConvexMiddleware } from "./middleware";
-import type { FunctionType, Context, EmptyObject, ConvexArgsValidator, ConvexReturnsValidator, Visibility } from "./types";
+import type { FunctionType, Context, EmptyObject, ConvexArgsValidator, ConvexReturnsValidator } from "./types";
 import { type ValidatorInput, type ToConvexArgsValidator, type ReturnsValidatorInput, type ToConvexReturnsValidator } from "./zod_support";
-export declare class ConvexBuilderWithFunctionKind<TDataModel extends GenericDataModel = GenericDataModel, TFunctionType extends FunctionType = FunctionType, TInitialContext extends Context = EmptyObject, TCurrentContext extends Context = EmptyObject, TArgsValidator extends ConvexArgsValidator | undefined = undefined, TReturnsValidator extends ConvexReturnsValidator | undefined = undefined, TVisibility extends Visibility = "public", THasHandler extends boolean = false, THandlerReturn = any> {
-    protected def: ConvexBuilderDef<TFunctionType, TArgsValidator, TReturnsValidator, TVisibility>;
-    constructor(def: ConvexBuilderDef<TFunctionType, TArgsValidator, TReturnsValidator, TVisibility>);
-    $context<U extends Context>(): ConvexBuilderWithFunctionKind<TDataModel, TFunctionType, U & EmptyObject, U, TArgsValidator, TReturnsValidator, TVisibility, THasHandler, THandlerReturn>;
-    middleware<UOutContext extends Context>(middleware: ConvexMiddleware<TInitialContext, UOutContext>): ConvexMiddleware<TInitialContext, UOutContext>;
+export declare class ConvexBuilderWithFunctionKind<TDataModel extends GenericDataModel = GenericDataModel, TFunctionType extends FunctionType = FunctionType, TCurrentContext extends Context = EmptyObject, TArgsValidator extends ConvexArgsValidator | undefined = undefined, TReturnsValidator extends ConvexReturnsValidator | undefined = undefined> {
+    protected def: ConvexBuilderDef<TFunctionType, TArgsValidator, TReturnsValidator>;
+    constructor(def: ConvexBuilderDef<TFunctionType, TArgsValidator, TReturnsValidator>);
+    $context<U extends Context>(): ConvexBuilderWithFunctionKind<TDataModel, TFunctionType, U, TArgsValidator, TReturnsValidator>;
+    middleware<UOutContext extends Context>(middleware: ConvexMiddleware<TCurrentContext, UOutContext>): ConvexMiddleware<TCurrentContext, UOutContext>;
     middleware<UInContext extends Context, UOutContext extends Context>(middleware: ConvexMiddleware<UInContext, UOutContext>): ConvexMiddleware<UInContext, UOutContext>;
-    use<UOutContext extends Context>(middleware: ConvexMiddleware<TCurrentContext, UOutContext>): ConvexBuilderWithFunctionKind<TDataModel, TFunctionType, TInitialContext, TCurrentContext & UOutContext, TArgsValidator, TReturnsValidator, TVisibility, THasHandler, THandlerReturn>;
-    input<UInput extends ValidatorInput>(validator: UInput): ConvexBuilderWithFunctionKind<TDataModel, TFunctionType, TInitialContext, TCurrentContext, ToConvexArgsValidator<UInput>, TReturnsValidator, TVisibility, THasHandler, THandlerReturn>;
-    returns<UReturns extends ReturnsValidatorInput>(validator: UReturns): ConvexBuilderWithFunctionKind<TDataModel, TFunctionType, TInitialContext, TCurrentContext, TArgsValidator, ToConvexReturnsValidator<UReturns>, TVisibility, THasHandler, THandlerReturn>;
-    handler<TReturn extends [TReturnsValidator] extends [ConvexReturnsValidator] ? ExpectedReturnType<TReturnsValidator> : any = [TReturnsValidator] extends [ConvexReturnsValidator] ? ExpectedReturnType<TReturnsValidator> : any>(handlerFn: (context: TCurrentContext, input: InferredArgs<TArgsValidator>) => Promise<TReturn>): ConvexBuilderWithHandler<TDataModel, TFunctionType, TInitialContext, TCurrentContext, TArgsValidator, TReturnsValidator, TVisibility, [
-        TReturnsValidator
-    ] extends [ConvexReturnsValidator] ? ExpectedReturnType<TReturnsValidator> : TReturn> & CallableBuilder<TCurrentContext, TArgsValidator, [
-        TReturnsValidator
-    ] extends [ConvexReturnsValidator] ? ExpectedReturnType<TReturnsValidator> : TReturn>;
+    use<UOutContext extends Context>(middleware: ConvexMiddleware<TCurrentContext, UOutContext>): ConvexBuilderWithFunctionKind<TDataModel, TFunctionType, TCurrentContext & UOutContext, TArgsValidator, TReturnsValidator>;
+    input<UInput extends ValidatorInput>(validator: UInput): ConvexBuilderWithFunctionKind<TDataModel, TFunctionType, TCurrentContext, ToConvexArgsValidator<UInput>, TReturnsValidator>;
+    returns<UReturns extends ReturnsValidatorInput>(validator: UReturns): ConvexBuilderWithFunctionKind<TDataModel, TFunctionType, TCurrentContext, TArgsValidator, ToConvexReturnsValidator<UReturns>>;
+    handler<TReturn extends InferredHandlerReturn<TReturnsValidator, any> = InferredHandlerReturn<TReturnsValidator, any>>(handlerFn: (context: TCurrentContext, input: InferredArgs<TArgsValidator>) => Promise<TReturn>): ConvexBuilderWithHandler<TDataModel, TFunctionType, TCurrentContext, TArgsValidator, TReturnsValidator, InferredHandlerReturn<TReturnsValidator, TReturn>> & CallableBuilder<TCurrentContext, TArgsValidator, InferredHandlerReturn<TReturnsValidator, TReturn>>;
 }
 //# sourceMappingURL=ConvexBuilderWithFunctionKind.d.ts.map

package/dist/ConvexBuilderWithFunctionKind.d.ts.map

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

package/dist/ConvexBuilderWithFunctionKind.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConvexBuilderWithFunctionKind.js","sourceRoot":"","sources":["../src/ConvexBuilderWithFunctionKind.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AActE,OAAO,EAGL,WAAW,EACX,iBAAiB,GAGlB,MAAM,eAAe,CAAC;AAEvB,MAAM,OAAO,6BAA6B;IAW9B,GAAG,CAKX;IAEF,YACE,GAKC;QAED,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED,QAAQ;QAWN,OAAO,IAAI,6BAA6B,CAUtC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,WAAW,EAAE,EAAE;SAChB,CAAC,CAAC;IACL,CAAC;IAQD,UAAU,CACR,UAAqD;QAErD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,GAAG,CACD,UAA0D;QAY1D,OAAO,IAAI,6BAA6B,CAUtC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,UAAiC,CAAC;SAC1E,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CACH,SAAiB;QAYjB,MAAM,eAAe,GAAG,WAAW,CAAC,SAAS,CAAC;YAC5C,CAAC,CAAE,iBAAiB,CAAC,SAAS,CAAmC;YACjE,CAAC,CAAE,SAA2C,CAAC;QAEjD,OAAO,IAAI,6BAA6B,CAUtC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,aAAa,EAAE,eAAe;SAC/B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CACL,SAAmB;QAYnB,MAAM,eAAe,GAAG,WAAW,CAAC,SAAS,CAAC;YAC5C,CAAC,CAAE,iBAAiB,CAAC,SAAS,CAAwC;YACtE,CAAC,CAAE,SAAgD,CAAC;QAEtD,OAAO,IAAI,6BAA6B,CAUtC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,gBAAgB,EAAE,eAAe;SAClC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAOL,SAGqB;QAoBrB,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACb,0EAA0E,CAC3E,CAAC;QACJ,CAAC;QAED,4EAA4E;QAC5E,mFAAmF;QACnF,oFAAoF;QACpF,MAAM,UAAU,GAAG,KAAK,EACtB,cAAuB,EACvB,QAAsC,EACtC,EAAE;YACF,OAAO,SAAS,CAAC,cAAiC,EAAE,QAAQ,CAAC,CAAC;QAChE,CAAC,CAAC;QAMF,OAAO,IAAI,wBAAwB,CASjC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,OAAO,EAAE,UAAiB;SAC3B,CAUiE,CAAC;IACrE,CAAC;CACF"}
+{"version":3,"file":"ConvexBuilderWithFunctionKind.js","sourceRoot":"","sources":["../src/ConvexBuilderWithFunctionKind.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAYtE,OAAO,EAGL,WAAW,EACX,iBAAiB,GAGlB,MAAM,eAAe,CAAC;AAEvB,MAAM,OAAO,6BAA6B;IAO9B,GAAG,CAIX;IAEF,YACE,GAAuE;QAEvE,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED,QAAQ;QAON,OAAO,IAAI,6BAA6B,CAMtC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,WAAW,EAAE,EAAE;SAChB,CAAC,CAAC;IACL,CAAC;IAQD,UAAU,CACR,UAAqD;QAErD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,GAAG,CACD,UAA0D;QAQ1D,OAAO,IAAI,6BAA6B,CAMtC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,UAAiC,CAAC;SAC1E,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CACH,SAAiB;QAQjB,MAAM,eAAe,GAAG,WAAW,CAAC,SAAS,CAAC;YAC5C,CAAC,CAAE,iBAAiB,CAAC,SAAS,CAAmC;YACjE,CAAC,CAAE,SAA2C,CAAC;QAEjD,OAAO,IAAI,6BAA6B,CAMtC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,aAAa,EAAE,eAAe;SAC/B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CACL,SAAmB;QAQnB,MAAM,eAAe,GAAG,WAAW,CAAC,SAAS,CAAC;YAC5C,CAAC,CAAE,iBAAiB,CAAC,SAAS,CAAwC;YACtE,CAAC,CAAE,SAAgD,CAAC;QAEtD,OAAO,IAAI,6BAA6B,CAMtC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,gBAAgB,EAAE,eAAe;SAClC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAML,SAGqB;QAcrB,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CACb,0EAA0E,CAC3E,CAAC;QACJ,CAAC;QAED,4EAA4E;QAC5E,mFAAmF;QACnF,oFAAoF;QACpF,MAAM,UAAU,GAAG,KAAK,EACtB,cAAuB,EACvB,QAAsC,EACtC,EAAE;YACF,OAAO,SAAS,CAAC,cAAiC,EAAE,QAAQ,CAAC,CAAC;QAChE,CAAC,CAAC;QAIF,OAAO,IAAI,wBAAwB,CAOjC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,OAAO,EAAE,UAAiB;SAC3B,CAQiE,CAAC;IACrE,CAAC;CACF"}

package/dist/ConvexBuilderWithHandler.d.ts

@@ -1,11 +1,11 @@
 import { type GenericDataModel, type RegisteredQuery, type RegisteredMutation, type RegisteredAction } from "convex/server";
 import type { ConvexMiddleware } from "./middleware";
-import type { FunctionType, Context, EmptyObject, ConvexArgsValidator, ConvexReturnsValidator, Visibility, ConvexBuilderDef, InferredArgs, CallableBuilder } from "./types";
-export declare class ConvexBuilderWithHandler<TDataModel extends GenericDataModel = GenericDataModel, TFunctionType extends FunctionType | undefined = undefined, TInitialContext extends Context = EmptyObject, TCurrentContext extends Context = EmptyObject, TArgsValidator extends ConvexArgsValidator | undefined = undefined, TReturnsValidator extends ConvexReturnsValidator | undefined = undefined, TVisibility extends Visibility = "public", THandlerReturn = any> {
+import type { FunctionType, Context, EmptyObject, ConvexArgsValidator, ConvexReturnsValidator, ConvexBuilderDef, InferredArgs, CallableBuilder } from "./types";
+export declare class ConvexBuilderWithHandler<TDataModel extends GenericDataModel = GenericDataModel, TFunctionType extends FunctionType = FunctionType, TCurrentContext extends Context = EmptyObject, TArgsValidator extends ConvexArgsValidator | undefined = undefined, TReturnsValidator extends ConvexReturnsValidator | undefined = undefined, THandlerReturn = any> {
     private def;
-    constructor(def: ConvexBuilderDef<TFunctionType, TArgsValidator, TReturnsValidator, TVisibility>);
+    constructor(def: ConvexBuilderDef<TFunctionType, TArgsValidator, TReturnsValidator>);
     private _call;
-    use<UOutContext extends Context>(middleware: ConvexMiddleware<TCurrentContext, UOutContext>): ConvexBuilderWithHandler<TDataModel, TFunctionType, TInitialContext, TCurrentContext & UOutContext, TArgsValidator, TReturnsValidator, TVisibility, THandlerReturn> & CallableBuilder<TCurrentContext & UOutContext, TArgsValidator, THandlerReturn>;
+    use<UOutContext extends Context>(middleware: ConvexMiddleware<TCurrentContext, UOutContext>): ConvexBuilderWithHandler<TDataModel, TFunctionType, TCurrentContext & UOutContext, TArgsValidator, TReturnsValidator, THandlerReturn> & CallableBuilder<TCurrentContext & UOutContext, TArgsValidator, THandlerReturn>;
     public(): TFunctionType extends "query" ? RegisteredQuery<"public", InferredArgs<TArgsValidator>, Promise<THandlerReturn>> : TFunctionType extends "mutation" ? RegisteredMutation<"public", InferredArgs<TArgsValidator>, Promise<THandlerReturn>> : TFunctionType extends "action" ? RegisteredAction<"public", InferredArgs<TArgsValidator>, Promise<THandlerReturn>> : never;
     internal(): TFunctionType extends "query" ? RegisteredQuery<"internal", InferredArgs<TArgsValidator>, Promise<THandlerReturn>> : TFunctionType extends "mutation" ? RegisteredMutation<"internal", InferredArgs<TArgsValidator>, Promise<THandlerReturn>> : TFunctionType extends "action" ? RegisteredAction<"internal", InferredArgs<TArgsValidator>, Promise<THandlerReturn>> : never;
     private _register;

package/dist/ConvexBuilderWithHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConvexBuilderWithHandler.d.ts","sourceRoot":"","sources":["../src/ConvexBuilderWithHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EAOtB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,gBAAgB,EAAuB,MAAM,cAAc,CAAC;AAC1E,OAAO,KAAK,EACV,YAAY,EACZ,OAAO,EACP,WAAW,EACX,mBAAmB,EACnB,sBAAsB,EACtB,UAAU,EACV,gBAAgB,EAChB,YAAY,EACZ,eAAe,EAIhB,MAAM,SAAS,CAAC;AAEjB,qBAAa,wBAAwB,CACnC,UAAU,SAAS,gBAAgB,GAAG,gBAAgB,EACtD,aAAa,SAAS,YAAY,GAAG,SAAS,GAAG,SAAS,EAC1D,eAAe,SAAS,OAAO,GAAG,WAAW,EAC7C,eAAe,SAAS,OAAO,GAAG,WAAW,EAC7C,cAAc,SAAS,mBAAmB,GAAG,SAAS,GAAG,SAAS,EAClE,iBAAiB,SAAS,sBAAsB,GAAG,SAAS,GAAG,SAAS,EACxE,WAAW,SAAS,UAAU,GAAG,QAAQ,EACzC,cAAc,GAAG,GAAG;IAEpB,OAAO,CAAC,GAAG,CAKT;gBAGA,GAAG,EAAE,gBAAgB,CACnB,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,WAAW,CACZ;IAaH,OAAO,CAAC,KAAK;IAyBb,GAAG,CAAC,WAAW,SAAS,OAAO,EAC7B,UAAU,EAAE,gBAAgB,CAAC,eAAe,EAAE,WAAW,CAAC,GACzD,wBAAwB,CACzB,UAAU,EACV,aAAa,EACb,eAAe,EACf,eAAe,GAAG,WAAW,EAC7B,cAAc,EACd,iBAAiB,EACjB,WAAW,EACX,cAAc,CACf,GACC,eAAe,CACb,eAAe,GAAG,WAAW,EAC7B,cAAc,EACd,cAAc,CACf;IA8BH,MAAM,IAAI,aAAa,SAAS,OAAO,GACnC,eAAe,CACb,QAAQ,EACR,YAAY,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,cAAc,CAAC,CACxB,GACD,aAAa,SAAS,UAAU,GAC9B,kBAAkB,CAChB,QAAQ,EACR,YAAY,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,cAAc,CAAC,CACxB,GACD,aAAa,SAAS,QAAQ,GAC5B,gBAAgB,CACd,QAAQ,EACR,YAAY,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,cAAc,CAAC,CACxB,GACD,KAAK;IAIb,QAAQ,IAAI,aAAa,SAAS,OAAO,GACrC,eAAe,CACb,UAAU,EACV,YAAY,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,cAAc,CAAC,CACxB,GACD,aAAa,SAAS,UAAU,GAC9B,kBAAkB,CAChB,UAAU,EACV,YAAY,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,cAAc,CAAC,CACxB,GACD,aAAa,SAAS,QAAQ,GAC5B,gBAAgB,CACd,UAAU,EACV,YAAY,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,cAAc,CAAC,CACxB,GACD,KAAK;IAIb,OAAO,CAAC,SAAS;CA0DlB"}
+{"version":3,"file":"ConvexBuilderWithHandler.d.ts","sourceRoot":"","sources":["../src/ConvexBuilderWithHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EAOtB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,gBAAgB,EAAuB,MAAM,cAAc,CAAC;AAC1E,OAAO,KAAK,EACV,YAAY,EACZ,OAAO,EACP,WAAW,EACX,mBAAmB,EACnB,sBAAsB,EAEtB,gBAAgB,EAChB,YAAY,EACZ,eAAe,EAIhB,MAAM,SAAS,CAAC;AAEjB,qBAAa,wBAAwB,CACnC,UAAU,SAAS,gBAAgB,GAAG,gBAAgB,EACtD,aAAa,SAAS,YAAY,GAAG,YAAY,EACjD,eAAe,SAAS,OAAO,GAAG,WAAW,EAC7C,cAAc,SAAS,mBAAmB,GAAG,SAAS,GAAG,SAAS,EAClE,iBAAiB,SAAS,sBAAsB,GAAG,SAAS,GAAG,SAAS,EACxE,cAAc,GAAG,GAAG;IAEpB,OAAO,CAAC,GAAG,CAIT;gBAGA,GAAG,EAAE,gBAAgB,CAAC,aAAa,EAAE,cAAc,EAAE,iBAAiB,CAAC;IAazE,OAAO,CAAC,KAAK;IAyBb,GAAG,CAAC,WAAW,SAAS,OAAO,EAC7B,UAAU,EAAE,gBAAgB,CAAC,eAAe,EAAE,WAAW,CAAC,GACzD,wBAAwB,CACzB,UAAU,EACV,aAAa,EACb,eAAe,GAAG,WAAW,EAC7B,cAAc,EACd,iBAAiB,EACjB,cAAc,CACf,GACC,eAAe,CACb,eAAe,GAAG,WAAW,EAC7B,cAAc,EACd,cAAc,CACf;IA0BH,MAAM,IAAI,aAAa,SAAS,OAAO,GACnC,eAAe,CACb,QAAQ,EACR,YAAY,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,cAAc,CAAC,CACxB,GACD,aAAa,SAAS,UAAU,GAC9B,kBAAkB,CAChB,QAAQ,EACR,YAAY,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,cAAc,CAAC,CACxB,GACD,aAAa,SAAS,QAAQ,GAC5B,gBAAgB,CACd,QAAQ,EACR,YAAY,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,cAAc,CAAC,CACxB,GACD,KAAK;IAIb,QAAQ,IAAI,aAAa,SAAS,OAAO,GACrC,eAAe,CACb,UAAU,EACV,YAAY,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,cAAc,CAAC,CACxB,GACD,aAAa,SAAS,UAAU,GAC9B,kBAAkB,CAChB,UAAU,EACV,YAAY,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,cAAc,CAAC,CACxB,GACD,aAAa,SAAS,QAAQ,GAC5B,gBAAgB,CACd,UAAU,EACV,YAAY,CAAC,cAAc,CAAC,EAC5B,OAAO,CAAC,cAAc,CAAC,CACxB,GACD,KAAK;IAIb,OAAO,CAAC,SAAS;CA0DlB"}

package/dist/ConvexBuilderWithHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConvexBuilderWithHandler.js","sourceRoot":"","sources":["../src/ConvexBuilderWithHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,YAAY,EACZ,oBAAoB,EACpB,eAAe,EACf,uBAAuB,EACvB,aAAa,EACb,qBAAqB,GACtB,MAAM,eAAe,CAAC;AAiBvB,MAAM,OAAO,wBAAwB;IAU3B,GAAG,CAKT;IAEF,YACE,GAKC;QAED,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QAEf,kDAAkD;QAClD,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE;YACrB,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAuB,EAAE,EAAE;gBACpD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7B,CAAC;SACF,CAAQ,CAAC;IACZ,CAAC;IAED,qCAAqC;IAC7B,KAAK,CACX,OAAwB;QAExB,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC;QAE1C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,KAAK,EAAE,IAAkC,EAAE,EAAE;YAClD,IAAI,cAAc,GAAY,OAAO,CAAC;YAEtC,iCAAiC;YACjC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;gBACrC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;oBAClE,OAAO;iBACR,CAAC,CAAC,CAAC;gBACJ,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC;YAClC,CAAC;YAED,oDAAoD;YACpD,OAAO,OAAO,CAAC,cAAqB,EAAE,IAAI,CAAC,CAAC;QAC9C,CAAC,CAAC;IACJ,CAAC;IAED,GAAG,CACD,UAA0D;QAgB1D,OAAO,IAAI,wBAAwB,CASjC;YACA,GAAG,IAAI,CAAC,GAAG;YACX,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,UAAiC,CAAC;SAC1E,CAcE,CAAC;IACN,CAAC;IAED,MAAM;QAmBJ,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAQ,CAAC;IACzC,CAAC;IAED,QAAQ;QAmBN,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAQ,CAAC;IAC3C,CAAC;IAEO,SAAS,CAAC,UAAsB;QACtC,MAAM,EACJ,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,OAAO,EACP,WAAW,GACZ,GAAG,IAAI,CAAC,GAAG,CAAC;QAEb,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CACb,mEAAmE,CACpE,CAAC;QACJ,CAAC;QAED,oFAAoF;QACpF,MAAM,eAAe,GAAG,KAAK,EAC3B,OAGyB,EACzB,QAAa,EACb,EAAE;YACF,IAAI,cAAc,GAAY,OAAO,CAAC;YAEtC,iCAAiC;YACjC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;gBACrC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;oBAClE,OAAO;iBACR,CAAC,CAAC,CAAC;gBACJ,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC;YAClC,CAAC;YAED,oDAAoD;YACpD,OAAO,OAAO,CAAC,cAAqB,EAAE,QAAQ,CAAC,CAAC;QAClD,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,aAAa,IAAI,EAAE;YACzB,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,OAAO,EAAE,eAAe;SAClB,CAAC;QAET,MAAM,QAAQ,GAAG,UAAU,KAAK,QAAQ,CAAC;QACzC,MAAM,cAAc,GAAG;YACrB,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,oBAAoB;YACrD,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,uBAAuB;YAC9D,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,qBAAqB;SACzD,CAAC,YAAY,CAAC,CAAC;QAEhB,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;CACF"}
+{"version":3,"file":"ConvexBuilderWithHandler.js","sourceRoot":"","sources":["../src/ConvexBuilderWithHandler.ts"],"names":[],"mappings":"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"}

package/dist/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,wBAAgB,aAAa,CAC3B,UAAU,SAAS,gBAAgB,KAChC,aAAa,CAAC,UAAU,CAAC,CAK7B"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,wBAAgB,aAAa,CAC3B,UAAU,SAAS,gBAAgB,KAChC,aAAa,CAAC,UAAU,CAAC,CAI7B"}

package/dist/builder.js

@@ -2,7 +2,6 @@ import { ConvexBuilder } from "./ConvexBuilder";
 export function createBuilder() {
     return new ConvexBuilder({
         middlewares: [],
-        visibility: "public",
     });
 }
 //# sourceMappingURL=builder.js.map

package/dist/builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,UAAU,aAAa;IAG3B,OAAO,IAAI,aAAa,CAAa;QACnC,WAAW,EAAE,EAAE;QACf,UAAU,EAAE,QAAQ;KACrB,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,UAAU,aAAa;IAG3B,OAAO,IAAI,aAAa,CAAa;QACnC,WAAW,EAAE,EAAE;KAChB,CAAC,CAAC;AACL,CAAC"}

package/dist/index.d.ts

@@ -2,5 +2,4 @@ export { createBuilder } from "./builder";
 export type { ConvexMiddleware, ConvexMiddlewareOptions, AnyConvexMiddleware, } from "./middleware";
 export type { Context, ConvexArgsValidator, ConvexReturnsValidator, InferArgs, QueryCtx, MutationCtx, ActionCtx, FunctionType, Visibility, } from "./types";
 export { isZodSchema, toConvexValidator, type ValidatorInput, type ReturnsValidatorInput, } from "./zod_support";
-export { input, returns, getMetadata, getMethodMetadataFromClass, makeCallableMethods, makeCallable, } from "./decorators";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,YAAY,EACV,gBAAgB,EAChB,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,cAAc,CAAC;AAEtB,YAAY,EACV,OAAO,EACP,mBAAmB,EACnB,sBAAsB,EACtB,SAAS,EACT,QAAQ,EACR,WAAW,EACX,SAAS,EACT,YAAY,EACZ,UAAU,GACX,MAAM,SAAS,CAAC;AAEjB,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,KAAK,cAAc,EACnB,KAAK,qBAAqB,GAC3B,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,KAAK,EACL,OAAO,EACP,WAAW,EACX,0BAA0B,EAC1B,mBAAmB,EACnB,YAAY,GACb,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C,YAAY,EACV,gBAAgB,EAChB,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,cAAc,CAAC;AAEtB,YAAY,EACV,OAAO,EACP,mBAAmB,EACnB,sBAAsB,EACtB,SAAS,EACT,QAAQ,EACR,WAAW,EACX,SAAS,EACT,YAAY,EACZ,UAAU,GACX,MAAM,SAAS,CAAC;AAEjB,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,KAAK,cAAc,EACnB,KAAK,qBAAqB,GAC3B,MAAM,eAAe,CAAC"}

package/dist/index.js

@@ -1,4 +1,3 @@
 export { createBuilder } from "./builder";
 export { isZodSchema, toConvexValidator, } from "./zod_support";
-export { input, returns, getMetadata, getMethodMetadataFromClass, makeCallableMethods, makeCallable, } from "./decorators";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAoB1C,OAAO,EACL,WAAW,EACX,iBAAiB,GAGlB,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,KAAK,EACL,OAAO,EACP,WAAW,EACX,0BAA0B,EAC1B,mBAAmB,EACnB,YAAY,GACb,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAoB1C,OAAO,EACL,WAAW,EACX,iBAAiB,GAGlB,MAAM,eAAe,CAAC"}

package/dist/types.d.ts

@@ -30,15 +30,15 @@ export type Visibility = "public" | "internal";
 export type CallableBuilder<TCurrentContext extends Context, TArgsValidator extends ConvexArgsValidator | undefined, THandlerReturn> = {
     (context: TCurrentContext): (args: InferredArgs<TArgsValidator>) => Promise<THandlerReturn>;
 };
-export interface ConvexBuilderDef<TFunctionType extends FunctionType | undefined, TArgsValidator extends ConvexArgsValidator | undefined, TReturnsValidator extends ConvexReturnsValidator | undefined, TVisibility extends Visibility> {
+export interface ConvexBuilderDef<TFunctionType extends FunctionType | undefined = undefined, TArgsValidator extends ConvexArgsValidator | undefined = undefined, TReturnsValidator extends ConvexReturnsValidator | undefined = undefined> {
     functionType?: TFunctionType;
     middlewares: readonly AnyConvexMiddleware[];
     argsValidator?: TArgsValidator;
     returnsValidator?: TReturnsValidator;
-    visibility: TVisibility;
     handler?: (context: Context, input: any) => Promise<any>;
 }
 export type ExpectedReturnType<TReturnsValidator extends ConvexReturnsValidator | undefined> = TReturnsValidator extends ConvexReturnsValidator ? InferReturns<TReturnsValidator> : any;
+export type InferredHandlerReturn<TReturnsValidator extends ConvexReturnsValidator | undefined, TReturn> = [TReturnsValidator] extends [ConvexReturnsValidator] ? ExpectedReturnType<TReturnsValidator> : TReturn;
 export type InferredArgs<T extends ConvexArgsValidator | undefined> = T extends ConvexArgsValidator ? InferArgs<T> : EmptyObject;
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluent-convex",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "A fluent API builder for Convex functions with middleware support, inspired by oRPC",
   "type": "module",
   "main": "./dist/index.js",

package/src/ConvexBuilder.ts

@@ -13,24 +13,20 @@ import type {
 export class ConvexBuilder<
   TDataModel extends GenericDataModel = GenericDataModel,
 > {
-  private def: ConvexBuilderDef<undefined, undefined, undefined, "public">;
+  private def: ConvexBuilderDef;
 
-  constructor(
-    def: ConvexBuilderDef<undefined, undefined, undefined, "public">
-  ) {
+  constructor(def: ConvexBuilderDef) {
     this.def = def;
   }
 
   query(): ConvexBuilderWithFunctionKind<
     TDataModel,
     "query",
-    QueryCtx<TDataModel>,
     QueryCtx<TDataModel>
   > {
     return new ConvexBuilderWithFunctionKind<
       TDataModel,
       "query",
-      QueryCtx<TDataModel>,
       QueryCtx<TDataModel>
     >({
       ...this.def,
@@ -41,13 +37,11 @@ export class ConvexBuilder<
   mutation(): ConvexBuilderWithFunctionKind<
     TDataModel,
     "mutation",
-    MutationCtx<TDataModel>,
     MutationCtx<TDataModel>
   > {
     return new ConvexBuilderWithFunctionKind<
       TDataModel,
       "mutation",
-      MutationCtx<TDataModel>,
       MutationCtx<TDataModel>
     >({
       ...this.def,
@@ -58,13 +52,11 @@ export class ConvexBuilder<
   action(): ConvexBuilderWithFunctionKind<
     TDataModel,
     "action",
-    ActionCtx<TDataModel>,
     ActionCtx<TDataModel>
   > {
     return new ConvexBuilderWithFunctionKind<
       TDataModel,
       "action",
-      ActionCtx<TDataModel>,
       ActionCtx<TDataModel>
     >({
       ...this.def,

package/src/ConvexBuilderWithFunctionKind.ts

@@ -1,7 +1,6 @@
 import type { GenericDataModel } from "convex/server";
 import { ConvexBuilderWithHandler } from "./ConvexBuilderWithHandler";
-import { InferredArgs } from "./types";
-import { ExpectedReturnType } from "./types";
+import { InferredArgs, InferredHandlerReturn } from "./types";
 import { ConvexBuilderDef } from "./types";
 import { CallableBuilder } from "./types";
 import type { ConvexMiddleware, AnyConvexMiddleware } from "./middleware";
@@ -11,7 +10,6 @@ import type {
   EmptyObject,
   ConvexArgsValidator,
   ConvexReturnsValidator,
-  Visibility,
 } from "./types";
 import {
   type ValidatorInput,
@@ -25,28 +23,18 @@ import {
 export class ConvexBuilderWithFunctionKind<
   TDataModel extends GenericDataModel = GenericDataModel,
   TFunctionType extends FunctionType = FunctionType,
-  TInitialContext extends Context = EmptyObject,
   TCurrentContext extends Context = EmptyObject,
   TArgsValidator extends ConvexArgsValidator | undefined = undefined,
   TReturnsValidator extends ConvexReturnsValidator | undefined = undefined,
-  TVisibility extends Visibility = "public",
-  THasHandler extends boolean = false,
-  THandlerReturn = any,
 > {
   protected def: ConvexBuilderDef<
     TFunctionType,
     TArgsValidator,
-    TReturnsValidator,
-    TVisibility
+    TReturnsValidator
   >;
 
   constructor(
-    def: ConvexBuilderDef<
-      TFunctionType,
-      TArgsValidator,
-      TReturnsValidator,
-      TVisibility
-    >
+    def: ConvexBuilderDef<TFunctionType, TArgsValidator, TReturnsValidator>
   ) {
     this.def = def;
   }
@@ -54,24 +42,16 @@ export class ConvexBuilderWithFunctionKind<
   $context<U extends Context>(): ConvexBuilderWithFunctionKind<
     TDataModel,
     TFunctionType,
-    U & EmptyObject,
     U,
     TArgsValidator,
-    TReturnsValidator,
-    TVisibility,
-    THasHandler,
-    THandlerReturn
+    TReturnsValidator
   > {
     return new ConvexBuilderWithFunctionKind<
       TDataModel,
       TFunctionType,
-      U & EmptyObject,
       U,
       TArgsValidator,
-      TReturnsValidator,
-      TVisibility,
-      THasHandler,
-      THandlerReturn
+      TReturnsValidator
     >({
       ...this.def,
       middlewares: [],
@@ -79,8 +59,8 @@ export class ConvexBuilderWithFunctionKind<
   }
 
   middleware<UOutContext extends Context>(
-    middleware: ConvexMiddleware<TInitialContext, UOutContext>
-  ): ConvexMiddleware<TInitialContext, UOutContext>;
+    middleware: ConvexMiddleware<TCurrentContext, UOutContext>
+  ): ConvexMiddleware<TCurrentContext, UOutContext>;
   middleware<UInContext extends Context, UOutContext extends Context>(
     middleware: ConvexMiddleware<UInContext, UOutContext>
   ): ConvexMiddleware<UInContext, UOutContext>;
@@ -95,24 +75,16 @@ export class ConvexBuilderWithFunctionKind<
   ): ConvexBuilderWithFunctionKind<
     TDataModel,
     TFunctionType,
-    TInitialContext,
     TCurrentContext & UOutContext,
     TArgsValidator,
-    TReturnsValidator,
-    TVisibility,
-    THasHandler,
-    THandlerReturn
+    TReturnsValidator
   > {
     return new ConvexBuilderWithFunctionKind<
       TDataModel,
       TFunctionType,
-      TInitialContext,
       TCurrentContext & UOutContext,
       TArgsValidator,
-      TReturnsValidator,
-      TVisibility,
-      THasHandler,
-      THandlerReturn
+      TReturnsValidator
     >({
       ...this.def,
       middlewares: [...this.def.middlewares, middleware as AnyConvexMiddleware],
@@ -124,13 +96,9 @@ export class ConvexBuilderWithFunctionKind<
   ): ConvexBuilderWithFunctionKind<
     TDataModel,
     TFunctionType,
-    TInitialContext,
     TCurrentContext,
     ToConvexArgsValidator<UInput>,
-    TReturnsValidator,
-    TVisibility,
-    THasHandler,
-    THandlerReturn
+    TReturnsValidator
   > {
     const convexValidator = isZodSchema(validator)
       ? (toConvexValidator(validator) as ToConvexArgsValidator<UInput>)
@@ -139,13 +107,9 @@ export class ConvexBuilderWithFunctionKind<
     return new ConvexBuilderWithFunctionKind<
       TDataModel,
       TFunctionType,
-      TInitialContext,
       TCurrentContext,
       ToConvexArgsValidator<UInput>,
-      TReturnsValidator,
-      TVisibility,
-      THasHandler,
-      THandlerReturn
+      TReturnsValidator
     >({
       ...this.def,
       argsValidator: convexValidator,
@@ -157,13 +121,9 @@ export class ConvexBuilderWithFunctionKind<
   ): ConvexBuilderWithFunctionKind<
     TDataModel,
     TFunctionType,
-    TInitialContext,
     TCurrentContext,
     TArgsValidator,
-    ToConvexReturnsValidator<UReturns>,
-    TVisibility,
-    THasHandler,
-    THandlerReturn
+    ToConvexReturnsValidator<UReturns>
   > {
     const convexValidator = isZodSchema(validator)
       ? (toConvexValidator(validator) as ToConvexReturnsValidator<UReturns>)
@@ -172,13 +132,9 @@ export class ConvexBuilderWithFunctionKind<
     return new ConvexBuilderWithFunctionKind<
       TDataModel,
       TFunctionType,
-      TInitialContext,
       TCurrentContext,
       TArgsValidator,
-      ToConvexReturnsValidator<UReturns>,
-      TVisibility,
-      THasHandler,
-      THandlerReturn
+      ToConvexReturnsValidator<UReturns>
     >({
       ...this.def,
       returnsValidator: convexValidator,
@@ -186,11 +142,10 @@ export class ConvexBuilderWithFunctionKind<
   }
 
   handler<
-    TReturn extends [TReturnsValidator] extends [ConvexReturnsValidator]
-      ? ExpectedReturnType<TReturnsValidator>
-      : any = [TReturnsValidator] extends [ConvexReturnsValidator]
-      ? ExpectedReturnType<TReturnsValidator>
-      : any,
+    TReturn extends InferredHandlerReturn<
+      TReturnsValidator,
+      any
+    > = InferredHandlerReturn<TReturnsValidator, any>,
   >(
     handlerFn: (
       context: TCurrentContext,
@@ -199,21 +154,15 @@ export class ConvexBuilderWithFunctionKind<
   ): ConvexBuilderWithHandler<
     TDataModel,
     TFunctionType,
-    TInitialContext,
     TCurrentContext,
     TArgsValidator,
     TReturnsValidator,
-    TVisibility,
-    [TReturnsValidator] extends [ConvexReturnsValidator]
-      ? ExpectedReturnType<TReturnsValidator>
-      : TReturn
+    InferredHandlerReturn<TReturnsValidator, TReturn>
   > &
     CallableBuilder<
       TCurrentContext,
       TArgsValidator,
-      [TReturnsValidator] extends [ConvexReturnsValidator]
-        ? ExpectedReturnType<TReturnsValidator>
-        : TReturn
+      InferredHandlerReturn<TReturnsValidator, TReturn>
     > {
     if (this.def.handler) {
       throw new Error(
@@ -231,18 +180,14 @@ export class ConvexBuilderWithFunctionKind<
       return handlerFn(transformedCtx as TCurrentContext, baseArgs);
     };
 
-    type InferredReturn = [TReturnsValidator] extends [ConvexReturnsValidator]
-      ? ExpectedReturnType<TReturnsValidator>
-      : TReturn;
+    type InferredReturn = InferredHandlerReturn<TReturnsValidator, TReturn>;
 
     return new ConvexBuilderWithHandler<
       TDataModel,
       TFunctionType,
-      TInitialContext,
       TCurrentContext,
       TArgsValidator,
       TReturnsValidator,
-      TVisibility,
       InferredReturn
     >({
       ...this.def,
@@ -250,11 +195,9 @@ export class ConvexBuilderWithFunctionKind<
     }) as ConvexBuilderWithHandler<
       TDataModel,
       TFunctionType,
-      TInitialContext,
       TCurrentContext,
       TArgsValidator,
       TReturnsValidator,
-      TVisibility,
       InferredReturn
     > &
       CallableBuilder<TCurrentContext, TArgsValidator, InferredReturn>;

package/src/ConvexBuilderWithHandler.ts

@@ -28,28 +28,20 @@ import type {
 
 export class ConvexBuilderWithHandler<
   TDataModel extends GenericDataModel = GenericDataModel,
-  TFunctionType extends FunctionType | undefined = undefined,
-  TInitialContext extends Context = EmptyObject,
+  TFunctionType extends FunctionType = FunctionType,
   TCurrentContext extends Context = EmptyObject,
   TArgsValidator extends ConvexArgsValidator | undefined = undefined,
   TReturnsValidator extends ConvexReturnsValidator | undefined = undefined,
-  TVisibility extends Visibility = "public",
   THandlerReturn = any,
 > {
   private def: ConvexBuilderDef<
     TFunctionType,
     TArgsValidator,
-    TReturnsValidator,
-    TVisibility
+    TReturnsValidator
   >;
 
   constructor(
-    def: ConvexBuilderDef<
-      TFunctionType,
-      TArgsValidator,
-      TReturnsValidator,
-      TVisibility
-    >
+    def: ConvexBuilderDef<TFunctionType, TArgsValidator, TReturnsValidator>
   ) {
     this.def = def;
 
@@ -92,11 +84,9 @@ export class ConvexBuilderWithHandler<
   ): ConvexBuilderWithHandler<
     TDataModel,
     TFunctionType,
-    TInitialContext,
     TCurrentContext & UOutContext,
     TArgsValidator,
     TReturnsValidator,
-    TVisibility,
     THandlerReturn
   > &
     CallableBuilder<
@@ -107,11 +97,9 @@ export class ConvexBuilderWithHandler<
     return new ConvexBuilderWithHandler<
       TDataModel,
       TFunctionType,
-      TInitialContext,
       TCurrentContext & UOutContext,
       TArgsValidator,
       TReturnsValidator,
-      TVisibility,
       THandlerReturn
     >({
       ...this.def,
@@ -119,11 +107,9 @@ export class ConvexBuilderWithHandler<
     }) as ConvexBuilderWithHandler<
       TDataModel,
       TFunctionType,
-      TInitialContext,
       TCurrentContext & UOutContext,
       TArgsValidator,
       TReturnsValidator,
-      TVisibility,
       THandlerReturn
     > &
       CallableBuilder<

package/src/builder.test-d.ts

@@ -9,7 +9,6 @@ import {
   type DataModelFromSchemaDefinition,
 } from "convex/server";
 import { createBuilder } from "./builder";
-import { input, returns } from "./decorators";
 import type { QueryCtx, MutationCtx } from "./types";
 
 const schema = defineSchema({

package/src/builder.ts

@@ -6,6 +6,5 @@ export function createBuilder<
 >(): ConvexBuilder<TDataModel> {
   return new ConvexBuilder<TDataModel>({
     middlewares: [],
-    visibility: "public",
   });
 }

package/src/index.ts

@@ -24,12 +24,3 @@ export {
   type ValidatorInput,
   type ReturnsValidatorInput,
 } from "./zod_support";
-
-export {
-  input,
-  returns,
-  getMetadata,
-  getMethodMetadataFromClass,
-  makeCallableMethods,
-  makeCallable,
-} from "./decorators";

package/src/types.ts

@@ -74,16 +74,14 @@ export type CallableBuilder<
   ): (args: InferredArgs<TArgsValidator>) => Promise<THandlerReturn>;
 };
 export interface ConvexBuilderDef<
-  TFunctionType extends FunctionType | undefined,
-  TArgsValidator extends ConvexArgsValidator | undefined,
-  TReturnsValidator extends ConvexReturnsValidator | undefined,
-  TVisibility extends Visibility,
+  TFunctionType extends FunctionType | undefined = undefined,
+  TArgsValidator extends ConvexArgsValidator | undefined = undefined,
+  TReturnsValidator extends ConvexReturnsValidator | undefined = undefined,
 > {
   functionType?: TFunctionType;
   middlewares: readonly AnyConvexMiddleware[];
   argsValidator?: TArgsValidator;
   returnsValidator?: TReturnsValidator;
-  visibility: TVisibility;
   handler?: (context: Context, input: any) => Promise<any>;
 }
 export type ExpectedReturnType<
@@ -91,5 +89,13 @@ export type ExpectedReturnType<
 > = TReturnsValidator extends ConvexReturnsValidator
   ? InferReturns<TReturnsValidator>
   : any;
+
+export type InferredHandlerReturn<
+  TReturnsValidator extends ConvexReturnsValidator | undefined,
+  TReturn,
+> = [TReturnsValidator] extends [ConvexReturnsValidator]
+  ? ExpectedReturnType<TReturnsValidator>
+  : TReturn;
+
 export type InferredArgs<T extends ConvexArgsValidator | undefined> =
   T extends ConvexArgsValidator ? InferArgs<T> : EmptyObject;

package/dist/decorators.d.ts

@@ -1,40 +0,0 @@
-import type { ConvexArgsValidator, ConvexReturnsValidator } from "./types";
-import type { ValidatorInput, ReturnsValidatorInput } from "./zod_support";
-interface CallableMethodMetadata {
-    inputValidator?: ConvexArgsValidator;
-    inputValidatorOriginal?: ValidatorInput;
-    returnsValidator?: ConvexReturnsValidator;
-    returnsValidatorOriginal?: ReturnsValidatorInput;
-}
-/**
- * Decorator to specify input validation for a callable method
- * Compatible with both legacy (esbuild) and modern decorator syntax
- */
-export declare function input<UInput extends ValidatorInput>(validator: UInput): any;
-/**
- * Decorator to specify return validation for a callable method
- * Compatible with both legacy (esbuild) and modern decorator syntax
- */
-export declare function returns<UReturns extends ReturnsValidatorInput>(validator: UReturns): any;
-/**
- * Get metadata for a specific method
- */
-export declare function getMetadata(target: any, propertyKey: string | symbol): CallableMethodMetadata;
-/**
- * Get metadata for a method from a class constructor
- * This is the public API for accessing decorator metadata
- */
-export declare function getMethodMetadataFromClass<T extends new (...args: any[]) => any>(ModelClass: T, methodName: string | symbol): CallableMethodMetadata;
-/**
- * Create a proxy that automatically makes all decorated methods callable
- * Usage: const callableModel = makeCallableMethods(new MyQueryModel(context));
- * Then: await callableModel.listNumbers({ count: 10 });
- */
-export declare function makeCallableMethods<T extends object>(instance: T): T;
-/**
- * Make a method callable with validation
- * This wraps the original method to validate inputs and optionally outputs
- */
-export declare function makeCallable<T extends object>(instance: T, methodName: keyof T): (...args: any[]) => Promise<any>;
-export {};
-//# sourceMappingURL=decorators.d.ts.map

package/dist/decorators.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAO3E,UAAU,sBAAsB;IAC9B,cAAc,CAAC,EAAE,mBAAmB,CAAC;IACrC,sBAAsB,CAAC,EAAE,cAAc,CAAC;IACxC,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAC1C,wBAAwB,CAAC,EAAE,qBAAqB,CAAC;CAClD;AA6BD;;;GAGG;AACH,wBAAgB,KAAK,CAAC,MAAM,SAAS,cAAc,EACjD,SAAS,EAAE,MAAM,GAChB,GAAG,CAuBL;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,QAAQ,SAAS,qBAAqB,EAC5D,SAAS,EAAE,QAAQ,GAClB,GAAG,CAyBL;AAED;;GAEG;AACH,wBAAgB,WAAW,CACzB,MAAM,EAAE,GAAG,EACX,WAAW,EAAE,MAAM,GAAG,MAAM,GAC3B,sBAAsB,CAExB;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAC9E,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,MAAM,GAAG,MAAM,GAC1B,sBAAsB,CAExB;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAgCpE;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,EAC3C,QAAQ,EAAE,CAAC,EACX,UAAU,EAAE,MAAM,CAAC,GAClB,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAwClC"}

package/dist/decorators.js

@@ -1,148 +0,0 @@
-import { isZodSchema, toConvexValidator } from "./zod_support";
-// Metadata stored on decorated methods
-// Using WeakMap for legacy decorator compatibility with esbuild
-const methodMetadataMap = new WeakMap();
-// Get metadata from a method (legacy decorator support)
-function getMethodMetadata(target, propertyKey) {
-    const prototype = typeof target === "function" ? target.prototype : target;
-    const metadataMap = methodMetadataMap.get(prototype);
-    if (!metadataMap)
-        return {};
-    return metadataMap.get(propertyKey) || {};
-}
-// Set metadata on a method (legacy decorator support)
-function setMethodMetadata(target, propertyKey, metadata) {
-    const prototype = typeof target === "function" ? target.prototype : target;
-    let metadataMap = methodMetadataMap.get(prototype);
-    if (!metadataMap) {
-        metadataMap = new Map();
-        methodMetadataMap.set(prototype, metadataMap);
-    }
-    const existing = metadataMap.get(propertyKey) || {};
-    metadataMap.set(propertyKey, { ...existing, ...metadata });
-}
-/**
- * Decorator to specify input validation for a callable method
- * Compatible with both legacy (esbuild) and modern decorator syntax
- */
-export function input(validator) {
-    return function (target, propertyKey, descriptor) {
-        // Handle both legacy (3 args) and modern (2 args) decorator calls
-        if (descriptor === undefined) {
-            // Modern decorator - get descriptor from target
-            descriptor = Object.getOwnPropertyDescriptor(target, propertyKey) || {};
-        }
-        const convexValidator = isZodSchema(validator)
-            ? toConvexValidator(validator)
-            : validator;
-        setMethodMetadata(target, propertyKey, {
-            inputValidator: convexValidator,
-            inputValidatorOriginal: validator,
-        });
-        return descriptor;
-    };
-}
-/**
- * Decorator to specify return validation for a callable method
- * Compatible with both legacy (esbuild) and modern decorator syntax
- */
-export function returns(validator) {
-    return function (target, propertyKey, descriptor) {
-        // Handle both legacy (3 args) and modern (2 args) decorator calls
-        if (descriptor === undefined) {
-            // Modern decorator - get descriptor from target
-            descriptor = Object.getOwnPropertyDescriptor(target, propertyKey) || {};
-        }
-        // For returns validators, we need GenericValidator, not PropertyValidators
-        // If it's a Zod schema, convert it; otherwise assume it's already a GenericValidator
-        const convexValidator = isZodSchema(validator)
-            ? toConvexValidator(validator)
-            : validator;
-        setMethodMetadata(target, propertyKey, {
-            returnsValidator: convexValidator,
-            returnsValidatorOriginal: validator,
-        });
-        return descriptor;
-    };
-}
-/**
- * Get metadata for a specific method
- */
-export function getMetadata(target, propertyKey) {
-    return getMethodMetadata(target, propertyKey);
-}
-/**
- * Get metadata for a method from a class constructor
- * This is the public API for accessing decorator metadata
- */
-export function getMethodMetadataFromClass(ModelClass, methodName) {
-    return getMethodMetadata(ModelClass.prototype, methodName);
-}
-/**
- * Create a proxy that automatically makes all decorated methods callable
- * Usage: const callableModel = makeCallableMethods(new MyQueryModel(context));
- * Then: await callableModel.listNumbers({ count: 10 });
- */
-export function makeCallableMethods(instance) {
-    const callableMethods = new Map();
-    const prototype = Object.getPrototypeOf(instance);
-    // Find all methods on the prototype and check if they have metadata
-    const propertyNames = Object.getOwnPropertyNames(prototype);
-    for (const propName of propertyNames) {
-        if (propName !== "constructor") {
-            const metadata = getMethodMetadata(prototype, propName);
-            // If method has metadata, make it callable
-            if (metadata.inputValidator || metadata.returnsValidator) {
-                callableMethods.set(propName, makeCallable(instance, propName));
-            }
-        }
-    }
-    return new Proxy(instance, {
-        get(target, prop) {
-            // Return callable version if available
-            if (callableMethods.has(prop)) {
-                return callableMethods.get(prop);
-            }
-            // Otherwise return original property
-            return target[prop];
-        },
-    });
-}
-/**
- * Make a method callable with validation
- * This wraps the original method to validate inputs and optionally outputs
- */
-export function makeCallable(instance, methodName) {
-    const originalMethod = instance[methodName];
-    if (typeof originalMethod !== "function") {
-        throw new Error(`Method '${String(methodName)}' is not a function on ${instance.constructor.name}`);
-    }
-    // Get metadata from the prototype
-    const prototype = Object.getPrototypeOf(instance);
-    const metadata = getMethodMetadata(prototype, methodName);
-    return async (...args) => {
-        // Validate input if validator is provided
-        if (metadata.inputValidatorOriginal) {
-            const input = args[0] || {};
-            if (isZodSchema(metadata.inputValidatorOriginal)) {
-                // Use Zod's parse for runtime validation
-                const parsed = metadata.inputValidatorOriginal.parse(input);
-                args[0] = parsed;
-            }
-            // For Convex validators, we skip runtime validation
-            // as they're primarily for type checking and Convex handles validation
-        }
-        // Call the original method
-        const result = await originalMethod.apply(instance, args);
-        // Validate return value if validator is provided
-        if (metadata.returnsValidatorOriginal) {
-            if (isZodSchema(metadata.returnsValidatorOriginal)) {
-                // Use Zod's parse for runtime validation
-                return metadata.returnsValidatorOriginal.parse(result);
-            }
-            // For Convex validators, we skip runtime validation
-        }
-        return result;
-    };
-}
-//# sourceMappingURL=decorators.js.map

package/dist/decorators.js.map

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

package/src/decorators.ts

@@ -1,218 +0,0 @@
-import type {
-  ConvexArgsValidator,
-  ConvexReturnsValidator,
-} from "./types";
-import type { ValidatorInput, ReturnsValidatorInput } from "./zod_support";
-import { isZodSchema, toConvexValidator } from "./zod_support";
-
-// Metadata stored on decorated methods
-// Using WeakMap for legacy decorator compatibility with esbuild
-const methodMetadataMap = new WeakMap<object, Map<string | symbol, CallableMethodMetadata>>();
-
-interface CallableMethodMetadata {
-  inputValidator?: ConvexArgsValidator;
-  inputValidatorOriginal?: ValidatorInput; // Store original for runtime validation
-  returnsValidator?: ConvexReturnsValidator;
-  returnsValidatorOriginal?: ReturnsValidatorInput; // Store original for runtime validation
-}
-
-// Get metadata from a method (legacy decorator support)
-function getMethodMetadata(
-  target: any,
-  propertyKey: string | symbol,
-): CallableMethodMetadata {
-  const prototype = typeof target === "function" ? target.prototype : target;
-  const metadataMap = methodMetadataMap.get(prototype);
-  if (!metadataMap) return {};
-  return metadataMap.get(propertyKey) || {};
-}
-
-// Set metadata on a method (legacy decorator support)
-function setMethodMetadata(
-  target: any,
-  propertyKey: string | symbol,
-  metadata: CallableMethodMetadata,
-): void {
-  const prototype = typeof target === "function" ? target.prototype : target;
-  let metadataMap = methodMetadataMap.get(prototype);
-  if (!metadataMap) {
-    metadataMap = new Map();
-    methodMetadataMap.set(prototype, metadataMap);
-  }
-  const existing = metadataMap.get(propertyKey) || {};
-  metadataMap.set(propertyKey, { ...existing, ...metadata });
-}
-
-/**
- * Decorator to specify input validation for a callable method
- * Compatible with both legacy (esbuild) and modern decorator syntax
- */
-export function input<UInput extends ValidatorInput>(
-  validator: UInput,
-): any {
-  return function (
-    target: any,
-    propertyKey: string | symbol,
-    descriptor?: PropertyDescriptor,
-  ) {
-    // Handle both legacy (3 args) and modern (2 args) decorator calls
-    if (descriptor === undefined) {
-      // Modern decorator - get descriptor from target
-      descriptor = Object.getOwnPropertyDescriptor(target, propertyKey) || {};
-    }
-
-    const convexValidator = isZodSchema(validator)
-      ? toConvexValidator(validator)
-      : (validator as ConvexArgsValidator);
-
-    setMethodMetadata(target, propertyKey, {
-      inputValidator: convexValidator,
-      inputValidatorOriginal: validator,
-    });
-
-    return descriptor;
-  };
-}
-
-/**
- * Decorator to specify return validation for a callable method
- * Compatible with both legacy (esbuild) and modern decorator syntax
- */
-export function returns<UReturns extends ReturnsValidatorInput>(
-  validator: UReturns,
-): any {
-  return function (
-    target: any,
-    propertyKey: string | symbol,
-    descriptor?: PropertyDescriptor,
-  ) {
-    // Handle both legacy (3 args) and modern (2 args) decorator calls
-    if (descriptor === undefined) {
-      // Modern decorator - get descriptor from target
-      descriptor = Object.getOwnPropertyDescriptor(target, propertyKey) || {};
-    }
-
-    // For returns validators, we need GenericValidator, not PropertyValidators
-    // If it's a Zod schema, convert it; otherwise assume it's already a GenericValidator
-    const convexValidator: ConvexReturnsValidator = isZodSchema(validator)
-      ? (toConvexValidator(validator) as ConvexReturnsValidator)
-      : (validator as ConvexReturnsValidator);
-
-    setMethodMetadata(target, propertyKey, {
-      returnsValidator: convexValidator,
-      returnsValidatorOriginal: validator,
-    });
-
-    return descriptor;
-  };
-}
-
-/**
- * Get metadata for a specific method
- */
-export function getMetadata(
-  target: any,
-  propertyKey: string | symbol,
-): CallableMethodMetadata {
-  return getMethodMetadata(target, propertyKey);
-}
-
-/**
- * Get metadata for a method from a class constructor
- * This is the public API for accessing decorator metadata
- */
-export function getMethodMetadataFromClass<T extends new (...args: any[]) => any>(
-  ModelClass: T,
-  methodName: string | symbol,
-): CallableMethodMetadata {
-  return getMethodMetadata(ModelClass.prototype, methodName);
-}
-
-/**
- * Create a proxy that automatically makes all decorated methods callable
- * Usage: const callableModel = makeCallableMethods(new MyQueryModel(context));
- * Then: await callableModel.listNumbers({ count: 10 });
- */
-export function makeCallableMethods<T extends object>(instance: T): T {
-  const callableMethods = new Map<
-    string | symbol,
-    (...args: any[]) => Promise<any>
-  >();
-  const prototype = Object.getPrototypeOf(instance);
-
-  // Find all methods on the prototype and check if they have metadata
-  const propertyNames = Object.getOwnPropertyNames(prototype);
-  for (const propName of propertyNames) {
-    if (propName !== "constructor") {
-      const metadata = getMethodMetadata(prototype, propName);
-      // If method has metadata, make it callable
-      if (metadata.inputValidator || metadata.returnsValidator) {
-        callableMethods.set(
-          propName,
-          makeCallable(instance, propName as keyof T),
-        );
-      }
-    }
-  }
-
-  return new Proxy(instance, {
-    get(target, prop) {
-      // Return callable version if available
-      if (callableMethods.has(prop)) {
-        return callableMethods.get(prop);
-      }
-      // Otherwise return original property
-      return (target as any)[prop];
-    },
-  });
-}
-
-/**
- * Make a method callable with validation
- * This wraps the original method to validate inputs and optionally outputs
- */
-export function makeCallable<T extends object>(
-  instance: T,
-  methodName: keyof T,
-): (...args: any[]) => Promise<any> {
-  const originalMethod = (instance as any)[methodName];
-
-  if (typeof originalMethod !== "function") {
-    throw new Error(
-      `Method '${String(methodName)}' is not a function on ${instance.constructor.name}`,
-    );
-  }
-
-  // Get metadata from the prototype
-  const prototype = Object.getPrototypeOf(instance);
-  const metadata = getMethodMetadata(prototype, methodName as string | symbol);
-
-  return async (...args: any[]) => {
-    // Validate input if validator is provided
-    if (metadata.inputValidatorOriginal) {
-      const input = args[0] || {};
-      if (isZodSchema(metadata.inputValidatorOriginal)) {
-        // Use Zod's parse for runtime validation
-        const parsed = metadata.inputValidatorOriginal.parse(input);
-        args[0] = parsed;
-      }
-      // For Convex validators, we skip runtime validation
-      // as they're primarily for type checking and Convex handles validation
-    }
-
-    // Call the original method
-    const result = await originalMethod.apply(instance, args);
-
-    // Validate return value if validator is provided
-    if (metadata.returnsValidatorOriginal) {
-      if (isZodSchema(metadata.returnsValidatorOriginal)) {
-        // Use Zod's parse for runtime validation
-        return metadata.returnsValidatorOriginal.parse(result);
-      }
-      // For Convex validators, we skip runtime validation
-    }
-
-    return result;
-  };
-}
-