react-native-nitro-storage 0.1.3 → 0.3.0

package/src/index.web.ts

@@ -1,14 +1,67 @@
-import { useSyncExternalStore } from "react";
+import { useRef, useSyncExternalStore } from "react";
+import { StorageScope } from "./Storage.types";
+import {
+  MIGRATION_VERSION_KEY,
+  type StoredEnvelope,
+  isStoredEnvelope,
+  assertBatchScope,
+  assertValidScope,
+  serializeWithPrimitiveFastPath,
+  deserializeWithPrimitiveFastPath,
+} from "./internal";
+
+export { StorageScope } from "./Storage.types";
+export { migrateFromMMKV } from "./migration";
+
+export type Validator<T> = (value: unknown) => value is T;
+export type ExpirationConfig = {
+  ttlMs: number;
+};
 
-export enum StorageScope {
-  Memory = 0,
-  Disk = 1,
-  Secure = 2,
-}
+export type MigrationContext = {
+  scope: StorageScope;
+  getRaw: (key: string) => string | undefined;
+  setRaw: (key: string, value: string) => void;
+  removeRaw: (key: string) => void;
+};
+
+export type Migration = (context: MigrationContext) => void;
+
+export type TransactionContext = {
+  scope: StorageScope;
+  getRaw: (key: string) => string | undefined;
+  setRaw: (key: string, value: string) => void;
+  removeRaw: (key: string) => void;
+  getItem: <T>(item: Pick<StorageItem<T>, "scope" | "key" | "get">) => T;
+  setItem: <T>(item: Pick<StorageItem<T>, "scope" | "key" | "set">, value: T) => void;
+  removeItem: (item: Pick<StorageItem<unknown>, "scope" | "key" | "delete">) => void;
+};
+
+type KeyListenerRegistry = Map<string, Set<() => void>>;
+type RawBatchPathItem = {
+  _hasValidation?: boolean;
+  _hasExpiration?: boolean;
+};
+type NonMemoryScope = StorageScope.Disk | StorageScope.Secure;
+type PendingSecureWrite = { key: string; value: string | undefined };
+type BrowserStorageLike = {
+  setItem: (key: string, value: string) => void;
+  getItem: (key: string) => string | null;
+  removeItem: (key: string) => void;
+  clear: () => void;
+};
+
+const registeredMigrations = new Map<number, Migration>();
+const runMicrotask =
+  typeof queueMicrotask === "function"
+    ? queueMicrotask
+    : (task: () => void) => {
+        Promise.resolve().then(task);
+      };
 
 export interface Storage {
   name: string;
-  equals: (other: any) => boolean;
+  equals: (other: unknown) => boolean;
   dispose: () => void;
   set(key: string, value: string, scope: number): void;
   get(key: string, scope: number): string | undefined;
@@ -23,15 +76,140 @@ export interface Storage {
   ): () => void;
 }
 
