@assistant-ui/tap 0.5.14 → 0.6.1

package/src/__tests__/rules/rules.hook-order.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from "vitest";
-import { tapEffect } from "../../hooks/tap-effect";
-import { tapState } from "../../hooks/tap-state";
+import { useEffect } from "../../hooks/useEffect";
+import { useState } from "../../hooks/useState";
 import { createTestResource, renderTest } from "../test-utils";
 import {
   renderResourceFiber,
@@ -13,11 +13,11 @@ describe("Rules of Hooks - Hook Order", () => {
 
     const resource = createTestResource(() => {
       if (condition) {
-        tapState(1);
-        tapEffect(() => {}, []);
+        useState(1);
+        useEffect(() => {}, []);
       } else {
-        tapEffect(() => {}, []);
-        tapState(1);
+        useEffect(() => {}, []);
+        useState(1);
       }
       return null;
     });
@@ -35,13 +35,13 @@ describe("Rules of Hooks - Hook Order", () => {
   });
 
   it("should throw when hook types change between renders", () => {
-    let useEffect = false;
+    let addEffect = false;
 
     const resource = createTestResource(() => {
-      if (useEffect) {
-        tapEffect(() => {});
+      if (addEffect) {
+        useEffect(() => {});
       } else {
-        tapState(0);
+        useState(0);
       }
       return null;
     });
@@ -49,7 +49,7 @@ describe("Rules of Hooks - Hook Order", () => {
     renderTest(resource, undefined);
 
     // Change to use different hook type
-    useEffect = true;
+    addEffect = true;
 
     expect(() => renderResourceFiber(resource, undefined)).toThrow(
       "Hook order changed between renders",
@@ -60,13 +60,13 @@ describe("Rules of Hooks - Hook Order", () => {
     let condition = true;
 
     const resource = createTestResource(() => {
-      tapState(1);
+      useState(1);
 
       if (condition) {
-        tapState(2); // Conditional hook
+        useState(2); // Conditional hook
       }
 
-      tapState(3);
+      useState(3);
       return null;
     });
 
@@ -86,7 +86,7 @@ describe("Rules of Hooks - Hook Order", () => {
 
     const resource = createTestResource(() => {
       const states = items.map((item) => {
-        const [value] = tapState(item);
+        const [value] = useState(item);
         return value;
       });
 
@@ -105,7 +105,7 @@ describe("Rules of Hooks - Hook Order", () => {
 
     const resource = createTestResource(() => {
       items.forEach((item) => {
-        tapState(item);
+        useState(item);
       });
       return null;
     });
@@ -122,11 +122,11 @@ describe("Rules of Hooks - Hook Order", () => {
 
   it("should maintain order with mixed hook types", () => {
     const resource = createTestResource(() => {
-      const [a] = tapState(1);
-      tapEffect(() => {});
-      const [b] = tapState(2);
-      tapEffect(() => {});
-      const [c] = tapState(3);
+      const [a] = useState(1);
+      useEffect(() => {});
+      const [b] = useState(2);
+      useEffect(() => {});
+      const [c] = useState(3);
 
       return { a, b, c };
     });
@@ -143,13 +143,13 @@ describe("Rules of Hooks - Hook Order", () => {
     let shouldReturn = false;
 
     const resource = createTestResource(() => {
-      const [a] = tapState(1);
+      const [a] = useState(1);
 
       if (shouldReturn) {
         return a; // Early return
       }
 
-      const [b] = tapState(2);
+      const [b] = useState(2);
       return a + b;
     });
 
@@ -166,19 +166,19 @@ describe("Rules of Hooks - Hook Order", () => {
 
   it("should throw on nested hook calls", () => {
     const resource = createTestResource(() => {
-      const [count, setCount] = tapState(0);
+      const [count, setCount] = useState(0);
 
       // This effect contains a hook call, which is invalid
-      tapEffect(() => {
+      useEffect(() => {
         if (count > 0) {
           expect(() => {
-            const [_nested] = tapState(0); // Invalid: hook inside effect
+            const [_nested] = useState(0); // Invalid: hook inside effect
           }).toThrow("No resource fiber available");
         }
       });
 
       // Use an effect to trigger the state change
-      tapEffect(() => {
+      useEffect(() => {
         if (count === 0) {
           setCount(1);
         }

package/src/__tests__/strictmode/react-strictmode-behavior.test.tsx

@@ -2,7 +2,7 @@
  * Tests to verify React's strict mode behavior
  * These tests verify React's own behavior, not tap's implementation
  */
-/* oxlint-disable tap-hooks/exhaustive-deps -- intentional missing-dep patterns for strict-mode tests */
+/* oxlint-disable react/exhaustive-deps -- intentional missing-dep patterns for strict-mode tests */
 
 import { describe, it, expect } from "vitest";
 import { render } from "@testing-library/react";

package/src/__tests__/strictmode/strictmode.test.ts

@@ -1,11 +1,11 @@
 import { describe, it, expect } from "vitest";
 import { resource } from "../../core/resource";
 import { isDevelopment } from "../../core/helpers/env";
-import { tapRef } from "../../hooks/tap-ref";
-import { tapState } from "../../hooks/tap-state";
-import { tapEffect } from "../../hooks/tap-effect";
-import { tapMemo } from "../../hooks/tap-memo";
-import { tapResource } from "../../hooks/tap-resource";
+import { useRef } from "../../hooks/useRef";
+import { useState } from "../../hooks/useState";
+import { useEffect } from "../../hooks/useEffect";
+import { useMemo } from "../../hooks/useMemo";
+import { useResource } from "../../hooks/useResource";
 import { createResourceRoot } from "../../core/createResourceRoot";
 import { withKey } from "../../core/withKey";
 
@@ -14,16 +14,16 @@ describe("Strict Mode", () => {
     expect(isDevelopment).toBe(true);
   });
 
-  it("should persist tapMemo cache across strict mode double render", () => {
+  it("should persist useMemo cache across strict mode double render", () => {
     const events: string[] = [];
     let outerCount = 0;
     let memoCount = 0;
 
-    const TestResource = resource(() => {
+    const TestResource = resource(function TestResource() {
       const idx = outerCount++;
       events.push(`outer-${idx}`);
 
-      tapMemo(() => {
+      useMemo(() => {
         events.push(`memo-${memoCount++}`);
         return {};
       }, []);
@@ -36,7 +36,7 @@ describe("Strict Mode", () => {
 
     console.log("Events:", events);
 
-    // tapMemo factory runs twice during first render (strict mode double-call)
+    // useMemo factory runs twice during first render (strict mode double-call)
     // but should NOT run during second render (cache should persist)
     expect(events).toEqual([
       "outer-0",
@@ -49,12 +49,12 @@ describe("Strict Mode", () => {
     ]);
   });
 
-  it("should double-invoke tapMemo factory and use the first result", () => {
+  it("should double-invoke useMemo factory and use the first result", () => {
     const events: string[] = [];
     let memoCallCount = 0;
 
-    const TestResource = resource(() => {
-      const memoValue = tapMemo(() => {
+    const TestResource = resource(function TestResource() {
+      const memoValue = useMemo(() => {
         memoCallCount++;
         events.push(`memo-${memoCallCount}`);
         return memoCallCount;
@@ -79,7 +79,7 @@ describe("Strict Mode", () => {
   it("should double-render on first render", () => {
     let renderCount = 0;
 
-    const TestResource = resource(() => {
+    const TestResource = resource(function TestResource() {
       renderCount++;
       return { renderCount };
     });
@@ -95,13 +95,13 @@ describe("Strict Mode", () => {
   it("should double-call hook fns", () => {
     let renderCount = 0;
 
-    const TestResource = resource(() => {
-      const ref = tapRef(0);
-      const [count] = tapState(() => {
+    const TestResource = resource(function TestResource() {
+      const ref = useRef(0);
+      const [count] = useState(() => {
         renderCount++;
         return ++ref.current;
       });
-      const [count2] = tapState(() => {
+      const [count2] = useState(() => {
         renderCount++;
         return ++ref.current;
       });
@@ -119,12 +119,12 @@ describe("Strict Mode", () => {
 
   it("should double-commit effects", () => {
     const events: string[] = [];
-    const TestResource = resource(() => {
-      const ref = tapRef(0);
+    const TestResource = resource(function TestResource() {
+      const ref = useRef(0);
       ref.current++;
       const count = ref.current;
 
-      tapEffect(() => {
+      useEffect(() => {
         events.push("mount-1");
 
         return () => {
@@ -132,7 +132,7 @@ describe("Strict Mode", () => {
         };
       });
 
-      tapEffect(() => {
+      useEffect(() => {
         events.push("mount-2");
 
         return () => {
@@ -140,7 +140,7 @@ describe("Strict Mode", () => {
         };
       }, []);
 
-      tapEffect(() => {
+      useEffect(() => {
         expect(count).toBe(2);
 
         events.push("mount-3");
@@ -170,13 +170,13 @@ describe("Strict Mode", () => {
   it("should double-render on child render", () => {
     let renderCount = 0;
 
-    const TestChildResource = resource(() => {
+    const TestChildResource = resource(function TestChildResource() {
       renderCount++;
       return { renderCount };
     });
 
-    const TestResource = resource(() => {
-      return tapResource(TestChildResource());
+    const TestResource = resource(function TestResource() {
+      return useResource(TestChildResource());
     });
 
     const root = createResourceRoot();
@@ -189,10 +189,10 @@ describe("Strict Mode", () => {
 
   it("should double-mount before handling state updates", () => {
     const events: string[] = [];
-    const TestResource = resource(() => {
-      const [id, setId] = tapState(0);
+    const TestResource = resource(function TestResource() {
+      const [id, setId] = useState(0);
       events.push(`render-${id}`);
-      tapEffect(() => {
+      useEffect(() => {
         events.push(`mount-${id}`);
         setId(1);
         return () => {
@@ -228,13 +228,13 @@ describe("Strict Mode", () => {
       return renderCount;
     };
 
-    const TestChildResource = resource(() => {
-      const [fnState] = tapState(() => {
+    const TestChildResource = resource(function TestChildResource() {
+      const [fnState] = useState(() => {
         fnCount++;
         return fnCount;
       });
       const count = incrementRenderCount();
-      tapEffect(() => {
+      useEffect(() => {
         expect(fnState % 2).toBe(1);
         expect(count).toBe(fnState + 1);
 
@@ -246,12 +246,12 @@ describe("Strict Mode", () => {
       return { renderCount, fnCount, fnState };
     });
 
-    const TestResource = resource(() => {
-      const [id, setId] = tapState(0);
-      tapEffect(() => {
+    const TestResource = resource(function TestResource() {
+      const [id, setId] = useState(0);
+      useEffect(() => {
         setId(1);
       });
-      return tapResource(withKey(id, TestChildResource()));
+      return useResource(withKey(id, TestChildResource()));
     });
 
     const root = createResourceRoot();
@@ -270,16 +270,16 @@ describe("Strict Mode", () => {
   it("should double-render on child render change", () => {
     let renderCount = 0;
     const events: string[] = [];
-    const TestChildResource = resource(() => {
+    const TestChildResource = resource(function TestChildResource() {
       renderCount++;
       events.push(`render-${renderCount}`);
 
-      tapState(() => {
+      useState(() => {
         return events.push(`fn-${renderCount}`);
       });
 
       const count = renderCount;
-      tapEffect(() => {
+      useEffect(() => {
         events.push(`mount-${count}`);
         return () => {
           events.push(`unmount-${count}`);
@@ -287,10 +287,10 @@ describe("Strict Mode", () => {
       });
     });
 
-    const TestResource = resource(() => {
-      const [id, setId] = tapState(0);
+    const TestResource = resource(function TestResource() {
+      const [id, setId] = useState(0);
       events.push(`outer-render-${id}`);
-      tapEffect(() => {
+      useEffect(() => {
         events.push(`outer-mount-${id}`);
         setId(1);
 
@@ -298,7 +298,7 @@ describe("Strict Mode", () => {
           events.push(`outer-unmount-${id}`);
         };
       });
-      return tapResource(withKey(id, TestChildResource()));
+      return useResource(withKey(id, TestChildResource()));
     });
 
     const root = createResourceRoot();

package/src/__tests__/strictmode/tap-strictmode-rerender-sources.test.ts

@@ -2,12 +2,12 @@
  * Tests to verify when tap strict mode causes double-rendering
  * These tests should mirror the React strict mode behavior
  */
-/* oxlint-disable tap-hooks/exhaustive-deps -- empty dep arrays are part of the test scenarios */
+/* oxlint-disable react/exhaustive-deps -- empty dep arrays are part of the test scenarios */
 
 import { afterEach, describe, it, expect, vi } from "vitest";
 import { resource } from "../../core/resource";
-import { tapState } from "../../hooks/tap-state";
-import { tapEffect } from "../../hooks/tap-effect";
+import { useState } from "../../hooks/useState";
+import { useEffect } from "../../hooks/useEffect";
 import { createResourceRoot } from "../../core/createResourceRoot";
 import { flushResourcesSync } from "../../core/scheduler";
 
@@ -17,11 +17,11 @@ describe("Tap Strict Mode - Rerender Sources", () => {
       const events: string[] = [];
       let updaterCallCount = 0;
 
-      const TestResource = resource(() => {
-        const [count, setCount] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count, setCount] = useState(0);
         events.push(`render count=${count}`);
 
-        tapEffect(() => {
+        useEffect(() => {
           events.push("effect mount");
           setCount((prev) => {
             updaterCallCount++;
@@ -70,8 +70,8 @@ describe("Tap Strict Mode - Rerender Sources", () => {
     it("should double-render on initial mount", () => {
       const events: string[] = [];
 
-      const TestResource = resource(() => {
-        const [count] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count] = useState(0);
         events.push(`render count=${count}`);
         return { count };
       });
@@ -83,15 +83,15 @@ describe("Tap Strict Mode - Rerender Sources", () => {
     });
   });
 
-  describe("Source 2: setState in tapEffect", () => {
-    it("should double-render after setState in tapEffect", () => {
+  describe("Source 2: setState in useEffect", () => {
+    it("should double-render after setState in useEffect", () => {
       const events: string[] = [];
 
-      const TestResource = resource(() => {
-        const [count, setCount] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count, setCount] = useState(0);
         events.push(`render count=${count}`);
 
-        tapEffect(() => {
+        useEffect(() => {
           events.push(`effect count=${count}`);
           if (count === 0) {
             setCount(1);
@@ -125,8 +125,8 @@ describe("Tap Strict Mode - Rerender Sources", () => {
     it("should ALSO double-render after setState in flushResourcesSync", () => {
       const events: string[] = [];
 
-      const TestResource = resource(() => {
-        const [count, setCount] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count, setCount] = useState(0);
         events.push(`render count=${count}`);
 
         return {
@@ -158,8 +158,8 @@ describe("Tap Strict Mode - Rerender Sources", () => {
     it("should double-render on ALL flushResourcesSync calls", () => {
       const events: string[] = [];
 
-      const TestResource = resource(() => {
-        const [count, setCount] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count, setCount] = useState(0);
         events.push(`render count=${count}`);
 
         return {
@@ -212,11 +212,11 @@ describe("Tap Strict Mode - Rerender Sources", () => {
 
       const events: string[] = [];
 
-      const TestResource = resource(() => {
-        const [count, setCount] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count, setCount] = useState(0);
         events.push(`render count=${count}`);
 
-        tapEffect(() => {
+        useEffect(() => {
           if (count === 0) {
             setTimeout(() => {
               events.push("setTimeout");
@@ -253,11 +253,11 @@ describe("Tap Strict Mode - Rerender Sources", () => {
     it("should double-render AND double-call Promise callback", async () => {
       const events: string[] = [];
 
-      const TestResource = resource(() => {
-        const [count, setCount] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count, setCount] = useState(0);
         events.push(`render count=${count}`);
 
-        tapEffect(() => {
+        useEffect(() => {
           if (count === 0) {
             Promise.resolve().then(() => {
               events.push("promise");
@@ -291,9 +291,9 @@ describe("Tap Strict Mode - Rerender Sources", () => {
     it("should batch multiple setState calls in flushResourcesSync (single double-render)", () => {
       const events: string[] = [];
 
-      const TestResource = resource(() => {
-        const [count1, setCount1] = tapState(0);
-        const [count2, setCount2] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count1, setCount1] = useState(0);
+        const [count2, setCount2] = useState(0);
         events.push(`render count1=${count1} count2=${count2}`);
 
         return {
@@ -322,15 +322,15 @@ describe("Tap Strict Mode - Rerender Sources", () => {
       ]);
     });
 
-    it("should batch multiple setState calls in tapEffect (single double-render)", () => {
+    it("should batch multiple setState calls in useEffect (single double-render)", () => {
       const events: string[] = [];
 
-      const TestResource = resource(() => {
-        const [count1, setCount1] = tapState(0);
-        const [count2, setCount2] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count1, setCount1] = useState(0);
+        const [count2, setCount2] = useState(0);
         events.push(`render count1=${count1} count2=${count2}`);
 
-        tapEffect(() => {
+        useEffect(() => {
           if (count1 === 0 && count2 === 0) {
             setCount1(1);
             setCount2(2);
@@ -357,8 +357,8 @@ describe("Tap Strict Mode - Rerender Sources", () => {
     it("should double-render simple resources", () => {
       const events: string[] = [];
 
-      const TestResource = resource(() => {
-        const [count, setCount] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count, setCount] = useState(0);
         events.push(`render count=${count}`);
 
         return {
@@ -379,8 +379,8 @@ describe("Tap Strict Mode - Rerender Sources", () => {
     it("should double-render with function updater in flushResourcesSync", () => {
       const events: string[] = [];
 
-      const TestResource = resource(() => {
-        const [count, setCount] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count, setCount] = useState(0);
         events.push(`render count=${count}`);
 
         return {
@@ -419,12 +419,12 @@ describe("Tap Strict Mode - Rerender Sources", () => {
     it("should handle effect with dependencies and setState", () => {
       const events: string[] = [];
 
-      const TestResource = resource(() => {
-        const [count, setCount] = tapState(0);
-        const [doubled, setDoubled] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count, setCount] = useState(0);
+        const [doubled, setDoubled] = useState(0);
         events.push(`render count=${count} doubled=${doubled}`);
 
-        tapEffect(() => {
+        useEffect(() => {
           events.push(`effect count=${count}`);
           setDoubled(count * 2);
           return () => {
@@ -469,13 +469,13 @@ describe("Tap Strict Mode - Rerender Sources", () => {
     });
   });
 
-  describe("Source 10: tapState initializer function", () => {
-    it("should call tapState initializer twice", () => {
+  describe("Source 10: useState initializer function", () => {
+    it("should call useState initializer twice", () => {
       const events: string[] = [];
       let initCount = 0;
 
-      const TestResource = resource(() => {
-        const [value] = tapState(() => {
+      const TestResource = resource(function TestResource() {
+        const [value] = useState(() => {
           initCount++;
           events.push(`init call #${initCount}`);
           return initCount;
@@ -489,7 +489,7 @@ describe("Tap Strict Mode - Rerender Sources", () => {
       const root = createResourceRoot();
       root.render(TestResource());
 
-      // tapState initializer should be called twice, first value kept
+      // useState initializer should be called twice, first value kept
       expect(events).toEqual([
         "init call #1",
         "init call #2",
@@ -503,8 +503,8 @@ describe("Tap Strict Mode - Rerender Sources", () => {
     it("should maintain double-render behavior after disposal and recreation", () => {
       const events: string[] = [];
 
-      const TestResource = resource(() => {
-        const [count, setCount] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count, setCount] = useState(0);
         events.push(`render count=${count}`);
 
         return {
@@ -547,11 +547,11 @@ describe("Tap Strict Mode - Rerender Sources", () => {
       const events: string[] = [];
       let effectRunCount = 0;
 
-      const TestResource = resource(() => {
-        const [count, setCount] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count, setCount] = useState(0);
         events.push(`render count=${count}`);
 
-        tapEffect(() => {
+        useEffect(() => {
           effectRunCount++;
           events.push(`effect mount #${effectRunCount} count=${count}`);
 
@@ -593,11 +593,11 @@ describe("Tap Strict Mode - Rerender Sources", () => {
       const events: string[] = [];
       let effectRunCount = 0;
 
-      const TestResource = resource(() => {
-        const [count, setCount] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count, setCount] = useState(0);
         events.push(`render count=${count}`);
 
-        tapEffect(() => {
+        useEffect(() => {
           effectRunCount++;
           events.push(`effect mount #${effectRunCount} count=${count}`);
 
@@ -638,11 +638,11 @@ describe("Tap Strict Mode - Rerender Sources", () => {
       const events: string[] = [];
       let effectRunCount = 0;
 
-      const TestResource = resource(() => {
-        const [count, setCount] = tapState(0);
+      const TestResource = resource(function TestResource() {
+        const [count, setCount] = useState(0);
         events.push(`render count=${count}`);
 
-        tapEffect(() => {
+        useEffect(() => {
           effectRunCount++;
           events.push(`effect mount #${effectRunCount} count=${count}`);
 

package/src/__tests__/test-utils.ts

@@ -7,7 +7,7 @@ import {
   commitResourceFiber,
 } from "../core/ResourceFiber";
 import type { ResourceFiber } from "../core/types";
-import { tapState } from "../hooks/tap-state";
+import { useState } from "../hooks/useState";
 
 /**
  * Creates a test resource fiber for unit testing.
@@ -195,7 +195,7 @@ export function createCounterResource(initialValue = 0) {
  */
 export function createStatefulCounterResource() {
   return (props: { initial: number }) => {
-    const [count, setCount] = tapState(props.initial);
+    const [count, setCount] = useState(props.initial);
     return {
       count,
       increment: () => setCount((c: number) => c + 1),

package/src/core/ResourceFiber.ts

@@ -10,6 +10,7 @@ import {
   withResourceFiber,
 } from "./helpers/execution-context";
 import { callResourceFn } from "./helpers/callResourceFn";
+import { withReactDispatcher } from "./react-dispatcher";
 import { isDevelopment } from "./helpers/env";
 
 export function createResourceFiber<R, P>(
@@ -53,7 +54,9 @@ export function renderResourceFiber<R, P>(
   withResourceFiber(fiber, () => {
     fiber.renderContext = result;
     try {
-      result.output = callResourceFn(fiber.type, props);
+      result.output = withReactDispatcher(() =>
+        callResourceFn(fiber.type, props),
+      );
     } finally {
       fiber.renderContext = undefined;
     }