@effectify/react-query 1.0.0 → 1.0.1-beta.0

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectify/react-query",
-  "version": "1.0.0",
+  "version": "1.0.1-beta.0",
   "description": "Integration of Effect with TanStack Query for React",
   "repository": {
     "type": "git",
@@ -34,10 +34,12 @@
   "devDependencies": {
     "typescript": "catalog:",
     "@types/react": "catalog:",
-    "effect": "catalog:"
+    "@types/react-dom": "catalog:",
+    "effect": "catalog:",
+    "react-dom": "catalog:"
   },
   "optionalDependencies": {},
   "peerDependencies": {
-    "effect": "^3.19.16 || ^4.0.0-beta"
+    "effect": "^4.0.0-beta"
   }
 }

package/dist/src/lib/internal/make-use-rx-subsciption-ref.d.ts

@@ -1,20 +1,5 @@
-import { type Context } from "react";
 import type * as ManagedRuntime from "effect/ManagedRuntime";
-import type { Subscribable, SubscriptionOptions } from "../types.js";
-import type * as Effect from "effect/Effect";
-/**
- * ⚠️ TEMPORARILY DISABLED - Effect v4 Migration
- *
- * This hook is temporarily disabled due to significant API changes in Effect v4:
- * - SubscriptionRef.SubscriptionRefTypeId was removed
- * - Stream APIs reorganized under effect/unstable/*
- * - Migration documentation is incomplete (see Effect-TS/effect-smol#1378)
- *
- * The core functionality (useEffectQuery, useEffectMutation) works with v4.
- * This advanced subscription feature will be revisited when v4 documentation
- * is complete or when the beta stabilizes.
- *
- * TODO: Re-enable after Effect v4 stable release and documentation update
- * @deprecated Temporarily disabled during Effect v4 beta migration
- */
-export declare const makeUseRxSubscriptionRef: <R, E>(RuntimeContext: Context<ManagedRuntime.ManagedRuntime<R, E> | null>) => <A, E2>(_subscribable: Subscribable<A, E2> | Effect.Effect<Subscribable<A, E2>, never, R> | Effect.Effect<unknown, never, R>, _onNext: (value: A) => void, _opts?: SubscriptionOptions) => A;
+import * as SubscriptionRef from "effect/SubscriptionRef";
+import { type Context } from "react";
+import type { SubscriptionOptions } from "../types.js";
+export declare const makeUseRxSubscriptionRef: <R, E>(RuntimeContext: Context<ManagedRuntime.ManagedRuntime<R, E> | null>) => <A>(ref: SubscriptionRef.SubscriptionRef<A>, onNext: (value: A) => void, opts?: SubscriptionOptions) => A;

package/dist/src/lib/internal/make-use-rx-subsciption-ref.js

