dharma-core 0.12.0 → 0.14.0

package/dist/cjs/index.d.ts

@@ -2,4 +2,5 @@ export * from "./lib/createEffect";
 export * from "./lib/createStore";
 export * from "./lib/derive";
 export * from "./lib/merge";
+export * from "./lib/StorageUnavailableError";
 export * from "./types/types";

package/dist/cjs/index.js

@@ -4,6 +4,7 @@ var createEffect = require('./lib/createEffect.js');
 var createStore = require('./lib/createStore.js');
 var derive = require('./lib/derive.js');
 var merge = require('./lib/merge.js');
+var StorageUnavailableError = require('./lib/StorageUnavailableError.js');
 
 
 
@@ -11,4 +12,5 @@ exports.createEffect = createEffect.createEffect;
 exports.createStore = createStore.createStore;
 exports.derive = derive.derive;
 exports.merge = merge.merge;
+exports.StorageUnavailableError = StorageUnavailableError.StorageUnavailableError;
 //# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;"}

package/dist/cjs/internal/createStorageAdapter.d.ts

@@ -1,6 +1,6 @@
 import { SetState, StoreConfig } from "../types/types";
 export declare const createStorageAdapter: <TState, TActions>(config: StoreConfig<TState, TActions>, get: () => TState, set: SetState<TState>) => {
-    onLoad: () => Promise<void>;
+    onLoad: () => void;
     onChange: (newState: TState) => Promise<void>;
     onAttach: () => void;
     onDetach: () => void;

package/dist/cjs/internal/createStorageAdapter.js

@@ -1,73 +1,91 @@
 'use strict';
 
-var warn = require('./warn.js');
+var StorageUnavailableError = require('../lib/StorageUnavailableError.js');
 
+const isThenable = (value) => typeof value?.then === "function";
+const getDefaultStorage = () => {
+    try {
+        // Accessing localStorage can throw, e.g. in sandboxed iframes or when cookies are disabled
+        return localStorage;
+    }
+    catch {
+        return undefined;
+    }
+};
 const createStorageAdapter = (config, get, set) => {
     if (!config.persist) {
         return null;
     }
     const IS_BROWSER = typeof window !== "undefined";
-    const storage = config.storage ?? (IS_BROWSER ? localStorage : undefined);
+    // React Native defines window without the event listener API
+    const CAN_LISTEN = IS_BROWSER && typeof window.addEventListener === "function";
+    const storage = config.storage ?? (IS_BROWSER ? getDefaultStorage() : undefined);
+    const { key, serializer = JSON, syncWithStorageOn = "load", onStorageError, } = config;
     if (!storage) {
-        warn.warn("No storage provider found. If this happened during SSR, you can safely ignore this warning.");
+        onStorageError?.(new StorageUnavailableError.StorageUnavailableError(key));
         return null;
     }
-    const { key, serializer = JSON, initialState } = config;
-    const initKey = `init_${key}`;
-    const onLoad = async () => {
-        try {
-            let initialStateSnapshot = storage.getItem(initKey);
-            const initialStateString = serializer.stringify(initialState);
-            if (initialStateSnapshot instanceof Promise) {
-                initialStateSnapshot = await initialStateSnapshot;
-            }
-            if (initialStateSnapshot !== initialStateString) {
-                storage.setItem(initKey, initialStateString);
-                storage.removeItem(key);
-            }
-        }
-        catch {
-            warn.warn("Failed to initialize snapshots. If this happened during SSR, you can safely ignore this warning.");
-        }
-    };
     const syncWithSnapshot = async () => {
+        let nextState;
         try {
+            const prevState = get();
             let currentSnapshot = storage.getItem(key);
-            if (currentSnapshot instanceof Promise) {
+            if (isThenable(currentSnapshot)) {
                 currentSnapshot = await currentSnapshot;
+                // The state changed while reading, so the snapshot is outdated
+                if (!Object.is(get(), prevState)) {
+                    return;
+                }
             }
-            if (currentSnapshot && currentSnapshot !== serializer.stringify(get())) {
-                set(serializer.parse(currentSnapshot));
+            if (!currentSnapshot || currentSnapshot === serializer.stringify(get())) {
+                return;
             }
+            nextState = serializer.parse(currentSnapshot);
         }
-        catch {
-            warn.warn("Failed to update state from snapshot");
+        catch (error) {
+            onStorageError?.(error);
+            return;
+        }
+        set(nextState);
+    };
+    const onLoad = () => {
+        if (syncWithStorageOn === "load") {
+            syncWithSnapshot();
+        }
+    };
+    const onStorage = (event) => {
+        if (event.key === key && event.storageArea === storage) {
+            syncWithSnapshot();
         }
     };
     const onAttach = () => {
-        syncWithSnapshot();
-        if (IS_BROWSER) {
+        if (syncWithStorageOn === "attach") {
+            syncWithSnapshot();
+        }
+        if (CAN_LISTEN) {
             window.addEventListener("focus", syncWithSnapshot);
+            window.addEventListener("storage", onStorage);
         }
     };
     const onChange = async (newState) => {
         try {
             let currentSnapshot = storage.getItem(key);
             const newSnapshot = serializer.stringify(newState);
-            if (currentSnapshot instanceof Promise) {
+            if (isThenable(currentSnapshot)) {
                 currentSnapshot = await currentSnapshot;
             }
             if (newSnapshot !== currentSnapshot) {
-                storage.setItem(key, newSnapshot);
+                await storage.setItem(key, newSnapshot);
             }
         }
-        catch {
-            warn.warn("Failed to update snapshot");
+        catch (error) {
+            onStorageError?.(error);
         }
     };
     const onDetach = () => {
-        if (IS_BROWSER) {
+        if (CAN_LISTEN) {
             window.removeEventListener("focus", syncWithSnapshot);
+            window.removeEventListener("storage", onStorage);
         }
     };
     return {

package/dist/cjs/internal/createStorageAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"createStorageAdapter.js","sources":["../../../src/internal/createStorageAdapter.ts"],"sourcesContent":["import { SetState, StorageAPI, StoreConfig } from \"../types/types\";\nimport { warn } from \"./warn\";\n\nexport const createStorageAdapter = <TState, TActions>(\n  config: StoreConfig<TState, TActions>,\n  get: () => TState,\n  set: SetState<TState>,\n) => {\n  if (!config.persist) {\n    return null;\n  }\n\n  const IS_BROWSER = typeof window !== \"undefined\";\n\n  const storage =\n    config.storage ?? (IS_BROWSER ? (localStorage as StorageAPI) : undefined);\n\n  if (!storage) {\n    warn(\n      \"No storage provider found. If this happened during SSR, you can safely ignore this warning.\",\n    );\n    return null;\n  }\n\n  const { key, serializer = JSON, initialState } = config;\n  const initKey = `init_${key}`;\n\n  const onLoad = async () => {\n    try {\n      let initialStateSnapshot = storage.getItem(initKey);\n      const initialStateString = serializer.stringify(initialState);\n\n      if (initialStateSnapshot instanceof Promise) {\n        initialStateSnapshot = await initialStateSnapshot;\n      }\n\n      if (initialStateSnapshot !== initialStateString) {\n        storage.setItem(initKey, initialStateString);\n        storage.removeItem(key);\n      }\n    } catch {\n      warn(\n        \"Failed to initialize snapshots. If this happened during SSR, you can safely ignore this warning.\",\n      );\n    }\n  };\n\n  const syncWithSnapshot = async () => {\n    try {\n      let currentSnapshot = storage.getItem(key);\n\n      if (currentSnapshot instanceof Promise) {\n        currentSnapshot = await currentSnapshot;\n      }\n\n      if (currentSnapshot && currentSnapshot !== serializer.stringify(get())) {\n        set(serializer.parse(currentSnapshot));\n      }\n    } catch {\n      warn(\"Failed to update state from snapshot\");\n    }\n  };\n\n  const onAttach = () => {\n    syncWithSnapshot();\n\n    if (IS_BROWSER) {\n      window.addEventListener(\"focus\", syncWithSnapshot);\n    }\n  };\n\n  const onChange = async (newState: TState) => {\n    try {\n      let currentSnapshot = storage.getItem(key);\n      const newSnapshot = serializer.stringify(newState);\n\n      if (currentSnapshot instanceof Promise) {\n        currentSnapshot = await currentSnapshot;\n      }\n\n      if (newSnapshot !== currentSnapshot) {\n        storage.setItem(key, newSnapshot);\n      }\n    } catch {\n      warn(\"Failed to update snapshot\");\n    }\n  };\n\n  const onDetach = () => {\n    if (IS_BROWSER) {\n      window.removeEventListener(\"focus\", syncWithSnapshot);\n    }\n  };\n\n  return {\n    onLoad,\n    onChange,\n    onAttach,\n    onDetach,\n  };\n};\n"],"names":["warn"],"mappings":";;;;AAGO,MAAM,oBAAoB,GAAG,CAClC,MAAqC,EACrC,GAAiB,EACjB,GAAqB,KACnB;AACF,IAAA,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;AACnB,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,MAAM,UAAU,GAAG,OAAO,MAAM,KAAK,WAAW;AAEhD,IAAA,MAAM,OAAO,GACX,MAAM,CAAC,OAAO,KAAK,UAAU,GAAI,YAA2B,GAAG,SAAS,CAAC;IAE3E,IAAI,CAAC,OAAO,EAAE;QACZA,SAAI,CACF,6FAA6F,CAC9F;AACD,QAAA,OAAO,IAAI;IACb;IAEA,MAAM,EAAE,GAAG,EAAE,UAAU,GAAG,IAAI,EAAE,YAAY,EAAE,GAAG,MAAM;AACvD,IAAA,MAAM,OAAO,GAAG,CAAA,KAAA,EAAQ,GAAG,EAAE;AAE7B,IAAA,MAAM,MAAM,GAAG,YAAW;AACxB,QAAA,IAAI;YACF,IAAI,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;YACnD,MAAM,kBAAkB,GAAG,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC;AAE7D,YAAA,IAAI,oBAAoB,YAAY,OAAO,EAAE;gBAC3C,oBAAoB,GAAG,MAAM,oBAAoB;YACnD;AAEA,YAAA,IAAI,oBAAoB,KAAK,kBAAkB,EAAE;AAC/C,gBAAA,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC;AAC5C,gBAAA,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;YACzB;QACF;AAAE,QAAA,MAAM;YACNA,SAAI,CACF,kGAAkG,CACnG;QACH;AACF,IAAA,CAAC;AAED,IAAA,MAAM,gBAAgB,GAAG,YAAW;AAClC,QAAA,IAAI;YACF,IAAI,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;AAE1C,YAAA,IAAI,eAAe,YAAY,OAAO,EAAE;gBACtC,eAAe,GAAG,MAAM,eAAe;YACzC;AAEA,YAAA,IAAI,eAAe,IAAI,eAAe,KAAK,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE;gBACtE,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACxC;QACF;AAAE,QAAA,MAAM;YACNA,SAAI,CAAC,sCAAsC,CAAC;QAC9C;AACF,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;AACpB,QAAA,gBAAgB,EAAE;QAElB,IAAI,UAAU,EAAE;AACd,YAAA,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,CAAC;QACpD;AACF,IAAA,CAAC;AAED,IAAA,MAAM,QAAQ,GAAG,OAAO,QAAgB,KAAI;AAC1C,QAAA,IAAI;YACF,IAAI,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;YAC1C,MAAM,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC;AAElD,YAAA,IAAI,eAAe,YAAY,OAAO,EAAE;gBACtC,eAAe,GAAG,MAAM,eAAe;YACzC;AAEA,YAAA,IAAI,WAAW,KAAK,eAAe,EAAE;AACnC,gBAAA,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC;YACnC;QACF;AAAE,QAAA,MAAM;YACNA,SAAI,CAAC,2BAA2B,CAAC;QACnC;AACF,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;QACpB,IAAI,UAAU,EAAE;AACd,YAAA,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC;QACvD;AACF,IAAA,CAAC;IAED,OAAO;QACL,MAAM;QACN,QAAQ;QACR,QAAQ;QACR,QAAQ;KACT;AACH;;;;"}
+{"version":3,"file":"createStorageAdapter.js","sources":["../../../src/internal/createStorageAdapter.ts"],"sourcesContent":["import { StorageUnavailableError } from \"../lib/StorageUnavailableError\";\nimport { SetState, StorageAPI, StoreConfig } from \"../types/types\";\n\nconst isThenable = (value: unknown): value is PromiseLike<unknown> =>\n  typeof (value as PromiseLike<unknown> | null)?.then === \"function\";\n\nconst getDefaultStorage = (): StorageAPI | undefined => {\n  try {\n    // Accessing localStorage can throw, e.g. in sandboxed iframes or when cookies are disabled\n    return localStorage;\n  } catch {\n    return undefined;\n  }\n};\n\nexport const createStorageAdapter = <TState, TActions>(\n  config: StoreConfig<TState, TActions>,\n  get: () => TState,\n  set: SetState<TState>,\n) => {\n  if (!config.persist) {\n    return null;\n  }\n\n  const IS_BROWSER = typeof window !== \"undefined\";\n  // React Native defines window without the event listener API\n  const CAN_LISTEN =\n    IS_BROWSER && typeof window.addEventListener === \"function\";\n\n  const storage =\n    config.storage ?? (IS_BROWSER ? getDefaultStorage() : undefined);\n\n  const {\n    key,\n    serializer = JSON,\n    syncWithStorageOn = \"load\",\n    onStorageError,\n  } = config;\n\n  if (!storage) {\n    onStorageError?.(new StorageUnavailableError(key));\n    return null;\n  }\n\n  const syncWithSnapshot = async () => {\n    let nextState: TState;\n\n    try {\n      const prevState = get();\n      let currentSnapshot = storage.getItem(key);\n\n      if (isThenable(currentSnapshot)) {\n        currentSnapshot = await currentSnapshot;\n\n        // The state changed while reading, so the snapshot is outdated\n        if (!Object.is(get(), prevState)) {\n          return;\n        }\n      }\n\n      if (!currentSnapshot || currentSnapshot === serializer.stringify(get())) {\n        return;\n      }\n\n      nextState = serializer.parse(currentSnapshot);\n    } catch (error) {\n      onStorageError?.(error);\n      return;\n    }\n\n    set(nextState);\n  };\n\n  const onLoad = () => {\n    if (syncWithStorageOn === \"load\") {\n      syncWithSnapshot();\n    }\n  };\n\n  const onStorage = (event: StorageEvent) => {\n    if (event.key === key && event.storageArea === storage) {\n      syncWithSnapshot();\n    }\n  };\n\n  const onAttach = () => {\n    if (syncWithStorageOn === \"attach\") {\n      syncWithSnapshot();\n    }\n\n    if (CAN_LISTEN) {\n      window.addEventListener(\"focus\", syncWithSnapshot);\n      window.addEventListener(\"storage\", onStorage);\n    }\n  };\n\n  const onChange = async (newState: TState) => {\n    try {\n      let currentSnapshot = storage.getItem(key);\n      const newSnapshot = serializer.stringify(newState);\n\n      if (isThenable(currentSnapshot)) {\n        currentSnapshot = await currentSnapshot;\n      }\n\n      if (newSnapshot !== currentSnapshot) {\n        await storage.setItem(key, newSnapshot);\n      }\n    } catch (error) {\n      onStorageError?.(error);\n    }\n  };\n\n  const onDetach = () => {\n    if (CAN_LISTEN) {\n      window.removeEventListener(\"focus\", syncWithSnapshot);\n      window.removeEventListener(\"storage\", onStorage);\n    }\n  };\n\n  return {\n    onLoad,\n    onChange,\n    onAttach,\n    onDetach,\n  };\n};\n"],"names":["StorageUnavailableError"],"mappings":";;;;AAGA,MAAM,UAAU,GAAG,CAAC,KAAc,KAChC,OAAQ,KAAqC,EAAE,IAAI,KAAK,UAAU;AAEpE,MAAM,iBAAiB,GAAG,MAA6B;AACrD,IAAA,IAAI;;AAEF,QAAA,OAAO,YAAY;IACrB;AAAE,IAAA,MAAM;AACN,QAAA,OAAO,SAAS;IAClB;AACF,CAAC;AAEM,MAAM,oBAAoB,GAAG,CAClC,MAAqC,EACrC,GAAiB,EACjB,GAAqB,KACnB;AACF,IAAA,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;AACnB,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,MAAM,UAAU,GAAG,OAAO,MAAM,KAAK,WAAW;;IAEhD,MAAM,UAAU,GACd,UAAU,IAAI,OAAO,MAAM,CAAC,gBAAgB,KAAK,UAAU;AAE7D,IAAA,MAAM,OAAO,GACX,MAAM,CAAC,OAAO,KAAK,UAAU,GAAG,iBAAiB,EAAE,GAAG,SAAS,CAAC;AAElE,IAAA,MAAM,EACJ,GAAG,EACH,UAAU,GAAG,IAAI,EACjB,iBAAiB,GAAG,MAAM,EAC1B,cAAc,GACf,GAAG,MAAM;IAEV,IAAI,CAAC,OAAO,EAAE;QACZ,cAAc,GAAG,IAAIA,+CAAuB,CAAC,GAAG,CAAC,CAAC;AAClD,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,MAAM,gBAAgB,GAAG,YAAW;AAClC,QAAA,IAAI,SAAiB;AAErB,QAAA,IAAI;AACF,YAAA,MAAM,SAAS,GAAG,GAAG,EAAE;YACvB,IAAI,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;AAE1C,YAAA,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE;gBAC/B,eAAe,GAAG,MAAM,eAAe;;gBAGvC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,EAAE;oBAChC;gBACF;YACF;AAEA,YAAA,IAAI,CAAC,eAAe,IAAI,eAAe,KAAK,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE;gBACvE;YACF;AAEA,YAAA,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC;QAC/C;QAAE,OAAO,KAAK,EAAE;AACd,YAAA,cAAc,GAAG,KAAK,CAAC;YACvB;QACF;QAEA,GAAG,CAAC,SAAS,CAAC;AAChB,IAAA,CAAC;IAED,MAAM,MAAM,GAAG,MAAK;AAClB,QAAA,IAAI,iBAAiB,KAAK,MAAM,EAAE;AAChC,YAAA,gBAAgB,EAAE;QACpB;AACF,IAAA,CAAC;AAED,IAAA,MAAM,SAAS,GAAG,CAAC,KAAmB,KAAI;AACxC,QAAA,IAAI,KAAK,CAAC,GAAG,KAAK,GAAG,IAAI,KAAK,CAAC,WAAW,KAAK,OAAO,EAAE;AACtD,YAAA,gBAAgB,EAAE;QACpB;AACF,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;AACpB,QAAA,IAAI,iBAAiB,KAAK,QAAQ,EAAE;AAClC,YAAA,gBAAgB,EAAE;QACpB;QAEA,IAAI,UAAU,EAAE;AACd,YAAA,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,CAAC;AAClD,YAAA,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC;QAC/C;AACF,IAAA,CAAC;AAED,IAAA,MAAM,QAAQ,GAAG,OAAO,QAAgB,KAAI;AAC1C,QAAA,IAAI;YACF,IAAI,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;YAC1C,MAAM,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC;AAElD,YAAA,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE;gBAC/B,eAAe,GAAG,MAAM,eAAe;YACzC;AAEA,YAAA,IAAI,WAAW,KAAK,eAAe,EAAE;gBACnC,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC;YACzC;QACF;QAAE,OAAO,KAAK,EAAE;AACd,YAAA,cAAc,GAAG,KAAK,CAAC;QACzB;AACF,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;QACpB,IAAI,UAAU,EAAE;AACd,YAAA,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC;AACrD,YAAA,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,CAAC;QAClD;AACF,IAAA,CAAC;IAED,OAAO;QACL,MAAM;QACN,QAAQ;QACR,QAAQ;QACR,QAAQ;KACT;AACH;;;;"}

package/dist/cjs/lib/StorageUnavailableError.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Reported to `onStorageError` when a persisted store has no storage to use.
+ * This is expected during SSR, and can otherwise mean that local storage is inaccessible.
+ */
+export declare class StorageUnavailableError extends Error {
+    constructor(key: string);
+}

package/dist/cjs/lib/StorageUnavailableError.js

@@ -0,0 +1,15 @@
+'use strict';
+
+/**
+ * Reported to `onStorageError` when a persisted store has no storage to use.
+ * This is expected during SSR, and can otherwise mean that local storage is inaccessible.
+ */
+class StorageUnavailableError extends Error {
+    constructor(key) {
+        super(`[dharma-core] No storage provider was found for "${key}". If this happened during SSR, it can be safely ignored.`);
+        this.name = "StorageUnavailableError";
+    }
+}
+
+exports.StorageUnavailableError = StorageUnavailableError;
+//# sourceMappingURL=StorageUnavailableError.js.map

package/dist/cjs/lib/StorageUnavailableError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"StorageUnavailableError.js","sources":["../../../src/lib/StorageUnavailableError.ts"],"sourcesContent":["/**\n * Reported to `onStorageError` when a persisted store has no storage to use.\n * This is expected during SSR, and can otherwise mean that local storage is inaccessible.\n */\nexport class StorageUnavailableError extends Error {\n  constructor(key: string) {\n    super(\n      `[dharma-core] No storage provider was found for \"${key}\". If this happened during SSR, it can be safely ignored.`,\n    );\n    this.name = \"StorageUnavailableError\";\n  }\n}\n"],"names":[],"mappings":";;AAAA;;;AAGG;AACG,MAAO,uBAAwB,SAAQ,KAAK,CAAA;AAChD,IAAA,WAAA,CAAY,GAAW,EAAA;AACrB,QAAA,KAAK,CACH,CAAA,iDAAA,EAAoD,GAAG,CAAA,yDAAA,CAA2D,CACnH;AACD,QAAA,IAAI,CAAC,IAAI,GAAG,yBAAyB;IACvC;AACD;;;;"}

package/dist/cjs/lib/createEffect.js

@@ -33,6 +33,7 @@ const createEffect = (store, effectFn, dependencyFn) => {
     const unmount = () => {
         unsubscribe?.();
         unsubscribe = undefined;
+        prev = undefined;
     };
     return {
         mount,

package/dist/cjs/lib/createEffect.js.map

@@ -1 +1 @@
-{"version":3,"file":"createEffect.js","sources":["../../../src/lib/createEffect.ts"],"sourcesContent":["import { Effect, Store } from \"../types/types\";\nimport { deeplyEquals } from \"./deeplyEquals\";\n\n/**\n * Creates an effect that runs when the store's state changes.\n *\n * @param store - The store instance to subscribe to\n * @param effectFn - The function to run when dependencies change. Receives the current state as argument.\n * @param dependencyFn - Optional function that returns an array of dependencies. If provided, the effect will only run when these dependencies change.\n *\n * @returns An Effect object with mount and unmount methods\n *\n * @see {@link https://dharma.fransek.dev/core/createeffect/}\n */\nexport const createEffect = <TState, TActions, TDerived>(\n  store: Store<TState, TActions>,\n  effectFn: (state: TState) => TDerived,\n  dependencyFn?: (state: TState) => unknown[],\n): Effect => {\n  let prev: unknown[] | undefined;\n  let unsubscribe: (() => void) | undefined;\n\n  const execute = () => effectFn(store.get());\n\n  const effect = () => {\n    const next = dependencyFn?.(store.get());\n\n    if (!prev || !deeplyEquals(prev, next)) {\n      prev = next;\n      execute();\n    }\n  };\n\n  const mount = () => {\n    if (!unsubscribe) {\n      unsubscribe = store.subscribe(effect);\n    }\n    return unmount;\n  };\n\n  const unmount = () => {\n    unsubscribe?.();\n    unsubscribe = undefined;\n  };\n\n  return {\n    mount,\n    unmount,\n  };\n};\n"],"names":["deeplyEquals"],"mappings":";;;;AAGA;;;;;;;;;;AAUG;AACI,MAAM,YAAY,GAAG,CAC1B,KAA8B,EAC9B,QAAqC,EACrC,YAA2C,KACjC;AACV,IAAA,IAAI,IAA2B;AAC/B,IAAA,IAAI,WAAqC;AAEzC,IAAA,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IAE3C,MAAM,MAAM,GAAG,MAAK;QAClB,MAAM,IAAI,GAAG,YAAY,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QAExC,IAAI,CAAC,IAAI,IAAI,CAACA,yBAAY,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YACtC,IAAI,GAAG,IAAI;AACX,YAAA,OAAO,EAAE;QACX;AACF,IAAA,CAAC;IAED,MAAM,KAAK,GAAG,MAAK;QACjB,IAAI,CAAC,WAAW,EAAE;AAChB,YAAA,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC;QACvC;AACA,QAAA,OAAO,OAAO;AAChB,IAAA,CAAC;IAED,MAAM,OAAO,GAAG,MAAK;QACnB,WAAW,IAAI;QACf,WAAW,GAAG,SAAS;AACzB,IAAA,CAAC;IAED,OAAO;QACL,KAAK;QACL,OAAO;KACR;AACH;;;;"}
+{"version":3,"file":"createEffect.js","sources":["../../../src/lib/createEffect.ts"],"sourcesContent":["import { Effect, Store } from \"../types/types\";\nimport { deeplyEquals } from \"./deeplyEquals\";\n\n/**\n * Creates an effect that runs when the store's state changes.\n *\n * @param store - The store instance to subscribe to\n * @param effectFn - The function to run when dependencies change. Receives the current state as argument.\n * @param dependencyFn - Optional function that returns an array of dependencies. If provided, the effect will only run when these dependencies change.\n *\n * @returns An Effect object with mount and unmount methods\n *\n * @see {@link https://dharma.fransek.dev/core/createeffect/}\n */\nexport const createEffect = <TState, TActions, TDerived>(\n  store: Store<TState, TActions>,\n  effectFn: (state: TState) => TDerived,\n  dependencyFn?: (state: TState) => unknown[],\n): Effect => {\n  let prev: unknown[] | undefined;\n  let unsubscribe: (() => void) | undefined;\n\n  const execute = () => effectFn(store.get());\n\n  const effect = () => {\n    const next = dependencyFn?.(store.get());\n\n    if (!prev || !deeplyEquals(prev, next)) {\n      prev = next;\n      execute();\n    }\n  };\n\n  const mount = () => {\n    if (!unsubscribe) {\n      unsubscribe = store.subscribe(effect);\n    }\n    return unmount;\n  };\n\n  const unmount = () => {\n    unsubscribe?.();\n    unsubscribe = undefined;\n    prev = undefined;\n  };\n\n  return {\n    mount,\n    unmount,\n  };\n};\n"],"names":["deeplyEquals"],"mappings":";;;;AAGA;;;;;;;;;;AAUG;AACI,MAAM,YAAY,GAAG,CAC1B,KAA8B,EAC9B,QAAqC,EACrC,YAA2C,KACjC;AACV,IAAA,IAAI,IAA2B;AAC/B,IAAA,IAAI,WAAqC;AAEzC,IAAA,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IAE3C,MAAM,MAAM,GAAG,MAAK;QAClB,MAAM,IAAI,GAAG,YAAY,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QAExC,IAAI,CAAC,IAAI,IAAI,CAACA,yBAAY,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YACtC,IAAI,GAAG,IAAI;AACX,YAAA,OAAO,EAAE;QACX;AACF,IAAA,CAAC;IAED,MAAM,KAAK,GAAG,MAAK;QACjB,IAAI,CAAC,WAAW,EAAE;AAChB,YAAA,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC;QACvC;AACA,QAAA,OAAO,OAAO;AAChB,IAAA,CAAC;IAED,MAAM,OAAO,GAAG,MAAK;QACnB,WAAW,IAAI;QACf,WAAW,GAAG,SAAS;QACvB,IAAI,GAAG,SAAS;AAClB,IAAA,CAAC;IAED,OAAO;QACL,KAAK;QACL,OAAO;KACR;AACH;;;;"}

package/dist/cjs/lib/createStore.js

@@ -21,16 +21,15 @@ const createStore = (config) => {
         return state;
     };
     const set = (stateModifier) => {
+        const prevState = state;
         setSilently(stateModifier);
-        dispatch();
+        if (!Object.is(state, prevState)) {
+            dispatch();
+        }
         return state;
     };
     const resetSilently = () => setSilently(initialState);
-    const reset = () => {
-        resetSilently();
-        dispatch();
-        return state;
-    };
+    const reset = () => set(initialState);
     const listeners = new Set();
     const actions = config.actions?.({
         set,
@@ -47,21 +46,20 @@ const createStore = (config) => {
         listener(state);
         listeners.add(listener);
         return () => {
-            listeners.delete(listener);
-            if (listeners.size === 0) {
+            if (listeners.delete(listener) && listeners.size === 0) {
                 storageAdapter?.onDetach();
                 onDetach?.({ state, set, reset, initialState });
             }
         };
     };
     const dispatch = () => {
-        storageAdapter?.onChange(state);
         onChange?.({
             state,
             set: setSilently,
             reset: resetSilently,
             initialState,
         });
+        storageAdapter?.onChange(state);
         listeners.forEach((listener) => listener(state));
     };
     storageAdapter?.onLoad();

package/dist/cjs/lib/createStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"createStore.js","sources":["../../../src/lib/createStore.ts"],"sourcesContent":["import { createStorageAdapter } from \"../internal/createStorageAdapter\";\nimport { Listener, StateModifier, Store, StoreConfig } from \"../types/types\";\nimport { merge } from \"./merge\";\n\n/**\n * Creates a store with an initial state and actions that can modify the state.\n *\n * @param {StoreConfig<TState, TActions>} [config] - The configuration for the store.\n *\n * @returns {Store<TState, TActions>} The created store with state management methods.\n *\n * @see {@link https://dharma.fransek.dev/core/createstore/}\n */\nexport const createStore = <TState, TActions = undefined>(\n  config: StoreConfig<TState, TActions>,\n): Store<TState, TActions> => {\n  const { initialState, onLoad, onAttach, onDetach, onChange } = config;\n\n  let state = initialState;\n\n  const get = () => state;\n\n  const setSilently = (stateModifier: StateModifier<TState>) => {\n    state = merge(state, stateModifier);\n    return state;\n  };\n\n  const set = (stateModifier: StateModifier<TState>) => {\n    setSilently(stateModifier);\n    dispatch();\n    return state;\n  };\n\n  const resetSilently = () => setSilently(initialState);\n\n  const reset = () => {\n    resetSilently();\n    dispatch();\n    return state;\n  };\n\n  const listeners = new Set<Listener<TState>>();\n  const actions = config.actions?.({\n    set,\n    get,\n    reset,\n    initialState,\n  }) as TActions;\n  const storageAdapter = createStorageAdapter(config, get, set);\n\n  const subscribe = (listener: Listener<TState>) => {\n    if (listeners.size === 0) {\n      storageAdapter?.onAttach();\n      onAttach?.({ state, set, reset, initialState });\n    }\n\n    listener(state);\n    listeners.add(listener);\n\n    return () => {\n      listeners.delete(listener);\n\n      if (listeners.size === 0) {\n        storageAdapter?.onDetach();\n        onDetach?.({ state, set, reset, initialState });\n      }\n    };\n  };\n\n  const dispatch = () => {\n    storageAdapter?.onChange(state);\n    onChange?.({\n      state,\n      set: setSilently,\n      reset: resetSilently,\n      initialState,\n    });\n    listeners.forEach((listener) => listener(state));\n  };\n\n  storageAdapter?.onLoad();\n  onLoad?.({ state, set, reset, initialState });\n\n  return {\n    get,\n    subscribe,\n    actions,\n    set,\n    reset,\n    initialState,\n  };\n};\n"],"names":["merge","createStorageAdapter"],"mappings":";;;;;AAIA;;;;;;;;AAQG;AACI,MAAM,WAAW,GAAG,CACzB,MAAqC,KACV;AAC3B,IAAA,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM;IAErE,IAAI,KAAK,GAAG,YAAY;AAExB,IAAA,MAAM,GAAG,GAAG,MAAM,KAAK;AAEvB,IAAA,MAAM,WAAW,GAAG,CAAC,aAAoC,KAAI;AAC3D,QAAA,KAAK,GAAGA,WAAK,CAAC,KAAK,EAAE,aAAa,CAAC;AACnC,QAAA,OAAO,KAAK;AACd,IAAA,CAAC;AAED,IAAA,MAAM,GAAG,GAAG,CAAC,aAAoC,KAAI;QACnD,WAAW,CAAC,aAAa,CAAC;AAC1B,QAAA,QAAQ,EAAE;AACV,QAAA,OAAO,KAAK;AACd,IAAA,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC;IAErD,MAAM,KAAK,GAAG,MAAK;AACjB,QAAA,aAAa,EAAE;AACf,QAAA,QAAQ,EAAE;AACV,QAAA,OAAO,KAAK;AACd,IAAA,CAAC;AAED,IAAA,MAAM,SAAS,GAAG,IAAI,GAAG,EAAoB;AAC7C,IAAA,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,GAAG;QAC/B,GAAG;QACH,GAAG;QACH,KAAK;QACL,YAAY;AACb,KAAA,CAAa;IACd,MAAM,cAAc,GAAGC,yCAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC;AAE7D,IAAA,MAAM,SAAS,GAAG,CAAC,QAA0B,KAAI;AAC/C,QAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;YACxB,cAAc,EAAE,QAAQ,EAAE;AAC1B,YAAA,QAAQ,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;QACjD;QAEA,QAAQ,CAAC,KAAK,CAAC;AACf,QAAA,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC;AAEvB,QAAA,OAAO,MAAK;AACV,YAAA,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC;AAE1B,YAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;gBACxB,cAAc,EAAE,QAAQ,EAAE;AAC1B,gBAAA,QAAQ,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;YACjD;AACF,QAAA,CAAC;AACH,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;AACpB,QAAA,cAAc,EAAE,QAAQ,CAAC,KAAK,CAAC;AAC/B,QAAA,QAAQ,GAAG;YACT,KAAK;AACL,YAAA,GAAG,EAAE,WAAW;AAChB,YAAA,KAAK,EAAE,aAAa;YACpB,YAAY;AACb,SAAA,CAAC;AACF,QAAA,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,KAAK,CAAC,CAAC;AAClD,IAAA,CAAC;IAED,cAAc,EAAE,MAAM,EAAE;AACxB,IAAA,MAAM,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IAE7C,OAAO;QACL,GAAG;QACH,SAAS;QACT,OAAO;QACP,GAAG;QACH,KAAK;QACL,YAAY;KACb;AACH;;;;"}
+{"version":3,"file":"createStore.js","sources":["../../../src/lib/createStore.ts"],"sourcesContent":["import { createStorageAdapter } from \"../internal/createStorageAdapter\";\nimport { Listener, StateModifier, Store, StoreConfig } from \"../types/types\";\nimport { merge } from \"./merge\";\n\n/**\n * Creates a store with an initial state and actions that can modify the state.\n *\n * @param {StoreConfig<TState, TActions>} [config] - The configuration for the store.\n *\n * @returns {Store<TState, TActions>} The created store with state management methods.\n *\n * @see {@link https://dharma.fransek.dev/core/createstore/}\n */\nexport const createStore = <TState, TActions = undefined>(\n  config: StoreConfig<TState, TActions>,\n): Store<TState, TActions> => {\n  const { initialState, onLoad, onAttach, onDetach, onChange } = config;\n\n  let state = initialState;\n\n  const get = () => state;\n\n  const setSilently = (stateModifier: StateModifier<TState>) => {\n    state = merge(state, stateModifier);\n    return state;\n  };\n\n  const set = (stateModifier: StateModifier<TState>) => {\n    const prevState = state;\n    setSilently(stateModifier);\n\n    if (!Object.is(state, prevState)) {\n      dispatch();\n    }\n\n    return state;\n  };\n\n  const resetSilently = () => setSilently(initialState);\n\n  const reset = () => set(initialState);\n\n  const listeners = new Set<Listener<TState>>();\n  const actions = config.actions?.({\n    set,\n    get,\n    reset,\n    initialState,\n  }) as TActions;\n  const storageAdapter = createStorageAdapter(config, get, set);\n\n  const subscribe = (listener: Listener<TState>) => {\n    if (listeners.size === 0) {\n      storageAdapter?.onAttach();\n      onAttach?.({ state, set, reset, initialState });\n    }\n\n    listener(state);\n    listeners.add(listener);\n\n    return () => {\n      if (listeners.delete(listener) && listeners.size === 0) {\n        storageAdapter?.onDetach();\n        onDetach?.({ state, set, reset, initialState });\n      }\n    };\n  };\n\n  const dispatch = () => {\n    onChange?.({\n      state,\n      set: setSilently,\n      reset: resetSilently,\n      initialState,\n    });\n    storageAdapter?.onChange(state);\n    listeners.forEach((listener) => listener(state));\n  };\n\n  storageAdapter?.onLoad();\n  onLoad?.({ state, set, reset, initialState });\n\n  return {\n    get,\n    subscribe,\n    actions,\n    set,\n    reset,\n    initialState,\n  };\n};\n"],"names":["merge","createStorageAdapter"],"mappings":";;;;;AAIA;;;;;;;;AAQG;AACI,MAAM,WAAW,GAAG,CACzB,MAAqC,KACV;AAC3B,IAAA,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM;IAErE,IAAI,KAAK,GAAG,YAAY;AAExB,IAAA,MAAM,GAAG,GAAG,MAAM,KAAK;AAEvB,IAAA,MAAM,WAAW,GAAG,CAAC,aAAoC,KAAI;AAC3D,QAAA,KAAK,GAAGA,WAAK,CAAC,KAAK,EAAE,aAAa,CAAC;AACnC,QAAA,OAAO,KAAK;AACd,IAAA,CAAC;AAED,IAAA,MAAM,GAAG,GAAG,CAAC,aAAoC,KAAI;QACnD,MAAM,SAAS,GAAG,KAAK;QACvB,WAAW,CAAC,aAAa,CAAC;QAE1B,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE;AAChC,YAAA,QAAQ,EAAE;QACZ;AAEA,QAAA,OAAO,KAAK;AACd,IAAA,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC;IAErD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC;AAErC,IAAA,MAAM,SAAS,GAAG,IAAI,GAAG,EAAoB;AAC7C,IAAA,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,GAAG;QAC/B,GAAG;QACH,GAAG;QACH,KAAK;QACL,YAAY;AACb,KAAA,CAAa;IACd,MAAM,cAAc,GAAGC,yCAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC;AAE7D,IAAA,MAAM,SAAS,GAAG,CAAC,QAA0B,KAAI;AAC/C,QAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;YACxB,cAAc,EAAE,QAAQ,EAAE;AAC1B,YAAA,QAAQ,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;QACjD;QAEA,QAAQ,CAAC,KAAK,CAAC;AACf,QAAA,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC;AAEvB,QAAA,OAAO,MAAK;AACV,YAAA,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;gBACtD,cAAc,EAAE,QAAQ,EAAE;AAC1B,gBAAA,QAAQ,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;YACjD;AACF,QAAA,CAAC;AACH,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;AACpB,QAAA,QAAQ,GAAG;YACT,KAAK;AACL,YAAA,GAAG,EAAE,WAAW;AAChB,YAAA,KAAK,EAAE,aAAa;YACpB,YAAY;AACb,SAAA,CAAC;AACF,QAAA,cAAc,EAAE,QAAQ,CAAC,KAAK,CAAC;AAC/B,QAAA,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,KAAK,CAAC,CAAC;AAClD,IAAA,CAAC;IAED,cAAc,EAAE,MAAM,EAAE;AACxB,IAAA,MAAM,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IAE7C,OAAO;QACL,GAAG;QACH,SAAS;QACT,OAAO;QACP,GAAG;QACH,KAAK;QACL,YAAY;KACb;AACH;;;;"}

package/dist/cjs/lib/deeplyEquals.js

@@ -30,12 +30,11 @@ const deeplyEquals = (a, b) => {
         return false;
     }
     const keysA = Object.keys(a);
-    const keysB = Object.keys(b);
-    if (keysA.length !== keysB.length) {
+    if (keysA.length !== Object.keys(b).length) {
         return false;
     }
     for (const key of keysA) {
-        if (!keysB.includes(key)) {
+        if (!Object.prototype.hasOwnProperty.call(b, key)) {
             return false;
         }
         if (!deeplyEquals(a[key], b[key])) {

package/dist/cjs/lib/deeplyEquals.js.map

@@ -1 +1 @@
-{"version":3,"file":"deeplyEquals.js","sources":["../../../src/lib/deeplyEquals.ts"],"sourcesContent":["export const deeplyEquals = (a: unknown, b: unknown): boolean => {\n  if (a === b) {\n    return true;\n  }\n\n  if (\n    a === null ||\n    b === null ||\n    typeof a !== \"object\" ||\n    typeof b !== \"object\"\n  ) {\n    return false;\n  }\n\n  const protoA = Object.getPrototypeOf(a);\n  const protoB = Object.getPrototypeOf(b);\n\n  if (protoA !== protoB) {\n    return false;\n  }\n\n  if (protoA === Array.prototype) {\n    const arrA = a as unknown[];\n    const arrB = b as unknown[];\n    if (arrA.length !== arrB.length) return false;\n    for (let i = 0; i < arrA.length; i++) {\n      if (!deeplyEquals(arrA[i], arrB[i])) return false;\n    }\n    return true;\n  }\n\n  if (protoA !== Object.prototype) {\n    return false;\n  }\n\n  const keysA = Object.keys(a);\n  const keysB = Object.keys(b);\n\n  if (keysA.length !== keysB.length) {\n    return false;\n  }\n\n  for (const key of keysA) {\n    if (!keysB.includes(key)) {\n      return false;\n    }\n    if (\n      !deeplyEquals(\n        (a as Record<string, unknown>)[key],\n        (b as Record<string, unknown>)[key],\n      )\n    ) {\n      return false;\n    }\n  }\n\n  return true;\n};\n"],"names":[],"mappings":";;MAAa,YAAY,GAAG,CAAC,CAAU,EAAE,CAAU,KAAa;AAC9D,IAAA,IAAI,CAAC,KAAK,CAAC,EAAE;AACX,QAAA,OAAO,IAAI;IACb;IAEA,IACE,CAAC,KAAK,IAAI;AACV,QAAA,CAAC,KAAK,IAAI;QACV,OAAO,CAAC,KAAK,QAAQ;AACrB,QAAA,OAAO,CAAC,KAAK,QAAQ,EACrB;AACA,QAAA,OAAO,KAAK;IACd;IAEA,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;AAEvC,IAAA,IAAI,MAAM,KAAK,MAAM,EAAE;AACrB,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,IAAI,MAAM,KAAK,KAAK,CAAC,SAAS,EAAE;QAC9B,MAAM,IAAI,GAAG,CAAc;QAC3B,MAAM,IAAI,GAAG,CAAc;AAC3B,QAAA,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;AAAE,YAAA,OAAO,KAAK;AAC7C,QAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACpC,YAAA,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AAAE,gBAAA,OAAO,KAAK;QACnD;AACA,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,IAAI,MAAM,KAAK,MAAM,CAAC,SAAS,EAAE;AAC/B,QAAA,OAAO,KAAK;IACd;IAEA,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAE5B,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;AACjC,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;QACvB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;AACxB,YAAA,OAAO,KAAK;QACd;AACA,QAAA,IACE,CAAC,YAAY,CACV,CAA6B,CAAC,GAAG,CAAC,EAClC,CAA6B,CAAC,GAAG,CAAC,CACpC,EACD;AACA,YAAA,OAAO,KAAK;QACd;IACF;AAEA,IAAA,OAAO,IAAI;AACb;;;;"}
+{"version":3,"file":"deeplyEquals.js","sources":["../../../src/lib/deeplyEquals.ts"],"sourcesContent":["export const deeplyEquals = (a: unknown, b: unknown): boolean => {\n  if (a === b) {\n    return true;\n  }\n\n  if (\n    a === null ||\n    b === null ||\n    typeof a !== \"object\" ||\n    typeof b !== \"object\"\n  ) {\n    return false;\n  }\n\n  const protoA = Object.getPrototypeOf(a);\n  const protoB = Object.getPrototypeOf(b);\n\n  if (protoA !== protoB) {\n    return false;\n  }\n\n  if (protoA === Array.prototype) {\n    const arrA = a as unknown[];\n    const arrB = b as unknown[];\n    if (arrA.length !== arrB.length) return false;\n    for (let i = 0; i < arrA.length; i++) {\n      if (!deeplyEquals(arrA[i], arrB[i])) return false;\n    }\n    return true;\n  }\n\n  if (protoA !== Object.prototype) {\n    return false;\n  }\n\n  const keysA = Object.keys(a);\n\n  if (keysA.length !== Object.keys(b).length) {\n    return false;\n  }\n\n  for (const key of keysA) {\n    if (!Object.prototype.hasOwnProperty.call(b, key)) {\n      return false;\n    }\n    if (\n      !deeplyEquals(\n        (a as Record<string, unknown>)[key],\n        (b as Record<string, unknown>)[key],\n      )\n    ) {\n      return false;\n    }\n  }\n\n  return true;\n};\n"],"names":[],"mappings":";;MAAa,YAAY,GAAG,CAAC,CAAU,EAAE,CAAU,KAAa;AAC9D,IAAA,IAAI,CAAC,KAAK,CAAC,EAAE;AACX,QAAA,OAAO,IAAI;IACb;IAEA,IACE,CAAC,KAAK,IAAI;AACV,QAAA,CAAC,KAAK,IAAI;QACV,OAAO,CAAC,KAAK,QAAQ;AACrB,QAAA,OAAO,CAAC,KAAK,QAAQ,EACrB;AACA,QAAA,OAAO,KAAK;IACd;IAEA,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;AAEvC,IAAA,IAAI,MAAM,KAAK,MAAM,EAAE;AACrB,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,IAAI,MAAM,KAAK,KAAK,CAAC,SAAS,EAAE;QAC9B,MAAM,IAAI,GAAG,CAAc;QAC3B,MAAM,IAAI,GAAG,CAAc;AAC3B,QAAA,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;AAAE,YAAA,OAAO,KAAK;AAC7C,QAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACpC,YAAA,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AAAE,gBAAA,OAAO,KAAK;QACnD;AACA,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,IAAI,MAAM,KAAK,MAAM,CAAC,SAAS,EAAE;AAC/B,QAAA,OAAO,KAAK;IACd;IAEA,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAE5B,IAAA,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE;AAC1C,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;AACvB,QAAA,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;AACjD,YAAA,OAAO,KAAK;QACd;AACA,QAAA,IACE,CAAC,YAAY,CACV,CAA6B,CAAC,GAAG,CAAC,EAClC,CAA6B,CAAC,GAAG,CAAC,CACpC,EACD;AACA,YAAA,OAAO,KAAK;QACd;IACF;AAEA,IAAA,OAAO,IAAI;AACb;;;;"}

package/dist/cjs/lib/derive.js

@@ -18,22 +18,24 @@ var deeplyEquals = require('./deeplyEquals.js');
  */
 const derive = (store, deriveFn, dependencyFn) => {
     let memo;
-    let prev;
-    let isStale = true;
+    let hasMemo = false;
+    let prevState;
+    let prevDeps;
     let unsubscribe;
     const listeners = new Set();
-    const compute = () => {
-        memo = deriveFn(store.get());
-        isStale = false;
-        return memo;
-    };
     const get = () => {
-        const next = dependencyFn?.(store.get());
-        isStale &&= !prev || !deeplyEquals.deeplyEquals(prev, next);
-        if (isStale) {
-            prev = next;
-            return compute();
+        const state = store.get();
+        if (hasMemo && Object.is(state, prevState)) {
+            return memo;
+        }
+        prevState = state;
+        const deps = dependencyFn?.(state);
+        if (hasMemo && dependencyFn && deeplyEquals.deeplyEquals(prevDeps, deps)) {
+            return memo;
         }
+        prevDeps = deps;
+        memo = deriveFn(state);
+        hasMemo = true;
         return memo;
     };
     const subscribe = (listener) => {
@@ -50,7 +52,6 @@ const derive = (store, deriveFn, dependencyFn) => {
         };
     };
     const listener = () => {
-        isStale = true;
         listeners.forEach((listener) => listener(get()));
     };
     const mount = () => {

package/dist/cjs/lib/derive.js.map

@@ -1 +1 @@
-{"version":3,"file":"derive.js","sources":["../../../src/lib/derive.ts"],"sourcesContent":["import { DerivedStore, Listener, Store } from \"../types/types\";\nimport { deeplyEquals } from \"./deeplyEquals\";\n\n/**\n * Creates a derived store from an existing store.\n *\n * A derived store computes its state based on the original store's state using a derive function.\n * The derived store's value is memoized and only recomputed when requested.\n *\n * @param store - The original store to derive from\n * @param deriveFn - A function that computes the derived state from the original state\n * @param dependencyFn - Optional function that returns an array of dependencies. If provided, the derived state will only be recomputed when these dependencies change\n *\n * @returns A new store containing the derived state\n *\n * @see {@link https://dharma.fransek.dev/core/derive/}\n */\nexport const derive = <TState, TActions, TDerived>(\n  store: Store<TState, TActions>,\n  deriveFn: (state: TState) => TDerived,\n  dependencyFn?: (state: TState) => unknown[],\n): DerivedStore<TDerived> => {\n  let memo: TDerived | undefined;\n  let prev: unknown[] | undefined;\n  let isStale = true;\n  let unsubscribe: (() => void) | undefined;\n  const listeners = new Set<Listener<TDerived>>();\n\n  const compute = () => {\n    memo = deriveFn(store.get());\n    isStale = false;\n    return memo;\n  };\n\n  const get = () => {\n    const next = dependencyFn?.(store.get());\n    isStale &&= !prev || !deeplyEquals(prev, next);\n\n    if (isStale) {\n      prev = next;\n      return compute();\n    }\n\n    return memo as TDerived;\n  };\n\n  const subscribe = (listener: Listener<TDerived>) => {\n    if (listeners.size === 0) {\n      mount();\n    }\n\n    listener(get());\n    listeners.add(listener);\n\n    return () => {\n      listeners.delete(listener);\n\n      if (listeners.size === 0) {\n        unmount();\n      }\n    };\n  };\n\n  const listener = () => {\n    isStale = true;\n    listeners.forEach((listener) => listener(get()));\n  };\n\n  const mount = () => {\n    if (!unsubscribe) {\n      unsubscribe = store.subscribe(listener);\n    }\n    return unmount;\n  };\n\n  const unmount = () => {\n    unsubscribe?.();\n    unsubscribe = undefined;\n  };\n\n  return {\n    get,\n    subscribe,\n    mount,\n    unmount,\n  };\n};\n"],"names":["deeplyEquals"],"mappings":";;;;AAGA;;;;;;;;;;;;;AAaG;AACI,MAAM,MAAM,GAAG,CACpB,KAA8B,EAC9B,QAAqC,EACrC,YAA2C,KACjB;AAC1B,IAAA,IAAI,IAA0B;AAC9B,IAAA,IAAI,IAA2B;IAC/B,IAAI,OAAO,GAAG,IAAI;AAClB,IAAA,IAAI,WAAqC;AACzC,IAAA,MAAM,SAAS,GAAG,IAAI,GAAG,EAAsB;IAE/C,MAAM,OAAO,GAAG,MAAK;QACnB,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC5B,OAAO,GAAG,KAAK;AACf,QAAA,OAAO,IAAI;AACb,IAAA,CAAC;IAED,MAAM,GAAG,GAAG,MAAK;QACf,MAAM,IAAI,GAAG,YAAY,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC,IAAI,IAAI,CAACA,yBAAY,CAAC,IAAI,EAAE,IAAI,CAAC;QAE9C,IAAI,OAAO,EAAE;YACX,IAAI,GAAG,IAAI;YACX,OAAO,OAAO,EAAE;QAClB;AAEA,QAAA,OAAO,IAAgB;AACzB,IAAA,CAAC;AAED,IAAA,MAAM,SAAS,GAAG,CAAC,QAA4B,KAAI;AACjD,QAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;AACxB,YAAA,KAAK,EAAE;QACT;AAEA,QAAA,QAAQ,CAAC,GAAG,EAAE,CAAC;AACf,QAAA,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC;AAEvB,QAAA,OAAO,MAAK;AACV,YAAA,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC;AAE1B,YAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;AACxB,gBAAA,OAAO,EAAE;YACX;AACF,QAAA,CAAC;AACH,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;QACpB,OAAO,GAAG,IAAI;AACd,QAAA,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;AAClD,IAAA,CAAC;IAED,MAAM,KAAK,GAAG,MAAK;QACjB,IAAI,CAAC,WAAW,EAAE;AAChB,YAAA,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC;QACzC;AACA,QAAA,OAAO,OAAO;AAChB,IAAA,CAAC;IAED,MAAM,OAAO,GAAG,MAAK;QACnB,WAAW,IAAI;QACf,WAAW,GAAG,SAAS;AACzB,IAAA,CAAC;IAED,OAAO;QACL,GAAG;QACH,SAAS;QACT,KAAK;QACL,OAAO;KACR;AACH;;;;"}
+{"version":3,"file":"derive.js","sources":["../../../src/lib/derive.ts"],"sourcesContent":["import { DerivedStore, Listener, Store } from \"../types/types\";\nimport { deeplyEquals } from \"./deeplyEquals\";\n\n/**\n * Creates a derived store from an existing store.\n *\n * A derived store computes its state based on the original store's state using a derive function.\n * The derived store's value is memoized and only recomputed when requested.\n *\n * @param store - The original store to derive from\n * @param deriveFn - A function that computes the derived state from the original state\n * @param dependencyFn - Optional function that returns an array of dependencies. If provided, the derived state will only be recomputed when these dependencies change\n *\n * @returns A new store containing the derived state\n *\n * @see {@link https://dharma.fransek.dev/core/derive/}\n */\nexport const derive = <TState, TActions, TDerived>(\n  store: Store<TState, TActions>,\n  deriveFn: (state: TState) => TDerived,\n  dependencyFn?: (state: TState) => unknown[],\n): DerivedStore<TDerived> => {\n  let memo: TDerived | undefined;\n  let hasMemo = false;\n  let prevState: TState | undefined;\n  let prevDeps: unknown[] | undefined;\n  let unsubscribe: (() => void) | undefined;\n  const listeners = new Set<Listener<TDerived>>();\n\n  const get = () => {\n    const state = store.get();\n\n    if (hasMemo && Object.is(state, prevState)) {\n      return memo as TDerived;\n    }\n\n    prevState = state;\n    const deps = dependencyFn?.(state);\n\n    if (hasMemo && dependencyFn && deeplyEquals(prevDeps, deps)) {\n      return memo as TDerived;\n    }\n\n    prevDeps = deps;\n    memo = deriveFn(state);\n    hasMemo = true;\n    return memo;\n  };\n\n  const subscribe = (listener: Listener<TDerived>) => {\n    if (listeners.size === 0) {\n      mount();\n    }\n\n    listener(get());\n    listeners.add(listener);\n\n    return () => {\n      listeners.delete(listener);\n\n      if (listeners.size === 0) {\n        unmount();\n      }\n    };\n  };\n\n  const listener = () => {\n    listeners.forEach((listener) => listener(get()));\n  };\n\n  const mount = () => {\n    if (!unsubscribe) {\n      unsubscribe = store.subscribe(listener);\n    }\n    return unmount;\n  };\n\n  const unmount = () => {\n    unsubscribe?.();\n    unsubscribe = undefined;\n  };\n\n  return {\n    get,\n    subscribe,\n    mount,\n    unmount,\n  };\n};\n"],"names":["deeplyEquals"],"mappings":";;;;AAGA;;;;;;;;;;;;;AAaG;AACI,MAAM,MAAM,GAAG,CACpB,KAA8B,EAC9B,QAAqC,EACrC,YAA2C,KACjB;AAC1B,IAAA,IAAI,IAA0B;IAC9B,IAAI,OAAO,GAAG,KAAK;AACnB,IAAA,IAAI,SAA6B;AACjC,IAAA,IAAI,QAA+B;AACnC,IAAA,IAAI,WAAqC;AACzC,IAAA,MAAM,SAAS,GAAG,IAAI,GAAG,EAAsB;IAE/C,MAAM,GAAG,GAAG,MAAK;AACf,QAAA,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE;QAEzB,IAAI,OAAO,IAAI,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE;AAC1C,YAAA,OAAO,IAAgB;QACzB;QAEA,SAAS,GAAG,KAAK;AACjB,QAAA,MAAM,IAAI,GAAG,YAAY,GAAG,KAAK,CAAC;QAElC,IAAI,OAAO,IAAI,YAAY,IAAIA,yBAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE;AAC3D,YAAA,OAAO,IAAgB;QACzB;QAEA,QAAQ,GAAG,IAAI;AACf,QAAA,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC;QACtB,OAAO,GAAG,IAAI;AACd,QAAA,OAAO,IAAI;AACb,IAAA,CAAC;AAED,IAAA,MAAM,SAAS,GAAG,CAAC,QAA4B,KAAI;AACjD,QAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;AACxB,YAAA,KAAK,EAAE;QACT;AAEA,QAAA,QAAQ,CAAC,GAAG,EAAE,CAAC;AACf,QAAA,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC;AAEvB,QAAA,OAAO,MAAK;AACV,YAAA,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC;AAE1B,YAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;AACxB,gBAAA,OAAO,EAAE;YACX;AACF,QAAA,CAAC;AACH,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;AACpB,QAAA,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;AAClD,IAAA,CAAC;IAED,MAAM,KAAK,GAAG,MAAK;QACjB,IAAI,CAAC,WAAW,EAAE;AAChB,YAAA,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC;QACzC;AACA,QAAA,OAAO,OAAO;AAChB,IAAA,CAAC;IAED,MAAM,OAAO,GAAG,MAAK;QACnB,WAAW,IAAI;QACf,WAAW,GAAG,SAAS;AACzB,IAAA,CAAC;IAED,OAAO;QACL,GAAG;QACH,SAAS;QACT,KAAK;QACL,OAAO;KACR;AACH;;;;"}

package/dist/cjs/lib/merge.d.ts

@@ -5,6 +5,7 @@ import { StateModifier } from "../types/types";
  * @param {T} currentState - The current state object.
  * @param {StateModifier<T>} stateModifier - A function or object that modifies the state.
  * @returns {T} The new state object, which is a combination of the current state and the state modifier.
+ * Returns `currentState` itself if the state modifier resolves to it.
  *
  * @see {@link https://dharma.fransek.dev/core/merge/}
  */

package/dist/cjs/lib/merge.js

@@ -8,21 +8,21 @@ const isObject = (value) => !!value && typeof value === "object" && !Array.isArr
  * @param {T} currentState - The current state object.
  * @param {StateModifier<T>} stateModifier - A function or object that modifies the state.
  * @returns {T} The new state object, which is a combination of the current state and the state modifier.
+ * Returns `currentState` itself if the state modifier resolves to it.
  *
  * @see {@link https://dharma.fransek.dev/core/merge/}
  */
 const merge = (currentState, stateModifier) => {
-    if (isObject(stateModifier)) {
-        return { ...currentState, ...stateModifier };
+    const modifiedState = typeof stateModifier === "function"
+        ? stateModifier(currentState)
+        : stateModifier;
+    if (Object.is(modifiedState, currentState)) {
+        return currentState;
     }
-    if (typeof stateModifier === "function") {
-        const modifiedState = stateModifier(currentState);
-        if (isObject(modifiedState)) {
-            return { ...currentState, ...modifiedState };
-        }
-        return modifiedState;
+    if (isObject(modifiedState)) {
+        return { ...currentState, ...modifiedState };
     }
-    return stateModifier;
+    return modifiedState;
 };
 
 exports.merge = merge;

package/dist/cjs/lib/merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge.js","sources":["../../../src/lib/merge.ts"],"sourcesContent":["import { StateModifier } from \"../types/types\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst isObject = (value: unknown): value is Record<keyof any, unknown> =>\n  !!value && typeof value === \"object\" && !Array.isArray(value);\n\n/**\n * Merges the current state with a state modifier.\n *\n * @param {T} currentState - The current state object.\n * @param {StateModifier<T>} stateModifier - A function or object that modifies the state.\n * @returns {T} The new state object, which is a combination of the current state and the state modifier.\n *\n * @see {@link https://dharma.fransek.dev/core/merge/}\n */\nexport const merge = <T>(\n  currentState: T,\n  stateModifier: StateModifier<T>,\n): T => {\n  if (isObject(stateModifier)) {\n    return { ...currentState, ...stateModifier };\n  }\n\n  if (typeof stateModifier === \"function\") {\n    const modifiedState = stateModifier(currentState);\n\n    if (isObject(modifiedState)) {\n      return { ...currentState, ...modifiedState };\n    }\n\n    return modifiedState;\n  }\n\n  return stateModifier;\n};\n"],"names":[],"mappings":";;AAEA;AACA,MAAM,QAAQ,GAAG,CAAC,KAAc,KAC9B,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;AAE/D;;;;;;;;AAQG;MACU,KAAK,GAAG,CACnB,YAAe,EACf,aAA+B,KAC1B;AACL,IAAA,IAAI,QAAQ,CAAC,aAAa,CAAC,EAAE;AAC3B,QAAA,OAAO,EAAE,GAAG,YAAY,EAAE,GAAG,aAAa,EAAE;IAC9C;AAEA,IAAA,IAAI,OAAO,aAAa,KAAK,UAAU,EAAE;AACvC,QAAA,MAAM,aAAa,GAAG,aAAa,CAAC,YAAY,CAAC;AAEjD,QAAA,IAAI,QAAQ,CAAC,aAAa,CAAC,EAAE;AAC3B,YAAA,OAAO,EAAE,GAAG,YAAY,EAAE,GAAG,aAAa,EAAE;QAC9C;AAEA,QAAA,OAAO,aAAa;IACtB;AAEA,IAAA,OAAO,aAAa;AACtB;;;;"}
+{"version":3,"file":"merge.js","sources":["../../../src/lib/merge.ts"],"sourcesContent":["import { StateModifier } from \"../types/types\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst isObject = (value: unknown): value is Record<keyof any, unknown> =>\n  !!value && typeof value === \"object\" && !Array.isArray(value);\n\n/**\n * Merges the current state with a state modifier.\n *\n * @param {T} currentState - The current state object.\n * @param {StateModifier<T>} stateModifier - A function or object that modifies the state.\n * @returns {T} The new state object, which is a combination of the current state and the state modifier.\n * Returns `currentState` itself if the state modifier resolves to it.\n *\n * @see {@link https://dharma.fransek.dev/core/merge/}\n */\nexport const merge = <T>(\n  currentState: T,\n  stateModifier: StateModifier<T>,\n): T => {\n  const modifiedState =\n    typeof stateModifier === \"function\"\n      ? stateModifier(currentState)\n      : stateModifier;\n\n  if (Object.is(modifiedState, currentState)) {\n    return currentState;\n  }\n\n  if (isObject(modifiedState)) {\n    return { ...currentState, ...modifiedState };\n  }\n\n  return modifiedState as T;\n};\n"],"names":[],"mappings":";;AAEA;AACA,MAAM,QAAQ,GAAG,CAAC,KAAc,KAC9B,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;AAE/D;;;;;;;;;AASG;MACU,KAAK,GAAG,CACnB,YAAe,EACf,aAA+B,KAC1B;AACL,IAAA,MAAM,aAAa,GACjB,OAAO,aAAa,KAAK;AACvB,UAAE,aAAa,CAAC,YAAY;UAC1B,aAAa;IAEnB,IAAI,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,YAAY,CAAC,EAAE;AAC1C,QAAA,OAAO,YAAY;IACrB;AAEA,IAAA,IAAI,QAAQ,CAAC,aAAa,CAAC,EAAE;AAC3B,QAAA,OAAO,EAAE,GAAG,YAAY,EAAE,GAAG,aAAa,EAAE;IAC9C;AAEA,IAAA,OAAO,aAAkB;AAC3B;;;;"}

package/dist/cjs/types/types.d.ts

@@ -67,11 +67,10 @@ export type BaseConfig<TState, TActions> = {
     /** Invoked whenever the state changes. */
     onChange?: StoreEventListener<TState>;
 };
-export type MaybePromise<T> = T | Promise<T>;
+export type MaybePromise<T> = T | PromiseLike<T>;
 export type StorageAPI = {
     getItem: (key: string) => MaybePromise<string | null>;
     setItem: (key: string, value: string) => MaybePromise<void>;
-    removeItem: (key: string) => MaybePromise<void>;
 };
 export type Serializer<T = any> = {
     stringify: (value: T) => string;
@@ -90,5 +89,13 @@ export type PersistConfig<TState> = {
     storage?: StorageAPI;
     /** The serializer to use for storing the state. Defaults to JSON. */
     serializer?: Serializer<TState>;
+    /**
+     * When to initially synchronize the store's state with the storage. Defaults to "load".
+     *
+     * Set to "attach" when using SSR to avoid hydration errors.
+     */
+    syncWithStorageOn?: "load" | "attach";
+    /** Invoked when a storage error occurs. */
+    onStorageError?: (error: unknown) => void;
 };
 export type StoreConfig<TState, TActions> = BaseConfig<TState, TActions> & (PersistConfig<TState> | NoPersistConfig);

package/dist/esm/index.d.ts

@@ -2,4 +2,5 @@ export * from "./lib/createEffect";
 export * from "./lib/createStore";
 export * from "./lib/derive";
 export * from "./lib/merge";
+export * from "./lib/StorageUnavailableError";
 export * from "./types/types";

package/dist/esm/index.js

@@ -2,4 +2,5 @@ export { createEffect } from './lib/createEffect.js';
 export { createStore } from './lib/createStore.js';
 export { derive } from './lib/derive.js';
 export { merge } from './lib/merge.js';
+export { StorageUnavailableError } from './lib/StorageUnavailableError.js';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;"}

package/dist/esm/internal/createStorageAdapter.d.ts

@@ -1,6 +1,6 @@
 import { SetState, StoreConfig } from "../types/types";
 export declare const createStorageAdapter: <TState, TActions>(config: StoreConfig<TState, TActions>, get: () => TState, set: SetState<TState>) => {
-    onLoad: () => Promise<void>;
+    onLoad: () => void;
     onChange: (newState: TState) => Promise<void>;
     onAttach: () => void;
     onDetach: () => void;

package/dist/esm/internal/createStorageAdapter.js

@@ -1,71 +1,89 @@
-import { warn } from './warn.js';
+import { StorageUnavailableError } from '../lib/StorageUnavailableError.js';
 
+const isThenable = (value) => typeof value?.then === "function";
+const getDefaultStorage = () => {
+    try {
+        // Accessing localStorage can throw, e.g. in sandboxed iframes or when cookies are disabled
+        return localStorage;
+    }
+    catch {
+        return undefined;
+    }
+};
 const createStorageAdapter = (config, get, set) => {
     if (!config.persist) {
         return null;
     }
     const IS_BROWSER = typeof window !== "undefined";
-    const storage = config.storage ?? (IS_BROWSER ? localStorage : undefined);
+    // React Native defines window without the event listener API
+    const CAN_LISTEN = IS_BROWSER && typeof window.addEventListener === "function";
+    const storage = config.storage ?? (IS_BROWSER ? getDefaultStorage() : undefined);
+    const { key, serializer = JSON, syncWithStorageOn = "load", onStorageError, } = config;
     if (!storage) {
-        warn("No storage provider found. If this happened during SSR, you can safely ignore this warning.");
+        onStorageError?.(new StorageUnavailableError(key));
         return null;
     }
-    const { key, serializer = JSON, initialState } = config;
-    const initKey = `init_${key}`;
-    const onLoad = async () => {
-        try {
-            let initialStateSnapshot = storage.getItem(initKey);
-            const initialStateString = serializer.stringify(initialState);
-            if (initialStateSnapshot instanceof Promise) {
-                initialStateSnapshot = await initialStateSnapshot;
-            }
-            if (initialStateSnapshot !== initialStateString) {
-                storage.setItem(initKey, initialStateString);
-                storage.removeItem(key);
-            }
-        }
-        catch {
-            warn("Failed to initialize snapshots. If this happened during SSR, you can safely ignore this warning.");
-        }
-    };
     const syncWithSnapshot = async () => {
+        let nextState;
         try {
+            const prevState = get();
             let currentSnapshot = storage.getItem(key);
-            if (currentSnapshot instanceof Promise) {
+            if (isThenable(currentSnapshot)) {
                 currentSnapshot = await currentSnapshot;
+                // The state changed while reading, so the snapshot is outdated
+                if (!Object.is(get(), prevState)) {
+                    return;
+                }
             }
-            if (currentSnapshot && currentSnapshot !== serializer.stringify(get())) {
-                set(serializer.parse(currentSnapshot));
+            if (!currentSnapshot || currentSnapshot === serializer.stringify(get())) {
+                return;
             }
+            nextState = serializer.parse(currentSnapshot);
         }
-        catch {
-            warn("Failed to update state from snapshot");
+        catch (error) {
+            onStorageError?.(error);
+            return;
+        }
+        set(nextState);
+    };
+    const onLoad = () => {
+        if (syncWithStorageOn === "load") {
+            syncWithSnapshot();
+        }
+    };
+    const onStorage = (event) => {
+        if (event.key === key && event.storageArea === storage) {
+            syncWithSnapshot();
         }
     };
     const onAttach = () => {
-        syncWithSnapshot();
-        if (IS_BROWSER) {
+        if (syncWithStorageOn === "attach") {
+            syncWithSnapshot();
+        }
+        if (CAN_LISTEN) {
             window.addEventListener("focus", syncWithSnapshot);
+            window.addEventListener("storage", onStorage);
         }
     };
     const onChange = async (newState) => {
         try {
             let currentSnapshot = storage.getItem(key);
             const newSnapshot = serializer.stringify(newState);
-            if (currentSnapshot instanceof Promise) {
+            if (isThenable(currentSnapshot)) {
                 currentSnapshot = await currentSnapshot;
             }
             if (newSnapshot !== currentSnapshot) {
-                storage.setItem(key, newSnapshot);
+                await storage.setItem(key, newSnapshot);
             }
         }
-        catch {
-            warn("Failed to update snapshot");
+        catch (error) {
+            onStorageError?.(error);
         }
     };
     const onDetach = () => {
-        if (IS_BROWSER) {
+        if (CAN_LISTEN) {
             window.removeEventListener("focus", syncWithSnapshot);
+            window.removeEventListener("storage", onStorage);
         }
     };
     return {

package/dist/esm/internal/createStorageAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"createStorageAdapter.js","sources":["../../../src/internal/createStorageAdapter.ts"],"sourcesContent":["import { SetState, StorageAPI, StoreConfig } from \"../types/types\";\nimport { warn } from \"./warn\";\n\nexport const createStorageAdapter = <TState, TActions>(\n  config: StoreConfig<TState, TActions>,\n  get: () => TState,\n  set: SetState<TState>,\n) => {\n  if (!config.persist) {\n    return null;\n  }\n\n  const IS_BROWSER = typeof window !== \"undefined\";\n\n  const storage =\n    config.storage ?? (IS_BROWSER ? (localStorage as StorageAPI) : undefined);\n\n  if (!storage) {\n    warn(\n      \"No storage provider found. If this happened during SSR, you can safely ignore this warning.\",\n    );\n    return null;\n  }\n\n  const { key, serializer = JSON, initialState } = config;\n  const initKey = `init_${key}`;\n\n  const onLoad = async () => {\n    try {\n      let initialStateSnapshot = storage.getItem(initKey);\n      const initialStateString = serializer.stringify(initialState);\n\n      if (initialStateSnapshot instanceof Promise) {\n        initialStateSnapshot = await initialStateSnapshot;\n      }\n\n      if (initialStateSnapshot !== initialStateString) {\n        storage.setItem(initKey, initialStateString);\n        storage.removeItem(key);\n      }\n    } catch {\n      warn(\n        \"Failed to initialize snapshots. If this happened during SSR, you can safely ignore this warning.\",\n      );\n    }\n  };\n\n  const syncWithSnapshot = async () => {\n    try {\n      let currentSnapshot = storage.getItem(key);\n\n      if (currentSnapshot instanceof Promise) {\n        currentSnapshot = await currentSnapshot;\n      }\n\n      if (currentSnapshot && currentSnapshot !== serializer.stringify(get())) {\n        set(serializer.parse(currentSnapshot));\n      }\n    } catch {\n      warn(\"Failed to update state from snapshot\");\n    }\n  };\n\n  const onAttach = () => {\n    syncWithSnapshot();\n\n    if (IS_BROWSER) {\n      window.addEventListener(\"focus\", syncWithSnapshot);\n    }\n  };\n\n  const onChange = async (newState: TState) => {\n    try {\n      let currentSnapshot = storage.getItem(key);\n      const newSnapshot = serializer.stringify(newState);\n\n      if (currentSnapshot instanceof Promise) {\n        currentSnapshot = await currentSnapshot;\n      }\n\n      if (newSnapshot !== currentSnapshot) {\n        storage.setItem(key, newSnapshot);\n      }\n    } catch {\n      warn(\"Failed to update snapshot\");\n    }\n  };\n\n  const onDetach = () => {\n    if (IS_BROWSER) {\n      window.removeEventListener(\"focus\", syncWithSnapshot);\n    }\n  };\n\n  return {\n    onLoad,\n    onChange,\n    onAttach,\n    onDetach,\n  };\n};\n"],"names":[],"mappings":";;AAGO,MAAM,oBAAoB,GAAG,CAClC,MAAqC,EACrC,GAAiB,EACjB,GAAqB,KACnB;AACF,IAAA,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;AACnB,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,MAAM,UAAU,GAAG,OAAO,MAAM,KAAK,WAAW;AAEhD,IAAA,MAAM,OAAO,GACX,MAAM,CAAC,OAAO,KAAK,UAAU,GAAI,YAA2B,GAAG,SAAS,CAAC;IAE3E,IAAI,CAAC,OAAO,EAAE;QACZ,IAAI,CACF,6FAA6F,CAC9F;AACD,QAAA,OAAO,IAAI;IACb;IAEA,MAAM,EAAE,GAAG,EAAE,UAAU,GAAG,IAAI,EAAE,YAAY,EAAE,GAAG,MAAM;AACvD,IAAA,MAAM,OAAO,GAAG,CAAA,KAAA,EAAQ,GAAG,EAAE;AAE7B,IAAA,MAAM,MAAM,GAAG,YAAW;AACxB,QAAA,IAAI;YACF,IAAI,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;YACnD,MAAM,kBAAkB,GAAG,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC;AAE7D,YAAA,IAAI,oBAAoB,YAAY,OAAO,EAAE;gBAC3C,oBAAoB,GAAG,MAAM,oBAAoB;YACnD;AAEA,YAAA,IAAI,oBAAoB,KAAK,kBAAkB,EAAE;AAC/C,gBAAA,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,kBAAkB,CAAC;AAC5C,gBAAA,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;YACzB;QACF;AAAE,QAAA,MAAM;YACN,IAAI,CACF,kGAAkG,CACnG;QACH;AACF,IAAA,CAAC;AAED,IAAA,MAAM,gBAAgB,GAAG,YAAW;AAClC,QAAA,IAAI;YACF,IAAI,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;AAE1C,YAAA,IAAI,eAAe,YAAY,OAAO,EAAE;gBACtC,eAAe,GAAG,MAAM,eAAe;YACzC;AAEA,YAAA,IAAI,eAAe,IAAI,eAAe,KAAK,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE;gBACtE,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACxC;QACF;AAAE,QAAA,MAAM;YACN,IAAI,CAAC,sCAAsC,CAAC;QAC9C;AACF,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;AACpB,QAAA,gBAAgB,EAAE;QAElB,IAAI,UAAU,EAAE;AACd,YAAA,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,CAAC;QACpD;AACF,IAAA,CAAC;AAED,IAAA,MAAM,QAAQ,GAAG,OAAO,QAAgB,KAAI;AAC1C,QAAA,IAAI;YACF,IAAI,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;YAC1C,MAAM,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC;AAElD,YAAA,IAAI,eAAe,YAAY,OAAO,EAAE;gBACtC,eAAe,GAAG,MAAM,eAAe;YACzC;AAEA,YAAA,IAAI,WAAW,KAAK,eAAe,EAAE;AACnC,gBAAA,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC;YACnC;QACF;AAAE,QAAA,MAAM;YACN,IAAI,CAAC,2BAA2B,CAAC;QACnC;AACF,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;QACpB,IAAI,UAAU,EAAE;AACd,YAAA,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC;QACvD;AACF,IAAA,CAAC;IAED,OAAO;QACL,MAAM;QACN,QAAQ;QACR,QAAQ;QACR,QAAQ;KACT;AACH;;;;"}
+{"version":3,"file":"createStorageAdapter.js","sources":["../../../src/internal/createStorageAdapter.ts"],"sourcesContent":["import { StorageUnavailableError } from \"../lib/StorageUnavailableError\";\nimport { SetState, StorageAPI, StoreConfig } from \"../types/types\";\n\nconst isThenable = (value: unknown): value is PromiseLike<unknown> =>\n  typeof (value as PromiseLike<unknown> | null)?.then === \"function\";\n\nconst getDefaultStorage = (): StorageAPI | undefined => {\n  try {\n    // Accessing localStorage can throw, e.g. in sandboxed iframes or when cookies are disabled\n    return localStorage;\n  } catch {\n    return undefined;\n  }\n};\n\nexport const createStorageAdapter = <TState, TActions>(\n  config: StoreConfig<TState, TActions>,\n  get: () => TState,\n  set: SetState<TState>,\n) => {\n  if (!config.persist) {\n    return null;\n  }\n\n  const IS_BROWSER = typeof window !== \"undefined\";\n  // React Native defines window without the event listener API\n  const CAN_LISTEN =\n    IS_BROWSER && typeof window.addEventListener === \"function\";\n\n  const storage =\n    config.storage ?? (IS_BROWSER ? getDefaultStorage() : undefined);\n\n  const {\n    key,\n    serializer = JSON,\n    syncWithStorageOn = \"load\",\n    onStorageError,\n  } = config;\n\n  if (!storage) {\n    onStorageError?.(new StorageUnavailableError(key));\n    return null;\n  }\n\n  const syncWithSnapshot = async () => {\n    let nextState: TState;\n\n    try {\n      const prevState = get();\n      let currentSnapshot = storage.getItem(key);\n\n      if (isThenable(currentSnapshot)) {\n        currentSnapshot = await currentSnapshot;\n\n        // The state changed while reading, so the snapshot is outdated\n        if (!Object.is(get(), prevState)) {\n          return;\n        }\n      }\n\n      if (!currentSnapshot || currentSnapshot === serializer.stringify(get())) {\n        return;\n      }\n\n      nextState = serializer.parse(currentSnapshot);\n    } catch (error) {\n      onStorageError?.(error);\n      return;\n    }\n\n    set(nextState);\n  };\n\n  const onLoad = () => {\n    if (syncWithStorageOn === \"load\") {\n      syncWithSnapshot();\n    }\n  };\n\n  const onStorage = (event: StorageEvent) => {\n    if (event.key === key && event.storageArea === storage) {\n      syncWithSnapshot();\n    }\n  };\n\n  const onAttach = () => {\n    if (syncWithStorageOn === \"attach\") {\n      syncWithSnapshot();\n    }\n\n    if (CAN_LISTEN) {\n      window.addEventListener(\"focus\", syncWithSnapshot);\n      window.addEventListener(\"storage\", onStorage);\n    }\n  };\n\n  const onChange = async (newState: TState) => {\n    try {\n      let currentSnapshot = storage.getItem(key);\n      const newSnapshot = serializer.stringify(newState);\n\n      if (isThenable(currentSnapshot)) {\n        currentSnapshot = await currentSnapshot;\n      }\n\n      if (newSnapshot !== currentSnapshot) {\n        await storage.setItem(key, newSnapshot);\n      }\n    } catch (error) {\n      onStorageError?.(error);\n    }\n  };\n\n  const onDetach = () => {\n    if (CAN_LISTEN) {\n      window.removeEventListener(\"focus\", syncWithSnapshot);\n      window.removeEventListener(\"storage\", onStorage);\n    }\n  };\n\n  return {\n    onLoad,\n    onChange,\n    onAttach,\n    onDetach,\n  };\n};\n"],"names":[],"mappings":";;AAGA,MAAM,UAAU,GAAG,CAAC,KAAc,KAChC,OAAQ,KAAqC,EAAE,IAAI,KAAK,UAAU;AAEpE,MAAM,iBAAiB,GAAG,MAA6B;AACrD,IAAA,IAAI;;AAEF,QAAA,OAAO,YAAY;IACrB;AAAE,IAAA,MAAM;AACN,QAAA,OAAO,SAAS;IAClB;AACF,CAAC;AAEM,MAAM,oBAAoB,GAAG,CAClC,MAAqC,EACrC,GAAiB,EACjB,GAAqB,KACnB;AACF,IAAA,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;AACnB,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,MAAM,UAAU,GAAG,OAAO,MAAM,KAAK,WAAW;;IAEhD,MAAM,UAAU,GACd,UAAU,IAAI,OAAO,MAAM,CAAC,gBAAgB,KAAK,UAAU;AAE7D,IAAA,MAAM,OAAO,GACX,MAAM,CAAC,OAAO,KAAK,UAAU,GAAG,iBAAiB,EAAE,GAAG,SAAS,CAAC;AAElE,IAAA,MAAM,EACJ,GAAG,EACH,UAAU,GAAG,IAAI,EACjB,iBAAiB,GAAG,MAAM,EAC1B,cAAc,GACf,GAAG,MAAM;IAEV,IAAI,CAAC,OAAO,EAAE;QACZ,cAAc,GAAG,IAAI,uBAAuB,CAAC,GAAG,CAAC,CAAC;AAClD,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,MAAM,gBAAgB,GAAG,YAAW;AAClC,QAAA,IAAI,SAAiB;AAErB,QAAA,IAAI;AACF,YAAA,MAAM,SAAS,GAAG,GAAG,EAAE;YACvB,IAAI,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;AAE1C,YAAA,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE;gBAC/B,eAAe,GAAG,MAAM,eAAe;;gBAGvC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,EAAE;oBAChC;gBACF;YACF;AAEA,YAAA,IAAI,CAAC,eAAe,IAAI,eAAe,KAAK,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE;gBACvE;YACF;AAEA,YAAA,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC;QAC/C;QAAE,OAAO,KAAK,EAAE;AACd,YAAA,cAAc,GAAG,KAAK,CAAC;YACvB;QACF;QAEA,GAAG,CAAC,SAAS,CAAC;AAChB,IAAA,CAAC;IAED,MAAM,MAAM,GAAG,MAAK;AAClB,QAAA,IAAI,iBAAiB,KAAK,MAAM,EAAE;AAChC,YAAA,gBAAgB,EAAE;QACpB;AACF,IAAA,CAAC;AAED,IAAA,MAAM,SAAS,GAAG,CAAC,KAAmB,KAAI;AACxC,QAAA,IAAI,KAAK,CAAC,GAAG,KAAK,GAAG,IAAI,KAAK,CAAC,WAAW,KAAK,OAAO,EAAE;AACtD,YAAA,gBAAgB,EAAE;QACpB;AACF,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;AACpB,QAAA,IAAI,iBAAiB,KAAK,QAAQ,EAAE;AAClC,YAAA,gBAAgB,EAAE;QACpB;QAEA,IAAI,UAAU,EAAE;AACd,YAAA,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,CAAC;AAClD,YAAA,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC;QAC/C;AACF,IAAA,CAAC;AAED,IAAA,MAAM,QAAQ,GAAG,OAAO,QAAgB,KAAI;AAC1C,QAAA,IAAI;YACF,IAAI,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC;YAC1C,MAAM,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC;AAElD,YAAA,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE;gBAC/B,eAAe,GAAG,MAAM,eAAe;YACzC;AAEA,YAAA,IAAI,WAAW,KAAK,eAAe,EAAE;gBACnC,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC;YACzC;QACF;QAAE,OAAO,KAAK,EAAE;AACd,YAAA,cAAc,GAAG,KAAK,CAAC;QACzB;AACF,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;QACpB,IAAI,UAAU,EAAE;AACd,YAAA,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,CAAC;AACrD,YAAA,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,CAAC;QAClD;AACF,IAAA,CAAC;IAED,OAAO;QACL,MAAM;QACN,QAAQ;QACR,QAAQ;QACR,QAAQ;KACT;AACH;;;;"}

package/dist/esm/lib/StorageUnavailableError.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Reported to `onStorageError` when a persisted store has no storage to use.
+ * This is expected during SSR, and can otherwise mean that local storage is inaccessible.
+ */
+export declare class StorageUnavailableError extends Error {
+    constructor(key: string);
+}

package/dist/esm/lib/StorageUnavailableError.js

@@ -0,0 +1,13 @@
+/**
+ * Reported to `onStorageError` when a persisted store has no storage to use.
+ * This is expected during SSR, and can otherwise mean that local storage is inaccessible.
+ */
+class StorageUnavailableError extends Error {
+    constructor(key) {
+        super(`[dharma-core] No storage provider was found for "${key}". If this happened during SSR, it can be safely ignored.`);
+        this.name = "StorageUnavailableError";
+    }
+}
+
+export { StorageUnavailableError };
+//# sourceMappingURL=StorageUnavailableError.js.map

package/dist/esm/lib/StorageUnavailableError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"StorageUnavailableError.js","sources":["../../../src/lib/StorageUnavailableError.ts"],"sourcesContent":["/**\n * Reported to `onStorageError` when a persisted store has no storage to use.\n * This is expected during SSR, and can otherwise mean that local storage is inaccessible.\n */\nexport class StorageUnavailableError extends Error {\n  constructor(key: string) {\n    super(\n      `[dharma-core] No storage provider was found for \"${key}\". If this happened during SSR, it can be safely ignored.`,\n    );\n    this.name = \"StorageUnavailableError\";\n  }\n}\n"],"names":[],"mappings":"AAAA;;;AAGG;AACG,MAAO,uBAAwB,SAAQ,KAAK,CAAA;AAChD,IAAA,WAAA,CAAY,GAAW,EAAA;AACrB,QAAA,KAAK,CACH,CAAA,iDAAA,EAAoD,GAAG,CAAA,yDAAA,CAA2D,CACnH;AACD,QAAA,IAAI,CAAC,IAAI,GAAG,yBAAyB;IACvC;AACD;;;;"}

package/dist/esm/lib/createEffect.js

@@ -31,6 +31,7 @@ const createEffect = (store, effectFn, dependencyFn) => {
     const unmount = () => {
         unsubscribe?.();
         unsubscribe = undefined;
+        prev = undefined;
     };
     return {
         mount,

package/dist/esm/lib/createEffect.js.map

@@ -1 +1 @@
-{"version":3,"file":"createEffect.js","sources":["../../../src/lib/createEffect.ts"],"sourcesContent":["import { Effect, Store } from \"../types/types\";\nimport { deeplyEquals } from \"./deeplyEquals\";\n\n/**\n * Creates an effect that runs when the store's state changes.\n *\n * @param store - The store instance to subscribe to\n * @param effectFn - The function to run when dependencies change. Receives the current state as argument.\n * @param dependencyFn - Optional function that returns an array of dependencies. If provided, the effect will only run when these dependencies change.\n *\n * @returns An Effect object with mount and unmount methods\n *\n * @see {@link https://dharma.fransek.dev/core/createeffect/}\n */\nexport const createEffect = <TState, TActions, TDerived>(\n  store: Store<TState, TActions>,\n  effectFn: (state: TState) => TDerived,\n  dependencyFn?: (state: TState) => unknown[],\n): Effect => {\n  let prev: unknown[] | undefined;\n  let unsubscribe: (() => void) | undefined;\n\n  const execute = () => effectFn(store.get());\n\n  const effect = () => {\n    const next = dependencyFn?.(store.get());\n\n    if (!prev || !deeplyEquals(prev, next)) {\n      prev = next;\n      execute();\n    }\n  };\n\n  const mount = () => {\n    if (!unsubscribe) {\n      unsubscribe = store.subscribe(effect);\n    }\n    return unmount;\n  };\n\n  const unmount = () => {\n    unsubscribe?.();\n    unsubscribe = undefined;\n  };\n\n  return {\n    mount,\n    unmount,\n  };\n};\n"],"names":[],"mappings":";;AAGA;;;;;;;;;;AAUG;AACI,MAAM,YAAY,GAAG,CAC1B,KAA8B,EAC9B,QAAqC,EACrC,YAA2C,KACjC;AACV,IAAA,IAAI,IAA2B;AAC/B,IAAA,IAAI,WAAqC;AAEzC,IAAA,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IAE3C,MAAM,MAAM,GAAG,MAAK;QAClB,MAAM,IAAI,GAAG,YAAY,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QAExC,IAAI,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YACtC,IAAI,GAAG,IAAI;AACX,YAAA,OAAO,EAAE;QACX;AACF,IAAA,CAAC;IAED,MAAM,KAAK,GAAG,MAAK;QACjB,IAAI,CAAC,WAAW,EAAE;AAChB,YAAA,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC;QACvC;AACA,QAAA,OAAO,OAAO;AAChB,IAAA,CAAC;IAED,MAAM,OAAO,GAAG,MAAK;QACnB,WAAW,IAAI;QACf,WAAW,GAAG,SAAS;AACzB,IAAA,CAAC;IAED,OAAO;QACL,KAAK;QACL,OAAO;KACR;AACH;;;;"}
+{"version":3,"file":"createEffect.js","sources":["../../../src/lib/createEffect.ts"],"sourcesContent":["import { Effect, Store } from \"../types/types\";\nimport { deeplyEquals } from \"./deeplyEquals\";\n\n/**\n * Creates an effect that runs when the store's state changes.\n *\n * @param store - The store instance to subscribe to\n * @param effectFn - The function to run when dependencies change. Receives the current state as argument.\n * @param dependencyFn - Optional function that returns an array of dependencies. If provided, the effect will only run when these dependencies change.\n *\n * @returns An Effect object with mount and unmount methods\n *\n * @see {@link https://dharma.fransek.dev/core/createeffect/}\n */\nexport const createEffect = <TState, TActions, TDerived>(\n  store: Store<TState, TActions>,\n  effectFn: (state: TState) => TDerived,\n  dependencyFn?: (state: TState) => unknown[],\n): Effect => {\n  let prev: unknown[] | undefined;\n  let unsubscribe: (() => void) | undefined;\n\n  const execute = () => effectFn(store.get());\n\n  const effect = () => {\n    const next = dependencyFn?.(store.get());\n\n    if (!prev || !deeplyEquals(prev, next)) {\n      prev = next;\n      execute();\n    }\n  };\n\n  const mount = () => {\n    if (!unsubscribe) {\n      unsubscribe = store.subscribe(effect);\n    }\n    return unmount;\n  };\n\n  const unmount = () => {\n    unsubscribe?.();\n    unsubscribe = undefined;\n    prev = undefined;\n  };\n\n  return {\n    mount,\n    unmount,\n  };\n};\n"],"names":[],"mappings":";;AAGA;;;;;;;;;;AAUG;AACI,MAAM,YAAY,GAAG,CAC1B,KAA8B,EAC9B,QAAqC,EACrC,YAA2C,KACjC;AACV,IAAA,IAAI,IAA2B;AAC/B,IAAA,IAAI,WAAqC;AAEzC,IAAA,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IAE3C,MAAM,MAAM,GAAG,MAAK;QAClB,MAAM,IAAI,GAAG,YAAY,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QAExC,IAAI,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YACtC,IAAI,GAAG,IAAI;AACX,YAAA,OAAO,EAAE;QACX;AACF,IAAA,CAAC;IAED,MAAM,KAAK,GAAG,MAAK;QACjB,IAAI,CAAC,WAAW,EAAE;AAChB,YAAA,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC;QACvC;AACA,QAAA,OAAO,OAAO;AAChB,IAAA,CAAC;IAED,MAAM,OAAO,GAAG,MAAK;QACnB,WAAW,IAAI;QACf,WAAW,GAAG,SAAS;QACvB,IAAI,GAAG,SAAS;AAClB,IAAA,CAAC;IAED,OAAO;QACL,KAAK;QACL,OAAO;KACR;AACH;;;;"}

package/dist/esm/lib/createStore.js

@@ -19,16 +19,15 @@ const createStore = (config) => {
         return state;
     };
     const set = (stateModifier) => {
+        const prevState = state;
         setSilently(stateModifier);
-        dispatch();
+        if (!Object.is(state, prevState)) {
+            dispatch();
+        }
         return state;
     };
     const resetSilently = () => setSilently(initialState);
-    const reset = () => {
-        resetSilently();
-        dispatch();
-        return state;
-    };
+    const reset = () => set(initialState);
     const listeners = new Set();
     const actions = config.actions?.({
         set,
@@ -45,21 +44,20 @@ const createStore = (config) => {
         listener(state);
         listeners.add(listener);
         return () => {
-            listeners.delete(listener);
-            if (listeners.size === 0) {
+            if (listeners.delete(listener) && listeners.size === 0) {
                 storageAdapter?.onDetach();
                 onDetach?.({ state, set, reset, initialState });
             }
         };
     };
     const dispatch = () => {
-        storageAdapter?.onChange(state);
         onChange?.({
             state,
             set: setSilently,
             reset: resetSilently,
             initialState,
         });
+        storageAdapter?.onChange(state);
         listeners.forEach((listener) => listener(state));
     };
     storageAdapter?.onLoad();

package/dist/esm/lib/createStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"createStore.js","sources":["../../../src/lib/createStore.ts"],"sourcesContent":["import { createStorageAdapter } from \"../internal/createStorageAdapter\";\nimport { Listener, StateModifier, Store, StoreConfig } from \"../types/types\";\nimport { merge } from \"./merge\";\n\n/**\n * Creates a store with an initial state and actions that can modify the state.\n *\n * @param {StoreConfig<TState, TActions>} [config] - The configuration for the store.\n *\n * @returns {Store<TState, TActions>} The created store with state management methods.\n *\n * @see {@link https://dharma.fransek.dev/core/createstore/}\n */\nexport const createStore = <TState, TActions = undefined>(\n  config: StoreConfig<TState, TActions>,\n): Store<TState, TActions> => {\n  const { initialState, onLoad, onAttach, onDetach, onChange } = config;\n\n  let state = initialState;\n\n  const get = () => state;\n\n  const setSilently = (stateModifier: StateModifier<TState>) => {\n    state = merge(state, stateModifier);\n    return state;\n  };\n\n  const set = (stateModifier: StateModifier<TState>) => {\n    setSilently(stateModifier);\n    dispatch();\n    return state;\n  };\n\n  const resetSilently = () => setSilently(initialState);\n\n  const reset = () => {\n    resetSilently();\n    dispatch();\n    return state;\n  };\n\n  const listeners = new Set<Listener<TState>>();\n  const actions = config.actions?.({\n    set,\n    get,\n    reset,\n    initialState,\n  }) as TActions;\n  const storageAdapter = createStorageAdapter(config, get, set);\n\n  const subscribe = (listener: Listener<TState>) => {\n    if (listeners.size === 0) {\n      storageAdapter?.onAttach();\n      onAttach?.({ state, set, reset, initialState });\n    }\n\n    listener(state);\n    listeners.add(listener);\n\n    return () => {\n      listeners.delete(listener);\n\n      if (listeners.size === 0) {\n        storageAdapter?.onDetach();\n        onDetach?.({ state, set, reset, initialState });\n      }\n    };\n  };\n\n  const dispatch = () => {\n    storageAdapter?.onChange(state);\n    onChange?.({\n      state,\n      set: setSilently,\n      reset: resetSilently,\n      initialState,\n    });\n    listeners.forEach((listener) => listener(state));\n  };\n\n  storageAdapter?.onLoad();\n  onLoad?.({ state, set, reset, initialState });\n\n  return {\n    get,\n    subscribe,\n    actions,\n    set,\n    reset,\n    initialState,\n  };\n};\n"],"names":[],"mappings":";;;AAIA;;;;;;;;AAQG;AACI,MAAM,WAAW,GAAG,CACzB,MAAqC,KACV;AAC3B,IAAA,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM;IAErE,IAAI,KAAK,GAAG,YAAY;AAExB,IAAA,MAAM,GAAG,GAAG,MAAM,KAAK;AAEvB,IAAA,MAAM,WAAW,GAAG,CAAC,aAAoC,KAAI;AAC3D,QAAA,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC;AACnC,QAAA,OAAO,KAAK;AACd,IAAA,CAAC;AAED,IAAA,MAAM,GAAG,GAAG,CAAC,aAAoC,KAAI;QACnD,WAAW,CAAC,aAAa,CAAC;AAC1B,QAAA,QAAQ,EAAE;AACV,QAAA,OAAO,KAAK;AACd,IAAA,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC;IAErD,MAAM,KAAK,GAAG,MAAK;AACjB,QAAA,aAAa,EAAE;AACf,QAAA,QAAQ,EAAE;AACV,QAAA,OAAO,KAAK;AACd,IAAA,CAAC;AAED,IAAA,MAAM,SAAS,GAAG,IAAI,GAAG,EAAoB;AAC7C,IAAA,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,GAAG;QAC/B,GAAG;QACH,GAAG;QACH,KAAK;QACL,YAAY;AACb,KAAA,CAAa;IACd,MAAM,cAAc,GAAG,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC;AAE7D,IAAA,MAAM,SAAS,GAAG,CAAC,QAA0B,KAAI;AAC/C,QAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;YACxB,cAAc,EAAE,QAAQ,EAAE;AAC1B,YAAA,QAAQ,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;QACjD;QAEA,QAAQ,CAAC,KAAK,CAAC;AACf,QAAA,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC;AAEvB,QAAA,OAAO,MAAK;AACV,YAAA,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC;AAE1B,YAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;gBACxB,cAAc,EAAE,QAAQ,EAAE;AAC1B,gBAAA,QAAQ,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;YACjD;AACF,QAAA,CAAC;AACH,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;AACpB,QAAA,cAAc,EAAE,QAAQ,CAAC,KAAK,CAAC;AAC/B,QAAA,QAAQ,GAAG;YACT,KAAK;AACL,YAAA,GAAG,EAAE,WAAW;AAChB,YAAA,KAAK,EAAE,aAAa;YACpB,YAAY;AACb,SAAA,CAAC;AACF,QAAA,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,KAAK,CAAC,CAAC;AAClD,IAAA,CAAC;IAED,cAAc,EAAE,MAAM,EAAE;AACxB,IAAA,MAAM,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IAE7C,OAAO;QACL,GAAG;QACH,SAAS;QACT,OAAO;QACP,GAAG;QACH,KAAK;QACL,YAAY;KACb;AACH;;;;"}
+{"version":3,"file":"createStore.js","sources":["../../../src/lib/createStore.ts"],"sourcesContent":["import { createStorageAdapter } from \"../internal/createStorageAdapter\";\nimport { Listener, StateModifier, Store, StoreConfig } from \"../types/types\";\nimport { merge } from \"./merge\";\n\n/**\n * Creates a store with an initial state and actions that can modify the state.\n *\n * @param {StoreConfig<TState, TActions>} [config] - The configuration for the store.\n *\n * @returns {Store<TState, TActions>} The created store with state management methods.\n *\n * @see {@link https://dharma.fransek.dev/core/createstore/}\n */\nexport const createStore = <TState, TActions = undefined>(\n  config: StoreConfig<TState, TActions>,\n): Store<TState, TActions> => {\n  const { initialState, onLoad, onAttach, onDetach, onChange } = config;\n\n  let state = initialState;\n\n  const get = () => state;\n\n  const setSilently = (stateModifier: StateModifier<TState>) => {\n    state = merge(state, stateModifier);\n    return state;\n  };\n\n  const set = (stateModifier: StateModifier<TState>) => {\n    const prevState = state;\n    setSilently(stateModifier);\n\n    if (!Object.is(state, prevState)) {\n      dispatch();\n    }\n\n    return state;\n  };\n\n  const resetSilently = () => setSilently(initialState);\n\n  const reset = () => set(initialState);\n\n  const listeners = new Set<Listener<TState>>();\n  const actions = config.actions?.({\n    set,\n    get,\n    reset,\n    initialState,\n  }) as TActions;\n  const storageAdapter = createStorageAdapter(config, get, set);\n\n  const subscribe = (listener: Listener<TState>) => {\n    if (listeners.size === 0) {\n      storageAdapter?.onAttach();\n      onAttach?.({ state, set, reset, initialState });\n    }\n\n    listener(state);\n    listeners.add(listener);\n\n    return () => {\n      if (listeners.delete(listener) && listeners.size === 0) {\n        storageAdapter?.onDetach();\n        onDetach?.({ state, set, reset, initialState });\n      }\n    };\n  };\n\n  const dispatch = () => {\n    onChange?.({\n      state,\n      set: setSilently,\n      reset: resetSilently,\n      initialState,\n    });\n    storageAdapter?.onChange(state);\n    listeners.forEach((listener) => listener(state));\n  };\n\n  storageAdapter?.onLoad();\n  onLoad?.({ state, set, reset, initialState });\n\n  return {\n    get,\n    subscribe,\n    actions,\n    set,\n    reset,\n    initialState,\n  };\n};\n"],"names":[],"mappings":";;;AAIA;;;;;;;;AAQG;AACI,MAAM,WAAW,GAAG,CACzB,MAAqC,KACV;AAC3B,IAAA,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM;IAErE,IAAI,KAAK,GAAG,YAAY;AAExB,IAAA,MAAM,GAAG,GAAG,MAAM,KAAK;AAEvB,IAAA,MAAM,WAAW,GAAG,CAAC,aAAoC,KAAI;AAC3D,QAAA,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC;AACnC,QAAA,OAAO,KAAK;AACd,IAAA,CAAC;AAED,IAAA,MAAM,GAAG,GAAG,CAAC,aAAoC,KAAI;QACnD,MAAM,SAAS,GAAG,KAAK;QACvB,WAAW,CAAC,aAAa,CAAC;QAE1B,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE;AAChC,YAAA,QAAQ,EAAE;QACZ;AAEA,QAAA,OAAO,KAAK;AACd,IAAA,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC;IAErD,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC;AAErC,IAAA,MAAM,SAAS,GAAG,IAAI,GAAG,EAAoB;AAC7C,IAAA,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,GAAG;QAC/B,GAAG;QACH,GAAG;QACH,KAAK;QACL,YAAY;AACb,KAAA,CAAa;IACd,MAAM,cAAc,GAAG,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC;AAE7D,IAAA,MAAM,SAAS,GAAG,CAAC,QAA0B,KAAI;AAC/C,QAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;YACxB,cAAc,EAAE,QAAQ,EAAE;AAC1B,YAAA,QAAQ,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;QACjD;QAEA,QAAQ,CAAC,KAAK,CAAC;AACf,QAAA,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC;AAEvB,QAAA,OAAO,MAAK;AACV,YAAA,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;gBACtD,cAAc,EAAE,QAAQ,EAAE;AAC1B,gBAAA,QAAQ,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;YACjD;AACF,QAAA,CAAC;AACH,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;AACpB,QAAA,QAAQ,GAAG;YACT,KAAK;AACL,YAAA,GAAG,EAAE,WAAW;AAChB,YAAA,KAAK,EAAE,aAAa;YACpB,YAAY;AACb,SAAA,CAAC;AACF,QAAA,cAAc,EAAE,QAAQ,CAAC,KAAK,CAAC;AAC/B,QAAA,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,KAAK,CAAC,CAAC;AAClD,IAAA,CAAC;IAED,cAAc,EAAE,MAAM,EAAE;AACxB,IAAA,MAAM,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IAE7C,OAAO;QACL,GAAG;QACH,SAAS;QACT,OAAO;QACP,GAAG;QACH,KAAK;QACL,YAAY;KACb;AACH;;;;"}

package/dist/esm/lib/deeplyEquals.js

@@ -28,12 +28,11 @@ const deeplyEquals = (a, b) => {
         return false;
     }
     const keysA = Object.keys(a);
-    const keysB = Object.keys(b);
-    if (keysA.length !== keysB.length) {
+    if (keysA.length !== Object.keys(b).length) {
         return false;
     }
     for (const key of keysA) {
-        if (!keysB.includes(key)) {
+        if (!Object.prototype.hasOwnProperty.call(b, key)) {
             return false;
         }
         if (!deeplyEquals(a[key], b[key])) {

package/dist/esm/lib/deeplyEquals.js.map

@@ -1 +1 @@
-{"version":3,"file":"deeplyEquals.js","sources":["../../../src/lib/deeplyEquals.ts"],"sourcesContent":["export const deeplyEquals = (a: unknown, b: unknown): boolean => {\n  if (a === b) {\n    return true;\n  }\n\n  if (\n    a === null ||\n    b === null ||\n    typeof a !== \"object\" ||\n    typeof b !== \"object\"\n  ) {\n    return false;\n  }\n\n  const protoA = Object.getPrototypeOf(a);\n  const protoB = Object.getPrototypeOf(b);\n\n  if (protoA !== protoB) {\n    return false;\n  }\n\n  if (protoA === Array.prototype) {\n    const arrA = a as unknown[];\n    const arrB = b as unknown[];\n    if (arrA.length !== arrB.length) return false;\n    for (let i = 0; i < arrA.length; i++) {\n      if (!deeplyEquals(arrA[i], arrB[i])) return false;\n    }\n    return true;\n  }\n\n  if (protoA !== Object.prototype) {\n    return false;\n  }\n\n  const keysA = Object.keys(a);\n  const keysB = Object.keys(b);\n\n  if (keysA.length !== keysB.length) {\n    return false;\n  }\n\n  for (const key of keysA) {\n    if (!keysB.includes(key)) {\n      return false;\n    }\n    if (\n      !deeplyEquals(\n        (a as Record<string, unknown>)[key],\n        (b as Record<string, unknown>)[key],\n      )\n    ) {\n      return false;\n    }\n  }\n\n  return true;\n};\n"],"names":[],"mappings":"MAAa,YAAY,GAAG,CAAC,CAAU,EAAE,CAAU,KAAa;AAC9D,IAAA,IAAI,CAAC,KAAK,CAAC,EAAE;AACX,QAAA,OAAO,IAAI;IACb;IAEA,IACE,CAAC,KAAK,IAAI;AACV,QAAA,CAAC,KAAK,IAAI;QACV,OAAO,CAAC,KAAK,QAAQ;AACrB,QAAA,OAAO,CAAC,KAAK,QAAQ,EACrB;AACA,QAAA,OAAO,KAAK;IACd;IAEA,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;AAEvC,IAAA,IAAI,MAAM,KAAK,MAAM,EAAE;AACrB,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,IAAI,MAAM,KAAK,KAAK,CAAC,SAAS,EAAE;QAC9B,MAAM,IAAI,GAAG,CAAc;QAC3B,MAAM,IAAI,GAAG,CAAc;AAC3B,QAAA,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;AAAE,YAAA,OAAO,KAAK;AAC7C,QAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACpC,YAAA,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AAAE,gBAAA,OAAO,KAAK;QACnD;AACA,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,IAAI,MAAM,KAAK,MAAM,CAAC,SAAS,EAAE;AAC/B,QAAA,OAAO,KAAK;IACd;IAEA,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAE5B,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;AACjC,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;QACvB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;AACxB,YAAA,OAAO,KAAK;QACd;AACA,QAAA,IACE,CAAC,YAAY,CACV,CAA6B,CAAC,GAAG,CAAC,EAClC,CAA6B,CAAC,GAAG,CAAC,CACpC,EACD;AACA,YAAA,OAAO,KAAK;QACd;IACF;AAEA,IAAA,OAAO,IAAI;AACb;;;;"}
+{"version":3,"file":"deeplyEquals.js","sources":["../../../src/lib/deeplyEquals.ts"],"sourcesContent":["export const deeplyEquals = (a: unknown, b: unknown): boolean => {\n  if (a === b) {\n    return true;\n  }\n\n  if (\n    a === null ||\n    b === null ||\n    typeof a !== \"object\" ||\n    typeof b !== \"object\"\n  ) {\n    return false;\n  }\n\n  const protoA = Object.getPrototypeOf(a);\n  const protoB = Object.getPrototypeOf(b);\n\n  if (protoA !== protoB) {\n    return false;\n  }\n\n  if (protoA === Array.prototype) {\n    const arrA = a as unknown[];\n    const arrB = b as unknown[];\n    if (arrA.length !== arrB.length) return false;\n    for (let i = 0; i < arrA.length; i++) {\n      if (!deeplyEquals(arrA[i], arrB[i])) return false;\n    }\n    return true;\n  }\n\n  if (protoA !== Object.prototype) {\n    return false;\n  }\n\n  const keysA = Object.keys(a);\n\n  if (keysA.length !== Object.keys(b).length) {\n    return false;\n  }\n\n  for (const key of keysA) {\n    if (!Object.prototype.hasOwnProperty.call(b, key)) {\n      return false;\n    }\n    if (\n      !deeplyEquals(\n        (a as Record<string, unknown>)[key],\n        (b as Record<string, unknown>)[key],\n      )\n    ) {\n      return false;\n    }\n  }\n\n  return true;\n};\n"],"names":[],"mappings":"MAAa,YAAY,GAAG,CAAC,CAAU,EAAE,CAAU,KAAa;AAC9D,IAAA,IAAI,CAAC,KAAK,CAAC,EAAE;AACX,QAAA,OAAO,IAAI;IACb;IAEA,IACE,CAAC,KAAK,IAAI;AACV,QAAA,CAAC,KAAK,IAAI;QACV,OAAO,CAAC,KAAK,QAAQ;AACrB,QAAA,OAAO,CAAC,KAAK,QAAQ,EACrB;AACA,QAAA,OAAO,KAAK;IACd;IAEA,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;AAEvC,IAAA,IAAI,MAAM,KAAK,MAAM,EAAE;AACrB,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,IAAI,MAAM,KAAK,KAAK,CAAC,SAAS,EAAE;QAC9B,MAAM,IAAI,GAAG,CAAc;QAC3B,MAAM,IAAI,GAAG,CAAc;AAC3B,QAAA,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;AAAE,YAAA,OAAO,KAAK;AAC7C,QAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AACpC,YAAA,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AAAE,gBAAA,OAAO,KAAK;QACnD;AACA,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,IAAI,MAAM,KAAK,MAAM,CAAC,SAAS,EAAE;AAC/B,QAAA,OAAO,KAAK;IACd;IAEA,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAE5B,IAAA,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE;AAC1C,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;AACvB,QAAA,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;AACjD,YAAA,OAAO,KAAK;QACd;AACA,QAAA,IACE,CAAC,YAAY,CACV,CAA6B,CAAC,GAAG,CAAC,EAClC,CAA6B,CAAC,GAAG,CAAC,CACpC,EACD;AACA,YAAA,OAAO,KAAK;QACd;IACF;AAEA,IAAA,OAAO,IAAI;AACb;;;;"}

package/dist/esm/lib/derive.js

@@ -16,22 +16,24 @@ import { deeplyEquals } from './deeplyEquals.js';
  */
 const derive = (store, deriveFn, dependencyFn) => {
     let memo;
-    let prev;
-    let isStale = true;
+    let hasMemo = false;
+    let prevState;
+    let prevDeps;
     let unsubscribe;
     const listeners = new Set();
-    const compute = () => {
-        memo = deriveFn(store.get());
-        isStale = false;
-        return memo;
-    };
     const get = () => {
-        const next = dependencyFn?.(store.get());
-        isStale &&= !prev || !deeplyEquals(prev, next);
-        if (isStale) {
-            prev = next;
-            return compute();
+        const state = store.get();
+        if (hasMemo && Object.is(state, prevState)) {
+            return memo;
+        }
+        prevState = state;
+        const deps = dependencyFn?.(state);
+        if (hasMemo && dependencyFn && deeplyEquals(prevDeps, deps)) {
+            return memo;
         }
+        prevDeps = deps;
+        memo = deriveFn(state);
+        hasMemo = true;
         return memo;
     };
     const subscribe = (listener) => {
@@ -48,7 +50,6 @@ const derive = (store, deriveFn, dependencyFn) => {
         };
     };
     const listener = () => {
-        isStale = true;
         listeners.forEach((listener) => listener(get()));
     };
     const mount = () => {

package/dist/esm/lib/derive.js.map

@@ -1 +1 @@
-{"version":3,"file":"derive.js","sources":["../../../src/lib/derive.ts"],"sourcesContent":["import { DerivedStore, Listener, Store } from \"../types/types\";\nimport { deeplyEquals } from \"./deeplyEquals\";\n\n/**\n * Creates a derived store from an existing store.\n *\n * A derived store computes its state based on the original store's state using a derive function.\n * The derived store's value is memoized and only recomputed when requested.\n *\n * @param store - The original store to derive from\n * @param deriveFn - A function that computes the derived state from the original state\n * @param dependencyFn - Optional function that returns an array of dependencies. If provided, the derived state will only be recomputed when these dependencies change\n *\n * @returns A new store containing the derived state\n *\n * @see {@link https://dharma.fransek.dev/core/derive/}\n */\nexport const derive = <TState, TActions, TDerived>(\n  store: Store<TState, TActions>,\n  deriveFn: (state: TState) => TDerived,\n  dependencyFn?: (state: TState) => unknown[],\n): DerivedStore<TDerived> => {\n  let memo: TDerived | undefined;\n  let prev: unknown[] | undefined;\n  let isStale = true;\n  let unsubscribe: (() => void) | undefined;\n  const listeners = new Set<Listener<TDerived>>();\n\n  const compute = () => {\n    memo = deriveFn(store.get());\n    isStale = false;\n    return memo;\n  };\n\n  const get = () => {\n    const next = dependencyFn?.(store.get());\n    isStale &&= !prev || !deeplyEquals(prev, next);\n\n    if (isStale) {\n      prev = next;\n      return compute();\n    }\n\n    return memo as TDerived;\n  };\n\n  const subscribe = (listener: Listener<TDerived>) => {\n    if (listeners.size === 0) {\n      mount();\n    }\n\n    listener(get());\n    listeners.add(listener);\n\n    return () => {\n      listeners.delete(listener);\n\n      if (listeners.size === 0) {\n        unmount();\n      }\n    };\n  };\n\n  const listener = () => {\n    isStale = true;\n    listeners.forEach((listener) => listener(get()));\n  };\n\n  const mount = () => {\n    if (!unsubscribe) {\n      unsubscribe = store.subscribe(listener);\n    }\n    return unmount;\n  };\n\n  const unmount = () => {\n    unsubscribe?.();\n    unsubscribe = undefined;\n  };\n\n  return {\n    get,\n    subscribe,\n    mount,\n    unmount,\n  };\n};\n"],"names":[],"mappings":";;AAGA;;;;;;;;;;;;;AAaG;AACI,MAAM,MAAM,GAAG,CACpB,KAA8B,EAC9B,QAAqC,EACrC,YAA2C,KACjB;AAC1B,IAAA,IAAI,IAA0B;AAC9B,IAAA,IAAI,IAA2B;IAC/B,IAAI,OAAO,GAAG,IAAI;AAClB,IAAA,IAAI,WAAqC;AACzC,IAAA,MAAM,SAAS,GAAG,IAAI,GAAG,EAAsB;IAE/C,MAAM,OAAO,GAAG,MAAK;QACnB,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAC5B,OAAO,GAAG,KAAK;AACf,QAAA,OAAO,IAAI;AACb,IAAA,CAAC;IAED,MAAM,GAAG,GAAG,MAAK;QACf,MAAM,IAAI,GAAG,YAAY,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC;QAE9C,IAAI,OAAO,EAAE;YACX,IAAI,GAAG,IAAI;YACX,OAAO,OAAO,EAAE;QAClB;AAEA,QAAA,OAAO,IAAgB;AACzB,IAAA,CAAC;AAED,IAAA,MAAM,SAAS,GAAG,CAAC,QAA4B,KAAI;AACjD,QAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;AACxB,YAAA,KAAK,EAAE;QACT;AAEA,QAAA,QAAQ,CAAC,GAAG,EAAE,CAAC;AACf,QAAA,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC;AAEvB,QAAA,OAAO,MAAK;AACV,YAAA,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC;AAE1B,YAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;AACxB,gBAAA,OAAO,EAAE;YACX;AACF,QAAA,CAAC;AACH,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;QACpB,OAAO,GAAG,IAAI;AACd,QAAA,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;AAClD,IAAA,CAAC;IAED,MAAM,KAAK,GAAG,MAAK;QACjB,IAAI,CAAC,WAAW,EAAE;AAChB,YAAA,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC;QACzC;AACA,QAAA,OAAO,OAAO;AAChB,IAAA,CAAC;IAED,MAAM,OAAO,GAAG,MAAK;QACnB,WAAW,IAAI;QACf,WAAW,GAAG,SAAS;AACzB,IAAA,CAAC;IAED,OAAO;QACL,GAAG;QACH,SAAS;QACT,KAAK;QACL,OAAO;KACR;AACH;;;;"}
+{"version":3,"file":"derive.js","sources":["../../../src/lib/derive.ts"],"sourcesContent":["import { DerivedStore, Listener, Store } from \"../types/types\";\nimport { deeplyEquals } from \"./deeplyEquals\";\n\n/**\n * Creates a derived store from an existing store.\n *\n * A derived store computes its state based on the original store's state using a derive function.\n * The derived store's value is memoized and only recomputed when requested.\n *\n * @param store - The original store to derive from\n * @param deriveFn - A function that computes the derived state from the original state\n * @param dependencyFn - Optional function that returns an array of dependencies. If provided, the derived state will only be recomputed when these dependencies change\n *\n * @returns A new store containing the derived state\n *\n * @see {@link https://dharma.fransek.dev/core/derive/}\n */\nexport const derive = <TState, TActions, TDerived>(\n  store: Store<TState, TActions>,\n  deriveFn: (state: TState) => TDerived,\n  dependencyFn?: (state: TState) => unknown[],\n): DerivedStore<TDerived> => {\n  let memo: TDerived | undefined;\n  let hasMemo = false;\n  let prevState: TState | undefined;\n  let prevDeps: unknown[] | undefined;\n  let unsubscribe: (() => void) | undefined;\n  const listeners = new Set<Listener<TDerived>>();\n\n  const get = () => {\n    const state = store.get();\n\n    if (hasMemo && Object.is(state, prevState)) {\n      return memo as TDerived;\n    }\n\n    prevState = state;\n    const deps = dependencyFn?.(state);\n\n    if (hasMemo && dependencyFn && deeplyEquals(prevDeps, deps)) {\n      return memo as TDerived;\n    }\n\n    prevDeps = deps;\n    memo = deriveFn(state);\n    hasMemo = true;\n    return memo;\n  };\n\n  const subscribe = (listener: Listener<TDerived>) => {\n    if (listeners.size === 0) {\n      mount();\n    }\n\n    listener(get());\n    listeners.add(listener);\n\n    return () => {\n      listeners.delete(listener);\n\n      if (listeners.size === 0) {\n        unmount();\n      }\n    };\n  };\n\n  const listener = () => {\n    listeners.forEach((listener) => listener(get()));\n  };\n\n  const mount = () => {\n    if (!unsubscribe) {\n      unsubscribe = store.subscribe(listener);\n    }\n    return unmount;\n  };\n\n  const unmount = () => {\n    unsubscribe?.();\n    unsubscribe = undefined;\n  };\n\n  return {\n    get,\n    subscribe,\n    mount,\n    unmount,\n  };\n};\n"],"names":[],"mappings":";;AAGA;;;;;;;;;;;;;AAaG;AACI,MAAM,MAAM,GAAG,CACpB,KAA8B,EAC9B,QAAqC,EACrC,YAA2C,KACjB;AAC1B,IAAA,IAAI,IAA0B;IAC9B,IAAI,OAAO,GAAG,KAAK;AACnB,IAAA,IAAI,SAA6B;AACjC,IAAA,IAAI,QAA+B;AACnC,IAAA,IAAI,WAAqC;AACzC,IAAA,MAAM,SAAS,GAAG,IAAI,GAAG,EAAsB;IAE/C,MAAM,GAAG,GAAG,MAAK;AACf,QAAA,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,EAAE;QAEzB,IAAI,OAAO,IAAI,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE;AAC1C,YAAA,OAAO,IAAgB;QACzB;QAEA,SAAS,GAAG,KAAK;AACjB,QAAA,MAAM,IAAI,GAAG,YAAY,GAAG,KAAK,CAAC;QAElC,IAAI,OAAO,IAAI,YAAY,IAAI,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE;AAC3D,YAAA,OAAO,IAAgB;QACzB;QAEA,QAAQ,GAAG,IAAI;AACf,QAAA,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC;QACtB,OAAO,GAAG,IAAI;AACd,QAAA,OAAO,IAAI;AACb,IAAA,CAAC;AAED,IAAA,MAAM,SAAS,GAAG,CAAC,QAA4B,KAAI;AACjD,QAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;AACxB,YAAA,KAAK,EAAE;QACT;AAEA,QAAA,QAAQ,CAAC,GAAG,EAAE,CAAC;AACf,QAAA,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC;AAEvB,QAAA,OAAO,MAAK;AACV,YAAA,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC;AAE1B,YAAA,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;AACxB,gBAAA,OAAO,EAAE;YACX;AACF,QAAA,CAAC;AACH,IAAA,CAAC;IAED,MAAM,QAAQ,GAAG,MAAK;AACpB,QAAA,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;AAClD,IAAA,CAAC;IAED,MAAM,KAAK,GAAG,MAAK;QACjB,IAAI,CAAC,WAAW,EAAE;AAChB,YAAA,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC;QACzC;AACA,QAAA,OAAO,OAAO;AAChB,IAAA,CAAC;IAED,MAAM,OAAO,GAAG,MAAK;QACnB,WAAW,IAAI;QACf,WAAW,GAAG,SAAS;AACzB,IAAA,CAAC;IAED,OAAO;QACL,GAAG;QACH,SAAS;QACT,KAAK;QACL,OAAO;KACR;AACH;;;;"}

package/dist/esm/lib/merge.d.ts

@@ -5,6 +5,7 @@ import { StateModifier } from "../types/types";
  * @param {T} currentState - The current state object.
  * @param {StateModifier<T>} stateModifier - A function or object that modifies the state.
  * @returns {T} The new state object, which is a combination of the current state and the state modifier.
+ * Returns `currentState` itself if the state modifier resolves to it.
  *
  * @see {@link https://dharma.fransek.dev/core/merge/}
  */

package/dist/esm/lib/merge.js

@@ -6,21 +6,21 @@ const isObject = (value) => !!value && typeof value === "object" && !Array.isArr
  * @param {T} currentState - The current state object.
  * @param {StateModifier<T>} stateModifier - A function or object that modifies the state.
  * @returns {T} The new state object, which is a combination of the current state and the state modifier.
+ * Returns `currentState` itself if the state modifier resolves to it.
  *
  * @see {@link https://dharma.fransek.dev/core/merge/}
  */
 const merge = (currentState, stateModifier) => {
-    if (isObject(stateModifier)) {
-        return { ...currentState, ...stateModifier };
+    const modifiedState = typeof stateModifier === "function"
+        ? stateModifier(currentState)
+        : stateModifier;
+    if (Object.is(modifiedState, currentState)) {
+        return currentState;
     }
-    if (typeof stateModifier === "function") {
-        const modifiedState = stateModifier(currentState);
-        if (isObject(modifiedState)) {
-            return { ...currentState, ...modifiedState };
-        }
-        return modifiedState;
+    if (isObject(modifiedState)) {
+        return { ...currentState, ...modifiedState };
     }
-    return stateModifier;
+    return modifiedState;
 };
 
 export { merge };

package/dist/esm/lib/merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge.js","sources":["../../../src/lib/merge.ts"],"sourcesContent":["import { StateModifier } from \"../types/types\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst isObject = (value: unknown): value is Record<keyof any, unknown> =>\n  !!value && typeof value === \"object\" && !Array.isArray(value);\n\n/**\n * Merges the current state with a state modifier.\n *\n * @param {T} currentState - The current state object.\n * @param {StateModifier<T>} stateModifier - A function or object that modifies the state.\n * @returns {T} The new state object, which is a combination of the current state and the state modifier.\n *\n * @see {@link https://dharma.fransek.dev/core/merge/}\n */\nexport const merge = <T>(\n  currentState: T,\n  stateModifier: StateModifier<T>,\n): T => {\n  if (isObject(stateModifier)) {\n    return { ...currentState, ...stateModifier };\n  }\n\n  if (typeof stateModifier === \"function\") {\n    const modifiedState = stateModifier(currentState);\n\n    if (isObject(modifiedState)) {\n      return { ...currentState, ...modifiedState };\n    }\n\n    return modifiedState;\n  }\n\n  return stateModifier;\n};\n"],"names":[],"mappings":"AAEA;AACA,MAAM,QAAQ,GAAG,CAAC,KAAc,KAC9B,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;AAE/D;;;;;;;;AAQG;MACU,KAAK,GAAG,CACnB,YAAe,EACf,aAA+B,KAC1B;AACL,IAAA,IAAI,QAAQ,CAAC,aAAa,CAAC,EAAE;AAC3B,QAAA,OAAO,EAAE,GAAG,YAAY,EAAE,GAAG,aAAa,EAAE;IAC9C;AAEA,IAAA,IAAI,OAAO,aAAa,KAAK,UAAU,EAAE;AACvC,QAAA,MAAM,aAAa,GAAG,aAAa,CAAC,YAAY,CAAC;AAEjD,QAAA,IAAI,QAAQ,CAAC,aAAa,CAAC,EAAE;AAC3B,YAAA,OAAO,EAAE,GAAG,YAAY,EAAE,GAAG,aAAa,EAAE;QAC9C;AAEA,QAAA,OAAO,aAAa;IACtB;AAEA,IAAA,OAAO,aAAa;AACtB;;;;"}
+{"version":3,"file":"merge.js","sources":["../../../src/lib/merge.ts"],"sourcesContent":["import { StateModifier } from \"../types/types\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst isObject = (value: unknown): value is Record<keyof any, unknown> =>\n  !!value && typeof value === \"object\" && !Array.isArray(value);\n\n/**\n * Merges the current state with a state modifier.\n *\n * @param {T} currentState - The current state object.\n * @param {StateModifier<T>} stateModifier - A function or object that modifies the state.\n * @returns {T} The new state object, which is a combination of the current state and the state modifier.\n * Returns `currentState` itself if the state modifier resolves to it.\n *\n * @see {@link https://dharma.fransek.dev/core/merge/}\n */\nexport const merge = <T>(\n  currentState: T,\n  stateModifier: StateModifier<T>,\n): T => {\n  const modifiedState =\n    typeof stateModifier === \"function\"\n      ? stateModifier(currentState)\n      : stateModifier;\n\n  if (Object.is(modifiedState, currentState)) {\n    return currentState;\n  }\n\n  if (isObject(modifiedState)) {\n    return { ...currentState, ...modifiedState };\n  }\n\n  return modifiedState as T;\n};\n"],"names":[],"mappings":"AAEA;AACA,MAAM,QAAQ,GAAG,CAAC,KAAc,KAC9B,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;AAE/D;;;;;;;;;AASG;MACU,KAAK,GAAG,CACnB,YAAe,EACf,aAA+B,KAC1B;AACL,IAAA,MAAM,aAAa,GACjB,OAAO,aAAa,KAAK;AACvB,UAAE,aAAa,CAAC,YAAY;UAC1B,aAAa;IAEnB,IAAI,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,YAAY,CAAC,EAAE;AAC1C,QAAA,OAAO,YAAY;IACrB;AAEA,IAAA,IAAI,QAAQ,CAAC,aAAa,CAAC,EAAE;AAC3B,QAAA,OAAO,EAAE,GAAG,YAAY,EAAE,GAAG,aAAa,EAAE;IAC9C;AAEA,IAAA,OAAO,aAAkB;AAC3B;;;;"}

package/dist/esm/types/types.d.ts

@@ -67,11 +67,10 @@ export type BaseConfig<TState, TActions> = {
     /** Invoked whenever the state changes. */
     onChange?: StoreEventListener<TState>;
 };
-export type MaybePromise<T> = T | Promise<T>;
+export type MaybePromise<T> = T | PromiseLike<T>;
 export type StorageAPI = {
     getItem: (key: string) => MaybePromise<string | null>;
     setItem: (key: string, value: string) => MaybePromise<void>;
-    removeItem: (key: string) => MaybePromise<void>;
 };
 export type Serializer<T = any> = {
     stringify: (value: T) => string;
@@ -90,5 +89,13 @@ export type PersistConfig<TState> = {
     storage?: StorageAPI;
     /** The serializer to use for storing the state. Defaults to JSON. */
     serializer?: Serializer<TState>;
+    /**
+     * When to initially synchronize the store's state with the storage. Defaults to "load".
+     *
+     * Set to "attach" when using SSR to avoid hydration errors.
+     */
+    syncWithStorageOn?: "load" | "attach";
+    /** Invoked when a storage error occurs. */
+    onStorageError?: (error: unknown) => void;
 };
 export type StoreConfig<TState, TActions> = BaseConfig<TState, TActions> & (PersistConfig<TState> | NoPersistConfig);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dharma-core",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "author": "Frans Ekman <fransedvinekman@gmail.com>",
   "license": "MIT",
   "description": "A simple and lightweight state management solution for JavaScript and TypeScript applications.",

package/dist/cjs/internal/warn.d.ts

@@ -1 +0,0 @@
-export declare const warn: (message: string) => void;

package/dist/cjs/internal/warn.js

@@ -1,6 +0,0 @@
-'use strict';
-
-const warn = (message) => console.warn(`[dharma-core] ${message}`);
-
-exports.warn = warn;
-//# sourceMappingURL=warn.js.map

package/dist/cjs/internal/warn.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"warn.js","sources":["../../../src/internal/warn.ts"],"sourcesContent":["export const warn = (message: string) =>\n  console.warn(`[dharma-core] ${message}`);\n"],"names":[],"mappings":";;AAAO,MAAM,IAAI,GAAG,CAAC,OAAe,KAClC,OAAO,CAAC,IAAI,CAAC,iBAAiB,OAAO,CAAA,CAAE;;;;"}

package/dist/esm/internal/warn.d.ts

@@ -1 +0,0 @@
-export declare const warn: (message: string) => void;

package/dist/esm/internal/warn.js

@@ -1,4 +0,0 @@
-const warn = (message) => console.warn(`[dharma-core] ${message}`);
-
-export { warn };
-//# sourceMappingURL=warn.js.map

package/dist/esm/internal/warn.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"warn.js","sources":["../../../src/internal/warn.ts"],"sourcesContent":["export const warn = (message: string) =>\n  console.warn(`[dharma-core] ${message}`);\n"],"names":[],"mappings":"AAAO,MAAM,IAAI,GAAG,CAAC,OAAe,KAClC,OAAO,CAAC,IAAI,CAAC,iBAAiB,OAAO,CAAA,CAAE;;;;"}