@etsoo/shared 1.0.87 → 1.0.91

package/__tests__/StorageUtils.ts

@@ -11,6 +11,7 @@ test('Tests for all', () => {
     expect(StorageUtils.getSessionData('string1', '')).toBe('');
     expect(StorageUtils.getSessionData('boolean', false)).toBe(true);
     expect(StorageUtils.getSessionData('number', 0)).toBe(3.14);
+    expect(StorageUtils.getSessionData('number1', 0)).toBe(0);
     expect(StorageUtils.getSessionData('test', {})).toHaveProperty('id', 123);
 });
 

package/__tests__/Utils.ts

@@ -107,6 +107,7 @@ test('Tests for parseString', () => {
     expect(Utils.parseString<boolean>('')).toBeUndefined();
     expect(Utils.parseString<number>(undefined)).toBeUndefined();
     expect(Utils.parseString('3.14', 0)).toBe(3.14);
+    expect(Utils.parseString(null, 0)).toBe(0);
     expect(Utils.parseString('2021/4/13', new Date())).toStrictEqual(
         new Date('2021/4/13')
     );

package/__tests__/WindowStorageTests.ts

@@ -0,0 +1,35 @@
+import { WindowStorage } from '../src/storage/WindowStorage';
+
+// Arrange
+localStorage.setItem('test', 'test');
+localStorage.setItem('a', 'a');
+const storage = new WindowStorage(['test', 'a'], (field, data, index) => {
+    if (index === 0 && field === 'test') return null;
+    return 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);
+});
+
+test('Tests for getData', () => {
+    expect(storage.getData('test')).toBeUndefined();
+    expect(storage.getPersistedData('test')).toBe('test');
+
+    expect(storage.getData('a')).toBe('a');
+    expect(storage.getPersistedData('a')).toBe('a');
+});
+
+test('Tests for setData', () => {
+    storage.setData('test', 'test2');
+    expect(storage.getData('test')).toBe('test2');
+    expect(storage.getPersistedData('test')).toBe('test2');
+});

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

@@ -2,36 +2,75 @@
  * Storage interface
  */
 export interface IStorage {
+    /**
+     * Current instance index
+     */
+    readonly instanceIndex: number;
     /**
      * 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;
+    /**
+     * Get persisted object data
+     * @param key Key name
+     */
+    getPersistedObject<T extends {}>(key: string): T | undefined;
     /**
      * Set 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;
+    setData(key: string, data: unknown): void;
+    /**
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
+     */
+    setPersistedData(key: string, data: unknown): void;
+    /**
+     * Get current instance count
+     * @returns Current instance count
+     */
+    getInstanceCount(): number;
+    /**
+     * Update instance count
+     * @param removed Is removed?
+     * @returns Current instance count
+     */
+    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: (field: string, data: string | null) => string | null): IStorage;
+    new (globalFields: string[], callback: IStorageInitCallback): IStorage;
 }

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

@@ -1,40 +1,78 @@
-import { IStorage } from './IStorage';
+import { IStorage, IStorageInitCallback } from './IStorage';
 /**
  * Window storage
  * https://developer.mozilla.org/en-US/docs/Web/API/Storage
  */
 export declare class WindowStorage implements IStorage {
-    private globalFields;
+    protected persistedFields: string[];
+    /**
+     * Instance count field name
+     */
+    private readonly instanceCountField;
+    private _instanceIndex;
+    /**
+     * Current instance index
+     */
+    get instanceIndex(): number;
     /**
      * Constructor
-     * @param globalFields Global fields
+     * @param persistedFields Persisted fields
      * @param callback Field and data callback
      */
-    constructor(globalFields: string[], callback: (field: string, data: string | null) => string | null);
+    constructor(persistedFields: string[], callback: IStorageInitCallback);
     /**
      * 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;
+    /**
+     * Get persisted object data
+     * @param key Key name
+     */
+    getPersistedObject<T extends {}>(key: string): T | undefined;
     /**
      * Set 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;
+    setData(key: string, data: unknown): void;
+    /**
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
+     */
+    setPersistedData(key: string, data: unknown): void;
+    /**
+     * Get current instance count
+     * @returns Current instance count
+     */
+    getInstanceCount(): number;
+    /**
+     * Update instance count
+     * @param removed Is removed?
+     * @returns Current instance count
+     */
+    updateInstanceCount(removed: boolean): number;
 }

package/lib/cjs/storage/WindowStorage.js