@@ -1,25 +1,15 @@
-import { useContext } from "react";
-/**
- * ⚠️ TEMPORARILY DISABLED - Effect v4 Migration
- *
- * This hook is temporarily disabled due to significant API changes in Effect v4:
- * - SubscriptionRef.SubscriptionRefTypeId was removed
- * - Stream APIs reorganized under effect/unstable/*
- * - Migration documentation is incomplete (see Effect-TS/effect-smol#1378)
- *
- * The core functionality (useEffectQuery, useEffectMutation) works with v4.
- * This advanced subscription feature will be revisited when v4 documentation
- * is complete or when the beta stabilizes.
- *
- * TODO: Re-enable after Effect v4 stable release and documentation update
- * @deprecated Temporarily disabled during Effect v4 beta migration
- */
-export const makeUseRxSubscriptionRef = (RuntimeContext) => (_subscribable, _onNext, _opts) => {
-    const runtime = useContext(RuntimeContext);
-    if (!runtime) {
-        throw new Error("Runtime context not found. Make sure to wrap your app with RuntimeProvider");
-    }
-    throw new Error("useRxSubscriptionRef is temporarily disabled during Effect v4 beta migration. " +
-        "Please use useEffectQuery or useEffectMutation instead, or wait for v4 stable release. " +
-        "See: https://github.com/Effect-TS/effect-smol/issues/1378");
+import * as SubscriptionRef from "effect/SubscriptionRef";
+import { useCallback, useMemo, useRef } from "react";
+import { makeUseRxSubscribe } from "./make-use-rx-subscribe.js";
+export const makeUseRxSubscriptionRef = (RuntimeContext) => {
+    const useRxSubscribe = makeUseRxSubscribe(RuntimeContext);
+    return (ref, onNext, opts) => {
+        const changes = useMemo(() => SubscriptionRef.changes(ref), [ref]);
+        const skipInitial = opts?.skipInitial ?? true;
+        const onNextRef = useRef(onNext);
+        onNextRef.current = onNext;
+        const handleNext = useCallback((value) => onNextRef.current(value), []);
+        const currentValue = SubscriptionRef.getUnsafe(ref);
+        return useRxSubscribe(changes, currentValue, handleNext, undefined, skipInitial);
+    };
 };

package/dist/src/lib/internal/make-use-rx-subscribe.d.ts

@@ -2,4 +2,4 @@ import * as Effect from "effect/Effect";
 import type * as ManagedRuntime from "effect/ManagedRuntime";
 import * as Stream from "effect/Stream";
 import { type Context } from "react";
-export declare const makeUseRxSubscribe: <R, E>(RuntimeContext: Context<ManagedRuntime.ManagedRuntime<R, E> | null>) => <E2, A>(stream: Stream.Stream<A, E2, R> | Effect.Effect<Stream.Stream<A, E2, R>, E2, R>, initialValue: A, onNext: (value: A) => void, onError?: (error: E2) => void) => A | undefined;
+export declare const makeUseRxSubscribe: <R, E>(RuntimeContext: Context<ManagedRuntime.ManagedRuntime<R, E> | null>) => <E2, A>(stream: Stream.Stream<A, E2, R> | Effect.Effect<Stream.Stream<A, E2, R>, E2, R>, initialValue: A, onNext: (value: A) => void, onError?: (error: E2) => void, skipInitial?: boolean) => A;

package/dist/src/lib/internal/make-use-rx-subscribe.js

@@ -1,40 +1,32 @@
 import * as Effect from "effect/Effect";
-import * as Exit from "effect/Exit";
-import * as Fiber from "effect/Fiber";
 import * as Stream from "effect/Stream";
-import { useContext, useEffect, useRef, useState } from "react";
+import { useContext, useEffect, useMemo, useState } from "react";
 export const makeUseRxSubscribe = (RuntimeContext) => {
-    return (stream, initialValue, onNext, onError) => {
+    return (stream, initialValue, onNext, onError, skipInitial = false) => {
         const runtime = useContext(RuntimeContext);
         if (!runtime) {
             throw new Error("Runtime context not found. Make sure to wrap your app with RuntimeProvider");
         }
-        const [value, setValue] = useState(initialValue);
-        const fiberRef = useRef(null);
-        const finalStream = Effect.isEffect(stream)
-            ? Stream.unwrap(stream)
-            : stream;
+        const [value, setValue] = useState(() => initialValue);
+        const finalStream = useMemo(() => (Effect.isEffect(stream) ? Stream.unwrap(stream) : stream), [stream]);
         useEffect(() => {
+            let isInitial = true;
             const subscription = finalStream.pipe(Stream.tap((a) => Effect.sync(() => {
                 setValue(a);
+                if (isInitial) {
+                    isInitial = false;
+                    if (skipInitial)
+                        return;
+                }
                 onNext(a);
             })), Stream.catch((e) => Stream.fromEffect(Effect.sync(() => {
                 onError?.(e);
-                return;
-            }))), Stream.runDrain, Effect.forever, Effect.forkDetach);
-            runtime.runCallback(subscription, {
-                onExit: (exit) => {
-                    if (Exit.isSuccess(exit)) {
-                        fiberRef.current = exit.value;
-                    }
-                },
-            });
+            }))), Stream.runDrain);
+            const cancel = runtime.runCallback(subscription);
             return () => {
-                if (fiberRef.current !== null) {
-                    runtime.runCallback(Fiber.interrupt(fiberRef.current));
-                }
+                cancel();
             };
-        }, [finalStream, runtime, onNext, onError]);
+        }, [finalStream, runtime, onNext, onError, skipInitial]);
         return value;
     };
 };

