@ngx-pwa/local-storage 16.3.0 → 18.0.0

package/fesm2022/ngx-pwa-local-storage.mjs

@@ -1,8 +1,8 @@
-import { isPlatformBrowser } from '@angular/common';
 import * as i0 from '@angular/core';
-import { InjectionToken, inject, Injectable, PLATFORM_ID, makeEnvironmentProviders, NgModule } from '@angular/core';
-import { ReplaySubject, fromEvent, race, throwError, of, Observable, asyncScheduler, from } from 'rxjs';
-import { mergeMap, map, first, takeWhile, tap, observeOn, catchError } from 'rxjs/operators';
+import { InjectionToken, makeEnvironmentProviders, NgModule, inject, Injectable, PLATFORM_ID } from '@angular/core';
+import { of, throwError, Observable, asyncScheduler, from, ReplaySubject, fromEvent, race } from 'rxjs';
+import { observeOn, mergeMap, map, first, takeWhile, tap, catchError } from 'rxjs/operators';
+import { isPlatformBrowser } from '@angular/common';
 
 /**
  * Exception message when `indexedDB` is not working
@@ -18,12 +18,12 @@ class IDBBrokenError extends Error {
     }
 }
 /**
- * Exception message when a value can't be serialized for `localStorage`
+ * Exception message when a value cannot be serialized for `localStorage`
  */
 const SERIALIZATION_ERROR = `The storage is currently localStorage,
 where data must be serialized, and the provided data can't be serialized.`;
 /**
- * Exception raised when a value can't be serialized for `localStorage`
+ * Exception throwned when a value cannot be serialized for `localStorage`
  */
 class SerializationError extends Error {
     constructor() {
@@ -90,6 +90,406 @@ const IDB_NO_WRAP = new InjectionToken("localStorageIDBWrap", {
     factory: () => DEFAULT_IDB_NO_WRAP
 });
 
+/**
+ * Allows to add a prefix before `localStorage` keys.
+ *
+ * *Use only* for interoperability with other APIs or to avoid collision for multiple applications on the same subdomain.
+ *
+ * **WARNING: do not change this option in an application already deployed in production, as previously stored data would be lost.**
+ *
+ * @example
+ * export const appConfig: ApplicationConfig = {
+ *   providers: [provideLocalStoragePrefix('custom_')]
+ * };
+ */
+function provideLocalStoragePrefix(prefix) {
+    return makeEnvironmentProviders([{ provide: LS_PREFIX, useValue: prefix }]);
+}
+/**
+ * Allows to change the name used for `indexedDB` database.
+ *
+ * *Use only* for interoperability with other APIs or to avoid collision for multiple applications on the same subdomain.
+ *
+ * **WARNING: do not change this option in an application already deployed in production, as previously stored data would be lost.**
+ *
+ * @example
+ * export const appConfig: ApplicationConfig = {
+ *   providers: [provideIndexedDBDataBaseName('custom')]
+ * };
+ */
+function provideIndexedDBDataBaseName(name) {
+    return makeEnvironmentProviders([{ provide: IDB_DB_NAME, useValue: name }]);
+}
+/**
+ * Allows to change the database version used for `indexedDB` database.
+ * Must be an unsigned **integer**.
+ *
+ * **Use with caution as the creation of the store depends on the version.**
+ *
+ * *Use only* for interoperability with other APIs or to avoid collision for multiple applications on the same subdomain.
+ *
+ * **WARNING: do not change this option in an applicattion already deployed in production, as previously stored data would be lost.**
+ *
+ * @example
+ * export const appConfig: ApplicationConfig = {
+ *   providers: [provideIndexedDBDataBaseVersion(2)]
+ * };
+ */
+function provideIndexedDBDataBaseVersion(version) {
+    return makeEnvironmentProviders([{ provide: IDB_DB_VERSION, useValue: version }]);
+}
+/**
+ * Allows to change the name used for `indexedDB` object store.
+ *
+ * *Use only* for interoperability with other APIs.
+ *
+ * **WARNING: do not change this option in an application already deployed in production, as previously stored data would be lost.**
+ *
+ * @example
+ * export const appConfig: ApplicationConfig = {
+ *   providers: [provideIndexedDBStoreName('custom')]
+ * };
+ */
+function provideIndexedDBStoreName(name) {
+    return makeEnvironmentProviders([{ provide: IDB_STORE_NAME, useValue: name }]);
+}
+
+/**
+ * This module is only here for backward compatibility, **do not add it by yourself**
+ *
+ * @ignore
+ */
+class StorageModule {
+    /**
+     * Only useful to provide options, otherwise it does nothing.
+     *
+     * **Must be used at initialization, ie. in `AppModule`, and must not be loaded again in another module.**
+     */
+    static forRoot(config) {
+        return {
+            ngModule: StorageModule,
+            providers: [
+                config.LSPrefix ? { provide: LS_PREFIX, useValue: config.LSPrefix } : [],
+                config.IDBDBName ? { provide: IDB_DB_NAME, useValue: config.IDBDBName } : [],
+                config.IDBStoreName ? { provide: IDB_STORE_NAME, useValue: config.IDBStoreName } : [],
+                config.IDBDBVersion ? { provide: IDB_DB_VERSION, useValue: config.IDBDBVersion } : [],
+                (config.IDBNoWrap === false) ? { provide: IDB_NO_WRAP, useValue: config.IDBNoWrap } : [],
+            ],
+        };
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: StorageModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.0.0", ngImport: i0, type: StorageModule }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: StorageModule }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: StorageModule, decorators: [{
+            type: NgModule
+        }] });
+
+/**
+ * Exception message when a value is not valid against the JSON schema
+ */
+const VALIDATION_ERROR = `Data stored is not valid against the provided JSON schema.
+Check your JSON schema, otherwise it means data has been corrupted.`;
+/**
+ * Exception throwned when a value is not valid against the JSON schema
+ */
+class ValidationError extends Error {
+    constructor() {
+        super(...arguments);
+        this.message = VALIDATION_ERROR;
+    }
+}
+
+class LocalStorageDatabase {
+    constructor() {
+        /* Prefix if asked, or no prefix otherwise */
+        this.prefix = inject(LS_PREFIX) || "";
+    }
+    /**
+     * Number of items in `localStorage`
+     */
+    get size() {
+        /* Wrap in a RxJS `Observable` to be consistent with other storages */
+        return of(localStorage.length);
+    }
+    /**
+     * Gets an item value in `localStorage`
+     * @param key The item's key
+     * @returns The item's value if the key exists, `undefined` otherwise, wrapped in a RxJS `Observable`
+     */
+    get(key) {
+        /* Get raw data */
+        const unparsedData = localStorage.getItem(this.prefixKey(key));
+        /* No need to parse if data is `null` or `undefined` */
+        if (unparsedData !== null) {
+            /* Try to parse */
+            try {
+                const parsedData = JSON.parse(unparsedData);
+                /* Wrap in a RxJS `Observable` to be consistent with other storages */
+                return of(parsedData);
+            }
+            catch (error) {
+                return throwError(() => error);
+            }
+        }
+        return of(undefined);
+    }
+    /**
+     * Store an item in `localStorage`
+     * @param key The item's key
+     * @param data The item's value
+     * @returns A RxJS `Observable` to wait the end of the operation
+     */
+    set(key, data) {
+        let serializedData = null;
+        /* Check if data can be serialized */
+        const dataPrototype = Object.getPrototypeOf(data);
+        if ((typeof data === "object") && (data !== null) && !Array.isArray(data) &&
+            !((dataPrototype === Object.prototype) || (dataPrototype === null))) {
+            return throwError(() => new SerializationError());
+        }
+        /* Try to stringify (can fail on circular references) */
+        try {
+            serializedData = JSON.stringify(data);
+        }
+        catch (error) {
+            return throwError(() => error);
+        }
+        /* Can fail if storage quota is exceeded */
+        try {
+            localStorage.setItem(this.prefixKey(key), serializedData);
+        }
+        catch (error) {
+            return throwError(() => error);
+        }
+        /* Wrap in a RxJS `Observable` to be consistent with other storages */
+        return of(undefined);
+    }
+    /**
+     * Deletes an item in `localStorage`
+     * @param key The item's key
+     * @returns A RxJS `Observable` to wait the end of the operation
+     */
+    delete(key) {
+        localStorage.removeItem(this.prefixKey(key));
+        /* Wrap in a RxJS `Observable` to be consistent with other storages */
+        return of(undefined);
+    }
+    /**
+     * Deletes all items in `localStorage`
+     * @returns A RxJS `Observable` to wait the end of the operation
+     */
+    clear() {
+        localStorage.clear();
+        /* Wrap in a RxJS `Observable` to be consistent with other storages */
+        return of(undefined);
+    }
+    /**
+     * Get all keys in `localStorage`
+     * Note the order of the keys may be inconsistent in Firefox
+     * @returns A RxJS `Observable` iterating on keys
+     */
+    keys() {
+        /* Create an `Observable` from keys */
+        return new Observable((subscriber) => {
+            /* Iteretate over all the indexes */
+            for (let index = 0; index < localStorage.length; index += 1) {
+                /* Cast as we are sure in this case the key is not `null` */
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- Ensured by the logic
+                subscriber.next(this.getUnprefixedKey(index));
+            }
+            subscriber.complete();
+        }).pipe(
+        /* Required to work like other databases which are asynchronous */
+        observeOn(asyncScheduler));
+    }
+    /**
+     * Check if a key exists in `localStorage`
+     * @param key The item's key
+     * @returns A RxJS `Observable` telling if the key exists or not
+     */
+    has(key) {
+        /* Itérate over all indexes in storage */
+        for (let index = 0; index < localStorage.length; index += 1) {
+            if (key === this.getUnprefixedKey(index)) {
+                /* Wrap in a RxJS `Observable` to be consistent with other storages */
+                return of(true);
+            }
+        }
+        /* Wrap in a RxJS `Observable` to be consistent with other storages */
+        return of(false);
+    }
+    /**
+     * Get an unprefixed key
+     * @param index Index of the key
+     * @returns The unprefixed key name if exists, `null` otherwise
+     */
+    getUnprefixedKey(index) {
+        /* Get the key in storage: may have a prefix */
+        const prefixedKey = localStorage.key(index);
+        if (prefixedKey !== null) {
+            /* If no prefix, the key is already good, otherwrite strip the prefix */
+            return !this.prefix ? prefixedKey : prefixedKey.substring(this.prefix.length);
+        }
+        return null;
+    }
+    /**
+     * Add the prefix to a key
+     * @param key The key name
+     * @returns The prefixed key name
+     */
+    prefixKey(key) {
+        return `${this.prefix}${key}`;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: LocalStorageDatabase, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: LocalStorageDatabase, providedIn: "root" }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: LocalStorageDatabase, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: "root"
+                }]
+        }], ctorParameters: () => [] });
+
+class MemoryDatabase {
+    constructor() {
+        /**
+         * Memory storage
+         */
+        this.memoryStorage = new Map();
+    }
+    /**
+     * Number of items in memory
+     */
+    get size() {
+        /* Wrap in a RxJS `Observable` to be consistent with other storages */
+        return of(this.memoryStorage.size);
+    }
+    /**
+     * Gets an item value in memory
+     * @param key The item's key
+     * @returns The item's value if the key exists, `undefined` otherwise, wrapped in a RxJS `Observable`
+     */
+    get(key) {
+        /* Wrap in a RxJS `Observable` to be consistent with other storages */
+        return of(this.memoryStorage.get(key));
+    }
+    /**
+     * Sets an item in memory
+     * @param key The item's key
+     * @param data The item's value
+     * @returns A RxJS `Observable` to wait the end of the operation
+     */
+    set(key, data) {
+        this.memoryStorage.set(key, data);
+        /* Wrap in a RxJS `Observable` to be consistent with other storages */
+        return of(undefined);
+    }
+    /**
+     * Deletes an item in memory
+     * @param key The item's key
+     * @returns A RxJS `Observable` to wait the end of the operation
+     */
+    delete(key) {
+        this.memoryStorage.delete(key);
+        /* Wrap in a RxJS `Observable` to be consistent with other storages */
+        return of(undefined);
+    }
+    /**
+     * Deletes all items in memory
+     * @returns A RxJS `Observable` to wait the end of the operation
+     */
+    clear() {
+        this.memoryStorage.clear();
+        /* Wrap in a RxJS `Observable` to be consistent with other storages */
+        return of(undefined);
+    }
+    /**
+     * Get all keys in memory
+     * @returns A RxJS `Observable` iterating on keys
+     */
+    keys() {
+        /* Create an `Observable` from keys */
+        return from(this.memoryStorage.keys());
+    }
+    /**
+     * Check if a key exists in memory
+     * @param key Key name
+     * @returns a RxJS `Observable` telling if the key exists or not
+     */
+    has(key) {
+        /* Wrap in a RxJS `Observable` to be consistent with other storages */
+        return of(this.memoryStorage.has(key));
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: MemoryDatabase, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: MemoryDatabase, providedIn: "root" }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: MemoryDatabase, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: "root"
+                }]
+        }] });
+
+/**
+ * Factory to create a storage according to browser support
+ * @see {@link https://github.com/cyrilletuzi/angular-async-local-storage/blob/main/docs/BROWSERS_SUPPORT.md}
+ */
+function localDatabaseFactory() {
+    const platformId = inject(PLATFORM_ID);
+    /* When storage is fully disabled in browser (via the "Block all cookies" option),
+     * just trying to check `indexedDB` or `localStorage` variables causes a security exception.
+     * Prevents https://github.com/cyrilletuzi/angular-async-local-storage/issues/118
+     */
+    try {
+        // Do not explicit `window` here, as the global object is not the same in web workers
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- They can be undefined in some browsers scenarios
+        if (isPlatformBrowser(platformId) && (indexedDB !== undefined) && (indexedDB !== null) && ("open" in indexedDB)) {
+            /* Check:
+            * - if we are in a browser context (issue: server-side rendering)
+            * - it could exist but be `undefined` or `null`
+            * - it could exists but not having a working API
+            * Will be the case for:
+            * - All other browsers in normal mode
+            * - Chromium / Safari / Firefox private mode, but in this case, data will be swiped when the user leaves the app */
+            return new IndexedDBDatabase();
+        }
+        else if (isPlatformBrowser(platformId)
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- They can be undefined in some browsers scenarios
+            && (localStorage !== undefined) && (localStorage !== null) && ("getItem" in localStorage)) {
+            /* Check:
+            * - if we are in a browser context (issue: server-side rendering)
+            * - if `localStorage` exists (to be sure)
+            * - it could exists but not having a working API
+            * Will be the case for:
+            * - Safari cross-origin iframes, detected later in `IndexedDBDatabase.connect()`
+            * @see {@link https://github.com/cyrilletuzi/angular-async-local-storage/issues/42}
+            */
+            return new LocalStorageDatabase();
+        }
+    }
+    catch {
+        // Nothing to do
+    }
+    /* Will be the case for:
+     * - In browsers if storage has been fully disabled (via the "Block all cookies" option)
+     * - Server-side rendering
+     * - All other non-browser context
+     */
+    return new MemoryDatabase();
+}
+class LocalDatabase {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: LocalDatabase, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: LocalDatabase, providedIn: "root", useFactory: localDatabaseFactory }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: LocalDatabase, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: "root",
+                    useFactory: localDatabaseFactory,
+                }]
+        }] });
+
 class IndexedDBDatabase {
     constructor() {
         /**
@@ -150,9 +550,9 @@ class IndexedDBDatabase {
                 if ((request.result !== undefined) && (request.result !== null)) {
                     /* Prior to v8, the value was wrapped in an `{ value: ...}` object */
                     if (!this.noWrap && (typeof request.result === "object") && (this.wrapIndex in request.result) &&
-                        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access -- Required by indexedDb behavior
                         (request.result[this.wrapIndex] !== undefined) && (request.result[this.wrapIndex] !== null)) {
-                        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access -- Required by indexedDb behavior
                         return request.result[this.wrapIndex];
                     }
                     else {
@@ -242,13 +642,14 @@ class IndexedDBDatabase {
             /* Listen to success event */
             const success$ = fromEvent(request, "success").pipe(
             /* Stop the `Observable` when the cursor is `null` */
+            // eslint-disable-next-line rxjs/no-ignored-takewhile-value -- Required by indexedDb behavior, getting the result from the event does not always work
             takeWhile(() => (request.result !== null)), 
             /* This lib only allows string keys, but user could have added other types of keys from outside
              * It's OK to cast as the cursor as been tested in the previous operator */
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-base-to-string -- Required by indexedDb behavior, and strings are enforced by the lib
             map(() => request.result.key.toString()), 
             /* Iterate on the cursor */
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- Required by indexedDb behavior
             tap(() => { request.result.continue(); }));
             /* Listen to error event and if so, throw an error */
             const error$ = this.listenError(request);
@@ -305,9 +706,9 @@ class IndexedDBDatabase {
                 this.database.next(request.result);
             },
             error: () => {
-                /* Firefox private mode issue: fallback storage if IndexedDb connection is failing
-                * @see {@link https://bugzilla.mozilla.org/show_bug.cgi?id=781982}
-                * @see {@link https://github.com/cyrilletuzi/angular-async-local-storage/issues/26} */
+                /* Keeping this error management for safety, but it should not happen anymore.
+                 * It was for Firefox private mode issue in Firefox versions < 115
+                 * @see {@link https://github.com/cyrilletuzi/angular-async-local-storage/issues/26} */
                 this.database.error(new IDBBrokenError());
             },
         });
@@ -335,477 +736,61 @@ class IndexedDBDatabase {
      * Open an `indexedDB` transaction and get our store
      * @param mode `readonly` or `readwrite`
      * @returns An `indexedDB` transaction store and events, wrapped in an RxJS `Observable`
-     */
-    transaction(mode) {
-        /* From the `indexedDB` connection, open a transaction and get the store */
-        return this.database
-            .pipe(mergeMap((database) => {
-            let transaction;
-            try {
-                transaction = database.transaction([this.storeName], mode);
-            }
-            catch (error) {
-                /* The store could have been deleted from outside */
-                return throwError(() => error);
-            }
-            /* Get the store from the transaction */
-            const store = transaction.objectStore(this.storeName);
-            /* Listen transaction `complete` and `error` events */
-            const events = this.listenTransactionEvents(transaction);
-            return of({ store, events });
-        }));
-    }
-    /**
-     * Listen errors on a transaction or request, and throw if trigerred
-     * @param transactionOrRequest `indexedDb` transaction or request to listen
-     * @returns An `Observable` listening to errors
-     */
-    listenError(transactionOrRequest) {
-        return fromEvent(transactionOrRequest, "error").pipe(
-        /* Throw on error to be able to catch errors in RxJS way.
-         * Here `event.target` must be used, as `transactionOrRequest.error` will be `null`
-         * if we are on the request and the error is only triggered later by the transaction */
-        mergeMap((event) => throwError(() => event.target?.error)));
-    }
-    /**
-     * Listen transaction `complete` and `error` events
-     * @param transaction Transaction to listen
-     * @returns An `Observable` listening to transaction `complete` and `error` events
-     */
-    listenTransactionEvents(transaction) {
-        /* Listen to the `complete` event */
-        const complete$ = fromEvent(transaction, "complete");
-        /* Listen to the `error` event */
-        const error$ = this.listenError(transaction);
-        /* Choose the first event to occur */
-        return race([complete$, error$]);
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: IndexedDBDatabase, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: IndexedDBDatabase, providedIn: "root" }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: IndexedDBDatabase, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: "root"
-                }]
-        }], ctorParameters: function () { return []; } });
-
-class LocalStorageDatabase {
-    constructor() {
-        /* Prefix if asked, or no prefix otherwise */
-        this.prefix = inject(LS_PREFIX) || "";
-    }
-    /**
-     * Number of items in `localStorage`
-     */
-    get size() {
-        /* Wrap in a RxJS `Observable` to be consistent with other storages */
-        return of(localStorage.length);
-    }
-    /**
-     * Gets an item value in `localStorage`
-     * @param key The item's key
-     * @returns The item's value if the key exists, `undefined` otherwise, wrapped in a RxJS `Observable`
-     */
-    get(key) {
-        /* Get raw data */
-        const unparsedData = localStorage.getItem(this.prefixKey(key));
-        let parsedData;
-        /* No need to parse if data is `null` or `undefined` */
-        if ((unparsedData !== undefined) && (unparsedData !== null)) {
-            /* Try to parse */
-            try {
-                parsedData = JSON.parse(unparsedData);
-            }
-            catch (error) {
-                return throwError(() => error);
-            }
-        }
-        /* Wrap in a RxJS `Observable` to be consistent with other storages */
-        return of(parsedData);
-    }
-    /**
-     * Store an item in `localStorage`
-     * @param key The item's key
-     * @param data The item's value
-     * @returns A RxJS `Observable` to wait the end of the operation
-     */
-    set(key, data) {
-        let serializedData = null;
-        /* Check if data can be serialized */
-        const dataPrototype = Object.getPrototypeOf(data);
-        if ((typeof data === "object") && (data !== null) && !Array.isArray(data) &&
-            !((dataPrototype === Object.prototype) || (dataPrototype === null))) {
-            return throwError(() => new SerializationError());
-        }
-        /* Try to stringify (can fail on circular references) */
-        try {
-            serializedData = JSON.stringify(data);
-        }
-        catch (error) {
-            return throwError(() => error);
-        }
-        /* Can fail if storage quota is exceeded */
-        try {
-            localStorage.setItem(this.prefixKey(key), serializedData);
-        }
-        catch (error) {
-            return throwError(() => error);
-        }
-        /* Wrap in a RxJS `Observable` to be consistent with other storages */
-        return of(undefined);
-    }
-    /**
-     * Deletes an item in `localStorage`
-     * @param key The item's key
-     * @returns A RxJS `Observable` to wait the end of the operation
-     */
-    delete(key) {
-        localStorage.removeItem(this.prefixKey(key));
-        /* Wrap in a RxJS `Observable` to be consistent with other storages */
-        return of(undefined);
-    }
-    /**
-     * Deletes all items in `localStorage`
-     * @returns A RxJS `Observable` to wait the end of the operation
-     */
-    clear() {
-        localStorage.clear();
-        /* Wrap in a RxJS `Observable` to be consistent with other storages */
-        return of(undefined);
-    }
-    /**
-     * Get all keys in `localStorage`
-     * Note the order of the keys may be inconsistent in Firefox
-     * @returns A RxJS `Observable` iterating on keys
-     */
-    keys() {
-        /* Create an `Observable` from keys */
-        return new Observable((subscriber) => {
-            /* Iteretate over all the indexes */
-            for (let index = 0; index < localStorage.length; index += 1) {
-                /* Cast as we are sure in this case the key is not `null` */
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                subscriber.next(this.getUnprefixedKey(index));
-            }
-            subscriber.complete();
-        }).pipe(
-        /* Required to work like other databases which are asynchronous */
-        observeOn(asyncScheduler));
-    }
-    /**
-     * Check if a key exists in `localStorage`
-     * @param key The item's key
-     * @returns A RxJS `Observable` telling if the key exists or not
-     */
-    has(key) {
-        /* Itérate over all indexes in storage */
-        for (let index = 0; index < localStorage.length; index += 1) {
-            if (key === this.getUnprefixedKey(index)) {
-                /* Wrap in a RxJS `Observable` to be consistent with other storages */
-                return of(true);
-            }
-        }
-        /* Wrap in a RxJS `Observable` to be consistent with other storages */
-        return of(false);
-    }
-    /**
-     * Get an unprefixed key
-     * @param index Index of the key
-     * @returns The unprefixed key name if exists, `null` otherwise
-     */
-    getUnprefixedKey(index) {
-        /* Get the key in storage: may have a prefix */
-        const prefixedKey = localStorage.key(index);
-        if (prefixedKey !== null) {
-            /* If no prefix, the key is already good, otherwrite strip the prefix */
-            return !this.prefix ? prefixedKey : prefixedKey.substring(this.prefix.length);
-        }
-        return null;
-    }
-    /**
-     * Add the prefix to a key
-     * @param key The key name
-     * @returns The prefixed key name
-     */
-    prefixKey(key) {
-        return `${this.prefix}${key}`;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: LocalStorageDatabase, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: LocalStorageDatabase, providedIn: "root" }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: LocalStorageDatabase, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: "root"
-                }]
-        }], ctorParameters: function () { return []; } });
-
-class MemoryDatabase {
-    constructor() {
-        /**
-         * Memory storage
-         */
-        this.memoryStorage = new Map();
-    }
-    /**
-     * Number of items in memory
-     */
-    get size() {
-        /* Wrap in a RxJS `Observable` to be consistent with other storages */
-        return of(this.memoryStorage.size);
-    }
-    /**
-     * Gets an item value in memory
-     * @param key The item's key
-     * @returns The item's value if the key exists, `undefined` otherwise, wrapped in a RxJS `Observable`
-     */
-    get(key) {
-        /* Wrap in a RxJS `Observable` to be consistent with other storages */
-        return of(this.memoryStorage.get(key));
-    }
-    /**
-     * Sets an item in memory
-     * @param key The item's key
-     * @param data The item's value
-     * @returns A RxJS `Observable` to wait the end of the operation
-     */
-    set(key, data) {
-        this.memoryStorage.set(key, data);
-        /* Wrap in a RxJS `Observable` to be consistent with other storages */
-        return of(undefined);
-    }
-    /**
-     * Deletes an item in memory
-     * @param key The item's key
-     * @returns A RxJS `Observable` to wait the end of the operation
-     */
-    delete(key) {
-        this.memoryStorage.delete(key);
-        /* Wrap in a RxJS `Observable` to be consistent with other storages */
-        return of(undefined);
-    }
-    /**
-     * Deletes all items in memory
-     * @returns A RxJS `Observable` to wait the end of the operation
-     */
-    clear() {
-        this.memoryStorage.clear();
-        /* Wrap in a RxJS `Observable` to be consistent with other storages */
-        return of(undefined);
+     */
+    transaction(mode) {
+        /* From the `indexedDB` connection, open a transaction and get the store */
+        return this.database
+            .pipe(mergeMap((database) => {
+            let transaction;
+            try {
+                transaction = database.transaction([this.storeName], mode);
+            }
+            catch (error) {
+                /* The store could have been deleted from outside */
+                return throwError(() => error);
+            }
+            /* Get the store from the transaction */
+            const store = transaction.objectStore(this.storeName);
+            /* Listen transaction `complete` and `error` events */
+            const events = this.listenTransactionEvents(transaction);
+            return of({ store, events });
+        }));
     }
     /**
-     * Get all keys in memory
-     * @returns A RxJS `Observable` iterating on keys
+     * Listen errors on a transaction or request, and throw if trigerred
+     * @param transactionOrRequest `indexedDb` transaction or request to listen
+     * @returns An `Observable` listening to errors
      */
-    keys() {
-        /* Create an `Observable` from keys */
-        return from(this.memoryStorage.keys());
+    listenError(transactionOrRequest) {
+        return fromEvent(transactionOrRequest, "error").pipe(
+        /* Throw on error to be able to catch errors in RxJS way.
+         * Here `event.target` must be used, as `transactionOrRequest.error` will be `null`
+         * if we are on the request and the error is only triggered later by the transaction */
+        mergeMap((event) => throwError(() => event.target?.error)));
     }
     /**
-     * Check if a key exists in memory
-     * @param key Key name
-     * @returns a RxJS `Observable` telling if the key exists or not
+     * Listen transaction `complete` and `error` events
+     * @param transaction Transaction to listen
+     * @returns An `Observable` listening to transaction `complete` and `error` events
      */
-    has(key) {
-        /* Wrap in a RxJS `Observable` to be consistent with other storages */
-        return of(this.memoryStorage.has(key));
+    listenTransactionEvents(transaction) {
+        /* Listen to the `complete` event */
+        const complete$ = fromEvent(transaction, "complete");
+        /* Listen to the `error` event */
+        const error$ = this.listenError(transaction);
+        /* Choose the first event to occur */
+        return race([complete$, error$]);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: MemoryDatabase, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: MemoryDatabase, providedIn: "root" }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: IndexedDBDatabase, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: IndexedDBDatabase, providedIn: "root" }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: MemoryDatabase, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: IndexedDBDatabase, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: "root"
                 }]
-        }] });
-
-/**
- * Factory to create a storage according to browser support
- * @see {@link https://github.com/cyrilletuzi/angular-async-local-storage/blob/main/docs/BROWSERS_SUPPORT.md}
- */
-function localDatabaseFactory() {
-    const platformId = inject(PLATFORM_ID);
-    /* When storage is fully disabled in browser (via the "Block all cookies" option),
-     * just trying to check `indexedDB` or `localStorage` variables causes a security exception.
-     * Prevents https://github.com/cyrilletuzi/angular-async-local-storage/issues/118
-     */
-    try {
-        // Do not explicit `window` here, as the global object is not the same in web workers
-        if (isPlatformBrowser(platformId) && (indexedDB !== undefined) && (indexedDB !== null) && ("open" in indexedDB)) {
-            /* Check:
-            * - if we are in a browser context (issue: server-side rendering)
-            * - it could exist but be `undefined` or `null`
-            * - it could exists but not having a working API
-            * Will be the case for:
-            * - All other browsers in normal mode
-            * - Chromium / Safari private mode, but in this case, data will be swiped when the user leaves the app */
-            return new IndexedDBDatabase();
-        }
-        else if (isPlatformBrowser(platformId)
-            && (localStorage !== undefined) && (localStorage !== null) && ("getItem" in localStorage)) {
-            /* Check:
-            * - if we are in a browser context (issue: server-side rendering)
-            * - if `localStorage` exists (to be sure)
-            * - it could exists but not having a working API
-            * Will be the case for:
-            * - Safari cross-origin iframes, detected later in `IndexedDBDatabase.connect()`
-            * @see {@link https://github.com/cyrilletuzi/angular-async-local-storage/issues/42}
-            * - Firefox private mode, but in this case, data will be swiped when the user leaves the app
-            * For Firefox, can only be detected later in `IndexedDBDatabase.connect()`
-            * @see {@link https://bugzilla.mozilla.org/show_bug.cgi?id=781982}
-            */
-            return new LocalStorageDatabase();
-        }
-    }
-    catch {
-        // Nothing to do
-    }
-    /* Will be the case for:
-     * - In browsers if storage has been fully disabled (via the "Block all cookies" option)
-     * - Server-side rendering
-     * - All other non-browser context
-     */
-    return new MemoryDatabase();
-}
-/** @deprecated Will be removed in v17 */
-class LocalDatabase {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: LocalDatabase, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: LocalDatabase, providedIn: "root", useFactory: localDatabaseFactory }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: LocalDatabase, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: "root",
-                    useFactory: localDatabaseFactory,
-                }]
-        }] });
-
-/**
- * Allows to add a prefix before `localStorage` keys.
- * *Use only* for interoperability with other APIs or to avoid collision for multiple apps on the same subdomain.
- * **WARNING: do not change this option in an app already deployed in production, as previously stored data would be lost.**
- *
- * @example
- * bootstrapApplication(AppComponent, {
- *   providers: [provideLocalStoragePrefix('custom_')]
- * });
- *
- * @example
- * NgModule({
- *   providers: [provideLocalStoragePrefix('custom_')]
- * })
- * export class AppModule
- */
-function provideLocalStoragePrefix(prefix) {
-    return makeEnvironmentProviders([{ provide: LS_PREFIX, useValue: prefix }]);
-}
-/**
- * Allows to change the name used for `indexedDB` database.
- * *Use only* for interoperability with other APIs or to avoid collision for multiple apps on the same subdomain.
- * **WARNING: do not change this option in an app already deployed in production, as previously stored data would be lost.**
- *
- * @example
- * bootstrapApplication(AppComponent, {
- *   providers: [provideIndexedDBDataBaseName('custom')]
- * });
- *
- * @example
- * NgModule({
- *   providers: [provideIndexedDBDataBaseName('custom')]
- * })
- * export class AppModule
- */
-function provideIndexedDBDataBaseName(name) {
-    return makeEnvironmentProviders([{ provide: IDB_DB_NAME, useValue: name }]);
-}
-/**
- * Allows to change the database version used for `indexedDB` database.
- * Must be an unsigned **integer**.
- * **Use with caution as the creation of the store depends on the version.**
- * *Use only* for interoperability with other APIs or to avoid collision for multiple apps on the same subdomain.
- * **WARNING: do not change this option in an app already deployed in production, as previously stored data would be lost.**
- *
- * @example
- * bootstrapApplication(AppComponent, {
- *   providers: [provideIndexedDBDataBaseVersion(2)]
- * });
- *
- * @example
- * NgModule({
- *   providers: [provideIndexedDBDataBaseVersion(2)]
- * })
- * export class AppModule
- */
-function provideIndexedDBDataBaseVersion(version) {
-    return makeEnvironmentProviders([{ provide: IDB_DB_VERSION, useValue: version }]);
-}
-/**
- * Allows to change the name used for `indexedDB` object store.
- * *Use only* for interoperability with other APIs.
- * **WARNING: do not change this option in an app already deployed in production, as previously stored data would be lost.**
- *
- * @example
- * bootstrapApplication(AppComponent, {
- *   providers: [provideIndexedDBStoreName('custom')]
- * });
- *
- * @example
- * NgModule({
- *   providers: [provideIndexedDBStoreName('custom')]
- * })
- * export class AppModule
- */
-function provideIndexedDBStoreName(name) {
-    return makeEnvironmentProviders([{ provide: IDB_STORE_NAME, useValue: name }]);
-}
-
-/**
- * This module is only here for backward compatibility, do not add it by yourself
- */
-class StorageModule {
-    /**
-     * Only useful to provide options, otherwise it does nothing.
-     * **Must be used at initialization, ie. in `AppModule`, and must not be loaded again in another module.**
-     *
-     */
-    static forRoot(config) {
-        return {
-            ngModule: StorageModule,
-            providers: [
-                config.LSPrefix ? { provide: LS_PREFIX, useValue: config.LSPrefix } : [],
-                config.IDBDBName ? { provide: IDB_DB_NAME, useValue: config.IDBDBName } : [],
-                config.IDBStoreName ? { provide: IDB_STORE_NAME, useValue: config.IDBStoreName } : [],
-                config.IDBDBVersion ? { provide: IDB_DB_VERSION, useValue: config.IDBDBVersion } : [],
-                (config.IDBNoWrap === false) ? { provide: IDB_NO_WRAP, useValue: config.IDBNoWrap } : [],
-            ],
-        };
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: StorageModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "16.0.0", ngImport: i0, type: StorageModule }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: StorageModule }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: StorageModule, decorators: [{
-            type: NgModule
-        }] });
-
-/**
- * Exception message when a value is not valid against the JSON schema
- */
-const VALIDATION_ERROR = `Data stored is not valid against the provided JSON schema.
-Check your JSON schema, otherwise it means data has been corrupted.`;
-/**
- * Exception raised when a value is not valid against the JSON schema
- */
-class ValidationError extends Error {
-    constructor() {
-        super(...arguments);
-        this.message = VALIDATION_ERROR;
-    }
-}
+        }], ctorParameters: () => [] });
 