@@ -10,37 +10,54 @@ const Utils_1 = require("../Utils");
 class WindowStorage {
     /**
      * Constructor
-     * @param globalFields Global fields
+     * @param persistedFields Persisted fields
      * @param callback Field and data callback
      */
-    constructor(globalFields, callback) {
-        this.globalFields = globalFields;
-        if (globalFields.length == 0)
-            return;
-        // Copy global fields to session storage where first item does not exist
-        // Duplicate browser tab would copy the session storage
-        const firsItem = sessionStorage.getItem(globalFields[0]);
-        if (firsItem)
-            return;
-        globalFields.forEach((field) => {
-            const data = callback(field, localStorage.getItem(field));
+    constructor(persistedFields, callback) {
+        this.persistedFields = persistedFields;
+        /**
+         * Instance count field name
+         */
+        this.instanceCountField = 'EtsooSmartERPInstanceCount';
+        // Init instance index
+        this._instanceIndex = this.getInstanceCount();
+        // Copy global fields to session storage
+        persistedFields.forEach((field) => {
+            const data = callback(field, localStorage.getItem(field), this._instanceIndex);
             if (data == null)
                 sessionStorage.removeItem(field);
             else
                 sessionStorage.setItem(field, data);
         });
     }
+    /**
+     * Current instance index
+     */
+    get instanceIndex() {
+        return this._instanceIndex;
+    }
     /**
      * 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);
@@ -50,13 +67,21 @@ class WindowStorage {
     /**
      * Get object data
      * @param key Key name
-     * @param persistance From the persisted data
      */
-    getObject(key, persistance) {
+    getObject(key) {
+        // Get storage
+        const data = sessionStorage.getItem(key);
+        if (data == null)
+            return undefined;
+        return JSON.parse(data);
+    }
+    /**
+     * Get persisted object data
+     * @param key Key name
+     */
+    getPersistedObject(key) {
         // Get storage
-        const data = persistance
-            ? localStorage.getItem(key)
-            : sessionStorage.getItem(key);
+        const data = localStorage.getItem(key);
         if (data == null)
             return undefined;
         return JSON.parse(data);
@@ -65,17 +90,41 @@ class WindowStorage {
      * Set 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;
-        }
+    setData(key, data) {
         StorageUtils_1.StorageUtils.setSessionData(key, data);
-        if (persistance !== false && this.globalFields.includes(key)) {
-            StorageUtils_1.StorageUtils.setLocalData(key, data);
+        if (this.persistedFields.includes(key)) {
+            this.setPersistedData(key, data);
         }
     }
+    /**
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
+     */
+    setPersistedData(key, data) {
+        StorageUtils_1.StorageUtils.setLocalData(key, data);
+    }
+    /**
+     * Get current instance count
+     * @returns Current instance count
+     */
+    getInstanceCount() {
+        const count = this.getPersistedData(this.instanceCountField, 0);
+        // Make sure starting from 0
+        if (count < 0)
+            return 0;
+        return count;
+    }
+    /**
+     * Update instance count
+     * @param removed Is removed?
+     * @returns Current instance count
+     */
+    updateInstanceCount(removed) {
+        const count = this.getInstanceCount() + (removed ? -1 : 1);
+        this.setPersistedData(this.instanceCountField, count);
+        return count;
+    }
 }
 exports.WindowStorage = WindowStorage;

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

@@ -2,36 +2,75 @@
  * Storage interface
  */
 export interface IStorage {
+    /**
+     * Current instance index
+     */
+    readonly instanceIndex: number;
     /**
      * 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;
+    /**
+     * Get persisted object data
+     * @param key Key name
+     */
+    getPersistedObject<T extends {}>(key: string): T | undefined;
     /**
      * Set 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;
+    setData(key: string, data: unknown): void;
+    /**
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
+     */
+    setPersistedData(key: string, data: unknown): void;
+    /**
+     * Get current instance count
+     * @returns Current instance count
+     */
+    getInstanceCount(): number;
+    /**
+     * Update instance count
+     * @param removed Is removed?
+     * @returns Current instance count
+     */
+    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: (field: string, data: string | null) => string | null): IStorage;
+    new (globalFields: string[], callback: IStorageInitCallback): IStorage;
 }

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

@@ -1,40 +1,78 @@
-import { IStorage } from './IStorage';
+import { IStorage, IStorageInitCallback } from './IStorage';
 /**
  * Window storage
  * https://developer.mozilla.org/en-US/docs/Web/API/Storage
  */
 export declare class WindowStorage implements IStorage {
-    private globalFields;
+    protected persistedFields: string[];
+    /**
+     * Instance count field name
+     */
+    private readonly instanceCountField;
+    private _instanceIndex;
+    /**
+     * Current instance index
+     */
+    get instanceIndex(): number;
     /**
      * Constructor
-     * @param globalFields Global fields
+     * @param persistedFields Persisted fields
      * @param callback Field and data callback
      */
-    constructor(globalFields: string[], callback: (field: string, data: string | null) => string | null);
+    constructor(persistedFields: string[], callback: IStorageInitCallback);
     /**
      * 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;
+    /**
+     * Get persisted object data
+     * @param key Key name
+     */
+    getPersistedObject<T extends {}>(key: string): T | undefined;
     /**
      * Set 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;
+    setData(key: string, data: unknown): void;
+    /**
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
+     */
+    setPersistedData(key: string, data: unknown): void;
+    /**
+     * Get current instance count
+     * @returns Current instance count
+     */
+    getInstanceCount(): number;
+    /**
+     * Update instance count
+     * @param removed Is removed?
+     * @returns Current instance count
+     */
+    updateInstanceCount(removed: boolean): number;
 }

package/lib/mjs/storage/WindowStorage.js

@@ -7,37 +7,54 @@ import { Utils } from '../Utils';
 export class WindowStorage {
     /**
      * Constructor
-     * @param globalFields Global fields
+     * @param persistedFields Persisted fields
      * @param callback Field and data callback
      */
-    constructor(globalFields, callback) {
-        this.globalFields = globalFields;
-        if (globalFields.length == 0)
-            return;
-        // Copy global fields to session storage where first item does not exist
-        // Duplicate browser tab would copy the session storage
-        const firsItem = sessionStorage.getItem(globalFields[0]);
-        if (firsItem)
-            return;
-        globalFields.forEach((field) => {
-            const data = callback(field, localStorage.getItem(field));
+    constructor(persistedFields, callback) {
+        this.persistedFields = persistedFields;
+        /**
+         * Instance count field name
+         */
+        this.instanceCountField = 'EtsooSmartERPInstanceCount';
+        // Init instance index
+        this._instanceIndex = this.getInstanceCount();
+        // Copy global fields to session storage
+        persistedFields.forEach((field) => {
+            const data = callback(field, localStorage.getItem(field), this._instanceIndex);
             if (data == null)
                 sessionStorage.removeItem(field);
             else
                 sessionStorage.setItem(field, data);
         });
     }
+    /**
+     * Current instance index
+     */
+    get instanceIndex() {
+        return this._instanceIndex;
+    }
     /**
      * 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);
@@ -47,13 +64,21 @@ 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 = sessionStorage.getItem(key);
+        if (data == null)
+            return undefined;
+        return JSON.parse(data);
+    }
+    /**
+     * Get persisted object data
+     * @param key Key name
+     */
+    getPersistedObject(key) {
         // Get storage
-        const data = persistance
-            ? localStorage.getItem(key)
-            : sessionStorage.getItem(key);
+        const data = localStorage.getItem(key);
         if (data == null)
             return undefined;
         return JSON.parse(data);
@@ -62,16 +87,40 @@ export class WindowStorage {
      * Set 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;
-        }
+    setData(key, data) {
         StorageUtils.setSessionData(key, data);
-        if (persistance !== false && this.globalFields.includes(key)) {
-            StorageUtils.setLocalData(key, data);
+        if (this.persistedFields.includes(key)) {
+            this.setPersistedData(key, data);
         }
     }
+    /**
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
+     */
+    setPersistedData(key, data) {
+        StorageUtils.setLocalData(key, data);
+    }
+    /**
+     * Get current instance count
+     * @returns Current instance count
+     */
+    getInstanceCount() {
+        const count = this.getPersistedData(this.instanceCountField, 0);
+        // Make sure starting from 0
+        if (count < 0)
+            return 0;
+        return count;
+    }
+    /**
+     * Update instance count
+     * @param removed Is removed?
+     * @returns Current instance count
+     */
+    updateInstanceCount(removed) {
+        const count = this.getInstanceCount() + (removed ? -1 : 1);
+        this.setPersistedData(this.instanceCountField, count);
+        return count;
+    }
 }

package/package.json

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

package/src/storage/IStorage.ts

@@ -2,43 +2,87 @@
  * Storage interface
  */
 export interface IStorage {
+    /**
+     * Current instance index
+     */
+    readonly instanceIndex: number;
+
     /**
      * 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;
+
+    /**
+     * Get persisted object data
+     * @param key Key name
+     */
+    getPersistedObject<T extends {}>(key: string): T | undefined;
 
     /**
      * Set 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;
+    setData(key: string, data: unknown): void;
+
+    /**
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
+     */
+    setPersistedData(key: string, data: unknown): void;
+
+    /**
+     * Get current instance count
+     * @returns Current instance count
+     */
+    getInstanceCount(): number;
+
+    /**
+     * Update instance count
+     * @param removed Is removed?
+     * @returns Current instance count
+     */
+    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: (field: string, data: string | null) => string | null
-    ): IStorage;
+    new (globalFields: string[], callback: IStorageInitCallback): IStorage;
 }

package/src/storage/WindowStorage.ts

@@ -1,30 +1,44 @@
 import { StorageUtils } from '../StorageUtils';
 import { Utils } from '../Utils';
-import { IStorage } from './IStorage';
+import { IStorage, IStorageInitCallback } from './IStorage';
 
 /**
  * Window storage
  * https://developer.mozilla.org/en-US/docs/Web/API/Storage
  */
 export class WindowStorage implements IStorage {
+    /**
+     * Instance count field name
+     */
+    private readonly instanceCountField = 'EtsooSmartERPInstanceCount';
+
+    private _instanceIndex: number;
+    /**
+     * Current instance index
+     */
+    get instanceIndex() {
+        return this._instanceIndex;
+    }
+
     /**
      * Constructor
-     * @param globalFields Global fields
+     * @param persistedFields Persisted fields
      * @param callback Field and data callback
      */
     constructor(
-        private globalFields: string[],
-        callback: (field: string, data: string | null) => string | null
+        protected persistedFields: string[],
+        callback: IStorageInitCallback
     ) {
-        if (globalFields.length == 0) return;
+        // Init instance index
+        this._instanceIndex = this.getInstanceCount();
 
-        // Copy global fields to session storage where first item does not exist
-        // Duplicate browser tab would copy the session storage
-        const firsItem = sessionStorage.getItem(globalFields[0]);
-        if (firsItem) return;
-
-        globalFields.forEach((field) => {
-            const data = callback(field, localStorage.getItem(field));
+        // Copy global fields to session storage
+        persistedFields.forEach((field) => {
+            const data = callback(
+                field,
+                localStorage.getItem(field),
+                this._instanceIndex
+            );
             if (data == null) sessionStorage.removeItem(field);
             else sessionStorage.setItem(field, data);
         });
@@ -33,33 +47,53 @@ export class WindowStorage implements IStorage {
     /**
      * 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);
@@ -71,13 +105,23 @@ 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 = sessionStorage.getItem(key);
+
+        if (data == null) return undefined;
+
+        return <T>JSON.parse(data);
+    }
+
+    /**
+     * Get persisted object data
+     * @param key Key name
+     */
+    getPersistedObject<T extends {}>(key: string) {
         // Get storage
-        const data = persistance
-            ? localStorage.getItem(key)
-            : sessionStorage.getItem(key);
+        const data = localStorage.getItem(key);
 
         if (data == null) return undefined;
 
@@ -88,17 +132,42 @@ export class WindowStorage implements IStorage {
      * Set 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;
-        }
-
+    setData(key: string, data: unknown) {
         StorageUtils.setSessionData(key, data);
-        if (persistance !== false && this.globalFields.includes(key)) {
-            StorageUtils.setLocalData(key, data);
+        if (this.persistedFields.includes(key)) {
+            this.setPersistedData(key, data);
         }
     }
+
+    /**
+     * Set persisted data
+     * @param key Key name
+     * @param data  Data, null for removal
+     */
+    setPersistedData(key: string, data: unknown) {
+        StorageUtils.setLocalData(key, data);
+    }
+
+    /**
+     * Get current instance count
+     * @returns Current instance count
+     */
+    getInstanceCount() {
+        const count = this.getPersistedData(this.instanceCountField, 0);
+        // Make sure starting from 0
+        if (count < 0) return 0;
+        return count;
+    }
+
+    /**
+     * Update instance count
+     * @param removed Is removed?
+     * @returns Current instance count
+     */
+    updateInstanceCount(removed: boolean) {
+        const count = this.getInstanceCount() + (removed ? -1 : 1);
+        this.setPersistedData(this.instanceCountField, count);
+        return count;
+    }
 }