@confect/react 1.0.3 → 3.0.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @confect/react
 
+## 3.0.0
+
+### Minor Changes
+
+- 5fb6a61: Add support for plain Convex functions. Plain Convex queries, mutations, and actions can now be included in your Confect spec and impl tree using new `FunctionSpec.convexPublic*` and `FunctionSpec.convexInternal*` constructors. This enables interop with Convex components and libraries (such as Workpool, Workflow, Migrations, and Better Auth) that require user-defined or -provided Convex functions.
+
+### Patch Changes
+
+- Updated dependencies [5fb6a61]
+  - @confect/core@3.0.0
+
+## 2.0.0
+
+### Major Changes
+
+- 7861159: Replace Effect-native return types with Convex-equivalent return types in React hooks. `useQuery` now returns `T | undefined` instead of `Option<T>`. `useMutation` and `useAction` now return `(args) => Promise<T>` instead of `(args) => Effect<T>`. The hooks still encode args and decode return values via the spec's Effect Schemas automatically.
+
+### Patch Changes
+
+- @confect/core@2.0.0
+
 ## 1.0.3
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,10 +1,9 @@
-import * as Ref from "@confect/core/Ref";
-import { Effect, Option } from "effect";
+import { Ref } from "@confect/core";
 
 //#region src/index.d.ts
-declare const useQuery: <Query extends Ref.AnyPublicQuery>(ref: Query, args: Ref.Args<Query>["Type"]) => Option.Option<Ref.Returns<Query>["Type"]>;
-declare const useMutation: <Mutation extends Ref.AnyPublicMutation>(ref: Mutation) => (args: Ref.Args<Mutation>["Type"]) => Effect.Effect<Ref.Returns<Mutation>["Type"]>;
-declare const useAction: <Action extends Ref.AnyPublicAction>(ref: Action) => (args: Ref.Args<Action>["Type"]) => Effect.Effect<Ref.Returns<Action>["Type"]>;
+declare const useQuery: <Query extends Ref.AnyPublicQuery>(ref: Query, args: Ref.Args<Query>) => Ref.Returns<Query> | undefined;
+declare const useMutation: <Mutation extends Ref.AnyPublicMutation>(ref: Mutation) => (args: Ref.Args<Mutation>) => Promise<Ref.Returns<Mutation>>;
+declare const useAction: <Action extends Ref.AnyPublicAction>(ref: Action) => (args: Ref.Args<Action>) => Promise<Ref.Returns<Action>>;
 //#endregion
 export { useAction, useMutation, useQuery };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/index.ts"],"mappings":";;;;cAQa,QAAA,iBAA0B,GAAA,CAAI,cAAA,EACzC,GAAA,EAAK,KAAA,EACL,IAAA,EAAM,GAAA,CAAI,IAAA,CAAK,KAAA,cACd,MAAA,CAAO,MAAA,CAAO,GAAA,CAAI,OAAA,CAAQ,KAAA;AAAA,cAoBhB,WAAA,oBAAgC,GAAA,CAAI,iBAAA,EAC/C,GAAA,EAAK,QAAA,MAOH,IAAA,EAAM,GAAA,CAAI,IAAA,CAAK,QAAA,cACd,MAAA,CAAO,MAAA,CAAO,GAAA,CAAI,OAAA,CAAQ,QAAA;AAAA,cAYlB,SAAA,kBAA4B,GAAA,CAAI,eAAA,EAAiB,GAAA,EAAK,MAAA,MAM/D,IAAA,EAAM,GAAA,CAAI,IAAA,CAAK,MAAA,cACd,MAAA,CAAO,MAAA,CAAO,GAAA,CAAI,OAAA,CAAQ,MAAA"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/index.ts"],"mappings":";;;cAQa,QAAA,iBAA0B,GAAA,CAAI,cAAA,EACzC,GAAA,EAAK,KAAA,EACL,IAAA,EAAM,GAAA,CAAI,IAAA,CAAK,KAAA,MACd,GAAA,CAAI,OAAA,CAAQ,KAAA;AAAA,cA4BF,WAAA,oBAAgC,GAAA,CAAI,iBAAA,EAC/C,GAAA,EAAK,QAAA,MAMG,IAAA,EAAM,GAAA,CAAI,IAAA,CAAK,QAAA,MAAY,OAAA,CAAQ,GAAA,CAAI,OAAA,CAAQ,QAAA;AAAA,cAa5C,SAAA,kBAA4B,GAAA,CAAI,eAAA,EAAiB,GAAA,EAAK,MAAA,MAKzD,IAAA,EAAM,GAAA,CAAI,IAAA,CAAK,MAAA,MAAU,OAAA,CAAQ,GAAA,CAAI,OAAA,CAAQ,MAAA"}

