gjendje 1.2.0 → 1.2.1

package/README.md

@@ -2,8 +2,8 @@
 
 # gjendje
 
-![NPM Last Update](https://img.shields.io/npm/last-update/gjendje)
 ![NPM Version](https://img.shields.io/npm/v/gjendje)
+![NPM Last Update](https://img.shields.io/npm/last-update/gjendje)
 ![GitHub License](https://img.shields.io/github/license/charliebeckstrand/gjendje)
 
 gjendje is a storage-agnostic state management library for TypeScript and JavaScript. It gives you a single, unified API for reactive state — regardless of where that state lives.

package/dist/{chunk-ZOVUXRDH.cjs → chunk-6NYUDOPO.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkPEC73EEB_cjs = require('./chunk-PEC73EEB.cjs');
+var chunk7LC5PRFD_cjs = require('./chunk-7LC5PRFD.cjs');
 
 // src/batch.ts
 var depth = 0;
@@ -184,7 +184,7 @@ function readAndMigrate(raw, options, key, scope) {
     if (storedVersion < currentVersion && options.migrate) {
       data = runMigrations(data, storedVersion, currentVersion, options.migrate);
       if (key && scope) {
-        chunkPEC73EEB_cjs.getConfig().onMigrate?.({
+        chunk7LC5PRFD_cjs.getConfig().onMigrate?.({
           key,
           scope,
           fromVersion: storedVersion,
@@ -195,13 +195,13 @@ function readAndMigrate(raw, options, key, scope) {
     }
     if (options.validate && !options.validate(data)) {
       if (key && scope) {
-        chunkPEC73EEB_cjs.getConfig().onValidationFail?.({ key, scope, value: data });
+        chunk7LC5PRFD_cjs.getConfig().onValidationFail?.({ key, scope, value: data });
       }
       return defaultValue;
     }
     return data;
   } catch {
-    chunkPEC73EEB_cjs.log("debug", `Failed to read/migrate stored value \u2014 falling back to default.`);
+    chunk7LC5PRFD_cjs.log("debug", `Failed to read/migrate stored value \u2014 falling back to default.`);
     return defaultValue;
   }
 }
@@ -229,7 +229,7 @@ function mergeKeys(stored, defaultValue, keys) {
 var MAX_MIGRATION_STEPS = 1e3;
 function runMigrations(data, fromVersion, toVersion, migrations) {
   if (fromVersion < 0 || toVersion - fromVersion > MAX_MIGRATION_STEPS) {
-    chunkPEC73EEB_cjs.log("warn", `Migration range v${fromVersion}\u2192v${toVersion} is out of bounds \u2014 skipping.`);
+    chunk7LC5PRFD_cjs.log("warn", `Migration range v${fromVersion}\u2192v${toVersion} is out of bounds \u2014 skipping.`);
     return data;
   }
   let current = data;
@@ -239,7 +239,7 @@ function runMigrations(data, fromVersion, toVersion, migrations) {
       try {
         current = migrateFn(current);
       } catch {
-        chunkPEC73EEB_cjs.log("warn", `Migration from v${v} failed \u2014 returning partially migrated value.`);
+        chunk7LC5PRFD_cjs.log("warn", `Migration from v${v} failed \u2014 returning partially migrated value.`);
         return current;
       }
     }
@@ -253,6 +253,7 @@ function createStorageAdapter(storage, key, options) {
   const listeners = createListeners();
   let cachedRaw;
   let cachedValue;
+  let cacheValid = false;
   function parse(raw) {
     if (serialize) {
       return serialize.parse(raw);
@@ -260,25 +261,32 @@ function createStorageAdapter(storage, key, options) {
     return readAndMigrate(raw, options, key, options.scope);
   }
   function read() {
+    if (cacheValid) return cachedValue;
     try {
       const raw = storage.getItem(key);
       if (raw === null) {
         cachedRaw = null;
-        cachedValue = void 0;
+        cachedValue = defaultValue;
+        cacheValid = true;
         return defaultValue;
       }
-      if (raw === cachedRaw) return cachedValue;
+      if (raw === cachedRaw) {
+        cacheValid = true;
+        return cachedValue;
+      }
       let value;
       try {
         value = parse(raw);
       } catch {
         cachedRaw = void 0;
         cachedValue = void 0;
+        cacheValid = false;
         return defaultValue;
       }
       value = mergeKeys(value, defaultValue, persist);
       cachedRaw = raw;
       cachedValue = value;
+      cacheValid = true;
       return value;
     } catch {
       return defaultValue;
@@ -291,16 +299,18 @@ function createStorageAdapter(storage, key, options) {
       storage.setItem(key, raw);
       cachedRaw = raw;
       cachedValue = persist ? mergeKeys(toStore, defaultValue, persist) : value;
+      cacheValid = true;
     } catch (e) {
       cachedRaw = void 0;
       cachedValue = void 0;
-      chunkPEC73EEB_cjs.log(
+      cacheValid = false;
+      chunk7LC5PRFD_cjs.log(
         "error",
         `Failed to write key "${key}" to storage: ${e instanceof Error ? e.message : String(e)}`
       );
       const isQuotaError = e instanceof DOMException && (e.name === "QuotaExceededError" || e.code === 22);
       if (isQuotaError && options.scope) {
-        chunkPEC73EEB_cjs.getConfig().onQuotaExceeded?.({ key, scope: options.scope, error: e });
+        chunk7LC5PRFD_cjs.getConfig().onQuotaExceeded?.({ key, scope: options.scope, error: e });
       }
     }
   }
@@ -310,6 +320,7 @@ function createStorageAdapter(storage, key, options) {
     if (event.storageArea !== storage || event.key !== key) return;
     cachedRaw = void 0;
     cachedValue = void 0;
+    cacheValid = false;
     lastNotifiedValue = read();
     notify(notifyListeners);
   }
@@ -330,6 +341,7 @@ function createStorageAdapter(storage, key, options) {
     destroy() {
       cachedRaw = void 0;
       cachedValue = void 0;
+      cacheValid = false;
       listeners.clear();
       if (typeof window !== "undefined") {
         window.removeEventListener("storage", onStorageEvent);
@@ -395,7 +407,7 @@ function createBucketAdapter(key, bucketOptions, options) {
         if (parsed != null) {
           openOptions.expires = parsed;
         } else {
-          chunkPEC73EEB_cjs.log(
+          chunk7LC5PRFD_cjs.log(
             "warn",
             `Invalid bucket expires format: "${bucketOptions.expires}". Expected a number or a string like "7d", "24h", "30m".`
           );
@@ -406,7 +418,7 @@ function createBucketAdapter(key, bucketOptions, options) {
         if (parsed != null) {
           openOptions.quota = parsed;
         } else {
-          chunkPEC73EEB_cjs.log(
+          chunk7LC5PRFD_cjs.log(
             "warn",
             `Invalid bucket quota format: "${bucketOptions.quota}". Expected a number or a string like "10mb", "50kb", "1gb".`
           );
@@ -427,7 +439,7 @@ function createBucketAdapter(key, bucketOptions, options) {
       }
       const bucketValue = delegate.get();
       if (hadUserWrite && shallowEqual(bucketValue, defaultValue)) {
-        chunkPEC73EEB_cjs.getConfig().onExpire?.({ key, scope: "bucket", expiredAt: Date.now() });
+        chunk7LC5PRFD_cjs.getConfig().onExpire?.({ key, scope: "bucket", expiredAt: Date.now() });
       }
       if (hadUserWrite) {
         delegate.set(currentValue);
@@ -514,15 +526,15 @@ function withSync(adapter, key, scope) {
       try {
         adapter.set(value);
         if (scope) {
-          chunkPEC73EEB_cjs.getConfig().onSync?.({ key, scope, value, source: "remote" });
+          chunk7LC5PRFD_cjs.getConfig().onSync?.({ key, scope, value, source: "remote" });
         }
       } catch (err) {
-        chunkPEC73EEB_cjs.log(
+        chunk7LC5PRFD_cjs.log(
           "error",
           `Sync failed for key "${key}": ${err instanceof Error ? err.message : String(err)}`
         );
         if (scope) {
-          chunkPEC73EEB_cjs.reportError(key, scope, err);
+          chunk7LC5PRFD_cjs.reportError(key, scope, err);
         }
       }
     };
@@ -654,16 +666,7 @@ var _serverAdapterFactory;
 function registerServerAdapter(factory) {
   _serverAdapterFactory = factory;
 }
-var PERSISTENT_SCOPES = /* @__PURE__ */ new Set(["local", "session", "bucket"]);
 var SYNCABLE_SCOPES = /* @__PURE__ */ new Set(["local", "bucket"]);
-var MEMORY_SHIM = {
-  ready: RESOLVED,
-  get: () => void 0,
-  set: () => {
-  },
-  subscribe: () => () => {
-  }
-};
 function resolveStorageKey(key, options, configPrefix) {
   if (options.prefix === false) return key;
   const prefix = options.prefix ?? configPrefix;
@@ -671,9 +674,6 @@ function resolveStorageKey(key, options, configPrefix) {
 }
 function resolveAdapter(storageKey, scope, options) {
   switch (scope) {
-    case "memory":
-    case "render":
-      return createMemoryAdapter(options.default);
     case "session":
       if (typeof sessionStorage === "undefined") {
         throw new Error(
@@ -859,7 +859,7 @@ var StateImpl = class {
           if (Object.hasOwn(prevRec, key)) {
             filtered[key] = partialRec[key];
           } else {
-            chunkPEC73EEB_cjs.log("warn", `patch("${this.key}") ignored unknown key "${key}" (strict mode).`);
+            chunk7LC5PRFD_cjs.log("warn", `patch("${this.key}") ignored unknown key "${key}" (strict mode).`);
           }
         }
         return { ...prev, ...filtered };
@@ -877,7 +877,7 @@ var StateImpl = class {
     s.watchers?.clear();
     s.watchUnsub?.();
     this._adapter.destroy?.();
-    chunkPEC73EEB_cjs.unregisterByKey(this._rKey);
+    chunk7LC5PRFD_cjs.unregisterByKey(this._rKey);
     this._config.onDestroy?.({ key: this.key, scope: this.scope });
     if (s.resolveDestroyed) {
       s.resolveDestroyed();
@@ -914,31 +914,20 @@ function getExt(c) {
   }
   return c.ext;
 }
-var MEMORY_MUTABLE_SHIM = {
-  lastValue: void 0,
-  isDestroyed: false,
-  interceptors: void 0,
-  changeHandlers: void 0,
-  settled: RESOLVED,
-  resolveDestroyed: void 0,
-  destroyed: void 0,
-  hydrated: void 0,
-  watchers: void 0,
-  watchUnsub: void 0,
-  watchPrev: void 0
-};
-var MemoryStateImpl = class extends StateImpl {
+var MemoryStateImpl = class {
+  key;
+  scope = "memory";
   _c;
+  _defaultValue;
+  _options;
+  _config;
+  _rKey;
   constructor(key, rKey, options, config) {
-    super(
-      key,
-      "memory",
-      rKey,
-      MEMORY_SHIM,
-      options,
-      config,
-      MEMORY_MUTABLE_SHIM
-    );
+    this.key = key;
+    this._rKey = rKey;
+    this._defaultValue = options.default;
+    this._options = options;
+    this._config = config;
     this._c = {
       current: options.default,
       isDestroyed: false,
@@ -1079,6 +1068,24 @@ var MemoryStateImpl = class extends StateImpl {
     this._ensureWatchSubscription();
     return addWatcher(ext.watchers, watchKey, listener);
   }
+  patch(partial, options) {
+    this.set((prev) => {
+      if (options?.strict) {
+        const prevRec = prev;
+        const partialRec = partial;
+        const filtered = {};
+        for (const key of Object.keys(partialRec)) {
+          if (Object.hasOwn(prevRec, key)) {
+            filtered[key] = partialRec[key];
+          } else {
+            chunk7LC5PRFD_cjs.log("warn", `patch("${this.key}") ignored unknown key "${key}" (strict mode).`);
+          }
+        }
+        return { ...prev, ...filtered };
+      }
+      return { ...prev, ...partial };
+    });
+  }
   _ensureWatchSubscription() {
     const ext = getExt(this._c);
     if (ext.watchUnsub) return;
@@ -1106,7 +1113,7 @@ var MemoryStateImpl = class extends StateImpl {
     }
     c.listeners?.clear();
     c.notifyFn = void 0;
-    if (this._rKey) chunkPEC73EEB_cjs.unregisterByKey(this._rKey);
+    if (this._rKey) chunk7LC5PRFD_cjs.unregisterByKey(this._rKey);
     this._config.onDestroy?.({ key: this.key, scope: this.scope });
     if (ext?.resolveDestroyed) {
       ext.resolveDestroyed();
@@ -1119,7 +1126,7 @@ function createBase(key, options) {
   if (!key) {
     throw new Error("[gjendje] key must be a non-empty string.");
   }
-  const config = chunkPEC73EEB_cjs.getConfig();
+  const config = chunk7LC5PRFD_cjs.getConfig();
   if (config.keyPattern && !config.keyPattern.test(key)) {
     throw new Error(
       `[gjendje] Key "${key}" does not match the configured keyPattern ${config.keyPattern}.`
@@ -1129,7 +1136,7 @@ function createBase(key, options) {
   const scope = rawScope === "render" ? "memory" : rawScope;
   if (scope === "memory") {
     if (options.sync || config.sync) {
-      chunkPEC73EEB_cjs.log(
+      chunk7LC5PRFD_cjs.log(
         "warn",
         `sync: true is ignored for scope "memory". Only "local" and "bucket" scopes support cross-tab sync.`
       );
@@ -1137,27 +1144,27 @@ function createBase(key, options) {
     if (config.registry === false) {
       return new MemoryStateImpl(key, "", options, config);
     }
-    const rKey2 = chunkPEC73EEB_cjs.scopedKey(key, scope);
-    const existing2 = chunkPEC73EEB_cjs.getRegistered(rKey2);
+    const rKey2 = chunk7LC5PRFD_cjs.scopedKey(key, scope);
+    const existing2 = chunk7LC5PRFD_cjs.getRegistered(rKey2);
     if (existing2 && !existing2.isDestroyed) {
       if (config.warnOnDuplicate) {
-        chunkPEC73EEB_cjs.log("warn", `Duplicate state("${key}") with scope "${scope}". Returning cached instance.`);
+        chunk7LC5PRFD_cjs.log("warn", `Duplicate state("${key}") with scope "${scope}". Returning cached instance.`);
       }
       return existing2;
     }
     const instance2 = new MemoryStateImpl(key, rKey2, options, config);
-    chunkPEC73EEB_cjs.registerNew(rKey2, key, scope, instance2, config, existing2);
+    chunk7LC5PRFD_cjs.registerNew(rKey2, key, scope, instance2, config, existing2);
     return instance2;
   }
-  const rKey = chunkPEC73EEB_cjs.scopedKey(key, scope);
-  const existing = chunkPEC73EEB_cjs.getRegistered(rKey);
+  const rKey = chunk7LC5PRFD_cjs.scopedKey(key, scope);
+  const existing = chunk7LC5PRFD_cjs.getRegistered(rKey);
   if (existing && !existing.isDestroyed) {
     if (config.warnOnDuplicate) {
-      chunkPEC73EEB_cjs.log("warn", `Duplicate state("${key}") with scope "${scope}". Returning cached instance.`);
+      chunk7LC5PRFD_cjs.log("warn", `Duplicate state("${key}") with scope "${scope}". Returning cached instance.`);
     }
     return existing;
   }
-  if (config.requireValidation && PERSISTENT_SCOPES.has(scope) && !options.validate) {
+  if (config.requireValidation && chunk7LC5PRFD_cjs.PERSISTENT_SCOPES.has(scope) && !options.validate) {
     throw new Error(
       `[gjendje] A validate function is required for persisted scope "${scope}" on state("${key}"). Set requireValidation: false in configure() to disable.`
     );
@@ -1166,13 +1173,14 @@ function createBase(key, options) {
   const useMemoryFallback = isSsrMode && isServer();
   const effectiveSync = options.sync ?? (config.sync && SYNCABLE_SCOPES.has(scope));
   if (effectiveSync && !SYNCABLE_SCOPES.has(scope)) {
-    chunkPEC73EEB_cjs.log(
+    chunk7LC5PRFD_cjs.log(
       "warn",
       `sync: true is ignored for scope "${scope}". Only "local" and "bucket" scopes support cross-tab sync.`
     );
   }
   const storageKey = resolveStorageKey(key, options, config.prefix);
-  const baseAdapter = useMemoryFallback ? createMemoryAdapter(options.default) : resolveAdapter(storageKey, scope, options);
+  const nonMemoryScope = scope;
+  const baseAdapter = useMemoryFallback ? createMemoryAdapter(options.default) : resolveAdapter(storageKey, nonMemoryScope, options);
   const shouldSync = effectiveSync && SYNCABLE_SCOPES.has(scope) && !useMemoryFallback;
   const adapter = shouldSync ? withSync(baseAdapter, storageKey, scope) : baseAdapter;
   const instance = new StateImpl(key, scope, rKey, adapter, options, config);
@@ -1183,7 +1191,7 @@ function createBase(key, options) {
       if (!shallowEqual(currentValue, options.default)) return;
       let realAdapter;
       try {
-        realAdapter = resolveAdapter(storageKey, scope, options);
+        realAdapter = resolveAdapter(storageKey, nonMemoryScope, options);
         const storedValue = realAdapter.get();
         if (!shallowEqual(storedValue, options.default)) {
           instance.set(storedValue);
@@ -1195,14 +1203,14 @@ function createBase(key, options) {
           clientValue: storedValue
         });
       } catch (err) {
-        chunkPEC73EEB_cjs.log("debug", `Hydration adapter unavailable for state("${key}") \u2014 using memory fallback.`);
-        chunkPEC73EEB_cjs.reportError(key, scope, err);
+        chunk7LC5PRFD_cjs.log("debug", `Hydration adapter unavailable for state("${key}") \u2014 using memory fallback.`);
+        chunk7LC5PRFD_cjs.reportError(key, scope, err);
       } finally {
         realAdapter?.destroy?.();
       }
     });
   }
-  chunkPEC73EEB_cjs.registerNew(rKey, key, scope, instance, config, existing);
+  chunk7LC5PRFD_cjs.registerNew(rKey, key, scope, instance, config, existing);
   return instance;
 }
 

package/dist/{chunk-PEC73EEB.cjs → chunk-7LC5PRFD.cjs}

@@ -55,6 +55,7 @@ function getRegistry() {
   return registry;
 }
 
+exports.PERSISTENT_SCOPES = PERSISTENT_SCOPES;
 exports.configure = configure;
 exports.getConfig = getConfig;
 exports.getRegistered = getRegistered;

package/dist/{chunk-4IXO3W5U.js → chunk-T6S7QGUQ.js}

@@ -53,4 +53,4 @@ function getRegistry() {
   return registry;
 }
 
-export { configure, getConfig, getRegistered, getRegistry, log, registerNew, reportError, scopedKey, unregisterByKey };
+export { PERSISTENT_SCOPES, configure, getConfig, getRegistered, getRegistry, log, registerNew, reportError, scopedKey, unregisterByKey };

package/dist/{chunk-664AIFB3.js → chunk-V7QPAQ6F.js}

@@ -1,4 +1,4 @@
-import { getConfig, log, scopedKey, getRegistered, registerNew, unregisterByKey, reportError } from './chunk-4IXO3W5U.js';
+import { getConfig, log, scopedKey, getRegistered, registerNew, PERSISTENT_SCOPES, unregisterByKey, reportError } from './chunk-T6S7QGUQ.js';
 
 // src/batch.ts
 var depth = 0;
@@ -251,6 +251,7 @@ function createStorageAdapter(storage, key, options) {
   const listeners = createListeners();
   let cachedRaw;
   let cachedValue;
+  let cacheValid = false;
   function parse(raw) {
     if (serialize) {
       return serialize.parse(raw);
@@ -258,25 +259,32 @@ function createStorageAdapter(storage, key, options) {
     return readAndMigrate(raw, options, key, options.scope);
   }
   function read() {
+    if (cacheValid) return cachedValue;
     try {
       const raw = storage.getItem(key);
       if (raw === null) {
         cachedRaw = null;
-        cachedValue = void 0;
+        cachedValue = defaultValue;
+        cacheValid = true;
         return defaultValue;
       }
-      if (raw === cachedRaw) return cachedValue;
+      if (raw === cachedRaw) {
+        cacheValid = true;
+        return cachedValue;
+      }
       let value;
       try {
         value = parse(raw);
       } catch {
         cachedRaw = void 0;
         cachedValue = void 0;
+        cacheValid = false;
         return defaultValue;
       }
       value = mergeKeys(value, defaultValue, persist);
       cachedRaw = raw;
       cachedValue = value;
+      cacheValid = true;
       return value;
     } catch {
       return defaultValue;
@@ -289,9 +297,11 @@ function createStorageAdapter(storage, key, options) {
       storage.setItem(key, raw);
       cachedRaw = raw;
       cachedValue = persist ? mergeKeys(toStore, defaultValue, persist) : value;
+      cacheValid = true;
     } catch (e) {
       cachedRaw = void 0;
       cachedValue = void 0;
+      cacheValid = false;
       log(
         "error",
         `Failed to write key "${key}" to storage: ${e instanceof Error ? e.message : String(e)}`
@@ -308,6 +318,7 @@ function createStorageAdapter(storage, key, options) {
     if (event.storageArea !== storage || event.key !== key) return;
     cachedRaw = void 0;
     cachedValue = void 0;
+    cacheValid = false;
     lastNotifiedValue = read();
     notify(notifyListeners);
   }
@@ -328,6 +339,7 @@ function createStorageAdapter(storage, key, options) {
     destroy() {
       cachedRaw = void 0;
       cachedValue = void 0;
+      cacheValid = false;
       listeners.clear();
       if (typeof window !== "undefined") {
         window.removeEventListener("storage", onStorageEvent);
@@ -652,16 +664,7 @@ var _serverAdapterFactory;
 function registerServerAdapter(factory) {
   _serverAdapterFactory = factory;
 }
-var PERSISTENT_SCOPES = /* @__PURE__ */ new Set(["local", "session", "bucket"]);
 var SYNCABLE_SCOPES = /* @__PURE__ */ new Set(["local", "bucket"]);
-var MEMORY_SHIM = {
-  ready: RESOLVED,
-  get: () => void 0,
-  set: () => {
-  },
-  subscribe: () => () => {
-  }
-};
 function resolveStorageKey(key, options, configPrefix) {
   if (options.prefix === false) return key;
   const prefix = options.prefix ?? configPrefix;
@@ -669,9 +672,6 @@ function resolveStorageKey(key, options, configPrefix) {
 }
 function resolveAdapter(storageKey, scope, options) {
   switch (scope) {
-    case "memory":
-    case "render":
-      return createMemoryAdapter(options.default);
     case "session":
       if (typeof sessionStorage === "undefined") {
         throw new Error(
@@ -912,31 +912,20 @@ function getExt(c) {
   }
   return c.ext;
 }
-var MEMORY_MUTABLE_SHIM = {
-  lastValue: void 0,
-  isDestroyed: false,
-  interceptors: void 0,
-  changeHandlers: void 0,
-  settled: RESOLVED,
-  resolveDestroyed: void 0,
-  destroyed: void 0,
-  hydrated: void 0,
-  watchers: void 0,
-  watchUnsub: void 0,
-  watchPrev: void 0
-};
-var MemoryStateImpl = class extends StateImpl {
+var MemoryStateImpl = class {
+  key;
+  scope = "memory";
   _c;
+  _defaultValue;
+  _options;
+  _config;
+  _rKey;
   constructor(key, rKey, options, config) {
-    super(
-      key,
-      "memory",
-      rKey,
-      MEMORY_SHIM,
-      options,
-      config,
-      MEMORY_MUTABLE_SHIM
-    );
+    this.key = key;
+    this._rKey = rKey;
+    this._defaultValue = options.default;
+    this._options = options;
+    this._config = config;
     this._c = {
       current: options.default,
       isDestroyed: false,
@@ -1077,6 +1066,24 @@ var MemoryStateImpl = class extends StateImpl {
     this._ensureWatchSubscription();
     return addWatcher(ext.watchers, watchKey, listener);
   }
+  patch(partial, options) {
+    this.set((prev) => {
+      if (options?.strict) {
+        const prevRec = prev;
+        const partialRec = partial;
+        const filtered = {};
+        for (const key of Object.keys(partialRec)) {
+          if (Object.hasOwn(prevRec, key)) {
+            filtered[key] = partialRec[key];
+          } else {
+            log("warn", `patch("${this.key}") ignored unknown key "${key}" (strict mode).`);
+          }
+        }
+        return { ...prev, ...filtered };
+      }
+      return { ...prev, ...partial };
+    });
+  }
   _ensureWatchSubscription() {
     const ext = getExt(this._c);
     if (ext.watchUnsub) return;
@@ -1170,7 +1177,8 @@ function createBase(key, options) {
     );
   }
   const storageKey = resolveStorageKey(key, options, config.prefix);
-  const baseAdapter = useMemoryFallback ? createMemoryAdapter(options.default) : resolveAdapter(storageKey, scope, options);
+  const nonMemoryScope = scope;
+  const baseAdapter = useMemoryFallback ? createMemoryAdapter(options.default) : resolveAdapter(storageKey, nonMemoryScope, options);
   const shouldSync = effectiveSync && SYNCABLE_SCOPES.has(scope) && !useMemoryFallback;
   const adapter = shouldSync ? withSync(baseAdapter, storageKey, scope) : baseAdapter;
   const instance = new StateImpl(key, scope, rKey, adapter, options, config);
@@ -1181,7 +1189,7 @@ function createBase(key, options) {
       if (!shallowEqual(currentValue, options.default)) return;
       let realAdapter;
       try {
-        realAdapter = resolveAdapter(storageKey, scope, options);
+        realAdapter = resolveAdapter(storageKey, nonMemoryScope, options);
         const storedValue = realAdapter.get();
         if (!shallowEqual(storedValue, options.default)) {
           instance.set(storedValue);

package/dist/devtools.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkPEC73EEB_cjs = require('./chunk-PEC73EEB.cjs');
+var chunk7LC5PRFD_cjs = require('./chunk-7LC5PRFD.cjs');
 
 // src/devtools/logger.ts
 var loggerOptions;
@@ -82,7 +82,7 @@ var unsubscribeDevTools;
 var connected = false;
 function getGlobalState() {
   const result = {};
-  for (const instance of chunkPEC73EEB_cjs.getRegistry().values()) {
+  for (const instance of chunk7LC5PRFD_cjs.getRegistry().values()) {
     if (!instance.isDestroyed) {
       result[instance.key] = instance.get();
     }
@@ -106,7 +106,7 @@ function handleDevToolsMessage(message) {
     } catch {
       return;
     }
-    const registry = chunkPEC73EEB_cjs.getRegistry();
+    const registry = chunk7LC5PRFD_cjs.getRegistry();
     for (const instance of registry.values()) {
       if (instance.isDestroyed) continue;
       const key = instance.key;
@@ -188,12 +188,12 @@ function enableDevTools(options) {
   if (devToolsEnabled) {
     return disableDevTools;
   }
-  const config = chunkPEC73EEB_cjs.getConfig();
+  const config = chunk7LC5PRFD_cjs.getConfig();
   originalOnChange = config.onChange;
   originalOnReset = config.onReset;
   originalOnRegister = config.onRegister;
   originalOnDestroy = config.onDestroy;
-  chunkPEC73EEB_cjs.configure({
+  chunk7LC5PRFD_cjs.configure({
     onChange: onChangeHandler,
     onReset: onResetHandler,
     onRegister: onRegisterHandler,
@@ -210,7 +210,7 @@ function enableDevTools(options) {
 }
 function disableDevTools() {
   if (!devToolsEnabled) return;
-  chunkPEC73EEB_cjs.configure({
+  chunk7LC5PRFD_cjs.configure({
     onChange: originalOnChange,
     onReset: originalOnReset,
     onRegister: originalOnRegister,

package/dist/devtools.js

@@ -1,4 +1,4 @@
-import { getConfig, configure, getRegistry } from './chunk-4IXO3W5U.js';
+import { getConfig, configure, getRegistry } from './chunk-T6S7QGUQ.js';
 
 // src/devtools/logger.ts
 var loggerOptions;

package/dist/index.cjs

@@ -1,11 +1,11 @@
 'use strict';
 
-var chunkZOVUXRDH_cjs = require('./chunk-ZOVUXRDH.cjs');
-var chunkPEC73EEB_cjs = require('./chunk-PEC73EEB.cjs');
+var chunk6NYUDOPO_cjs = require('./chunk-6NYUDOPO.cjs');
+var chunk7LC5PRFD_cjs = require('./chunk-7LC5PRFD.cjs');
 
 // src/collection.ts
 function collection(key, options) {
-  const base = chunkZOVUXRDH_cjs.createBase(key, options);
+  const base = chunk6NYUDOPO_cjs.createBase(key, options);
   let watchers;
   let prevItems;
   let unsubscribe;
@@ -23,7 +23,7 @@ function collection(key, options) {
       if (lengthChanged) {
         for (const [, listeners] of w) {
           for (const listener of listeners) {
-            chunkZOVUXRDH_cjs.safeCall(listener, next);
+            chunk6NYUDOPO_cjs.safeCall(listener, next);
           }
         }
         prevItems = next;
@@ -35,12 +35,12 @@ function collection(key, options) {
         const prev = prevItems[i];
         const curr = next[i];
         if (prev === curr) continue;
-        const p = chunkZOVUXRDH_cjs.isRecord(prev) ? prev : void 0;
-        const n = chunkZOVUXRDH_cjs.isRecord(curr) ? curr : void 0;
+        const p = chunk6NYUDOPO_cjs.isRecord(prev) ? prev : void 0;
+        const n = chunk6NYUDOPO_cjs.isRecord(curr) ? curr : void 0;
         if (!p || !n) {
           for (const [, listeners] of w) {
             for (const listener of listeners) {
-              chunkZOVUXRDH_cjs.safeCall(listener, next);
+              chunk6NYUDOPO_cjs.safeCall(listener, next);
             }
           }
           prevItems = next;
@@ -60,7 +60,7 @@ function collection(key, options) {
           const listeners = w.get(watchKey);
           if (listeners) {
             for (const listener of listeners) {
-              chunkZOVUXRDH_cjs.safeCall(listener, next);
+              chunk6NYUDOPO_cjs.safeCall(listener, next);
             }
           }
         }
@@ -69,9 +69,10 @@ function collection(key, options) {
     });
     return w;
   }
-  const col = Object.create(base);
+  const baseDestroy = base.destroy;
+  const col = base;
   col.watch = (watchKey, listener) => {
-    return chunkZOVUXRDH_cjs.addWatcher(ensureWatchers(), watchKey, listener);
+    return chunk6NYUDOPO_cjs.addWatcher(ensureWatchers(), watchKey, listener);
   };
   col.add = (...items) => {
     base.set(base.get().concat(items));
@@ -135,7 +136,7 @@ function collection(key, options) {
   col.destroy = () => {
     watchers?.clear();
     unsubscribe?.();
-    base.destroy();
+    baseDestroy.call(col);
   };
   return col;
 }
@@ -143,7 +144,6 @@ function collection(key, options) {
 // src/computed.ts
 var NOOP = () => {
 };
-var TO_VOID = () => void 0;
 var computedCounter = 0;
 function computed(deps, fn, options) {
   const listenerSet = /* @__PURE__ */ new Set();
@@ -153,7 +153,7 @@ function computed(deps, fn, options) {
   let cached;
   let isDirty = true;
   let isDestroyed = false;
-  const lazyDestroyed = chunkZOVUXRDH_cjs.createLazyDestroyed();
+  const lazyDestroyed = chunk6NYUDOPO_cjs.createLazyDestroyed();
   const depValues = new Array(deps.length);
   const depLen = deps.length;
   function recompute() {
@@ -171,16 +171,16 @@ function computed(deps, fn, options) {
     const value = recompute();
     if (value === prev) return;
     if (singleListener !== void 0) {
-      chunkZOVUXRDH_cjs.safeCall(singleListener, value);
+      chunk6NYUDOPO_cjs.safeCall(singleListener, value);
       return;
     }
     for (const l of listenerSet) {
-      chunkZOVUXRDH_cjs.safeCall(l, value);
+      chunk6NYUDOPO_cjs.safeCall(l, value);
     }
   };
   const markDirty = () => {
     isDirty = true;
-    chunkZOVUXRDH_cjs.notify(notifyListeners);
+    chunk6NYUDOPO_cjs.notify(notifyListeners);
   };
   const unsubscribers = new Array(depLen);
   for (let i = 0; i < depLen; i++) {
@@ -188,12 +188,12 @@ function computed(deps, fn, options) {
     unsubscribers[i] = dep.subscribe(markDirty);
   }
   recompute();
-  let readyPromise = chunkZOVUXRDH_cjs.RESOLVED;
-  let hydratedPromise = chunkZOVUXRDH_cjs.RESOLVED;
-  let settledPromise = chunkZOVUXRDH_cjs.RESOLVED;
+  let readyPromise = chunk6NYUDOPO_cjs.RESOLVED;
+  let hydratedPromise = chunk6NYUDOPO_cjs.RESOLVED;
+  let settledPromise = chunk6NYUDOPO_cjs.RESOLVED;
   let hasAsyncDep = false;
   for (let i = 0; i < depLen; i++) {
-    if (deps[i].ready !== chunkZOVUXRDH_cjs.RESOLVED) {
+    if (deps[i].ready !== chunk6NYUDOPO_cjs.RESOLVED) {
       hasAsyncDep = true;
       break;
     }
@@ -208,9 +208,9 @@ function computed(deps, fn, options) {
       hydratedArr[i] = dep.hydrated;
       settledArr[i] = dep.settled;
     }
-    readyPromise = Promise.all(readyArr).then(TO_VOID);
-    hydratedPromise = Promise.all(hydratedArr).then(TO_VOID);
-    settledPromise = Promise.all(settledArr).then(TO_VOID);
+    readyPromise = Promise.all(readyArr).then(NOOP);
+    hydratedPromise = Promise.all(hydratedArr).then(NOOP);
+    settledPromise = Promise.all(settledArr).then(NOOP);
   }
   return {
     key: instanceKey,
@@ -225,7 +225,7 @@ function computed(deps, fn, options) {
       return hydratedPromise;
     },
     get destroyed() {
-      if (isDestroyed) return chunkZOVUXRDH_cjs.RESOLVED;
+      if (isDestroyed) return chunk6NYUDOPO_cjs.RESOLVED;
       return lazyDestroyed.promise;
     },
     get isDestroyed() {
@@ -268,7 +268,7 @@ function computed(deps, fn, options) {
 
 // src/devtools.ts
 function snapshot() {
-  return Array.from(chunkPEC73EEB_cjs.getRegistry().values(), (instance) => ({
+  return Array.from(chunk7LC5PRFD_cjs.getRegistry().values(), (instance) => ({
     key: instance.key,
     scope: instance.scope,
     value: instance.isDestroyed ? void 0 : instance.get(),
@@ -396,7 +396,7 @@ function withWatch(instance) {
     unsubscribe = instance.subscribe((next) => {
       try {
         if (watchers && watchers.size > 0) {
-          chunkZOVUXRDH_cjs.notifyWatchers(watchers, prev, next);
+          chunk6NYUDOPO_cjs.notifyWatchers(watchers, prev, next);
         }
       } finally {
         prev = next;
@@ -407,7 +407,7 @@ function withWatch(instance) {
   result.watch = (watchKey, listener) => {
     if (!watchers) watchers = /* @__PURE__ */ new Map();
     ensureSubscription();
-    return chunkZOVUXRDH_cjs.addWatcher(watchers, watchKey, listener);
+    return chunk6NYUDOPO_cjs.addWatcher(watchers, watchKey, listener);
   };
   result.destroy = () => {
     watchers?.clear();
@@ -424,7 +424,7 @@ function withWatch(instance) {
 // src/previous.ts
 var previousCounter = 0;
 function previous(source, options) {
-  const listeners = chunkZOVUXRDH_cjs.createListeners();
+  const listeners = chunk6NYUDOPO_cjs.createListeners();
   const instanceKey = options?.key ?? `previous:${previousCounter++}`;
   let prev;
   let current = source.get();
@@ -437,10 +437,10 @@ function previous(source, options) {
     prev = current;
     current = next;
     if (old !== prev) {
-      chunkZOVUXRDH_cjs.notify(notifyListeners);
+      chunk6NYUDOPO_cjs.notify(notifyListeners);
     }
   });
-  const lazyDestroyed = chunkZOVUXRDH_cjs.createLazyDestroyed();
+  const lazyDestroyed = chunk6NYUDOPO_cjs.createLazyDestroyed();
   return {
     key: instanceKey,
     scope: "memory",
@@ -487,92 +487,11 @@ function readonly(instance) {
 }
 
 // src/select.ts
-var NOOP2 = () => {
-};
 var selectCounter = 0;
 function select(source, fn, options) {
-  const listenerSet = /* @__PURE__ */ new Set();
-  let singleListener;
-  let listenerCount = 0;
-  const instanceKey = options?.key ?? `select:${selectCounter++}`;
-  let cached;
-  let isDirty = true;
-  let isDestroyed = false;
-  const lazyDestroyed = chunkZOVUXRDH_cjs.createLazyDestroyed();
-  function recompute() {
-    if (!isDirty) return cached;
-    cached = fn(source.get());
-    isDirty = false;
-    return cached;
-  }
-  const notifyListeners = () => {
-    const prev = cached;
-    const value = recompute();
-    if (value === prev) return;
-    if (singleListener !== void 0) {
-      chunkZOVUXRDH_cjs.safeCall(singleListener, value);
-      return;
-    }
-    for (const l of listenerSet) {
-      chunkZOVUXRDH_cjs.safeCall(l, value);
-    }
-  };
-  const markDirty = () => {
-    isDirty = true;
-    chunkZOVUXRDH_cjs.notify(notifyListeners);
-  };
-  const unsubscribe = source.subscribe(markDirty);
-  recompute();
-  return {
-    key: instanceKey,
-    scope: "memory",
-    get ready() {
-      return source.ready;
-    },
-    get settled() {
-      return source.settled;
-    },
-    get hydrated() {
-      return source.hydrated;
-    },
-    get destroyed() {
-      if (isDestroyed) return chunkZOVUXRDH_cjs.RESOLVED;
-      return lazyDestroyed.promise;
-    },
-    get isDestroyed() {
-      return isDestroyed;
-    },
-    get() {
-      return recompute();
-    },
-    peek() {
-      return cached;
-    },
-    subscribe(listener) {
-      if (isDestroyed) return NOOP2;
-      listenerSet.add(listener);
-      listenerCount++;
-      singleListener = listenerCount === 1 ? listener : void 0;
-      return () => {
-        listenerSet.delete(listener);
-        listenerCount--;
-        if (listenerCount === 1) {
-          singleListener = listenerSet.values().next().value;
-        } else {
-          singleListener = void 0;
-        }
-      };
-    },
-    destroy() {
-      if (isDestroyed) return;
-      isDestroyed = true;
-      unsubscribe();
-      listenerSet.clear();
-      listenerCount = 0;
-      singleListener = void 0;
-      lazyDestroyed.resolve();
-    }
-  };
+  return computed([source], (values) => fn(values[0]), {
+    key: options?.key ?? `select:${selectCounter++}`
+  });
 }
 
 // src/shortcuts.ts
@@ -588,7 +507,7 @@ function extractEntry(entry) {
 }
 function scopeShortcut(scope, entry, options) {
   const [key, defaultValue] = extractEntry(entry);
-  return chunkZOVUXRDH_cjs.createBase(key, { ...options, default: defaultValue, scope });
+  return chunk6NYUDOPO_cjs.createBase(key, { ...options, default: defaultValue, scope });
 }
 function _state(keyOrEntry, optionsOrDefault, extraOptions) {
   let key;
@@ -601,7 +520,7 @@ function _state(keyOrEntry, optionsOrDefault, extraOptions) {
     key = keyOrEntry;
     options = extraOptions ? { ...extraOptions, default: optionsOrDefault } : optionsOrDefault !== null && typeof optionsOrDefault === "object" && "default" in optionsOrDefault ? optionsOrDefault : { default: optionsOrDefault };
   }
-  return chunkZOVUXRDH_cjs.createBase(key, options);
+  return chunk6NYUDOPO_cjs.createBase(key, options);
 }
 _state.local = (e, o) => scopeShortcut("local", e, o);
 _state.session = (e, o) => scopeShortcut("session", e, o);
@@ -612,15 +531,15 @@ var state = _state;
 
 Object.defineProperty(exports, "batch", {
   enumerable: true,
-  get: function () { return chunkZOVUXRDH_cjs.batch; }
+  get: function () { return chunk6NYUDOPO_cjs.batch; }
 });
 Object.defineProperty(exports, "shallowEqual", {
   enumerable: true,
-  get: function () { return chunkZOVUXRDH_cjs.shallowEqual; }
+  get: function () { return chunk6NYUDOPO_cjs.shallowEqual; }
 });
 Object.defineProperty(exports, "configure", {
   enumerable: true,
-  get: function () { return chunkPEC73EEB_cjs.configure; }
+  get: function () { return chunk7LC5PRFD_cjs.configure; }
 });
 exports.collection = collection;
 exports.computed = computed;

package/dist/index.js

@@ -1,7 +1,7 @@
-import { createBase, addWatcher, createLazyDestroyed, RESOLVED, createListeners, notify, safeCall, isRecord, notifyWatchers } from './chunk-664AIFB3.js';
-export { batch, shallowEqual } from './chunk-664AIFB3.js';
-import { getRegistry } from './chunk-4IXO3W5U.js';
-export { configure } from './chunk-4IXO3W5U.js';
+import { createBase, addWatcher, createLazyDestroyed, RESOLVED, createListeners, notify, safeCall, isRecord, notifyWatchers } from './chunk-V7QPAQ6F.js';
+export { batch, shallowEqual } from './chunk-V7QPAQ6F.js';
+import { getRegistry } from './chunk-T6S7QGUQ.js';
+export { configure } from './chunk-T6S7QGUQ.js';
 
 // src/collection.ts
 function collection(key, options) {
@@ -69,7 +69,8 @@ function collection(key, options) {
     });
     return w;
   }
-  const col = Object.create(base);
+  const baseDestroy = base.destroy;
+  const col = base;
   col.watch = (watchKey, listener) => {
     return addWatcher(ensureWatchers(), watchKey, listener);
   };
@@ -135,7 +136,7 @@ function collection(key, options) {
   col.destroy = () => {
     watchers?.clear();
     unsubscribe?.();
-    base.destroy();
+    baseDestroy.call(col);
   };
   return col;
 }
@@ -143,7 +144,6 @@ function collection(key, options) {
 // src/computed.ts
 var NOOP = () => {
 };
-var TO_VOID = () => void 0;
 var computedCounter = 0;
 function computed(deps, fn, options) {
   const listenerSet = /* @__PURE__ */ new Set();
@@ -208,9 +208,9 @@ function computed(deps, fn, options) {
       hydratedArr[i] = dep.hydrated;
       settledArr[i] = dep.settled;
     }
-    readyPromise = Promise.all(readyArr).then(TO_VOID);
-    hydratedPromise = Promise.all(hydratedArr).then(TO_VOID);
-    settledPromise = Promise.all(settledArr).then(TO_VOID);
+    readyPromise = Promise.all(readyArr).then(NOOP);
+    hydratedPromise = Promise.all(hydratedArr).then(NOOP);
+    settledPromise = Promise.all(settledArr).then(NOOP);
   }
   return {
     key: instanceKey,
@@ -487,92 +487,11 @@ function readonly(instance) {
 }
 
 // src/select.ts
-var NOOP2 = () => {
-};
 var selectCounter = 0;
 function select(source, fn, options) {
-  const listenerSet = /* @__PURE__ */ new Set();
-  let singleListener;
-  let listenerCount = 0;
-  const instanceKey = options?.key ?? `select:${selectCounter++}`;
-  let cached;
-  let isDirty = true;
-  let isDestroyed = false;
-  const lazyDestroyed = createLazyDestroyed();
-  function recompute() {
-    if (!isDirty) return cached;
-    cached = fn(source.get());
-    isDirty = false;
-    return cached;
-  }
-  const notifyListeners = () => {
-    const prev = cached;
-    const value = recompute();
-    if (value === prev) return;
-    if (singleListener !== void 0) {
-      safeCall(singleListener, value);
-      return;
-    }
-    for (const l of listenerSet) {
-      safeCall(l, value);
-    }
-  };
-  const markDirty = () => {
-    isDirty = true;
-    notify(notifyListeners);
-  };
-  const unsubscribe = source.subscribe(markDirty);
-  recompute();
-  return {
-    key: instanceKey,
-    scope: "memory",
-    get ready() {
-      return source.ready;
-    },
-    get settled() {
-      return source.settled;
-    },
-    get hydrated() {
-      return source.hydrated;
-    },
-    get destroyed() {
-      if (isDestroyed) return RESOLVED;
-      return lazyDestroyed.promise;
-    },
-    get isDestroyed() {
-      return isDestroyed;
-    },
-    get() {
-      return recompute();
-    },
-    peek() {
-      return cached;
-    },
-    subscribe(listener) {
-      if (isDestroyed) return NOOP2;
-      listenerSet.add(listener);
-      listenerCount++;
-      singleListener = listenerCount === 1 ? listener : void 0;
-      return () => {
-        listenerSet.delete(listener);
-        listenerCount--;
-        if (listenerCount === 1) {
-          singleListener = listenerSet.values().next().value;
-        } else {
-          singleListener = void 0;
-        }
-      };
-    },
-    destroy() {
-      if (isDestroyed) return;
-      isDestroyed = true;
-      unsubscribe();
-      listenerSet.clear();
-      listenerCount = 0;
-      singleListener = void 0;
-      lazyDestroyed.resolve();
-    }
-  };
+  return computed([source], (values) => fn(values[0]), {
+    key: options?.key ?? `select:${selectCounter++}`
+  });
 }
 
 // src/shortcuts.ts

package/dist/server.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkZOVUXRDH_cjs = require('./chunk-ZOVUXRDH.cjs');
-require('./chunk-PEC73EEB.cjs');
+var chunk6NYUDOPO_cjs = require('./chunk-6NYUDOPO.cjs');
+require('./chunk-7LC5PRFD.cjs');
 var async_hooks = require('async_hooks');
 
 var als = new async_hooks.AsyncLocalStorage();
@@ -10,7 +10,7 @@ async function withServerSession(fn) {
   return als.run(store, fn);
 }
 function createServerAdapter(key, defaultValue) {
-  const listeners = chunkZOVUXRDH_cjs.createListeners();
+  const listeners = chunk6NYUDOPO_cjs.createListeners();
   function getStore() {
     return als.getStore();
   }
@@ -32,7 +32,7 @@ function createServerAdapter(key, defaultValue) {
       }
       store.set(key, value);
       lastNotifiedValue = value;
-      chunkZOVUXRDH_cjs.notify(notifyListeners);
+      chunk6NYUDOPO_cjs.notify(notifyListeners);
     },
     subscribe: listeners.subscribe,
     destroy() {
@@ -40,7 +40,7 @@ function createServerAdapter(key, defaultValue) {
     }
   };
 }
-chunkZOVUXRDH_cjs.registerServerAdapter(createServerAdapter);
+chunk6NYUDOPO_cjs.registerServerAdapter(createServerAdapter);
 
 exports.createServerAdapter = createServerAdapter;
 exports.withServerSession = withServerSession;

package/dist/server.js

@@ -1,5 +1,5 @@
-import { registerServerAdapter, createListeners, notify } from './chunk-664AIFB3.js';
-import './chunk-4IXO3W5U.js';
+import { registerServerAdapter, createListeners, notify } from './chunk-V7QPAQ6F.js';
+import './chunk-T6S7QGUQ.js';
 import { AsyncLocalStorage } from 'async_hooks';
 
 var als = new AsyncLocalStorage();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gjendje",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Storage-agnostic state management for TypeScript",
   "keywords": [
     "state",