@confect/core 4.0.0 → 6.0.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @confect/core
 
+## 6.0.0
+
+### Minor Changes
+
+- df95ce7: Add `Ref.OptionalArgs` type utility to `@confect/core` for conditionally optional function args. `QueryRunner`, `MutationRunner`, and `ActionRunner` now accept optional args for no-arg Confect functions. `useQuery`, `useMutation`, and `useAction` now accept optional args for no-arg Confect functions. `TestConfect` `query`/`mutation`/`action` helpers now accept optional args for no-arg Confect functions.
+
+### Patch Changes
+
+- a8083e8: Fix table field path inference when a schema has a `name` field and an optional Convex ID or bytes field.
+
+## 5.0.0
+
 ## 4.0.0
 
 ## 3.0.0

package/dist/FunctionProvenance.d.ts

@@ -1,6 +1,6 @@
 import { Data, Schema } from "effect";
-import * as effect_Unify0 from "effect/Unify";
 import { DefaultFunctionArgs } from "convex/server";
+import * as effect_Unify0 from "effect/Unify";
 
 //#region src/FunctionProvenance.d.ts
 declare namespace FunctionProvenance_d_exports {
@@ -11,10 +11,7 @@ type FunctionProvenance = Data.TaggedEnum<{
     args: Schema.Schema.AnyNoContext;
     returns: Schema.Schema.AnyNoContext;
   };
-  Convex: {
-    /** @internal */_args: DefaultFunctionArgs; /** @internal */
-    _returns: any;
-  };
+  Convex: {};
 }>;
 interface Confect<Args extends Schema.Schema.AnyNoContext, Returns extends Schema.Schema.AnyNoContext> {
   readonly _tag: "Confect";

package/dist/FunctionProvenance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FunctionProvenance.d.ts","names":[],"sources":["../src/FunctionProvenance.ts"],"mappings":";;;;;;;;KAIY,kBAAA,GAAqB,IAAA,CAAK,UAAA;EACpC,OAAA;IACE,IAAA,EAAM,MAAA,CAAO,MAAA,CAAO,YAAA;IACpB,OAAA,EAAS,MAAA,CAAO,MAAA,CAAO,YAAA;EAAA;EAEzB,MAAA;oBAEE,KAAA,EAAO,mBAAA;IAEP,QAAA;EAAA;AAAA;AAAA,UAIa,OAAA,cACF,MAAA,CAAO,MAAA,CAAO,YAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;EAAA,SAErB,IAAA;EAAA,SACA,IAAA,EAAM,IAAA;EAAA,SACN,OAAA,EAAS,OAAA;AAAA;AAAA,UAGH,UAAA,SAAmB,OAAA,CAClC,MAAA,CAAO,MAAA,CAAO,YAAA,EACd,MAAA,CAAO,MAAA,CAAO,YAAA;AAAA,UAGC,MAAA,cAAoB,mBAAA;EAAA,SAC1B,IAAA;EAAA,SACA,KAAA,EAAO,IAAA;EAAA,SACP,QAAA,EAAU,OAAA;AAAA;AAAA,UAGJ,SAAA,SAAkB,MAAA,CAAO,mBAAA;AAAA,cAE7B,kBAAA;EAAA;;mBAjCH,MAAA,CAAO,MAAA,CAAO,YAAA;IAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;EAAA;EAAA;;oBAIhB,mBAAA;IAAA;;;;mBALD,MAAA,CAAO,MAAA,CAAO,YAAA;IAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;EAAA;IAAA;;;oBAIhB,mBAAA;IAAA;;;;;;;;uBALD,MAAA,CAAO,MAAA,CAAO,YAAA;QAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;MAAA;MAAA;;wBAIhB,mBAAA;QAAA;;;;qBALD,MAAA,CAAO,MAAA,CAAO,YAAA;MAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;IAAA;MAAA;sBAIhB,mBAAA;MAAA;;;;;uBALD,MAAA,CAAO,MAAA,CAAO,YAAA;QAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;MAAA;MAAA;;wBAIhB,mBAAA;QAAA;;;;qBALD,MAAA,CAAO,MAAA,CAAO,YAAA;MAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;IAAA;MAAA;sBAIhB,mBAAA;MAAA;;;;cA8BE,OAAA,gBACE,MAAA,CAAO,MAAA,CAAO,YAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA,EAE9B,IAAA,EAAM,IAAA,EACN,OAAA,EAAS,OAAA;EAAA;iBAxCD,MAAA,CAAO,MAAA,CAAO,YAAA;EAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;AAAA;AAAA,cA8Cd,MAAA,iBAAwB,mBAAA;EAAA;kBA1C1B,mBAAA;EAAA"}
+{"version":3,"file":"FunctionProvenance.d.ts","names":[],"sources":["../src/FunctionProvenance.ts"],"mappings":";;;;;;;;KAIY,kBAAA,GAAqB,IAAA,CAAK,UAAA;EACpC,OAAA;IACE,IAAA,EAAM,MAAA,CAAO,MAAA,CAAO,YAAA;IACpB,OAAA,EAAS,MAAA,CAAO,MAAA,CAAO,YAAA;EAAA;EAEzB,MAAA;AAAA;AAAA,UAQe,OAAA,cACF,MAAA,CAAO,MAAA,CAAO,YAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;EAAA,SAErB,IAAA;EAAA,SACA,IAAA,EAAM,IAAA;EAAA,SACN,OAAA,EAAS,OAAA;AAAA;AAAA,UAGH,UAAA,SAAmB,OAAA,CAClC,MAAA,CAAO,MAAA,CAAO,YAAA,EACd,MAAA,CAAO,MAAA,CAAO,YAAA;AAAA,UAGC,MAAA,cAAoB,mBAAA;EAAA,SAC1B,IAAA;EAAA,SACA,KAAA,EAAO,IAAA;EAAA,SACP,QAAA,EAAU,OAAA;AAAA;AAAA,UAGJ,SAAA,SAAkB,MAAA,CAAO,mBAAA;AAAA,cAE7B,kBAAA;EAAA;;mBAjCH,MAAA,CAAO,MAAA,CAAO,YAAA;IAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;EAAA;EAAA;;oBAIhB,mBAAA;IAAA;;;;mBALD,MAAA,CAAO,MAAA,CAAO,YAAA;IAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;EAAA;IAAA;;;oBAIhB,mBAAA;IAAA;;;;;;;;uBALD,MAAA,CAAO,MAAA,CAAO,YAAA;QAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;MAAA;MAAA;;wBAIhB,mBAAA;QAAA;;;;qBALD,MAAA,CAAO,MAAA,CAAO,YAAA;MAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;IAAA;MAAA;sBAIhB,mBAAA;MAAA;;;;;uBALD,MAAA,CAAO,MAAA,CAAO,YAAA;QAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;MAAA;MAAA;;wBAIhB,mBAAA;QAAA;;;;qBALD,MAAA,CAAO,MAAA,CAAO,YAAA;MAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;IAAA;MAAA;sBAIhB,mBAAA;MAAA;;;;cA8BE,OAAA,gBACE,MAAA,CAAO,MAAA,CAAO,YAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA,EAE9B,IAAA,EAAM,IAAA,EACN,OAAA,EAAS,OAAA;EAAA;iBAxCD,MAAA,CAAO,MAAA,CAAO,YAAA;EAAA,kBACX,MAAA,CAAO,MAAA,CAAO,YAAA;AAAA;AAAA,cA8Cd,MAAA,iBAAwB,mBAAA;EAAA;kBA1C1B,mBAAA;EAAA"}

package/dist/GroupSpec.d.ts

@@ -8,20 +8,20 @@ declare namespace GroupSpec_d_exports {
 declare const TypeId = "@confect/core/GroupSpec";
 type TypeId = typeof TypeId;
 declare const isGroupSpec: (u: unknown) => u is Any;
-interface GroupSpec<Runtime$2 extends Runtime, Name_ extends string, Functions_ extends AnyWithPropsWithRuntime$1<Runtime$2> = never, Groups_ extends AnyWithPropsWithRuntime<Runtime$2> = never> {
+interface GroupSpec<Runtime$1 extends Runtime, Name_ extends string, Functions_ extends AnyWithPropsWithRuntime$1<Runtime$1> = never, Groups_ extends AnyWithPropsWithRuntime<Runtime$1> = never> {
   readonly [TypeId]: TypeId;
-  readonly runtime: Runtime$2;
+  readonly runtime: Runtime$1;
   readonly name: Name_;
-  readonly functions: { [FunctionName in Name$1<AnyWithPropsWithRuntime$1<Runtime$2>>]: WithName$1<Functions_, FunctionName> };
+  readonly functions: { [FunctionName in Name$1<AnyWithPropsWithRuntime$1<Runtime$1>>]: WithName$1<Functions_, FunctionName> };
   readonly groups: { [GroupName in Name<Groups_>]: WithName<Groups_, GroupName> };
-  addFunction<Function extends AnyWithPropsWithRuntime$1<Runtime$2>>(function_: Function): GroupSpec<Runtime$2, Name_, Functions_ | Function, Groups_>;
-  addGroup<Group extends AnyWithPropsWithRuntime<Runtime$2>>(group: Group): GroupSpec<Runtime$2, Name_, Functions_, Groups_ | Group>;
+  addFunction<Function extends AnyWithPropsWithRuntime$1<Runtime$1>>(function_: Function): GroupSpec<Runtime$1, Name_, Functions_ | Function, Groups_>;
+  addGroup<Group extends AnyWithPropsWithRuntime<Runtime$1>>(group: Group): GroupSpec<Runtime$1, Name_, Functions_, Groups_ | Group>;
 }
 interface Any {
   readonly [TypeId]: TypeId;
 }
 interface AnyWithProps extends GroupSpec<Runtime, string, AnyWithProps$1, AnyWithProps> {}
-interface AnyWithPropsWithRuntime<Runtime$1 extends Runtime> extends GroupSpec<Runtime$1, string, AnyWithPropsWithRuntime$1<Runtime$1>, AnyWithPropsWithRuntime<Runtime$1>> {}
+interface AnyWithPropsWithRuntime<Runtime$2 extends Runtime> extends GroupSpec<Runtime$2, string, AnyWithPropsWithRuntime$1<Runtime$2>, AnyWithPropsWithRuntime<Runtime$2>> {}
 type Name<Group extends AnyWithProps> = Group["name"];
 type Functions<Group extends AnyWithProps> = Group["functions"][keyof Group["functions"]];
 type Groups<Group extends AnyWithProps> = Group["groups"][keyof Group["groups"]];

package/dist/Ref.d.ts

@@ -1,10 +1,11 @@
 import { AnyAction as AnyAction$1, AnyMutation as AnyMutation$1, AnyQuery as AnyQuery$1, GetFunctionType as GetFunctionType$1, GetRuntime as GetRuntime$1, RuntimeAndFunctionType } from "./RuntimeAndFunctionType.js";
 import { AnyWithProps, Args as Args$1, GetFunctionVisibility as GetFunctionVisibility$1, GetRuntimeAndFunctionType as GetRuntimeAndFunctionType$1, Returns as Returns$1 } from "./FunctionSpec.js";
-import { FunctionVisibility } from "convex/server";
+import { Effect, ParseResult } from "effect";
+import { FunctionReference as FunctionReference$1, FunctionVisibility } from "convex/server";
 
 //#region src/Ref.d.ts
 declare namespace Ref_d_exports {
-  export { Any, AnyAction, AnyInternal, AnyMutation, AnyPublic, AnyPublicAction, AnyPublicMutation, AnyPublicQuery, AnyQuery, Args, FromFunctionSpec, GetFunctionType, GetFunctionVisibility, GetRuntime, GetRuntimeAndFunctionType, Ref, Returns, getConvexFunctionName, getFunctionSpec, make };
+  export { Any, AnyAction, AnyInternal, AnyMutation, AnyPublic, AnyPublicAction, AnyPublicMutation, AnyPublicQuery, AnyQuery, Args, FromFunctionSpec, FunctionReference, GetFunctionType, GetFunctionVisibility, GetRuntime, GetRuntimeAndFunctionType, OptionalArgs, Ref, Returns, decodeReturns, decodeReturnsSync, encodeArgs, encodeArgsSync, getConvexFunctionName, getFunctionReference, make, runWithCodec };
 }
 interface Ref<_RuntimeAndFunctionType extends RuntimeAndFunctionType, _FunctionVisibility extends FunctionVisibility, _Args, _Returns> {
   readonly _RuntimeAndFunctionType?: _RuntimeAndFunctionType;
@@ -26,16 +27,28 @@ type GetRuntime<Ref_> = Ref_ extends Ref<infer RuntimeAndFunctionType_, infer _F
 type GetFunctionType<Ref_> = Ref_ extends Ref<infer RuntimeAndFunctionType_, infer _FunctionVisibility, infer _Args, infer _Returns> ? GetFunctionType$1<RuntimeAndFunctionType_> : never;
 type GetFunctionVisibility<Ref_> = Ref_ extends Ref<infer _RuntimeAndFunctionType, infer FunctionVisibility_, infer _Args, infer _Returns> ? FunctionVisibility_ : never;
 type Args<Ref_> = Ref_ extends Ref<infer _RuntimeAndFunctionType, infer _FunctionVisibility, infer Args_, infer _Returns> ? Args_ : never;
+type OptionalArgs<Ref_ extends Any> = keyof Args<Ref_> extends never ? [args?: Args<Ref_>] : [args: Args<Ref_>];
 type Returns<Ref_> = Ref_ extends Ref<infer _RuntimeAndFunctionType, infer _FunctionVisibility, infer _Args, infer Returns_> ? Returns_ : never;
-type FromFunctionSpec<F extends AnyWithProps> = Ref<GetRuntimeAndFunctionType$1<F>, GetFunctionVisibility$1<F>, Args$1<F>, Returns$1<F>>;
+type FunctionReference<Ref_ extends Any> = FunctionReference$1<GetFunctionType<Ref_>, GetFunctionVisibility<Ref_>>;
+type FromFunctionSpec<FunctionSpec_ extends AnyWithProps> = Ref<GetRuntimeAndFunctionType$1<FunctionSpec_>, GetFunctionVisibility$1<FunctionSpec_>, Args$1<FunctionSpec_>, Returns$1<FunctionSpec_>>;
 declare const make: <FunctionSpec_ extends AnyWithProps>(
 /**
- * This is a Convex "function name" of the format `myGroupDir/myGroupMod:myFunc`.
+ * The namespace portion of a Convex function name, i.e. the part before the
+ * colon. For example, for `myGroupDir/myGroupMod:myFunc` this would be
+ * `myGroupDir/myGroupMod`.
  */
 
-convexFunctionName: string, functionSpec: FunctionSpec_) => FromFunctionSpec<FunctionSpec_>;
-declare const getFunctionSpec: (ref: Any) => AnyWithProps;
+functionNamespace: string, functionSpec: FunctionSpec_) => FromFunctionSpec<FunctionSpec_>;
 declare const getConvexFunctionName: (ref: Any) => string;
+declare const getFunctionReference: <Ref_ extends Any>(ref: Ref_) => FunctionReference<Ref_>;
+declare const encodeArgs: <Ref_ extends Any>(ref: Ref_, args: Args<Ref_>) => Effect.Effect<unknown, ParseResult.ParseError>;
+declare const decodeReturns: <Ref_ extends Any>(ref: Ref_, returns: unknown) => Effect.Effect<Returns<Ref_>, ParseResult.ParseError>;
+declare const encodeArgsSync: <Ref_ extends Any>(ref: Ref_, args: Args<Ref_>) => unknown;
+declare const decodeReturnsSync: <Ref_ extends Any>(ref: Ref_, encodedReturns: unknown) => Returns<Ref_>;
+declare const runWithCodec: {
+  <Ref_ extends Any, E>(ref: Ref_, args: Args<Ref_>, f: (functionReference: FunctionReference<Ref_>, encodedArgs: unknown) => Effect.Effect<unknown, E>): Effect.Effect<Returns<Ref_>, E | ParseResult.ParseError>;
+  <Ref_ extends Any>(ref: Ref_, args: Args<Ref_>, f: (functionReference: FunctionReference<Ref_>, encodedArgs: unknown) => PromiseLike<unknown>): Effect.Effect<Returns<Ref_>, ParseResult.ParseError>;
+};
 //#endregion
-export { Any, AnyAction, AnyInternal, AnyMutation, AnyPublic, AnyPublicAction, AnyPublicMutation, AnyPublicQuery, AnyQuery, Args, FromFunctionSpec, GetFunctionType, GetFunctionVisibility, GetRuntime, GetRuntimeAndFunctionType, Ref, Ref_d_exports, Returns, getConvexFunctionName, getFunctionSpec, make };
+export { Any, AnyAction, AnyInternal, AnyMutation, AnyPublic, AnyPublicAction, AnyPublicMutation, AnyPublicQuery, AnyQuery, Args, FromFunctionSpec, FunctionReference, GetFunctionType, GetFunctionVisibility, GetRuntime, GetRuntimeAndFunctionType, OptionalArgs, Ref, Ref_d_exports, Returns, decodeReturns, decodeReturnsSync, encodeArgs, encodeArgsSync, getConvexFunctionName, getFunctionReference, make, runWithCodec };
 //# sourceMappingURL=Ref.d.ts.map

package/dist/Ref.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Ref.d.ts","names":[],"sources":["../src/Ref.ts"],"mappings":";;;;;;;;UAIiB,GAAA,iCACiB,sBAAA,8BACJ,kBAAA;EAAA,SAInB,uBAAA,GAA0B,uBAAA;EAAA,SAC1B,mBAAA,GAAsB,mBAAA;EAAA,SACtB,KAAA,GAAQ,KAAA;EAAA,SACR,QAAA,GAAW,QAAA;AAAA;AAAA,UAGL,GAAA,SAAY,GAAA;AAAA,UAEZ,WAAA,SAAoB,GAAA;AAAA,UAEpB,SAAA,SAAkB,GAAA;AAAA,UAElB,QAAA,SAAiB,GAAA,CAChC,UAAA,EACA,kBAAA;AAAA,UAKe,WAAA,SAAoB,GAAA,CACnC,aAAA,EACA,kBAAA;AAAA,UAKe,SAAA,SAAkB,GAAA,CACjC,WAAA,EACA,kBAAA;AAAA,UAKe,cAAA,SAAuB,GAAA,CACtC,UAAA;AAAA,UAMe,iBAAA,SAA0B,GAAA,CACzC,aAAA;AAAA,UAMe,eAAA,SAAwB,GAAA,CACvC,WAAA;AAAA,KAMU,yBAAA,SACV,IAAA,SAAa,GAAA,0FAMT,uBAAA;AAAA,KAGM,UAAA,SACV,IAAA,SAAa,GAAA,0FAMT,YAAA,CAAkC,uBAAA;AAAA,KAG5B,eAAA,SACV,IAAA,SAAa,GAAA,0FAMT,iBAAA,CAAuC,uBAAA;AAAA,KAGjC,qBAAA,SACV,IAAA,SAAa,GAAA,0FAMT,mBAAA;AAAA,KAGM,IAAA,SACV,IAAA,SAAa,GAAA,0FAMT,KAAA;AAAA,KAGM,OAAA,SACV,IAAA,SAAa,GAAA,0FAMT,QAAA;AAAA,KAGM,gBAAA,WAA2B,YAAA,IAA6B,GAAA,CAClE,2BAAA,CAAuC,CAAA,GACvC,uBAAA,CAAmC,CAAA,GACnC,MAAA,CAAkB,CAAA,GAClB,SAAA,CAAqB,CAAA;AAAA,cAGV,IAAA,yBAA8B,YAAA;;;;;AAIzC,kBAAA,UACA,YAAA,EAAc,aAAA,KACb,gBAAA,CAAiB,aAAA;AAAA,cAQP,eAAA,GAAmB,GAAA,EAAK,GAAA,KAAM,YAAA;AAAA,cAM9B,qBAAA,GAAyB,GAAA,EAAK,GAAA"}
+{"version":3,"file":"Ref.d.ts","names":[],"sources":["../src/Ref.ts"],"mappings":";;;;;;;;;UAUiB,GAAA,iCACiB,sBAAA,8BACJ,kBAAA;EAAA,SAInB,uBAAA,GAA0B,uBAAA;EAAA,SAC1B,mBAAA,GAAsB,mBAAA;EAAA,SACtB,KAAA,GAAQ,KAAA;EAAA,SACR,QAAA,GAAW,QAAA;AAAA;AAAA,UAOL,GAAA,SAAY,GAAA;AAAA,UAEZ,WAAA,SAAoB,GAAA;AAAA,UAEpB,SAAA,SAAkB,GAAA;AAAA,UAElB,QAAA,SAAiB,GAAA,CAChC,UAAA,EACA,kBAAA;AAAA,UAKe,WAAA,SAAoB,GAAA,CACnC,aAAA,EACA,kBAAA;AAAA,UAKe,SAAA,SAAkB,GAAA,CACjC,WAAA,EACA,kBAAA;AAAA,UAKe,cAAA,SAAuB,GAAA,CACtC,UAAA;AAAA,UAMe,iBAAA,SAA0B,GAAA,CACzC,aAAA;AAAA,UAMe,eAAA,SAAwB,GAAA,CACvC,WAAA;AAAA,KAMU,yBAAA,SACV,IAAA,SAAa,GAAA,0FAMT,uBAAA;AAAA,KAGM,UAAA,SACV,IAAA,SAAa,GAAA,0FAMT,YAAA,CAAkC,uBAAA;AAAA,KAG5B,eAAA,SACV,IAAA,SAAa,GAAA,0FAMT,iBAAA,CAAuC,uBAAA;AAAA,KAGjC,qBAAA,SACV,IAAA,SAAa,GAAA,0FAMT,mBAAA;AAAA,KAGM,IAAA,SACV,IAAA,SAAa,GAAA,0FAMT,KAAA;AAAA,KAGM,YAAA,cAA0B,GAAA,UAAa,IAAA,CAAK,IAAA,mBACnD,IAAA,GAAO,IAAA,CAAK,IAAA,MACZ,IAAA,EAAM,IAAA,CAAK,IAAA;AAAA,KAEJ,OAAA,SACV,IAAA,SAAa,GAAA,0FAMT,QAAA;AAAA,KAGM,iBAAA,cAA+B,GAAA,IAAO,mBAAA,CAChD,eAAA,CAAgB,IAAA,GAChB,qBAAA,CAAsB,IAAA;AAAA,KAGZ,gBAAA,uBAAuC,YAAA,IACjD,GAAA,CACE,2BAAA,CAAuC,aAAA,GACvC,uBAAA,CAAmC,aAAA,GACnC,MAAA,CAAkB,aAAA,GAClB,SAAA,CAAqB,aAAA;AAAA,cAGZ,IAAA,yBAA8B,YAAA;;;;;;;AAMzC,iBAAA,UACA,YAAA,EAAc,aAAA,KACb,gBAAA,CAAiB,aAAA;AAAA,cAEP,qBAAA,GAAyB,GAAA,EAAK,GAAA;AAAA,cAG9B,oBAAA,gBAAqC,GAAA,EAChD,GAAA,EAAK,IAAA,KACJ,iBAAA,CAAkB,IAAA;AAAA,cAGR,UAAA,gBAA2B,GAAA,EACtC,GAAA,EAAK,IAAA,EACL,IAAA,EAAM,IAAA,CAAK,IAAA,MACV,MAAA,CAAO,MAAA,UAAgB,WAAA,CAAY,UAAA;AAAA,cAOzB,aAAA,gBAA8B,GAAA,EACzC,GAAA,EAAK,IAAA,EACL,OAAA,cACC,MAAA,CAAO,MAAA,CAAO,OAAA,CAAQ,IAAA,GAAO,WAAA,CAAY,UAAA;AAAA,cAO/B,cAAA,gBAA+B,GAAA,EAC1C,GAAA,EAAK,IAAA,EACL,IAAA,EAAM,IAAA,CAAK,IAAA;AAAA,cAQA,iBAAA,gBAAkC,GAAA,EAC7C,GAAA,EAAK,IAAA,EACL,cAAA,cACC,OAAA,CAAQ,IAAA;AAAA,cAOE,YAAA;EAAA,cACG,GAAA,KACZ,GAAA,EAAK,IAAA,EACL,IAAA,EAAM,IAAA,CAAK,IAAA,GACX,CAAA,GACE,iBAAA,EAAmB,iBAAA,CAAkB,IAAA,GACrC,WAAA,cACG,MAAA,CAAO,MAAA,UAAgB,CAAA,IAC3B,MAAA,CAAO,MAAA,CAAO,OAAA,CAAQ,IAAA,GAAO,CAAA,GAAI,WAAA,CAAY,UAAA;EAAA,cAClC,GAAA,EACZ,GAAA,EAAK,IAAA,EACL,IAAA,EAAM,IAAA,CAAK,IAAA,GACX,CAAA,GACE,iBAAA,EAAmB,iBAAA,CAAkB,IAAA,GACrC,WAAA,cACG,WAAA,YACJ,MAAA,CAAO,MAAA,CAAO,OAAA,CAAQ,IAAA,GAAO,WAAA,CAAY,UAAA;AAAA"}

package/dist/Ref.js

@@ -1,20 +1,41 @@
 import { __exportAll } from "./_virtual/_rolldown/runtime.js";
+import { Effect, Match, Schema } from "effect";
+import { makeFunctionReference } from "convex/server";
 
 //#region src/Ref.ts
 var Ref_exports = /* @__PURE__ */ __exportAll({
+	decodeReturns: () => decodeReturns,
+	decodeReturnsSync: () => decodeReturnsSync,
+	encodeArgs: () => encodeArgs,
+	encodeArgsSync: () => encodeArgsSync,
 	getConvexFunctionName: () => getConvexFunctionName,
-	getFunctionSpec: () => getFunctionSpec,
-	make: () => make
+	getFunctionReference: () => getFunctionReference,
+	make: () => make,
+	runWithCodec: () => runWithCodec
 });
-const make = (convexFunctionName, functionSpec) => ({
-	[HiddenFunctionSpecKey]: functionSpec,
-	[HiddenConvexFunctionNameKey]: convexFunctionName
+const make = (functionNamespace, functionSpec) => ({
+	functionSpec,
+	functionNamespace
+});
+const getConvexFunctionName = (ref) => `${ref.functionNamespace}:${ref.functionSpec.name}`;
+const getFunctionReference = (ref) => makeFunctionReference(getConvexFunctionName(ref));
+const encodeArgs = (ref, args) => Match.value(ref.functionSpec.functionProvenance).pipe(Match.tag("Confect", (c) => Schema.encode(c.args)(args)), Match.tag("Convex", () => Effect.succeed(args)), Match.exhaustive);
+const decodeReturns = (ref, returns) => Match.value(ref.functionSpec.functionProvenance).pipe(Match.tag("Confect", (c) => Schema.decode(c.returns)(returns)), Match.tag("Convex", () => Effect.succeed(returns)), Match.exhaustive);
+const encodeArgsSync = (ref, args) => Match.value(ref.functionSpec.functionProvenance).pipe(Match.tag("Confect", (c) => Schema.encodeSync(c.args)(args)), Match.tag("Convex", () => args), Match.exhaustive);
+const decodeReturnsSync = (ref, encodedReturns) => Match.value(ref.functionSpec.functionProvenance).pipe(Match.tag("Confect", (c) => Schema.decodeSync(c.returns)(encodedReturns)), Match.tag("Convex", () => encodedReturns), Match.exhaustive);
+const runWithCodec = (ref, args, f) => Effect.gen(function* () {
+	const functionReference = getFunctionReference(ref);
+	const functionProvenance = ref.functionSpec.functionProvenance;
+	const call = (encodedArgs) => {
+		const result = f(functionReference, encodedArgs);
+		return Effect.isEffect(result) ? result : Effect.promise(() => result);
+	};
+	return yield* Match.value(functionProvenance).pipe(Match.tag("Confect", (confect) => Effect.gen(function* () {
+		const encodedReturns = yield* call(yield* Schema.encode(confect.args)(args));
+		return yield* Schema.decode(confect.returns)(encodedReturns);
+	})), Match.tag("Convex", () => call(args)), Match.exhaustive);
 });
-const HiddenFunctionSpecKey = "@confect/core/api/HiddenFunctionSpecKey";
-const getFunctionSpec = (ref) => ref[HiddenFunctionSpecKey];
-const HiddenConvexFunctionNameKey = "@confect/core/api/HiddenConvexFunctionNameKey";
-const getConvexFunctionName = (ref) => ref[HiddenConvexFunctionNameKey];
 
 //#endregion
-export { Ref_exports, getConvexFunctionName, getFunctionSpec, make };
+export { Ref_exports, decodeReturns, decodeReturnsSync, encodeArgs, encodeArgsSync, getConvexFunctionName, getFunctionReference, make, runWithCodec };
 //# sourceMappingURL=Ref.js.map

package/dist/Ref.js.map

@@ -1 +1 @@
-{"version":3,"file":"Ref.js","names":[],"sources":["../src/Ref.ts"],"sourcesContent":["import type { FunctionVisibility } from \"convex/server\";\nimport type * as FunctionSpec from \"./FunctionSpec\";\nimport type * as RuntimeAndFunctionType from \"./RuntimeAndFunctionType\";\n\nexport interface Ref<\n  _RuntimeAndFunctionType extends RuntimeAndFunctionType.RuntimeAndFunctionType,\n  _FunctionVisibility extends FunctionVisibility,\n  _Args,\n  _Returns,\n> {\n  readonly _RuntimeAndFunctionType?: _RuntimeAndFunctionType;\n  readonly _FunctionVisibility?: _FunctionVisibility;\n  readonly _Args?: _Args;\n  readonly _Returns?: _Returns;\n}\n\nexport interface Any extends Ref<any, any, any, any> {}\n\nexport interface AnyInternal extends Ref<any, \"internal\", any, any> {}\n\nexport interface AnyPublic extends Ref<any, \"public\", any, any> {}\n\nexport interface AnyQuery extends Ref<\n  RuntimeAndFunctionType.AnyQuery,\n  FunctionVisibility,\n  any,\n  any\n> {}\n\nexport interface AnyMutation extends Ref<\n  RuntimeAndFunctionType.AnyMutation,\n  FunctionVisibility,\n  any,\n  any\n> {}\n\nexport interface AnyAction extends Ref<\n  RuntimeAndFunctionType.AnyAction,\n  FunctionVisibility,\n  any,\n  any\n> {}\n\nexport interface AnyPublicQuery extends Ref<\n  RuntimeAndFunctionType.AnyQuery,\n  \"public\",\n  any,\n  any\n> {}\n\nexport interface AnyPublicMutation extends Ref<\n  RuntimeAndFunctionType.AnyMutation,\n  \"public\",\n  any,\n  any\n> {}\n\nexport interface AnyPublicAction extends Ref<\n  RuntimeAndFunctionType.AnyAction,\n  \"public\",\n  any,\n  any\n> {}\n\nexport type GetRuntimeAndFunctionType<Ref_> =\n  Ref_ extends Ref<\n    infer RuntimeAndFunctionType_,\n    infer _FunctionVisibility,\n    infer _Args,\n    infer _Returns\n  >\n    ? RuntimeAndFunctionType_\n    : never;\n\nexport type GetRuntime<Ref_> =\n  Ref_ extends Ref<\n    infer RuntimeAndFunctionType_,\n    infer _FunctionVisibility,\n    infer _Args,\n    infer _Returns\n  >\n    ? RuntimeAndFunctionType.GetRuntime<RuntimeAndFunctionType_>\n    : never;\n\nexport type GetFunctionType<Ref_> =\n  Ref_ extends Ref<\n    infer RuntimeAndFunctionType_,\n    infer _FunctionVisibility,\n    infer _Args,\n    infer _Returns\n  >\n    ? RuntimeAndFunctionType.GetFunctionType<RuntimeAndFunctionType_>\n    : never;\n\nexport type GetFunctionVisibility<Ref_> =\n  Ref_ extends Ref<\n    infer _RuntimeAndFunctionType,\n    infer FunctionVisibility_,\n    infer _Args,\n    infer _Returns\n  >\n    ? FunctionVisibility_\n    : never;\n\nexport type Args<Ref_> =\n  Ref_ extends Ref<\n    infer _RuntimeAndFunctionType,\n    infer _FunctionVisibility,\n    infer Args_,\n    infer _Returns\n  >\n    ? Args_\n    : never;\n\nexport type Returns<Ref_> =\n  Ref_ extends Ref<\n    infer _RuntimeAndFunctionType,\n    infer _FunctionVisibility,\n    infer _Args,\n    infer Returns_\n  >\n    ? Returns_\n    : never;\n\nexport type FromFunctionSpec<F extends FunctionSpec.AnyWithProps> = Ref<\n  FunctionSpec.GetRuntimeAndFunctionType<F>,\n  FunctionSpec.GetFunctionVisibility<F>,\n  FunctionSpec.Args<F>,\n  FunctionSpec.Returns<F>\n>;\n\nexport const make = <FunctionSpec_ extends FunctionSpec.AnyWithProps>(\n  /**\n   * This is a Convex \"function name\" of the format `myGroupDir/myGroupMod:myFunc`.\n   */\n  convexFunctionName: string,\n  functionSpec: FunctionSpec_,\n): FromFunctionSpec<FunctionSpec_> =>\n  ({\n    [HiddenFunctionSpecKey]: functionSpec,\n    [HiddenConvexFunctionNameKey]: convexFunctionName,\n  }) as FromFunctionSpec<FunctionSpec_>;\n\nconst HiddenFunctionSpecKey = \"@confect/core/api/HiddenFunctionSpecKey\";\n\nexport const getFunctionSpec = (ref: Any): FunctionSpec.AnyWithProps =>\n  (ref as any)[HiddenFunctionSpecKey];\n\nconst HiddenConvexFunctionNameKey =\n  \"@confect/core/api/HiddenConvexFunctionNameKey\";\n\nexport const getConvexFunctionName = (ref: Any): string =>\n  (ref as any)[HiddenConvexFunctionNameKey];\n"],"mappings":";;;;;;;;AAmIA,MAAa,QAIX,oBACA,kBAEC;EACE,wBAAwB;EACxB,8BAA8B;CAChC;AAEH,MAAM,wBAAwB;AAE9B,MAAa,mBAAmB,QAC7B,IAAY;AAEf,MAAM,8BACJ;AAEF,MAAa,yBAAyB,QACnC,IAAY"}
+{"version":3,"file":"Ref.js","names":[],"sources":["../src/Ref.ts"],"sourcesContent":["import type {\n  FunctionReference as ConvexFunctionReference,\n  FunctionVisibility,\n} from \"convex/server\";\nimport { makeFunctionReference } from \"convex/server\";\nimport type { ParseResult } from \"effect\";\nimport { Effect, Match, Schema } from \"effect\";\nimport type * as FunctionSpec from \"./FunctionSpec\";\nimport type * as RuntimeAndFunctionType from \"./RuntimeAndFunctionType\";\n\nexport interface Ref<\n  _RuntimeAndFunctionType extends RuntimeAndFunctionType.RuntimeAndFunctionType,\n  _FunctionVisibility extends FunctionVisibility,\n  _Args,\n  _Returns,\n> {\n  readonly _RuntimeAndFunctionType?: _RuntimeAndFunctionType;\n  readonly _FunctionVisibility?: _FunctionVisibility;\n  readonly _Args?: _Args;\n  readonly _Returns?: _Returns;\n  /** @internal */\n  readonly functionSpec: FunctionSpec.AnyWithProps;\n  /** @internal */\n  readonly functionNamespace: string;\n}\n\nexport interface Any extends Ref<any, any, any, any> {}\n\nexport interface AnyInternal extends Ref<any, \"internal\", any, any> {}\n\nexport interface AnyPublic extends Ref<any, \"public\", any, any> {}\n\nexport interface AnyQuery extends Ref<\n  RuntimeAndFunctionType.AnyQuery,\n  FunctionVisibility,\n  any,\n  any\n> {}\n\nexport interface AnyMutation extends Ref<\n  RuntimeAndFunctionType.AnyMutation,\n  FunctionVisibility,\n  any,\n  any\n> {}\n\nexport interface AnyAction extends Ref<\n  RuntimeAndFunctionType.AnyAction,\n  FunctionVisibility,\n  any,\n  any\n> {}\n\nexport interface AnyPublicQuery extends Ref<\n  RuntimeAndFunctionType.AnyQuery,\n  \"public\",\n  any,\n  any\n> {}\n\nexport interface AnyPublicMutation extends Ref<\n  RuntimeAndFunctionType.AnyMutation,\n  \"public\",\n  any,\n  any\n> {}\n\nexport interface AnyPublicAction extends Ref<\n  RuntimeAndFunctionType.AnyAction,\n  \"public\",\n  any,\n  any\n> {}\n\nexport type GetRuntimeAndFunctionType<Ref_> =\n  Ref_ extends Ref<\n    infer RuntimeAndFunctionType_,\n    infer _FunctionVisibility,\n    infer _Args,\n    infer _Returns\n  >\n    ? RuntimeAndFunctionType_\n    : never;\n\nexport type GetRuntime<Ref_> =\n  Ref_ extends Ref<\n    infer RuntimeAndFunctionType_,\n    infer _FunctionVisibility,\n    infer _Args,\n    infer _Returns\n  >\n    ? RuntimeAndFunctionType.GetRuntime<RuntimeAndFunctionType_>\n    : never;\n\nexport type GetFunctionType<Ref_> =\n  Ref_ extends Ref<\n    infer RuntimeAndFunctionType_,\n    infer _FunctionVisibility,\n    infer _Args,\n    infer _Returns\n  >\n    ? RuntimeAndFunctionType.GetFunctionType<RuntimeAndFunctionType_>\n    : never;\n\nexport type GetFunctionVisibility<Ref_> =\n  Ref_ extends Ref<\n    infer _RuntimeAndFunctionType,\n    infer FunctionVisibility_,\n    infer _Args,\n    infer _Returns\n  >\n    ? FunctionVisibility_\n    : never;\n\nexport type Args<Ref_> =\n  Ref_ extends Ref<\n    infer _RuntimeAndFunctionType,\n    infer _FunctionVisibility,\n    infer Args_,\n    infer _Returns\n  >\n    ? Args_\n    : never;\n\nexport type OptionalArgs<Ref_ extends Any> = keyof Args<Ref_> extends never\n  ? [args?: Args<Ref_>]\n  : [args: Args<Ref_>];\n\nexport type Returns<Ref_> =\n  Ref_ extends Ref<\n    infer _RuntimeAndFunctionType,\n    infer _FunctionVisibility,\n    infer _Args,\n    infer Returns_\n  >\n    ? Returns_\n    : never;\n\nexport type FunctionReference<Ref_ extends Any> = ConvexFunctionReference<\n  GetFunctionType<Ref_>,\n  GetFunctionVisibility<Ref_>\n>;\n\nexport type FromFunctionSpec<FunctionSpec_ extends FunctionSpec.AnyWithProps> =\n  Ref<\n    FunctionSpec.GetRuntimeAndFunctionType<FunctionSpec_>,\n    FunctionSpec.GetFunctionVisibility<FunctionSpec_>,\n    FunctionSpec.Args<FunctionSpec_>,\n    FunctionSpec.Returns<FunctionSpec_>\n  >;\n\nexport const make = <FunctionSpec_ extends FunctionSpec.AnyWithProps>(\n  /**\n   * The namespace portion of a Convex function name, i.e. the part before the\n   * colon. For example, for `myGroupDir/myGroupMod:myFunc` this would be\n   * `myGroupDir/myGroupMod`.\n   */\n  functionNamespace: string,\n  functionSpec: FunctionSpec_,\n): FromFunctionSpec<FunctionSpec_> => ({ functionSpec, functionNamespace });\n\nexport const getConvexFunctionName = (ref: Any): string =>\n  `${ref.functionNamespace}:${ref.functionSpec.name}`;\n\nexport const getFunctionReference = <Ref_ extends Any>(\n  ref: Ref_,\n): FunctionReference<Ref_> =>\n  makeFunctionReference(getConvexFunctionName(ref)) as FunctionReference<Ref_>;\n\nexport const encodeArgs = <Ref_ extends Any>(\n  ref: Ref_,\n  args: Args<Ref_>,\n): Effect.Effect<unknown, ParseResult.ParseError> =>\n  Match.value(ref.functionSpec.functionProvenance).pipe(\n    Match.tag(\"Confect\", (c) => Schema.encode(c.args)(args)),\n    Match.tag(\"Convex\", () => Effect.succeed(args)),\n    Match.exhaustive,\n  );\n\nexport const decodeReturns = <Ref_ extends Any>(\n  ref: Ref_,\n  returns: unknown,\n): Effect.Effect<Returns<Ref_>, ParseResult.ParseError> =>\n  Match.value(ref.functionSpec.functionProvenance).pipe(\n    Match.tag(\"Confect\", (c) => Schema.decode(c.returns)(returns)),\n    Match.tag(\"Convex\", () => Effect.succeed(returns)),\n    Match.exhaustive,\n  );\n\nexport const encodeArgsSync = <Ref_ extends Any>(\n  ref: Ref_,\n  args: Args<Ref_>,\n): unknown =>\n  Match.value(ref.functionSpec.functionProvenance).pipe(\n    Match.tag(\"Confect\", (c) => Schema.encodeSync(c.args)(args)),\n    Match.tag(\"Convex\", () => args),\n    Match.exhaustive,\n  );\n\nexport const decodeReturnsSync = <Ref_ extends Any>(\n  ref: Ref_,\n  encodedReturns: unknown,\n): Returns<Ref_> =>\n  Match.value(ref.functionSpec.functionProvenance).pipe(\n    Match.tag(\"Confect\", (c) => Schema.decodeSync(c.returns)(encodedReturns)),\n    Match.tag(\"Convex\", () => encodedReturns),\n    Match.exhaustive,\n  ) as Returns<Ref_>;\n\nexport const runWithCodec: {\n  <Ref_ extends Any, E>(\n    ref: Ref_,\n    args: Args<Ref_>,\n    f: (\n      functionReference: FunctionReference<Ref_>,\n      encodedArgs: unknown,\n    ) => Effect.Effect<unknown, E>,\n  ): Effect.Effect<Returns<Ref_>, E | ParseResult.ParseError>;\n  <Ref_ extends Any>(\n    ref: Ref_,\n    args: Args<Ref_>,\n    f: (\n      functionReference: FunctionReference<Ref_>,\n      encodedArgs: unknown,\n    ) => PromiseLike<unknown>,\n  ): Effect.Effect<Returns<Ref_>, ParseResult.ParseError>;\n} = <Ref_ extends Any, E>(\n  ref: Ref_,\n  args: Args<Ref_>,\n  f: (\n    functionReference: FunctionReference<Ref_>,\n    encodedArgs: unknown,\n  ) => Effect.Effect<unknown, E> | PromiseLike<unknown>,\n): Effect.Effect<Returns<Ref_>, E | ParseResult.ParseError> =>\n  Effect.gen(function* () {\n    const functionReference = getFunctionReference(ref);\n    const functionProvenance = ref.functionSpec.functionProvenance;\n    const call = (encodedArgs: unknown) => {\n      const result = f(functionReference, encodedArgs);\n      return Effect.isEffect(result) ? result : Effect.promise(() => result);\n    };\n    return yield* Match.value(functionProvenance).pipe(\n      Match.tag(\"Confect\", (confect) =>\n        Effect.gen(function* () {\n          const encodedArgs = yield* Schema.encode(confect.args)(args);\n          const encodedReturns = yield* call(encodedArgs);\n          return yield* Schema.decode(confect.returns)(encodedReturns);\n        }),\n      ),\n      Match.tag(\"Convex\", () => call(args)),\n      Match.exhaustive,\n    );\n  });\n"],"mappings":";;;;;;;;;;;;;;;AAuJA,MAAa,QAMX,mBACA,kBACqC;CAAE;CAAc;CAAmB;AAE1E,MAAa,yBAAyB,QACpC,GAAG,IAAI,kBAAkB,GAAG,IAAI,aAAa;AAE/C,MAAa,wBACX,QAEA,sBAAsB,sBAAsB,IAAI,CAAC;AAEnD,MAAa,cACX,KACA,SAEA,MAAM,MAAM,IAAI,aAAa,mBAAmB,CAAC,KAC/C,MAAM,IAAI,YAAY,MAAM,OAAO,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,EACxD,MAAM,IAAI,gBAAgB,OAAO,QAAQ,KAAK,CAAC,EAC/C,MAAM,WACP;AAEH,MAAa,iBACX,KACA,YAEA,MAAM,MAAM,IAAI,aAAa,mBAAmB,CAAC,KAC/C,MAAM,IAAI,YAAY,MAAM,OAAO,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,EAC9D,MAAM,IAAI,gBAAgB,OAAO,QAAQ,QAAQ,CAAC,EAClD,MAAM,WACP;AAEH,MAAa,kBACX,KACA,SAEA,MAAM,MAAM,IAAI,aAAa,mBAAmB,CAAC,KAC/C,MAAM,IAAI,YAAY,MAAM,OAAO,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,EAC5D,MAAM,IAAI,gBAAgB,KAAK,EAC/B,MAAM,WACP;AAEH,MAAa,qBACX,KACA,mBAEA,MAAM,MAAM,IAAI,aAAa,mBAAmB,CAAC,KAC/C,MAAM,IAAI,YAAY,MAAM,OAAO,WAAW,EAAE,QAAQ,CAAC,eAAe,CAAC,EACzE,MAAM,IAAI,gBAAgB,eAAe,EACzC,MAAM,WACP;AAEH,MAAa,gBAkBX,KACA,MACA,MAKA,OAAO,IAAI,aAAa;CACtB,MAAM,oBAAoB,qBAAqB,IAAI;CACnD,MAAM,qBAAqB,IAAI,aAAa;CAC5C,MAAM,QAAQ,gBAAyB;EACrC,MAAM,SAAS,EAAE,mBAAmB,YAAY;AAChD,SAAO,OAAO,SAAS,OAAO,GAAG,SAAS,OAAO,cAAc,OAAO;;AAExE,QAAO,OAAO,MAAM,MAAM,mBAAmB,CAAC,KAC5C,MAAM,IAAI,YAAY,YACpB,OAAO,IAAI,aAAa;EAEtB,MAAM,iBAAiB,OAAO,KADV,OAAO,OAAO,OAAO,QAAQ,KAAK,CAAC,KAAK,CACb;AAC/C,SAAO,OAAO,OAAO,OAAO,QAAQ,QAAQ,CAAC,eAAe;GAC5D,CACH,EACD,MAAM,IAAI,gBAAgB,KAAK,KAAK,CAAC,EACrC,MAAM,WACP;EACD"}

package/dist/Refs.js

@@ -16,9 +16,9 @@ const make = (convexSpec, nodeSpec) => {
 		internal: refs
 	};
 };
-const makeHelper = (groups, groupPath = null) => pipe(groups, Record.map((group) => {
-	const currentGroupPath = groupPath ? `${groupPath}/${group.name}` : group.name;
-	return Record.union(makeHelper(group.groups, currentGroupPath), Record.map(group.functions, (function_) => make$1(`${currentGroupPath}:${function_.name}`, function_)), (_subGroup, _function) => {
+const makeHelper = (groups, functionNamespace = null) => pipe(groups, Record.map((group) => {
+	const currentFunctionNamespace = functionNamespace ? `${functionNamespace}/${group.name}` : group.name;
+	return Record.union(makeHelper(group.groups, currentFunctionNamespace), Record.map(group.functions, (function_) => make$1(currentFunctionNamespace, function_)), (_subGroup, _function) => {
 		throw new Error(`Group and function at same level have same name ('${getConvexFunctionName(_function)}')`);
 	});
 }));

package/dist/Refs.js.map

@@ -1 +1 @@
-{"version":3,"file":"Refs.js","names":["GroupSpec.makeNode","Ref.make","Ref.getConvexFunctionName"],"sources":["../src/Refs.ts"],"sourcesContent":["import type { Types } from \"effect\";\nimport { Array, pipe, Record } from \"effect\";\nimport type * as FunctionSpec from \"./FunctionSpec\";\nimport * as GroupSpec from \"./GroupSpec\";\nimport * as Ref from \"./Ref\";\nimport type * as Spec from \"./Spec\";\n\nexport type Refs<\n  ConvexSpec extends Spec.AnyWithPropsWithRuntime<\"Convex\">,\n  NodeSpec extends Spec.AnyWithPropsWithRuntime<\"Node\"> = never,\n  Predicate extends Ref.Any = Ref.Any,\n> = Types.Simplify<\n  OmitEmpty<\n    Helper<\n      | Spec.Groups<ConvexSpec>\n      | (NodeSpec extends never\n          ? never\n          : GroupSpec.GroupSpec<\n              \"Node\",\n              \"node\",\n              never,\n              NodeSpec[\"groups\"][keyof NodeSpec[\"groups\"]]\n            >),\n      Predicate\n    >\n  >\n>;\n\ntype GroupRefs<\n  Group extends GroupSpec.AnyWithProps,\n  Predicate extends Ref.Any,\n> = Types.Simplify<\n  OmitEmpty<Helper<GroupSpec.Groups<Group>, Predicate>> &\n    FilteredFunctions<GroupSpec.Functions<Group>, Predicate>\n>;\n\ntype OmitEmpty<T> = {\n  [K in keyof T as keyof T[K] extends never ? never : K]: T[K];\n};\n\ntype FunctionSpecMatchesPredicate<\n  FunctionSpec_ extends FunctionSpec.AnyWithProps,\n  Predicate extends Ref.Any,\n> =\n  Ref.Ref<\n    FunctionSpec.GetRuntimeAndFunctionType<FunctionSpec_>,\n    FunctionSpec.GetFunctionVisibility<FunctionSpec_>,\n    any,\n    any\n  > extends Predicate\n    ? true\n    : false;\n\ntype FilteredFunctions<\n  FunctionSpecs extends FunctionSpec.AnyWithProps,\n  Predicate extends Ref.Any,\n> = {\n  [Name in FunctionSpec.Name<FunctionSpecs> as FunctionSpec.WithName<\n    FunctionSpecs,\n    Name\n  > extends infer FunctionSpec_ extends FunctionSpec.AnyWithProps\n    ? FunctionSpecMatchesPredicate<FunctionSpec_, Predicate> extends true\n      ? Name\n      : never\n    : never]: FunctionSpec.WithName<FunctionSpecs, Name> extends infer F extends\n    FunctionSpec.AnyWithProps\n    ? Ref.FromFunctionSpec<F>\n    : never;\n};\n\ntype Helper<\n  Groups extends GroupSpec.AnyWithProps,\n  Predicate extends Ref.Any,\n> = {\n  [GroupName in GroupSpec.Name<Groups>]: GroupSpec.WithName<\n    Groups,\n    GroupName\n  > extends infer Group extends GroupSpec.AnyWithProps\n    ? GroupRefs<Group, Predicate>\n    : never;\n};\n\ntype Any =\n  | {\n      readonly [key: string]: Any;\n    }\n  | Ref.Any;\n\nexport const make = <\n  ConvexSpec extends Spec.AnyWithPropsWithRuntime<\"Convex\">,\n  NodeSpec extends Spec.AnyWithPropsWithRuntime<\"Node\"> = never,\n>(\n  convexSpec: ConvexSpec,\n  nodeSpec?: NodeSpec,\n): {\n  public: Refs<ConvexSpec, NodeSpec, Ref.AnyPublic>;\n  internal: Refs<ConvexSpec, NodeSpec, Ref.AnyInternal>;\n} => {\n  const nodeGroup = nodeSpec\n    ? Array.reduce(\n        Record.values(nodeSpec.groups),\n        GroupSpec.makeNode(\"node\"),\n        (nodeGroupSpec, group) => nodeGroupSpec.addGroup(group),\n      )\n    : null;\n\n  const groups = nodeGroup\n    ? { ...convexSpec.groups, node: nodeGroup }\n    : convexSpec.groups;\n  const refs = makeHelper(groups);\n  return {\n    public: refs as Refs<ConvexSpec, NodeSpec, Ref.AnyPublic>,\n    internal: refs as Refs<ConvexSpec, NodeSpec, Ref.AnyInternal>,\n  };\n};\n\nconst makeHelper = (\n  groups: Record.ReadonlyRecord<string, GroupSpec.Any>,\n  groupPath: string | null = null,\n): Any =>\n  pipe(\n    groups as Record.ReadonlyRecord<string, GroupSpec.AnyWithProps>,\n    Record.map((group) => {\n      const currentGroupPath = groupPath\n        ? `${groupPath}/${group.name}`\n        : group.name;\n\n      return Record.union(\n        makeHelper(group.groups, currentGroupPath),\n        Record.map(group.functions, (function_) =>\n          Ref.make(`${currentGroupPath}:${function_.name}`, function_),\n        ),\n        (_subGroup, _function) => {\n          throw new Error(\n            `Group and function at same level have same name ('${Ref.getConvexFunctionName(_function)}')`,\n          );\n        },\n      );\n    }),\n  );\n"],"mappings":";;;;;;;AAwFA,MAAa,QAIX,YACA,aAIG;CACH,MAAM,YAAY,WACd,MAAM,OACJ,OAAO,OAAO,SAAS,OAAO,EAC9BA,SAAmB,OAAO,GACzB,eAAe,UAAU,cAAc,SAAS,MAAM,CACxD,GACD;CAKJ,MAAM,OAAO,WAHE,YACX;EAAE,GAAG,WAAW;EAAQ,MAAM;EAAW,GACzC,WAAW,OACgB;AAC/B,QAAO;EACL,QAAQ;EACR,UAAU;EACX;;AAGH,MAAM,cACJ,QACA,YAA2B,SAE3B,KACE,QACA,OAAO,KAAK,UAAU;CACpB,MAAM,mBAAmB,YACrB,GAAG,UAAU,GAAG,MAAM,SACtB,MAAM;AAEV,QAAO,OAAO,MACZ,WAAW,MAAM,QAAQ,iBAAiB,EAC1C,OAAO,IAAI,MAAM,YAAY,cAC3BC,OAAS,GAAG,iBAAiB,GAAG,UAAU,QAAQ,UAAU,CAC7D,GACA,WAAW,cAAc;AACxB,QAAM,IAAI,MACR,qDAAqDC,sBAA0B,UAAU,CAAC,IAC3F;GAEJ;EACD,CACH"}
+{"version":3,"file":"Refs.js","names":["GroupSpec.makeNode","Ref.make","Ref.getConvexFunctionName"],"sources":["../src/Refs.ts"],"sourcesContent":["import type { Types } from \"effect\";\nimport { Array, pipe, Record } from \"effect\";\nimport type * as FunctionSpec from \"./FunctionSpec\";\nimport * as GroupSpec from \"./GroupSpec\";\nimport * as Ref from \"./Ref\";\nimport type * as Spec from \"./Spec\";\n\nexport type Refs<\n  ConvexSpec extends Spec.AnyWithPropsWithRuntime<\"Convex\">,\n  NodeSpec extends Spec.AnyWithPropsWithRuntime<\"Node\"> = never,\n  Predicate extends Ref.Any = Ref.Any,\n> = Types.Simplify<\n  OmitEmpty<\n    Helper<\n      | Spec.Groups<ConvexSpec>\n      | (NodeSpec extends never\n          ? never\n          : GroupSpec.GroupSpec<\n              \"Node\",\n              \"node\",\n              never,\n              NodeSpec[\"groups\"][keyof NodeSpec[\"groups\"]]\n            >),\n      Predicate\n    >\n  >\n>;\n\ntype GroupRefs<\n  Group extends GroupSpec.AnyWithProps,\n  Predicate extends Ref.Any,\n> = Types.Simplify<\n  OmitEmpty<Helper<GroupSpec.Groups<Group>, Predicate>> &\n    FilteredFunctions<GroupSpec.Functions<Group>, Predicate>\n>;\n\ntype OmitEmpty<T> = {\n  [K in keyof T as keyof T[K] extends never ? never : K]: T[K];\n};\n\ntype FunctionSpecMatchesPredicate<\n  FunctionSpec_ extends FunctionSpec.AnyWithProps,\n  Predicate extends Ref.Any,\n> =\n  Ref.Ref<\n    FunctionSpec.GetRuntimeAndFunctionType<FunctionSpec_>,\n    FunctionSpec.GetFunctionVisibility<FunctionSpec_>,\n    any,\n    any\n  > extends Predicate\n    ? true\n    : false;\n\ntype FilteredFunctions<\n  FunctionSpecs extends FunctionSpec.AnyWithProps,\n  Predicate extends Ref.Any,\n> = {\n  [Name in FunctionSpec.Name<FunctionSpecs> as FunctionSpec.WithName<\n    FunctionSpecs,\n    Name\n  > extends infer FunctionSpec_ extends FunctionSpec.AnyWithProps\n    ? FunctionSpecMatchesPredicate<FunctionSpec_, Predicate> extends true\n      ? Name\n      : never\n    : never]: FunctionSpec.WithName<FunctionSpecs, Name> extends infer F extends\n    FunctionSpec.AnyWithProps\n    ? Ref.FromFunctionSpec<F>\n    : never;\n};\n\ntype Helper<\n  Groups extends GroupSpec.AnyWithProps,\n  Predicate extends Ref.Any,\n> = {\n  [GroupName in GroupSpec.Name<Groups>]: GroupSpec.WithName<\n    Groups,\n    GroupName\n  > extends infer Group extends GroupSpec.AnyWithProps\n    ? GroupRefs<Group, Predicate>\n    : never;\n};\n\ntype Any =\n  | {\n      readonly [key: string]: Any;\n    }\n  | Ref.Any;\n\nexport const make = <\n  ConvexSpec extends Spec.AnyWithPropsWithRuntime<\"Convex\">,\n  NodeSpec extends Spec.AnyWithPropsWithRuntime<\"Node\"> = never,\n>(\n  convexSpec: ConvexSpec,\n  nodeSpec?: NodeSpec,\n): {\n  public: Refs<ConvexSpec, NodeSpec, Ref.AnyPublic>;\n  internal: Refs<ConvexSpec, NodeSpec, Ref.AnyInternal>;\n} => {\n  const nodeGroup = nodeSpec\n    ? Array.reduce(\n        Record.values(nodeSpec.groups),\n        GroupSpec.makeNode(\"node\"),\n        (nodeGroupSpec, group) => nodeGroupSpec.addGroup(group),\n      )\n    : null;\n\n  const groups = nodeGroup\n    ? { ...convexSpec.groups, node: nodeGroup }\n    : convexSpec.groups;\n  const refs = makeHelper(groups);\n  return {\n    public: refs as Refs<ConvexSpec, NodeSpec, Ref.AnyPublic>,\n    internal: refs as Refs<ConvexSpec, NodeSpec, Ref.AnyInternal>,\n  };\n};\n\nconst makeHelper = (\n  groups: Record.ReadonlyRecord<string, GroupSpec.Any>,\n  functionNamespace: string | null = null,\n): Any =>\n  pipe(\n    groups as Record.ReadonlyRecord<string, GroupSpec.AnyWithProps>,\n    Record.map((group) => {\n      const currentFunctionNamespace = functionNamespace\n        ? `${functionNamespace}/${group.name}`\n        : group.name;\n\n      return Record.union(\n        makeHelper(group.groups, currentFunctionNamespace),\n        Record.map(group.functions, (function_) =>\n          Ref.make(currentFunctionNamespace, function_),\n        ),\n        (_subGroup, _function) => {\n          throw new Error(\n            `Group and function at same level have same name ('${Ref.getConvexFunctionName(_function)}')`,\n          );\n        },\n      );\n    }),\n  );\n"],"mappings":";;;;;;;AAwFA,MAAa,QAIX,YACA,aAIG;CACH,MAAM,YAAY,WACd,MAAM,OACJ,OAAO,OAAO,SAAS,OAAO,EAC9BA,SAAmB,OAAO,GACzB,eAAe,UAAU,cAAc,SAAS,MAAM,CACxD,GACD;CAKJ,MAAM,OAAO,WAHE,YACX;EAAE,GAAG,WAAW;EAAQ,MAAM;EAAW,GACzC,WAAW,OACgB;AAC/B,QAAO;EACL,QAAQ;EACR,UAAU;EACX;;AAGH,MAAM,cACJ,QACA,oBAAmC,SAEnC,KACE,QACA,OAAO,KAAK,UAAU;CACpB,MAAM,2BAA2B,oBAC7B,GAAG,kBAAkB,GAAG,MAAM,SAC9B,MAAM;AAEV,QAAO,OAAO,MACZ,WAAW,MAAM,QAAQ,yBAAyB,EAClD,OAAO,IAAI,MAAM,YAAY,cAC3BC,OAAS,0BAA0B,UAAU,CAC9C,GACA,WAAW,cAAc;AACxB,QAAM,IAAI,MACR,qDAAqDC,sBAA0B,UAAU,CAAC,IAC3F;GAEJ;EACD,CACH"}

package/dist/Spec.d.ts

@@ -10,17 +10,17 @@ type TypeId = typeof TypeId;
 declare const isSpec: (u: unknown) => u is AnyWithProps;
 declare const isConvexSpec: (u: unknown) => u is AnyWithPropsWithRuntime<"Convex">;
 declare const isNodeSpec: (u: unknown) => u is AnyWithPropsWithRuntime<"Node">;
-interface Spec<Runtime$2 extends Runtime, Groups_ extends AnyWithPropsWithRuntime$1<Runtime$2> = never> {
+interface Spec<Runtime$1 extends Runtime, Groups_ extends AnyWithPropsWithRuntime$1<Runtime$1> = never> {
   readonly [TypeId]: TypeId;
-  readonly runtime: Runtime$2;
+  readonly runtime: Runtime$1;
   readonly groups: { [GroupName in Name<Groups_>]: WithName<Groups_, GroupName> };
-  add<Group extends AnyWithPropsWithRuntime$1<Runtime$2>>(group: Group): Spec<Runtime$2, Groups_ | Group>;
+  add<Group extends AnyWithPropsWithRuntime$1<Runtime$1>>(group: Group): Spec<Runtime$1, Groups_ | Group>;
 }
 interface Any {
   readonly [TypeId]: TypeId;
 }
 interface AnyWithProps extends Spec<Runtime, AnyWithProps$1> {}
-interface AnyWithPropsWithRuntime<Runtime$1 extends Runtime> extends Spec<Runtime$1, AnyWithPropsWithRuntime$1<Runtime$1>> {}
+interface AnyWithPropsWithRuntime<Runtime$2 extends Runtime> extends Spec<Runtime$2, AnyWithPropsWithRuntime$1<Runtime$2>> {}
 type Groups<Spec_ extends AnyWithProps> = Spec_["groups"][keyof Spec_["groups"]];
 declare const make: () => Spec<"Convex">;
 declare const makeNode: () => Spec<"Node">;

package/dist/Types.d.ts

@@ -14,11 +14,12 @@ type IsValueLiteral<Vl> = [Vl] extends [never] ? never : IsUnion<Vl> extends tru
  * Only checks for records with string keys.
  */
 type IsRecord<T> = [T] extends [never] ? false : IsUnion<T> extends true ? false : T extends Record<string, infer V> ? string extends keyof T ? keyof T extends string ? T extends Record<string, V> ? Record<string, V> extends T ? true : false : false : false : false : false;
-type DeepMutable<T> = IsAny<T> extends true ? any : T extends Brand.Brand<any> | GenericId<any> ? T : T extends ReadonlyMap<infer K, infer V> ? Map<DeepMutable<K>, DeepMutable<V>> : T extends ReadonlySet<infer V> ? Set<DeepMutable<V>> : [keyof T] extends [never] ? T : { -readonly [K in keyof T]: DeepMutable<T[K]> };
+type DeepMutable<T> = IsAny<T> extends true ? any : T extends NonRecursiveLeaf ? T : T extends ReadonlyMap<infer K, infer V> ? Map<DeepMutable<K>, DeepMutable<V>> : T extends ReadonlySet<infer V> ? Set<DeepMutable<V>> : [keyof T] extends [never] ? T : { -readonly [K in keyof T]: DeepMutable<T[K]> };
 type TypeError<Message extends string, T = never> = [Message, T];
 type TypeDefect<Message extends string, T = never> = [Message, T];
 type IsRecursive<T> = true extends DetectCycle<T> ? true : false;
-type DetectCycle<T, Cache extends any[] = []> = IsAny<T> extends true ? false : [T] extends [any] ? T extends Cache[number] ? true : T extends Array<infer U> ? DetectCycle<U, [...Cache, T]> : T extends Map<infer _U, infer V> ? DetectCycle<V, [...Cache, T]> : T extends Set<infer U> ? DetectCycle<U, [...Cache, T]> : T extends object ? true extends { [K in keyof T]: DetectCycle<T[K], [...Cache, T]> }[keyof T] ? true : false : false : never;
+type NonRecursiveLeaf = Brand.Brand<any> | GenericId<any> | ArrayBuffer;
+type DetectCycle<T, Cache extends any[] = []> = IsAny<T> extends true ? false : [T] extends [any] ? T extends NonRecursiveLeaf ? false : T extends Cache[number] ? true : T extends Array<infer U> ? DetectCycle<U, [...Cache, T]> : T extends Map<infer _U, infer V> ? DetectCycle<V, [...Cache, T]> : T extends Set<infer U> ? DetectCycle<U, [...Cache, T]> : T extends object ? true extends { [K in keyof T]: DetectCycle<T[K], [...Cache, T]> }[keyof T] ? true : false : false : never;
 type UnionToTuple<t> = _unionToTuple<t, []> extends infer result ? conform<result, t[]> : never;
 type _unionToTuple<t, result extends unknown[]> = getLastBranch<t> extends infer current ? [t] extends [never] ? result : _unionToTuple<Exclude<t, current>, [current, ...result]> : never;
 type getLastBranch<t> = intersectUnion<t extends unknown ? (x: t) => void : never> extends ((x: infer branch) => void) ? branch : never;

package/dist/Types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Types.d.ts","names":[],"sources":["../src/Types.ts"],"mappings":";;;;;;;;KAUY,UAAA,oBAA8B,CAAA,eAC7B,IAAA,CAAK,CAAA,EAAG,CAAA;AAAA,KAET,KAAA,oBAAyB,CAAA;AAAA,KAEzB,OAAA,cAAqB,CAAA,GAAI,CAAA,IAAK,CAAA,oBACrC,CAAA,WAAY,CAAA;AAAA,KAML,cAAA,QAAsB,EAAA,4BAE9B,OAAA,CAAQ,EAAA,0BAEL,EAAA,mEACmB,EAAA,8BAEE,EAAA,+BAEG,EAAA,8BAEC,EAAA;;;;KAQpB,QAAA,OAAe,CAAA,4BAEvB,OAAA,CAAQ,CAAA,yBAEN,CAAA,SAAU,MAAA,yCACa,CAAA,SACb,CAAA,kBACJ,CAAA,SAAU,MAAA,SAAe,CAAA,IACvB,MAAA,SAAe,CAAA,UAAW,CAAA;AAAA,KAQ5B,WAAA,MACV,KAAA,CAAM,CAAA,uBAEF,CAAA,SAAU,KAAA,CAAM,KAAA,QAAa,SAAA,QAC3B,CAAA,GACA,CAAA,SAAU,WAAA,qBACR,GAAA,CAAI,WAAA,CAAY,CAAA,GAAI,WAAA,CAAY,CAAA,KAChC,CAAA,SAAU,WAAA,YACR,GAAA,CAAI,WAAA,CAAY,CAAA,YACT,CAAA,oBACL,CAAA,2BACwB,CAAA,GAAI,WAAA,CAAY,CAAA,CAAE,CAAA;AAAA,KAE5C,SAAA,uCAAgD,OAAA,EAAS,CAAA;AAAA,KAEzD,UAAA,uCAAiD,OAAA,EAAS,CAAA;AAAA,KAE1D,WAAA,mBAA8B,WAAA,CAAY,CAAA;AAAA,KAEjD,WAAA,gCACH,KAAA,CAAM,CAAA,0BAED,CAAA,kBACC,CAAA,SAAU,KAAA,kBAER,CAAA,SAAU,KAAA,YACR,WAAA,CAAY,CAAA,MAAO,KAAA,EAAO,CAAA,KAC1B,CAAA,SAAU,GAAA,sBACR,WAAA,CAAY,CAAA,MAAO,KAAA,EAAO,CAAA,KAC1B,CAAA,SAAU,GAAA,YACR,WAAA,CAAY,CAAA,MAAO,KAAA,EAAO,CAAA,KAC1B,CAAA,6CAEgB,CAAA,GAAI,WAAA,CAAY,CAAA,CAAE,CAAA,OAAQ,KAAA,EAAO,CAAA,WACvC,CAAA;AAAA,KAYd,YAAA,MACV,aAAA,CAAc,CAAA,6BAA8B,OAAA,CAAQ,MAAA,EAAQ,CAAA;AAAA,KAEzD,aAAA,gCACH,aAAA,CAAc,CAAA,2BACT,CAAA,oBACC,MAAA,GACA,aAAA,CAAc,OAAA,CAAQ,CAAA,EAAG,OAAA,IAAW,OAAA,KAAY,MAAA;AAAA,KAGnD,aAAA,MACH,cAAA,CAAe,CAAA,oBAAqB,CAAA,EAAG,CAAA,6BACrC,CAAA,2BAEE,MAAA;AAAA,KAGD,cAAA,OAAqB,CAAA,oBAAqB,CAAA,EAAG,CAAA,6BAChD,CAAA,iCAEE,YAAA;AAAA,KAGC,OAAA,YAAmB,CAAA,SAAU,IAAA,GAAO,CAAA,GAAI,IAAA;AAAA,KAMjC,oBAAA,yBACc,gBAAA,gBACV,qBAAA,CAAsB,eAAA,yBAElC,CAAA,yCACA,IAAA,2CAEgB,IAAA,GAAO,sBAAA,CACjB,cAAA,CAAe,eAAA,EAAiB,KAAA,GAChC,IAAA,CAAK,CAAA;AAAA,KAOH,kBAAA,mBAAqC,gBAAA;EAC/C,GAAA,EAAK,qBAAA,CAAsB,SAAA;EAC3B,KAAA,EAAO,qBAAA,CAAsB,SAAA;AAAA"}
+{"version":3,"file":"Types.d.ts","names":[],"sources":["../src/Types.ts"],"mappings":";;;;;;;;KAUY,UAAA,oBAA8B,CAAA,eAC7B,IAAA,CAAK,CAAA,EAAG,CAAA;AAAA,KAET,KAAA,oBAAyB,CAAA;AAAA,KAEzB,OAAA,cAAqB,CAAA,GAAI,CAAA,IAAK,CAAA,oBACrC,CAAA,WAAY,CAAA;AAAA,KAML,cAAA,QAAsB,EAAA,4BAE9B,OAAA,CAAQ,EAAA,0BAEL,EAAA,mEACmB,EAAA,8BAEE,EAAA,+BAEG,EAAA,8BAEC,EAAA;;;;KAQpB,QAAA,OAAe,CAAA,4BAEvB,OAAA,CAAQ,CAAA,yBAEN,CAAA,SAAU,MAAA,yCACa,CAAA,SACb,CAAA,kBACJ,CAAA,SAAU,MAAA,SAAe,CAAA,IACvB,MAAA,SAAe,CAAA,UAAW,CAAA;AAAA,KAQ5B,WAAA,MACV,KAAA,CAAM,CAAA,uBAEF,CAAA,SAAU,gBAAA,GACR,CAAA,GACA,CAAA,SAAU,WAAA,qBACR,GAAA,CAAI,WAAA,CAAY,CAAA,GAAI,WAAA,CAAY,CAAA,KAChC,CAAA,SAAU,WAAA,YACR,GAAA,CAAI,WAAA,CAAY,CAAA,YACT,CAAA,oBACL,CAAA,2BACwB,CAAA,GAAI,WAAA,CAAY,CAAA,CAAE,CAAA;AAAA,KAE5C,SAAA,uCAAgD,OAAA,EAAS,CAAA;AAAA,KAEzD,UAAA,uCAAiD,OAAA,EAAS,CAAA;AAAA,KAE1D,WAAA,mBAA8B,WAAA,CAAY,CAAA;AAAA,KAEjD,gBAAA,GAAmB,KAAA,CAAM,KAAA,QAAa,SAAA,QAAiB,WAAA;AAAA,KAEvD,WAAA,gCACH,KAAA,CAAM,CAAA,0BAED,CAAA,kBACC,CAAA,SAAU,gBAAA,WAER,CAAA,SAAU,KAAA,kBAER,CAAA,SAAU,KAAA,YACR,WAAA,CAAY,CAAA,MAAO,KAAA,EAAO,CAAA,KAC1B,CAAA,SAAU,GAAA,sBACR,WAAA,CAAY,CAAA,MAAO,KAAA,EAAO,CAAA,KAC1B,CAAA,SAAU,GAAA,YACR,WAAA,CAAY,CAAA,MAAO,KAAA,EAAO,CAAA,KAC1B,CAAA,6CAEgB,CAAA,GAAI,WAAA,CAAY,CAAA,CAAE,CAAA,OAAQ,KAAA,EAAO,CAAA,WACvC,CAAA;AAAA,KAYhB,YAAA,MACV,aAAA,CAAc,CAAA,6BAA8B,OAAA,CAAQ,MAAA,EAAQ,CAAA;AAAA,KAEzD,aAAA,gCACH,aAAA,CAAc,CAAA,2BACT,CAAA,oBACC,MAAA,GACA,aAAA,CAAc,OAAA,CAAQ,CAAA,EAAG,OAAA,IAAW,OAAA,KAAY,MAAA;AAAA,KAGnD,aAAA,MACH,cAAA,CAAe,CAAA,oBAAqB,CAAA,EAAG,CAAA,6BACrC,CAAA,2BAEE,MAAA;AAAA,KAGD,cAAA,OAAqB,CAAA,oBAAqB,CAAA,EAAG,CAAA,6BAChD,CAAA,iCAEE,YAAA;AAAA,KAGC,OAAA,YAAmB,CAAA,SAAU,IAAA,GAAO,CAAA,GAAI,IAAA;AAAA,KAMjC,oBAAA,yBACc,gBAAA,gBACV,qBAAA,CAAsB,eAAA,yBAElC,CAAA,yCACA,IAAA,2CAEgB,IAAA,GAAO,sBAAA,CACjB,cAAA,CAAe,eAAA,EAAiB,KAAA,GAChC,IAAA,CAAK,CAAA;AAAA,KAOH,kBAAA,mBAAqC,gBAAA;EAC/C,GAAA,EAAK,qBAAA,CAAsB,SAAA;EAC3B,KAAA,EAAO,qBAAA,CAAsB,SAAA;AAAA"}

package/dist/Types.js.map

@@ -1 +1 @@
-{"version":3,"file":"Types.js","names":[],"sources":["../src/Types.ts"],"sourcesContent":["import type {\n  DocumentByName,\n  FieldTypeFromFieldPath,\n  GenericDatabaseReader,\n  GenericDataModel,\n  TableNamesInDataModel,\n} from \"convex/server\";\nimport type { GenericId } from \"convex/values\";\nimport type { Brand } from \"effect\";\n\nexport type IsOptional<T, K extends keyof T> =\n  {} extends Pick<T, K> ? true : false;\n\nexport type IsAny<T> = 0 extends 1 & T ? true : false;\n\nexport type IsUnion<T, U extends T = T> = T extends unknown\n  ? [U] extends [T]\n    ? false\n    : true\n  : never;\n\n// https://stackoverflow.com/a/52806744\nexport type IsValueLiteral<Vl> = [Vl] extends [never]\n  ? never\n  : IsUnion<Vl> extends true\n    ? false\n    : [Vl] extends [string | number | bigint | boolean]\n      ? [string] extends [Vl]\n        ? false\n        : [number] extends [Vl]\n          ? false\n          : [boolean] extends [Vl]\n            ? false\n            : [bigint] extends [Vl]\n              ? false\n              : true\n      : false;\n\n/**\n * Only checks for records with string keys.\n */\nexport type IsRecord<T> = [T] extends [never]\n  ? false\n  : IsUnion<T> extends true\n    ? false\n    : T extends Record<string, infer V>\n      ? string extends keyof T\n        ? keyof T extends string\n          ? T extends Record<string, V>\n            ? Record<string, V> extends T\n              ? true\n              : false\n            : false\n          : false\n        : false\n      : false;\n\nexport type DeepMutable<T> =\n  IsAny<T> extends true\n    ? any\n    : T extends Brand.Brand<any> | GenericId<any>\n      ? T\n      : T extends ReadonlyMap<infer K, infer V>\n        ? Map<DeepMutable<K>, DeepMutable<V>>\n        : T extends ReadonlySet<infer V>\n          ? Set<DeepMutable<V>>\n          : [keyof T] extends [never]\n            ? T\n            : { -readonly [K in keyof T]: DeepMutable<T[K]> };\n\nexport type TypeError<Message extends string, T = never> = [Message, T];\n\nexport type TypeDefect<Message extends string, T = never> = [Message, T];\n\nexport type IsRecursive<T> = true extends DetectCycle<T> ? true : false;\n\ntype DetectCycle<T, Cache extends any[] = []> =\n  IsAny<T> extends true\n    ? false\n    : [T] extends [any]\n      ? T extends Cache[number]\n        ? true\n        : T extends Array<infer U>\n          ? DetectCycle<U, [...Cache, T]>\n          : T extends Map<infer _U, infer V>\n            ? DetectCycle<V, [...Cache, T]>\n            : T extends Set<infer U>\n              ? DetectCycle<U, [...Cache, T]>\n              : T extends object\n                ? true extends {\n                    [K in keyof T]: DetectCycle<T[K], [...Cache, T]>;\n                  }[keyof T]\n                  ? true\n                  : false\n                : false\n      : never;\n\n//////////////////////////////////\n// START: Vendored from Arktype //\n//////////////////////////////////\n\n// https://github.com/arktypeio/arktype/blob/2e911d01a741ccee7a17e31ee144049817fabbb8/ark/util/unionToTuple.ts#L9\n\nexport type UnionToTuple<t> =\n  _unionToTuple<t, []> extends infer result ? conform<result, t[]> : never;\n\ntype _unionToTuple<t, result extends unknown[]> =\n  getLastBranch<t> extends infer current\n    ? [t] extends [never]\n      ? result\n      : _unionToTuple<Exclude<t, current>, [current, ...result]>\n    : never;\n\ntype getLastBranch<t> =\n  intersectUnion<t extends unknown ? (x: t) => void : never> extends (\n    x: infer branch,\n  ) => void\n    ? branch\n    : never;\n\ntype intersectUnion<t> = (t extends unknown ? (_: t) => void : never) extends (\n  _: infer intersection,\n) => void\n  ? intersection\n  : never;\n\ntype conform<t, base> = t extends base ? t : base;\n\n////////////////////////////////\n// END: Vendored from Arktype //\n////////////////////////////////\n\nexport type IndexFieldTypesForEq<\n  ConvexDataModel extends GenericDataModel,\n  Table extends TableNamesInDataModel<ConvexDataModel>,\n  T extends string[],\n> = T extends readonly [...infer Rest, any]\n  ? Rest extends readonly string[]\n    ? {\n        [K in keyof Rest]: FieldTypeFromFieldPath<\n          DocumentByName<ConvexDataModel, Table>,\n          Rest[K]\n        >;\n      }\n    : never\n  : never;\n\n// Would prefer to use `BaseDatabaseReader` from the `convex` package, but it's not exported.\nexport type BaseDatabaseReader<DataModel extends GenericDataModel> = {\n  get: GenericDatabaseReader<DataModel>[\"get\"];\n  query: GenericDatabaseReader<DataModel>[\"query\"];\n};\n"],"mappings":""}
+{"version":3,"file":"Types.js","names":[],"sources":["../src/Types.ts"],"sourcesContent":["import type {\n  DocumentByName,\n  FieldTypeFromFieldPath,\n  GenericDatabaseReader,\n  GenericDataModel,\n  TableNamesInDataModel,\n} from \"convex/server\";\nimport type { GenericId } from \"convex/values\";\nimport type { Brand } from \"effect\";\n\nexport type IsOptional<T, K extends keyof T> =\n  {} extends Pick<T, K> ? true : false;\n\nexport type IsAny<T> = 0 extends 1 & T ? true : false;\n\nexport type IsUnion<T, U extends T = T> = T extends unknown\n  ? [U] extends [T]\n    ? false\n    : true\n  : never;\n\n// https://stackoverflow.com/a/52806744\nexport type IsValueLiteral<Vl> = [Vl] extends [never]\n  ? never\n  : IsUnion<Vl> extends true\n    ? false\n    : [Vl] extends [string | number | bigint | boolean]\n      ? [string] extends [Vl]\n        ? false\n        : [number] extends [Vl]\n          ? false\n          : [boolean] extends [Vl]\n            ? false\n            : [bigint] extends [Vl]\n              ? false\n              : true\n      : false;\n\n/**\n * Only checks for records with string keys.\n */\nexport type IsRecord<T> = [T] extends [never]\n  ? false\n  : IsUnion<T> extends true\n    ? false\n    : T extends Record<string, infer V>\n      ? string extends keyof T\n        ? keyof T extends string\n          ? T extends Record<string, V>\n            ? Record<string, V> extends T\n              ? true\n              : false\n            : false\n          : false\n        : false\n      : false;\n\nexport type DeepMutable<T> =\n  IsAny<T> extends true\n    ? any\n    : T extends NonRecursiveLeaf\n      ? T\n      : T extends ReadonlyMap<infer K, infer V>\n        ? Map<DeepMutable<K>, DeepMutable<V>>\n        : T extends ReadonlySet<infer V>\n          ? Set<DeepMutable<V>>\n          : [keyof T] extends [never]\n            ? T\n            : { -readonly [K in keyof T]: DeepMutable<T[K]> };\n\nexport type TypeError<Message extends string, T = never> = [Message, T];\n\nexport type TypeDefect<Message extends string, T = never> = [Message, T];\n\nexport type IsRecursive<T> = true extends DetectCycle<T> ? true : false;\n\ntype NonRecursiveLeaf = Brand.Brand<any> | GenericId<any> | ArrayBuffer;\n\ntype DetectCycle<T, Cache extends any[] = []> =\n  IsAny<T> extends true\n    ? false\n    : [T] extends [any]\n      ? T extends NonRecursiveLeaf\n        ? false\n        : T extends Cache[number]\n          ? true\n          : T extends Array<infer U>\n            ? DetectCycle<U, [...Cache, T]>\n            : T extends Map<infer _U, infer V>\n              ? DetectCycle<V, [...Cache, T]>\n              : T extends Set<infer U>\n                ? DetectCycle<U, [...Cache, T]>\n                : T extends object\n                  ? true extends {\n                      [K in keyof T]: DetectCycle<T[K], [...Cache, T]>;\n                    }[keyof T]\n                    ? true\n                    : false\n                  : false\n      : never;\n\n//////////////////////////////////\n// START: Vendored from Arktype //\n//////////////////////////////////\n\n// https://github.com/arktypeio/arktype/blob/2e911d01a741ccee7a17e31ee144049817fabbb8/ark/util/unionToTuple.ts#L9\n\nexport type UnionToTuple<t> =\n  _unionToTuple<t, []> extends infer result ? conform<result, t[]> : never;\n\ntype _unionToTuple<t, result extends unknown[]> =\n  getLastBranch<t> extends infer current\n    ? [t] extends [never]\n      ? result\n      : _unionToTuple<Exclude<t, current>, [current, ...result]>\n    : never;\n\ntype getLastBranch<t> =\n  intersectUnion<t extends unknown ? (x: t) => void : never> extends (\n    x: infer branch,\n  ) => void\n    ? branch\n    : never;\n\ntype intersectUnion<t> = (t extends unknown ? (_: t) => void : never) extends (\n  _: infer intersection,\n) => void\n  ? intersection\n  : never;\n\ntype conform<t, base> = t extends base ? t : base;\n\n////////////////////////////////\n// END: Vendored from Arktype //\n////////////////////////////////\n\nexport type IndexFieldTypesForEq<\n  ConvexDataModel extends GenericDataModel,\n  Table extends TableNamesInDataModel<ConvexDataModel>,\n  T extends string[],\n> = T extends readonly [...infer Rest, any]\n  ? Rest extends readonly string[]\n    ? {\n        [K in keyof Rest]: FieldTypeFromFieldPath<\n          DocumentByName<ConvexDataModel, Table>,\n          Rest[K]\n        >;\n      }\n    : never\n  : never;\n\n// Would prefer to use `BaseDatabaseReader` from the `convex` package, but it's not exported.\nexport type BaseDatabaseReader<DataModel extends GenericDataModel> = {\n  get: GenericDatabaseReader<DataModel>[\"get\"];\n  query: GenericDatabaseReader<DataModel>[\"query\"];\n};\n"],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@confect/core",
-  "version": "4.0.0",
+  "version": "6.0.0",
   "description": "Shared specs and schemas used by all Confect packages",
   "repository": {
     "type": "git",

package/src/Ref.ts

@@ -1,4 +1,10 @@
-import type { FunctionVisibility } from "convex/server";
+import type {
+  FunctionReference as ConvexFunctionReference,
+  FunctionVisibility,
+} from "convex/server";
+import { makeFunctionReference } from "convex/server";
+import type { ParseResult } from "effect";
+import { Effect, Match, Schema } from "effect";
 import type * as FunctionSpec from "./FunctionSpec";
 import type * as RuntimeAndFunctionType from "./RuntimeAndFunctionType";
 
@@ -12,6 +18,10 @@ export interface Ref<
   readonly _FunctionVisibility?: _FunctionVisibility;
   readonly _Args?: _Args;
   readonly _Returns?: _Returns;
+  /** @internal */
+  readonly functionSpec: FunctionSpec.AnyWithProps;
+  /** @internal */
+  readonly functionNamespace: string;
 }
 
 export interface Any extends Ref<any, any, any, any> {}
@@ -112,6 +122,10 @@ export type Args<Ref_> =
     ? Args_
     : never;
 
+export type OptionalArgs<Ref_ extends Any> = keyof Args<Ref_> extends never
+  ? [args?: Args<Ref_>]
+  : [args: Args<Ref_>];
+
 export type Returns<Ref_> =
   Ref_ extends Ref<
     infer _RuntimeAndFunctionType,
@@ -122,32 +136,118 @@ export type Returns<Ref_> =
     ? Returns_
     : never;
 
-export type FromFunctionSpec<F extends FunctionSpec.AnyWithProps> = Ref<
-  FunctionSpec.GetRuntimeAndFunctionType<F>,
-  FunctionSpec.GetFunctionVisibility<F>,
-  FunctionSpec.Args<F>,
-  FunctionSpec.Returns<F>
+export type FunctionReference<Ref_ extends Any> = ConvexFunctionReference<
+  GetFunctionType<Ref_>,
+  GetFunctionVisibility<Ref_>
 >;
 
+export type FromFunctionSpec<FunctionSpec_ extends FunctionSpec.AnyWithProps> =
+  Ref<
+    FunctionSpec.GetRuntimeAndFunctionType<FunctionSpec_>,
+    FunctionSpec.GetFunctionVisibility<FunctionSpec_>,
+    FunctionSpec.Args<FunctionSpec_>,
+    FunctionSpec.Returns<FunctionSpec_>
+  >;
+
 export const make = <FunctionSpec_ extends FunctionSpec.AnyWithProps>(
   /**
-   * This is a Convex "function name" of the format `myGroupDir/myGroupMod:myFunc`.
+   * The namespace portion of a Convex function name, i.e. the part before the
+   * colon. For example, for `myGroupDir/myGroupMod:myFunc` this would be
+   * `myGroupDir/myGroupMod`.
    */
-  convexFunctionName: string,
+  functionNamespace: string,
   functionSpec: FunctionSpec_,
-): FromFunctionSpec<FunctionSpec_> =>
-  ({
-    [HiddenFunctionSpecKey]: functionSpec,
-    [HiddenConvexFunctionNameKey]: convexFunctionName,
-  }) as FromFunctionSpec<FunctionSpec_>;
-
-const HiddenFunctionSpecKey = "@confect/core/api/HiddenFunctionSpecKey";
-
-export const getFunctionSpec = (ref: Any): FunctionSpec.AnyWithProps =>
-  (ref as any)[HiddenFunctionSpecKey];
-
-const HiddenConvexFunctionNameKey =
-  "@confect/core/api/HiddenConvexFunctionNameKey";
+): FromFunctionSpec<FunctionSpec_> => ({ functionSpec, functionNamespace });
 
 export const getConvexFunctionName = (ref: Any): string =>
-  (ref as any)[HiddenConvexFunctionNameKey];
+  `${ref.functionNamespace}:${ref.functionSpec.name}`;
+
+export const getFunctionReference = <Ref_ extends Any>(
+  ref: Ref_,
+): FunctionReference<Ref_> =>
+  makeFunctionReference(getConvexFunctionName(ref)) as FunctionReference<Ref_>;
+
+export const encodeArgs = <Ref_ extends Any>(
+  ref: Ref_,
+  args: Args<Ref_>,
+): Effect.Effect<unknown, ParseResult.ParseError> =>
+  Match.value(ref.functionSpec.functionProvenance).pipe(
+    Match.tag("Confect", (c) => Schema.encode(c.args)(args)),
+    Match.tag("Convex", () => Effect.succeed(args)),
+    Match.exhaustive,
+  );
+
+export const decodeReturns = <Ref_ extends Any>(
+  ref: Ref_,
+  returns: unknown,
+): Effect.Effect<Returns<Ref_>, ParseResult.ParseError> =>
+  Match.value(ref.functionSpec.functionProvenance).pipe(
+    Match.tag("Confect", (c) => Schema.decode(c.returns)(returns)),
+    Match.tag("Convex", () => Effect.succeed(returns)),
+    Match.exhaustive,
+  );
+
+export const encodeArgsSync = <Ref_ extends Any>(
+  ref: Ref_,
+  args: Args<Ref_>,
+): unknown =>
+  Match.value(ref.functionSpec.functionProvenance).pipe(
+    Match.tag("Confect", (c) => Schema.encodeSync(c.args)(args)),
+    Match.tag("Convex", () => args),
+    Match.exhaustive,
+  );
+
+export const decodeReturnsSync = <Ref_ extends Any>(
+  ref: Ref_,
+  encodedReturns: unknown,
+): Returns<Ref_> =>
+  Match.value(ref.functionSpec.functionProvenance).pipe(
+    Match.tag("Confect", (c) => Schema.decodeSync(c.returns)(encodedReturns)),
+    Match.tag("Convex", () => encodedReturns),
+    Match.exhaustive,
+  ) as Returns<Ref_>;
+
+export const runWithCodec: {
+  <Ref_ extends Any, E>(
+    ref: Ref_,
+    args: Args<Ref_>,
+    f: (
+      functionReference: FunctionReference<Ref_>,
+      encodedArgs: unknown,
+    ) => Effect.Effect<unknown, E>,
+  ): Effect.Effect<Returns<Ref_>, E | ParseResult.ParseError>;
+  <Ref_ extends Any>(
+    ref: Ref_,
+    args: Args<Ref_>,
+    f: (
+      functionReference: FunctionReference<Ref_>,
+      encodedArgs: unknown,
+    ) => PromiseLike<unknown>,
+  ): Effect.Effect<Returns<Ref_>, ParseResult.ParseError>;
+} = <Ref_ extends Any, E>(
+  ref: Ref_,
+  args: Args<Ref_>,
+  f: (
+    functionReference: FunctionReference<Ref_>,
+    encodedArgs: unknown,
+  ) => Effect.Effect<unknown, E> | PromiseLike<unknown>,
+): Effect.Effect<Returns<Ref_>, E | ParseResult.ParseError> =>
+  Effect.gen(function* () {
+    const functionReference = getFunctionReference(ref);
+    const functionProvenance = ref.functionSpec.functionProvenance;
+    const call = (encodedArgs: unknown) => {
+      const result = f(functionReference, encodedArgs);
+      return Effect.isEffect(result) ? result : Effect.promise(() => result);
+    };
+    return yield* Match.value(functionProvenance).pipe(
+      Match.tag("Confect", (confect) =>
+        Effect.gen(function* () {
+          const encodedArgs = yield* Schema.encode(confect.args)(args);
+          const encodedReturns = yield* call(encodedArgs);
+          return yield* Schema.decode(confect.returns)(encodedReturns);
+        }),
+      ),
+      Match.tag("Convex", () => call(args)),
+      Match.exhaustive,
+    );
+  });

package/src/Refs.ts

@@ -116,19 +116,19 @@ export const make = <
 
 const makeHelper = (
   groups: Record.ReadonlyRecord<string, GroupSpec.Any>,
-  groupPath: string | null = null,
+  functionNamespace: string | null = null,
 ): Any =>
   pipe(
     groups as Record.ReadonlyRecord<string, GroupSpec.AnyWithProps>,
     Record.map((group) => {
-      const currentGroupPath = groupPath
-        ? `${groupPath}/${group.name}`
+      const currentFunctionNamespace = functionNamespace
+        ? `${functionNamespace}/${group.name}`
         : group.name;
 
       return Record.union(
-        makeHelper(group.groups, currentGroupPath),
+        makeHelper(group.groups, currentFunctionNamespace),
         Record.map(group.functions, (function_) =>
-          Ref.make(`${currentGroupPath}:${function_.name}`, function_),
+          Ref.make(currentFunctionNamespace, function_),
         ),
         (_subGroup, _function) => {
           throw new Error(

package/src/Types.ts

@@ -58,7 +58,7 @@ export type IsRecord<T> = [T] extends [never]
 export type DeepMutable<T> =
   IsAny<T> extends true
     ? any
-    : T extends Brand.Brand<any> | GenericId<any>
+    : T extends NonRecursiveLeaf
       ? T
       : T extends ReadonlyMap<infer K, infer V>
         ? Map<DeepMutable<K>, DeepMutable<V>>
@@ -74,25 +74,29 @@ export type TypeDefect<Message extends string, T = never> = [Message, T];
 
 export type IsRecursive<T> = true extends DetectCycle<T> ? true : false;
 
+type NonRecursiveLeaf = Brand.Brand<any> | GenericId<any> | ArrayBuffer;
+
 type DetectCycle<T, Cache extends any[] = []> =
   IsAny<T> extends true
     ? false
     : [T] extends [any]
-      ? T extends Cache[number]
-        ? true
-        : T extends Array<infer U>
-          ? DetectCycle<U, [...Cache, T]>
-          : T extends Map<infer _U, infer V>
-            ? DetectCycle<V, [...Cache, T]>
-            : T extends Set<infer U>
-              ? DetectCycle<U, [...Cache, T]>
-              : T extends object
-                ? true extends {
-                    [K in keyof T]: DetectCycle<T[K], [...Cache, T]>;
-                  }[keyof T]
-                  ? true
+      ? T extends NonRecursiveLeaf
+        ? false
+        : T extends Cache[number]
+          ? true
+          : T extends Array<infer U>
+            ? DetectCycle<U, [...Cache, T]>
+            : T extends Map<infer _U, infer V>
+              ? DetectCycle<V, [...Cache, T]>
+              : T extends Set<infer U>
+                ? DetectCycle<U, [...Cache, T]>
+                : T extends object
+                  ? true extends {
+                      [K in keyof T]: DetectCycle<T[K], [...Cache, T]>;
+                    }[keyof T]
+                    ? true
+                    : false
                   : false
-                : false
       : never;
 
 //////////////////////////////////