@etsoo/shared 1.0.86 → 1.0.90

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,16 @@
+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);
+});

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

@@ -2,22 +2,29 @@
  * 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): T | undefined;
+    getData<T>(key: string, persistance?: boolean): 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): T;
+    getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
     /**
-     * Get session storage object data
+     * Get object data
      * @param key Key name
+     * @param persistance From the persisted data
      */
-    getObject<T extends {}>(key: string): T | undefined;
+    getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
     /**
      * Set data
      * @param key Key name
@@ -25,10 +32,27 @@ export interface IStorage {
      * @param persistance Persist the data, false will stop persistance
      */
     setData(key: string, data: unknown, persistance?: boolean): 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,37 +1,60 @@
-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;
+    /**
+     * Instance count field name
+     */
+    private readonly instanceCountField;
+    private _instanceIndex;
+    /**
+     * Current instance index
+     */
+    get instanceIndex(): number;
     /**
      * Constructor
      * @param globalFields Global fields
      * @param callback Field and data callback
      */
-    constructor(globalFields: string[], callback: (field: string, data: string | null) => string | null);
+    constructor(globalFields: string[], callback: IStorageInitCallback);
     /**
      * Get data
      * @param key Key name
+     * @param persistance From the persisted data
      */
-    getData<T>(key: string): T | undefined;
+    getData<T>(key: string, persistance?: boolean): 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): T;
+    getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
     /**
      * Get object data
      * @param key Key name
+     * @param persistance From the persisted data
      */
-    getObject<T extends {}>(key: string): T | undefined;
+    getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
     /**
      * Set data
      * @param key Key name
      * @param data  Data, null for removal
-     * @param persistance Persist the data, false will stop persistance
+     * @param persistance To the persisted data, false will stop persistance
      */
     setData(key: string, data: unknown, persistance?: boolean): 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

@@ -15,29 +15,38 @@ class WindowStorage {
      */
     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;
+        /**
+         * 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));
+            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) {
+    getData(key, defaultValue, persistance) {
         // Get storage
-        const data = sessionStorage.getItem(key);
+        const data = persistance
+            ? localStorage.getItem(key)
+            : sessionStorage.getItem(key);
         // No default value
         if (defaultValue == null)
             return Utils_1.Utils.parseString(data);
@@ -47,10 +56,13 @@ class WindowStorage {
     /**
      * Get object data
      * @param key Key name
+     * @param persistance From the persisted data
      */
-    getObject(key) {
+    getObject(key, persistance) {
         // Get storage
-        const data = sessionStorage.getItem(key);
+        const data = persistance
+            ? localStorage.getItem(key)
+            : sessionStorage.getItem(key);
         if (data == null)
             return undefined;
         return JSON.parse(data);
@@ -59,14 +71,38 @@ class WindowStorage {
      * Set data
      * @param key Key name
      * @param data  Data, null for removal
-     * @param persistance Persist the data, false will stop persistance
+     * @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 ||
-            (persistance == null && this.globalFields.includes(key))) {
+        if (persistance !== false && this.globalFields.includes(key)) {
             StorageUtils_1.StorageUtils.setLocalData(key, data);
         }
     }
+    /**
+     * Get current instance count
+     * @returns Current instance count
+     */
+    getInstanceCount() {
+        const count = this.getData(this.instanceCountField, 0, true);
+        // 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.setData(this.instanceCountField, count, true);
+        return count;
+    }
 }
 exports.WindowStorage = WindowStorage;

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

@@ -2,22 +2,29 @@
  * 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): T | undefined;
+    getData<T>(key: string, persistance?: boolean): 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): T;
+    getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
     /**
-     * Get session storage object data
+     * Get object data
      * @param key Key name
+     * @param persistance From the persisted data
      */
-    getObject<T extends {}>(key: string): T | undefined;
+    getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
     /**
      * Set data
      * @param key Key name
@@ -25,10 +32,27 @@ export interface IStorage {
      * @param persistance Persist the data, false will stop persistance
      */
     setData(key: string, data: unknown, persistance?: boolean): 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,37 +1,60 @@
-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;
+    /**
+     * Instance count field name
+     */
+    private readonly instanceCountField;
+    private _instanceIndex;
+    /**
+     * Current instance index
+     */
+    get instanceIndex(): number;
     /**
      * Constructor
      * @param globalFields Global fields
      * @param callback Field and data callback
      */
-    constructor(globalFields: string[], callback: (field: string, data: string | null) => string | null);
+    constructor(globalFields: string[], callback: IStorageInitCallback);
     /**
      * Get data
      * @param key Key name
+     * @param persistance From the persisted data
      */
-    getData<T>(key: string): T | undefined;
+    getData<T>(key: string, persistance?: boolean): 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): T;
+    getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
     /**
      * Get object data
      * @param key Key name
+     * @param persistance From the persisted data
      */
-    getObject<T extends {}>(key: string): T | undefined;
+    getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
     /**
      * Set data
      * @param key Key name
      * @param data  Data, null for removal
-     * @param persistance Persist the data, false will stop persistance
+     * @param persistance To the persisted data, false will stop persistance
      */
     setData(key: string, data: unknown, persistance?: boolean): 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