package/dist/index.js

@@ -1,31 +1,27 @@
-import * as Ref from "@confect/core/Ref";
+import { Ref } from "@confect/core";
 import { useAction as useAction$1, useMutation as useMutation$1, useQuery as useQuery$1 } from "convex/react";
-import { Effect, Option, Schema } from "effect";
+import { Match, Schema } from "effect";
 
 //#region src/index.ts
 const useQuery = (ref, args) => {
-	const function_ = Ref.getFunction(ref);
-	const encodedReturnsOrUndefined = useQuery$1(Ref.getConvexFunctionName(ref), Schema.encodeSync(function_.args)(args));
-	if (encodedReturnsOrUndefined === void 0) return Option.none();
-	else return Option.some(Schema.decodeSync(function_.returns)(encodedReturnsOrUndefined));
+	const functionSpec = Ref.getFunctionSpec(ref);
+	const encodedReturnsOrUndefined = useQuery$1(Ref.getConvexFunctionName(ref), Match.value(functionSpec.functionProvenance).pipe(Match.tag("Confect", (confect) => Schema.encodeSync(confect.args)(args)), Match.tag("Convex", () => args), Match.exhaustive));
+	if (encodedReturnsOrUndefined === void 0) return;
+	return Match.value(functionSpec.functionProvenance).pipe(Match.tag("Confect", (confect) => Schema.decodeSync(confect.returns)(encodedReturnsOrUndefined)), Match.tag("Convex", () => encodedReturnsOrUndefined), Match.exhaustive);
 };
 const useMutation = (ref) => {
-	const function_ = Ref.getFunction(ref);
+	const functionSpec = Ref.getFunctionSpec(ref);
 	const actualMutation = useMutation$1(Ref.getConvexFunctionName(ref));
-	return (args) => Effect.gen(function* () {
-		const encodedArgs = yield* Schema.encode(function_.args)(args);
-		const actualReturns = yield* Effect.promise(() => actualMutation(encodedArgs));
-		return yield* Schema.decode(function_.returns)(actualReturns);
-	}).pipe(Effect.orDie);
+	return (args) => Match.value(functionSpec.functionProvenance).pipe(Match.tag("Confect", (confect) => {
+		return actualMutation(Schema.encodeSync(confect.args)(args)).then((result) => Schema.decodeSync(confect.returns)(result));
+	}), Match.tag("Convex", () => actualMutation(args)), Match.exhaustive);
 };
 const useAction = (ref) => {
-	const function_ = Ref.getFunction(ref);
+	const functionSpec = Ref.getFunctionSpec(ref);
 	const actualAction = useAction$1(Ref.getConvexFunctionName(ref));
-	return (args) => Effect.gen(function* () {
-		const encodedArgs = yield* Schema.encode(function_.args)(args);
-		const actualReturns = yield* Effect.promise(() => actualAction(encodedArgs));
-		return yield* Schema.decode(function_.returns)(actualReturns);
-	}).pipe(Effect.orDie);
+	return (args) => Match.value(functionSpec.functionProvenance).pipe(Match.tag("Confect", (confect) => {
+		return actualAction(Schema.encodeSync(confect.args)(args)).then((result) => Schema.decodeSync(confect.returns)(result));
+	}), Match.tag("Convex", () => actualAction(args)), Match.exhaustive);
 };
 
 //#endregion

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["useConvexQuery","useConvexMutation","useConvexAction"],"sources":["../src/index.ts"],"sourcesContent":["import * as Ref from \"@confect/core/Ref\";\nimport {\n  useAction as useConvexAction,\n  useMutation as useConvexMutation,\n  useQuery as useConvexQuery,\n} from \"convex/react\";\nimport { Effect, Option, Schema } from \"effect\";\n\nexport const useQuery = <Query extends Ref.AnyPublicQuery>(\n  ref: Query,\n  args: Ref.Args<Query>[\"Type\"],\n): Option.Option<Ref.Returns<Query>[\"Type\"]> => {\n  const function_ = Ref.getFunction(ref);\n  const functionName = Ref.getConvexFunctionName(ref);\n\n  const encodedArgs = Schema.encodeSync(function_.args)(args);\n\n  const encodedReturnsOrUndefined = useConvexQuery(\n    functionName as any,\n    encodedArgs,\n  );\n\n  if (encodedReturnsOrUndefined === undefined) {\n    return Option.none();\n  } else {\n    return Option.some(\n      Schema.decodeSync(function_.returns)(encodedReturnsOrUndefined),\n    );\n  }\n};\n\nexport const useMutation = <Mutation extends Ref.AnyPublicMutation>(\n  ref: Mutation,\n) => {\n  const function_ = Ref.getFunction(ref);\n  const functionName = Ref.getConvexFunctionName(ref);\n  const actualMutation = useConvexMutation(functionName as any);\n\n  return (\n    args: Ref.Args<Mutation>[\"Type\"],\n  ): Effect.Effect<Ref.Returns<Mutation>[\"Type\"]> =>\n    Effect.gen(function* () {\n      const encodedArgs = yield* Schema.encode(function_.args)(args);\n\n      const actualReturns = yield* Effect.promise(() =>\n        actualMutation(encodedArgs),\n      );\n\n      return yield* Schema.decode(function_.returns)(actualReturns);\n    }).pipe(Effect.orDie);\n};\n\nexport const useAction = <Action extends Ref.AnyPublicAction>(ref: Action) => {\n  const function_ = Ref.getFunction(ref);\n  const functionName = Ref.getConvexFunctionName(ref);\n  const actualAction = useConvexAction(functionName as any);\n\n  return (\n    args: Ref.Args<Action>[\"Type\"],\n  ): Effect.Effect<Ref.Returns<Action>[\"Type\"]> =>\n    Effect.gen(function* () {\n      const encodedArgs = yield* Schema.encode(function_.args)(args);\n\n      const actualReturns = yield* Effect.promise(() =>\n        actualAction(encodedArgs),\n      );\n\n      return yield* Schema.decode(function_.returns)(actualReturns);\n    }).pipe(Effect.orDie);\n};\n"],"mappings":";;;;;AAQA,MAAa,YACX,KACA,SAC8C;CAC9C,MAAM,YAAY,IAAI,YAAY,IAAI;CAKtC,MAAM,4BAA4BA,WAJb,IAAI,sBAAsB,IAAI,EAE/B,OAAO,WAAW,UAAU,KAAK,CAAC,KAAK,CAK1D;AAED,KAAI,8BAA8B,OAChC,QAAO,OAAO,MAAM;KAEpB,QAAO,OAAO,KACZ,OAAO,WAAW,UAAU,QAAQ,CAAC,0BAA0B,CAChE;;AAIL,MAAa,eACX,QACG;CACH,MAAM,YAAY,IAAI,YAAY,IAAI;CAEtC,MAAM,iBAAiBC,cADF,IAAI,sBAAsB,IAAI,CACU;AAE7D,SACE,SAEA,OAAO,IAAI,aAAa;EACtB,MAAM,cAAc,OAAO,OAAO,OAAO,UAAU,KAAK,CAAC,KAAK;EAE9D,MAAM,gBAAgB,OAAO,OAAO,cAClC,eAAe,YAAY,CAC5B;AAED,SAAO,OAAO,OAAO,OAAO,UAAU,QAAQ,CAAC,cAAc;GAC7D,CAAC,KAAK,OAAO,MAAM;;AAGzB,MAAa,aAAiD,QAAgB;CAC5E,MAAM,YAAY,IAAI,YAAY,IAAI;CAEtC,MAAM,eAAeC,YADA,IAAI,sBAAsB,IAAI,CACM;AAEzD,SACE,SAEA,OAAO,IAAI,aAAa;EACtB,MAAM,cAAc,OAAO,OAAO,OAAO,UAAU,KAAK,CAAC,KAAK;EAE9D,MAAM,gBAAgB,OAAO,OAAO,cAClC,aAAa,YAAY,CAC1B;AAED,SAAO,OAAO,OAAO,OAAO,UAAU,QAAQ,CAAC,cAAc;GAC7D,CAAC,KAAK,OAAO,MAAM"}
+{"version":3,"file":"index.js","names":["useConvexQuery","useConvexMutation","useConvexAction"],"sources":["../src/index.ts"],"sourcesContent":["import { Ref } from \"@confect/core\";\nimport {\n  useAction as useConvexAction,\n  useMutation as useConvexMutation,\n  useQuery as useConvexQuery,\n} from \"convex/react\";\nimport { Match, Schema } from \"effect\";\n\nexport const useQuery = <Query extends Ref.AnyPublicQuery>(\n  ref: Query,\n  args: Ref.Args<Query>,\n): Ref.Returns<Query> | undefined => {\n  const functionSpec = Ref.getFunctionSpec(ref);\n  const functionName = Ref.getConvexFunctionName(ref);\n\n  const encodedArgs = Match.value(functionSpec.functionProvenance).pipe(\n    Match.tag(\"Confect\", (confect) => Schema.encodeSync(confect.args)(args)),\n    Match.tag(\"Convex\", () => args),\n    Match.exhaustive,\n  );\n\n  const encodedReturnsOrUndefined = useConvexQuery(\n    functionName as any,\n    encodedArgs,\n  );\n\n  if (encodedReturnsOrUndefined === undefined) {\n    return undefined;\n  }\n\n  return Match.value(functionSpec.functionProvenance).pipe(\n    Match.tag(\"Confect\", (confect) =>\n      Schema.decodeSync(confect.returns)(encodedReturnsOrUndefined),\n    ),\n    Match.tag(\"Convex\", () => encodedReturnsOrUndefined),\n    Match.exhaustive,\n  );\n};\n\nexport const useMutation = <Mutation extends Ref.AnyPublicMutation>(\n  ref: Mutation,\n) => {\n  const functionSpec = Ref.getFunctionSpec(ref);\n  const functionName = Ref.getConvexFunctionName(ref);\n  const actualMutation = useConvexMutation(functionName as any);\n\n  return (args: Ref.Args<Mutation>): Promise<Ref.Returns<Mutation>> =>\n    Match.value(functionSpec.functionProvenance).pipe(\n      Match.tag(\"Confect\", (confect) => {\n        const encodedArgs = Schema.encodeSync(confect.args)(args);\n        return actualMutation(encodedArgs).then((result) =>\n          Schema.decodeSync(confect.returns)(result),\n        );\n      }),\n      Match.tag(\"Convex\", () => actualMutation(args as any)),\n      Match.exhaustive,\n    );\n};\n\nexport const useAction = <Action extends Ref.AnyPublicAction>(ref: Action) => {\n  const functionSpec = Ref.getFunctionSpec(ref);\n  const functionName = Ref.getConvexFunctionName(ref);\n  const actualAction = useConvexAction(functionName as any);\n\n  return (args: Ref.Args<Action>): Promise<Ref.Returns<Action>> =>\n    Match.value(functionSpec.functionProvenance).pipe(\n      Match.tag(\"Confect\", (confect) => {\n        const encodedArgs = Schema.encodeSync(confect.args)(args);\n        return actualAction(encodedArgs).then((result) =>\n          Schema.decodeSync(confect.returns)(result),\n        );\n      }),\n      Match.tag(\"Convex\", () => actualAction(args as any)),\n      Match.exhaustive,\n    );\n};\n"],"mappings":";;;;;AAQA,MAAa,YACX,KACA,SACmC;CACnC,MAAM,eAAe,IAAI,gBAAgB,IAAI;CAS7C,MAAM,4BAA4BA,WARb,IAAI,sBAAsB,IAAI,EAE/B,MAAM,MAAM,aAAa,mBAAmB,CAAC,KAC/D,MAAM,IAAI,YAAY,YAAY,OAAO,WAAW,QAAQ,KAAK,CAAC,KAAK,CAAC,EACxE,MAAM,IAAI,gBAAgB,KAAK,EAC/B,MAAM,WACP,CAKA;AAED,KAAI,8BAA8B,OAChC;AAGF,QAAO,MAAM,MAAM,aAAa,mBAAmB,CAAC,KAClD,MAAM,IAAI,YAAY,YACpB,OAAO,WAAW,QAAQ,QAAQ,CAAC,0BAA0B,CAC9D,EACD,MAAM,IAAI,gBAAgB,0BAA0B,EACpD,MAAM,WACP;;AAGH,MAAa,eACX,QACG;CACH,MAAM,eAAe,IAAI,gBAAgB,IAAI;CAE7C,MAAM,iBAAiBC,cADF,IAAI,sBAAsB,IAAI,CACU;AAE7D,SAAQ,SACN,MAAM,MAAM,aAAa,mBAAmB,CAAC,KAC3C,MAAM,IAAI,YAAY,YAAY;AAEhC,SAAO,eADa,OAAO,WAAW,QAAQ,KAAK,CAAC,KAAK,CACvB,CAAC,MAAM,WACvC,OAAO,WAAW,QAAQ,QAAQ,CAAC,OAAO,CAC3C;GACD,EACF,MAAM,IAAI,gBAAgB,eAAe,KAAY,CAAC,EACtD,MAAM,WACP;;AAGL,MAAa,aAAiD,QAAgB;CAC5E,MAAM,eAAe,IAAI,gBAAgB,IAAI;CAE7C,MAAM,eAAeC,YADA,IAAI,sBAAsB,IAAI,CACM;AAEzD,SAAQ,SACN,MAAM,MAAM,aAAa,mBAAmB,CAAC,KAC3C,MAAM,IAAI,YAAY,YAAY;AAEhC,SAAO,aADa,OAAO,WAAW,QAAQ,KAAK,CAAC,KAAK,CACzB,CAAC,MAAM,WACrC,OAAO,WAAW,QAAQ,QAAQ,CAAC,OAAO,CAC3C;GACD,EACF,MAAM,IAAI,gBAAgB,aAAa,KAAY,CAAC,EACpD,MAAM,WACP"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@confect/react",
-  "version": "1.0.3",
+  "version": "3.0.0",
   "description": "Client-side bindings for React apps",
   "repository": {
     "type": "git",
@@ -35,20 +35,19 @@
   "author": "RJ Dellecese",
   "license": "ISC",
   "devDependencies": {
-    "@effect/language-service": "0.73.1",
-    "@eslint/js": "9.39.2",
-    "@types/node": "25.2.3",
-    "eslint": "9.39.2",
+    "@eslint/js": "10.0.1",
+    "@types/node": "25.3.3",
+    "eslint": "10.0.2",
     "prettier": "3.8.1",
     "tsdown": "0.20.3",
     "typescript": "5.9.3",
-    "typescript-eslint": "8.55.0"
+    "typescript-eslint": "8.56.1"
   },
   "peerDependencies": {
     "convex": "^1.30.0",
     "effect": "^3.19.16",
     "react": "^18.0.0 || ^19.0.0",
-    "@confect/core": "1.0.3"
+    "@confect/core": "3.0.0"
   },
   "engines": {
     "node": ">=22",

package/src/index.ts

@@ -1,19 +1,23 @@
-import * as Ref from "@confect/core/Ref";
+import { Ref } from "@confect/core";
 import {
   useAction as useConvexAction,
   useMutation as useConvexMutation,
   useQuery as useConvexQuery,
 } from "convex/react";
-import { Effect, Option, Schema } from "effect";
+import { Match, Schema } from "effect";
 
 export const useQuery = <Query extends Ref.AnyPublicQuery>(
   ref: Query,
-  args: Ref.Args<Query>["Type"],
-): Option.Option<Ref.Returns<Query>["Type"]> => {
-  const function_ = Ref.getFunction(ref);
+  args: Ref.Args<Query>,
+): Ref.Returns<Query> | undefined => {
+  const functionSpec = Ref.getFunctionSpec(ref);
   const functionName = Ref.getConvexFunctionName(ref);
 
-  const encodedArgs = Schema.encodeSync(function_.args)(args);
+  const encodedArgs = Match.value(functionSpec.functionProvenance).pipe(
+    Match.tag("Confect", (confect) => Schema.encodeSync(confect.args)(args)),
+    Match.tag("Convex", () => args),
+    Match.exhaustive,
+  );
 
   const encodedReturnsOrUndefined = useConvexQuery(
     functionName as any,
@@ -21,50 +25,52 @@ export const useQuery = <Query extends Ref.AnyPublicQuery>(
   );
 
   if (encodedReturnsOrUndefined === undefined) {
-    return Option.none();
-  } else {
-    return Option.some(
-      Schema.decodeSync(function_.returns)(encodedReturnsOrUndefined),
-    );
+    return undefined;
   }
+
+  return Match.value(functionSpec.functionProvenance).pipe(
+    Match.tag("Confect", (confect) =>
+      Schema.decodeSync(confect.returns)(encodedReturnsOrUndefined),
+    ),
+    Match.tag("Convex", () => encodedReturnsOrUndefined),
+    Match.exhaustive,
+  );
 };
 
 export const useMutation = <Mutation extends Ref.AnyPublicMutation>(
   ref: Mutation,
 ) => {
-  const function_ = Ref.getFunction(ref);
+  const functionSpec = Ref.getFunctionSpec(ref);
   const functionName = Ref.getConvexFunctionName(ref);
   const actualMutation = useConvexMutation(functionName as any);
 
-  return (
-    args: Ref.Args<Mutation>["Type"],
-  ): Effect.Effect<Ref.Returns<Mutation>["Type"]> =>
-    Effect.gen(function* () {
-      const encodedArgs = yield* Schema.encode(function_.args)(args);
-
-      const actualReturns = yield* Effect.promise(() =>
-        actualMutation(encodedArgs),
-      );
-
-      return yield* Schema.decode(function_.returns)(actualReturns);
-    }).pipe(Effect.orDie);
+  return (args: Ref.Args<Mutation>): Promise<Ref.Returns<Mutation>> =>
+    Match.value(functionSpec.functionProvenance).pipe(
+      Match.tag("Confect", (confect) => {
+        const encodedArgs = Schema.encodeSync(confect.args)(args);
+        return actualMutation(encodedArgs).then((result) =>
+          Schema.decodeSync(confect.returns)(result),
+        );
+      }),
+      Match.tag("Convex", () => actualMutation(args as any)),
+      Match.exhaustive,
+    );
 };
 
 export const useAction = <Action extends Ref.AnyPublicAction>(ref: Action) => {
-  const function_ = Ref.getFunction(ref);
+  const functionSpec = Ref.getFunctionSpec(ref);
   const functionName = Ref.getConvexFunctionName(ref);
   const actualAction = useConvexAction(functionName as any);
 
-  return (
-    args: Ref.Args<Action>["Type"],
-  ): Effect.Effect<Ref.Returns<Action>["Type"]> =>
-    Effect.gen(function* () {
-      const encodedArgs = yield* Schema.encode(function_.args)(args);
-
-      const actualReturns = yield* Effect.promise(() =>
-        actualAction(encodedArgs),
-      );
-
-      return yield* Schema.decode(function_.returns)(actualReturns);
-    }).pipe(Effect.orDie);
+  return (args: Ref.Args<Action>): Promise<Ref.Returns<Action>> =>
+    Match.value(functionSpec.functionProvenance).pipe(
+      Match.tag("Confect", (confect) => {
+        const encodedArgs = Schema.encodeSync(confect.args)(args);
+        return actualAction(encodedArgs).then((result) =>
+          Schema.decodeSync(confect.returns)(result),
+        );
+      }),
+      Match.tag("Convex", () => actualAction(args as any)),
+      Match.exhaustive,
+    );
 };