@etsoo/shared 1.0.91 → 1.0.95

package/README.md

@@ -38,6 +38,8 @@ Data type definitions and type safe functions
 |HAlign|Horizontal align|
 |HAlignEnum|Horizontal align enum|
 |IdType|Number and string combination id type|
+|IdItem|Item with id or id generator|
+|IdLabelItem|Item with id and label|
 |Simple|Basic or basic array type|
 |SimpleEnum|Simple type enum|
 |SimpleNames|Simple type names|
@@ -56,6 +58,8 @@ Data type definitions and type safe functions
 |getEnumByValue|Get enum item from value|
 |getEnumKey|Get enum string literal type value|
 |getEnumKeys|Get Enum keys|
+|getItemId|Get item id|
+|getItemLabel|Get item label|
 |isBasicName|Check the type is a basic type or not (type guard)|
 |isSimpleObject|Is the target a simple object, all values are simple type (Type guard)|
 |isSimpleType|Is the input value simple type, include null and undefined|

package/__tests__/DataTypes.ts

@@ -74,6 +74,32 @@ test('Tests for getEnumKeys', () => {
     expect(DataTypes.getEnumKeys(ProductUnit)).toContainEqual('GRAM');
 });
 
+test('Tests for getItemId', () => {
+    // Arrange
+    const items: DataTypes.IdItem[] = [
+        { id: 1 },
+        { id: '123' },
+        { id: () => 'f123' }
+    ];
+
+    // Assert
+    expect(DataTypes.getItemId(items[0])).toBe('1');
+    expect(DataTypes.getItemId(items[2])).toBe('f123');
+});
+
+test('Tests for getItemLabel', () => {
+    // Arrange
+    const items: DataTypes.IdLabelItem[] = [
+        { id: 1, label: '123' },
+        { id: '123', label: () => 'f123' },
+        { id: () => 'f123', label: 'l123' }
+    ];
+
+    // Assert
+    expect(DataTypes.getItemLabel(items[0])).toBe('123');
+    expect(DataTypes.getItemLabel(items[1])).toBe('f123');
+});
+
 test('Tests for isSimpleType', () => {
     expect(DataTypes.isSimpleType(1)).toBeTruthy();
     expect(DataTypes.isSimpleType(new Date())).toBeTruthy();

package/__tests__/StorageUtils.ts

@@ -7,12 +7,17 @@ test('Tests for all', () => {
     StorageUtils.setSessionData('number', 3.14);
     StorageUtils.setSessionData('test', { id: 123, name: 'test' });
 
+    const array = StorageUtils.getSessionData<string[]>('array', []);
+    array.push('new');
+    StorageUtils.setSessionData('array', array);
+
     expect(StorageUtils.getSessionData<string>('string')).toBe('test');
     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);
+    expect(StorageUtils.getSessionData<string[]>('array')).toEqual(array);
 });
 
 test('Tests for getLocalObject', () => {

package/lib/cjs/DataTypes.d.ts

@@ -133,6 +133,36 @@ export declare namespace DataTypes {
      * Simple object, string key, simple type and null value Record
      */
     type SimpleObject = Record<string, Simple | null | undefined>;
+    /**
+     * Item with id property
+     */
+    type IdItem = {
+        /**
+         * Id field or generator
+         */
+        id: IdType | (() => string);
+    };
+    /**
+     * Item with id and label property
+     */
+    type IdLabelItem = IdItem & {
+        /**
+         * label field or generator
+         */
+        label: string | (() => string);
+    };
+    /**
+     * Get item id
+     * @param item Item with id
+     * @returns string id
+     */
+    const getItemId: (item: IdItem) => string;
+    /**
+     * Get item label
+     * @param item Item with id
+     * @returns string id
+     */
+    const getItemLabel: (item: IdLabelItem) => string;
     /**
      * Culture definiton
      */

package/lib/cjs/DataTypes.js

@@ -74,6 +74,28 @@ var DataTypes;
         VAlignEnum[VAlignEnum["Center"] = 2] = "Center";
         VAlignEnum[VAlignEnum["Bottom"] = 3] = "Bottom";
     })(VAlignEnum = DataTypes.VAlignEnum || (DataTypes.VAlignEnum = {}));
+    /**
+     * Get item id
+     * @param item Item with id
+     * @returns string id
+     */
+    DataTypes.getItemId = (item) => {
+        if (typeof item.id === 'function')
+            return item.id();
+        if (typeof item.id === 'number')
+            return item.id.toString();
+        return item.id;
+    };
+    /**
+     * Get item label
+     * @param item Item with id
+     * @returns string id
+     */
+    DataTypes.getItemLabel = (item) => {
+        if (typeof item.label === 'function')
+            return item.label();
+        return item.label;
+    };
     /**
      * Convert value to target type
      * @param input Input value

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

@@ -3,9 +3,23 @@
  */
 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
@@ -50,27 +64,4 @@ export interface IStorage {
      * @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: IStorageInitCallback): IStorage;
 }

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

@@ -1,25 +1,27 @@
-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 {
-    protected persistedFields: string[];
     /**
-     * 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 persistedFields Persisted fields
-     * @param callback Field and data callback
+     * Copy keys to persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
      */
-    constructor(persistedFields: string[], callback: IStorageInitCallback);
+    copyTo(keys: string[], removeSource?: boolean): void;
     /**
      * Get data
      * @param key Key name
@@ -64,15 +66,4 @@ export declare class WindowStorage implements IStorage {
      * @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

@@ -9,32 +9,41 @@ const Utils_1 = require("../Utils");
  */
 class WindowStorage {
     /**
-     * Constructor
-     * @param persistedFields Persisted fields
-     * @param callback Field and data callback
+     * Clear keys
+     * @param keys Keys
+     * @param persisted Persisted or session data
      */
-    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);
+    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
@@ -93,9 +102,6 @@ class WindowStorage {
      */
     setData(key, data) {
         StorageUtils_1.StorageUtils.setSessionData(key, data);
-        if (this.persistedFields.includes(key)) {
-            this.setPersistedData(key, data);
-        }
     }
     /**
      * Set persisted data
@@ -105,26 +111,5 @@ class WindowStorage {
     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/DataTypes.d.ts

@@ -133,6 +133,36 @@ export declare namespace DataTypes {
      * Simple object, string key, simple type and null value Record
      */
     type SimpleObject = Record<string, Simple | null | undefined>;
+    /**
+     * Item with id property
+     */
+    type IdItem = {
+        /**
+         * Id field or generator
+         */
+        id: IdType | (() => string);
+    };
+    /**
+     * Item with id and label property
+     */
+    type IdLabelItem = IdItem & {
+        /**
+         * label field or generator
+         */
+        label: string | (() => string);
+    };
+    /**
+     * Get item id
+     * @param item Item with id
+     * @returns string id
+     */
+    const getItemId: (item: IdItem) => string;
+    /**
+     * Get item label
+     * @param item Item with id
+     * @returns string id
+     */
+    const getItemLabel: (item: IdLabelItem) => string;
     /**
      * Culture definiton
      */

package/lib/mjs/DataTypes.js

@@ -71,6 +71,28 @@ export var DataTypes;
         VAlignEnum[VAlignEnum["Center"] = 2] = "Center";
         VAlignEnum[VAlignEnum["Bottom"] = 3] = "Bottom";
     })(VAlignEnum = DataTypes.VAlignEnum || (DataTypes.VAlignEnum = {}));
+    /**
+     * Get item id
+     * @param item Item with id
+     * @returns string id
+     */
+    DataTypes.getItemId = (item) => {
+        if (typeof item.id === 'function')
+            return item.id();
+        if (typeof item.id === 'number')
+            return item.id.toString();
+        return item.id;
+    };
+    /**
+     * Get item label
+     * @param item Item with id
+     * @returns string id
+     */
+    DataTypes.getItemLabel = (item) => {
+        if (typeof item.label === 'function')
+            return item.label();
+        return item.label;
+    };
     /**
      * Convert value to target type
      * @param input Input value

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

@@ -3,9 +3,23 @@
  */
 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
@@ -50,27 +64,4 @@ export interface IStorage {
      * @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: IStorageInitCallback): IStorage;
 }

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

