@assistant-ui/tap 0.5.14 → 0.6.0

package/src/__tests__/basic/tapResources.basic.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, afterEach } from "vitest";
-import { tapResources } from "../../hooks/tap-resources";
-import { tapState } from "../../hooks/tap-state";
+import { useResources } from "../../hooks/useResources";
+import { useState } from "../../hooks/useState";
 import { resource } from "../../core/resource";
 import { withKey } from "../../core/withKey";
 import {
@@ -13,20 +13,25 @@ import {
 const SimpleCounter = resource(createCounterResource());
 
 // Stateful counter that tracks its own count
-const StatefulCounter = resource((props: { initial: number }) => {
-  const [count] = tapState(props.initial);
+const StatefulCounter = resource(function StatefulCounter(props: {
+  initial: number;
+}) {
+  const [count] = useState(props.initial);
   return { count };
 });
 
 // Display component for testing type changes
-const Display = resource((props: { text: string }) => {
+const Display = resource(function Display(props: { text: string }) {
   return { type: "display", text: props.text };
 });
 
 // Counter with render tracking for testing instance preservation
 const renderCounts = new Map<string, number>();
 const instances = new Map<string, object>();
-const TrackingCounter = resource((props: { value: number; id: string }) => {
+const TrackingCounter = resource(function TrackingCounter(props: {
+  value: number;
+  id: string;
+}) {
   const currentCount = (renderCounts.get(props.id) || 0) + 1;
   renderCounts.set(props.id, currentCount);
 
@@ -42,7 +47,7 @@ const TrackingCounter = resource((props: { value: number; id: string }) => {
   };
 });
 
-describe("tapResources - Basic Functionality", () => {
+describe("useResources - Basic Functionality", () => {
   afterEach(() => {
     cleanupAllResources();
   });
@@ -50,7 +55,7 @@ describe("tapResources - Basic Functionality", () => {
   describe("Basic Rendering", () => {
     it("should render multiple resources with keys", () => {
       const testFiber = createTestResource(() => {
-        const results = tapResources(
+        const results = useResources(
           () => [
             withKey("a", SimpleCounter({ value: 10 })),
             withKey("b", SimpleCounter({ value: 20 })),
@@ -67,8 +72,8 @@ describe("tapResources - Basic Functionality", () => {
     });
 
     it("should work with resource constructor syntax", () => {
-      const Counter = resource((props: { value: number }) => {
-        const [count] = tapState(props.value);
+      const Counter = resource(function Counter(props: { value: number }) {
+        const [count] = useState(props.value);
         return { count, double: count * 2 };
       });
 
@@ -79,7 +84,7 @@ describe("tapResources - Basic Functionality", () => {
       ];
 
       const testFiber = createTestResource(() => {
-        const results = tapResources(
+        const results = useResources(
           () =>
             items.map((item) =>
               withKey(item.key, Counter({ value: item.value })),
@@ -105,7 +110,7 @@ describe("tapResources - Basic Functionality", () => {
         (props: {
           items: Array<{ key: string; value: number; id: string }>;
         }) => {
-          return tapResources(() => {
+          return useResources(() => {
             return props.items.map((item) =>
               withKey(
                 item.key,
@@ -162,7 +167,7 @@ describe("tapResources - Basic Functionality", () => {
     it("should handle adding and removing resources", () => {
       const testFiber = createTestResource(
         (props: { items: Array<{ key: string; value: number }> }) => {
-          const results = tapResources(() => {
+          const results = useResources(() => {
             return props.items.map((item) =>
               withKey(item.key, SimpleCounter({ value: item.value })),
             );
@@ -203,7 +208,7 @@ describe("tapResources - Basic Functionality", () => {
 
     it("should handle changing resource types for the same key", () => {
       const testFiber = createTestResource((props: { useCounter: boolean }) => {
-        const results = tapResources(
+        const results = useResources(
           () => [
             withKey(
               "item",

package/src/__tests__/basic/tapState.basic.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, afterEach } from "vitest";
-import { tapState } from "../../hooks/tap-state";
-import { tapEffect } from "../../hooks/tap-effect";
+import { useState } from "../../hooks/useState";
+import { useEffect } from "../../hooks/useEffect";
 import {
   createTestResource,
   renderTest,
@@ -9,7 +9,7 @@ import {
   getCommittedOutput,
 } from "../test-utils";
 
-describe("tapState - Basic Functionality", () => {
+describe("useState - Basic Functionality", () => {
   afterEach(() => {
     cleanupAllResources();
   });
@@ -17,7 +17,7 @@ describe("tapState - Basic Functionality", () => {
   describe("Initialization", () => {
     it("should initialize with direct value", () => {
       const testFiber = createTestResource(() => {
-        const [count] = tapState(42);
+        const [count] = useState(42);
         return count;
       });
 
@@ -29,7 +29,7 @@ describe("tapState - Basic Functionality", () => {
       let initCalled = 0;
 
       const testFiber = createTestResource(() => {
-        const [count] = tapState(() => {
+        const [count] = useState(() => {
           initCalled++;
           return 100;
         });
@@ -48,7 +48,7 @@ describe("tapState - Basic Functionality", () => {
 
     it("should handle undefined initial state", () => {
       const testFiber = createTestResource(() => {
-        const [value] = tapState<string>();
+        const [value] = useState<string>();
         return value;
       });
 
@@ -64,7 +64,7 @@ describe("tapState - Basic Functionality", () => {
 
       const testFiber = createTestResource(() => {
         renderCount++;
-        const [count, setCount] = tapState(0);
+        const [count, setCount] = useState(0);
 
         // Capture setter on first render
         if (!setCountFn) {
@@ -97,9 +97,9 @@ describe("tapState - Basic Functionality", () => {
 
       const testFiber = createTestResource(() => {
         renderCount++;
-        const [count, setCount] = tapState(42);
+        const [count, setCount] = useState(42);
 
-        tapEffect(() => {
+        useEffect(() => {
           setCountFn = setCount;
         });
 
@@ -125,9 +125,9 @@ describe("tapState - Basic Functionality", () => {
         null;
 
       const testFiber = createTestResource(() => {
-        const [count, setCount] = tapState(10);
+        const [count, setCount] = useState(10);
 
-        tapEffect(() => {
+        useEffect(() => {
           setCountFn = setCount;
         });
 
@@ -155,9 +155,9 @@ describe("tapState - Basic Functionality", () => {
   describe("Multiple States", () => {
     it("should handle multiple state hooks independently", () => {
       const testFiber = createTestResource(() => {
-        const [count1, setCount1] = tapState(1);
-        const [count2, setCount2] = tapState(2);
-        const [text, setText] = tapState("hello");
+        const [count1, setCount1] = useState(1);
+        const [count2, setCount2] = useState(2);
+        const [text, setText] = useState("hello");
 
         return {
           count1,
@@ -179,11 +179,11 @@ describe("tapState - Basic Functionality", () => {
       let setters: any = null;
 
       const testFiber = createTestResource(() => {
-        const [a, setA] = tapState("a");
-        const [b, setB] = tapState("b");
-        const [c, setC] = tapState("c");
+        const [a, setA] = useState("a");
+        const [b, setB] = useState("b");
+        const [c, setC] = useState("c");
 
-        tapEffect(() => {
+        useEffect(() => {
           setters = { setA, setB, setC };
         });
 
@@ -212,9 +212,9 @@ describe("tapState - Basic Functionality", () => {
       let setCountFn: ((value: number) => void) | null = null;
 
       const testFiber = createTestResource((props: { multiplier: number }) => {
-        const [count, setCount] = tapState(10);
+        const [count, setCount] = useState(10);
 
-        tapEffect(() => {
+        useEffect(() => {
           setCountFn = setCount;
         });
 

package/src/__tests__/errors/errors.effect-errors.test.ts

@@ -1,7 +1,7 @@
-/* oxlint-disable tap-hooks/exhaustive-deps -- tests deliberately exercise invalid dep arrays */
+/* oxlint-disable react/exhaustive-deps -- tests deliberately exercise invalid dep arrays */
 import { describe, it, expect, vi } 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, unmountResource } from "../test-utils";
 import {
   renderResourceFiber,
@@ -13,7 +13,7 @@ describe("Errors - Effect Errors", () => {
     const error = new Error("Effect error");
 
     const resource = createTestResource(() => {
-      tapEffect(() => {
+      useEffect(() => {
         throw error;
       });
       return null;
@@ -27,7 +27,7 @@ describe("Errors - Effect Errors", () => {
     let dep = 0;
 
     const resource = createTestResource(() => {
-      tapEffect(() => {
+      useEffect(() => {
         return () => {
           if (dep > 0) {
             throw error;
@@ -52,7 +52,7 @@ describe("Errors - Effect Errors", () => {
 
   it("should throw on invalid effect return value", () => {
     const resource = createTestResource(() => {
-      tapEffect(() => {
+      useEffect(() => {
         return "not a function" as any; // Invalid return
       });
       return null;
@@ -69,13 +69,13 @@ describe("Errors - Effect Errors", () => {
     const goodEffect = vi.fn();
 
     const resource = createTestResource(() => {
-      tapEffect(() => {
+      useEffect(() => {
         throw error1;
       });
 
-      tapEffect(goodEffect); // This won't run
+      useEffect(goodEffect); // This won't run
 
-      tapEffect(() => {
+      useEffect(() => {
         throw error2;
       });
 
@@ -99,9 +99,9 @@ describe("Errors - Effect Errors", () => {
     const cleanup3 = vi.fn();
 
     const resource = createTestResource(() => {
-      tapEffect(() => cleanup1);
-      tapEffect(() => cleanup2);
-      tapEffect(() => cleanup3);
+      useEffect(() => cleanup1);
+      useEffect(() => cleanup2);
+      useEffect(() => cleanup3);
       return null;
     });
 
@@ -119,16 +119,16 @@ describe("Errors - Effect Errors", () => {
     let shouldThrow = false;
 
     const resource = createTestResource(() => {
-      const [dep, setDep] = tapState(0);
+      const [dep, setDep] = useState(0);
 
-      tapEffect(() => {
+      useEffect(() => {
         if (shouldThrow) {
           throw error;
         }
       }, [dep]);
 
       // Use effect to trigger state change
-      tapEffect(() => {
+      useEffect(() => {
         if (dep === 0) {
           shouldThrow = true;
           setDep(1); // Trigger effect re-run
@@ -148,7 +148,7 @@ describe("Errors - Effect Errors", () => {
     let asyncErrorPromise: Promise<void>;
 
     const resource = createTestResource(() => {
-      tapEffect(() => {
+      useEffect(() => {
         // Async errors are not caught by the framework
         asyncErrorPromise = new Promise((_, reject) => {
           setTimeout(() => {
@@ -176,9 +176,9 @@ describe("Errors - Effect Errors", () => {
     let effectRan = false;
 
     const resource = createTestResource(() => {
-      const [value] = tapState("initial");
+      const [value] = useState("initial");
 
-      tapEffect(() => {
+      useEffect(() => {
         effectRan = true;
         throw error;
       });
@@ -198,9 +198,9 @@ describe("Errors - Effect Errors", () => {
     let throwOnCleanup = false;
 
     const resource = createTestResource(() => {
-      const [count, setCount] = tapState(0);
+      const [count, setCount] = useState(0);
 
-      tapEffect(() => {
+      useEffect(() => {
         return () => {
           if (throwOnCleanup) {
             throw cleanupError;
@@ -209,7 +209,7 @@ describe("Errors - Effect Errors", () => {
       }, [count]);
 
       // Use effect to trigger state change
-      tapEffect(() => {
+      useEffect(() => {
         if (count === 0) {
           throwOnCleanup = true;
           setCount(1);

package/src/__tests__/errors/errors.render-errors.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,
@@ -22,11 +22,11 @@ describe("Errors - Render Errors", () => {
   it("should throw when hooks are called outside render context", () => {
     // Try to call hook outside of resource render
     expect(() => {
-      tapState(0);
+      useState(0);
     }).toThrow("No resource fiber available");
 
     expect(() => {
-      tapEffect(() => {});
+      useEffect(() => {});
     }).toThrow("No resource fiber available");
   });
 
@@ -34,7 +34,7 @@ describe("Errors - Render Errors", () => {
     const error = new Error("Initializer error");
 
     const resource = createTestResource(() => {
-      const [value] = tapState(() => {
+      const [value] = useState(() => {
         throw error;
       });
       return value;
@@ -45,7 +45,7 @@ describe("Errors - Render Errors", () => {
 
   it("should detect render during render", () => {
     const resource = createTestResource(() => {
-      const [count, setCount] = tapState(0);
+      const [count, setCount] = useState(0);
 
       // This violates the rules - no state updates during render
       if (count < 5) {
@@ -62,9 +62,9 @@ describe("Errors - Render Errors", () => {
 
   it("should allow setState during commit (effects)", () => {
     const resource = createTestResource(() => {
-      const [count, setCount] = tapState(0);
+      const [count, setCount] = useState(0);
 
-      tapEffect(() => {
+      useEffect(() => {
         // setState during effects (commit phase) is allowed
         if (count < 5) {
           setCount(count + 1);
@@ -85,11 +85,11 @@ describe("Errors - Render Errors", () => {
 
     const resource = createTestResource(() => {
       if (useStateFirst) {
-        tapState(1);
-        tapEffect(() => {});
+        useState(1);
+        useEffect(() => {});
       } else {
-        tapEffect(() => {});
-        tapState(1);
+        useEffect(() => {});
+        useState(1);
       }
       return null;
     });
@@ -107,7 +107,7 @@ describe("Errors - Render Errors", () => {
     let shouldThrow = false;
 
     const resource = createTestResource(() => {
-      const [count, _setCount] = tapState(42);
+      const [count, _setCount] = useState(42);
 
       if (shouldThrow) {
         throw new Error("Render failed");
@@ -134,11 +134,11 @@ describe("Errors - Render Errors", () => {
     const resource = createTestResource(() => {
       if (phase === "hook-order") {
         // Wrong hook order
-        tapEffect(() => {});
-        tapState(1);
+        useEffect(() => {});
+        useState(1);
       } else {
-        tapState(1);
-        tapEffect(() => {
+        useState(1);
+        useEffect(() => {
           if (phase === "effect-error") {
             throw new Error("Effect error");
           }
@@ -171,7 +171,7 @@ describe("Errors - Render Errors", () => {
   it("should handle errors in nested hook calls", () => {
     const useFeature = () => {
       // This will fail if called outside render
-      const [value] = tapState("feature");
+      const [value] = useState("feature");
       return value;
     };
 

package/src/__tests__/lifecycle/lifecycle.dependencies.test.ts

@@ -1,7 +1,7 @@
-/* oxlint-disable tap-hooks/exhaustive-deps -- tests deliberately exercise invalid dep arrays */
+/* oxlint-disable react/exhaustive-deps -- tests deliberately exercise invalid dep arrays */
 import { describe, it, expect, vi } 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, waitForNextTick } from "../test-utils";
 import {
   renderResourceFiber,
@@ -15,10 +15,10 @@ describe("Lifecycle - Dependencies", () => {
     let setDep: any;
 
     const resource = createTestResource(() => {
-      const [dep, _setDep] = tapState(1);
+      const [dep, _setDep] = useState(1);
       setDep = _setDep;
 
-      tapEffect(effect, [dep]);
+      useEffect(effect, [dep]);
       return dep;
     });
 
@@ -38,11 +38,11 @@ describe("Lifecycle - Dependencies", () => {
     let triggerRerender: any;
 
     const resource = createTestResource(() => {
-      const [count, setCount] = tapState(0);
-      const [dep] = tapState("constant");
+      const [count, setCount] = useState(0);
+      const [dep] = useState("constant");
       triggerRerender = setCount;
 
-      tapEffect(effect, [dep]);
+      useEffect(effect, [dep]);
       return { count, dep };
     });
 
@@ -62,10 +62,10 @@ describe("Lifecycle - Dependencies", () => {
     let setDep: any;
 
     const resource = createTestResource(() => {
-      const [dep, _setDep] = tapState(1);
+      const [dep, _setDep] = useState(1);
       setDep = _setDep;
 
-      tapEffect(() => {
+      useEffect(() => {
         log.push(`effect-${dep}`);
         return () => log.push(`cleanup-${dep}`);
       }, [dep]);
@@ -89,10 +89,10 @@ describe("Lifecycle - Dependencies", () => {
     let triggerRerender: any;
 
     const resource = createTestResource(() => {
-      const [count, setCount] = tapState(0);
+      const [count, setCount] = useState(0);
       triggerRerender = setCount;
 
-      tapEffect(effect); // No deps = always re-run
+      useEffect(effect); // No deps = always re-run
       return count;
     });
 
@@ -112,10 +112,10 @@ describe("Lifecycle - Dependencies", () => {
     let triggerRerender: any;
 
     const resource = createTestResource(() => {
-      const [count, setCount] = tapState(0);
+      const [count, setCount] = useState(0);
       triggerRerender = setCount;
 
-      tapEffect(effect, []); // Empty deps = run once
+      useEffect(effect, []); // Empty deps = run once
       return count;
     });
 
@@ -135,12 +135,12 @@ describe("Lifecycle - Dependencies", () => {
     let setDep1: any, setDep2: any;
 
     const resource = createTestResource(() => {
-      const [dep1, _setDep1] = tapState("a");
-      const [dep2, _setDep2] = tapState(1);
+      const [dep1, _setDep1] = useState("a");
+      const [dep2, _setDep2] = useState(1);
       setDep1 = _setDep1;
       setDep2 = _setDep2;
 
-      tapEffect(effect, [dep1, dep2]);
+      useEffect(effect, [dep1, dep2]);
       return { dep1, dep2 };
     });
 
@@ -176,10 +176,10 @@ describe("Lifecycle - Dependencies", () => {
     let setObj: any;
 
     const resource = createTestResource(() => {
-      const [obj, _setObj] = tapState({ value: 1 });
+      const [obj, _setObj] = useState({ value: 1 });
       setObj = _setObj;
 
-      tapEffect(effect, [obj]);
+      useEffect(effect, [obj]);
       return obj;
     });
 
@@ -199,10 +199,10 @@ describe("Lifecycle - Dependencies", () => {
     let setValue: any;
 
     const resource = createTestResource(() => {
-      const [value, _setValue] = tapState(NaN);
+      const [value, _setValue] = useState(NaN);
       setValue = _setValue;
 
-      tapEffect(effect, [value]);
+      useEffect(effect, [value]);
       return value;
     });
 
@@ -222,9 +222,9 @@ describe("Lifecycle - Dependencies", () => {
 
     const resource = createTestResource(() => {
       if (useDeps) {
-        tapEffect(() => {}, [1]);
+        useEffect(() => {}, [1]);
       } else {
-        tapEffect(() => {}); // No deps
+        useEffect(() => {}); // No deps
       }
       return null;
     });
@@ -234,9 +234,9 @@ describe("Lifecycle - Dependencies", () => {
     // Change to no deps
     useDeps = false;
 
-    // Error now throws during render (fail-fast validation)
+    // Error throws during render (fail-fast validation)
     expect(() => renderResourceFiber(resource, undefined)).toThrow(
-      "tapEffect called with and without dependencies across re-renders",
+      "useEffect called with and without dependencies across re-renders",
     );
   });
 });