@etsoo/shared 1.0.90 → 1.0.94

package/lib/cjs/storage/IStorage.d.ts

@@ -3,56 +3,65 @@
  */
 export interface IStorage {
     /**
-     * Current instance index
+     * Clear keys
+     * @param keys Keys
+     * @param persisted Persisted or session data
      */
-    readonly instanceIndex: number;
+    clear(keys: string[], persisted?: boolean): void;
+    /**
+     * Copy keys to session from persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
+     */
+    copyFrom(keys: string[], removeSource?: boolean): void;
+    /**
+     * Copy keys to persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
+     */
+    copyTo(keys: string[], removeSource?: boolean): void;
     /**
      * Get data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getData<T>(key: string, persistance?: boolean): T | undefined;
+    getData<T>(key: string): T | undefined;
     /**
      * Get data with default value
      * @param key Key name
      * @param defaultValue Default value
-     * @param persistance From the persisted data
      */
-    getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
+    getData<T>(key: string, defaultValue: T): T;
+    /**
+     * Get persisted data
+     * @param key Key name
+     */
+    getPersistedData<T>(key: string): T | undefined;
+    /**
+     * Get persisted data with default value
+     * @param key Key name
+     * @param defaultValue Default value
+     */
+    getPersistedData<T>(key: string, defaultValue: T): T;
     /**
      * Get object data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
+    getObject<T extends {}>(key: string): T | undefined;
     /**
-     * Set data
+     * Get persisted object data
      * @param key Key name
-     * @param data  Data, null for removal
-     * @param persistance Persist the data, false will stop persistance
      */
-    setData(key: string, data: unknown, persistance?: boolean): void;
+    getPersistedObject<T extends {}>(key: string): T | undefined;
     /**
-     * Get current instance count
-     * @returns Current instance count
+     * Set data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    getInstanceCount(): number;
+    setData(key: string, data: unknown): void;
     /**
-     * Update instance count
-     * @param removed Is removed?
-     * @returns Current instance count
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    updateInstanceCount(removed: boolean): number;
-}
-/**
- * Storage init callback
- */
-export interface IStorageInitCallback {
-    (field: string, data: string | null, instanceIndex: number): string | null;
-}
-/**
- * Storage constructor interface
- */
-export interface IStorageConstructor {
-    new (globalFields: string[], callback: IStorageInitCallback): IStorage;
+    setPersistedData(key: string, data: unknown): void;
 }

package/lib/cjs/storage/WindowStorage.d.ts

@@ -1,60 +1,69 @@
-import { IStorage, IStorageInitCallback } from './IStorage';
+import { IStorage } from './IStorage';
 /**
  * Window storage
  * https://developer.mozilla.org/en-US/docs/Web/API/Storage
  */
 export declare class WindowStorage implements IStorage {
-    private globalFields;
     /**
-     * Instance count field name
+     * Clear keys
+     * @param keys Keys
+     * @param persisted Persisted or session data
      */
-    private readonly instanceCountField;
-    private _instanceIndex;
+    clear(keys: string[], persisted?: boolean): void;
     /**
-     * Current instance index
+     * Copy keys to session from persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
      */
-    get instanceIndex(): number;
+    copyFrom(keys: string[], removeSource?: boolean): void;
     /**
-     * Constructor
-     * @param globalFields Global fields
-     * @param callback Field and data callback
+     * Copy keys to persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
      */
-    constructor(globalFields: string[], callback: IStorageInitCallback);
+    copyTo(keys: string[], removeSource?: boolean): void;
     /**
      * Get data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getData<T>(key: string, persistance?: boolean): T | undefined;
+    getData<T>(key: string): T | undefined;
     /**
      * Get data with default value
      * @param key Key name
      * @param defaultValue Default value
-     * @param persistance From the persisted data
      */
-    getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
+    getData<T>(key: string, defaultValue: T): T;
+    /**
+     * Get persisted data
+     * @param key Key name
+     */
+    getPersistedData<T>(key: string): T | undefined;
+    /**
+     * Get persisted data with default value
+     * @param key Key name
+     * @param defaultValue Default value
+     */
+    getPersistedData<T>(key: string, defaultValue: T): T;
     /**
      * Get object data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
+    getObject<T extends {}>(key: string): T | undefined;
     /**
-     * Set data
+     * Get persisted object data
      * @param key Key name
-     * @param data  Data, null for removal
-     * @param persistance To the persisted data, false will stop persistance
      */
-    setData(key: string, data: unknown, persistance?: boolean): void;
+    getPersistedObject<T extends {}>(key: string): T | undefined;
     /**
-     * Get current instance count
-     * @returns Current instance count
+     * Set data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    getInstanceCount(): number;
+    setData(key: string, data: unknown): void;
     /**
-     * Update instance count
-     * @param removed Is removed?
-     * @returns Current instance count
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    updateInstanceCount(removed: boolean): number;
+    setPersistedData(key: string, data: unknown): void;
 }

package/lib/cjs/storage/WindowStorage.js

@@ -9,44 +9,64 @@ const Utils_1 = require("../Utils");
  */
 class WindowStorage {
     /**
-     * Constructor
-     * @param globalFields Global fields
-     * @param callback Field and data callback
+     * Clear keys
+     * @param keys Keys
+     * @param persisted Persisted or session data
      */
-    constructor(globalFields, callback) {
-        this.globalFields = globalFields;
-        /**
-         * Instance count field name
-         */
-        this.instanceCountField = 'EtsooSmartERPInstanceCount';
-        // Init instance index
-        this._instanceIndex = this.getInstanceCount();
-        // Copy global fields to session storage
-        globalFields.forEach((field) => {
-            const data = callback(field, localStorage.getItem(field), this._instanceIndex);
-            if (data == null)
-                sessionStorage.removeItem(field);
+    clear(keys, persisted) {
+        keys.forEach((key) => {
+            if (persisted)
+                this.setPersistedData(key, undefined);
             else
-                sessionStorage.setItem(field, data);
+                this.setData(key, undefined);
         });
     }
     /**
-     * Current instance index
+     * Copy keys to session from persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
      */
-    get instanceIndex() {
-        return this._instanceIndex;
+    copyFrom(keys, removeSource) {
+        keys.forEach((key) => {
+            this.setData(key, this.getPersistedData(key));
+            if (removeSource)
+                this.setPersistedData(key, undefined);
+        });
+    }
+    /**
+     * Copy keys to persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
+     */
+    copyTo(keys, removeSource) {
+        keys.forEach((key) => {
+            this.setPersistedData(key, this.getData(key));
+            if (removeSource)
+                this.setData(key, undefined);
+        });
     }
     /**
      * Get data
      * @param key Key name
      * @param defaultValue Default value
-     * @param persistance From the persisted data
      */
-    getData(key, defaultValue, persistance) {
+    getData(key, defaultValue) {
         // Get storage
-        const data = persistance
-            ? localStorage.getItem(key)
-            : sessionStorage.getItem(key);
+        const data = sessionStorage.getItem(key);
+        // No default value
+        if (defaultValue == null)
+            return Utils_1.Utils.parseString(data);
+        // Return
+        return Utils_1.Utils.parseString(data, defaultValue);
+    }
+    /**
+     * Get persisted data
+     * @param key Key name
+     * @param defaultValue Default value
+     */
+    getPersistedData(key, defaultValue) {
+        // Get storage
+        const data = localStorage.getItem(key);
         // No default value
         if (defaultValue == null)
             return Utils_1.Utils.parseString(data);
@@ -56,53 +76,40 @@ class WindowStorage {
     /**
      * Get object data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getObject(key, persistance) {
+    getObject(key) {
         // Get storage
-        const data = persistance
-            ? localStorage.getItem(key)
-            : sessionStorage.getItem(key);
+        const data = sessionStorage.getItem(key);
         if (data == null)
             return undefined;
         return JSON.parse(data);
     }
     /**
-     * Set data
+     * Get persisted object data
      * @param key Key name
-     * @param data  Data, null for removal
-     * @param persistance To the persisted data, false will stop persistance
      */
-    setData(key, data, persistance) {
-        if (persistance) {
-            StorageUtils_1.StorageUtils.setLocalData(key, data);
-            return;
-        }
-        StorageUtils_1.StorageUtils.setSessionData(key, data);
-        if (persistance !== false && this.globalFields.includes(key)) {
-            StorageUtils_1.StorageUtils.setLocalData(key, data);
-        }
+    getPersistedObject(key) {
+        // Get storage
+        const data = localStorage.getItem(key);
+        if (data == null)
+            return undefined;
+        return JSON.parse(data);
     }
     /**
-     * Get current instance count
-     * @returns Current instance count
+     * Set data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    getInstanceCount() {
-        const count = this.getData(this.instanceCountField, 0, true);
-        // Make sure starting from 0
-        if (count < 0)
-            return 0;
-        return count;
+    setData(key, data) {
+        StorageUtils_1.StorageUtils.setSessionData(key, data);
     }
     /**
-     * Update instance count
-     * @param removed Is removed?
-     * @returns Current instance count
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    updateInstanceCount(removed) {
-        const count = this.getInstanceCount() + (removed ? -1 : 1);
-        this.setData(this.instanceCountField, count, true);
-        return count;
+    setPersistedData(key, data) {
+        StorageUtils_1.StorageUtils.setLocalData(key, data);
     }
 }
 exports.WindowStorage = WindowStorage;

package/lib/mjs/storage/IStorage.d.ts

@@ -3,56 +3,65 @@
  */
 export interface IStorage {
     /**
-     * Current instance index
+     * Clear keys
+     * @param keys Keys
+     * @param persisted Persisted or session data
      */
-    readonly instanceIndex: number;
+    clear(keys: string[], persisted?: boolean): void;
+    /**
+     * Copy keys to session from persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
+     */
+    copyFrom(keys: string[], removeSource?: boolean): void;
+    /**
+     * Copy keys to persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
+     */
+    copyTo(keys: string[], removeSource?: boolean): void;
     /**
      * Get data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getData<T>(key: string, persistance?: boolean): T | undefined;
+    getData<T>(key: string): T | undefined;
     /**
      * Get data with default value
      * @param key Key name
      * @param defaultValue Default value
-     * @param persistance From the persisted data
      */
-    getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
+    getData<T>(key: string, defaultValue: T): T;
+    /**
+     * Get persisted data
+     * @param key Key name
+     */
+    getPersistedData<T>(key: string): T | undefined;
+    /**
+     * Get persisted data with default value
+     * @param key Key name
+     * @param defaultValue Default value
+     */
+    getPersistedData<T>(key: string, defaultValue: T): T;
     /**
      * Get object data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
+    getObject<T extends {}>(key: string): T | undefined;
     /**
-     * Set data
+     * Get persisted object data
      * @param key Key name
-     * @param data  Data, null for removal
-     * @param persistance Persist the data, false will stop persistance
      */
-    setData(key: string, data: unknown, persistance?: boolean): void;
+    getPersistedObject<T extends {}>(key: string): T | undefined;
     /**
-     * Get current instance count
-     * @returns Current instance count
+     * Set data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    getInstanceCount(): number;
+    setData(key: string, data: unknown): void;
     /**
-     * Update instance count
-     * @param removed Is removed?
-     * @returns Current instance count
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    updateInstanceCount(removed: boolean): number;
-}
-/**
- * Storage init callback
- */
-export interface IStorageInitCallback {
-    (field: string, data: string | null, instanceIndex: number): string | null;
-}
-/**
- * Storage constructor interface
- */
-export interface IStorageConstructor {
-    new (globalFields: string[], callback: IStorageInitCallback): IStorage;
+    setPersistedData(key: string, data: unknown): void;
 }

package/lib/mjs/storage/WindowStorage.d.ts

@@ -1,60 +1,69 @@
-import { IStorage, IStorageInitCallback } from './IStorage';
+import { IStorage } from './IStorage';
 /**
  * Window storage
  * https://developer.mozilla.org/en-US/docs/Web/API/Storage
  */
 export declare class WindowStorage implements IStorage {
-    private globalFields;
     /**
-     * Instance count field name
+     * Clear keys
+     * @param keys Keys
+     * @param persisted Persisted or session data
      */
-    private readonly instanceCountField;
-    private _instanceIndex;
+    clear(keys: string[], persisted?: boolean): void;
     /**
-     * Current instance index
+     * Copy keys to session from persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
      */
-    get instanceIndex(): number;
+    copyFrom(keys: string[], removeSource?: boolean): void;
     /**
-     * Constructor
-     * @param globalFields Global fields
-     * @param callback Field and data callback
+     * Copy keys to persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
      */
-    constructor(globalFields: string[], callback: IStorageInitCallback);
+    copyTo(keys: string[], removeSource?: boolean): void;
     /**
      * Get data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getData<T>(key: string, persistance?: boolean): T | undefined;
+    getData<T>(key: string): T | undefined;
     /**
      * Get data with default value
      * @param key Key name
      * @param defaultValue Default value
-     * @param persistance From the persisted data
      */
-    getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
+    getData<T>(key: string, defaultValue: T): T;
+    /**
+     * Get persisted data
+     * @param key Key name
+     */
+    getPersistedData<T>(key: string): T | undefined;
+    /**
+     * Get persisted data with default value
+     * @param key Key name
+     * @param defaultValue Default value
+     */
+    getPersistedData<T>(key: string, defaultValue: T): T;
     /**
      * Get object data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
+    getObject<T extends {}>(key: string): T | undefined;
     /**
-     * Set data
+     * Get persisted object data
      * @param key Key name
-     * @param data  Data, null for removal
-     * @param persistance To the persisted data, false will stop persistance
      */
-    setData(key: string, data: unknown, persistance?: boolean): void;
+    getPersistedObject<T extends {}>(key: string): T | undefined;
     /**
-     * Get current instance count
-     * @returns Current instance count
+     * Set data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    getInstanceCount(): number;
+    setData(key: string, data: unknown): void;
     /**
-     * Update instance count
-     * @param removed Is removed?
-     * @returns Current instance count
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    updateInstanceCount(removed: boolean): number;
+    setPersistedData(key: string, data: unknown): void;
 }

package/lib/mjs/storage/WindowStorage.js

@@ -6,44 +6,64 @@ import { Utils } from '../Utils';
  */
 export class WindowStorage {
     /**
-     * Constructor
-     * @param globalFields Global fields
-     * @param callback Field and data callback
+     * Clear keys
+     * @param keys Keys
+     * @param persisted Persisted or session data
      */
-    constructor(globalFields, callback) {
-        this.globalFields = globalFields;
-        /**
-         * Instance count field name
-         */
-        this.instanceCountField = 'EtsooSmartERPInstanceCount';
-        // Init instance index
-        this._instanceIndex = this.getInstanceCount();
-        // Copy global fields to session storage
-        globalFields.forEach((field) => {
-            const data = callback(field, localStorage.getItem(field), this._instanceIndex);
-            if (data == null)
-                sessionStorage.removeItem(field);
+    clear(keys, persisted) {
+        keys.forEach((key) => {
+            if (persisted)
+                this.setPersistedData(key, undefined);
             else
-                sessionStorage.setItem(field, data);
+                this.setData(key, undefined);
         });
     }
     /**
-     * Current instance index
+     * Copy keys to session from persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
      */
-    get instanceIndex() {
-        return this._instanceIndex;
+    copyFrom(keys, removeSource) {
+        keys.forEach((key) => {
+            this.setData(key, this.getPersistedData(key));
+            if (removeSource)
+                this.setPersistedData(key, undefined);
+        });
+    }
+    /**
+     * Copy keys to persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
+     */
+    copyTo(keys, removeSource) {
+        keys.forEach((key) => {
+            this.setPersistedData(key, this.getData(key));
+            if (removeSource)
+                this.setData(key, undefined);
+        });
     }
     /**
      * Get data
      * @param key Key name
      * @param defaultValue Default value
-     * @param persistance From the persisted data
      */
-    getData(key, defaultValue, persistance) {
+    getData(key, defaultValue) {
         // Get storage
-        const data = persistance
-            ? localStorage.getItem(key)
-            : sessionStorage.getItem(key);
+        const data = sessionStorage.getItem(key);
+        // No default value
+        if (defaultValue == null)
+            return Utils.parseString(data);
+        // Return
+        return Utils.parseString(data, defaultValue);
+    }
+    /**
+     * Get persisted data
+     * @param key Key name
+     * @param defaultValue Default value
+     */
+    getPersistedData(key, defaultValue) {
+        // Get storage
+        const data = localStorage.getItem(key);
         // No default value
         if (defaultValue == null)
             return Utils.parseString(data);
@@ -53,52 +73,39 @@ export class WindowStorage {
     /**
      * Get object data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getObject(key, persistance) {
+    getObject(key) {
         // Get storage
-        const data = persistance
-            ? localStorage.getItem(key)
-            : sessionStorage.getItem(key);
+        const data = sessionStorage.getItem(key);
         if (data == null)
             return undefined;
         return JSON.parse(data);
     }
     /**
-     * Set data
+     * Get persisted object data
      * @param key Key name
-     * @param data  Data, null for removal
-     * @param persistance To the persisted data, false will stop persistance
      */
-    setData(key, data, persistance) {
-        if (persistance) {
-            StorageUtils.setLocalData(key, data);
-            return;
-        }
-        StorageUtils.setSessionData(key, data);
-        if (persistance !== false && this.globalFields.includes(key)) {
-            StorageUtils.setLocalData(key, data);
-        }
+    getPersistedObject(key) {
+        // Get storage
+        const data = localStorage.getItem(key);
+        if (data == null)
+            return undefined;
+        return JSON.parse(data);
     }
     /**
-     * Get current instance count
-     * @returns Current instance count
+     * Set data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    getInstanceCount() {
-        const count = this.getData(this.instanceCountField, 0, true);
-        // Make sure starting from 0
-        if (count < 0)
-            return 0;
-        return count;
+    setData(key, data) {
+        StorageUtils.setSessionData(key, data);
     }
     /**
-     * Update instance count
-     * @param removed Is removed?
-     * @returns Current instance count
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    updateInstanceCount(removed) {
-        const count = this.getInstanceCount() + (removed ? -1 : 1);
-        this.setData(this.instanceCountField, count, true);
-        return count;
+    setPersistedData(key, data) {
+        StorageUtils.setLocalData(key, data);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.0.90",
+    "version": "1.0.94",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/storage/IStorage.ts

@@ -3,64 +3,75 @@
  */
 export interface IStorage {
     /**
-     * Current instance index
+     * Clear keys
+     * @param keys Keys
+     * @param persisted Persisted or session data
      */
-    readonly instanceIndex: number;
+    clear(keys: string[], persisted?: boolean): void;
+
+    /**
+     * Copy keys to session from persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
+     */
+    copyFrom(keys: string[], removeSource?: boolean): void;
+
+    /**
+     * Copy keys to persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
+     */
+    copyTo(keys: string[], removeSource?: boolean): void;
 
     /**
      * Get data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getData<T>(key: string, persistance?: boolean): T | undefined;
+    getData<T>(key: string): T | undefined;
 
     /**
      * Get data with default value
      * @param key Key name
      * @param defaultValue Default value
-     * @param persistance From the persisted data
      */
-    getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
+    getData<T>(key: string, defaultValue: T): T;
 
     /**
-     * Get object data
+     * Get persisted data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
+    getPersistedData<T>(key: string): T | undefined;
 
     /**
-     * Set data
+     * Get persisted data with default value
      * @param key Key name
-     * @param data  Data, null for removal
-     * @param persistance Persist the data, false will stop persistance
+     * @param defaultValue Default value
      */
-    setData(key: string, data: unknown, persistance?: boolean): void;
+    getPersistedData<T>(key: string, defaultValue: T): T;
 
     /**
-     * Get current instance count
-     * @returns Current instance count
+     * Get object data
+     * @param key Key name
      */
-    getInstanceCount(): number;
+    getObject<T extends {}>(key: string): T | undefined;
 
     /**
-     * Update instance count
-     * @param removed Is removed?
-     * @returns Current instance count
+     * Get persisted object data
+     * @param key Key name
      */
-    updateInstanceCount(removed: boolean): number;
-}
+    getPersistedObject<T extends {}>(key: string): T | undefined;
 
-/**
- * Storage init callback
- */
-export interface IStorageInitCallback {
-    (field: string, data: string | null, instanceIndex: number): string | null;
-}
+    /**
+     * Set data
+     * @param key Key name
+     * @param data  Data, null for removal
+     */
+    setData(key: string, data: unknown): void;
 
-/**
- * Storage constructor interface
- */
-export interface IStorageConstructor {
-    new (globalFields: string[], callback: IStorageInitCallback): IStorage;
+    /**
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
+     */
+    setPersistedData(key: string, data: unknown): void;
 }

package/src/storage/WindowStorage.ts

@@ -1,6 +1,6 @@
 import { StorageUtils } from '../StorageUtils';
 import { Utils } from '../Utils';
-import { IStorage, IStorageInitCallback } from './IStorage';
+import { IStorage } from './IStorage';
 
 /**
  * Window storage
@@ -8,72 +8,91 @@ import { IStorage, IStorageInitCallback } from './IStorage';
  */
 export class WindowStorage implements IStorage {
     /**
-     * Instance count field name
+     * Clear keys
+     * @param keys Keys
+     * @param persisted Persisted or session data
      */
-    private readonly instanceCountField = 'EtsooSmartERPInstanceCount';
+    clear(keys: string[], persisted?: boolean) {
+        keys.forEach((key) => {
+            if (persisted) this.setPersistedData(key, undefined);
+            else this.setData(key, undefined);
+        });
+    }
 
-    private _instanceIndex: number;
     /**
-     * Current instance index
+     * Copy keys to session from persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
      */
-    get instanceIndex() {
-        return this._instanceIndex;
+    copyFrom(keys: string[], removeSource?: boolean) {
+        keys.forEach((key) => {
+            this.setData(key, this.getPersistedData(key));
+            if (removeSource) this.setPersistedData(key, undefined);
+        });
     }
 
     /**
-     * Constructor
-     * @param globalFields Global fields
-     * @param callback Field and data callback
+     * Copy keys to persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
      */
-    constructor(
-        private globalFields: string[],
-        callback: IStorageInitCallback
-    ) {
-        // Init instance index
-        this._instanceIndex = this.getInstanceCount();
-
-        // Copy global fields to session storage
-        globalFields.forEach((field) => {
-            const data = callback(
-                field,
-                localStorage.getItem(field),
-                this._instanceIndex
-            );
-            if (data == null) sessionStorage.removeItem(field);
-            else sessionStorage.setItem(field, data);
+    copyTo(keys: string[], removeSource?: boolean) {
+        keys.forEach((key) => {
+            this.setPersistedData(key, this.getData(key));
+            if (removeSource) this.setData(key, undefined);
         });
     }
 
     /**
      * Get data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getData<T>(key: string, persistance?: boolean): T | undefined;
+    getData<T>(key: string): T | undefined;
 
     /**
      * Get data with default value
      * @param key Key name
      * @param defaultValue Default value
-     * @param persistance From the persisted data
      */
-    getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
+    getData<T>(key: string, defaultValue: T): T;
 
     /**
      * Get data
      * @param key Key name
      * @param defaultValue Default value
-     * @param persistance From the persisted data
      */
-    getData<T>(
-        key: string,
-        defaultValue?: T,
-        persistance?: boolean
-    ): T | undefined {
+    getData<T>(key: string, defaultValue?: T): T | undefined {
+        // Get storage
+        const data = sessionStorage.getItem(key);
+
+        // No default value
+        if (defaultValue == null) return Utils.parseString<T>(data);
+
+        // Return
+        return Utils.parseString<T>(data, defaultValue);
+    }
+
+    /**
+     * Get persisted data
+     * @param key Key name
+     */
+    getPersistedData<T>(key: string): T | undefined;
+
+    /**
+     * Get persisted data with default value
+     * @param key Key name
+     * @param defaultValue Default value
+     */
+    getPersistedData<T>(key: string, defaultValue: T): T;
+
+    /**
+     * Get persisted data
+     * @param key Key name
+     * @param defaultValue Default value
+     */
+    getPersistedData<T>(key: string, defaultValue?: T): T | undefined {
         // Get storage
-        const data = persistance
-            ? localStorage.getItem(key)
-            : sessionStorage.getItem(key);
+        const data = localStorage.getItem(key);
 
         // No default value
         if (defaultValue == null) return Utils.parseString<T>(data);
@@ -85,13 +104,10 @@ export class WindowStorage implements IStorage {
     /**
      * Get object data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getObject<T extends {}>(key: string, persistance?: boolean) {
+    getObject<T extends {}>(key: string) {
         // Get storage
-        const data = persistance
-            ? localStorage.getItem(key)
-            : sessionStorage.getItem(key);
+        const data = sessionStorage.getItem(key);
 
         if (data == null) return undefined;
 
@@ -99,42 +115,33 @@ export class WindowStorage implements IStorage {
     }
 
     /**
-     * Set data
+     * Get persisted object data
      * @param key Key name
-     * @param data  Data, null for removal
-     * @param persistance To the persisted data, false will stop persistance
      */
-    setData(key: string, data: unknown, persistance?: boolean) {
-        if (persistance) {
-            StorageUtils.setLocalData(key, data);
-            return;
-        }
+    getPersistedObject<T extends {}>(key: string) {
+        // Get storage
+        const data = localStorage.getItem(key);
 
-        StorageUtils.setSessionData(key, data);
-        if (persistance !== false && this.globalFields.includes(key)) {
-            StorageUtils.setLocalData(key, data);
-        }
+        if (data == null) return undefined;
+
+        return <T>JSON.parse(data);
     }
 
     /**
-     * Get current instance count
-     * @returns Current instance count
+     * Set data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    getInstanceCount() {
-        const count = this.getData(this.instanceCountField, 0, true);
-        // Make sure starting from 0
-        if (count < 0) return 0;
-        return count;
+    setData(key: string, data: unknown) {
+        StorageUtils.setSessionData(key, data);
     }
 
     /**
-     * Update instance count
-     * @param removed Is removed?
-     * @returns Current instance count
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
      */
-    updateInstanceCount(removed: boolean) {
-        const count = this.getInstanceCount() + (removed ? -1 : 1);
-        this.setData(this.instanceCountField, count, true);
-        return count;
+    setPersistedData(key: string, data: unknown) {
+        StorageUtils.setLocalData(key, data);
     }
 }

package/__tests__/WindowStorageTests.ts

@@ -1,16 +0,0 @@
-import { WindowStorage } from '../src/storage/WindowStorage';
-
-// Arrange
-const storage = new WindowStorage([], (_field, data, _index) => data);
-
-test('Tests for getInstanceCount', () => {
-    expect(storage.getInstanceCount()).toBe(0);
-});
-
-test('Tests for updateInstanceCount / getInstanceCount', () => {
-    // Current index -1
-    storage.updateInstanceCount(true);
-
-    // Always make sure it starts with 0
-    expect(storage.getInstanceCount()).toBe(0);
-});