@@ -12,29 +12,38 @@ export class WindowStorage {
      */
     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;
+        /**
+         * 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));
+            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) {
+    getData(key, defaultValue, persistance) {
         // Get storage
-        const data = sessionStorage.getItem(key);
+        const data = persistance
+            ? localStorage.getItem(key)
+            : sessionStorage.getItem(key);
         // No default value
         if (defaultValue == null)
             return Utils.parseString(data);
@@ -44,10 +53,13 @@ export class WindowStorage {
     /**
      * Get object data
      * @param key Key name
+     * @param persistance From the persisted data
      */
-    getObject(key) {
+    getObject(key, persistance) {
         // Get storage
-        const data = sessionStorage.getItem(key);
+        const data = persistance
+            ? localStorage.getItem(key)
+            : sessionStorage.getItem(key);
         if (data == null)
             return undefined;
         return JSON.parse(data);
@@ -56,13 +68,37 @@ export class WindowStorage {
      * Set data
      * @param key Key name
      * @param data  Data, null for removal
-     * @param persistance Persist the data, false will stop persistance
+     * @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 ||
-            (persistance == null && this.globalFields.includes(key))) {
+        if (persistance !== false && this.globalFields.includes(key)) {
             StorageUtils.setLocalData(key, data);
         }
     }
+    /**
+     * Get current instance count
+     * @returns Current instance count
+     */
+    getInstanceCount() {
+        const count = this.getData(this.instanceCountField, 0, true);
+        // 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.setData(this.instanceCountField, count, true);
+        return count;
+    }
 }

package/package.json

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

package/src/storage/IStorage.ts

@@ -2,24 +2,32 @@
  * 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): T | undefined;
+    getData<T>(key: string, persistance?: boolean): 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): T;
+    getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
 
     /**
-     * Get session storage object data
+     * Get object data
      * @param key Key name
+     * @param persistance From the persisted data
      */
-    getObject<T extends {}>(key: string): T | undefined;
+    getObject<T extends {}>(key: string, persistance?: boolean): T | undefined;
 
     /**
      * Set data
@@ -28,14 +36,31 @@ export interface IStorage {
      * @param persistance Persist the data, false will stop persistance
      */
     setData(key: string, data: unknown, persistance?: boolean): 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,12 +1,25 @@
 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
@@ -14,17 +27,18 @@ export class WindowStorage implements IStorage {
      */
     constructor(
         private globalFields: string[],
-        callback: (field: string, data: string | null) => string | null
+        callback: IStorageInitCallback
     ) {
-        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;
+        // Init instance index
+        this._instanceIndex = this.getInstanceCount();
 
+        // Copy global fields to session storage
         globalFields.forEach((field) => {
-            const data = callback(field, localStorage.getItem(field));
+            const data = callback(
+                field,
+                localStorage.getItem(field),
+                this._instanceIndex
+            );
             if (data == null) sessionStorage.removeItem(field);
             else sessionStorage.setItem(field, data);
         });
@@ -33,24 +47,33 @@ export class WindowStorage implements IStorage {
     /**
      * Get data
      * @param key Key name
+     * @param persistance From the persisted data
      */
-    getData<T>(key: string): T | undefined;
+    getData<T>(key: string, persistance?: boolean): 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): T;
+    getData<T>(key: string, defaultValue: T, persistance?: boolean): T;
 
     /**
      * Get data
      * @param key Key name
      * @param defaultValue Default value
+     * @param persistance From the persisted data
      */
-    getData<T>(key: string, defaultValue?: T): T | undefined {
+    getData<T>(
+        key: string,
+        defaultValue?: T,
+        persistance?: boolean
+    ): T | undefined {
         // Get storage
-        const data = sessionStorage.getItem(key);
+        const data = persistance
+            ? localStorage.getItem(key)
+            : sessionStorage.getItem(key);
 
         // No default value
         if (defaultValue == null) return Utils.parseString<T>(data);
@@ -62,11 +85,16 @@ export class WindowStorage implements IStorage {
     /**
      * Get object data
      * @param key Key name
+     * @param persistance From the persisted data
      */
-    getObject<T extends {}>(key: string) {
+    getObject<T extends {}>(key: string, persistance?: boolean) {
         // Get storage
-        const data = sessionStorage.getItem(key);
+        const data = persistance
+            ? localStorage.getItem(key)
+            : sessionStorage.getItem(key);
+
         if (data == null) return undefined;
+
         return <T>JSON.parse(data);
     }
 
@@ -74,15 +102,39 @@ export class WindowStorage implements IStorage {
      * Set data
      * @param key Key name
      * @param data  Data, null for removal
-     * @param persistance Persist the data, false will stop persistance
+     * @param persistance To the persisted data, false will stop persistance
      */
     setData(key: string, data: unknown, persistance?: boolean) {
+        if (persistance) {
+            StorageUtils.setLocalData(key, data);
+            return;
+        }
+
         StorageUtils.setSessionData(key, data);
-        if (
-            persistance ||
-            (persistance == null && this.globalFields.includes(key))
-        ) {
+        if (persistance !== false && this.globalFields.includes(key)) {
             StorageUtils.setLocalData(key, data);
         }
     }
+
+    /**
+     * Get current instance count
+     * @returns Current instance count
+     */
+    getInstanceCount() {
+        const count = this.getData(this.instanceCountField, 0, true);
+        // 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.setData(this.instanceCountField, count, true);
+        return count;
+    }
 }