@confect/js 9.2.4 → 10.0.0-next.1

package/package.json

@@ -1,19 +1,18 @@
 {
   "name": "@confect/js",
   "description": "JavaScript client bindings for any JS runtime",
-  "version": "9.2.4",
+  "version": "10.0.0-next.1",
   "author": "RJ Dellecese",
   "bugs": {
     "url": "https://github.com/rjdellecese/confect/issues"
   },
   "devDependencies": {
-    "@effect/vitest": "0.29.0",
-    "@types/node": "26.1.1",
-    "effect": "3.21.2",
-    "tsdown": "0.22.7",
-    "typescript": "6.0.3",
-    "unrun": "0.3.1",
-    "vitest": "4.1.10"
+    "@effect/vitest": "4.0.0-beta.98",
+    "@types/node": "25.3.3",
+    "effect": "4.0.0-beta.98",
+    "tsdown": "0.20.3",
+    "typescript": "5.9.3",
+    "vitest": "3.2.4"
   },
   "engines": {
     "node": ">=22"
@@ -43,8 +42,8 @@
   "module": "./dist/index.js",
   "peerDependencies": {
     "convex": "^1.32.0",
-    "effect": "^3.21.2",
-    "@confect/core": "^9.2.4"
+    "effect": "^4.0.0-beta.98",
+    "@confect/core": "^10.0.0-next.1"
   },
   "repository": {
     "type": "git",

package/src/HttpClient.ts

@@ -1,12 +1,11 @@
 import * as Ref from "@confect/core/Ref";
 import { ConvexHttpClient } from "convex/browser";
-import type { ParseResult } from "effect";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
 
-export class HttpClientError extends Schema.TaggedError<HttpClientError>()(
+export class HttpClientError extends Schema.TaggedErrorClass<HttpClientError>()(
   "HttpClientError",
   {
     cause: Schema.Unknown,
@@ -37,7 +36,7 @@ const make = (
     ...rest: Ref.OptionalArgs<Query>
   ): Effect.Effect<
     Ref.Returns<Query>,
-    Ref.Error<Query> | HttpClientError | ParseResult.ParseError
+    Ref.Error<Query> | HttpClientError | Schema.SchemaError
   > => {
     const args = (rest[0] ?? {}) as Ref.Args<Query>;
     return Ref.runWithCodec(
@@ -54,7 +53,7 @@ const make = (
     ...rest: Ref.OptionalArgs<Mutation>
   ): Effect.Effect<
     Ref.Returns<Mutation>,
-    Ref.Error<Mutation> | HttpClientError | ParseResult.ParseError
+    Ref.Error<Mutation> | HttpClientError | Schema.SchemaError
   > => {
     const args = (rest[0] ?? {}) as Ref.Args<Mutation>;
     return Ref.runWithCodec(
@@ -71,7 +70,7 @@ const make = (
     ...rest: Ref.OptionalArgs<Action>
   ): Effect.Effect<
     Ref.Returns<Action>,
-    Ref.Error<Action> | HttpClientError | ParseResult.ParseError
+    Ref.Error<Action> | HttpClientError | Schema.SchemaError
   > => {
     const args = (rest[0] ?? {}) as Ref.Args<Action>;
     return Ref.runWithCodec(
@@ -96,7 +95,7 @@ const make = (
 /**
  * A Confect client which uses HTTP to communicate with your Convex backend. Works in any JS runtime that supports `fetch`. Wraps [ConvexHttpClient](https://docs.convex.dev/api/classes/browser.ConvexHttpClient).
  */
-export const HttpClient = Context.GenericTag<ReturnType<typeof make>>(
+export const HttpClient = Context.Service<ReturnType<typeof make>>(
   "@confect/js/HttpClient",
 );
 

package/src/WebSocketClient.ts

@@ -1,13 +1,14 @@
 import * as Ref from "@confect/core/Ref";
 import { ConvexClient } from "convex/browser";
-import type { ParseResult } from "effect";
+import * as Cause from "effect/Cause";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as Queue from "effect/Queue";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
 
-export class WebSocketClientError extends Schema.TaggedError<WebSocketClientError>()(
+export class WebSocketClientError extends Schema.TaggedErrorClass<WebSocketClientError>()(
   "WebSocketClientError",
   {
     cause: Schema.Unknown,
@@ -51,7 +52,7 @@ const make = (
         ...rest: Ref.OptionalArgs<Query>
       ): Effect.Effect<
         Ref.Returns<Query>,
-        Ref.Error<Query> | WebSocketClientError | ParseResult.ParseError
+        Ref.Error<Query> | WebSocketClientError | Schema.SchemaError
       > => {
         const args = (rest[0] ?? {}) as Ref.Args<Query>;
         return Ref.runWithCodec(
@@ -68,7 +69,7 @@ const make = (
         ...rest: Ref.OptionalArgs<Mutation>
       ): Effect.Effect<
         Ref.Returns<Mutation>,
-        Ref.Error<Mutation> | WebSocketClientError | ParseResult.ParseError
+        Ref.Error<Mutation> | WebSocketClientError | Schema.SchemaError
       > => {
         const args = (rest[0] ?? {}) as Ref.Args<Mutation>;
         return Ref.runWithCodec(
@@ -85,7 +86,7 @@ const make = (
         ...rest: Ref.OptionalArgs<Action>
       ): Effect.Effect<
         Ref.Returns<Action>,
-        Ref.Error<Action> | WebSocketClientError | ParseResult.ParseError
+        Ref.Error<Action> | WebSocketClientError | Schema.SchemaError
       > => {
         const args = (rest[0] ?? {}) as Ref.Args<Action>;
         return Ref.runWithCodec(
@@ -102,29 +103,29 @@ const make = (
         ...rest: Ref.OptionalArgs<Query>
       ): Stream.Stream<
         Ref.Returns<Query>,
-        Ref.Error<Query> | WebSocketClientError | ParseResult.ParseError
+        Ref.Error<Query> | WebSocketClientError | Schema.SchemaError
       > => {
         const args = (rest[0] ?? {}) as Ref.Args<Query>;
         const functionReference = Ref.getFunctionReference(ref);
         const onError = Ref.decodeErrorOrElse(ref, mapUnknownError);
 
-        return Stream.unwrapScoped(
+        return Stream.unwrap(
           Effect.gen(function* () {
             const encodedArgs = yield* Ref.encodeArgs(ref, args);
 
-            return Stream.asyncScoped<
+            return Stream.callback<
               unknown,
               Ref.Error<Query> | WebSocketClientError
-            >((emit) =>
+            >((queue) =>
               Effect.gen(function* () {
                 const unsubscribe = convexClient.onUpdate(
                   functionReference,
                   encodedArgs,
                   (result) => {
-                    emit.single(result);
+                    Queue.offerUnsafe(queue, result);
                   },
                   (error) => {
-                    emit.fail(onError(error));
+                    Queue.failCauseUnsafe(queue, Cause.fail(onError(error)));
                   },
                 );
                 yield* Effect.addFinalizer(() =>
@@ -154,8 +155,8 @@ const make = (
 /**
  * A Confect client which uses a WebSocket to communicate with your Convex backend and supports reactive query subscriptions. The WebSocket connection is managed by the layer's scope and closed automatically when the scope ends. Wraps [ConvexClient](https://docs.convex.dev/api/classes/browser.ConvexClient).
  */
-export const WebSocketClient = Context.GenericTag<
-  Effect.Effect.Success<ReturnType<typeof make>>
+export const WebSocketClient = Context.Service<
+  Effect.Success<ReturnType<typeof make>>
 >("@confect/js/WebSocketClient");
 
 export type WebSocketClient = typeof WebSocketClient.Identifier;
@@ -163,4 +164,4 @@ export type WebSocketClient = typeof WebSocketClient.Identifier;
 export const layer = (
   address: string,
   options?: ConstructorParameters<typeof ConvexClient>[1],
-) => Layer.scoped(WebSocketClient, make(address, options));
+) => Layer.effect(WebSocketClient, make(address, options));