floppy-disk 2.0.2 → 2.1.0-beta.2

package/esm/index.d.ts

@@ -1,2 +1,3 @@
+export { hashStoreKey } from './utils';
 export * from './vanilla';
 export * from './react';

package/esm/index.js

@@ -1,2 +1,3 @@
+export { hashStoreKey } from './utils';
 export * from './vanilla';
 export * from './react';

package/esm/preact/create-query.d.ts

@@ -4,6 +4,10 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * Query store key, an object that will be hashed into a string as a query store identifier.
      */
     key: TKey;
+    /**
+     * Query store key hash, a string used as a query store identifier.
+     */
+    keyHash: string;
     /**
      * Will only be called if the data is stale or empty.
      */

package/esm/preact/create-query.js

@@ -1,5 +1,5 @@
 import { useState } from 'preact/hooks';
-import { hashStoreKey, identityFn, noop } from '../utils';
+import { hasValue, identityFn, noop } from '../utils';
 import { createStores } from './create-stores';
 const getDecision = (value, param, { ifTrue, ifAlways }) => {
     if (value === true || (typeof value === 'function' && value(param) === true)) {
@@ -9,7 +9,6 @@ const getDecision = (value, param, { ifTrue, ifAlways }) => {
         ifAlways();
     }
 };
-const DEFAULT_STALE_TIME = 3000; // 3 seconds
 const INITIAL_QUERY_STATE = {
     isWaiting: false,
     isWaitingNextPage: false,
@@ -41,11 +40,13 @@ const useQueryDefaultDeps = (state) => [
     state.hasNextPage,
 ];
 export const createQuery = (queryFn, options = {}) => {
-    const { onFirstSubscribe = noop, onSubscribe = noop, onLastUnsubscribe = noop, onBeforeChangeKey = noop, defaultDeps = useQueryDefaultDeps, select = identityFn, staleTime = DEFAULT_STALE_TIME, fetchOnMount = true, fetchOnWindowFocus = true, enabled = true, retry = 1, retryDelay = 3000, keepPreviousData, getNextPageParam = () => undefined, onSuccess = noop, onError = noop, onSettled = noop, hashKeyFn = hashStoreKey, ...createStoresOptions } = options;
+    const { onFirstSubscribe = noop, onSubscribe = noop, onLastUnsubscribe = noop, onBeforeChangeKey = noop, defaultDeps = useQueryDefaultDeps, select = identityFn, staleTime = 3000, // 3 seconds
+    fetchOnMount = true, fetchOnWindowFocus = true, enabled = true, retry = 1, retryDelay = 3000, // 3 seconds
+    keepPreviousData, getNextPageParam = () => undefined, onSuccess = noop, onError = noop, onSettled = noop, ...createStoresOptions } = options;
     const retryTimeoutId = new Map();
     const retryNextPageTimeoutId = new Map();
     const preventReplaceResponse = new Map(); // Prevent optimistic data to be replaced
-    const useQuery = createStores(({ key: _key, get, set }) => {
+    const useQuery = createStores(({ get, set, key: _key, keyHash }) => {
         const key = _key;
         const getRetryProps = (error, retryCount) => {
             const maxRetryCount = (typeof retry === 'function' ? retry(error, key) : retry) || 0;
@@ -70,20 +71,20 @@ export const createQuery = (queryFn, options = {}) => {
                         set({ isGoingToRetry: false, isWaiting: true });
                     else
                         set({ isGoingToRetry: false, isWaiting: true, isRefetching: true });
-                    clearTimeout(retryTimeoutId.get(hashKeyFn(key)));
+                    clearTimeout(retryTimeoutId.get(keyHash));
                 }
                 const stateBeforeCallQuery = { ...get(), pageParam };
-                preventReplaceResponse.set(hashKeyFn(key), false);
+                preventReplaceResponse.set(keyHash, false);
                 queryFn(key, stateBeforeCallQuery)
                     .then((response) => {
-                    if (preventReplaceResponse.get(hashKeyFn(key))) {
+                    if (preventReplaceResponse.get(keyHash)) {
                         set({ isWaiting: false });
                         return;
                     }
                     responseAllPages.push(response);
                     const newPageParam = getNextPageParam(response, responseAllPages.length);
                     newPageParams.push(newPageParam);
-                    if (newPageParam !== undefined && newPageParams.length < pageParams.length) {
+                    if (hasValue(newPageParam) && newPageParams.length < pageParams.length) {
                         pageParam = newPageParam;
                         callQuery();
                         return;
@@ -108,7 +109,7 @@ export const createQuery = (queryFn, options = {}) => {
                         retryCount: 0,
                         pageParam: newPageParam,
                         pageParams: newPageParams,
-                        hasNextPage: newPageParam !== undefined,
+                        hasNextPage: hasValue(newPageParam),
                     });
                     onSuccess(response, stateBeforeCallQuery);
                 })
@@ -130,7 +131,7 @@ export const createQuery = (queryFn, options = {}) => {
                             errorUpdatedAt,
                             isGoingToRetry: shouldRetry,
                             pageParam,
-                            hasNextPage: pageParam !== undefined,
+                            hasNextPage: hasValue(pageParam),
                         }
                         : {
                             isWaiting: false,
@@ -141,10 +142,10 @@ export const createQuery = (queryFn, options = {}) => {
                             errorUpdatedAt,
                             isGoingToRetry: shouldRetry,
                             pageParam,
-                            hasNextPage: pageParam !== undefined,
+                            hasNextPage: hasValue(pageParam),
                         });
                     if (shouldRetry) {
-                        retryTimeoutId.set(hashKeyFn(key), window.setTimeout(() => {
+                        retryTimeoutId.set(keyHash, window.setTimeout(() => {
                             set({ retryCount: prevState.retryCount + 1 });
                             callQuery();
                         }, delay));
@@ -172,7 +173,7 @@ export const createQuery = (queryFn, options = {}) => {
             if (isWaitingNextPage || !hasNextPage)
                 return;
             set({ isWaitingNextPage: true, isGoingToRetryNextPage: false });
-            clearTimeout(retryNextPageTimeoutId.get(hashKeyFn(key)));
+            clearTimeout(retryNextPageTimeoutId.get(keyHash));
             queryFn(key, { ...state, pageParam })
                 .then((response) => {
                 const newPageParam = getNextPageParam(response, pageParams.length);
@@ -183,7 +184,7 @@ export const createQuery = (queryFn, options = {}) => {
                     data: select(response, { key, data }),
                     pageParam: newPageParam,
                     pageParams: pageParams.concat(newPageParam),
-                    hasNextPage: newPageParam !== undefined,
+                    hasNextPage: hasValue(newPageParam),
                 });
             })
                 .catch((error) => {
@@ -197,7 +198,7 @@ export const createQuery = (queryFn, options = {}) => {
                     isGoingToRetryNextPage: shouldRetry,
                 });
                 if (shouldRetry) {
-                    retryNextPageTimeoutId.set(hashKeyFn(key), window.setTimeout(() => {
+                    retryNextPageTimeoutId.set(keyHash, window.setTimeout(() => {
                         set({ retryNextPageCount: prevState.retryNextPageCount + 1 });
                         fetchNextPage();
                     }, delay));
@@ -207,6 +208,7 @@ export const createQuery = (queryFn, options = {}) => {
         return {
             ...INITIAL_QUERY_STATE,
             key,
+            keyHash,
             fetch,
             forceFetch,
             fetchNextPage,
@@ -225,7 +227,6 @@ export const createQuery = (queryFn, options = {}) => {
         return {
             ...createStoresOptions,
             defaultDeps,
-            hashKeyFn,
             onFirstSubscribe: (state) => {
                 if (typeof window !== 'undefined' && fetchOnWindowFocus) {
                     window.addEventListener('focus', fetchWindowFocusHandler);
@@ -244,8 +245,8 @@ export const createQuery = (queryFn, options = {}) => {
                     window.removeEventListener('focus', fetchWindowFocusHandler);
                 }
                 useQuery.set(state.key, { retryCount: 0, retryNextPageCount: 0 }, true);
-                clearTimeout(retryTimeoutId.get(hashKeyFn(state.key)));
-                clearTimeout(retryNextPageTimeoutId.get(hashKeyFn(state.key)));
+                clearTimeout(retryTimeoutId.get(state.keyHash));
+                clearTimeout(retryNextPageTimeoutId.get(state.keyHash));
                 onLastUnsubscribe(state);
             },
             onBeforeChangeKey: (nextKey, prevKey) => {
@@ -286,7 +287,7 @@ export const createQuery = (queryFn, options = {}) => {
                 data: select(response, { key: key, data: null }),
                 pageParam: newPageParam,
                 pageParams: [undefined, newPageParam],
-                hasNextPage: newPageParam !== undefined,
+                hasNextPage: hasValue(newPageParam),
             });
         });
     };
@@ -323,7 +324,7 @@ export const createQuery = (queryFn, options = {}) => {
             response: optimisticResponse,
             data: select(optimisticResponse, { key: key, data: null }),
         });
-        preventReplaceResponse.set(hashKeyFn(key), true);
+        preventReplaceResponse.set(prevState.keyHash, true);
         const revert = () => {
             useQuery.set(key, {
                 isOptimisticData: false,

package/esm/preact/create-stores.d.ts

@@ -3,9 +3,10 @@ import { WatchProps } from './create-store';
 type Maybe<T> = T | null | undefined;
 export type StoreKey = Record<string, any> | undefined;
 export type StoresInitializer<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = (api: {
-    key: TKey;
     get: () => T;
     set: (value: SetStoreData<T>, silent?: boolean) => void;
+    key: TKey;
+    keyHash: string;
 }) => T;
 export type UseStores<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = {
     /**
@@ -38,6 +39,10 @@ export type UseStores<TKey extends StoreKey = StoreKey, T extends StoreData = St
 };
 export type CreateStoresOptions<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = InitStoreOptions<T> & {
     onBeforeChangeKey?: (nextKey: TKey, prevKey: TKey) => void;
+    /**
+     * Will be triggered when a single store with a specific key was initialized.
+     */
+    onStoreInitialized?: (key: TKey, keyHash: string) => void;
     defaultDeps?: SelectDeps<T>;
     hashKeyFn?: (obj: TKey) => string;
 };

package/esm/preact/create-stores.js

@@ -2,15 +2,16 @@ import { useEffect, useMemo, useRef, useState } from 'preact/hooks';
 import { hashStoreKey, noop } from '../utils';
 import { initStore, } from '../vanilla';
 export const createStores = (initializer, options = {}) => {
-    const { onBeforeChangeKey = noop, defaultDeps, hashKeyFn = hashStoreKey } = options;
+    const { onBeforeChangeKey = noop, onStoreInitialized = noop, defaultDeps, hashKeyFn = hashStoreKey, } = options;
     const stores = new Map();
     const getStore = (_key) => {
         const key = _key || {};
-        const normalizedKey = hashKeyFn(key);
-        if (!stores.has(normalizedKey)) {
-            stores.set(normalizedKey, initStore((api) => initializer({ key, ...api }), options));
+        const keyHash = hashKeyFn(key);
+        if (!stores.has(keyHash)) {
+            stores.set(keyHash, initStore((api) => initializer({ key, keyHash, ...api }), options));
+            onStoreInitialized(key, keyHash);
         }
-        return stores.get(normalizedKey);
+        return stores.get(keyHash);
     };
     /**
      * IMPORTANT NOTE: selectDeps function must not be changed after initialization.
@@ -18,9 +19,9 @@ export const createStores = (initializer, options = {}) => {
     const useStores = (...args) => {
         const [_key, selectDeps = defaultDeps] = (typeof args[0] === 'function' ? [{}, args[0]] : args);
         const key = _key || {};
-        const normalizedKey = hashKeyFn(key);
+        const keyHash = hashKeyFn(key);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-        const { get, subscribe } = useMemo(() => getStore(key), [normalizedKey]);
+        const { get, subscribe } = useMemo(() => getStore(key), [keyHash]);
         const [state, setState] = useState(get);
         const isFirstRender = useRef(true);
         const prevKey = useRef(key);
@@ -34,7 +35,7 @@ export const createStores = (initializer, options = {}) => {
             const unsubs = subscribe(setState, selectDeps);
             return unsubs;
             // eslint-disable-next-line react-hooks/exhaustive-deps
-        }, [normalizedKey]);
+        }, [keyHash]);
         return state;
     };
     useStores.get = (key) => {

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

@@ -4,6 +4,10 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * Query store key, an object that will be hashed into a string as a query store identifier.
      */
     key: TKey;
+    /**
+     * Query store key hash, a string used as a query store identifier.
+     */
+    keyHash: string;
     /**
      * Will only be called if the data is stale or empty.
      */

package/esm/react/create-query.js

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { hashStoreKey, identityFn, noop } from '../utils';
+import { hasValue, identityFn, noop } from '../utils';
 import { createStores } from './create-stores';
 const getDecision = (value, param, { ifTrue, ifAlways }) => {
     if (value === true || (typeof value === 'function' && value(param) === true)) {
@@ -9,7 +9,6 @@ const getDecision = (value, param, { ifTrue, ifAlways }) => {
         ifAlways();
     }
 };
-const DEFAULT_STALE_TIME = 3000; // 3 seconds
 const INITIAL_QUERY_STATE = {
     isWaiting: false,
     isWaitingNextPage: false,
@@ -41,11 +40,13 @@ const useQueryDefaultDeps = (state) => [
     state.hasNextPage,
 ];
 export const createQuery = (queryFn, options = {}) => {
-    const { onFirstSubscribe = noop, onSubscribe = noop, onLastUnsubscribe = noop, onBeforeChangeKey = noop, defaultDeps = useQueryDefaultDeps, select = identityFn, staleTime = DEFAULT_STALE_TIME, fetchOnMount = true, fetchOnWindowFocus = true, enabled = true, retry = 1, retryDelay = 3000, keepPreviousData, getNextPageParam = () => undefined, onSuccess = noop, onError = noop, onSettled = noop, hashKeyFn = hashStoreKey, ...createStoresOptions } = options;
+    const { onFirstSubscribe = noop, onSubscribe = noop, onLastUnsubscribe = noop, onBeforeChangeKey = noop, defaultDeps = useQueryDefaultDeps, select = identityFn, staleTime = 3000, // 3 seconds
+    fetchOnMount = true, fetchOnWindowFocus = true, enabled = true, retry = 1, retryDelay = 3000, // 3 seconds
+    keepPreviousData, getNextPageParam = () => undefined, onSuccess = noop, onError = noop, onSettled = noop, ...createStoresOptions } = options;
     const retryTimeoutId = new Map();
     const retryNextPageTimeoutId = new Map();
     const preventReplaceResponse = new Map(); // Prevent optimistic data to be replaced
-    const useQuery = createStores(({ key: _key, get, set }) => {
+    const useQuery = createStores(({ get, set, key: _key, keyHash }) => {
         const key = _key;
         const getRetryProps = (error, retryCount) => {
             const maxRetryCount = (typeof retry === 'function' ? retry(error, key) : retry) || 0;
@@ -70,20 +71,20 @@ export const createQuery = (queryFn, options = {}) => {
                         set({ isGoingToRetry: false, isWaiting: true });
                     else
                         set({ isGoingToRetry: false, isWaiting: true, isRefetching: true });
-                    clearTimeout(retryTimeoutId.get(hashKeyFn(key)));
+                    clearTimeout(retryTimeoutId.get(keyHash));
                 }
                 const stateBeforeCallQuery = { ...get(), pageParam };
-                preventReplaceResponse.set(hashKeyFn(key), false);
+                preventReplaceResponse.set(keyHash, false);
                 queryFn(key, stateBeforeCallQuery)
                     .then((response) => {
-                    if (preventReplaceResponse.get(hashKeyFn(key))) {
+                    if (preventReplaceResponse.get(keyHash)) {
                         set({ isWaiting: false });
                         return;
                     }
                     responseAllPages.push(response);
                     const newPageParam = getNextPageParam(response, responseAllPages.length);
                     newPageParams.push(newPageParam);
-                    if (newPageParam !== undefined && newPageParams.length < pageParams.length) {
+                    if (hasValue(newPageParam) && newPageParams.length < pageParams.length) {
                         pageParam = newPageParam;
                         callQuery();
                         return;
@@ -108,7 +109,7 @@ export const createQuery = (queryFn, options = {}) => {
                         retryCount: 0,
                         pageParam: newPageParam,
                         pageParams: newPageParams,
-                        hasNextPage: newPageParam !== undefined,
+                        hasNextPage: hasValue(newPageParam),
                     });
                     onSuccess(response, stateBeforeCallQuery);
                 })
@@ -130,7 +131,7 @@ export const createQuery = (queryFn, options = {}) => {
                             errorUpdatedAt,
                             isGoingToRetry: shouldRetry,
                             pageParam,
-                            hasNextPage: pageParam !== undefined,
+                            hasNextPage: hasValue(pageParam),
                         }
                         : {
                             isWaiting: false,
@@ -141,10 +142,10 @@ export const createQuery = (queryFn, options = {}) => {
                             errorUpdatedAt,
                             isGoingToRetry: shouldRetry,
                             pageParam,
-                            hasNextPage: pageParam !== undefined,
+                            hasNextPage: hasValue(pageParam),
                         });
                     if (shouldRetry) {
-                        retryTimeoutId.set(hashKeyFn(key), window.setTimeout(() => {
+                        retryTimeoutId.set(keyHash, window.setTimeout(() => {
                             set({ retryCount: prevState.retryCount + 1 });
                             callQuery();
                         }, delay));
@@ -172,7 +173,7 @@ export const createQuery = (queryFn, options = {}) => {
             if (isWaitingNextPage || !hasNextPage)
                 return;
             set({ isWaitingNextPage: true, isGoingToRetryNextPage: false });
-            clearTimeout(retryNextPageTimeoutId.get(hashKeyFn(key)));
+            clearTimeout(retryNextPageTimeoutId.get(keyHash));
             queryFn(key, { ...state, pageParam })
                 .then((response) => {
                 const newPageParam = getNextPageParam(response, pageParams.length);
@@ -183,7 +184,7 @@ export const createQuery = (queryFn, options = {}) => {
                     data: select(response, { key, data }),
                     pageParam: newPageParam,
                     pageParams: pageParams.concat(newPageParam),
-                    hasNextPage: newPageParam !== undefined,
+                    hasNextPage: hasValue(newPageParam),
                 });
             })
                 .catch((error) => {
@@ -197,7 +198,7 @@ export const createQuery = (queryFn, options = {}) => {
                     isGoingToRetryNextPage: shouldRetry,
                 });
                 if (shouldRetry) {
-                    retryNextPageTimeoutId.set(hashKeyFn(key), window.setTimeout(() => {
+                    retryNextPageTimeoutId.set(keyHash, window.setTimeout(() => {
                         set({ retryNextPageCount: prevState.retryNextPageCount + 1 });
                         fetchNextPage();
                     }, delay));
@@ -207,6 +208,7 @@ export const createQuery = (queryFn, options = {}) => {
         return {
             ...INITIAL_QUERY_STATE,
             key,
+            keyHash,
             fetch,
             forceFetch,
             fetchNextPage,
@@ -225,7 +227,6 @@ export const createQuery = (queryFn, options = {}) => {
         return {
             ...createStoresOptions,
             defaultDeps,
-            hashKeyFn,
             onFirstSubscribe: (state) => {
                 if (typeof window !== 'undefined' && fetchOnWindowFocus) {
                     window.addEventListener('focus', fetchWindowFocusHandler);
@@ -244,8 +245,8 @@ export const createQuery = (queryFn, options = {}) => {
                     window.removeEventListener('focus', fetchWindowFocusHandler);
                 }
                 useQuery.set(state.key, { retryCount: 0, retryNextPageCount: 0 }, true);
-                clearTimeout(retryTimeoutId.get(hashKeyFn(state.key)));
-                clearTimeout(retryNextPageTimeoutId.get(hashKeyFn(state.key)));
+                clearTimeout(retryTimeoutId.get(state.keyHash));
+                clearTimeout(retryNextPageTimeoutId.get(state.keyHash));
                 onLastUnsubscribe(state);
             },
             onBeforeChangeKey: (nextKey, prevKey) => {
@@ -286,7 +287,7 @@ export const createQuery = (queryFn, options = {}) => {
                 data: select(response, { key: key, data: null }),
                 pageParam: newPageParam,
                 pageParams: [undefined, newPageParam],
-                hasNextPage: newPageParam !== undefined,
+                hasNextPage: hasValue(newPageParam),
             });
         });
     };
@@ -323,7 +324,7 @@ export const createQuery = (queryFn, options = {}) => {
             response: optimisticResponse,
             data: select(optimisticResponse, { key: key, data: null }),
         });
-        preventReplaceResponse.set(hashKeyFn(key), true);
+        preventReplaceResponse.set(prevState.keyHash, true);
         const revert = () => {
             useQuery.set(key, {
                 isOptimisticData: false,

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

@@ -3,9 +3,10 @@ import { WatchProps } from './create-store';
 type Maybe<T> = T | null | undefined;
 export type StoreKey = Record<string, any> | undefined;
 export type StoresInitializer<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = (api: {
-    key: TKey;
     get: () => T;
     set: (value: SetStoreData<T>, silent?: boolean) => void;
+    key: TKey;
+    keyHash: string;
 }) => T;
 export type UseStores<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = {
     /**
@@ -38,6 +39,10 @@ export type UseStores<TKey extends StoreKey = StoreKey, T extends StoreData = St
 };
 export type CreateStoresOptions<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = InitStoreOptions<T> & {
     onBeforeChangeKey?: (nextKey: TKey, prevKey: TKey) => void;
+    /**
+     * Will be triggered when a single store with a specific key was initialized.
+     */
+    onStoreInitialized?: (key: TKey, keyHash: string) => void;
     defaultDeps?: SelectDeps<T>;
     hashKeyFn?: (obj: TKey) => string;
 };

package/esm/react/create-stores.js

@@ -2,15 +2,16 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 import { hashStoreKey, noop } from '../utils';
 import { initStore, } from '../vanilla';
 export const createStores = (initializer, options = {}) => {
-    const { onBeforeChangeKey = noop, defaultDeps, hashKeyFn = hashStoreKey } = options;
+    const { onBeforeChangeKey = noop, onStoreInitialized = noop, defaultDeps, hashKeyFn = hashStoreKey, } = options;
     const stores = new Map();
     const getStore = (_key) => {
         const key = _key || {};
-        const normalizedKey = hashKeyFn(key);
-        if (!stores.has(normalizedKey)) {
-            stores.set(normalizedKey, initStore((api) => initializer({ key, ...api }), options));
+        const keyHash = hashKeyFn(key);
+        if (!stores.has(keyHash)) {
+            stores.set(keyHash, initStore((api) => initializer({ key, keyHash, ...api }), options));
+            onStoreInitialized(key, keyHash);
         }
-        return stores.get(normalizedKey);
+        return stores.get(keyHash);
     };
     /**
      * IMPORTANT NOTE: selectDeps function must not be changed after initialization.
@@ -18,9 +19,9 @@ export const createStores = (initializer, options = {}) => {
     const useStores = (...args) => {
         const [_key, selectDeps = defaultDeps] = (typeof args[0] === 'function' ? [{}, args[0]] : args);
         const key = _key || {};
-        const normalizedKey = hashKeyFn(key);
+        const keyHash = hashKeyFn(key);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-        const { get, subscribe } = useMemo(() => getStore(key), [normalizedKey]);
+        const { get, subscribe } = useMemo(() => getStore(key), [keyHash]);
         const [state, setState] = useState(get);
         const isFirstRender = useRef(true);
         const prevKey = useRef(key);
@@ -34,7 +35,7 @@ export const createStores = (initializer, options = {}) => {
             const unsubs = subscribe(setState, selectDeps);
             return unsubs;
             // eslint-disable-next-line react-hooks/exhaustive-deps
-        }, [normalizedKey]);
+        }, [keyHash]);
         return state;
     };
     useStores.get = (key) => {

package/esm/utils/index.d.ts

@@ -1,3 +1,4 @@
 export declare const noop: () => void;
-export declare const identityFn: <T>(a: T) => T;
+export declare const identityFn: <T>(value: T) => T;
+export declare const hasValue: (value: any) => boolean;
 export declare const hashStoreKey: (obj?: any) => string;

package/esm/utils/index.js

@@ -1,3 +1,4 @@
 export const noop = () => { };
-export const identityFn = (a) => a;
+export const identityFn = (value) => value;
+export const hasValue = (value) => value !== undefined && value !== null;
 export const hashStoreKey = (obj) => JSON.stringify(obj, Object.keys(obj).sort());

package/lib/index.d.ts

@@ -1,2 +1,3 @@
+export { hashStoreKey } from './utils';
 export * from './vanilla';
 export * from './react';

package/lib/index.js

@@ -1,5 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.hashStoreKey = void 0;
 const tslib_1 = require("tslib");
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "hashStoreKey", { enumerable: true, get: function () { return utils_1.hashStoreKey; } });
 tslib_1.__exportStar(require("./vanilla"), exports);
 tslib_1.__exportStar(require("./react"), exports);

package/lib/preact/create-query.d.ts

@@ -4,6 +4,10 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * Query store key, an object that will be hashed into a string as a query store identifier.
      */
     key: TKey;
+    /**
+     * Query store key hash, a string used as a query store identifier.
+     */
+    keyHash: string;
     /**
      * Will only be called if the data is stale or empty.
      */

package/lib/preact/create-query.js

@@ -12,7 +12,6 @@ const getDecision = (value, param, { ifTrue, ifAlways }) => {
         ifAlways();
     }
 };
-const DEFAULT_STALE_TIME = 3000; // 3 seconds
 const INITIAL_QUERY_STATE = {
     isWaiting: false,
     isWaitingNextPage: false,
@@ -44,11 +43,13 @@ const useQueryDefaultDeps = (state) => [
     state.hasNextPage,
 ];
 const createQuery = (queryFn, options = {}) => {
-    const { onFirstSubscribe = utils_1.noop, onSubscribe = utils_1.noop, onLastUnsubscribe = utils_1.noop, onBeforeChangeKey = utils_1.noop, defaultDeps = useQueryDefaultDeps, select = utils_1.identityFn, staleTime = DEFAULT_STALE_TIME, fetchOnMount = true, fetchOnWindowFocus = true, enabled = true, retry = 1, retryDelay = 3000, keepPreviousData, getNextPageParam = () => undefined, onSuccess = utils_1.noop, onError = utils_1.noop, onSettled = utils_1.noop, hashKeyFn = utils_1.hashStoreKey, ...createStoresOptions } = options;
+    const { onFirstSubscribe = utils_1.noop, onSubscribe = utils_1.noop, onLastUnsubscribe = utils_1.noop, onBeforeChangeKey = utils_1.noop, defaultDeps = useQueryDefaultDeps, select = utils_1.identityFn, staleTime = 3000, // 3 seconds
+    fetchOnMount = true, fetchOnWindowFocus = true, enabled = true, retry = 1, retryDelay = 3000, // 3 seconds
+    keepPreviousData, getNextPageParam = () => undefined, onSuccess = utils_1.noop, onError = utils_1.noop, onSettled = utils_1.noop, ...createStoresOptions } = options;
     const retryTimeoutId = new Map();
     const retryNextPageTimeoutId = new Map();
     const preventReplaceResponse = new Map(); // Prevent optimistic data to be replaced
-    const useQuery = (0, create_stores_1.createStores)(({ key: _key, get, set }) => {
+    const useQuery = (0, create_stores_1.createStores)(({ get, set, key: _key, keyHash }) => {
         const key = _key;
         const getRetryProps = (error, retryCount) => {
             const maxRetryCount = (typeof retry === 'function' ? retry(error, key) : retry) || 0;
@@ -73,20 +74,20 @@ const createQuery = (queryFn, options = {}) => {
                         set({ isGoingToRetry: false, isWaiting: true });
                     else
                         set({ isGoingToRetry: false, isWaiting: true, isRefetching: true });
-                    clearTimeout(retryTimeoutId.get(hashKeyFn(key)));
+                    clearTimeout(retryTimeoutId.get(keyHash));
                 }
                 const stateBeforeCallQuery = { ...get(), pageParam };
-                preventReplaceResponse.set(hashKeyFn(key), false);
+                preventReplaceResponse.set(keyHash, false);
                 queryFn(key, stateBeforeCallQuery)
                     .then((response) => {
-                    if (preventReplaceResponse.get(hashKeyFn(key))) {
+                    if (preventReplaceResponse.get(keyHash)) {
                         set({ isWaiting: false });
                         return;
                     }
                     responseAllPages.push(response);
                     const newPageParam = getNextPageParam(response, responseAllPages.length);
                     newPageParams.push(newPageParam);
-                    if (newPageParam !== undefined && newPageParams.length < pageParams.length) {
+                    if ((0, utils_1.hasValue)(newPageParam) && newPageParams.length < pageParams.length) {
                         pageParam = newPageParam;
                         callQuery();
                         return;
@@ -111,7 +112,7 @@ const createQuery = (queryFn, options = {}) => {
                         retryCount: 0,
                         pageParam: newPageParam,
                         pageParams: newPageParams,
-                        hasNextPage: newPageParam !== undefined,
+                        hasNextPage: (0, utils_1.hasValue)(newPageParam),
                     });
                     onSuccess(response, stateBeforeCallQuery);
                 })
@@ -133,7 +134,7 @@ const createQuery = (queryFn, options = {}) => {
                             errorUpdatedAt,
                             isGoingToRetry: shouldRetry,
                             pageParam,
-                            hasNextPage: pageParam !== undefined,
+                            hasNextPage: (0, utils_1.hasValue)(pageParam),
                         }
                         : {
                             isWaiting: false,
@@ -144,10 +145,10 @@ const createQuery = (queryFn, options = {}) => {
                             errorUpdatedAt,
                             isGoingToRetry: shouldRetry,
                             pageParam,
-                            hasNextPage: pageParam !== undefined,
+                            hasNextPage: (0, utils_1.hasValue)(pageParam),
                         });
                     if (shouldRetry) {
-                        retryTimeoutId.set(hashKeyFn(key), window.setTimeout(() => {
+                        retryTimeoutId.set(keyHash, window.setTimeout(() => {
                             set({ retryCount: prevState.retryCount + 1 });
                             callQuery();
                         }, delay));
@@ -175,7 +176,7 @@ const createQuery = (queryFn, options = {}) => {
             if (isWaitingNextPage || !hasNextPage)
                 return;
             set({ isWaitingNextPage: true, isGoingToRetryNextPage: false });
-            clearTimeout(retryNextPageTimeoutId.get(hashKeyFn(key)));
+            clearTimeout(retryNextPageTimeoutId.get(keyHash));
             queryFn(key, { ...state, pageParam })
                 .then((response) => {
                 const newPageParam = getNextPageParam(response, pageParams.length);
@@ -186,7 +187,7 @@ const createQuery = (queryFn, options = {}) => {
                     data: select(response, { key, data }),
                     pageParam: newPageParam,
                     pageParams: pageParams.concat(newPageParam),
-                    hasNextPage: newPageParam !== undefined,
+                    hasNextPage: (0, utils_1.hasValue)(newPageParam),
                 });
             })
                 .catch((error) => {
@@ -200,7 +201,7 @@ const createQuery = (queryFn, options = {}) => {
                     isGoingToRetryNextPage: shouldRetry,
                 });
                 if (shouldRetry) {
-                    retryNextPageTimeoutId.set(hashKeyFn(key), window.setTimeout(() => {
+                    retryNextPageTimeoutId.set(keyHash, window.setTimeout(() => {
                         set({ retryNextPageCount: prevState.retryNextPageCount + 1 });
                         fetchNextPage();
                     }, delay));
@@ -210,6 +211,7 @@ const createQuery = (queryFn, options = {}) => {
         return {
             ...INITIAL_QUERY_STATE,
             key,
+            keyHash,
             fetch,
             forceFetch,
             fetchNextPage,
@@ -228,7 +230,6 @@ const createQuery = (queryFn, options = {}) => {
         return {
             ...createStoresOptions,
             defaultDeps,
-            hashKeyFn,
             onFirstSubscribe: (state) => {
                 if (typeof window !== 'undefined' && fetchOnWindowFocus) {
                     window.addEventListener('focus', fetchWindowFocusHandler);
@@ -247,8 +248,8 @@ const createQuery = (queryFn, options = {}) => {
                     window.removeEventListener('focus', fetchWindowFocusHandler);
                 }
                 useQuery.set(state.key, { retryCount: 0, retryNextPageCount: 0 }, true);
-                clearTimeout(retryTimeoutId.get(hashKeyFn(state.key)));
-                clearTimeout(retryNextPageTimeoutId.get(hashKeyFn(state.key)));
+                clearTimeout(retryTimeoutId.get(state.keyHash));
+                clearTimeout(retryNextPageTimeoutId.get(state.keyHash));
                 onLastUnsubscribe(state);
             },
             onBeforeChangeKey: (nextKey, prevKey) => {
@@ -289,7 +290,7 @@ const createQuery = (queryFn, options = {}) => {
                 data: select(response, { key: key, data: null }),
                 pageParam: newPageParam,
                 pageParams: [undefined, newPageParam],
-                hasNextPage: newPageParam !== undefined,
+                hasNextPage: (0, utils_1.hasValue)(newPageParam),
             });
         });
     };
@@ -326,7 +327,7 @@ const createQuery = (queryFn, options = {}) => {
             response: optimisticResponse,
             data: select(optimisticResponse, { key: key, data: null }),
         });
-        preventReplaceResponse.set(hashKeyFn(key), true);
+        preventReplaceResponse.set(prevState.keyHash, true);
         const revert = () => {
             useQuery.set(key, {
                 isOptimisticData: false,

package/lib/preact/create-stores.d.ts

@@ -3,9 +3,10 @@ import { WatchProps } from './create-store';
 type Maybe<T> = T | null | undefined;
 export type StoreKey = Record<string, any> | undefined;
 export type StoresInitializer<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = (api: {
-    key: TKey;
     get: () => T;
     set: (value: SetStoreData<T>, silent?: boolean) => void;
+    key: TKey;
+    keyHash: string;
 }) => T;
 export type UseStores<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = {
     /**
@@ -38,6 +39,10 @@ export type UseStores<TKey extends StoreKey = StoreKey, T extends StoreData = St
 };
 export type CreateStoresOptions<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = InitStoreOptions<T> & {
     onBeforeChangeKey?: (nextKey: TKey, prevKey: TKey) => void;
+    /**
+     * Will be triggered when a single store with a specific key was initialized.
+     */
+    onStoreInitialized?: (key: TKey, keyHash: string) => void;
     defaultDeps?: SelectDeps<T>;
     hashKeyFn?: (obj: TKey) => string;
 };

package/lib/preact/create-stores.js

@@ -5,15 +5,16 @@ const hooks_1 = require("preact/hooks");
 const utils_1 = require("../utils");
 const vanilla_1 = require("../vanilla");
 const createStores = (initializer, options = {}) => {
-    const { onBeforeChangeKey = utils_1.noop, defaultDeps, hashKeyFn = utils_1.hashStoreKey } = options;
+    const { onBeforeChangeKey = utils_1.noop, onStoreInitialized = utils_1.noop, defaultDeps, hashKeyFn = utils_1.hashStoreKey, } = options;
     const stores = new Map();
     const getStore = (_key) => {
         const key = _key || {};
-        const normalizedKey = hashKeyFn(key);
-        if (!stores.has(normalizedKey)) {
-            stores.set(normalizedKey, (0, vanilla_1.initStore)((api) => initializer({ key, ...api }), options));
+        const keyHash = hashKeyFn(key);
+        if (!stores.has(keyHash)) {
+            stores.set(keyHash, (0, vanilla_1.initStore)((api) => initializer({ key, keyHash, ...api }), options));
+            onStoreInitialized(key, keyHash);
         }
-        return stores.get(normalizedKey);
+        return stores.get(keyHash);
     };
     /**
      * IMPORTANT NOTE: selectDeps function must not be changed after initialization.
@@ -21,9 +22,9 @@ const createStores = (initializer, options = {}) => {
     const useStores = (...args) => {
         const [_key, selectDeps = defaultDeps] = (typeof args[0] === 'function' ? [{}, args[0]] : args);
         const key = _key || {};
-        const normalizedKey = hashKeyFn(key);
+        const keyHash = hashKeyFn(key);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-        const { get, subscribe } = (0, hooks_1.useMemo)(() => getStore(key), [normalizedKey]);
+        const { get, subscribe } = (0, hooks_1.useMemo)(() => getStore(key), [keyHash]);
         const [state, setState] = (0, hooks_1.useState)(get);
         const isFirstRender = (0, hooks_1.useRef)(true);
         const prevKey = (0, hooks_1.useRef)(key);
@@ -37,7 +38,7 @@ const createStores = (initializer, options = {}) => {
             const unsubs = subscribe(setState, selectDeps);
             return unsubs;
             // eslint-disable-next-line react-hooks/exhaustive-deps
-        }, [normalizedKey]);
+        }, [keyHash]);
         return state;
     };
     useStores.get = (key) => {

package/lib/react/create-query.d.ts

@@ -4,6 +4,10 @@ export type QueryState<TKey extends StoreKey = StoreKey, TResponse = any, TData
      * Query store key, an object that will be hashed into a string as a query store identifier.
      */
     key: TKey;
+    /**
+     * Query store key hash, a string used as a query store identifier.
+     */
+    keyHash: string;
     /**
      * Will only be called if the data is stale or empty.
      */

package/lib/react/create-query.js

@@ -12,7 +12,6 @@ const getDecision = (value, param, { ifTrue, ifAlways }) => {
         ifAlways();
     }
 };
-const DEFAULT_STALE_TIME = 3000; // 3 seconds
 const INITIAL_QUERY_STATE = {
     isWaiting: false,
     isWaitingNextPage: false,
@@ -44,11 +43,13 @@ const useQueryDefaultDeps = (state) => [
     state.hasNextPage,
 ];
 const createQuery = (queryFn, options = {}) => {
-    const { onFirstSubscribe = utils_1.noop, onSubscribe = utils_1.noop, onLastUnsubscribe = utils_1.noop, onBeforeChangeKey = utils_1.noop, defaultDeps = useQueryDefaultDeps, select = utils_1.identityFn, staleTime = DEFAULT_STALE_TIME, fetchOnMount = true, fetchOnWindowFocus = true, enabled = true, retry = 1, retryDelay = 3000, keepPreviousData, getNextPageParam = () => undefined, onSuccess = utils_1.noop, onError = utils_1.noop, onSettled = utils_1.noop, hashKeyFn = utils_1.hashStoreKey, ...createStoresOptions } = options;
+    const { onFirstSubscribe = utils_1.noop, onSubscribe = utils_1.noop, onLastUnsubscribe = utils_1.noop, onBeforeChangeKey = utils_1.noop, defaultDeps = useQueryDefaultDeps, select = utils_1.identityFn, staleTime = 3000, // 3 seconds
+    fetchOnMount = true, fetchOnWindowFocus = true, enabled = true, retry = 1, retryDelay = 3000, // 3 seconds
+    keepPreviousData, getNextPageParam = () => undefined, onSuccess = utils_1.noop, onError = utils_1.noop, onSettled = utils_1.noop, ...createStoresOptions } = options;
     const retryTimeoutId = new Map();
     const retryNextPageTimeoutId = new Map();
     const preventReplaceResponse = new Map(); // Prevent optimistic data to be replaced
-    const useQuery = (0, create_stores_1.createStores)(({ key: _key, get, set }) => {
+    const useQuery = (0, create_stores_1.createStores)(({ get, set, key: _key, keyHash }) => {
         const key = _key;
         const getRetryProps = (error, retryCount) => {
             const maxRetryCount = (typeof retry === 'function' ? retry(error, key) : retry) || 0;
@@ -73,20 +74,20 @@ const createQuery = (queryFn, options = {}) => {
                         set({ isGoingToRetry: false, isWaiting: true });
                     else
                         set({ isGoingToRetry: false, isWaiting: true, isRefetching: true });
-                    clearTimeout(retryTimeoutId.get(hashKeyFn(key)));
+                    clearTimeout(retryTimeoutId.get(keyHash));
                 }
                 const stateBeforeCallQuery = { ...get(), pageParam };
-                preventReplaceResponse.set(hashKeyFn(key), false);
+                preventReplaceResponse.set(keyHash, false);
                 queryFn(key, stateBeforeCallQuery)
                     .then((response) => {
-                    if (preventReplaceResponse.get(hashKeyFn(key))) {
+                    if (preventReplaceResponse.get(keyHash)) {
                         set({ isWaiting: false });
                         return;
                     }
                     responseAllPages.push(response);
                     const newPageParam = getNextPageParam(response, responseAllPages.length);
                     newPageParams.push(newPageParam);
-                    if (newPageParam !== undefined && newPageParams.length < pageParams.length) {
+                    if ((0, utils_1.hasValue)(newPageParam) && newPageParams.length < pageParams.length) {
                         pageParam = newPageParam;
                         callQuery();
                         return;
@@ -111,7 +112,7 @@ const createQuery = (queryFn, options = {}) => {
                         retryCount: 0,
                         pageParam: newPageParam,
                         pageParams: newPageParams,
-                        hasNextPage: newPageParam !== undefined,
+                        hasNextPage: (0, utils_1.hasValue)(newPageParam),
                     });
                     onSuccess(response, stateBeforeCallQuery);
                 })
@@ -133,7 +134,7 @@ const createQuery = (queryFn, options = {}) => {
                             errorUpdatedAt,
                             isGoingToRetry: shouldRetry,
                             pageParam,
-                            hasNextPage: pageParam !== undefined,
+                            hasNextPage: (0, utils_1.hasValue)(pageParam),
                         }
                         : {
                             isWaiting: false,
@@ -144,10 +145,10 @@ const createQuery = (queryFn, options = {}) => {
                             errorUpdatedAt,
                             isGoingToRetry: shouldRetry,
                             pageParam,
-                            hasNextPage: pageParam !== undefined,
+                            hasNextPage: (0, utils_1.hasValue)(pageParam),
                         });
                     if (shouldRetry) {
-                        retryTimeoutId.set(hashKeyFn(key), window.setTimeout(() => {
+                        retryTimeoutId.set(keyHash, window.setTimeout(() => {
                             set({ retryCount: prevState.retryCount + 1 });
                             callQuery();
                         }, delay));
@@ -175,7 +176,7 @@ const createQuery = (queryFn, options = {}) => {
             if (isWaitingNextPage || !hasNextPage)
                 return;
             set({ isWaitingNextPage: true, isGoingToRetryNextPage: false });
-            clearTimeout(retryNextPageTimeoutId.get(hashKeyFn(key)));
+            clearTimeout(retryNextPageTimeoutId.get(keyHash));
             queryFn(key, { ...state, pageParam })
                 .then((response) => {
                 const newPageParam = getNextPageParam(response, pageParams.length);
@@ -186,7 +187,7 @@ const createQuery = (queryFn, options = {}) => {
                     data: select(response, { key, data }),
                     pageParam: newPageParam,
                     pageParams: pageParams.concat(newPageParam),
-                    hasNextPage: newPageParam !== undefined,
+                    hasNextPage: (0, utils_1.hasValue)(newPageParam),
                 });
             })
                 .catch((error) => {
@@ -200,7 +201,7 @@ const createQuery = (queryFn, options = {}) => {
                     isGoingToRetryNextPage: shouldRetry,
                 });
                 if (shouldRetry) {
-                    retryNextPageTimeoutId.set(hashKeyFn(key), window.setTimeout(() => {
+                    retryNextPageTimeoutId.set(keyHash, window.setTimeout(() => {
                         set({ retryNextPageCount: prevState.retryNextPageCount + 1 });
                         fetchNextPage();
                     }, delay));
@@ -210,6 +211,7 @@ const createQuery = (queryFn, options = {}) => {
         return {
             ...INITIAL_QUERY_STATE,
             key,
+            keyHash,
             fetch,
             forceFetch,
             fetchNextPage,
@@ -228,7 +230,6 @@ const createQuery = (queryFn, options = {}) => {
         return {
             ...createStoresOptions,
             defaultDeps,
-            hashKeyFn,
             onFirstSubscribe: (state) => {
                 if (typeof window !== 'undefined' && fetchOnWindowFocus) {
                     window.addEventListener('focus', fetchWindowFocusHandler);
@@ -247,8 +248,8 @@ const createQuery = (queryFn, options = {}) => {
                     window.removeEventListener('focus', fetchWindowFocusHandler);
                 }
                 useQuery.set(state.key, { retryCount: 0, retryNextPageCount: 0 }, true);
-                clearTimeout(retryTimeoutId.get(hashKeyFn(state.key)));
-                clearTimeout(retryNextPageTimeoutId.get(hashKeyFn(state.key)));
+                clearTimeout(retryTimeoutId.get(state.keyHash));
+                clearTimeout(retryNextPageTimeoutId.get(state.keyHash));
                 onLastUnsubscribe(state);
             },
             onBeforeChangeKey: (nextKey, prevKey) => {
@@ -289,7 +290,7 @@ const createQuery = (queryFn, options = {}) => {
                 data: select(response, { key: key, data: null }),
                 pageParam: newPageParam,
                 pageParams: [undefined, newPageParam],
-                hasNextPage: newPageParam !== undefined,
+                hasNextPage: (0, utils_1.hasValue)(newPageParam),
             });
         });
     };
@@ -326,7 +327,7 @@ const createQuery = (queryFn, options = {}) => {
             response: optimisticResponse,
             data: select(optimisticResponse, { key: key, data: null }),
         });
-        preventReplaceResponse.set(hashKeyFn(key), true);
+        preventReplaceResponse.set(prevState.keyHash, true);
         const revert = () => {
             useQuery.set(key, {
                 isOptimisticData: false,

package/lib/react/create-stores.d.ts

@@ -3,9 +3,10 @@ import { WatchProps } from './create-store';
 type Maybe<T> = T | null | undefined;
 export type StoreKey = Record<string, any> | undefined;
 export type StoresInitializer<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = (api: {
-    key: TKey;
     get: () => T;
     set: (value: SetStoreData<T>, silent?: boolean) => void;
+    key: TKey;
+    keyHash: string;
 }) => T;
 export type UseStores<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = {
     /**
@@ -38,6 +39,10 @@ export type UseStores<TKey extends StoreKey = StoreKey, T extends StoreData = St
 };
 export type CreateStoresOptions<TKey extends StoreKey = StoreKey, T extends StoreData = StoreData> = InitStoreOptions<T> & {
     onBeforeChangeKey?: (nextKey: TKey, prevKey: TKey) => void;
+    /**
+     * Will be triggered when a single store with a specific key was initialized.
+     */
+    onStoreInitialized?: (key: TKey, keyHash: string) => void;
     defaultDeps?: SelectDeps<T>;
     hashKeyFn?: (obj: TKey) => string;
 };

package/lib/react/create-stores.js

@@ -5,15 +5,16 @@ const react_1 = require("react");
 const utils_1 = require("../utils");
 const vanilla_1 = require("../vanilla");
 const createStores = (initializer, options = {}) => {
-    const { onBeforeChangeKey = utils_1.noop, defaultDeps, hashKeyFn = utils_1.hashStoreKey } = options;
+    const { onBeforeChangeKey = utils_1.noop, onStoreInitialized = utils_1.noop, defaultDeps, hashKeyFn = utils_1.hashStoreKey, } = options;
     const stores = new Map();
     const getStore = (_key) => {
         const key = _key || {};
-        const normalizedKey = hashKeyFn(key);
-        if (!stores.has(normalizedKey)) {
-            stores.set(normalizedKey, (0, vanilla_1.initStore)((api) => initializer({ key, ...api }), options));
+        const keyHash = hashKeyFn(key);
+        if (!stores.has(keyHash)) {
+            stores.set(keyHash, (0, vanilla_1.initStore)((api) => initializer({ key, keyHash, ...api }), options));
+            onStoreInitialized(key, keyHash);
         }
-        return stores.get(normalizedKey);
+        return stores.get(keyHash);
     };
     /**
      * IMPORTANT NOTE: selectDeps function must not be changed after initialization.
@@ -21,9 +22,9 @@ const createStores = (initializer, options = {}) => {
     const useStores = (...args) => {
         const [_key, selectDeps = defaultDeps] = (typeof args[0] === 'function' ? [{}, args[0]] : args);
         const key = _key || {};
-        const normalizedKey = hashKeyFn(key);
+        const keyHash = hashKeyFn(key);
         // eslint-disable-next-line react-hooks/exhaustive-deps
-        const { get, subscribe } = (0, react_1.useMemo)(() => getStore(key), [normalizedKey]);
+        const { get, subscribe } = (0, react_1.useMemo)(() => getStore(key), [keyHash]);
         const [state, setState] = (0, react_1.useState)(get);
         const isFirstRender = (0, react_1.useRef)(true);
         const prevKey = (0, react_1.useRef)(key);
@@ -37,7 +38,7 @@ const createStores = (initializer, options = {}) => {
             const unsubs = subscribe(setState, selectDeps);
             return unsubs;
             // eslint-disable-next-line react-hooks/exhaustive-deps
-        }, [normalizedKey]);
+        }, [keyHash]);
         return state;
     };
     useStores.get = (key) => {

package/lib/utils/index.d.ts

@@ -1,3 +1,4 @@
 export declare const noop: () => void;
-export declare const identityFn: <T>(a: T) => T;
+export declare const identityFn: <T>(value: T) => T;
+export declare const hasValue: (value: any) => boolean;
 export declare const hashStoreKey: (obj?: any) => string;

package/lib/utils/index.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hashStoreKey = exports.identityFn = exports.noop = void 0;
+exports.hashStoreKey = exports.hasValue = exports.identityFn = exports.noop = void 0;
 const noop = () => { };
 exports.noop = noop;
-const identityFn = (a) => a;
+const identityFn = (value) => value;
 exports.identityFn = identityFn;
+const hasValue = (value) => value !== undefined && value !== null;
+exports.hasValue = hasValue;
 const hashStoreKey = (obj) => JSON.stringify(obj, Object.keys(obj).sort());
 exports.hashStoreKey = hashStoreKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floppy-disk",
-  "version": "2.0.2",
+  "version": "2.1.0-beta.2",
   "description": "FloppyDisk - lightweight, simple, and powerful state management library",
   "keywords": [
     "state",