package/dist/src/lib/tanstack-query-effect.d.ts

@@ -14,8 +14,8 @@ export declare const tanstackQueryEffect: <R, E>({ layer, queryClient, }: {
     useRuntime: () => ManagedRuntime.ManagedRuntime<R, E>;
     useEffectQuery: <TData, TError extends import("./types.js").EffectfulError, TQueryKey extends import("./types.js").QueryKey = import("./types.js").QueryKey>({ gcTime, staleTime, ...options }: import("./types.js").EffectfulQueryOptions<TData, TError, R, TQueryKey>) => import("@tanstack/react-query").UseQueryResult<TData, Error>;
     useEffectMutation: <TData, TError_1 extends import("./types.js").EffectfulError, TVariables>(options: import("./types.js").EffectfulMutationOptions<TData, TError_1, TVariables, R>) => import("@tanstack/react-query").UseMutationResult<TData, Error, TVariables>;
-    useRxSubscribe: <E2_1, A>(stream: import("effect/Stream").Stream<A, E2_1, R> | Effect.Effect<import("effect/Stream").Stream<A, E2_1, R>, E2_1, R>, initialValue: A, onNext: (value: A) => void, onError?: ((error: E2_1) => void) | undefined) => A | undefined;
-    useRxSubscriptionRef: <A_1, E2_1>(_subscribable: import("./types.js").Subscribable<A_1, E2_1> | Effect.Effect<import("./types.js").Subscribable<A_1, E2_1>, never, R> | Effect.Effect<unknown, never, R>, _onNext: (value: A_1) => void, _opts?: import("./types.js").SubscriptionOptions) => A_1;
+    useRxSubscribe: <E2_1, A>(stream: import("effect/Stream").Stream<A, E2_1, R> | Effect.Effect<import("effect/Stream").Stream<A, E2_1, R>, E2_1, R>, initialValue: A, onNext: (value: A) => void, onError?: ((error: E2_1) => void) | undefined, skipInitial?: boolean) => A;
+    useRxSubscriptionRef: <A_1>(ref: import("effect/SubscriptionRef").SubscriptionRef<A_1>, onNext: (value: A_1) => void, opts?: import("./types.js").SubscriptionOptions) => A_1;
     createQueryDataHelpers: <TData, TVariables_1 = void>(queryKey: (variables: TVariables_1) => readonly [string, ...unknown[]]) => {
         removeQuery: (variables: TVariables_1) => void;
         removeAllQueries: () => void;

package/dist/src/lib/types.d.ts

@@ -16,11 +16,6 @@ export type EffectfulQueryOptions<TData, TError, R, TQueryKey extends QueryKey =
     staleTime?: number;
     gcTime?: number;
 };
-export interface Subscribable<A, E = never> {
-    readonly changes: unknown;
-    readonly get: () => A;
-    readonly _errorType?: E;
-}
 export interface SubscriptionOptions {
     readonly skipInitial?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectify/react-query",
-  "version": "1.0.0",
+  "version": "1.0.1-beta.0",
   "description": "Integration of Effect with TanStack Query for React",
   "repository": {
     "type": "git",
@@ -34,10 +34,12 @@
   "devDependencies": {
     "typescript": "npm:@typescript/typescript6@6.0.2",
     "@types/react": "19.2.17",
-    "effect": "4.0.0-rc.111"
+    "@types/react-dom": "19.2.3",
+    "effect": "4.0.0-rc.111",
+    "react-dom": "19.2.7"
   },
   "optionalDependencies": {},
   "peerDependencies": {
-    "effect": "^3.19.16 || ^4.0.0-beta"
+    "effect": "^4.0.0-beta"
   }
 }