-/** @deprecated Will be removed in v17 */
 class JSONValidator {
     /**
      * Validate a JSON data against a Jsubset of the JSON Schema standard.
@@ -853,16 +838,15 @@ class JSONValidator {
             return false;
         }
         if (schema.pattern) {
-            let regularExpression = null;
             try {
-                regularExpression = new RegExp(schema.pattern);
+                const regularExpression = new RegExp(schema.pattern);
+                if (!regularExpression.test(data)) {
+                    return false;
+                }
             }
             catch {
                 // Nothing to do
             }
-            if (regularExpression && !regularExpression.test(data)) {
-                return false;
-            }
         }
         return true;
     }
@@ -969,9 +953,8 @@ class JSONValidator {
             return false;
         }
         if (schemas) {
-            for (let i = 0; i < schemas.length; i += 1) {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                if (!this.validate(data[i], schemas[i])) {
+            for (const [index, schema] of schemas.entries()) {
+                if (!this.validate(data[index], schema)) {
                     return false;
                 }
             }
@@ -998,7 +981,7 @@ class JSONValidator {
         /* Validate required properties */
         if (schema.required) {
             for (const requiredProp of schema.required) {
-                if (!Object.prototype.hasOwnProperty.call(data, requiredProp)) {
+                if (!Object.hasOwn(data, requiredProp)) {
                     return false;
                 }
             }
@@ -1006,8 +989,8 @@ class JSONValidator {
         /* Recursively validate all properties */
         for (const property in schema.properties) {
             /* Filter to keep only real properties (no internal JS stuff) and check if the data has the property too */
-            if (Object.prototype.hasOwnProperty.call(schema.properties, property) && Object.prototype.hasOwnProperty.call(data, property)) {
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            if (Object.hasOwn(schema.properties, property) && Object.hasOwn(data, property)) {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- Ensured by the logic
                 if (!this.validate(data[property], schema.properties[property])) {
                     return false;
                 }
@@ -1040,10 +1023,10 @@ class JSONValidator {
         /* Cast as the data can be of multiple types, and so TypeScript is lost */
         return (schema.enum.includes(data));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: JSONValidator, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: JSONValidator, providedIn: "root" }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: JSONValidator, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: JSONValidator, providedIn: "root" }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: JSONValidator, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: JSONValidator, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: "root"
@@ -1051,19 +1034,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.0", ngImpor
         }] });
 
 class StorageMap {
+    #database;
+    #jsonValidator;
+    #notifiers = new Map();
     /**
      * Constructor params are provided by Angular (but can also be passed manually in tests)
      * @param database Storage to use
-     * @param jsonValidator Validator service
-     * @param LSPrefix Prefix for `localStorage` keys to avoid collision for multiple apps on the same subdomain or for interoperability
      */
-    constructor(database, jsonValidator = new JSONValidator()) {
-        this.database = database;
-        this.jsonValidator = jsonValidator;
-        this.notifiers = new Map();
+    constructor(database) {
+        this.#database = database;
+        this.#jsonValidator = new JSONValidator();
     }
     /**
-     * **Number of items** in storage, wrapped in an `Observable`.
+     * **Number of items** in storage, wrapped in an Observable.
+     *
+     * Note you do *not* need to unsubscribe (it is a self-completing Observable).
      *
      * @example
      * this.storageMap.size.subscribe((size) => {
@@ -1071,14 +1056,17 @@ class StorageMap {
      * });
      */
     get size() {
-        return this.database.size
+        return this.#database.size
             /* Catch if `indexedDb` is broken */
-            .pipe(this.catchIDBBroken(() => this.database.size));
+            .pipe(this.#catchIDBBroken(() => this.#database.size));
     }
     /**
-     * Tells you which storage engine is used. *Only useful for interoperability.*
+     * Tells you which storage engine is used.
+     *
+     * *Only useful for interoperability.*
+     *
      * Note that due to some browsers issues in some special contexts
-     * (Firefox private mode and Safari cross-origin iframes),
+     * (like Safari cross-origin iframes),
      * **this information may be wrong at initialization,**
      * as the storage could fallback from `indexedDB` to `localStorage`
      * only after a first read or write operation.
@@ -1090,13 +1078,13 @@ class StorageMap {
      * if (this.storageMap.backingEngine === 'indexedDB') {}
      */
     get backingEngine() {
-        if (this.database instanceof IndexedDBDatabase) {
+        if (this.#database instanceof IndexedDBDatabase) {
             return "indexedDB";
         }
-        else if (this.database instanceof LocalStorageDatabase) {
+        else if (this.#database instanceof LocalStorageDatabase) {
             return "localStorage";
         }
-        else if (this.database instanceof MemoryDatabase) {
+        else if (this.#database instanceof MemoryDatabase) {
             return "memory";
         }
         else {
@@ -1104,10 +1092,12 @@ class StorageMap {
         }
     }
     /**
-     * Info about `indexedDB` database. *Only useful for interoperability.*
+     * Information about `indexedDB` database.
+     *
+     * *Only useful for interoperability.*
+     *
      * @returns `indexedDB` database name, store name and database version.
-     * **Values will be empty if the storage is not `indexedDB`,**
-     * **so it should be used after an engine check**.
+     * **Values will be empty if the storage is not `indexedDB`, so it should be used after an engine check**.
      *
      * @see {@link https://github.com/cyrilletuzi/angular-async-local-storage/blob/main/docs/INTEROPERABILITY.md}
      *
@@ -1117,15 +1107,17 @@ class StorageMap {
      * }
      */
     get backingStore() {
-        return (this.database instanceof IndexedDBDatabase) ?
-            this.database.backingStore :
+        return (this.#database instanceof IndexedDBDatabase) ?
+            this.#database.backingStore :
             { database: "", store: "", version: 0 };
     }
     /**
-     * Info about `localStorage` fallback storage. *Only useful for interoperability.*
+     * Information about `localStorage` fallback storage.
+     *
+     * *Only useful for interoperability.*
+     *
      * @returns `localStorage` prefix.
-     * **Values will be empty if the storage is not `localStorage`,**
-     * **so it should be used after an engine check**.
+     * **Values will be empty if the storage is not `localStorage`, so it should be used after an engine check**.
      *
      * @see {@link https://github.com/cyrilletuzi/angular-async-local-storage/blob/main/docs/INTEROPERABILITY.md}
      *
@@ -1135,22 +1127,22 @@ class StorageMap {
      * }
      */
     get fallbackBackingStore() {
-        return (this.database instanceof LocalStorageDatabase) ?
-            { prefix: this.database.prefix } :
+        return (this.#database instanceof LocalStorageDatabase) ?
+            { prefix: this.#database.prefix } :
             { prefix: "" };
     }
     get(key, schema) {
         /* Get the data in storage */
-        return this.database.get(key).pipe(
+        return this.#database.get(key).pipe(
         /* Check if `indexedDb` is broken */
-        this.catchIDBBroken(() => this.database.get(key)), mergeMap((data) => {
+        this.#catchIDBBroken(() => this.#database.get(key)), mergeMap((data) => {
             /* No need to validate if the data is empty */
             if ((data === undefined) || (data === null)) {
                 return of(undefined);
             }
             else if (schema) {
                 /* Validate data against a JSON schema if provided */
-                if (!this.jsonValidator.validate(data, schema)) {
+                if (!this.#jsonValidator.validate(data, schema)) {
                     return throwError(() => new ValidationError());
                 }
                 /* Data have been checked, so it's OK to cast */
@@ -1161,12 +1153,19 @@ class StorageMap {
         }));
     }
     /**
-     * Set an item in storage.
-     * Note that setting `null` or `undefined` will remove the item to avoid some browsers issues.
+     * Store an item in storage.
+     *
+     * Note that:
+     * * you *do* need to subscribe, even if you do not have something specific to do after writing in storage, otherwise nothing happens (because it is how RxJS Observables work),
+     * * but you do *not* need to unsubscribe (it is a self-completing Observable),
+     * * setting `null` or `undefined` will remove the item to avoid some browsers issues,
+     * * you should stick to serializable JSON data, meaning primitive types, arrays and literal objects. Date, Map, Set, Blob and other special structures can cause issues in some scenarios.
+     * @see {@link https://github.com/cyrilletuzi/angular-async-local-storage/blob/main/docs/SERIALIZATION.md}
+     *
      * @param key The item's key
      * @param data The item's value
      * @param schema Optional JSON schema to validate the data
-     * @returns A RxJS `Observable` to wait the end of the operation
+     * @returns A RxJS Observable to wait the end of the operation
      *
      * @example
      * this.storageMap.set('key', 'value').subscribe(() => {});
@@ -1178,54 +1177,68 @@ class StorageMap {
             return this.delete(key);
         }
         /* Validate data against a JSON schema if provided */
-        if (schema && !this.jsonValidator.validate(data, schema)) {
+        if (schema && !this.#jsonValidator.validate(data, schema)) {
             return throwError(() => new ValidationError());
         }
-        return this.database.set(key, data).pipe(
+        return this.#database.set(key, data).pipe(
         /* Catch if `indexedDb` is broken */
-        this.catchIDBBroken(() => this.database.set(key, data)), 
+        this.#catchIDBBroken(() => this.#database.set(key, data)), 
         /* Notify watchers (must be last because it should only happen if the operation succeeds) */
-        tap(() => { this.notify(key, data); }));
+        tap(() => { this.#notify(key, data); }));
     }
     /**
-     * Delete an item in storage
+     * Delete an item in storage.
+     *
+     * Note that:
+     * * you *do* need to subscribe, even if you do not have something specific to do after deleting, otherwise nothing happens (because it is how RxJS Observables work),
+     * * but you do *not* need to unsubscribe (it is a self-completing Observable).
+     *
      * @param key The item's key
-     * @returns A RxJS `Observable` to wait the end of the operation
+     * @returns A RxJS Observable to wait the end of the operation
      *
      * @example
      * this.storageMap.delete('key').subscribe(() => {});
      */
     delete(key) {
-        return this.database.delete(key).pipe(
+        return this.#database.delete(key).pipe(
         /* Catch if `indexedDb` is broken */
-        this.catchIDBBroken(() => this.database.delete(key)), 
+        this.#catchIDBBroken(() => this.#database.delete(key)), 
         /* Notify watchers (must be last because it should only happen if the operation succeeds) */
-        tap(() => { this.notify(key, undefined); }));
+        tap(() => { this.#notify(key, undefined); }));
     }
     /**
-     * Delete all items in storage
-     * @returns A RxJS `Observable` to wait the end of the operation
+     * Delete all items in storage.
+     *
+     * Note that:
+     * * you *do* need to subscribe, even if you do not have something specific to do after clearing, otherwise nothing happens (because it is how RxJS Observables work),
+     * * but you do *not* need to unsubscribe (it is a self-completing Observable).
+     *
+     * @returns A RxJS Observable to wait the end of the operation
      *
      * @example
      * this.storageMap.clear().subscribe(() => {});
      */
     clear() {
-        return this.database.clear().pipe(
+        return this.#database.clear().pipe(
         /* Catch if `indexedDb` is broken */
-        this.catchIDBBroken(() => this.database.clear()), 
+        this.#catchIDBBroken(() => this.#database.clear()), 
         /* Notify watchers (must be last because it should only happen if the operation succeeds) */
         tap(() => {
-            for (const key of this.notifiers.keys()) {
-                this.notify(key, undefined);
+            for (const key of this.#notifiers.keys()) {
+                this.#notify(key, undefined);
             }
         }));
     }
     /**
-     * Get all keys stored in storage. Note **this is an *iterating* `Observable`**:
+     * Get all keys stored in storage.
+     *
+     * Note **this is an *iterating* Observable**:
      * * if there is no key, the `next` callback will not be invoked,
      * * if you need to wait the whole operation to end, be sure to act in the `complete` callback,
-     * as this `Observable` can emit several values and so will invoke the `next` callback several times.
-     * @returns A list of the keys wrapped in a RxJS `Observable`
+     * as this Observable can emit several values and so will invoke the `next` callback several times,
+     * * you do *not* need to unsubscribe (it is a self-completing Observable).
+     *
+     * @returns A list of the keys wrapped in a RxJS Observable
      *
      * @example
      * this.storageMap.keys().subscribe({
@@ -1234,13 +1247,16 @@ class StorageMap {
      * });
      */
     keys() {
-        return this.database.keys()
+        return this.#database.keys()
             /* Catch if `indexedDb` is broken */
-            .pipe(this.catchIDBBroken(() => this.database.keys()));
+            .pipe(this.#catchIDBBroken(() => this.#database.keys()));
     }
     /**
-     * Tells if a key exists in storage
-     * @returns A RxJS `Observable` telling if the key exists
+     * Tells if a key exists in storage.
+     *
+     * Note you do *not* need to unsubscribe (it is a self-completing Observable).
+     *
+     * @returns A RxJS Observable telling if the key exists
      *
      * @example
      * this.storageMap.has('key').subscribe((hasKey) => {
@@ -1248,24 +1264,28 @@ class StorageMap {
      * });
      */
     has(key) {
-        return this.database.has(key)
+        return this.#database.has(key)
             /* Catch if `indexedDb` is broken */
-            .pipe(this.catchIDBBroken(() => this.database.has(key)));
+            .pipe(this.#catchIDBBroken(() => this.#database.has(key)));
     }
     watch(key, schema) {
         /* Check if there is already a notifier */
-        if (!this.notifiers.has(key)) {
-            this.notifiers.set(key, new ReplaySubject(1));
+        if (!this.#notifiers.has(key)) {
+            this.#notifiers.set(key, new ReplaySubject(1));
         }
         /* Non-null assertion is required because TypeScript doesn't narrow `.has()` yet */
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const notifier = this.notifiers.get(key);
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- Ensured by the logic
+        const notifier = this.#notifiers.get(key);
         /* Get the current item value */
         (schema ? this.get(key, schema) : this.get(key)).subscribe({
-            next: (result) => notifier.next(result),
-            error: (error) => notifier.error(error),
+            next: (result) => {
+                notifier.next(result);
+            },
+            error: (error) => {
+                notifier.error(error);
+            },
         });
-        /* Only the public API of the `Observable` should be returned */
+        /* Only the public API of the Observable should be returned */
         return (schema ?
             notifier.asObservable() :
             notifier.asObservable());
@@ -1275,8 +1295,8 @@ class StorageMap {
      * @param key The item's key
      * @param data The new value
      */
-    notify(key, value) {
-        const notifier = this.notifiers.get(key);
+    #notify(key, value) {
+        const notifier = this.#notifiers.get(key);
         if (notifier) {
             notifier.next(value);
         }
@@ -1285,12 +1305,12 @@ class StorageMap {
      * RxJS operator to catch if `indexedDB` is broken
      * @param operationCallback Callback with the operation to redo
      */
-    catchIDBBroken(operationCallback) {
+    #catchIDBBroken(operationCallback) {
         return catchError((error) => {
             /* Check if `indexedDB` is broken based on error message (the specific error class seems to be lost in the process) */
             if ((error !== undefined) && (error !== null)
                 && (typeof error === "object") && ("message" in error)
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access -- Required because TypeScript narrowing is not working here
                 && (error.message === IDB_BROKEN_ERROR)) {
                 /* When storage is fully disabled in browser (via the "Block all cookies" option),
                  * just trying to check `localStorage` variable causes a security exception.
@@ -1299,16 +1319,16 @@ class StorageMap {
                 try {
                     if ("getItem" in localStorage) {
                         /* Fallback to `localStorage` if available */
-                        this.database = new LocalStorageDatabase();
+                        this.#database = new LocalStorageDatabase();
                     }
                     else {
                         /* Fallback to memory storage otherwise */
-                        this.database = new MemoryDatabase();
+                        this.#database = new MemoryDatabase();
                     }
                 }
                 catch {
                     /* Fallback to memory storage otherwise */
-                    this.database = new MemoryDatabase();
+                    this.#database = new MemoryDatabase();
                 }
                 /* Redo the operation */
                 return operationCallback();
@@ -1320,95 +1340,26 @@ class StorageMap {
             }
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: StorageMap, deps: [{ token: LocalDatabase }, { token: JSONValidator }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: StorageMap, providedIn: "root" }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: StorageMap, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: "root"
-                }]
-        }], ctorParameters: function () { return [{ type: LocalDatabase }, { type: JSONValidator }]; } });
-
-/**
- * @deprecated Will be removed in v17, use `StorageMap`
- * @see {@link https://github.com/cyrilletuzi/angular-async-local-storage/blob/main/docs/MIGRATION_TO_V16.md}
- */
-class LocalStorage {
-    /**
-     * Number of items in storage wrapped in an `Observable`
-     *
-     * @example
-     * this.localStorage.length.subscribe((length) => {
-     *   console.log(length);
-     * });
-     */
-    get length() {
-        return this.storageMap.size;
-    }
-    /* Use the `StorageMap` service to avoid code duplication */
-    constructor(storageMap) {
-        this.storageMap = storageMap;
-    }
-    getItem(key, schema) {
-        if (schema) {
-            /* Backward compatibility with version <= 7 */
-            schema = ("schema" in schema) ? schema.schema : schema;
-        }
-        return (schema ? this.storageMap.get(key, schema) : this.storageMap.get(key)).pipe(
-        /* Transform `undefined` into `null` to align with `localStorage` API */
-        map((value) => (value !== undefined) ? value : null));
-    }
-    /**
-     * Set an item in storage.
-     * Note that setting `null` or `undefined` will remove the item to avoid some browsers issues.
-     * @param key The item's key
-     * @param data The item's value
-     * @param schema Optional JSON schema to validate the data
-     * @returns A RxJS `Observable` to wait the end of the operation
-     *
-     * @example
-     * this.localStorage.set('key', 'value').subscribe(() => {});
-     */
-    setItem(key, data, schema) {
-        return this.storageMap.set(key, data, schema).pipe(
-        /* Transform `undefined` into `true` for backward compatibility with v7 */
-        map(() => true));
-    }
-    /**
-     * Delete an item in storage
-     * @param key The item's key
-     * @returns A RxJS `Observable` to wait the end of the operation
-     *
-     * @example
-     * this.localStorage.delete('key').subscribe(() => {});
-     */
-    removeItem(key) {
-        return this.storageMap.delete(key).pipe(
-        /* Transform `undefined` into `true` for backward compatibility with v7 */
-        map(() => true));
-    }
     /**
-     * Delete all items in storage
-     * @returns A RxJS `Observable` to wait the end of the operation
-     *
-     * @example
-     * this.localStorage.clear().subscribe(() => {});
+     * THIS METHOD IS FOR INTERNAL PURPOSE ONLY AND MUST NOT BE USED,
+     * IT CAN BE REMOVED AT ANY TIME AND MESSING WITH IT CAN CAUSE ISSUES
+     * @private
+     * @ignore
      */
-    clear() {
-        return this.storageMap.clear().pipe(
-        /* Transform `undefined` into `true` for backward compatibility with v7 */
-        map(() => true));
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment, @typescript-eslint/prefer-ts-expect-error -- Silence the not used error, it is used in tests
+    // @ts-ignore
+    ɵinternalGetDatabase() {
+        return this.#database;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: LocalStorage, deps: [{ token: StorageMap }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: LocalStorage, providedIn: "root" }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: StorageMap, deps: [{ token: LocalDatabase }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: StorageMap, providedIn: "root" }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.0", ngImport: i0, type: LocalStorage, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.0", ngImport: i0, type: StorageMap, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: "root"
                 }]
-        }], ctorParameters: function () { return [{ type: StorageMap }]; } });
+        }], ctorParameters: () => [{ type: LocalDatabase }] });
 
 /*
  * Public API Surface of local-storage
@@ -1418,5 +1369,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.0.0", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { JSONValidator, LocalDatabase, LocalStorage, SERIALIZATION_ERROR, SerializationError, StorageMap, StorageModule, VALIDATION_ERROR, ValidationError, provideIndexedDBDataBaseName, provideIndexedDBDataBaseVersion, provideIndexedDBStoreName, provideLocalStoragePrefix };
+export { SERIALIZATION_ERROR, SerializationError, StorageMap, StorageModule, VALIDATION_ERROR, ValidationError, provideIndexedDBDataBaseName, provideIndexedDBDataBaseVersion, provideIndexedDBStoreName, provideLocalStoragePrefix };
 //# sourceMappingURL=ngx-pwa-local-storage.mjs.map