@assistant-ui/tap 0.3.6 → 0.4.0

package/dist/hooks/tap-state.js

@@ -1,15 +1,17 @@
+import { isDevelopment } from "../core/env.js";
 import { getCurrentResourceFiber } from "../core/execution-context.js";
-const rerender = (fiber) => {
+const dispatchOnFiber = (fiber, callback) => {
     if (fiber.renderContext) {
         throw new Error("Resource updated during render");
     }
     if (fiber.isMounted) {
         // Only schedule rerender if currently mounted
-        fiber.scheduleRerender();
+        fiber.dispatchUpdate(callback);
     }
     else if (fiber.isNeverMounted) {
         throw new Error("Resource updated before mount");
     }
+    // TODO mark dirty
 };
 function getStateCell(initialValue) {
     const fiber = getCurrentResourceFiber();
@@ -19,32 +21,43 @@ function getStateCell(initialValue) {
         throw new Error("Rendered more hooks than during the previous render. " +
             "Hooks must be called in the exact same order in every render.");
     }
-    if (!fiber.cells[index]) {
-        // Initialize the value immediately
-        const value = typeof initialValue === "function"
-            ? initialValue()
-            : initialValue;
-        const cell = {
-            type: "state",
-            value,
-            set: (updater) => {
-                const currentValue = cell.value;
+    const cell = fiber.cells[index];
+    if (cell) {
+        if (cell.type !== "state")
+            throw new Error("Hook order changed between renders");
+        return cell;
+    }
+    const value = typeof initialValue === "function"
+        ? initialValue()
+        : initialValue;
+    if (isDevelopment &&
+        fiber.devStrictMode &&
+        typeof initialValue === "function") {
+        void initialValue();
+    }
+    const newCell = {
+        type: "state",
+        value,
+        set: (updater) => {
+            dispatchOnFiber(fiber, () => {
+                const currentValue = newCell.value;
                 const nextValue = typeof updater === "function"
                     ? updater(currentValue)
                     : updater;
-                if (!Object.is(currentValue, nextValue)) {
-                    cell.value = nextValue;
-                    rerender(fiber);
+                if (isDevelopment &&
+                    fiber.devStrictMode &&
+                    typeof updater === "function") {
+                    void updater(currentValue);
                 }
-            },
-        };
-        fiber.cells[index] = cell;
-    }
-    const cell = fiber.cells[index];
-    if (cell.type !== "state") {
-        throw new Error("Hook order changed between renders");
-    }
-    return cell;
+                if (Object.is(currentValue, nextValue))
+                    return false;
+                newCell.value = nextValue;
+                return true;
+            });
+        },
+    };
+    fiber.cells[index] = newCell;
+    return newCell;
 }
 export function tapState(initial) {
     const cell = getStateCell(initial);

package/dist/hooks/tap-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"tap-state.js","sourceRoot":"","sources":["../../src/hooks/tap-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,qCAAkC;AAOpE,MAAM,QAAQ,GAAG,CAAC,KAA8B,EAAE,EAAE;IAClD,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACpB,8CAA8C;QAC9C,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAC3B,CAAC;SAAM,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;AACH,CAAC,CAAC;AAEF,SAAS,YAAY,CACnB,YAA2B;IAE3B,MAAM,KAAK,GAAG,uBAAuB,EAAE,CAAC;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;IAEnC,mEAAmE;IACnE,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CACb,uDAAuD;YACrD,+DAA+D,CAClE,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,mCAAmC;QACnC,MAAM,KAAK,GACT,OAAO,YAAY,KAAK,UAAU;YAChC,CAAC,CAAE,YAAwB,EAAE;YAC7B,CAAC,CAAC,YAAY,CAAC;QAEnB,MAAM,IAAI,GAA6B;YACrC,IAAI,EAAE,OAAO;YACb,KAAK;YACL,GAAG,EAAE,CAAC,OAAiC,EAAE,EAAE;gBACzC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC;gBAChC,MAAM,SAAS,GACb,OAAO,OAAO,KAAK,UAAU;oBAC3B,CAAC,CAAE,OAA0B,CAAC,YAAY,CAAC;oBAC3C,CAAC,CAAC,OAAO,CAAC;gBAEd,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC,EAAE,CAAC;oBACxC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;oBACvB,QAAQ,CAAC,KAAK,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC;SACF,CAAC;QAEF,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,IAAgC,CAAC;AAC1C,CAAC;AASD,MAAM,UAAU,QAAQ,CACtB,OAAuB;IAEvB,MAAM,IAAI,GAAG,YAAY,CAAC,OAAwB,CAAC,CAAC;IAEpD,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"tap-state.js","sourceRoot":"","sources":["../../src/hooks/tap-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,uBAAoB;AAC5C,OAAO,EAAE,uBAAuB,EAAE,qCAAkC;AAOpE,MAAM,eAAe,GAAG,CACtB,KAA8B,EAC9B,QAAuB,EACvB,EAAE;IACF,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACpB,8CAA8C;QAC9C,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;SAAM,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IAED,kBAAkB;AACpB,CAAC,CAAC;AAEF,SAAS,YAAY,CACnB,YAA2B;IAE3B,MAAM,KAAK,GAAG,uBAAuB,EAAE,CAAC;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;IAEnC,mEAAmE;IACnE,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CACb,uDAAuD;YACrD,+DAA+D,CAClE,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChC,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;YACvB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAExD,OAAO,IAAgC,CAAC;IAC1C,CAAC;IAED,MAAM,KAAK,GACT,OAAO,YAAY,KAAK,UAAU;QAChC,CAAC,CAAE,YAAwB,EAAE;QAC7B,CAAC,CAAC,YAAY,CAAC;IAEnB,IACE,aAAa;QACb,KAAK,CAAC,aAAa;QACnB,OAAO,YAAY,KAAK,UAAU,EAClC,CAAC;QACD,KAAM,YAAwB,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,OAAO,GAA6B;QACxC,IAAI,EAAE,OAAO;QACb,KAAK;QACL,GAAG,EAAE,CAAC,OAAiC,EAAE,EAAE;YACzC,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE;gBAC1B,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC;gBACnC,MAAM,SAAS,GACb,OAAO,OAAO,KAAK,UAAU;oBAC3B,CAAC,CAAE,OAA0B,CAAC,YAAY,CAAC;oBAC3C,CAAC,CAAC,OAAO,CAAC;gBAEd,IACE,aAAa;oBACb,KAAK,CAAC,aAAa;oBACnB,OAAO,OAAO,KAAK,UAAU,EAC7B,CAAC;oBACD,KAAM,OAA0B,CAAC,YAAY,CAAC,CAAC;gBACjD,CAAC;gBAED,IAAI,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC;oBAAE,OAAO,KAAK,CAAC;gBAErD,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;gBAC1B,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;IAEF,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC;IAC7B,OAAO,OAAO,CAAC;AACjB,CAAC;AASD,MAAM,UAAU,QAAQ,CACtB,OAAuB;IAEvB,MAAM,IAAI,GAAG,YAAY,CAAC,OAAwB,CAAC,CAAC;IAEpD,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;AAChC,CAAC"}

package/dist/hooks/utils/depsShallowEqual.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"depsShallowEqual.d.ts","sourceRoot":"","sources":["../../../src/hooks/utils/depsShallowEqual.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,GAC3B,GAAG,SAAS,OAAO,EAAE,EACrB,GAAG,SAAS,OAAO,EAAE,YAOtB,CAAC"}

package/dist/hooks/utils/depsShallowEqual.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"depsShallowEqual.js","sourceRoot":"","sources":["../../../src/hooks/utils/depsShallowEqual.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,CAAqB,EACrB,CAAqB,EACrB,EAAE;IACF,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;IAC3C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}

package/dist/hooks/utils/tapHook.d.ts

@@ -0,0 +1,6 @@
+import { Cell } from "../../core/types.js";
+export declare const tapHook: <T extends "effect" | "memo">(type: T, init: () => Cell) => Cell & {
+    type: T;
+};
+export declare const registerRenderMountTask: (task: () => void) => void;
+//# sourceMappingURL=tapHook.d.ts.map

package/dist/hooks/utils/tapHook.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tapHook.d.ts","sourceRoot":"","sources":["../../../src/hooks/utils/tapHook.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,4BAAyB;AAExC,eAAO,MAAM,OAAO,GAAI,CAAC,SAAS,QAAQ,GAAG,MAAM,EACjD,MAAM,CAAC,EACP,MAAM,MAAM,IAAI,KACf,IAAI,GAAG;IAAE,IAAI,EAAE,CAAC,CAAA;CAuBlB,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,MAAM,MAAM,IAAI,SAGvD,CAAC"}

package/dist/hooks/utils/tapHook.js

@@ -0,0 +1,24 @@
+import { getCurrentResourceFiber } from "../../core/execution-context.js";
+export const tapHook = (type, init) => {
+    const fiber = getCurrentResourceFiber();
+    const index = fiber.currentIndex++;
+    if (!fiber.isFirstRender && index >= fiber.cells.length) {
+        // Check if we're trying to use more hooks than in previous renders
+        throw new Error("Rendered more hooks than during the previous render. " +
+            "Hooks must be called in the exact same order in every render.");
+    }
+    let cell = fiber.cells[index];
+    if (!cell) {
+        cell = init();
+        fiber.cells[index] = cell;
+    }
+    if (cell.type !== type) {
+        throw new Error("Hook order changed between renders");
+    }
+    return cell;
+};
+export const registerRenderMountTask = (task) => {
+    const fiber = getCurrentResourceFiber();
+    fiber.renderContext.commitTasks.push(task);
+};
+//# sourceMappingURL=tapHook.js.map

package/dist/hooks/utils/tapHook.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tapHook.js","sourceRoot":"","sources":["../../../src/hooks/utils/tapHook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,wCAAqC;AAGvE,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,IAAO,EACP,IAAgB,EACI,EAAE;IACtB,MAAM,KAAK,GAAG,uBAAuB,EAAE,CAAC;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;IAEnC,IAAI,CAAC,KAAK,CAAC,aAAa,IAAI,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACxD,mEAAmE;QACnE,MAAM,IAAI,KAAK,CACb,uDAAuD;YACrD,+DAA+D,CAClE,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,IAAI,GAAG,IAAI,EAAE,CAAC;QACd,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,IAA0B,CAAC;AACpC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,IAAgB,EAAE,EAAE;IAC1D,MAAM,KAAK,GAAG,uBAAuB,EAAE,CAAC;IACxC,KAAK,CAAC,aAAc,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC9C,CAAC,CAAC"}

package/dist/index.d.ts

@@ -1,7 +1,9 @@
 export { resource } from "./core/resource.js";
+export { withKey } from "./core/withKey.js";
 export { tapState } from "./hooks/tap-state.js";
 export { tapEffect } from "./hooks/tap-effect.js";
 export { tapRef } from "./hooks/tap-ref.js";
+export { tapConst } from "./hooks/tap-const.js";
 export { tapMemo } from "./hooks/tap-memo.js";
 export { tapCallback } from "./hooks/tap-callback.js";
 export { tapEffectEvent } from "./hooks/tap-effect-event.js";
@@ -9,7 +11,7 @@ export { tapResource } from "./hooks/tap-resource.js";
 export { tapInlineResource } from "./hooks/tap-inline-resource.js";
 export { tapResources } from "./hooks/tap-resources.js";
 export { createResource } from "./core/createResource.js";
-export { flushSync } from "./core/scheduler.js";
-export { createContext, tapContext, withContextProvider } from "./core/context.js";
-export type { Resource, ContravariantResource, ResourceElement, ExtractResourceOutput, } from "./core/types.js";
+export { flushResourcesSync } from "./core/scheduler.js";
+export { createResourceContext, tap, withContextProvider, } from "./core/context.js";
+export type { Resource, ContravariantResource, ResourceElement, } from "./core/types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,2BAAwB;AAG3C,OAAO,EAAE,QAAQ,EAAE,6BAA0B;AAC7C,OAAO,EAAE,SAAS,EAAE,8BAA2B;AAG/C,OAAO,EAAE,MAAM,EAAE,2BAAwB;AACzC,OAAO,EAAE,OAAO,EAAE,4BAAyB;AAC3C,OAAO,EAAE,WAAW,EAAE,gCAA6B;AACnD,OAAO,EAAE,cAAc,EAAE,oCAAiC;AAG1D,OAAO,EAAE,WAAW,EAAE,gCAA6B;AACnD,OAAO,EAAE,iBAAiB,EAAE,uCAAoC;AAChE,OAAO,EAAE,YAAY,EAAE,iCAA8B;AAGrD,OAAO,EAAE,cAAc,EAAE,iCAA8B;AACvD,OAAO,EAAE,SAAS,EAAE,4BAAyB;AAG7C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,mBAAmB,EAAE,0BAAuB;AAGhF,YAAY,EACV,QAAQ,EACR,qBAAqB,EACrB,eAAe,EACf,qBAAqB,GACtB,wBAAqB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,2BAAwB;AAC3C,OAAO,EAAE,OAAO,EAAE,0BAAuB;AAGzC,OAAO,EAAE,QAAQ,EAAE,6BAA0B;AAC7C,OAAO,EAAE,SAAS,EAAE,8BAA2B;AAG/C,OAAO,EAAE,MAAM,EAAE,2BAAwB;AACzC,OAAO,EAAE,QAAQ,EAAE,6BAA0B;AAC7C,OAAO,EAAE,OAAO,EAAE,4BAAyB;AAC3C,OAAO,EAAE,WAAW,EAAE,gCAA6B;AACnD,OAAO,EAAE,cAAc,EAAE,oCAAiC;AAG1D,OAAO,EAAE,WAAW,EAAE,gCAA6B;AACnD,OAAO,EAAE,iBAAiB,EAAE,uCAAoC;AAChE,OAAO,EAAE,YAAY,EAAE,iCAA8B;AAGrD,OAAO,EAAE,cAAc,EAAE,iCAA8B;AACvD,OAAO,EAAE,kBAAkB,EAAE,4BAAyB;AAGtD,OAAO,EACL,qBAAqB,EACrB,GAAG,EACH,mBAAmB,GACpB,0BAAuB;AAGxB,YAAY,EACV,QAAQ,EACR,qBAAqB,EACrB,eAAe,GAChB,wBAAqB"}

package/dist/index.js

@@ -1,9 +1,11 @@
 export { resource } from "./core/resource.js";
+export { withKey } from "./core/withKey.js";
 // primitive hooks
 export { tapState } from "./hooks/tap-state.js";
 export { tapEffect } from "./hooks/tap-effect.js";
 // utility hooks
 export { tapRef } from "./hooks/tap-ref.js";
+export { tapConst } from "./hooks/tap-const.js";
 export { tapMemo } from "./hooks/tap-memo.js";
 export { tapCallback } from "./hooks/tap-callback.js";
 export { tapEffectEvent } from "./hooks/tap-effect-event.js";
@@ -13,7 +15,7 @@ export { tapInlineResource } from "./hooks/tap-inline-resource.js";
 export { tapResources } from "./hooks/tap-resources.js";
 // imperative
 export { createResource } from "./core/createResource.js";
-export { flushSync } from "./core/scheduler.js";
+export { flushResourcesSync } from "./core/scheduler.js";
 // context
-export { createContext, tapContext, withContextProvider } from "./core/context.js";
+export { createResourceContext, tap, withContextProvider, } from "./core/context.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,2BAAwB;AAE3C,kBAAkB;AAClB,OAAO,EAAE,QAAQ,EAAE,6BAA0B;AAC7C,OAAO,EAAE,SAAS,EAAE,8BAA2B;AAE/C,gBAAgB;AAChB,OAAO,EAAE,MAAM,EAAE,2BAAwB;AACzC,OAAO,EAAE,OAAO,EAAE,4BAAyB;AAC3C,OAAO,EAAE,WAAW,EAAE,gCAA6B;AACnD,OAAO,EAAE,cAAc,EAAE,oCAAiC;AAE1D,YAAY;AACZ,OAAO,EAAE,WAAW,EAAE,gCAA6B;AACnD,OAAO,EAAE,iBAAiB,EAAE,uCAAoC;AAChE,OAAO,EAAE,YAAY,EAAE,iCAA8B;AAErD,aAAa;AACb,OAAO,EAAE,cAAc,EAAE,iCAA8B;AACvD,OAAO,EAAE,SAAS,EAAE,4BAAyB;AAE7C,UAAU;AACV,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,mBAAmB,EAAE,0BAAuB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,2BAAwB;AAC3C,OAAO,EAAE,OAAO,EAAE,0BAAuB;AAEzC,kBAAkB;AAClB,OAAO,EAAE,QAAQ,EAAE,6BAA0B;AAC7C,OAAO,EAAE,SAAS,EAAE,8BAA2B;AAE/C,gBAAgB;AAChB,OAAO,EAAE,MAAM,EAAE,2BAAwB;AACzC,OAAO,EAAE,QAAQ,EAAE,6BAA0B;AAC7C,OAAO,EAAE,OAAO,EAAE,4BAAyB;AAC3C,OAAO,EAAE,WAAW,EAAE,gCAA6B;AACnD,OAAO,EAAE,cAAc,EAAE,oCAAiC;AAE1D,YAAY;AACZ,OAAO,EAAE,WAAW,EAAE,gCAA6B;AACnD,OAAO,EAAE,iBAAiB,EAAE,uCAAoC;AAChE,OAAO,EAAE,YAAY,EAAE,iCAA8B;AAErD,aAAa;AACb,OAAO,EAAE,cAAc,EAAE,iCAA8B;AACvD,OAAO,EAAE,kBAAkB,EAAE,4BAAyB;AAEtD,UAAU;AACV,OAAO,EACL,qBAAqB,EACrB,GAAG,EACH,mBAAmB,GACpB,0BAAuB"}

package/dist/react/use-resource.d.ts

@@ -1,3 +1,3 @@
-import { ExtractResourceOutput, ResourceElement } from "../core/types.js";
-export declare function useResource<E extends ResourceElement<any, any>>(element: E): ExtractResourceOutput<E>;
+import type { ExtractResourceReturnType, ResourceElement } from "../core/types.js";
+export declare function useResource<E extends ResourceElement<any, any>>(element: E): ExtractResourceReturnType<E>;
 //# sourceMappingURL=use-resource.d.ts.map

package/dist/react/use-resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-resource.d.ts","sourceRoot":"","sources":["../../src/react/use-resource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,yBAAsB;AAevE,wBAAgB,WAAW,CAAC,CAAC,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7D,OAAO,EAAE,CAAC,GACT,qBAAqB,CAAC,CAAC,CAAC,CAgB1B"}
+{"version":3,"file":"use-resource.d.ts","sourceRoot":"","sources":["../../src/react/use-resource.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,eAAe,EAAE,yBAAsB;AAuBhF,wBAAgB,WAAW,CAAC,CAAC,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7D,OAAO,EAAE,CAAC,GACT,yBAAyB,CAAC,CAAC,CAAC,CAmB9B"}

package/dist/react/use-resource.js

@@ -1,19 +1,33 @@
-import { useEffect, useLayoutEffect, useMemo, useState } from "react";
+import { useLayoutEffect, useMemo, useReducer, useRef, useState } from "react";
 import { createResourceFiber, unmountResourceFiber, renderResourceFiber, commitResourceFiber, } from "../core/ResourceFiber.js";
-const shouldAvoidLayoutEffect = globalThis.__ASSISTANT_UI_DISABLE_LAYOUT_EFFECT__ === true;
-const useIsomorphicLayoutEffect = shouldAvoidLayoutEffect
-    ? useEffect
-    : useLayoutEffect;
+import { isDevelopment } from "../core/env.js";
+const useDevStrictMode = () => {
+    if (!isDevelopment)
+        return null;
+    const count = useRef(0);
+    const isFirstRender = count.current === 0;
+    useState(() => count.current++);
+    if (count.current !== 2)
+        return null;
+    return isFirstRender ? "child" : "root";
+};
+const resourceReducer = (version, callback) => {
+    return version + (callback() ? 1 : 0);
+};
 export function useResource(element) {
-    const [, rerender] = useState({});
-    const fiber = useMemo(() => createResourceFiber(element.type, () => rerender({})), [element.type]);
+    const [, dispatch] = useReducer(resourceReducer, 0);
+    const devStrictMode = useDevStrictMode();
+    // biome-ignore lint/correctness/useExhaustiveDependencies: user provided deps instead of prop identity
+    const fiber = useMemo(() => {
+        return createResourceFiber(element.type, dispatch, devStrictMode);
+    }, [element.type, element.key]);
     const result = renderResourceFiber(fiber, element.props);
-    useIsomorphicLayoutEffect(() => {
+    useLayoutEffect(() => {
         return () => unmountResourceFiber(fiber);
     }, [fiber]);
-    useIsomorphicLayoutEffect(() => {
+    useLayoutEffect(() => {
         commitResourceFiber(fiber, result);
     });
-    return result.state;
+    return result.output;
 }
 //# sourceMappingURL=use-resource.js.map

package/dist/react/use-resource.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-resource.js","sourceRoot":"","sources":["../../src/react/use-resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEtE,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,GACpB,iCAA8B;AAE/B,MAAM,uBAAuB,GAC1B,UAAkB,CAAC,sCAAsC,KAAK,IAAI,CAAC;AAEtE,MAAM,yBAAyB,GAAG,uBAAuB;IACvD,CAAC,CAAC,SAAS;IACX,CAAC,CAAC,eAAe,CAAC;AAEpB,MAAM,UAAU,WAAW,CACzB,OAAU;IAEV,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IAClC,MAAM,KAAK,GAAG,OAAO,CACnB,GAAG,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAC3D,CAAC,OAAO,CAAC,IAAI,CAAC,CACf,CAAC;IAEF,MAAM,MAAM,GAAG,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACzD,yBAAyB,CAAC,GAAG,EAAE;QAC7B,OAAO,GAAG,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACZ,yBAAyB,CAAC,GAAG,EAAE;QAC7B,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,KAAK,CAAC;AACtB,CAAC"}
+{"version":3,"file":"use-resource.js","sourceRoot":"","sources":["../../src/react/use-resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE/E,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,GACpB,iCAA8B;AAC/B,OAAO,EAAE,aAAa,EAAE,uBAAoB;AAE5C,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC5B,IAAI,CAAC,aAAa;QAAE,OAAO,IAAI,CAAC;IAEhC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACxB,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,KAAK,CAAC,CAAC;IAC1C,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAChC,IAAI,KAAK,CAAC,OAAO,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACrC,OAAO,aAAa,CAAC,CAAC,CAAE,OAAiB,CAAC,CAAC,CAAE,MAAgB,CAAC;AAChE,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,QAAuB,EAAE,EAAE;IACnE,OAAO,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,UAAU,WAAW,CACzB,OAAU;IAEV,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IAEzC,uGAAuG;IACvG,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE;QACzB,OAAO,mBAAmB,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IACpE,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAEhC,MAAM,MAAM,GAAG,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACzD,eAAe,CAAC,GAAG,EAAE;QACnB,OAAO,GAAG,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACZ,eAAe,CAAC,GAAG,EAAE;QACnB,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/tap",
-  "version": "0.3.6",
+  "version": "0.4.0",
   "description": "Zero-dependency reactive state management inspired by React hooks",
   "keywords": [
     "state-management",
@@ -46,8 +46,15 @@
     }
   },
   "devDependencies": {
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/react": "^16.3.1",
     "@types/react": "^19.2.9",
+    "@types/node": "^25.0.3",
+    "@types/react-dom": "^19.2.3",
     "@vitest/ui": "^4.0.17",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
+    "jsdom": "^27.3.0",
     "vitest": "^4.0.17",
     "@assistant-ui/x-buildutils": "0.0.1"
   },

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

@@ -13,13 +13,13 @@ describe("ResourceHandle - Basic Usage", () => {
     const handle = createResource(TestResource(5));
 
     // The handle provides a const API
-    expect(typeof handle.getState).toBe("function");
+    expect(typeof handle.getValue).toBe("function");
     expect(typeof handle.subscribe).toBe("function");
     expect(typeof handle.render).toBe("function");
 
     // Initial state
-    expect(handle.getState().value).toBe(10);
-    expect(handle.getState().propsUsed).toBe(5);
+    expect(handle.getValue().value).toBe(10);
+    expect(handle.getValue().propsUsed).toBe(5);
   });
 
   it("should allow updating props", () => {
@@ -29,7 +29,7 @@ describe("ResourceHandle - Basic Usage", () => {
     const handle = createResource(TestResource({ multiplier: 2 }));
 
     // Initial state
-    expect(handle.getState().result).toBe(20);
+    expect(handle.getValue().result).toBe(20);
 
     // Can call render to update props
     expect(() => handle.render(TestResource({ multiplier: 3 }))).not.toThrow();

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

@@ -60,7 +60,7 @@ describe("tapEffect - Basic Functionality", () => {
       expect(cleanup).toHaveBeenCalledTimes(1);
     });
 
-    it("should cleanup effects in reverse order", () => {
+    it("should cleanup effects in same order", () => {
       const cleanupOrder: string[] = [];
 
       const testFiber = createTestResource(() => {
@@ -84,7 +84,7 @@ describe("tapEffect - Basic Functionality", () => {
       manager.cleanup();
 
       // Cleanup should run in reverse order (LIFO)
-      expect(cleanupOrder).toEqual(["third", "second", "first"]);
+      expect(cleanupOrder).toEqual(["first", "second", "third"]);
     });
   });
 
@@ -131,6 +131,7 @@ describe("tapEffect - Basic Functionality", () => {
         }, []);
 
         // Effect with deps - runs when deps change
+        // biome-ignore lint/correctness/useExhaustiveDependencies: test
         tapEffect(() => {
           effectCalls.conditional++;
         }, [props.value]);

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

@@ -2,6 +2,7 @@ import { describe, it, expect, afterEach } from "vitest";
 import { tapResources } from "../../hooks/tap-resources";
 import { tapState } from "../../hooks/tap-state";
 import { resource } from "../../core/resource";
+import { withKey } from "../../core/withKey";
 import {
   createTestResource,
   renderTest,
@@ -59,8 +60,11 @@ describe("tapResources - Basic Functionality", () => {
     it("should render multiple resources with keys", () => {
       const testFiber = createTestResource(() => {
         const results = tapResources(
-          { a: 10, b: 20, c: 30 },
-          (value) => SimpleCounter({ value }),
+          () => [
+            withKey("a", SimpleCounter({ value: 10 })),
+            withKey("b", SimpleCounter({ value: 20 })),
+            withKey("c", SimpleCounter({ value: 30 })),
+          ],
           [],
         );
 
@@ -68,11 +72,7 @@ describe("tapResources - Basic Functionality", () => {
       });
 
       const result = renderTest(testFiber, undefined);
-      expect(result).toEqual({
-        a: { count: 10 },
-        b: { count: 20 },
-        c: { count: 30 },
-      });
+      expect(result).toEqual([{ count: 10 }, { count: 20 }, { count: 30 }]);
     });
 
     it("should work with resource constructor syntax", () => {
@@ -82,15 +82,17 @@ describe("tapResources - Basic Functionality", () => {
       });
 
       const testFiber = createTestResource(() => {
-        const items = {
-          first: { value: 5 },
-          second: { value: 10 },
-          third: { value: 15 },
-        };
+        const items = [
+          { key: "first", value: 5 },
+          { key: "second", value: 10 },
+          { key: "third", value: 15 },
+        ];
 
         const results = tapResources(
-          items,
-          (item) => Counter({ value: item.value }),
+          () =>
+            items.map((item) =>
+              withKey(item.key, Counter({ value: item.value })),
+            ),
           [],
         );
 
@@ -98,56 +100,66 @@ describe("tapResources - Basic Functionality", () => {
       });
 
       const result = renderTest(testFiber, undefined);
-      expect(result).toEqual({
-        first: { count: 5, double: 10 },
-        second: { count: 10, double: 20 },
-        third: { count: 15, double: 30 },
-      });
+      expect(result).toEqual([
+        { count: 5, double: 10 },
+        { count: 10, double: 20 },
+        { count: 15, double: 30 },
+      ]);
     });
   });
 
   describe("Instance Preservation", () => {
     it("should maintain resource instances when keys remain the same", () => {
       const testFiber = createTestResource(
-        (props: { items: Record<string, { value: number; id: string }> }) => {
-          return tapResources(
-            props.items,
-            (item) => TrackingCounter({ value: item.value, id: item.id }),
-
-            [],
-          );
+        (props: {
+          items: Array<{ key: string; value: number; id: string }>;
+        }) => {
+          return tapResources(() => {
+            return props.items.map((item) =>
+              withKey(
+                item.key,
+                TrackingCounter({ value: item.value, id: item.id }),
+              ),
+            );
+          }, [props.items]);
         },
       );
 
       // Initial render
       const result1 = renderTest(testFiber, {
-        items: { a: { value: 1, id: "a" }, b: { value: 2, id: "b" } },
+        items: [
+          { key: "a", value: 1, id: "a" },
+          { key: "b", value: 2, id: "b" },
+        ],
       });
 
       // Verify initial state
-      expect(result1.a).toMatchObject({
+      expect(result1[0]).toMatchObject({
         id: "a",
         value: 1,
         renderCount: 1,
       });
-      expect(result1.b).toMatchObject({
+      expect(result1[1]).toMatchObject({
         id: "b",
         value: 2,
         renderCount: 1,
       });
 
-      // Re-render with same keys but different values
+      // Re-render with same keys but different order and values
       const result2 = renderTest(testFiber, {
-        items: { b: { value: 20, id: "b" }, a: { value: 10, id: "a" } },
+        items: [
+          { key: "b", value: 20, id: "b" },
+          { key: "a", value: 10, id: "a" },
+        ],
       });
 
-      // Verify instances are preserved
-      expect(result2.b).toMatchObject({
+      // Verify instances are preserved (renderCount should be 2)
+      expect(result2[0]).toMatchObject({
         id: "b",
         value: 20,
         renderCount: 2,
       });
-      expect(result2.a).toMatchObject({
+      expect(result2[1]).toMatchObject({
         id: "a",
         value: 10,
         renderCount: 2,
@@ -158,65 +170,73 @@ describe("tapResources - Basic Functionality", () => {
   describe("Dynamic List Management", () => {
     it("should handle adding and removing resources", () => {
       const testFiber = createTestResource(
-        (props: { items: Record<string, number> }) => {
-          const results = tapResources(
-            props.items,
-            (value) => SimpleCounter({ value }),
-
-            [],
-          );
+        (props: { items: Array<{ key: string; value: number }> }) => {
+          const results = tapResources(() => {
+            return props.items.map((item) =>
+              withKey(item.key, SimpleCounter({ value: item.value })),
+            );
+          }, [props.items]);
           return results;
         },
       );
 
       // Initial render with 3 items
-      const result1 = renderTest(testFiber, { items: { a: 0, b: 10, c: 20 } });
-      expect(result1).toEqual({
-        a: { count: 0 },
-        b: { count: 10 },
-        c: { count: 20 },
+      const result1 = renderTest(testFiber, {
+        items: [
+          { key: "a", value: 0 },
+          { key: "b", value: 10 },
+          { key: "c", value: 20 },
+        ],
       });
+      expect(result1).toEqual([{ count: 0 }, { count: 10 }, { count: 20 }]);
 
       // Remove middle item
-      const result2 = renderTest(testFiber, { items: { a: 0, c: 10 } });
-      expect(result2).toEqual({
-        a: { count: 0 },
-        c: { count: 10 },
+      const result2 = renderTest(testFiber, {
+        items: [
+          { key: "a", value: 0 },
+          { key: "c", value: 10 },
+        ],
       });
+      expect(result2).toEqual([{ count: 0 }, { count: 10 }]);
 
       // Add new item
-      const result3 = renderTest(testFiber, { items: { a: 0, c: 10, d: 20 } });
-      expect(result3).toEqual({
-        a: { count: 0 },
-        c: { count: 10 },
-        d: { count: 20 },
+      const result3 = renderTest(testFiber, {
+        items: [
+          { key: "a", value: 0 },
+          { key: "c", value: 10 },
+          { key: "d", value: 20 },
+        ],
       });
+      expect(result3).toEqual([{ count: 0 }, { count: 10 }, { count: 20 }]);
     });
 
     it("should handle changing resource types for the same key", () => {
       const testFiber = createTestResource((props: { useCounter: boolean }) => {
         const results = tapResources(
-          { item: props.useCounter },
-          (useCounter) =>
-            useCounter
-              ? StatefulCounter({ initial: 42 })
-              : Display({ text: "Hello" }),
-          [],
+          () => [
+            withKey(
+              "item",
+              props.useCounter
+                ? StatefulCounter({ initial: 42 })
+                : Display({ text: "Hello" }),
+            ),
+          ],
+          [props.useCounter],
         );
         return results;
       });
 
       // Start with Counter
       const result1 = renderTest(testFiber, { useCounter: true });
-      expect(result1).toEqual({ item: { count: 42 } });
+      expect(result1).toEqual([{ count: 42 }]);
 
       // Switch to Display
       const result2 = renderTest(testFiber, { useCounter: false });
-      expect(result2).toEqual({ item: { type: "display", text: "Hello" } });
+      expect(result2).toEqual([{ type: "display", text: "Hello" }]);
 
       // Switch back to Counter (new instance)
       const result3 = renderTest(testFiber, { useCounter: true });
-      expect(result3).toEqual({ item: { count: 42 } });
+      expect(result3).toEqual([{ count: 42 }]);
     });
   });
 });