@confect/core 1.0.3 → 3.0.0

package/dist/Ref.js

@@ -3,18 +3,18 @@ import { __exportAll } from "./_virtual/_rolldown/runtime.js";
 //#region src/Ref.ts
 var Ref_exports = /* @__PURE__ */ __exportAll({
 	getConvexFunctionName: () => getConvexFunctionName,
-	getFunction: () => getFunction,
+	getFunctionSpec: () => getFunctionSpec,
 	make: () => make
 });
-const make = (convexFunctionName, function_) => ({
-	[HiddenFunctionKey]: function_,
+const make = (convexFunctionName, functionSpec) => ({
+	[HiddenFunctionSpecKey]: functionSpec,
 	[HiddenConvexFunctionNameKey]: convexFunctionName
 });
-const HiddenFunctionKey = "@confect/core/api/HiddenFunctionKey";
-const getFunction = (ref) => ref[HiddenFunctionKey];
+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, getFunction, make };
+export { Ref_exports, getConvexFunctionName, getFunctionSpec, make };
 //# 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 { 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 extends Schema.Schema.AnyNoContext,\n  _Returns extends Schema.Schema.AnyNoContext,\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  Schema.Schema.AnyNoContext,\n  Schema.Schema.AnyNoContext\n> {}\n\nexport interface AnyMutation extends Ref<\n  RuntimeAndFunctionType.AnyMutation,\n  FunctionVisibility,\n  Schema.Schema.AnyNoContext,\n  Schema.Schema.AnyNoContext\n> {}\n\nexport interface AnyAction extends Ref<\n  RuntimeAndFunctionType.AnyAction,\n  FunctionVisibility,\n  Schema.Schema.AnyNoContext,\n  Schema.Schema.AnyNoContext\n> {}\n\nexport interface AnyPublicQuery extends Ref<\n  RuntimeAndFunctionType.AnyQuery,\n  \"public\",\n  Schema.Schema.AnyNoContext,\n  Schema.Schema.AnyNoContext\n> {}\n\nexport interface AnyPublicMutation extends Ref<\n  RuntimeAndFunctionType.AnyMutation,\n  \"public\",\n  Schema.Schema.AnyNoContext,\n  Schema.Schema.AnyNoContext\n> {}\n\nexport interface AnyPublicAction extends Ref<\n  RuntimeAndFunctionType.AnyAction,\n  \"public\",\n  Schema.Schema.AnyNoContext,\n  Schema.Schema.AnyNoContext\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 = <\n  RuntimeAndFunctionType_ extends RuntimeAndFunctionType.RuntimeAndFunctionType,\n  FunctionVisibility_ extends FunctionVisibility,\n  Args_ extends Schema.Schema.AnyNoContext,\n  Returns_ extends Schema.Schema.AnyNoContext,\n>(\n  /**\n   * This is a Convex \"function name\" of the format \"myGroupDir/myGroupMod:myFunc\".\n   */\n  convexFunctionName: string,\n  function_: FunctionSpec.FunctionSpec<\n    RuntimeAndFunctionType_,\n    FunctionVisibility_,\n    string,\n    Args_,\n    Returns_\n  >,\n): Ref<RuntimeAndFunctionType_, FunctionVisibility_, Args_, Returns_> =>\n  ({\n    [HiddenFunctionKey]: function_,\n    [HiddenConvexFunctionNameKey]: convexFunctionName,\n  }) as Ref<RuntimeAndFunctionType_, FunctionVisibility_, Args_, Returns_>;\n\nconst HiddenFunctionKey = \"@confect/core/api/HiddenFunctionKey\";\ntype HiddenFunctionKey = typeof HiddenFunctionKey;\ntype HiddenFunction<Ref_ extends Any> = FunctionSpec.FunctionSpec<\n  GetRuntimeAndFunctionType<Ref_>,\n  GetFunctionVisibility<Ref_>,\n  string,\n  Args<Ref_>,\n  Returns<Ref_>\n>;\n\nexport const getFunction = <\n  RuntimeAndFunctionType_ extends RuntimeAndFunctionType.RuntimeAndFunctionType,\n  FunctionVisibility_ extends FunctionVisibility,\n  Args_ extends Schema.Schema.AnyNoContext,\n  Returns_ extends Schema.Schema.AnyNoContext,\n  Ref_ extends Ref<\n    RuntimeAndFunctionType_,\n    FunctionVisibility_,\n    Args_,\n    Returns_\n  >,\n>(\n  ref: Ref_,\n): HiddenFunction<Ref_> => (ref as any)[HiddenFunctionKey];\n\nconst HiddenConvexFunctionNameKey =\n  \"@confect/core/api/HiddenConvexFunctionNameKey\";\ntype HiddenConvexFunctionNameKey = typeof HiddenConvexFunctionNameKey;\ntype HiddenConvexFunctionName = string;\n\nexport const getConvexFunctionName = <\n  RuntimeAndFunctionType_ extends RuntimeAndFunctionType.RuntimeAndFunctionType,\n  FunctionVisibility_ extends FunctionVisibility,\n  Args_ extends Schema.Schema.AnyNoContext,\n  Returns_ extends Schema.Schema.AnyNoContext,\n>(\n  ref: Ref<RuntimeAndFunctionType_, FunctionVisibility_, Args_, Returns_>,\n): HiddenConvexFunctionName => (ref as any)[HiddenConvexFunctionNameKey];\n"],"mappings":";;;;;;;;AAoIA,MAAa,QASX,oBACA,eAQC;EACE,oBAAoB;EACpB,8BAA8B;CAChC;AAEH,MAAM,oBAAoB;AAU1B,MAAa,eAYX,QAC0B,IAAY;AAExC,MAAM,8BACJ;AAIF,MAAa,yBAMX,QAC8B,IAAY"}
+{"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"}

package/dist/Refs.d.ts

@@ -1,6 +1,6 @@
-import { AnyWithProps, Name as Name$1, WithName } from "./FunctionSpec.js";
+import { AnyWithProps, GetFunctionVisibility, GetRuntimeAndFunctionType, Name as Name$1, WithName } from "./FunctionSpec.js";
 import { AnyWithProps as AnyWithProps$1, Functions, GroupSpec, Groups, Name as Name$2, WithName as WithName$1 } from "./GroupSpec.js";
-import { Any, AnyInternal, AnyPublic, FromFunctionSpec } from "./Ref.js";
+import { Any, AnyInternal, AnyPublic, FromFunctionSpec, Ref } from "./Ref.js";
 import { AnyWithPropsWithRuntime, Groups as Groups$1 } from "./Spec.js";
 import { Types } from "effect";
 
@@ -11,7 +11,8 @@ declare namespace Refs_d_exports {
 type Refs<ConvexSpec extends AnyWithPropsWithRuntime<"Convex">, NodeSpec extends AnyWithPropsWithRuntime<"Node"> = never, Predicate extends Any = Any> = Types.Simplify<OmitEmpty<Helper<Groups$1<ConvexSpec> | (NodeSpec extends never ? never : GroupSpec<"Node", "node", never, NodeSpec["groups"][keyof NodeSpec["groups"]]>), Predicate>>>;
 type GroupRefs<Group extends AnyWithProps$1, Predicate extends Any> = Types.Simplify<OmitEmpty<Helper<Groups<Group>, Predicate>> & FilteredFunctions<Functions<Group>, Predicate>>;
 type OmitEmpty<T> = { [K in keyof T as keyof T[K] extends never ? never : K]: T[K] };
-type FilteredFunctions<Functions extends AnyWithProps, Predicate extends Any> = { [Name in Name$1<Functions> as WithName<Functions, Name> extends infer F extends AnyWithProps ? FromFunctionSpec<F> extends Predicate ? Name : never : never]: WithName<Functions, Name> extends infer F extends AnyWithProps ? FromFunctionSpec<F> : never };
+type FunctionSpecMatchesPredicate<FunctionSpec_ extends AnyWithProps, Predicate extends Any> = Ref<GetRuntimeAndFunctionType<FunctionSpec_>, GetFunctionVisibility<FunctionSpec_>, any, any> extends Predicate ? true : false;
+type FilteredFunctions<FunctionSpecs extends AnyWithProps, Predicate extends Any> = { [Name in Name$1<FunctionSpecs> as WithName<FunctionSpecs, Name> extends infer FunctionSpec_ extends AnyWithProps ? FunctionSpecMatchesPredicate<FunctionSpec_, Predicate> extends true ? Name : never : never]: WithName<FunctionSpecs, Name> extends infer F extends AnyWithProps ? FromFunctionSpec<F> : never };
 type Helper<Groups extends AnyWithProps$1, Predicate extends Any> = { [GroupName in Name$2<Groups>]: WithName$1<Groups, GroupName> extends infer Group extends AnyWithProps$1 ? GroupRefs<Group, Predicate> : never };
 declare const make: <ConvexSpec extends AnyWithPropsWithRuntime<"Convex">, NodeSpec extends AnyWithPropsWithRuntime<"Node"> = never>(convexSpec: ConvexSpec, nodeSpec?: NodeSpec) => {
   public: Refs<ConvexSpec, NodeSpec, AnyPublic>;

package/dist/Refs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Refs.d.ts","names":[],"sources":["../src/Refs.ts"],"mappings":";;;;;;;;;;KAOY,IAAA,oBACS,uBAAA,6BACF,uBAAA,oCACC,GAAA,GAAU,GAAA,IAC1B,KAAA,CAAM,QAAA,CACR,SAAA,CACE,MAAA,CACI,QAAA,CAAY,UAAA,KACX,QAAA,yBAEG,SAAA,wBAIE,QAAA,iBAAyB,QAAA,eAEjC,SAAA;AAAA,KAKD,SAAA,eACW,cAAA,oBACI,GAAA,IAChB,KAAA,CAAM,QAAA,CACR,SAAA,CAAU,MAAA,CAAO,MAAA,CAAiB,KAAA,GAAQ,SAAA,KACxC,iBAAA,CAAkB,SAAA,CAAoB,KAAA,GAAQ,SAAA;AAAA,KAG7C,SAAA,oBACS,CAAA,UAAW,CAAA,CAAE,CAAA,0BAA2B,CAAA,GAAI,CAAA,CAAE,CAAA;AAAA,KAGvD,iBAAA,mBACe,YAAA,oBACA,GAAA,eAET,MAAA,CAAkB,SAAA,KAAc,QAAA,CACvC,SAAA,EACA,IAAA,0BACwB,YAAA,GACtB,gBAAA,CAAqB,CAAA,UAAW,SAAA,GAC9B,IAAA,mBAEM,QAAA,CAAsB,SAAA,EAAW,IAAA,0BAC3C,YAAA,GACE,gBAAA,CAAqB,CAAA;AAAA,KAItB,MAAA,gBACY,cAAA,oBACG,GAAA,oBAEJ,MAAA,CAAe,MAAA,IAAU,UAAA,CACrC,MAAA,EACA,SAAA,8BAC4B,cAAA,GAC1B,SAAA,CAAU,KAAA,EAAO,SAAA;AAAA,cAUV,IAAA,sBACQ,uBAAA,6BACF,uBAAA,kBAEjB,UAAA,EAAY,UAAA,EACZ,QAAA,GAAW,QAAA;EAEX,MAAA,EAAQ,IAAA,CAAK,UAAA,EAAY,QAAA,EAAU,SAAA;EACnC,QAAA,EAAU,IAAA,CAAK,UAAA,EAAY,QAAA,EAAU,WAAA;AAAA"}
+{"version":3,"file":"Refs.d.ts","names":[],"sources":["../src/Refs.ts"],"mappings":";;;;;;;;;;KAOY,IAAA,oBACS,uBAAA,6BACF,uBAAA,oCACC,GAAA,GAAU,GAAA,IAC1B,KAAA,CAAM,QAAA,CACR,SAAA,CACE,MAAA,CACI,QAAA,CAAY,UAAA,KACX,QAAA,yBAEG,SAAA,wBAIE,QAAA,iBAAyB,QAAA,eAEjC,SAAA;AAAA,KAKD,SAAA,eACW,cAAA,oBACI,GAAA,IAChB,KAAA,CAAM,QAAA,CACR,SAAA,CAAU,MAAA,CAAO,MAAA,CAAiB,KAAA,GAAQ,SAAA,KACxC,iBAAA,CAAkB,SAAA,CAAoB,KAAA,GAAQ,SAAA;AAAA,KAG7C,SAAA,oBACS,CAAA,UAAW,CAAA,CAAE,CAAA,0BAA2B,CAAA,GAAI,CAAA,CAAE,CAAA;AAAA,KAGvD,4BAAA,uBACmB,YAAA,oBACJ,GAAA,IAElB,GAAA,CACE,yBAAA,CAAuC,aAAA,GACvC,qBAAA,CAAmC,aAAA,qBAG3B,SAAA;AAAA,KAIP,iBAAA,uBACmB,YAAA,oBACJ,GAAA,eAET,MAAA,CAAkB,aAAA,KAAkB,QAAA,CAC3C,aAAA,EACA,IAAA,sCACoC,YAAA,GAClC,4BAAA,CAA6B,aAAA,EAAe,SAAA,iBAC1C,IAAA,mBAEM,QAAA,CAAsB,aAAA,EAAe,IAAA,0BAC/C,YAAA,GACE,gBAAA,CAAqB,CAAA;AAAA,KAItB,MAAA,gBACY,cAAA,oBACG,GAAA,oBAEJ,MAAA,CAAe,MAAA,IAAU,UAAA,CACrC,MAAA,EACA,SAAA,8BAC4B,cAAA,GAC1B,SAAA,CAAU,KAAA,EAAO,SAAA;AAAA,cAUV,IAAA,sBACQ,uBAAA,6BACF,uBAAA,kBAEjB,UAAA,EAAY,UAAA,EACZ,QAAA,GAAW,QAAA;EAEX,MAAA,EAAQ,IAAA,CAAK,UAAA,EAAY,QAAA,EAAU,SAAA;EACnC,QAAA,EAAU,IAAA,CAAK,UAAA,EAAY,QAAA,EAAU,WAAA;AAAA"}

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 FilteredFunctions<\n  Functions extends FunctionSpec.AnyWithProps,\n  Predicate extends Ref.Any,\n> = {\n  [Name in FunctionSpec.Name<Functions> as FunctionSpec.WithName<\n    Functions,\n    Name\n  > extends infer F extends FunctionSpec.AnyWithProps\n    ? Ref.FromFunctionSpec<F> extends Predicate\n      ? Name\n      : never\n    : never]: FunctionSpec.WithName<Functions, 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":";;;;;;;AA2EA,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  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"}

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$1 extends Runtime, Groups_ extends AnyWithPropsWithRuntime$1<Runtime$1> = never> {
+interface Spec<Runtime$2 extends Runtime, Groups_ extends AnyWithPropsWithRuntime$1<Runtime$2> = never> {
   readonly [TypeId]: TypeId;
-  readonly runtime: Runtime$1;
+  readonly runtime: Runtime$2;
   readonly groups: { [GroupName in Name<Groups_>]: WithName<Groups_, GroupName> };
-  add<Group extends AnyWithPropsWithRuntime$1<Runtime$1>>(group: Group): Spec<Runtime$1, Groups_ | Group>;
+  add<Group extends AnyWithPropsWithRuntime$1<Runtime$2>>(group: Group): Spec<Runtime$2, Groups_ | Group>;
 }
 interface Any {
   readonly [TypeId]: TypeId;
 }
 interface AnyWithProps extends Spec<Runtime, AnyWithProps$1> {}
-interface AnyWithPropsWithRuntime<Runtime$2 extends Runtime> extends Spec<Runtime$2, AnyWithPropsWithRuntime$1<Runtime$2>> {}
+interface AnyWithPropsWithRuntime<Runtime$1 extends Runtime> extends Spec<Runtime$1, AnyWithPropsWithRuntime$1<Runtime$1>> {}
 type Groups<Spec_ extends AnyWithProps> = Spec_["groups"][keyof Spec_["groups"]];
 declare const make: () => Spec<"Convex">;
 declare const makeNode: () => Spec<"Node">;

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import { FunctionProvenance_d_exports } from "./FunctionProvenance.js";
 import { RuntimeAndFunctionType_d_exports } from "./RuntimeAndFunctionType.js";
 import { FunctionSpec_d_exports } from "./FunctionSpec.js";
 import { GenericId_d_exports } from "./GenericId.js";
@@ -10,4 +11,4 @@ import { Refs_d_exports } from "./Refs.js";
 import { SystemFields_d_exports } from "./SystemFields.js";
 import { Types_d_exports } from "./Types.js";
 import { UserIdentity_d_exports } from "./UserIdentity.js";
-export { FunctionSpec_d_exports as FunctionSpec, GenericId_d_exports as GenericId, GroupPath_d_exports as GroupPath, GroupSpec_d_exports as GroupSpec, PaginationResult_d_exports as PaginationResult, Ref_d_exports as Ref, Refs_d_exports as Refs, RuntimeAndFunctionType_d_exports as RuntimeAndFunctionType, Spec_d_exports as Spec, SystemFields_d_exports as SystemFields, Types_d_exports as Types, UserIdentity_d_exports as UserIdentity };
+export { FunctionProvenance_d_exports as FunctionProvenance, FunctionSpec_d_exports as FunctionSpec, GenericId_d_exports as GenericId, GroupPath_d_exports as GroupPath, GroupSpec_d_exports as GroupSpec, PaginationResult_d_exports as PaginationResult, Ref_d_exports as Ref, Refs_d_exports as Refs, RuntimeAndFunctionType_d_exports as RuntimeAndFunctionType, Spec_d_exports as Spec, SystemFields_d_exports as SystemFields, Types_d_exports as Types, UserIdentity_d_exports as UserIdentity };

package/dist/index.js

@@ -1,3 +1,4 @@
+import { FunctionProvenance_exports } from "./FunctionProvenance.js";
 import { RuntimeAndFunctionType_exports } from "./RuntimeAndFunctionType.js";
 import { FunctionSpec_exports } from "./FunctionSpec.js";
 import { GenericId_exports } from "./GenericId.js";
@@ -11,4 +12,4 @@ import { SystemFields_exports } from "./SystemFields.js";
 import { Types_exports } from "./Types.js";
 import { UserIdentity_exports } from "./UserIdentity.js";
 
-export { FunctionSpec_exports as FunctionSpec, GenericId_exports as GenericId, GroupPath_exports as GroupPath, GroupSpec_exports as GroupSpec, PaginationResult_exports as PaginationResult, Ref_exports as Ref, Refs_exports as Refs, RuntimeAndFunctionType_exports as RuntimeAndFunctionType, Spec_exports as Spec, SystemFields_exports as SystemFields, Types_exports as Types, UserIdentity_exports as UserIdentity };
+export { FunctionProvenance_exports as FunctionProvenance, FunctionSpec_exports as FunctionSpec, GenericId_exports as GenericId, GroupPath_exports as GroupPath, GroupSpec_exports as GroupSpec, PaginationResult_exports as PaginationResult, Ref_exports as Ref, Refs_exports as Refs, RuntimeAndFunctionType_exports as RuntimeAndFunctionType, Spec_exports as Spec, SystemFields_exports as SystemFields, Types_exports as Types, UserIdentity_exports as UserIdentity };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@confect/core",
-  "version": "1.0.3",
+  "version": "3.0.0",
   "description": "Shared specs and schemas used by all Confect packages",
   "repository": {
     "type": "git",
@@ -40,17 +40,16 @@
   "license": "ISC",
   "devDependencies": {
     "@ark/attest": "0.56.0",
-    "@effect/language-service": "0.73.1",
     "@effect/vitest": "0.27.0",
-    "@eslint/js": "9.39.2",
-    "@types/node": "25.2.3",
-    "effect": "3.19.16",
-    "eslint": "9.39.2",
+    "@eslint/js": "10.0.1",
+    "@types/node": "25.3.3",
+    "effect": "3.19.19",
+    "eslint": "10.0.2",
     "prettier": "3.8.1",
     "tsdown": "0.20.3",
     "tsx": "^4.21.0",
     "typescript": "5.9.3",
-    "typescript-eslint": "8.55.0",
+    "typescript-eslint": "8.56.1",
     "vitest": "3.2.4"
   },
   "peerDependencies": {

package/src/FunctionProvenance.ts

@@ -0,0 +1,60 @@
+import type { DefaultFunctionArgs } from "convex/server";
+import type { Schema } from "effect";
+import { Data } from "effect";
+
+export type FunctionProvenance = Data.TaggedEnum<{
+  Confect: {
+    args: Schema.Schema.AnyNoContext;
+    returns: Schema.Schema.AnyNoContext;
+  };
+  Convex: {
+    /** @internal */
+    _args: DefaultFunctionArgs;
+    /** @internal */
+    _returns: any;
+  };
+}>;
+
+export interface Confect<
+  Args extends Schema.Schema.AnyNoContext,
+  Returns extends Schema.Schema.AnyNoContext,
+> {
+  readonly _tag: "Confect";
+  readonly args: Args;
+  readonly returns: Returns;
+}
+
+export interface AnyConfect extends Confect<
+  Schema.Schema.AnyNoContext,
+  Schema.Schema.AnyNoContext
+> {}
+
+export interface Convex<Args extends DefaultFunctionArgs, Returns> {
+  readonly _tag: "Convex";
+  readonly _args: Args;
+  readonly _returns: Returns;
+}
+
+export interface AnyConvex extends Convex<DefaultFunctionArgs, any> {}
+
+export const FunctionProvenance = Data.taggedEnum<FunctionProvenance>();
+
+export const Confect = <
+  Args extends Schema.Schema.AnyNoContext,
+  Returns extends Schema.Schema.AnyNoContext,
+>(
+  args: Args,
+  returns: Returns,
+) =>
+  FunctionProvenance.Confect({
+    args,
+    returns,
+  });
+
+export const Convex = <_Args extends DefaultFunctionArgs, _Returns>() =>
+  FunctionProvenance.Convex(
+    {} as {
+      _args: _Args;
+      _returns: _Returns;
+    },
+  );

package/src/FunctionSpec.ts

@@ -7,6 +7,7 @@ import type {
 } from "convex/server";
 import type { Schema } from "effect";
 import { Predicate } from "effect";
+import * as FunctionProvenance from "./FunctionProvenance";
 import { validateConfectFunctionIdentifier } from "./internal/utils";
 import * as RuntimeAndFunctionType from "./RuntimeAndFunctionType";
 
@@ -20,15 +21,13 @@ export interface FunctionSpec<
   RuntimeAndFunctionType_ extends RuntimeAndFunctionType.RuntimeAndFunctionType,
   FunctionVisibility_ extends FunctionVisibility,
   Name_ extends string,
-  Args_ extends Schema.Schema.AnyNoContext,
-  Returns_ extends Schema.Schema.AnyNoContext,
+  FunctionProvenance_ extends FunctionProvenance.FunctionProvenance,
 > {
   readonly [TypeId]: TypeId;
   readonly runtimeAndFunctionType: RuntimeAndFunctionType_;
   readonly functionVisibility: FunctionVisibility_;
   readonly name: Name_;
-  readonly args: Args_;
-  readonly returns: Returns_;
+  readonly functionProvenance: FunctionProvenance_;
 }
 
 export interface Any {
@@ -39,8 +38,21 @@ export interface AnyWithProps extends FunctionSpec<
   RuntimeAndFunctionType.RuntimeAndFunctionType,
   FunctionVisibility,
   string,
-  Schema.Schema.AnyNoContext,
-  Schema.Schema.AnyNoContext
+  FunctionProvenance.FunctionProvenance
+> {}
+
+export interface AnyConfect extends FunctionSpec<
+  RuntimeAndFunctionType.RuntimeAndFunctionType,
+  FunctionVisibility,
+  string,
+  FunctionProvenance.AnyConfect
+> {}
+
+export interface AnyConvex extends FunctionSpec<
+  RuntimeAndFunctionType.RuntimeAndFunctionType,
+  FunctionVisibility,
+  string,
+  FunctionProvenance.AnyConvex
 > {}
 
 export interface AnyWithPropsWithRuntime<
@@ -49,8 +61,7 @@ export interface AnyWithPropsWithRuntime<
   RuntimeAndFunctionType.WithRuntime<Runtime>,
   FunctionVisibility,
   string,
-  Schema.Schema.AnyNoContext,
-  Schema.Schema.AnyNoContext
+  FunctionProvenance.FunctionProvenance
 > {}
 
 export interface AnyWithPropsWithFunctionType<
@@ -59,74 +70,114 @@ export interface AnyWithPropsWithFunctionType<
   RuntimeAndFunctionType_,
   FunctionVisibility,
   string,
-  Schema.Schema.AnyNoContext,
-  Schema.Schema.AnyNoContext
+  FunctionProvenance.FunctionProvenance
 > {}
 
-export type GetRuntimeAndFunctionType<Function extends AnyWithProps> =
-  Function["runtimeAndFunctionType"];
+export interface AnyWithPropsWithFunctionProvenance<
+  FunctionProvenance_ extends FunctionProvenance.FunctionProvenance,
+> extends FunctionSpec<
+  RuntimeAndFunctionType.RuntimeAndFunctionType,
+  FunctionVisibility,
+  string,
+  FunctionProvenance_
+> {}
 
-export type GetFunctionVisibility<Function extends AnyWithProps> =
-  Function["functionVisibility"];
+export type GetRuntimeAndFunctionType<FunctionSpec_ extends AnyWithProps> =
+  FunctionSpec_["runtimeAndFunctionType"];
+
+export type GetFunctionVisibility<FunctionSpec_ extends AnyWithProps> =
+  FunctionSpec_["functionVisibility"];
+
+export type Name<FunctionSpec_ extends AnyWithProps> = FunctionSpec_["name"];
+
+export type Args<FunctionSpec_ extends AnyWithProps> = FunctionSpec_ extends {
+  functionProvenance: {
+    _tag: "Confect";
+    args: infer ArgsSchema_ extends Schema.Schema.AnyNoContext;
+  };
+}
+  ? ArgsSchema_["Type"]
+  : FunctionSpec_ extends {
+        functionProvenance: { _tag: "Convex"; _args: infer Args_ };
+      }
+    ? Args_
+    : never;
 
-export type Name<Function extends AnyWithProps> = Function["name"];
+export type Returns<FunctionSpec_ extends AnyWithProps> =
+  FunctionSpec_ extends {
+    functionProvenance: {
+      _tag: "Confect";
+      returns: infer ReturnsSchema_ extends Schema.Schema.AnyNoContext;
+    };
+  }
+    ? ReturnsSchema_["Type"]
+    : FunctionSpec_ extends {
+          functionProvenance: { _tag: "Convex"; _returns: infer Returns_ };
+        }
+      ? Awaited<Returns_>
+      : never;
 
-export type Args<Function extends AnyWithProps> = Function["args"];
+export type EncodedArgs<FunctionSpec_ extends AnyWithProps> =
+  FunctionSpec_ extends {
+    functionProvenance: {
+      _tag: "Confect";
+      args: infer ArgsSchema_ extends Schema.Schema.AnyNoContext;
+    };
+  }
+    ? ArgsSchema_["Encoded"]
+    : FunctionSpec_ extends {
+          functionProvenance: { _tag: "Convex"; _args: infer Args_ };
+        }
+      ? Args_
+      : never;
 
-export type Returns<Function extends AnyWithProps> = Function["returns"];
+export type EncodedReturns<FunctionSpec_ extends AnyWithProps> =
+  FunctionSpec_ extends {
+    functionProvenance: {
+      _tag: "Confect";
+      returns: infer ReturnsSchema_ extends Schema.Schema.AnyNoContext;
+    };
+  }
+    ? ReturnsSchema_["Encoded"]
+    : FunctionSpec_ extends {
+          functionProvenance: { _tag: "Convex"; _returns: infer Returns_ };
+        }
+      ? Returns_
+      : never;
 
 export type WithName<
-  Function extends AnyWithProps,
+  FunctionSpec_ extends AnyWithProps,
   Name_ extends string,
-> = Extract<Function, { readonly name: Name_ }>;
+> = Extract<FunctionSpec_, { readonly name: Name_ }>;
 
 export type WithRuntimeAndFunctionType<
-  Function extends AnyWithProps,
+  FunctionSpec_ extends AnyWithProps,
   RuntimeAndFunctionType_ extends RuntimeAndFunctionType.RuntimeAndFunctionType,
 > = Extract<
-  Function,
+  FunctionSpec_,
   { readonly runtimeAndFunctionType: RuntimeAndFunctionType_ }
 >;
 
 export type WithFunctionType<
-  Function extends AnyWithProps,
+  FunctionSpec_ extends AnyWithProps,
   FunctionType_ extends FunctionType,
 > = Extract<
-  Function,
+  FunctionSpec_,
   { readonly runtimeAndFunctionType: { readonly functionType: FunctionType_ } }
 >;
 
+export type WithFunctionProvenance<
+  FunctionSpec_ extends AnyWithProps,
+  FunctionProvenance_ extends FunctionProvenance.FunctionProvenance,
+> = Extract<
+  FunctionSpec_,
+  { readonly functionProvenance: FunctionProvenance_ }
+>;
+
 export type WithoutName<
-  Function extends AnyWithProps,
-  Name_ extends Name<Function>,
-> = Exclude<Function, { readonly name: Name_ }>;
-
-export type RegisteredFunction<Function extends AnyWithProps> =
-  RuntimeAndFunctionType.GetFunctionType<
-    Function["runtimeAndFunctionType"]
-  > extends "query"
-    ? RegisteredQuery<
-        GetFunctionVisibility<Function>,
-        Args<Function>["Encoded"],
-        Promise<Returns<Function>["Encoded"]>
-      >
-    : RuntimeAndFunctionType.GetFunctionType<
-          Function["runtimeAndFunctionType"]
-        > extends "mutation"
-      ? RegisteredMutation<
-          GetFunctionVisibility<Function>,
-          Args<Function>["Encoded"],
-          Promise<Returns<Function>["Encoded"]>
-        >
-      : RuntimeAndFunctionType.GetFunctionType<
-            Function["runtimeAndFunctionType"]
-          > extends "action"
-        ? RegisteredAction<
-            GetFunctionVisibility<Function>,
-            Args<Function>["Encoded"],
-            Promise<Returns<Function>["Encoded"]>
-          >
-        : never;
+  FunctionSpec_ extends AnyWithProps,
+  Name_ extends Name<FunctionSpec_>,
+> = Exclude<FunctionSpec_, { readonly name: Name_ }>;
 
 const Proto = {
   [TypeId]: TypeId,
@@ -157,8 +208,7 @@ const make =
     RuntimeAndFunctionType_,
     FunctionVisibility_,
     Name_,
-    Args_,
-    Returns_
+    FunctionProvenance.Confect<Args_, Returns_>
   > => {
     validateConfectFunctionIdentifier(name);
 
@@ -166,8 +216,7 @@ const make =
       runtimeAndFunctionType,
       functionVisibility,
       name,
-      args,
-      returns,
+      functionProvenance: FunctionProvenance.Confect(args, returns),
     });
   };
 
@@ -198,3 +247,99 @@ export const internalNodeAction = make(
   RuntimeAndFunctionType.NodeAction,
   "internal",
 );
+
+type MatchingRegisteredFunction<
+  RuntimeAndFunctionType_ extends RuntimeAndFunctionType.RuntimeAndFunctionType,
+  FunctionVisibility_ extends FunctionVisibility,
+> =
+  RuntimeAndFunctionType.GetFunctionType<RuntimeAndFunctionType_> extends "query"
+    ? RegisteredQuery<FunctionVisibility_, any, any>
+    : RuntimeAndFunctionType.GetFunctionType<RuntimeAndFunctionType_> extends "mutation"
+      ? RegisteredMutation<FunctionVisibility_, any, any>
+      : RuntimeAndFunctionType.GetFunctionType<RuntimeAndFunctionType_> extends "action"
+        ? RegisteredAction<FunctionVisibility_, any, any>
+        : never;
+
+type ExtractArgs<F> =
+  F extends RegisteredQuery<any, infer A, any>
+    ? A
+    : F extends RegisteredMutation<any, infer A, any>
+      ? A
+      : F extends RegisteredAction<any, infer A, any>
+        ? A
+        : never;
+
+type ExtractReturns<F> =
+  F extends RegisteredQuery<any, any, infer R>
+    ? R
+    : F extends RegisteredMutation<any, any, infer R>
+      ? R
+      : F extends RegisteredAction<any, any, infer R>
+        ? R
+        : never;
+
+const makeConvex =
+  <
+    RuntimeAndFunctionType_ extends
+      RuntimeAndFunctionType.RuntimeAndFunctionType,
+    FunctionVisibility_ extends FunctionVisibility,
+  >(
+    runtimeAndFunctionType: RuntimeAndFunctionType_,
+    functionVisibility: FunctionVisibility_,
+  ) =>
+  <
+    F extends MatchingRegisteredFunction<
+      RuntimeAndFunctionType_,
+      FunctionVisibility_
+    >,
+  >() =>
+  <const Name_ extends string>(
+    name: Name_,
+  ): FunctionSpec<
+    RuntimeAndFunctionType_,
+    FunctionVisibility_,
+    Name_,
+    FunctionProvenance.Convex<ExtractArgs<F>, ExtractReturns<F>>
+  > => {
+    validateConfectFunctionIdentifier(name);
+
+    return Object.assign(Object.create(Proto), {
+      runtimeAndFunctionType,
+      functionVisibility,
+      name,
+      functionProvenance: FunctionProvenance.Convex(),
+    }) as any;
+  };
+
+export const convexPublicQuery = makeConvex(
+  RuntimeAndFunctionType.ConvexQuery,
+  "public",
+);
+export const convexInternalQuery = makeConvex(
+  RuntimeAndFunctionType.ConvexQuery,
+  "internal",
+);
+export const convexPublicMutation = makeConvex(
+  RuntimeAndFunctionType.ConvexMutation,
+  "public",
+);
+export const convexInternalMutation = makeConvex(
+  RuntimeAndFunctionType.ConvexMutation,
+  "internal",
+);
+export const convexPublicAction = makeConvex(
+  RuntimeAndFunctionType.ConvexAction,
+  "public",
+);
+export const convexInternalAction = makeConvex(
+  RuntimeAndFunctionType.ConvexAction,
+  "internal",
+);
+export const convexPublicNodeAction = makeConvex(
+  RuntimeAndFunctionType.NodeAction,
+  "public",
+);
+export const convexInternalNodeAction = makeConvex(
+  RuntimeAndFunctionType.NodeAction,
+  "internal",
+);