@assistant-ui/tap 0.4.2 → 0.4.4

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

@@ -1 +1 @@
-{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/core/env.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,SAEU,CAAC"}
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/core/env.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,SAGa,CAAC"}

package/dist/core/env.js

@@ -1,3 +1,4 @@
-export const isDevelopment = process.env["NODE_ENV"] === "development" ||
-    process.env["NODE_ENV"] === "test";
+export const isDevelopment = typeof process !== "undefined" &&
+    (process.env["NODE_ENV"] === "development" ||
+        process.env["NODE_ENV"] === "test");
 //# sourceMappingURL=env.js.map

package/dist/core/env.js.map

@@ -1 +1 @@
-{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/core/env.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,aAAa,GACxB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,aAAa;IACzC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,MAAM,CAAC"}
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/core/env.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,aAAa,GACxB,OAAO,OAAO,KAAK,WAAW;IAC9B,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,aAAa;QACxC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,MAAM,CAAC,CAAC"}

package/dist/index.d.ts

@@ -10,6 +10,7 @@ export { tapEffectEvent } from "./hooks/tap-effect-event.js";
 export { tapResource } from "./hooks/tap-resource.js";
 export { tapInlineResource } from "./hooks/tap-inline-resource.js";
 export { tapResources } from "./hooks/tap-resources.js";
+export { tapSubscribableResource } from "./tapSubscribableResource.js";
 export { createResource } from "./core/createResource.js";
 export { flushResourcesSync } from "./core/scheduler.js";
 export { createResourceContext, tap, withContextProvider, } from "./core/context.js";

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;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"}
+{"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,uBAAuB,EAAE,qCAAkC;AAGpE,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

@@ -13,6 +13,8 @@ export { tapEffectEvent } from "./hooks/tap-effect-event.js";
 export { tapResource } from "./hooks/tap-resource.js";
 export { tapInlineResource } from "./hooks/tap-inline-resource.js";
 export { tapResources } from "./hooks/tap-resources.js";
+// subscribable
+export { tapSubscribableResource } from "./tapSubscribableResource.js";
 // imperative
 export { createResource } from "./core/createResource.js";
 export { flushResourcesSync } from "./core/scheduler.js";

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;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"}
+{"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,eAAe;AACf,OAAO,EAAE,uBAAuB,EAAE,qCAAkC;AAEpE,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/tapSubscribableResource.d.ts

@@ -0,0 +1,16 @@
+import { ResourceElement } from "./core/types.js";
+export declare namespace tapSubscribableResource {
+    type Unsubscribe = () => void;
+    interface SubscribableResource<TState> {
+        /**
+         * Get the current state of the store.
+         */
+        getValue(): TState;
+        /**
+         * Subscribe to the store.
+         */
+        subscribe(listener: () => void): Unsubscribe;
+    }
+}
+export declare const tapSubscribableResource: <TState>(element: ResourceElement<TState>) => tapSubscribableResource.SubscribableResource<TState>;
+//# sourceMappingURL=tapSubscribableResource.d.ts.map

package/dist/tapSubscribableResource.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tapSubscribableResource.d.ts","sourceRoot":"","sources":["../src/tapSubscribableResource.ts"],"names":[],"mappings":"AAYA,OAAO,EAAgB,eAAe,EAAE,wBAAqB;AAE7D,yBAAiB,uBAAuB,CAAC;IACvC,KAAY,WAAW,GAAG,MAAM,IAAI,CAAC;IAErC,UAAiB,oBAAoB,CAAC,MAAM;QAC1C;;WAEG;QACH,QAAQ,IAAI,MAAM,CAAC;QAEnB;;WAEG;QACH,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,WAAW,CAAC;KAC9C;CACF;AAED,eAAO,MAAM,uBAAuB,GAAI,MAAM,EAC5C,SAAS,eAAe,CAAC,MAAM,CAAC,KAC/B,uBAAuB,CAAC,oBAAoB,CAAC,MAAM,CAoErD,CAAC"}

package/dist/tapSubscribableResource.js

@@ -0,0 +1,60 @@
+import { commitResourceFiber, createResourceFiber, renderResourceFiber, unmountResourceFiber, } from "./core/ResourceFiber.js";
+import { flushResourcesSync, UpdateScheduler } from "./core/scheduler.js";
+import { tapConst } from "./hooks/tap-const.js";
+import { tapMemo } from "./hooks/tap-memo.js";
+import { tapEffect } from "./hooks/tap-effect.js";
+import { tapEffectEvent } from "./hooks/tap-effect-event.js";
+import { tapRef } from "./hooks/tap-ref.js";
+export const tapSubscribableResource = (element) => {
+    const scheduler = tapConst(() => new UpdateScheduler(() => {
+        lastRenderRef.current = null;
+        handleUpdate();
+    }), []);
+    const fiber = tapMemo(() => {
+        void element.key;
+        return createResourceFiber(element.type, (callback) => {
+            if (callback()) {
+                scheduler.markDirty();
+            }
+        });
+    }, [element.type, element.key]);
+    const lastRenderRef = tapRef(null);
+    lastRenderRef.current = renderResourceFiber(fiber, element.props);
+    const isMountedRef = tapRef(false);
+    const committedPropsRef = tapRef(element.props);
+    const valueRef = tapRef(lastRenderRef.current.output);
+    const subscribers = tapConst(() => new Set(), []);
+    const handleUpdate = tapEffectEvent(() => {
+        if (!isMountedRef.current)
+            return; // skip update if not mounted
+        if (lastRenderRef.current === null) {
+            lastRenderRef.current = renderResourceFiber(fiber, committedPropsRef.current);
+        }
+        if (scheduler.isDirty)
+            return;
+        committedPropsRef.current = lastRenderRef.current.props;
+        commitResourceFiber(fiber, lastRenderRef.current);
+        if (scheduler.isDirty || valueRef.current === lastRenderRef.current.output)
+            return;
+        valueRef.current = lastRenderRef.current.output;
+        subscribers.forEach((callback) => callback());
+    });
+    tapEffect(() => {
+        isMountedRef.current = true;
+        return () => {
+            isMountedRef.current = false;
+            unmountResourceFiber(fiber);
+        };
+    }, [fiber]);
+    tapEffect(() => {
+        flushResourcesSync(handleUpdate);
+    });
+    return tapMemo(() => ({
+        getValue: () => valueRef.current,
+        subscribe: (listener) => {
+            subscribers.add(listener);
+            return () => subscribers.delete(listener);
+        },
+    }), []);
+};
+//# sourceMappingURL=tapSubscribableResource.js.map

package/dist/tapSubscribableResource.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@assistant-ui/tap",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Zero-dependency reactive state management inspired by React hooks",
   "keywords": [
     "state-management",
@@ -48,13 +48,13 @@
   "devDependencies": {
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
-    "@types/react": "^19.2.9",
-    "@types/node": "^25.0.10",
+    "@types/react": "^19.2.10",
+    "@types/node": "^25.2.0",
     "@types/react-dom": "^19.2.3",
     "@vitest/ui": "^4.0.18",
     "react": "19.2.4",
     "react-dom": "19.2.4",
-    "jsdom": "^27.4.0",
+    "jsdom": "^28.0.0",
     "vitest": "^4.0.18",
     "@assistant-ui/x-buildutils": "0.0.1"
   },

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

@@ -399,7 +399,7 @@ describe("Tap Strict Mode - Rerender Sources", () => {
   });
 
   describe("Source 8: setState with function updater", () => {
-    it.skip("should double-render with function updater in flushResourcesSync", () => {
+    it("should double-render with function updater in flushResourcesSync", () => {
       const events: string[] = [];
 
       const TestResource = resource(() => {

package/src/core/env.ts

@@ -1,3 +1,4 @@
 export const isDevelopment =
-  process.env["NODE_ENV"] === "development" ||
-  process.env["NODE_ENV"] === "test";
+  typeof process !== "undefined" &&
+  (process.env["NODE_ENV"] === "development" ||
+    process.env["NODE_ENV"] === "test");

package/src/index.ts

@@ -17,6 +17,9 @@ export { tapResource } from "./hooks/tap-resource";
 export { tapInlineResource } from "./hooks/tap-inline-resource";
 export { tapResources } from "./hooks/tap-resources";
 
+// subscribable
+export { tapSubscribableResource } from "./tapSubscribableResource";
+
 // imperative
 export { createResource } from "./core/createResource";
 export { flushResourcesSync } from "./core/scheduler";

package/src/tapSubscribableResource.ts

@@ -0,0 +1,101 @@
+import {
+  commitResourceFiber,
+  createResourceFiber,
+  renderResourceFiber,
+  unmountResourceFiber,
+} from "./core/ResourceFiber";
+import { flushResourcesSync, UpdateScheduler } from "./core/scheduler";
+import { tapConst } from "./hooks/tap-const";
+import { tapMemo } from "./hooks/tap-memo";
+import { tapEffect } from "./hooks/tap-effect";
+import { tapEffectEvent } from "./hooks/tap-effect-event";
+import { tapRef } from "./hooks/tap-ref";
+import { RenderResult, ResourceElement } from "./core/types";
+
+export namespace tapSubscribableResource {
+  export type Unsubscribe = () => void;
+
+  export interface SubscribableResource<TState> {
+    /**
+     * Get the current state of the store.
+     */
+    getValue(): TState;
+
+    /**
+     * Subscribe to the store.
+     */
+    subscribe(listener: () => void): Unsubscribe;
+  }
+}
+
+export const tapSubscribableResource = <TState>(
+  element: ResourceElement<TState>,
+): tapSubscribableResource.SubscribableResource<TState> => {
+  const scheduler = tapConst(
+    () =>
+      new UpdateScheduler(() => {
+        lastRenderRef.current = null;
+        handleUpdate();
+      }),
+    [],
+  );
+  const fiber = tapMemo(() => {
+    void element.key;
+
+    return createResourceFiber(element.type, (callback) => {
+      if (callback()) {
+        scheduler.markDirty();
+      }
+    });
+  }, [element.type, element.key]);
+
+  const lastRenderRef = tapRef<RenderResult | null>(null);
+  lastRenderRef.current = renderResourceFiber(fiber, element.props);
+
+  const isMountedRef = tapRef(false);
+  const committedPropsRef = tapRef(element.props);
+  const valueRef = tapRef<TState>(lastRenderRef.current.output);
+  const subscribers = tapConst(() => new Set<() => void>(), []);
+  const handleUpdate = tapEffectEvent(() => {
+    if (!isMountedRef.current) return; // skip update if not mounted
+
+    if (lastRenderRef.current === null) {
+      lastRenderRef.current = renderResourceFiber(
+        fiber,
+        committedPropsRef.current,
+      );
+    }
+
+    if (scheduler.isDirty) return;
+    committedPropsRef.current = lastRenderRef.current.props;
+    commitResourceFiber(fiber, lastRenderRef.current);
+
+    if (scheduler.isDirty || valueRef.current === lastRenderRef.current.output)
+      return;
+    valueRef.current = lastRenderRef.current.output;
+    subscribers.forEach((callback) => callback());
+  });
+
+  tapEffect(() => {
+    isMountedRef.current = true;
+    return () => {
+      isMountedRef.current = false;
+      unmountResourceFiber(fiber);
+    };
+  }, [fiber]);
+
+  tapEffect(() => {
+    flushResourcesSync(handleUpdate);
+  });
+
+  return tapMemo(
+    () => ({
+      getValue: () => valueRef.current,
+      subscribe: (listener: () => void) => {
+        subscribers.add(listener);
+        return () => subscribers.delete(listener);
+      },
+    }),
+    [],
+  );
+};