-const diskListeners = new Map<string, Set<() => void>>();
-const secureListeners = new Map<string, Set<() => void>>();
+const memoryStore = new Map<string, unknown>();
+const memoryListeners: KeyListenerRegistry = new Map();
+const webScopeListeners = new Map<NonMemoryScope, KeyListenerRegistry>([
+  [StorageScope.Disk, new Map()],
+  [StorageScope.Secure, new Map()],
+]);
+const scopedRawCache = new Map<NonMemoryScope, Map<string, string | undefined>>([
+  [StorageScope.Disk, new Map()],
+  [StorageScope.Secure, new Map()],
+]);
+const pendingSecureWrites = new Map<string, PendingSecureWrite>();
+let secureFlushScheduled = false;
+
+function getBrowserStorage(scope: number): BrowserStorageLike | undefined {
+  if (scope === StorageScope.Disk) {
+    return globalThis.localStorage;
+  }
+  if (scope === StorageScope.Secure) {
+    return globalThis.sessionStorage;
+  }
+  return undefined;
+}
+
+function getScopedListeners(scope: NonMemoryScope): KeyListenerRegistry {
+  return webScopeListeners.get(scope)!;
+}
+
+function getScopeRawCache(scope: NonMemoryScope): Map<string, string | undefined> {
+  return scopedRawCache.get(scope)!;
+}
+
+function cacheRawValue(scope: NonMemoryScope, key: string, value: string | undefined): void {
+  getScopeRawCache(scope).set(key, value);
+}
+
+function readCachedRawValue(
+  scope: NonMemoryScope,
+  key: string
+): string | undefined {
+  return getScopeRawCache(scope).get(key);
+}
+
+function hasCachedRawValue(scope: NonMemoryScope, key: string): boolean {
+  return getScopeRawCache(scope).has(key);
+}
+
+function clearScopeRawCache(scope: NonMemoryScope): void {
+  getScopeRawCache(scope).clear();
+}
+
+function notifyKeyListeners(registry: KeyListenerRegistry, key: string): void {
+  registry.get(key)?.forEach((listener) => listener());
+}
+
+function notifyAllListeners(registry: KeyListenerRegistry): void {
+  registry.forEach((listeners) => {
+    listeners.forEach((listener) => listener());
+  });
+}
+
+function addKeyListener(
+  registry: KeyListenerRegistry,
+  key: string,
+  listener: () => void
+): () => void {
+  let listeners = registry.get(key);
+  if (!listeners) {
+    listeners = new Set();
+    registry.set(key, listeners);
+  }
+  listeners.add(listener);
+
+  return () => {
+    const scopedListeners = registry.get(key);
+    if (!scopedListeners) {
+      return;
+    }
+    scopedListeners.delete(listener);
+    if (scopedListeners.size === 0) {
+      registry.delete(key);
+    }
+  };
+}
+
+function readPendingSecureWrite(key: string): string | undefined {
+  return pendingSecureWrites.get(key)?.value;
+}
 
