@assistant-ui/tap 0.3.6 → 0.4.0

package/dist/core/types.d.ts

@@ -1,39 +1,41 @@
 import type { tapEffect } from "../hooks/tap-effect.js";
 import type { tapState } from "../hooks/tap-state.js";
-import { fnSymbol } from "./callResourceFn.js";
+import type { fnSymbol } from "./callResourceFn.js";
 export type ResourceElement<R, P = any> = {
-    type: Resource<R, P> & {
+    readonly type: Resource<R, P> & {
         [fnSymbol]: (props: P) => R;
     };
-    props: P;
+    readonly props: P;
+    readonly key?: string | number;
 };
-type ResourceArgs<P> = undefined extends P ? [props?: P] : [props: P];
-export type Resource<R, P> = (...args: ResourceArgs<P>) => ResourceElement<R, P>;
-export type ContravariantResource<R, P> = (...args: ResourceArgs<P>) => ResourceElement<R>;
-export type ExtractResourceOutput<T> = T extends ResourceElement<infer R, any> ? R : never;
+export type Resource<R, P> = (props: P) => ResourceElement<R, P>;
+export type ContravariantResource<R, P> = (props: P) => ResourceElement<R>;
+export type ExtractResourceReturnType<T> = T extends ResourceElement<infer R, any> ? R : T extends Resource<infer R, any> ? R : never;
 export type Cell = {
-    type: "state";
+    readonly type: "state";
     value: any;
     set: (updater: tapState.StateUpdater<any>) => void;
 } | {
-    type: "effect";
-    mounted: boolean;
-    cleanup?: tapEffect.Destructor | undefined;
-    deps?: readonly unknown[] | undefined;
+    readonly type: "effect";
+    cleanup: tapEffect.Destructor | void;
+    deps: readonly unknown[] | null | undefined;
 };
 export interface EffectTask {
-    effect: tapEffect.EffectCallback;
-    deps?: readonly unknown[] | undefined;
-    cellIndex: number;
+    readonly effect: tapEffect.EffectCallback;
+    readonly deps: readonly unknown[] | undefined;
+    readonly cell: Cell & {
+        type: "effect";
+    };
 }
 export interface RenderResult {
-    state: any;
-    props: any;
-    commitTasks: EffectTask[];
+    readonly output: any;
+    readonly props: any;
+    readonly commitTasks: (() => void)[];
 }
 export interface ResourceFiber<R, P> {
-    readonly scheduleRerender: () => void;
-    readonly resource: Resource<R, P>;
+    readonly dispatchUpdate: (callback: () => boolean) => void;
+    readonly type: Resource<R, P>;
+    readonly devStrictMode: "root" | "child" | null;
     cells: Cell[];
     currentIndex: number;
     renderContext: RenderResult | undefined;
@@ -41,5 +43,4 @@ export interface ResourceFiber<R, P> {
     isFirstRender: boolean;
     isNeverMounted: boolean;
 }
-export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/core/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,+BAA4B;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,8BAA2B;AACnD,OAAO,EAAE,QAAQ,EAAE,4BAAyB;AAE5C,MAAM,MAAM,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,IAAI;IACxC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAA;KAAE,CAAC;IACvD,KAAK,EAAE,CAAC,CAAC;CACV,CAAC;AAEF,KAAK,YAAY,CAAC,CAAC,IAAI,SAAS,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;AACtE,MAAM,MAAM,QAAQ,CAAC,CAAC,EAAE,CAAC,IAAI,CAC3B,GAAG,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,KACrB,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE3B,MAAM,MAAM,qBAAqB,CAAC,CAAC,EAAE,CAAC,IAAI,CACxC,GAAG,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,KACrB,eAAe,CAAC,CAAC,CAAC,CAAC;AAExB,MAAM,MAAM,qBAAqB,CAAC,CAAC,IACjC,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAEtD,MAAM,MAAM,IAAI,GACZ;IACE,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,GAAG,CAAC;IACX,GAAG,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;CACpD,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC;IAC3C,IAAI,CAAC,EAAE,SAAS,OAAO,EAAE,GAAG,SAAS,CAAC;CACvC,CAAC;AAEN,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,SAAS,CAAC,cAAc,CAAC;IACjC,IAAI,CAAC,EAAE,SAAS,OAAO,EAAE,GAAG,SAAS,CAAC;IACtC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,GAAG,CAAC;IACX,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,EAAE,CAAC;IACjC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,IAAI,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAElC,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IAErB,aAAa,EAAE,YAAY,GAAG,SAAS,CAAC;IAExC,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;CACzB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,+BAA4B;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,8BAA2B;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,4BAAyB;AAEjD,MAAM,MAAM,eAAe,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,IAAI;IACxC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAA;KAAE,CAAC;IAChE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAClB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,QAAQ,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACjE,MAAM,MAAM,qBAAqB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC;AAE3E,MAAM,MAAM,yBAAyB,CAAC,CAAC,IACrC,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GACnC,CAAC,GACD,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAC9B,CAAC,GACD,KAAK,CAAC;AAEd,MAAM,MAAM,IAAI,GACZ;IACE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,GAAG,CAAC;IACX,GAAG,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;CACpD,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,OAAO,EAAE,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;IACrC,IAAI,EAAE,SAAS,OAAO,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC;CAC7C,CAAC;AAEN,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,cAAc,CAAC;IAC1C,QAAQ,CAAC,IAAI,EAAE,SAAS,OAAO,EAAE,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG;QAAE,IAAI,EAAE,QAAQ,CAAA;KAAE,CAAC;CAC1C;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC;IACpB,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;CACtC;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,EAAE,CAAC;IACjC,QAAQ,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,OAAO,KAAK,IAAI,CAAC;IAC3D,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9B,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;IAEhD,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IAErB,aAAa,EAAE,YAAY,GAAG,SAAS,CAAC;IAExC,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;CACzB"}

package/dist/core/types.js

@@ -1,2 +1,2 @@
-import { fnSymbol } from "./callResourceFn.js";
+export {};
 //# sourceMappingURL=types.js.map

package/dist/core/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,4BAAyB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":""}

package/dist/core/withKey.d.ts

@@ -0,0 +1,3 @@
+import { ResourceElement } from "./types.js";
+export declare function withKey<E extends ResourceElement<any, any>>(key: string | number, element: E): E;
+//# sourceMappingURL=withKey.d.ts.map

package/dist/core/withKey.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"withKey.d.ts","sourceRoot":"","sources":["../../src/core/withKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,mBAAgB;AAE1C,wBAAgB,OAAO,CAAC,CAAC,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EACzD,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,OAAO,EAAE,CAAC,GACT,CAAC,CAEH"}

package/dist/core/withKey.js

@@ -0,0 +1,4 @@
+export function withKey(key, element) {
+    return { ...element, key };
+}
+//# sourceMappingURL=withKey.js.map

package/dist/core/withKey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"withKey.js","sourceRoot":"","sources":["../../src/core/withKey.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,OAAO,CACrB,GAAoB,EACpB,OAAU;IAEV,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,CAAC;AAC7B,CAAC"}

package/dist/hooks/tap-callback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tap-callback.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-callback.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAC3D,IAAI,CAAC,EACL,MAAM,SAAS,OAAO,EAAE,KACvB,CAEF,CAAC"}
+{"version":3,"file":"tap-callback.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-callback.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAC3D,IAAI,CAAC,EACL,MAAM,SAAS,OAAO,EAAE,KACvB,CAGF,CAAC"}

package/dist/hooks/tap-callback.js

@@ -1,5 +1,6 @@
 import { tapMemo } from "./tap-memo.js";
 export const tapCallback = (fn, deps) => {
+    // biome-ignore lint/correctness/useExhaustiveDependencies: user provided deps instead of callback identity
     return tapMemo(() => fn, deps);
 };
 //# sourceMappingURL=tap-callback.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"tap-callback.js","sourceRoot":"","sources":["../../src/hooks/tap-callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,sBAAmB;AAErC,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,EAAK,EACL,IAAwB,EACrB,EAAE;IACL,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;AACjC,CAAC,CAAC"}
+{"version":3,"file":"tap-callback.js","sourceRoot":"","sources":["../../src/hooks/tap-callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,sBAAmB;AAErC,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,EAAK,EACL,IAAwB,EACrB,EAAE;IACL,2GAA2G;IAC3G,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;AACjC,CAAC,CAAC"}

package/dist/hooks/tap-const.d.ts

@@ -0,0 +1,2 @@
+export declare function tapConst<T>(getValue: () => T, _deps: readonly never[]): T;
+//# sourceMappingURL=tap-const.d.ts.map

package/dist/hooks/tap-const.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tap-const.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-const.ts"],"names":[],"mappings":"AAEA,wBAAgB,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,KAAK,EAAE,GAAG,CAAC,CAGzE"}

package/dist/hooks/tap-const.js

@@ -0,0 +1,6 @@
+import { tapState } from "./tap-state.js";
+export function tapConst(getValue, _deps) {
+    const [state] = tapState(getValue);
+    return state;
+}
+//# sourceMappingURL=tap-const.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tap-const.js","sourceRoot":"","sources":["../../src/hooks/tap-const.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,uBAAoB;AAEvC,MAAM,UAAU,QAAQ,CAAI,QAAiB,EAAE,KAAuB;IACpE,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACnC,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/hooks/tap-effect-event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tap-effect-event.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-effect-event.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAC9D,QAAQ,EAAE,CAAC,GACV,CAAC,CAQH"}
+{"version":3,"file":"tap-effect-event.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-effect-event.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAC9D,QAAQ,EAAE,CAAC,GACV,CAAC,CAoBH"}

package/dist/hooks/tap-effect-event.js

@@ -1,5 +1,8 @@
 import { tapRef } from "./tap-ref.js";
 import { tapEffect } from "./tap-effect.js";
+import { isDevelopment } from "../core/env.js";
+import { tapCallback } from "./tap-callback.js";
+import { getCurrentResourceFiber } from "../core/execution-context.js";
 /**
  * Creates a stable function reference that always calls the most recent version of the callback.
  * Similar to React's useEffectEvent hook.
@@ -20,6 +23,14 @@ export function tapEffectEvent(callback) {
     tapEffect(() => {
         callbackRef.current = callback;
     });
+    if (isDevelopment) {
+        const fiber = getCurrentResourceFiber();
+        return tapCallback(((...args) => {
+            if (fiber.renderContext)
+                throw new Error("tapEffectEvent cannot be called during render");
+            return callbackRef.current(...args);
+        }), []);
+    }
     return callbackRef.current;
 }
 //# sourceMappingURL=tap-effect-event.js.map

package/dist/hooks/tap-effect-event.js.map

@@ -1 +1 @@
-{"version":3,"file":"tap-effect-event.js","sourceRoot":"","sources":["../../src/hooks/tap-effect-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,qBAAkB;AACnC,OAAO,EAAE,SAAS,EAAE,wBAAqB;AAEzC;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,cAAc,CAC5B,QAAW;IAEX,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAErC,SAAS,CAAC,GAAG,EAAE;QACb,WAAW,CAAC,OAAO,GAAG,QAAQ,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC,OAAO,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"tap-effect-event.js","sourceRoot":"","sources":["../../src/hooks/tap-effect-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,qBAAkB;AACnC,OAAO,EAAE,SAAS,EAAE,wBAAqB;AACzC,OAAO,EAAE,aAAa,EAAE,uBAAoB;AAC5C,OAAO,EAAE,WAAW,EAAE,0BAAuB;AAC7C,OAAO,EAAE,uBAAuB,EAAE,qCAAkC;AAEpE;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,cAAc,CAC5B,QAAW;IAEX,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAErC,SAAS,CAAC,GAAG,EAAE;QACb,WAAW,CAAC,OAAO,GAAG,QAAQ,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,KAAK,GAAG,uBAAuB,EAAE,CAAC;QACxC,OAAO,WAAW,CAChB,CAAC,CAAC,GAAG,IAAmB,EAAE,EAAE;YAC1B,IAAI,KAAK,CAAC,aAAa;gBACrB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;YACnE,OAAO,WAAW,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QACtC,CAAC,CAAM,EACP,EAAE,CACH,CAAC;IACJ,CAAC;IAED,OAAO,WAAW,CAAC,OAAO,CAAC;AAC7B,CAAC"}

package/dist/hooks/tap-effect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tap-effect.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-effect.ts"],"names":[],"mappings":"AAiCA,yBAAiB,SAAS,CAAC;IACzB,KAAY,UAAU,GAAG,MAAM,IAAI,CAAC;IACpC,KAAY,cAAc,GAAG,MAAM,IAAI,GAAG,UAAU,CAAC;CACtD;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC;AAClE,wBAAgB,SAAS,CACvB,MAAM,EAAE,SAAS,CAAC,cAAc,EAChC,IAAI,EAAE,SAAS,OAAO,EAAE,GACvB,IAAI,CAAC"}
+{"version":3,"file":"tap-effect.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-effect.ts"],"names":[],"mappings":"AAUA,yBAAiB,SAAS,CAAC;IACzB,KAAY,UAAU,GAAG,MAAM,IAAI,CAAC;IACpC,KAAY,cAAc,GAAG,MAAM,IAAI,GAAG,UAAU,CAAC;CACtD;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC;AAClE,wBAAgB,SAAS,CACvB,MAAM,EAAE,SAAS,CAAC,cAAc,EAChC,IAAI,EAAE,SAAS,OAAO,EAAE,GACvB,IAAI,CAAC"}

package/dist/hooks/tap-effect.js

@@ -1,35 +1,47 @@
-import { getCurrentResourceFiber } from "../core/execution-context.js";
-function getEffectCell() {
-    const fiber = getCurrentResourceFiber();
-    const index = fiber.currentIndex++;
-    // Check if we're trying to use more hooks than in previous renders
-    if (!fiber.isFirstRender && index >= fiber.cells.length) {
-        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]) {
-        // Create the effect cell
-        const cell = {
-            type: "effect",
-            mounted: false,
-        };
-        fiber.cells[index] = cell;
-    }
-    const cell = fiber.cells[index];
-    if (cell.type !== "effect") {
-        throw new Error("Hook order changed between renders");
-    }
-    return index;
-}
+import { depsShallowEqual } from "./utils/depsShallowEqual.js";
+import { tapHook, registerRenderMountTask } from "./utils/tapHook.js";
+const newEffect = () => ({
+    type: "effect",
+    cleanup: undefined,
+    deps: null, // null means the effect has never been run
+});
 export function tapEffect(effect, deps) {
-    const fiber = getCurrentResourceFiber();
-    // Reserve a spot for the effect cell and get its index
-    const cellIndex = getEffectCell();
-    // Add task to render context for execution in commit phase
-    fiber.renderContext.commitTasks.push({
-        effect,
-        deps,
-        cellIndex,
+    const cell = tapHook("effect", newEffect);
+    if (deps && cell.deps && depsShallowEqual(cell.deps, deps))
+        return;
+    if (cell.deps !== null && !!deps !== !!cell.deps)
+        throw new Error("tapEffect called with and without dependencies across re-renders");
+    registerRenderMountTask(() => {
+        const errors = [];
+        try {
+            cell.cleanup?.();
+        }
+        catch (error) {
+            errors.push(error);
+        }
+        finally {
+            cell.cleanup = undefined;
+        }
+        try {
+            const cleanup = effect();
+            if (cleanup !== undefined && typeof cleanup !== "function") {
+                throw new Error("An effect function must either return a cleanup function or nothing. " +
+                    `Received: ${typeof cleanup}`);
+            }
+            cell.cleanup = cleanup;
+        }
+        catch (error) {
+            errors.push(error);
+        }
+        cell.deps = deps;
+        if (errors.length > 0) {
+            if (errors.length === 1) {
+                throw errors[0];
+            }
+            else {
+                throw new AggregateError(errors, "Errors during commit");
+            }
+        }
     });
 }
 //# sourceMappingURL=tap-effect.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"tap-effect.js","sourceRoot":"","sources":["../../src/hooks/tap-effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,qCAAkC;AAGpE,SAAS,aAAa;IACpB,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,yBAAyB;QACzB,MAAM,IAAI,GAA8B;YACtC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,KAAK;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,QAAQ,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAYD,MAAM,UAAU,SAAS,CACvB,MAAgC,EAChC,IAAyB;IAEzB,MAAM,KAAK,GAAG,uBAAuB,EAAE,CAAC;IAExC,uDAAuD;IACvD,MAAM,SAAS,GAAG,aAAa,EAAE,CAAC;IAElC,2DAA2D;IAC3D,KAAK,CAAC,aAAc,CAAC,WAAW,CAAC,IAAI,CAAC;QACpC,MAAM;QACN,IAAI;QACJ,SAAS;KACV,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"tap-effect.js","sourceRoot":"","sources":["../../src/hooks/tap-effect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,oCAAiC;AAC5D,OAAO,EAAE,OAAO,EAAE,uBAAuB,EAAE,2BAAwB;AAEnE,MAAM,SAAS,GAAG,GAA8B,EAAE,CAAC,CAAC;IAClD,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,IAAI,EAAE,2CAA2C;CACxD,CAAC,CAAC;AAYH,MAAM,UAAU,SAAS,CACvB,MAAgC,EAChC,IAAyB;IAEzB,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAE1C,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC;QAAE,OAAO;IACnE,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI;QAC9C,MAAM,IAAI,KAAK,CACb,kEAAkE,CACnE,CAAC;IAEJ,uBAAuB,CAAC,GAAG,EAAE;QAC3B,MAAM,MAAM,GAAc,EAAE,CAAC;QAE7B,IAAI,CAAC;YACH,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;QACnB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QAC3B,CAAC;QAED,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC;YAEzB,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,OAAO,KAAK,UAAU,EAAE,CAAC;gBAC3D,MAAM,IAAI,KAAK,CACb,uEAAuE;oBACrE,aAAa,OAAO,OAAO,EAAE,CAChC,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;QAED,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxB,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,cAAc,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/hooks/tap-inline-resource.d.ts

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

package/dist/hooks/tap-inline-resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tap-inline-resource.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-inline-resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,yBAAsB;AAGvE,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EACnE,OAAO,EAAE,CAAC,GACT,qBAAqB,CAAC,CAAC,CAAC,CAE1B"}
+{"version":3,"file":"tap-inline-resource.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-inline-resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,eAAe,EAAE,yBAAsB;AAG3E,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EACnE,OAAO,EAAE,CAAC,GACT,yBAAyB,CAAC,CAAC,CAAC,CAE9B"}

package/dist/hooks/tap-memo.js

@@ -1,5 +1,5 @@
 import { tapRef } from "./tap-ref.js";
-import { depsShallowEqual } from "./depsShallowEqual.js";
+import { depsShallowEqual } from "./utils/depsShallowEqual.js";
 export const tapMemo = (fn, deps) => {
     const dataRef = tapRef();
     if (!dataRef.current) {

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

@@ -1 +1 @@
-{"version":3,"file":"tap-memo.js","sourceRoot":"","sources":["../../src/hooks/tap-memo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,qBAAkB;AACnC,OAAO,EAAE,gBAAgB,EAAE,8BAA2B;AAEtD,MAAM,CAAC,MAAM,OAAO,GAAG,CAAI,EAAW,EAAE,IAAwB,EAAE,EAAE;IAClE,MAAM,OAAO,GAAG,MAAM,EAA0C,CAAC;IACjE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAED,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;QAClD,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE,EAAE,CAAC;QAC7B,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;AAC/B,CAAC,CAAC"}
+{"version":3,"file":"tap-memo.js","sourceRoot":"","sources":["../../src/hooks/tap-memo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,qBAAkB;AACnC,OAAO,EAAE,gBAAgB,EAAE,oCAAiC;AAE5D,MAAM,CAAC,MAAM,OAAO,GAAG,CAAI,EAAW,EAAE,IAAwB,EAAE,EAAE;IAClE,MAAM,OAAO,GAAG,MAAM,EAA0C,CAAC;IACjE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAED,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;QAClD,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE,EAAE,CAAC;QAC7B,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;AAC/B,CAAC,CAAC"}

package/dist/hooks/tap-resource.d.ts

@@ -1,4 +1,4 @@
-import { ExtractResourceOutput, ResourceElement } from "../core/types.js";
-export declare function tapResource<E extends ResourceElement<any, any>>(element: E): ExtractResourceOutput<E>;
-export declare function tapResource<E extends ResourceElement<any, any>>(element: E, deps: readonly unknown[]): ExtractResourceOutput<E>;
+import { ExtractResourceReturnType, ResourceElement } from "../core/types.js";
+export declare function tapResource<E extends ResourceElement<any, any>>(element: E): ExtractResourceReturnType<E>;
+export declare function tapResource<E extends ResourceElement<any, any>>(element: E, propsDeps: readonly unknown[]): ExtractResourceReturnType<E>;
 //# sourceMappingURL=tap-resource.d.ts.map

package/dist/hooks/tap-resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tap-resource.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,yBAAsB;AAWvE,wBAAgB,WAAW,CAAC,CAAC,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7D,OAAO,EAAE,CAAC,GACT,qBAAqB,CAAC,CAAC,CAAC,CAAC;AAC5B,wBAAgB,WAAW,CAAC,CAAC,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7D,OAAO,EAAE,CAAC,EACV,IAAI,EAAE,SAAS,OAAO,EAAE,GACvB,qBAAqB,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"tap-resource.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,eAAe,EAAE,yBAAsB;AAY3E,wBAAgB,WAAW,CAAC,CAAC,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7D,OAAO,EAAE,CAAC,GACT,yBAAyB,CAAC,CAAC,CAAC,CAAC;AAChC,wBAAgB,WAAW,CAAC,CAAC,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7D,OAAO,EAAE,CAAC,EACV,SAAS,EAAE,SAAS,OAAO,EAAE,GAC5B,yBAAyB,CAAC,CAAC,CAAC,CAAC"}

package/dist/hooks/tap-resource.js

@@ -2,17 +2,25 @@ import { tapEffect } from "./tap-effect.js";
 import { createResourceFiber, unmountResourceFiber, renderResourceFiber, commitResourceFiber, } from "../core/ResourceFiber.js";
 import { tapMemo } from "./tap-memo.js";
 import { tapState } from "./tap-state.js";
-export function tapResource(element, deps) {
-    const [stateVersion, rerender] = tapState({});
-    const fiber = tapMemo(() => createResourceFiber(element.type, () => rerender({})), [element.type]);
-    const props = deps ? tapMemo(() => element.props, deps) : element.props;
-    const result = tapMemo(() => renderResourceFiber(fiber, props), [fiber, props, stateVersion]);
-    tapEffect(() => {
-        return () => unmountResourceFiber(fiber);
-    }, [fiber]);
+import { tapConst } from "./tap-const.js";
+export function tapResource(element, propsDeps) {
+    const [version, setVersion] = tapState(0);
+    const rerender = tapConst(() => () => setVersion((v) => v + 1), []);
+    const fiber = tapMemo(() => {
+        void element.key;
+        return createResourceFiber(element.type, (callback) => {
+            if (callback())
+                rerender();
+        });
+    }, [element.type, element.key]);
+    const result = propsDeps
+        ? // biome-ignore lint/correctness/useExhaustiveDependencies: user provided deps instead of prop identity
+            tapMemo(() => renderResourceFiber(fiber, element.props), [fiber, ...propsDeps, version])
+        : renderResourceFiber(fiber, element.props);
+    tapEffect(() => () => unmountResourceFiber(fiber), [fiber]);
     tapEffect(() => {
         commitResourceFiber(fiber, result);
     }, [fiber, result]);
-    return result.state;
+    return result.output;
 }
 //# sourceMappingURL=tap-resource.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"tap-resource.js","sourceRoot":"","sources":["../../src/hooks/tap-resource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,wBAAqB;AACzC,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,GACpB,iCAA8B;AAC/B,OAAO,EAAE,OAAO,EAAE,sBAAmB;AACrC,OAAO,EAAE,QAAQ,EAAE,uBAAoB;AASvC,MAAM,UAAU,WAAW,CACzB,OAAU,EACV,IAAyB;IAEzB,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC9C,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,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IACxE,MAAM,MAAM,GAAG,OAAO,CACpB,GAAG,EAAE,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,EACvC,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAC7B,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,SAAS,CAAC,GAAG,EAAE;QACb,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IAEpB,OAAO,MAAM,CAAC,KAAK,CAAC;AACtB,CAAC"}
+{"version":3,"file":"tap-resource.js","sourceRoot":"","sources":["../../src/hooks/tap-resource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,wBAAqB;AACzC,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,GACpB,iCAA8B;AAC/B,OAAO,EAAE,OAAO,EAAE,sBAAmB;AACrC,OAAO,EAAE,QAAQ,EAAE,uBAAoB;AACvC,OAAO,EAAE,QAAQ,EAAE,uBAAoB;AASvC,MAAM,UAAU,WAAW,CACzB,OAAU,EACV,SAA8B;IAE9B,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEpE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE;QACzB,KAAK,OAAO,CAAC,GAAG,CAAC;QACjB,OAAO,mBAAmB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE;YACpD,IAAI,QAAQ,EAAE;gBAAE,QAAQ,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAEhC,MAAM,MAAM,GAAG,SAAS;QACtB,CAAC,CAAC,uGAAuG;YACvG,OAAO,CACL,GAAG,EAAE,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,EAC/C,CAAC,KAAK,EAAE,GAAG,SAAS,EAAE,OAAO,CAAC,CAC/B;QACH,CAAC,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAE9C,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5D,SAAS,CAAC,GAAG,EAAE;QACb,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IAEpB,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,CAAC"}

package/dist/hooks/tap-resources.d.ts

@@ -1,11 +1,3 @@
-import { ExtractResourceOutput, RenderResult, ResourceElement, ResourceFiber } from "../core/types.js";
-export type TapResourcesRenderResult<R, K extends string | number | symbol> = {
-    add: [K, ResourceFiber<R, any>][];
-    remove: K[];
-    commit: [K, RenderResult][];
-    return: Record<K, R>;
-};
-export declare function tapResources<M extends Record<string | number | symbol, any>, E extends ResourceElement<any, any>>(map: M, getElement: (t: M[keyof M], key: keyof M) => E, getElementDeps: any[]): {
-    [K in keyof M]: ExtractResourceOutput<E>;
-};
+import { ExtractResourceReturnType, ResourceElement } from "../core/types.js";
+export declare function tapResources<E extends ResourceElement<any, any>>(getElements: () => readonly E[], getElementsDeps?: readonly unknown[]): ExtractResourceReturnType<E>[];
 //# sourceMappingURL=tap-resources.d.ts.map

package/dist/hooks/tap-resources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tap-resources.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-resources.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,YAAY,EACZ,eAAe,EACf,aAAa,EACd,yBAAsB;AAYvB,MAAM,MAAM,wBAAwB,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,IAAI;IAC5E,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IAClC,MAAM,EAAE,CAAC,EAAE,CAAC;IACZ,MAAM,EAAE,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CACtB,CAAC;AAEF,wBAAgB,YAAY,CAC1B,CAAC,SAAS,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,EAC/C,CAAC,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAEnC,GAAG,EAAE,CAAC,EACN,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,EAC9C,cAAc,EAAE,GAAG,EAAE,GACpB;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC;CAAE,CAgF9C"}
+{"version":3,"file":"tap-resources.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-resources.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EAEzB,eAAe,EAEhB,yBAAsB;AAqBvB,wBAAgB,YAAY,CAAC,CAAC,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAC9D,WAAW,EAAE,MAAM,SAAS,CAAC,EAAE,EAC/B,eAAe,CAAC,EAAE,SAAS,OAAO,EAAE,GACnC,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAyGhC"}

package/dist/hooks/tap-resources.js

@@ -3,68 +3,99 @@ import { tapMemo } from "./tap-memo.js";
 import { tapState } from "./tap-state.js";
 import { tapCallback } from "./tap-callback.js";
 import { createResourceFiber, unmountResourceFiber, renderResourceFiber, commitResourceFiber, } from "../core/ResourceFiber.js";
-export function tapResources(map, getElement, getElementDeps) {
+import { tapConst } from "./tap-const.js";
+export function tapResources(getElements, getElementsDeps) {
     const [version, setVersion] = tapState(0);
-    const rerender = tapCallback(() => setVersion((v) => v + 1), []);
-    const [fibers] = tapState(() => new Map());
-    const getElementMemo = tapMemo(() => getElement, getElementDeps);
+    const rerender = tapConst(() => () => setVersion((v) => v + 1), []);
+    const fibers = tapConst(() => new Map(), []);
+    const getElementsMemo = getElementsDeps
+        ? // biome-ignore lint/correctness/useExhaustiveDependencies: library code
+            tapCallback(getElements, getElementsDeps)
+        : getElements;
     // Process each element
-    const results = tapMemo(() => {
-        const results = {
-            remove: [],
-            add: [],
-            commit: [],
-            return: {},
-        };
+    const res = tapMemo(() => {
+        void version;
+        const elementsArray = getElementsMemo();
+        const seenKeys = new Set();
+        const results = [];
+        let newCount = 0;
         // Create/update fibers and render
-        for (const key in map) {
-            const value = map[key];
-            const element = getElementMemo(value, key);
-            let fiber = fibers.get(key);
-            // Create new fiber if needed or type changed
-            if (!fiber || fiber.resource !== element.type) {
-                if (fiber)
-                    results.remove.push(key);
-                fiber = createResourceFiber(element.type, rerender);
-                results.add.push([key, fiber]);
+        for (let i = 0; i < elementsArray.length; i++) {
+            const element = elementsArray[i];
+            const elementKey = element.key;
+            if (elementKey === undefined) {
+                throw new Error(`tapResources did not provide a key for array at index ${i}`);
+            }
+            if (seenKeys.has(elementKey))
+                throw new Error(`Duplicate key ${elementKey} in tapResources`);
+            seenKeys.add(elementKey);
+            let state = fibers.get(elementKey);
+            if (!state) {
+                const fiber = createResourceFiber(element.type, (callback) => {
+                    if (callback())
+                        rerender();
+                });
+                const result = renderResourceFiber(fiber, element.props);
+                state = {
+                    fiber,
+                    next: result,
+                };
+                newCount++;
+                fibers.set(elementKey, state);
+                results.push(result.output);
+            }
+            else if (state.fiber.type !== element.type) {
+                const fiber = createResourceFiber(element.type, (callback) => {
+                    if (callback())
+                        rerender();
+                });
+                const result = renderResourceFiber(fiber, element.props);
+                state.next = [fiber, result];
+                results.push(result.output);
+            }
+            else {
+                state.next = renderResourceFiber(state.fiber, element.props);
+                results.push(state.next.output);
             }
-            // Render with current props
-            const renderResult = renderResourceFiber(fiber, element.props);
-            results.commit.push([key, renderResult]);
-            results.return[key] = renderResult.state;
         }
         // Clean up removed fibers (only if there might be stale ones)
-        if (fibers.size >
-            results.commit.length - results.add.length + results.remove.length) {
+        if (fibers.size > results.length - newCount) {
             for (const key of fibers.keys()) {
-                if (!(key in map)) {
-                    results.remove.push(key);
+                if (!seenKeys.has(key)) {
+                    fibers.get(key).next = "delete";
                 }
             }
         }
         return results;
-    }, [map, getElementMemo, version]);
+    }, [getElementsMemo, version]);
     // Cleanup on unmount
     tapEffect(() => {
         return () => {
             for (const key of fibers.keys()) {
-                unmountResourceFiber(fibers.get(key));
-                fibers.delete(key);
+                const fiber = fibers.get(key).fiber;
+                unmountResourceFiber(fiber);
             }
         };
     }, []);
     tapEffect(() => {
-        for (const key of results.remove) {
-            unmountResourceFiber(fibers.get(key));
-            fibers.delete(key);
-        }
-        for (const [key, fiber] of results.add) {
-            fibers.set(key, fiber);
-        }
-        for (const [key, result] of results.commit) {
-            commitResourceFiber(fibers.get(key), result);
+        res; // as a performance optimization, we only run if the results have changed
+        for (const [key, state] of fibers.entries()) {
+            if (state.next === "delete") {
+                if (state.fiber.isMounted) {
+                    unmountResourceFiber(state.fiber);
+                }
+                fibers.delete(key);
+            }
+            else if (Array.isArray(state.next)) {
+                unmountResourceFiber(state.fiber);
+                state.fiber = state.next[0];
+                commitResourceFiber(state.fiber, state.next[1]);
+            }
+            else {
+                commitResourceFiber(state.fiber, state.next);
+            }
         }
-    }, [results]);
-    return results.return;
+    }, [res]);
+    return res;
 }
 //# sourceMappingURL=tap-resources.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"tap-resources.js","sourceRoot":"","sources":["../../src/hooks/tap-resources.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tap-resources.js","sourceRoot":"","sources":["../../src/hooks/tap-resources.ts"],"names":[],"mappings":"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"}

package/dist/hooks/tap-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tap-state.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-state.ts"],"names":[],"mappings":"AAGA,yBAAiB,QAAQ,CAAC;IACxB,KAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;CACpD;AAgED,wBAAgB,QAAQ,CAAC,CAAC,GAAG,SAAS,KAAK;IACzC,CAAC,GAAG,SAAS;IACb,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI;CAC5C,CAAC;AACF,wBAAgB,QAAQ,CAAC,CAAC,EACxB,OAAO,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GACrB,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC"}
+{"version":3,"file":"tap-state.d.ts","sourceRoot":"","sources":["../../src/hooks/tap-state.ts"],"names":[],"mappings":"AAIA,yBAAiB,QAAQ,CAAC;IACxB,KAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;CACpD;AAsFD,wBAAgB,QAAQ,CAAC,CAAC,GAAG,SAAS,KAAK;IACzC,CAAC,GAAG,SAAS;IACb,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI;CAC5C,CAAC;AACF,wBAAgB,QAAQ,CAAC,CAAC,EACxB,OAAO,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GACrB,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC"}