react-native-nitro-storage 0.5.9 → 0.6.0

package/lib/commonjs/shared.js.map

@@ -1 +1 @@
-{"version":3,"names":["_Storage","require","_internal","_storageRuntime","isUpdater","valueOrFn","typedKeys","record","Object","keys","assertEnumInteger","value","min","max","label","Number","isFinite","Error","Math","trunc","assertAccessControlLevel","level","assertBiometricLevel","runMicrotask","exports","queueMicrotask","task","Promise","resolve","then","now","performance","Date","notifyKeyListeners","registry","key","listeners","get","listener","notifyAllListeners","values","createKeyChange","scope","oldValue","newValue","operation","source","type","SECURE_EVENT_REDACTED_VALUE","redactSecureKeyChange","event","StorageScope","Secure","undefined","canUseRawBatchPath","item","_hasExpiration","_hasValidation","_isBiometric","_secureAccessControl","canUseSecureRawBatchPath","defaultSerialize","serializeWithPrimitiveFastPath","defaultDeserialize","deserializeWithPrimitiveFastPath","isKeychainLockedError","err","isLockedStorageErrorCode","getStorageErrorCode"],"sourceRoot":"../../src","sources":["shared.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_Storage","require","_internal","_storageRuntime","isUpdater","valueOrFn","typedKeys","record","Object","keys","assertEnumInteger","value","min","max","label","Number","isFinite","Error","Math","trunc","assertAccessControlLevel","level","assertBiometricLevel","runMicrotask","exports","queueMicrotask","task","Promise","resolve","then","now","performance","Date","notifyKeyListeners","registry","key","listeners","get","listener","notifyAllListeners","values","createKeyChange","scope","oldValue","newValue","operation","source","type","SECURE_EVENT_REDACTED_VALUE","redactSecureKeyChange","event","StorageScope","Secure","undefined","canUseRawBatchPath","item","_hasExpiration","_hasValidation","_isBiometric","_secureAccessControl","canUseSecureRawBatchPath","defaultSerialize","serializeWithPrimitiveFastPath","defaultDeserialize","deserializeWithPrimitiveFastPath","isKeychainLockedError","err","isLockedStorageErrorCode","getStorageErrorCode"],"sourceRoot":"../../src","sources":["shared.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AAIA,IAAAE,eAAA,GAAAF,OAAA;AA4FO,SAASG,SAASA,CACvBC,SAA+B,EACF;EAC7B,OAAO,OAAOA,SAAS,KAAK,UAAU;AACxC;AAEO,SAASC,SAASA,CAAsBC,MAAoB,EAAO;EACxE,OAAOC,MAAM,CAACC,IAAI,CAACF,MAAM,CAAC;AAC5B;AAEO,SAASG,iBAAiBA,CAC/BC,KAAa,EACbC,GAAW,EACXC,GAAW,EACXC,KAAa,EACP;EACN,IAAI,CAACC,MAAM,CAACC,QAAQ,CAACL,KAAK,CAAC,IAAIA,KAAK,GAAGC,GAAG,IAAID,KAAK,GAAGE,GAAG,EAAE;IACzD,MAAM,IAAII,KAAK,CAAC,yBAAyBH,KAAK,EAAE,CAAC;EACnD;EACA,IAAIH,KAAK,KAAKO,IAAI,CAACC,KAAK,CAACR,KAAK,CAAC,EAAE;IAC/B,MAAM,IAAIM,KAAK,CAAC,yBAAyBH,KAAK,EAAE,CAAC;EACnD;AACF;AAEO,SAASM,wBAAwBA,CAACC,KAAa,EAAQ;EAC5DX,iBAAiB,CAACW,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,sBAAsB,CAAC;AACxD;AAEO,SAASC,oBAAoBA,CAACD,KAAa,EAAQ;EACxDX,iBAAiB,CAACW,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,iBAAiB,CAAC;AACnD;AAeO,MAAME,YAAY,GAAAC,OAAA,CAAAD,YAAA,GACvB,OAAOE,cAAc,KAAK,UAAU,GAChCA,cAAc,GACbC,IAAgB,IAAK;EACpBC,OAAO,CAACC,OAAO,CAAC,CAAC,CAACC,IAAI,CAACH,IAAI,CAAC;AAC9B,CAAC;AAEA,MAAMI,GAAG,GAAAN,OAAA,CAAAM,GAAA,GACd,OAAOC,WAAW,KAAK,WAAW,IAAI,OAAOA,WAAW,CAACD,GAAG,KAAK,UAAU,GACvE,MAAMC,WAAW,CAACD,GAAG,CAAC,CAAC,GACvB,MAAME,IAAI,CAACF,GAAG,CAAC,CAAC;AAEf,SAASG,kBAAkBA,CAChCC,QAA6B,EAC7BC,GAAW,EACL;EACN,MAAMC,SAAS,GAAGF,QAAQ,CAACG,GAAG,CAACF,GAAG,CAAC;EACnC,IAAIC,SAAS,EAAE;IACb,KAAK,MAAME,QAAQ,IAAIF,SAAS,EAAE;MAChCE,QAAQ,CAAC,CAAC;IACZ;EACF;AACF;AAEO,SAASC,kBAAkBA,CAACL,QAA6B,EAAQ;EACtE,KAAK,MAAME,SAAS,IAAIF,QAAQ,CAACM,MAAM,CAAC,CAAC,EAAE;IACzC,KAAK,MAAMF,QAAQ,IAAIF,SAAS,EAAE;MAChCE,QAAQ,CAAC,CAAC;IACZ;EACF;AACF;AAEO,SAASG,eAAeA,CAC7BC,KAAmB,EACnBP,GAAW,EACXQ,QAA4B,EAC5BC,QAA4B,EAC5BC,SAAiC,EACjCC,MAA2B,EACJ;EACvB,OAAO;IACLC,IAAI,EAAE,KAAK;IACXL,KAAK;IACLP,GAAG;IACHQ,QAAQ;IACRC,QAAQ;IACRC,SAAS;IACTC;EACF,CAAC;AACH;AAEO,MAAME,2BAA2B,GAAAxB,OAAA,CAAAwB,2BAAA,GAAG,UAAU;AAE9C,SAASC,qBAAqBA,CACnCC,KAA4B,EACL;EACvB,IAAIA,KAAK,CAACR,KAAK,KAAKS,qBAAY,CAACC,MAAM,EAAE;IACvC,OAAOF,KAAK;EACd;EAEA,OAAO;IACL,GAAGA,KAAK;IACRP,QAAQ,EACNO,KAAK,CAACP,QAAQ,KAAKU,SAAS,GAAGA,SAAS,GAAGL,2BAA2B;IACxEJ,QAAQ,EACNM,KAAK,CAACN,QAAQ,KAAKS,SAAS,GAAGA,SAAS,GAAGL;EAC/C,CAAC;AACH;AAEO,SAASM,kBAAkBA,CAACC,IAAsB,EAAW;EAClE,OACEA,IAAI,CAACC,cAAc,KAAK,KAAK,IAC7BD,IAAI,CAACE,cAAc,KAAK,KAAK,IAC7BF,IAAI,CAACG,YAAY,KAAK,IAAI,IAC1BH,IAAI,CAACI,oBAAoB,KAAKN,SAAS;AAE3C;AAEO,SAASO,wBAAwBA,CAACL,IAAsB,EAAW;EACxE,OACEA,IAAI,CAACC,cAAc,KAAK,KAAK,IAC7BD,IAAI,CAACE,cAAc,KAAK,KAAK,IAC7BF,IAAI,CAACG,YAAY,KAAK,IAAI;AAE9B;AAEO,SAASG,gBAAgBA,CAAIlD,KAAQ,EAAU;EACpD,OAAO,IAAAmD,wCAA8B,EAACnD,KAAK,CAAC;AAC9C;AAEO,SAASoD,kBAAkBA,CAAIpD,KAAa,EAAK;EACtD,OAAO,IAAAqD,0CAAgC,EAACrD,KAAK,CAAC;AAChD;AAaO,SAASsD,qBAAqBA,CAACC,GAAY,EAAW;EAC3D,OAAO,IAAAC,wCAAwB,EAAC,IAAAC,mCAAmB,EAACF,GAAG,CAAC,CAAC;AAC3D","ignoreList":[]}

package/lib/commonjs/storage-core.js

@@ -8,11 +8,14 @@ var _shared = require("./shared");
 var _Storage = require("./Storage.types");
 var _internal = require("./internal");
 var _storageEvents = require("./storage-events");
+const EMPTY_KEYS = Object.freeze([]);
 function asInternal(item) {
   return item;
 }
 function createStorageCore(buildAdapter) {
   const registeredMigrations = new Map();
+  const itemGroups = new Map();
+  const registeredKeyCounts = new Map();
   const memoryStore = new Map();
   const memoryListeners = new Map();
   const scopedListeners = new Map([[_Storage.StorageScope.Disk, new Map()], [_Storage.StorageScope.Secure, new Map()]]);
@@ -359,6 +362,40 @@ function createStorageCore(buildAdapter) {
     }
   };
   const adapter = buildAdapter(internals);
+  function resolveKeyRef(ref) {
+    return typeof ref === "string" ? ref : ref.key;
+  }
+  function clearScopeExcept(scope, exceptRefs) {
+    measureOperation("storage:clearExcept", scope, () => {
+      (0, _internal.assertValidScope)(scope);
+      const keep = new Set(exceptRefs.map(resolveKeyRef));
+      if (scope === _Storage.StorageScope.Memory) {
+        const removeKeys = Array.from(memoryStore.keys()).filter(key => !keep.has(key));
+        if (removeKeys.length === 0) {
+          return;
+        }
+        const previousValues = shouldReadPreviousEventValues(scope) ? removeKeys.map(key => getEventRawValue(scope, key)) : [];
+        removeKeys.forEach(key => memoryStore.delete(key));
+        removeKeys.forEach(key => (0, _shared.notifyKeyListeners)(memoryListeners, key));
+        emitBatchChange(scope, "clear", "memory", removeKeys.map((key, index) => (0, _shared.createKeyChange)(scope, key, previousValues[index], undefined, "clear", "memory")));
+        return;
+      }
+      if (scope === _Storage.StorageScope.Disk) {
+        flushDiskWrites();
+      }
+      if (scope === _Storage.StorageScope.Secure) {
+        flushSecureWrites();
+      }
+      const removeKeys = adapter.backend.getAllKeys(scope).filter(key => !keep.has(key));
+      if (removeKeys.length === 0) {
+        return;
+      }
+      const previousValues = shouldReadPreviousEventValues(scope) ? adapter.backend.getBatch(removeKeys, scope) : [];
+      adapter.backend.removeBatch(removeKeys, scope);
+      removeKeys.forEach(key => cacheRawValue(scope, key, undefined));
+      emitBatchChange(scope, "clear", adapter.changeSource, removeKeys.map((key, index) => (0, _shared.createKeyChange)(scope, key, previousValues[index], undefined, "clear", adapter.changeSource)));
+    });
+  }
   const storage = {
     subscribe: (scope, listener) => {
       (0, _internal.assertValidScope)(scope);
@@ -410,7 +447,11 @@ function createStorageCore(buildAdapter) {
       adapter.maybeCleanupScopeSubscription(_Storage.StorageScope.Disk);
       adapter.maybeCleanupScopeSubscription(_Storage.StorageScope.Secure);
     },
-    clear: scope => {
+    clear: (scope, options) => {
+      if (options?.except && options.except.length > 0) {
+        clearScopeExcept(scope, options.except);
+        return;
+      }
       measureOperation("storage:clear", scope, () => {
         const previousValues = shouldReadPreviousEventValues(scope) ? storage.getAll(scope) : {};
         if (scope === _Storage.StorageScope.Memory) {
@@ -439,6 +480,71 @@ function createStorageCore(buildAdapter) {
         storage.clear(_Storage.StorageScope.Secure);
       }, 3);
     },
+    clearGroup: group => {
+      const items = itemGroups.get(group);
+      if (!items || items.size === 0) {
+        return;
+      }
+      measureOperation("storage:clearGroup", _Storage.StorageScope.Memory, () => {
+        const byScope = new Map();
+        for (const item of items) {
+          const scoped = byScope.get(item.scope);
+          if (scoped) {
+            scoped.push(item);
+          } else {
+            byScope.set(item.scope, [item]);
+          }
+        }
+        byScope.forEach((groupItems, scope) => {
+          removeBatch(groupItems, scope);
+        });
+      }, items.size);
+    },
+    getGroupItems: group => {
+      const items = itemGroups.get(group);
+      return items ? Array.from(items) : [];
+    },
+    subscribeExpired: (scope, listener) => {
+      return storage.subscribe(scope, event => {
+        if (event.type === "key") {
+          if (event.operation === "expire") {
+            listener(event);
+          }
+          return;
+        }
+        event.changes.forEach(change => {
+          if (change.operation === "expire") {
+            listener(change);
+          }
+        });
+      });
+    },
+    findDuplicateKeys: () => {
+      const duplicates = [];
+      registeredKeyCounts.forEach((count, registryKey) => {
+        if (count <= 1) {
+          return;
+        }
+        const separatorIndex = registryKey.indexOf(":");
+        duplicates.push({
+          scope: Number(registryKey.slice(0, separatorIndex)),
+          key: registryKey.slice(separatorIndex + 1),
+          count
+        });
+      });
+      return duplicates;
+    },
+    getRegisteredKeys: () => {
+      const result = [];
+      registeredKeyCounts.forEach((_count, registryKey) => {
+        const separatorIndex = registryKey.indexOf(":");
+        result.push({
+          scope: Number(registryKey.slice(0, separatorIndex)),
+          key: registryKey.slice(separatorIndex + 1)
+        });
+      });
+      return result;
+    },
     clearNamespace: (namespace, scope) => {
       measureOperation("storage:clearNamespace", scope, () => {
         (0, _internal.assertValidScope)(scope);
@@ -738,6 +844,10 @@ function createStorageCore(buildAdapter) {
     const coalesceSecureWrites = config.scope === _Storage.StorageScope.Secure && config.coalesceSecureWrites === true && !isBiometric;
     const defaultValue = config.defaultValue;
     const nonMemoryScope = config.scope === _Storage.StorageScope.Disk ? _Storage.StorageScope.Disk : config.scope === _Storage.StorageScope.Secure ? _Storage.StorageScope.Secure : null;
+    const renameFromKeys = config.renameFrom === undefined ? EMPTY_KEYS : typeof config.renameFrom === "string" ? [config.renameFrom] : config.renameFrom;
+    const fallbackToCacheOnReadError = config.fallbackToCacheOnReadError === true;
+    const onReadError = config.onReadError;
+    let renamesMigrated = isMemory || renameFromKeys.length === 0;
     if (expiration && expiration.ttlMs <= 0) {
       throw new Error("expiration.ttlMs must be greater than 0.");
     }
@@ -779,15 +889,18 @@ function createStorageCore(buildAdapter) {
         if (memoryExpiration) {
           const expiresAt = memoryExpiration.get(storageKey);
           if (expiresAt !== undefined && expiresAt <= Date.now()) {
+            const expiredRaw = memoryStore.get(storageKey);
             memoryExpiration.delete(storageKey);
             memoryStore.delete(storageKey);
             (0, _shared.notifyKeyListeners)(memoryListeners, storageKey);
+            emitKeyChange(config.scope, storageKey, typeof expiredRaw === "string" ? expiredRaw : undefined, undefined, "expire", "memory");
             onExpired?.(storageKey);
             return undefined;
           }
         }
         return memoryStore.get(storageKey);
       }
+      migrateRenamesIfNeeded();
       if (nonMemoryScope === _Storage.StorageScope.Disk) {
         const pending = pendingDiskWrites.get(storageKey);
         if (pending !== undefined) {
@@ -808,12 +921,27 @@ function createStorageCore(buildAdapter) {
         }
       }
       if (isBiometric) {
-        return adapter.backend.getSecureBiometric(storageKey);
+        return readBackendRaw(() => adapter.backend.getSecureBiometric(storageKey));
       }
-      const raw = adapter.backend.get(storageKey, config.scope);
+      const raw = readBackendRaw(() => adapter.backend.get(storageKey, config.scope));
       cacheRawValue(nonMemoryScope, storageKey, raw);
       return raw;
     };
+    const readBackendRaw = read => {
+      try {
+        return read();
+      } catch (error) {
+        onReadError?.(error);
+        if (fallbackToCacheOnReadError) {
+          const cached = getScopeRawCache(nonMemoryScope).get(storageKey);
+          if (cached !== undefined) {
+            return cached;
+          }
+          return typeof lastRaw === "string" ? lastRaw : undefined;
+        }
+        throw error;
+      }
+    };
     const writeStoredRaw = rawValue => {
       const oldValue = undefined;
       if (isBiometric) {
@@ -844,32 +972,73 @@ function createStorageCore(buildAdapter) {
       adapter.backend.set(storageKey, rawValue, config.scope);
       emitKeyChange(config.scope, storageKey, oldValue, rawValue, "set", adapter.changeSource);
     };
-    const removeStoredRaw = () => {
+    const migrateRenamesIfNeeded = () => {
+      if (renamesMigrated) {
+        return;
+      }
+      try {
+        const hasCurrent = isBiometric ? adapter.backend.hasSecureBiometric(storageKey) : adapter.backend.has(storageKey, config.scope);
+        if (hasCurrent) {
+          for (const legacyKey of renameFromKeys) {
+            if (isBiometric) {
+              if (adapter.backend.hasSecureBiometric(legacyKey)) {
+                adapter.backend.deleteSecureBiometric(legacyKey);
+              }
+            } else if (adapter.backend.has(legacyKey, config.scope)) {
+              adapter.backend.remove(legacyKey, config.scope);
+            }
+          }
+          renamesMigrated = true;
+          return;
+        }
+        for (const legacyKey of renameFromKeys) {
+          const legacyRaw = isBiometric ? adapter.backend.getSecureBiometric(legacyKey) : adapter.backend.get(legacyKey, config.scope);
+          if (legacyRaw === undefined) {
+            continue;
+          }
+          writeStoredRaw(legacyRaw);
+          if (isBiometric) {
+            adapter.backend.deleteSecureBiometric(legacyKey);
+          } else {
+            adapter.backend.remove(legacyKey, config.scope);
+          }
+          break;
+        }
+        renamesMigrated = true;
+      } catch (error) {
+        if ((0, _shared.isKeychainLockedError)(error)) {
+          onReadError?.(error);
+          return;
+        }
+        throw error;
+      }
+    };
+    const removeStoredRaw = (operation = "remove") => {
       const oldValue = getEventRawValue(config.scope, storageKey);
       if (isBiometric) {
         adapter.backend.deleteSecureBiometric(storageKey);
-        emitKeyChange(config.scope, storageKey, oldValue, undefined, "remove", adapter.changeSource);
+        emitKeyChange(config.scope, storageKey, oldValue, undefined, operation, adapter.changeSource);
         return;
       }
       cacheRawValue(nonMemoryScope, storageKey, undefined);
       if (nonMemoryScope === _Storage.StorageScope.Disk) {
         if (coalesceDiskWrites || diskWritesAsync) {
           scheduleDiskWrite(storageKey, undefined);
-          emitKeyChange(config.scope, storageKey, oldValue, undefined, "remove", adapter.changeSource);
+          emitKeyChange(config.scope, storageKey, oldValue, undefined, operation, adapter.changeSource);
           return;
         }
         clearPendingDiskWrite(storageKey);
       }
       if (coalesceSecureWrites) {
         scheduleSecureWrite(storageKey, undefined, secureAccessControl ?? secureDefaultAccessControl);
-        emitKeyChange(config.scope, storageKey, oldValue, undefined, "remove", adapter.changeSource);
+        emitKeyChange(config.scope, storageKey, oldValue, undefined, operation, adapter.changeSource);
         return;
       }
       if (nonMemoryScope === _Storage.StorageScope.Secure) {
         clearPendingSecureWrite(storageKey);
       }
       adapter.backend.remove(storageKey, config.scope);
-      emitKeyChange(config.scope, storageKey, oldValue, undefined, "remove", adapter.changeSource);
+      emitKeyChange(config.scope, storageKey, oldValue, undefined, operation, adapter.changeSource);
     };
     const writeValueWithoutValidation = value => {
       if (isMemory) {
@@ -923,7 +1092,7 @@ function createStorageCore(buildAdapter) {
           if (lastExpiresAt > Date.now()) {
             return lastValue;
           }
-          removeStoredRaw();
+          removeStoredRaw("expire");
           invalidateParsedCache();
           onExpired?.(storageKey);
           lastValue = ensureValidatedValue(defaultValue, false);
@@ -959,7 +1128,7 @@ function createStorageCore(buildAdapter) {
           if ((0, _internal.isStoredEnvelope)(parsed)) {
             envelopeExpiresAt = parsed.expiresAt;
             if (parsed.expiresAt <= Date.now()) {
-              removeStoredRaw();
+              removeStoredRaw("expire");
               invalidateParsedCache();
               onExpired?.(storageKey);
               lastValue = ensureValidatedValue(defaultValue, false);
@@ -1023,6 +1192,27 @@ function createStorageCore(buildAdapter) {
         removeStoredRaw();
       });
     };
+    const merge = partial => {
+      set(prev => {
+        if (prev === null || typeof prev !== "object") {
+          return partial;
+        }
+        return {
+          ...prev,
+          ...partial
+        };
+      });
+    };
+    const reset = () => {
+      deleteItem();
+    };
+    const setOrDelete = value => {
+      if (value === null || value === undefined) {
+        deleteItem();
+        return;
+      }
+      set(value);
+    };
     const hasItem = () => measureOperation("item:has", config.scope, () => {
       if (isMemory) return memoryStore.has(storageKey);
       if (isBiometric) return adapter.backend.hasSecureBiometric(storageKey);
@@ -1075,6 +1265,9 @@ function createStorageCore(buildAdapter) {
       getWithVersion,
       set,
       setIfVersion,
+      merge,
+      reset,
+      setOrDelete,
       delete: deleteItem,
       has: hasItem,
       subscribe,
@@ -1097,9 +1290,22 @@ function createStorageCore(buildAdapter) {
       ...(secureAccessControl !== undefined ? {
         _secureAccessControl: secureAccessControl
       } : {}),
+      ...(config.group !== undefined ? {
+        _group: config.group
+      } : {}),
       scope: config.scope,
       key: storageKey
     };
+    if (config.group !== undefined) {
+      let groupSet = itemGroups.get(config.group);
+      if (!groupSet) {
+        groupSet = new Set();
+        itemGroups.set(config.group, groupSet);
+      }
+      groupSet.add(storageItem);
+    }
+    const registryKey = `${config.scope}:${storageKey}`;
+    registeredKeyCounts.set(registryKey, (registeredKeyCounts.get(registryKey) ?? 0) + 1);
     return storageItem;
   }
   function getBatch(items, scope) {
@@ -1484,14 +1690,104 @@ function createStorageCore(buildAdapter) {
         } : {}),
         ...(expirationConfig !== undefined ? {
           expiration: expirationConfig
+        } : {}),
+        ...(itemConfig.renameFrom !== undefined ? {
+          renameFrom: itemConfig.renameFrom
+        } : {}),
+        ...(options?.group !== undefined ? {
+          group: options.group
+        } : {}),
+        ...(options?.fallbackToCacheOnReadError !== undefined ? {
+          fallbackToCacheOnReadError: options.fallbackToCacheOnReadError
         } : {})
       });
     }
     return result;
   }
+  function memoryItem(config) {
+    return createStorageItem({
+      ...config,
+      scope: _Storage.StorageScope.Memory
+    });
+  }
+  function diskItem(config) {
+    return createStorageItem({
+      ...config,
+      scope: _Storage.StorageScope.Disk
+    });
+  }
+  function secureItem(config) {
+    return createStorageItem({
+      ...config,
+      scope: _Storage.StorageScope.Secure
+    });
+  }
+  function createSetItem(config) {
+    const {
+      defaultValue,
+      ...rest
+    } = config;
+    const initial = {};
+    if (defaultValue) {
+      for (const id of defaultValue) {
+        initial[id] = true;
+      }
+    }
+    const item = createStorageItem({
+      ...rest,
+      defaultValue: initial
+    });
+    const has = id => item.get()[id] === true;
+    const add = id => {
+      if (item.get()[id] === true) {
+        return;
+      }
+      item.merge({
+        [id]: true
+      });
+    };
+    const deleteId = id => {
+      const current = item.get();
+      if (current[id] !== true) {
+        return;
+      }
+      const next = {
+        ...current
+      };
+      delete next[id];
+      item.set(next);
+    };
+    const toggle = id => {
+      if (has(id)) {
+        deleteId(id);
+        return false;
+      }
+      add(id);
+      return true;
+    };
+    return {
+      get: item.get,
+      has,
+      add,
+      delete: deleteId,
+      toggle,
+      values: () => Object.keys(item.get()),
+      size: () => Object.keys(item.get()).length,
+      clear: () => item.set({}),
+      reset: item.reset,
+      subscribe: item.subscribe,
+      scope: item.scope,
+      key: item.key,
+      item
+    };
+  }
   return {
     storage,
     createStorageItem,
+    memoryItem,
+    diskItem,
+    secureItem,
+    createSetItem,
     getBatch,
     setBatch,
     removeBatch,