-function notifyDiskListeners(key: string) {
-  diskListeners.get(key)?.forEach((cb) => cb());
+function hasPendingSecureWrite(key: string): boolean {
+  return pendingSecureWrites.has(key);
 }
 
-function notifySecureListeners(key: string) {
-  secureListeners.get(key)?.forEach((cb) => cb());
+function clearPendingSecureWrite(key: string): void {
+  pendingSecureWrites.delete(key);
+}
+
+function flushSecureWrites(): void {
+  secureFlushScheduled = false;
+
+  if (pendingSecureWrites.size === 0) {
+    return;
+  }
+
+  const writes = Array.from(pendingSecureWrites.values());
+  pendingSecureWrites.clear();
+
+  const keysToSet: string[] = [];
+  const valuesToSet: string[] = [];
+  const keysToRemove: string[] = [];
+
+  writes.forEach(({ key, value }) => {
+    if (value === undefined) {
+      keysToRemove.push(key);
+    } else {
+      keysToSet.push(key);
+      valuesToSet.push(value);
+    }
+  });
+
+  if (keysToSet.length > 0) {
+    WebStorage.setBatch(keysToSet, valuesToSet, StorageScope.Secure);
+  }
+  if (keysToRemove.length > 0) {
+    WebStorage.removeBatch(keysToRemove, StorageScope.Secure);
+  }
+}
+
+function scheduleSecureWrite(key: string, value: string | undefined): void {
+  pendingSecureWrites.set(key, { key, value });
+  if (secureFlushScheduled) {
+    return;
+  }
+  secureFlushScheduled = true;
+  runMicrotask(flushSecureWrites);
 }
 
 const WebStorage: Storage = {
@@ -39,54 +217,61 @@ const WebStorage: Storage = {
   equals: (other) => other === WebStorage,
   dispose: () => {},
   set: (key: string, value: string, scope: number) => {
-    if (scope === StorageScope.Disk) {
-      localStorage?.setItem(key, value);
-      notifyDiskListeners(key);
-    } else if (scope === StorageScope.Secure) {
-      sessionStorage?.setItem(key, value);
-      notifySecureListeners(key);
+    const storage = getBrowserStorage(scope);
+    storage?.setItem(key, value);
+    if (scope === StorageScope.Disk || scope === StorageScope.Secure) {
+      notifyKeyListeners(getScopedListeners(scope), key);
     }
   },
-
   get: (key: string, scope: number) => {
-    if (scope === StorageScope.Disk) {
-      return localStorage?.getItem(key) ?? undefined;
-    } else if (scope === StorageScope.Secure) {
-      return sessionStorage?.getItem(key) ?? undefined;
-    }
-    return undefined;
+    const storage = getBrowserStorage(scope);
+    return storage?.getItem(key) ?? undefined;
   },
   remove: (key: string, scope: number) => {
-    if (scope === StorageScope.Disk) {
-      localStorage?.removeItem(key);
-      notifyDiskListeners(key);
-    } else if (scope === StorageScope.Secure) {
-      sessionStorage?.removeItem(key);
-      notifySecureListeners(key);
+    const storage = getBrowserStorage(scope);
+    storage?.removeItem(key);
+    if (scope === StorageScope.Disk || scope === StorageScope.Secure) {
+      notifyKeyListeners(getScopedListeners(scope), key);
     }
   },
-
   clear: (scope: number) => {
-    if (scope === StorageScope.Disk) {
-      localStorage?.clear();
-      diskListeners.forEach((listeners) => {
-        listeners.forEach((cb) => cb());
-      });
-    } else if (scope === StorageScope.Secure) {
-      sessionStorage?.clear();
-      secureListeners.forEach((listeners) => {
-        listeners.forEach((cb) => cb());
-      });
+    const storage = getBrowserStorage(scope);
+    storage?.clear();
+    if (scope === StorageScope.Disk || scope === StorageScope.Secure) {
+      notifyAllListeners(getScopedListeners(scope));
     }
   },
   setBatch: (keys: string[], values: string[], scope: number) => {
-    keys.forEach((key, i) => WebStorage.set(key, values[i], scope));
+    const storage = getBrowserStorage(scope);
+    if (!storage) {
+      return;
+    }
+
+    keys.forEach((key, index) => {
+      storage.setItem(key, values[index]);
+    });
+    if (scope === StorageScope.Disk || scope === StorageScope.Secure) {
+      const listeners = getScopedListeners(scope);
+      keys.forEach((key) => notifyKeyListeners(listeners, key));
+    }
   },
   getBatch: (keys: string[], scope: number) => {
-    return keys.map((key) => WebStorage.get(key, scope));
+    const storage = getBrowserStorage(scope);
+    return keys.map((key) => storage?.getItem(key) ?? undefined);
   },
   removeBatch: (keys: string[], scope: number) => {
-    keys.forEach((key) => WebStorage.remove(key, scope));
+    const storage = getBrowserStorage(scope);
+    if (!storage) {
+      return;
+    }
+
+    keys.forEach((key) => {
+      storage.removeItem(key);
+    });
+    if (scope === StorageScope.Disk || scope === StorageScope.Secure) {
+      const listeners = getScopedListeners(scope);
+      keys.forEach((key) => notifyKeyListeners(listeners, key));
+    }
   },
   addOnChange: (
     _scope: number,
@@ -96,21 +281,83 @@ const WebStorage: Storage = {
   },
 };
 
-const memoryStore = new Map<string, any>();
-const memoryListeners = new Set<(key: string, value: any) => void>();
+function getRawValue(key: string, scope: StorageScope): string | undefined {
+  assertValidScope(scope);
+  if (scope === StorageScope.Memory) {
+    const value = memoryStore.get(key);
+    return typeof value === "string" ? value : undefined;
+  }
+
+  if (scope === StorageScope.Secure && hasPendingSecureWrite(key)) {
+    return readPendingSecureWrite(key);
+  }
 
-function notifyMemoryListeners(key: string, value: any) {
-  memoryListeners.forEach((listener) => listener(key, value));
+  return WebStorage.get(key, scope);
+}
+
+function setRawValue(key: string, value: string, scope: StorageScope): void {
+  assertValidScope(scope);
+  if (scope === StorageScope.Memory) {
+    memoryStore.set(key, value);
+    notifyKeyListeners(memoryListeners, key);
+    return;
+  }
+
+  if (scope === StorageScope.Secure) {
+    flushSecureWrites();
+    clearPendingSecureWrite(key);
+  }
+
+  WebStorage.set(key, value, scope);
+  cacheRawValue(scope, key, value);
+}
+
+function removeRawValue(key: string, scope: StorageScope): void {
+  assertValidScope(scope);
+  if (scope === StorageScope.Memory) {
+    memoryStore.delete(key);
+    notifyKeyListeners(memoryListeners, key);
+    return;
+  }
+
+  if (scope === StorageScope.Secure) {
+    flushSecureWrites();
+    clearPendingSecureWrite(key);
+  }
+
+  WebStorage.remove(key, scope);
+  cacheRawValue(scope, key, undefined);
+}
+
+function readMigrationVersion(scope: StorageScope): number {
+  const raw = getRawValue(MIGRATION_VERSION_KEY, scope);
+  if (raw === undefined) {
+    return 0;
+  }
+
+  const parsed = Number.parseInt(raw, 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : 0;
+}
+
+function writeMigrationVersion(scope: StorageScope, version: number): void {
+  setRawValue(MIGRATION_VERSION_KEY, String(version), scope);
 }
 
 export const storage = {
   clear: (scope: StorageScope) => {
     if (scope === StorageScope.Memory) {
       memoryStore.clear();
-      notifyMemoryListeners("", undefined);
-    } else {
-      WebStorage.clear(scope);
+      notifyAllListeners(memoryListeners);
+      return;
     }
+
+    if (scope === StorageScope.Secure) {
+      flushSecureWrites();
+      pendingSecureWrites.clear();
+    }
+
+    clearScopeRawCache(scope);
+    WebStorage.clear(scope);
   },
   clearAll: () => {
     storage.clear(StorageScope.Memory);
@@ -125,6 +372,11 @@ export interface StorageItemConfig<T> {
   defaultValue?: T;
   serialize?: (value: T) => string;
   deserialize?: (value: string) => T;
+  validate?: Validator<T>;
+  onValidationError?: (invalidValue: unknown) => T;
+  expiration?: ExpirationConfig;
+  readCache?: boolean;
+  coalesceSecureWrites?: boolean;
 }
 
 export interface StorageItem<T> {
@@ -135,16 +387,23 @@ export interface StorageItem<T> {
   serialize: (value: T) => string;
   deserialize: (value: string) => T;
   _triggerListeners: () => void;
+  _hasValidation?: boolean;
+  _hasExpiration?: boolean;
+  _readCacheEnabled?: boolean;
   scope: StorageScope;
   key: string;
 }
 
+function canUseRawBatchPath(item: RawBatchPathItem): boolean {
+  return item._hasExpiration === false && item._hasValidation === false;
+}
+
 function defaultSerialize<T>(value: T): string {
-  return JSON.stringify(value);
+  return serializeWithPrimitiveFastPath(value);
 }
 
 function defaultDeserialize<T>(value: string): T {
-  return JSON.parse(value) as T;
+  return deserializeWithPrimitiveFastPath(value);
 }
 
 export function createStorageItem<T = undefined>(
@@ -153,70 +412,206 @@ export function createStorageItem<T = undefined>(
   const serialize = config.serialize ?? defaultSerialize;
   const deserialize = config.deserialize ?? defaultDeserialize;
   const isMemory = config.scope === StorageScope.Memory;
+  const validate = config.validate;
+  const onValidationError = config.onValidationError;
+  const expiration = config.expiration;
+  const expirationTtlMs = expiration?.ttlMs;
+  const memoryExpiration = expiration && isMemory ? new Map<string, number>() : null;
+  const readCache = !isMemory && config.readCache === true;
+  const coalesceSecureWrites =
+    config.scope === StorageScope.Secure && config.coalesceSecureWrites === true;
+  const nonMemoryScope: NonMemoryScope | null =
+    config.scope === StorageScope.Disk
+      ? StorageScope.Disk
+      : config.scope === StorageScope.Secure
+        ? StorageScope.Secure
+        : null;
+
+  if (expiration && expiration.ttlMs <= 0) {
+    throw new Error("expiration.ttlMs must be greater than 0.");
+  }
 
   const listeners = new Set<() => void>();
   let unsubscribe: (() => void) | null = null;
-  let lastRaw: string | undefined;
+  let lastRaw: unknown = undefined;
   let lastValue: T | undefined;
+  let hasLastValue = false;
+
+  const invalidateParsedCache = () => {
+    lastRaw = undefined;
+    lastValue = undefined;
+    hasLastValue = false;
+  };
 
   const ensureSubscription = () => {
-    if (!unsubscribe) {
-      if (isMemory) {
-        const listener = (key: string) => {
-          if (key === config.key) {
-            lastRaw = undefined;
-            lastValue = undefined;
-            listeners.forEach((l) => l());
-          }
-        };
-        memoryListeners.add(listener);
-        unsubscribe = () => memoryListeners.delete(listener);
-      } else if (config.scope === StorageScope.Disk) {
-        const listener = () => {
-          lastRaw = undefined;
-          lastValue = undefined;
-          listeners.forEach((l) => l());
-        };
-        if (!diskListeners.has(config.key)) {
-          diskListeners.set(config.key, new Set());
-        }
-        diskListeners.get(config.key)!.add(listener);
-        unsubscribe = () => diskListeners.get(config.key)?.delete(listener);
-      } else if (config.scope === StorageScope.Secure) {
-        const listener = () => {
-          lastRaw = undefined;
-          lastValue = undefined;
-          listeners.forEach((l) => l());
-        };
-        if (!secureListeners.has(config.key)) {
-          secureListeners.set(config.key, new Set());
+    if (unsubscribe) {
+      return;
+    }
+
+    const listener = () => {
+      invalidateParsedCache();
+      listeners.forEach((callback) => callback());
+    };
+
+    if (isMemory) {
+      unsubscribe = addKeyListener(memoryListeners, config.key, listener);
+      return;
+    }
+
+    unsubscribe = addKeyListener(getScopedListeners(nonMemoryScope!), config.key, listener);
+  };
+
+  const readStoredRaw = (): unknown => {
+    if (isMemory) {
+      if (memoryExpiration) {
+        const expiresAt = memoryExpiration.get(config.key);
+        if (expiresAt !== undefined && expiresAt <= Date.now()) {
+          memoryExpiration.delete(config.key);
+          memoryStore.delete(config.key);
+          notifyKeyListeners(memoryListeners, config.key);
+          return undefined;
         }
-        secureListeners.get(config.key)!.add(listener);
-        unsubscribe = () => secureListeners.get(config.key)?.delete(listener);
+      }
+      return memoryStore.get(config.key) as T | undefined;
+    }
+
+    if (nonMemoryScope === StorageScope.Secure && hasPendingSecureWrite(config.key)) {
+      return readPendingSecureWrite(config.key);
+    }
+
+    if (readCache) {
+      if (hasCachedRawValue(nonMemoryScope!, config.key)) {
+        return readCachedRawValue(nonMemoryScope!, config.key);
       }
     }
+
+    const raw = WebStorage.get(config.key, config.scope);
+    cacheRawValue(nonMemoryScope!, config.key, raw);
+    return raw;
   };
 
-  const get = (): T => {
-    let raw: string | undefined;
+  const writeStoredRaw = (rawValue: string): void => {
+    cacheRawValue(nonMemoryScope!, config.key, rawValue);
+
+    if (coalesceSecureWrites) {
+      scheduleSecureWrite(config.key, rawValue);
+      return;
+    }
+
+    if (nonMemoryScope === StorageScope.Secure) {
+      clearPendingSecureWrite(config.key);
+    }
+
+    WebStorage.set(config.key, rawValue, config.scope);
+  };
+
+  const removeStoredRaw = (): void => {
+    cacheRawValue(nonMemoryScope!, config.key, undefined);
+
+    if (coalesceSecureWrites) {
+      scheduleSecureWrite(config.key, undefined);
+      return;
+    }
+
+    if (nonMemoryScope === StorageScope.Secure) {
+      clearPendingSecureWrite(config.key);
+    }
+
+    WebStorage.remove(config.key, config.scope);
+  };
+
+  const writeValueWithoutValidation = (value: T): void => {
     if (isMemory) {
-      raw = memoryStore.get(config.key);
-    } else {
-      raw = WebStorage.get(config.key, config.scope);
+      if (memoryExpiration) {
+        memoryExpiration.set(config.key, Date.now() + (expirationTtlMs ?? 0));
+      }
+      memoryStore.set(config.key, value);
+      notifyKeyListeners(memoryListeners, config.key);
+      return;
     }
 
-    if (raw === lastRaw && lastValue !== undefined) {
-      return lastValue;
+    const serialized = serialize(value);
+    if (expiration) {
+      const envelope: StoredEnvelope = {
+        __nitroStorageEnvelope: true,
+        expiresAt: Date.now() + expiration.ttlMs,
+        payload: serialized,
+      };
+      writeStoredRaw(JSON.stringify(envelope));
+      return;
+    }
+
+    writeStoredRaw(serialized);
+  };
+
+  const resolveInvalidValue = (invalidValue: unknown): T => {
+    if (onValidationError) {
+      return onValidationError(invalidValue);
+    }
+
+    return config.defaultValue as T;
+  };
+
+  const ensureValidatedValue = (candidate: unknown, hadStoredValue: boolean): T => {
+    if (!validate || validate(candidate)) {
+      return candidate as T;
+    }
+
+    const resolved = resolveInvalidValue(candidate);
+    if (validate && !validate(resolved)) {
+      return config.defaultValue as T;
+    }
+    if (hadStoredValue) {
+      writeValueWithoutValidation(resolved);
+    }
+    return resolved;
+  };
+
+  const get = (): T => {
+    const raw = readStoredRaw();
+
+    const canUseCachedValue = !expiration && !memoryExpiration;
+    if (canUseCachedValue && raw === lastRaw && hasLastValue) {
+      return lastValue as T;
     }
 
     lastRaw = raw;
 
     if (raw === undefined) {
-      lastValue = config.defaultValue as T;
-    } else {
-      lastValue = isMemory ? (raw as T) : deserialize(raw);
+      lastValue = ensureValidatedValue(config.defaultValue, false);
+      hasLastValue = true;
+      return lastValue;
+    }
+
+    if (isMemory) {
+      lastValue = ensureValidatedValue(raw, true);
+      hasLastValue = true;
+      return lastValue;
+    }
+
+    let deserializableRaw = raw as string;
+
+    if (expiration) {
+      try {
+        const parsed = JSON.parse(raw as string) as unknown;
+        if (isStoredEnvelope(parsed)) {
+          if (parsed.expiresAt <= Date.now()) {
+            removeStoredRaw();
+            invalidateParsedCache();
+            lastValue = ensureValidatedValue(config.defaultValue, false);
+            hasLastValue = true;
+            return lastValue;
+          }
+
+          deserializableRaw = parsed.payload;
+        }
+      } catch {
+        // Keep backward compatibility with legacy raw values.
+      }
     }
 
+    lastValue = ensureValidatedValue(deserialize(deserializableRaw), true);
+    hasLastValue = true;
     return lastValue;
   };
 
@@ -227,25 +622,30 @@ export function createStorageItem<T = undefined>(
         ? (valueOrFn as (prev: T) => T)(currentValue)
         : valueOrFn;
 
-    lastRaw = undefined;
+    invalidateParsedCache();
 
-    if (isMemory) {
-      memoryStore.set(config.key, newValue);
-      notifyMemoryListeners(config.key, newValue);
-    } else {
-      WebStorage.set(config.key, serialize(newValue), config.scope);
+    if (validate && !validate(newValue)) {
+      throw new Error(
+        `Validation failed for key "${config.key}" in scope "${StorageScope[config.scope]}".`
+      );
     }
+
+    writeValueWithoutValidation(newValue);
   };
 
   const deleteItem = (): void => {
-    lastRaw = undefined;
+    invalidateParsedCache();
 
     if (isMemory) {
+      if (memoryExpiration) {
+        memoryExpiration.delete(config.key);
+      }
       memoryStore.delete(config.key);
-      notifyMemoryListeners(config.key, undefined);
-    } else {
-      WebStorage.remove(config.key, config.scope);
+      notifyKeyListeners(memoryListeners, config.key);
+      return;
     }
+
+    removeStoredRaw();
   };
 
   const subscribe = (callback: () => void): (() => void) => {
@@ -260,7 +660,7 @@ export function createStorageItem<T = undefined>(
     };
   };
 
-  return {
+  const storageItem: StorageItem<T> = {
     get,
     set,
     delete: deleteItem,
@@ -268,13 +668,17 @@ export function createStorageItem<T = undefined>(
     serialize,
     deserialize,
     _triggerListeners: () => {
-      lastRaw = undefined;
-      lastValue = undefined;
-      listeners.forEach((l) => l());
+      invalidateParsedCache();
+      listeners.forEach((listener) => listener());
     },
+    _hasValidation: validate !== undefined,
+    _hasExpiration: expiration !== undefined,
+    _readCacheEnabled: readCache,
     scope: config.scope,
     key: config.key,
   };
+
+  return storageItem;
 }
 
 export function useStorage<T>(
@@ -284,23 +688,106 @@ export function useStorage<T>(
   return [value, item.set];
 }
 
+export function useStorageSelector<T, TSelected>(
+  item: StorageItem<T>,
+  selector: (value: T) => TSelected,
+  isEqual: (prev: TSelected, next: TSelected) => boolean = Object.is
+): [TSelected, (value: T | ((prev: T) => T)) => void] {
+  const selectedRef = useRef<{ hasValue: false } | { hasValue: true; value: TSelected }>({
+    hasValue: false,
+  });
+
+  const getSelectedSnapshot = () => {
+    const nextSelected = selector(item.get());
+    const current = selectedRef.current;
+    if (current.hasValue && isEqual(current.value, nextSelected)) {
+      return current.value;
+    }
+
+    selectedRef.current = { hasValue: true, value: nextSelected };
+    return nextSelected;
+  };
+
+  const selectedValue = useSyncExternalStore(
+    item.subscribe,
+    getSelectedSnapshot,
+    getSelectedSnapshot
+  );
+  return [selectedValue, item.set];
+}
+
 export function useSetStorage<T>(item: StorageItem<T>) {
   return item.set;
 }
 
+type BatchReadItem<T> = Pick<
+  StorageItem<T>,
+  | "key"
+  | "scope"
+  | "get"
+  | "deserialize"
+  | "_hasValidation"
+  | "_hasExpiration"
+  | "_readCacheEnabled"
+>;
+type BatchRemoveItem = Pick<StorageItem<unknown>, "key" | "scope" | "delete">;
+
+export type StorageBatchSetItem<T> = {
+  item: StorageItem<T>;
+  value: T;
+};
+
 export function getBatch(
-  items: StorageItem<any>[],
+  items: readonly BatchReadItem<unknown>[],
   scope: StorageScope
-): any[] {
+): unknown[] {
+  assertBatchScope(items, scope);
+
   if (scope === StorageScope.Memory) {
     return items.map((item) => item.get());
   }
 
-  const keys = items.map((item) => item.key);
-  const rawValues = WebStorage.getBatch(keys, scope);
+  const useRawBatchPath = items.every((item) => canUseRawBatchPath(item));
+  if (!useRawBatchPath) {
+    return items.map((item) => item.get());
+  }
+  const useBatchCache = items.every((item) => item._readCacheEnabled === true);
 
-  return items.map((item, idx) => {
-    const raw = rawValues[idx];
+  const rawValues = new Array<string | undefined>(items.length);
+  const keysToFetch: string[] = [];
+  const keyIndexes: number[] = [];
+
+  items.forEach((item, index) => {
+    if (scope === StorageScope.Secure) {
+      if (hasPendingSecureWrite(item.key)) {
+        rawValues[index] = readPendingSecureWrite(item.key);
+        return;
+      }
+    }
+
+    if (useBatchCache) {
+      if (hasCachedRawValue(scope, item.key)) {
+        rawValues[index] = readCachedRawValue(scope, item.key);
+        return;
+      }
+    }
+
+    keysToFetch.push(item.key);
+    keyIndexes.push(index);
+  });
+
+  if (keysToFetch.length > 0) {
+    const fetchedValues = WebStorage.getBatch(keysToFetch, scope);
+    fetchedValues.forEach((value, index) => {
+      const key = keysToFetch[index];
+      const targetIndex = keyIndexes[index];
+      rawValues[targetIndex] = value;
+      cacheRawValue(scope, key, value);
+    });
+  }
+
+  return items.map((item, index) => {
+    const raw = rawValues[index];
     if (raw === undefined) {
       return item.get();
     }
@@ -308,34 +795,151 @@ export function getBatch(
   });
 }
 
-export function setBatch(
-  items: { item: StorageItem<any>; value: any }[],
+export function setBatch<T>(
+  items: readonly StorageBatchSetItem<T>[],
   scope: StorageScope
 ): void {
+  assertBatchScope(
+    items.map((batchEntry) => batchEntry.item),
+    scope
+  );
+
   if (scope === StorageScope.Memory) {
     items.forEach(({ item, value }) => item.set(value));
     return;
   }
 
-  const keys = items.map((i) => i.item.key);
-  const values = items.map((i) => i.item.serialize(i.value));
-  WebStorage.setBatch(keys, values, scope);
+  const useRawBatchPath = items.every(({ item }) => canUseRawBatchPath(item));
+  if (!useRawBatchPath) {
+    items.forEach(({ item, value }) => item.set(value));
+    return;
+  }
 
-  items.forEach(({ item }) => {
-    item._triggerListeners();
-  });
+  const keys = items.map((entry) => entry.item.key);
+  const values = items.map((entry) => entry.item.serialize(entry.value));
+  if (scope === StorageScope.Secure) {
+    flushSecureWrites();
+  }
+  WebStorage.setBatch(keys, values, scope);
+  keys.forEach((key, index) => cacheRawValue(scope, key, values[index]));
 }
 
 export function removeBatch(
-  items: StorageItem<any>[],
+  items: readonly BatchRemoveItem[],
   scope: StorageScope
 ): void {
+  assertBatchScope(items, scope);
+
   if (scope === StorageScope.Memory) {
     items.forEach((item) => item.delete());
     return;
   }
 
   const keys = items.map((item) => item.key);
+  if (scope === StorageScope.Secure) {
+    flushSecureWrites();
+  }
   WebStorage.removeBatch(keys, scope);
-  items.forEach((item) => item.delete());
+  keys.forEach((key) => cacheRawValue(scope, key, undefined));
+}
+
+export function registerMigration(version: number, migration: Migration): void {
+  if (!Number.isInteger(version) || version <= 0) {
+    throw new Error("Migration version must be a positive integer.");
+  }
+
+  if (registeredMigrations.has(version)) {
+    throw new Error(`Migration version ${version} is already registered.`);
+  }
+
+  registeredMigrations.set(version, migration);
+}
+
+export function migrateToLatest(scope: StorageScope = StorageScope.Disk): number {
+  assertValidScope(scope);
+  const currentVersion = readMigrationVersion(scope);
+  const versions = Array.from(registeredMigrations.keys())
+    .filter((version) => version > currentVersion)
+    .sort((a, b) => a - b);
+
+  let appliedVersion = currentVersion;
+  const context: MigrationContext = {
+    scope,
+    getRaw: (key) => getRawValue(key, scope),
+    setRaw: (key, value) => setRawValue(key, value, scope),
+    removeRaw: (key) => removeRawValue(key, scope),
+  };
+
+  versions.forEach((version) => {
+    const migration = registeredMigrations.get(version);
+    if (!migration) {
+      return;
+    }
+    migration(context);
+    writeMigrationVersion(scope, version);
+    appliedVersion = version;
+  });
+
+  return appliedVersion;
+}
+
+export function runTransaction<T>(
+  scope: StorageScope,
+  transaction: (context: TransactionContext) => T
+): T {
+  assertValidScope(scope);
+  if (scope === StorageScope.Secure) {
+    flushSecureWrites();
+  }
+
+  const rollback = new Map<string, string | undefined>();
+
+  const rememberRollback = (key: string) => {
+    if (rollback.has(key)) {
+      return;
+    }
+    rollback.set(key, getRawValue(key, scope));
+  };
+
+  const tx: TransactionContext = {
+    scope,
+    getRaw: (key) => getRawValue(key, scope),
+    setRaw: (key, value) => {
+      rememberRollback(key);
+      setRawValue(key, value, scope);
+    },
+    removeRaw: (key) => {
+      rememberRollback(key);
+      removeRawValue(key, scope);
+    },
+    getItem: (item) => {
+      assertBatchScope([item], scope);
+      return item.get();
+    },
+    setItem: (item, value) => {
+      assertBatchScope([item], scope);
+      rememberRollback(item.key);
+      item.set(value);
+    },
+    removeItem: (item) => {
+      assertBatchScope([item], scope);
+      rememberRollback(item.key);
+      item.delete();
+    },
+  };
+
+  try {
+    return transaction(tx);
+  } catch (error) {
+    Array.from(rollback.entries())
+      .reverse()
+      .forEach(([key, previousValue]) => {
+        if (previousValue === undefined) {
+          removeRawValue(key, scope);
+        } else {
+          setRawValue(key, previousValue, scope);
+        }
+      });
+    throw error;
+  }
 }