floppy-disk 3.0.0-beta.1 → 3.0.0-beta.2

package/esm/react/create-mutation.d.mts

@@ -14,7 +14,7 @@ import { type InitStoreOptions, type SetState } from 'floppy-disk/vanilla';
  * - No retry mechanism
  * - No caching across executions
  */
-export type MutationState<TData, TVariable> = {
+export type MutationState<TData, TVariable, TError> = {
     isPending: boolean;
 } & ({
     state: 'INITIAL';
@@ -41,7 +41,7 @@ export type MutationState<TData, TVariable> = {
     variable: TVariable;
     data: undefined;
     dataUpdatedAt: undefined;
-    error: any;
+    error: TError;
     errorUpdatedAt: number;
 });
 /**
@@ -50,19 +50,19 @@ export type MutationState<TData, TVariable> = {
  * @remarks
  * Lifecycle callbacks are triggered for each execution.
  */
-export type MutationOptions<TData, TVariable> = InitStoreOptions<MutationState<TData, TVariable>> & {
+export type MutationOptions<TData, TVariable, TError = Error> = InitStoreOptions<MutationState<TData, TVariable, TError>> & {
     /**
      * Called when the mutation succeeds.
      */
-    onSuccess?: (data: TData, variable: TVariable, stateBeforeExecute: MutationState<TData, TVariable>) => void;
+    onSuccess?: (data: TData, variable: TVariable, stateBeforeExecute: MutationState<TData, TVariable, TError>) => void;
     /**
      * Called when the mutation fails.
      */
-    onError?: (error: any, variable: TVariable, stateBeforeExecute: MutationState<TData, TVariable>) => void;
+    onError?: (error: TError, variable: TVariable, stateBeforeExecute: MutationState<TData, TVariable, TError>) => void;
     /**
      * Called after the mutation settles (either success or error).
      */
-    onSettled?: (variable: TVariable, stateBeforeExecute: MutationState<TData, TVariable>) => void;
+    onSettled?: (variable: TVariable, stateBeforeExecute: MutationState<TData, TVariable, TError>) => void;
 };
 /**
  * Creates a mutation store for handling async operations that modify data.
@@ -89,10 +89,10 @@ export type MutationOptions<TData, TVariable> = InitStoreOptions<MutationState<T
  * const { isPending } = useCreateUser();
  * const result = await useCreateUser.execute({ name: 'John' });
  */
-export declare const createMutation: <TData, TVariable = undefined>(mutationFn: (variable: TVariable, stateBeforeExecute: MutationState<TData, TVariable>) => Promise<TData>, options?: MutationOptions<TData, TVariable>) => (<TStateSlice = MutationState<TData, TVariable>>(selector?: (state: MutationState<TData, TVariable>) => TStateSlice) => TStateSlice) & {
-    subscribe: (subscriber: import("../vanilla.d.mts").Subscriber<MutationState<TData, TVariable>>) => () => void;
-    getSubscribers: () => Set<import("../vanilla.d.mts").Subscriber<MutationState<TData, TVariable>>>;
-    getState: () => MutationState<TData, TVariable>;
+export declare const createMutation: <TData, TVariable = undefined, TError = Error>(mutationFn: (variable: TVariable, stateBeforeExecute: MutationState<TData, TVariable, TError>) => Promise<TData>, options?: MutationOptions<TData, TVariable, TError>) => (() => MutationState<TData, TVariable, TError>) & {
+    subscribe: (subscriber: import("../vanilla.d.mts").Subscriber<MutationState<TData, TVariable, TError>>) => () => void;
+    getSubscribers: () => Set<import("../vanilla.d.mts").Subscriber<MutationState<TData, TVariable, TError>>>;
+    getState: () => MutationState<TData, TVariable, TError>;
     /**
      * Manually updates the mutation state.
      *
@@ -100,7 +100,7 @@ export declare const createMutation: <TData, TVariable = undefined>(mutationFn:
      * - Intended for advanced use cases.
      * - Prefer using provided mutation actions (`execute`, `reset`) instead.
      */
-    setState: (value: SetState<MutationState<TData, TVariable>>) => void;
+    setState: (value: SetState<MutationState<TData, TVariable, TError>>) => void;
     /**
      * Executes the mutation.
      *
@@ -118,11 +118,11 @@ export declare const createMutation: <TData, TVariable = undefined>(mutationFn:
     execute: TVariable extends undefined ? () => Promise<{
         variable: undefined;
         data?: TData;
-        error?: any;
+        error?: TError;
     }> : (variable: TVariable) => Promise<{
         variable: TVariable;
         data?: TData;
-        error?: any;
+        error?: TError;
     }>;
     /**
      * Resets the mutation state back to its initial state.

package/esm/react/create-query.d.mts

@@ -19,7 +19,7 @@ import { type InitStoreOptions, type SetState } from 'floppy-disk/vanilla';
  * @remarks
  * - Data and error are mutually exclusive except in `SUCCESS_BUT_REVALIDATION_ERROR`.
  */
-export type QueryState<TData> = {
+export type QueryState<TData, TError> = {
     isPending: boolean;
     isRevalidating: boolean;
     isRetrying: boolean;
@@ -46,7 +46,7 @@ export type QueryState<TData> = {
     isError: true;
     data: undefined;
     dataUpdatedAt: undefined;
-    error: any;
+    error: TError;
     errorUpdatedAt: number;
 } | {
     state: 'SUCCESS_BUT_REVALIDATION_ERROR';
@@ -54,7 +54,7 @@ export type QueryState<TData> = {
     isError: false;
     data: TData;
     dataUpdatedAt: number;
-    error: any;
+    error: TError;
     errorUpdatedAt: number;
 });
 /**
@@ -63,13 +63,13 @@ export type QueryState<TData> = {
  * @remarks
  * Controls caching, retry behavior, lifecycle, and side effects of an async operation.
  */
-export type QueryOptions<TData, TVariable extends Record<string, any>> = InitStoreOptions<QueryState<TData>> & {
+export type QueryOptions<TData, TVariable extends Record<string, any>, TError = Error> = InitStoreOptions<QueryState<TData, TError>> & {
     /**
      * Time (in milliseconds) that data is considered fresh.
      *
-     * While fresh, revalidation will be skipped.
+     * While fresh, revalidation will be skipped unless explicitly invalidated.
      *
-     * @default 2500 ms (2.5 minutes)
+     * @default 2500 ms (2.5 seconds)
      */
     staleTime?: number;
     /**
@@ -95,15 +95,15 @@ export type QueryOptions<TData, TVariable extends Record<string, any>> = InitSto
     /**
      * Called when the query succeeds.
      */
-    onSuccess?: (data: TData, variable: TVariable, stateBeforeExecute: QueryState<TData>) => void;
+    onSuccess?: (data: TData, variable: TVariable, stateBeforeExecute: QueryState<TData, TError>) => void;
     /**
      * Called when the query fails and will not retry.
      */
-    onError?: (error: any, variable: TVariable, stateBeforeExecute: QueryState<TData>) => void;
+    onError?: (error: TError, variable: TVariable, stateBeforeExecute: QueryState<TData, TError>) => void;
     /**
      * Called after the query settles (success or final failure).
      */
-    onSettled?: (variable: TVariable, stateBeforeExecute: QueryState<TData>) => void;
+    onSettled?: (variable: TVariable, stateBeforeExecute: QueryState<TData, TError>) => void;
     /**
      * Determines whether a failed query should retry.
      *
@@ -120,7 +120,7 @@ export type QueryOptions<TData, TVariable extends Record<string, any>> = InitSto
      *   return [false];
      * }
      */
-    shouldRetry?: (error: any, currentState: QueryState<TData>) => [true, number] | [false];
+    shouldRetry?: (error: TError, currentState: QueryState<TData, TError>) => [true, number] | [false];
 };
 /**
  * Creates a query factory for managing cached async operations.
@@ -131,16 +131,20 @@ export type QueryOptions<TData, TVariable extends Record<string, any>> = InitSto
  * @returns A function to retrieve or create a query instance by variable
  *
  * @remarks
- * - Queries are cached by a deterministic key derived from `variable`.
+ * - Queries are **keyed by variable** (via deterministic hashing).
  * - Each unique variable maps to its own store instance.
- * - Queries support:
- *   - Caching with `staleTime`
- *   - Explicit invalidation independent of freshness
- *   - Automatic garbage collection (`gcTime`)
- *   - Retry logic via `shouldRetry`
- *   - Background revalidation (focus / reconnect)
- * - Execution is deduplicated: multiple calls share the same in-flight promise.
- * - Ongoing executions can be optionally overwritten.
+ *
+ * Core features:
+ * - Caching via `staleTime`
+ * - Explicit invalidation (independent of freshness)
+ * - Retry logic via `shouldRetry`
+ * - Background revalidation (focus / reconnect)
+ * - Garbage collection via `gcTime`
+ *
+ * Execution behavior:
+ * - By default, executions **overwrite ongoing executions**
+ * - Set `overwriteOngoingExecution: false` to enable deduplication
+ * - Internal revalidation (focus/reconnect) uses deduplication by default
  *
  * @example
  * const userQuery = createQuery<UserDetail, { id: string }>(async ({ id }) => {
@@ -153,39 +157,36 @@ export type QueryOptions<TData, TVariable extends Record<string, any>> = InitSto
  *   // ...
  * }
  */
-export declare const createQuery: <TData, TVariable extends Record<string, any> = never>(queryFn: (variable: TVariable, currentState: QueryState<TData>) => Promise<TData>, options?: QueryOptions<TData, TVariable>) => ((variable?: TVariable) => {
-    <TStateSlice = QueryState<TData>>(options?: {
-        /**
-         * Whether the query should execute automatically on mount.
-         *
-         * @default true
-         */
-        enabled?: boolean;
-        /**
-         * Whether to keep previous successful data while a new variable is loading.
-         *
-         * @remarks
-         * - Only applies when the query is in the `INITIAL` state (no data & no error).
-         * - Intended for variable changes:
-         *   when switching from one variable to another, the previous data is temporarily shown
-         *   while the new execution is in progress.
-         * - Once the new execution resolves (success or error), the previous data is no longer used.
-         * - Prevents UI flicker (e.g. empty/loading state) during transitions.
-         *
-         * @example
-         * // Switching from userId=1 → userId=2
-         * // While loading userId=2, still show userId=1 data
-         * useQuery({ id: userId }, { keepPreviousData: true });
-         */ keepPreviousData?: boolean;
-    }, selector?: (state: QueryState<TData>) => TStateSlice): TStateSlice;
-    <TStateSlice = QueryState<TData>>(selector?: (state: QueryState<TData>) => TStateSlice): TStateSlice;
-} & {
+export declare const createQuery: <TData, TVariable extends Record<string, any> = never, TError = Error>(queryFn: (variable: TVariable, currentState: QueryState<TData, TError>) => Promise<TData>, options?: QueryOptions<TData, TVariable, TError>) => ((variable?: TVariable) => ((options?: {
+    /**
+     * Whether the query should execute automatically on mount.
+     *
+     * @default true
+     */
+    enabled?: boolean;
+    /**
+     * Whether to keep previous successful data while a new variable is loading.
+     *
+     * @remarks
+     * - Only applies when the query is in the `INITIAL` state (no data & no error).
+     * - Intended for variable changes:
+     *   when switching from one variable to another, the previous data is temporarily shown
+     *   while the new execution is in progress.
+     * - Once the new execution resolves (success or error), the previous data is no longer used.
+     * - Prevents UI flicker (e.g. empty/loading state) during transitions.
+     *
+     * @example
+     * // Switching from userId=1 → userId=2
+     * // While loading userId=2, still show userId=1 data
+     * useQuery({ id: userId }, { keepPreviousData: true });
+     */ keepPreviousData?: boolean;
+}) => QueryState<TData, TError>) & {
     metadata: {
         isInvalidated?: boolean;
-        promise?: Promise<QueryState<TData>> | undefined;
-        promiseResolver?: ((value: QueryState<TData> | PromiseLike<QueryState<TData>>) => void) | undefined;
+        promise?: Promise<QueryState<TData, TError>> | undefined;
+        promiseResolver?: ((value: QueryState<TData, TError> | PromiseLike<QueryState<TData, TError>>) => void) | undefined;
         retryTimeoutId?: number;
-        retryResolver?: ((value: QueryState<TData> | PromiseLike<QueryState<TData>>) => void) | undefined;
+        retryResolver?: ((value: QueryState<TData, TError> | PromiseLike<QueryState<TData, TError>>) => void) | undefined;
         garbageCollectionTimeoutId?: number;
         rollbackData?: TData | undefined;
     };
@@ -211,7 +212,7 @@ export declare const createQuery: <TData, TVariable extends Record<string, any>
      * @returns A promise resolving to the latest query state
      *
      * @remarks
-     * - By default, each call starts a new execution even if one is already in progress.
+     * - By default, each call **starts a new execution** even if one is already in progress.
      * - Set `overwriteOngoingExecution: false` to reuse an ongoing execution (deduplication).
      * - Handles:
      *   - Pending state
@@ -221,7 +222,7 @@ export declare const createQuery: <TData, TVariable extends Record<string, any>
      */
     execute: (options?: {
         overwriteOngoingExecution?: boolean;
-    }) => Promise<QueryState<TData>>;
+    }) => Promise<QueryState<TData, TError>>;
     /**
      * Re-executes the query if needed based on freshness or invalidation.
      *
@@ -237,7 +238,7 @@ export declare const createQuery: <TData, TVariable extends Record<string, any>
      */
     revalidate: (options?: {
         overwriteOngoingExecution?: boolean;
-    }) => Promise<QueryState<TData>>;
+    }) => Promise<QueryState<TData, TError>>;
     /**
      * Marks the query as invalidated and optionally triggers re-execution.
      *
@@ -289,7 +290,7 @@ export declare const createQuery: <TData, TVariable extends Record<string, any>
      * const { rollback, revalidate } = query.optimisticUpdate(newData);
      */
     optimisticUpdate: (data: TData) => {
-        revalidate: () => Promise<QueryState<TData>>;
+        revalidate: () => Promise<QueryState<TData, TError>>;
         rollback: () => TData;
     };
     /**
@@ -301,10 +302,10 @@ export declare const createQuery: <TData, TVariable extends Record<string, any>
      * - Should be used if an optimistic update fails.
      */
     rollbackOptimisticUpdate: () => TData;
-    subscribe: (subscriber: import("../vanilla.d.mts").Subscriber<QueryState<TData>>) => () => void;
-    getSubscribers: () => Set<import("../vanilla.d.mts").Subscriber<QueryState<TData>>>;
-    getState: () => QueryState<TData>;
-    setState: (value: SetState<QueryState<TData>>) => void;
+    subscribe: (subscriber: import("../vanilla.d.mts").Subscriber<QueryState<TData, TError>>) => () => void;
+    getSubscribers: () => Set<import("../vanilla.d.mts").Subscriber<QueryState<TData, TError>>>;
+    getState: () => QueryState<TData, TError>;
+    setState: (value: SetState<QueryState<TData, TError>>) => void;
 }) & {
     /**
      * Executes all query instances.

package/esm/react/create-store.d.mts

@@ -12,14 +12,17 @@ import { type InitStoreOptions } from 'floppy-disk/vanilla';
  * @remarks
  * - Combines the vanilla store with React integration.
  * - The returned function can be used directly as a hook.
+ *   - The hook uses Proxy-based tracking to automatically detect which state fields are used.
+ *   - Components will only re-render when the accessed values change.
  *
  * @example
- * const useCounter = createStore({ count: 0 });
+ * const useMyStore = createStore({ foo: 1, bar: 2 });
  *
  * function Component() {
- *   const count = useCounter((s) => s.count);
+ *   const state = useMyStore();
+ *   return <div>{state.foo}</div>;
  * }
  *
- * useCounter.setState({ count: 1 });
+ * useMyStore.setState({ foo: 2 }); // only components using foo will re-render
  */
-export declare const createStore: <TState extends Record<string, any>>(initialState: TState, options?: InitStoreOptions<TState>) => (<TStateSlice = TState>(selector?: (state: TState) => TStateSlice) => TStateSlice) & import("../vanilla.d.mts").StoreApi<TState>;
+export declare const createStore: <TState extends Record<string, any>>(initialState: TState, options?: InitStoreOptions<TState>) => (() => TState) & import("../vanilla.d.mts").StoreApi<TState>;

package/esm/react/create-stores.d.mts

@@ -12,18 +12,25 @@ import { type InitStoreOptions } from 'floppy-disk/vanilla';
  * - Keys are deterministically hashed, ensuring stable identity.
  * - Stores are lazily created and cached.
  * - Each store has its own state, subscribers, and lifecycle.
+ * - Each returned store includes:
+ *   - React hook (with Proxy-based tracking)
+ *   - Store API methods
+ *   - `delete()` for manual cleanup
  * - Useful for scenarios like:
  *   - Query caches
  *   - Entity-based state
  *   - Dynamic instances
  *
  * @example
- * const getUserStore = createStores({ name: '' });
+ * const userStore = createStores<{ name: string }, { id: number }>({ name: '' });
  *
- * const userStore = getUserStore({ id: 1 });
- * const name = userStore((s) => s.name);
+ * function Component() {
+ *   const useUserStore = userStore({ id: 1 });
+ *   const state = useUserStore();
+ *   return <div>{state.name}</div>;
+ * }
  */
-export declare const createStores: <TState extends Record<string, any>, TKey extends Record<string, any>>(initialState: TState, options?: InitStoreOptions<TState>) => (key?: TKey) => (<TStateSlice = TState>(selector?: (state: TState) => TStateSlice) => TStateSlice) & {
+export declare const createStores: <TState extends Record<string, any>, TKey extends Record<string, any>>(initialState: TState, options?: InitStoreOptions<TState>) => (key?: TKey) => (() => TState) & {
     delete: () => boolean;
     setState: (value: import("../vanilla.d.mts").SetState<TState>) => void;
     getState: () => TState;

package/esm/react/use-store.d.mts

@@ -1,18 +1,28 @@
 import { type StoreApi } from 'floppy-disk/vanilla';
-export declare const useStoreUpdateNotifier: <TState extends Record<string, any>, TStateSlice = TState>(store: StoreApi<TState>, selector: (state: TState) => TStateSlice) => void;
+type Path = Array<string | number | symbol>;
+export declare const getValueByPath: (obj: any, path: Path) => any;
+export declare const isPrefixPath: (candidatePrefix: Path, targetPath: Path) => boolean;
+export declare const compressPaths: (paths: Path[]) => Path[];
+export declare const useStoreStateProxy: <TState extends Record<string, any>>(storeState: TState) => readonly [TState, import("react").RefObject<Path[]>];
 /**
- * React hook for subscribing to a store with optional state selection.
+ * React hook for subscribing to a store using automatic dependency tracking.
  *
  * @param store - The store instance to subscribe to
- * @param selector - Optional selector to derive a slice of state
  *
- * @returns The selected state slice (or full state if no selector is provided)
+ * @returns A proxied version of the store state
  *
  * @remarks
- * - The selector does **not** need to be memoized.
- * - The hook internally keeps the latest selector reference to avoid re-subscription.
+ * - This hook uses a **Proxy-based tracking mechanism** to detect which parts of the state are accessed during render.
+ * - The component will only re-render when the **accessed values actually change**.
+ * - State must be treated as **immutable**:
+ *   - Updates must replace objects rather than mutate them
+ *   - Otherwise, changes may not be detected
+ * - No selector or memoization is needed.
  *
  * @example
- * const count = useStoreState(store, (s) => s.count);
+ * const state = useStoreState(store);
+ * return <div>{state.user.name}</div>;
+ * // Component will only re-render if `user.name` changes
  */
-export declare const useStoreState: <TState extends Record<string, any>, TStateSlice = TState>(store: StoreApi<TState>, selector?: (state: TState) => TStateSlice) => TStateSlice;
+export declare const useStoreState: <TState extends Record<string, any>>(storeState: TState, subscribe: StoreApi<TState>["subscribe"]) => TState;
+export {};

package/esm/react.d.mts

@@ -1,5 +1,5 @@
 export * from './react/use-isomorphic-layout-effect.mjs';
-export * from './react/use-store.mjs';
+export { useStoreState } from './react/use-store.mjs';
 export * from './react/create-store.mjs';
 export * from './react/create-stores.mjs';
 export * from './react/create-query.mjs';

package/esm/react.mjs

@@ -1,30 +1,75 @@
-import { useLayoutEffect, useEffect, useState, useRef } from 'react';
-import { isClient, identity, shallow, initStore, getHash, noop } from 'floppy-disk/vanilla';
+import { useLayoutEffect, useEffect, useState, useRef, useMemo } from 'react';
+import { isClient, initStore, getHash, noop } from 'floppy-disk/vanilla';
 
 const useIsomorphicLayoutEffect = isClient ? useLayoutEffect : useEffect;
 
-const useStoreUpdateNotifier = (store, selector) => {
-  const [, reRender] = useState({});
-  const selectorRef = useRef(selector);
-  selectorRef.current = selector;
-  useIsomorphicLayoutEffect(
-    () => store.subscribe((state, prevState) => {
-      if (selectorRef.current === identity) return reRender({});
-      const prevSlice = selectorRef.current(prevState);
-      const nextSlice = selectorRef.current(state);
-      if (!shallow(prevSlice, nextSlice)) reRender({});
-    }),
-    [store]
-  );
+const getValueByPath = (obj, path) => path.reduce((acc, key) => acc == null ? void 0 : acc[key], obj);
+const isPrefixPath = (candidatePrefix, targetPath) => {
+  if (candidatePrefix.length >= targetPath.length) return false;
+  for (let i = 0; i < candidatePrefix.length; i++) {
+    if (candidatePrefix[i] !== targetPath[i]) return false;
+  }
+  return true;
+};
+const compressPaths = (paths) => {
+  const result = [];
+  let prev = null;
+  for (let i = paths.length - 1; i >= 0; i--) {
+    const current = paths[i];
+    if (!prev || !isPrefixPath(current, prev)) result.push(current);
+    prev = current;
+  }
+  return result;
 };
-const useStoreState = (store, selector = identity) => {
-  useStoreUpdateNotifier(store, selector);
-  return selector(store.getState());
+const useStoreStateProxy = (storeState) => {
+  const usedPathsRef = useRef([]);
+  usedPathsRef.current = [];
+  const trackedState = useMemo(() => {
+    const track = (path) => usedPathsRef.current.push(path);
+    const proxyCache = /* @__PURE__ */ new WeakMap();
+    const createDeepProxy = (target, path = []) => {
+      if (typeof target !== "object" || target === null) {
+        return target;
+      }
+      if (proxyCache.has(target)) {
+        return proxyCache.get(target);
+      }
+      const proxy = new Proxy(target, {
+        get(obj, key) {
+          const newPath = [...path, key];
+          track(newPath);
+          const value = obj[key];
+          return createDeepProxy(value, newPath);
+        }
+      });
+      proxyCache.set(target, proxy);
+      return proxy;
+    };
+    return createDeepProxy(storeState);
+  }, [storeState]);
+  return [trackedState, usedPathsRef];
+};
+const useStoreState = (storeState, subscribe) => {
+  const [trackedState, usedPathsRef] = useStoreStateProxy(storeState);
+  const [, reRender] = useState({});
+  useIsomorphicLayoutEffect(() => {
+    return subscribe((nextState, prevState, changedKeys) => {
+      const paths = compressPaths(usedPathsRef.current);
+      for (const path of paths) {
+        const rootKey = path[0];
+        if (!changedKeys.includes(rootKey)) continue;
+        const prevVal = getValueByPath(prevState, path);
+        const nextVal = getValueByPath(nextState, path);
+        if (!Object.is(prevVal, nextVal)) return reRender({});
+      }
+    });
+  }, [subscribe]);
+  return trackedState;
 };
 
 const createStore = (initialState, options) => {
   const store = initStore(initialState, options);
-  const useStore = (selector) => useStoreState(store, selector);
+  const useStore = () => useStoreState(store.getState(), store.subscribe);
   return Object.assign(useStore, store);
 };
 
@@ -39,9 +84,7 @@ const createStores = (initialState, options) => {
       store = initStore(initialState, options);
       stores.set(keyHash, store);
     }
-    const useStore = (selector) => {
-      return useStoreState(store, selector);
-    };
+    const useStore = () => useStoreState(store.getState(), store.subscribe);
     return Object.assign(useStore, {
       ...store,
       delete: () => {
@@ -323,30 +366,51 @@ const createQuery = (queryFn, options = {}) => {
       stores.set(variableHash, store);
       internals.set(store, configureInternals(store, variable, variableHash));
     }
-    function useStore(optionsOrSelector = {}, maybeSelector) {
-      let selector;
-      let options2;
-      if (typeof optionsOrSelector === "function") {
-        options2 = {};
-        selector = optionsOrSelector;
-      } else {
-        options2 = optionsOrSelector;
-        selector = maybeSelector || identity;
-      }
-      useStoreUpdateNotifier(store, selector);
-      useIsomorphicLayoutEffect(() => {
-        if (options2.enabled !== false) revalidate(store, variable, false);
-      }, [store, options2.enabled]);
+    const useStore = (options2 = {}) => {
+      const { enabled = true, keepPreviousData } = options2;
       const storeState = store.getState();
-      let storeStateToBeUsed = storeState;
       const prevState = useRef({});
-      if (storeState.isSuccess) {
-        prevState.current = { data: storeState.data, dataUpdatedAt: storeState.dataUpdatedAt };
-      } else if (storeState.state === "INITIAL" && options2.keepPreviousData) {
+      let storeStateToBeUsed = storeState;
+      if (storeState.state !== "INITIAL") {
+        prevState.current = {
+          data: storeState.data,
+          dataUpdatedAt: storeState.dataUpdatedAt
+        };
+      } else if (keepPreviousData) {
         storeStateToBeUsed = { ...storeState, ...prevState.current };
       }
-      return selector(storeStateToBeUsed);
-    }
+      const [trackedState, usedPathsRef] = useStoreStateProxy(
+        enabled && storeState.state === "INITIAL" ? (
+          // Optimize rendering on initial state
+          // Do { isPending: true } → result
+          // instead of { isPending: false } → { isPending: true } → result
+          { ...storeStateToBeUsed, isPending: true }
+        ) : storeStateToBeUsed
+      );
+      const [, reRender] = useState({});
+      useIsomorphicLayoutEffect(() => {
+        return store.subscribe((nextState, prevState2, changedKeys) => {
+          if (prevState2.state === "INITIAL" && !prevState2.isPending && nextState.isPending) {
+            return;
+          }
+          const paths = compressPaths(usedPathsRef.current);
+          for (const path of paths) {
+            const rootKey = path[0];
+            if (!changedKeys.includes(rootKey)) continue;
+            const prevVal = getValueByPath(prevState2, path);
+            const nextVal = getValueByPath(nextState, path);
+            if (!Object.is(prevVal, nextVal)) return reRender({});
+          }
+        });
+      }, [store]);
+      useIsomorphicLayoutEffect(() => {
+        if (enabled !== false) revalidate(store, variable, false);
+      }, [store, enabled]);
+      if (keepPreviousData) {
+        !!trackedState.error;
+      }
+      return trackedState;
+    };
     return Object.assign(useStore, {
       subscribe: store.subscribe,
       getSubscribers: store.getSubscribers,
@@ -417,7 +481,7 @@ const createMutation = (mutationFn, options = {}) => {
   const { onSuccess = noop, onError, onSettled = noop } = options;
   const initialState = INITIAL_STATE;
   const store = initStore(initialState, options);
-  const useStore = (selector) => useStoreState(store, selector);
+  const useStore = () => useStoreState(store.getState(), store.subscribe);
   const execute = (variable) => {
     const stateBeforeExecute = store.getState();
     if (stateBeforeExecute.isPending) {
@@ -509,4 +573,4 @@ const createMutation = (mutationFn, options = {}) => {
   });
 };
 
-export { createMutation, createQuery, createStore, createStores, useIsomorphicLayoutEffect, useStoreState, useStoreUpdateNotifier };
+export { createMutation, createQuery, createStore, createStores, useIsomorphicLayoutEffect, useStoreState };

package/esm/vanilla/basic.d.mts

@@ -6,14 +6,6 @@ export declare const isClient: boolean;
  * Empty function.
  */
 export declare const noop: () => void;
-/**
- * Identity function.
- *
- * It accepts 1 argument, and simply return it.
- *
- * `const identity = value => value`
- */
-export declare const identity: <T>(value: T) => T;
 /**
  * If the value is a function, it will invoke the function.\
  * If the value is not a function, it will just return it.