@@ -1,25 +1,27 @@
-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 {
-    protected persistedFields: string[];
     /**
-     * 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 persistedFields Persisted fields
-     * @param callback Field and data callback
+     * Copy keys to persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
      */
-    constructor(persistedFields: string[], callback: IStorageInitCallback);
+    copyTo(keys: string[], removeSource?: boolean): void;
     /**
      * Get data
      * @param key Key name
@@ -64,15 +66,4 @@ export declare class WindowStorage implements IStorage {
      * @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

@@ -6,32 +6,41 @@ import { Utils } from '../Utils';
  */
 export class WindowStorage {
     /**
-     * Constructor
-     * @param persistedFields Persisted fields
-     * @param callback Field and data callback
+     * Clear keys
+     * @param keys Keys
+     * @param persisted Persisted or session data
      */
-    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);
+    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
@@ -90,9 +99,6 @@ export class WindowStorage {
      */
     setData(key, data) {
         StorageUtils.setSessionData(key, data);
-        if (this.persistedFields.includes(key)) {
-            this.setPersistedData(key, data);
-        }
     }
     /**
      * Set persisted data
@@ -102,25 +108,4 @@ export class WindowStorage {
     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.91",
+    "version": "1.0.95",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/DataTypes.ts

@@ -172,6 +172,47 @@ export namespace DataTypes {
      */
     export type SimpleObject = Record<string, Simple | null | undefined>;
 
+    /**
+     * Item with id property
+     */
+    export type IdItem = {
+        /**
+         * Id field or generator
+         */
+        id: IdType | (() => string);
+    };
+
+    /**
+     * Item with id and label property
+     */
+    export type IdLabelItem = IdItem & {
+        /**
+         * label field or generator
+         */
+        label: string | (() => string);
+    };
+
+    /**
+     * Get item id
+     * @param item Item with id
+     * @returns string id
+     */
+    export const getItemId = (item: IdItem) => {
+        if (typeof item.id === 'function') return item.id();
+        if (typeof item.id === 'number') return item.id.toString();
+        return item.id;
+    };
+
+    /**
+     * Get item label
+     * @param item Item with id
+     * @returns string id
+     */
+    export const getItemLabel = (item: IdLabelItem) => {
+        if (typeof item.label === 'function') return item.label();
+        return item.label;
+    };
+
     /**
      * Culture definiton
      */

package/src/storage/IStorage.ts

@@ -3,9 +3,25 @@
  */
 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
@@ -58,31 +74,4 @@ export interface IStorage {
      * @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: IStorageInitCallback): IStorage;
 }

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,39 +8,38 @@ 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 persistedFields Persisted fields
-     * @param callback Field and data callback
+     * Copy keys to persisted source
+     * @param keys Keys
+     * @param removeSource Remove from the source
      */
-    constructor(
-        protected persistedFields: string[],
-        callback: IStorageInitCallback
-    ) {
-        // 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);
+    copyTo(keys: string[], removeSource?: boolean) {
+        keys.forEach((key) => {
+            this.setPersistedData(key, this.getData(key));
+            if (removeSource) this.setData(key, undefined);
         });
     }
 
@@ -135,9 +134,6 @@ export class WindowStorage implements IStorage {
      */
     setData(key: string, data: unknown) {
         StorageUtils.setSessionData(key, data);
-        if (this.persistedFields.includes(key)) {
-            this.setPersistedData(key, data);
-        }
     }
 
     /**
@@ -148,26 +144,4 @@ export class WindowStorage implements IStorage {
     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;
-    }
 }

package/__tests__/WindowStorageTests.ts

@@ -1,35 +0,0 @@
-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');
-});