@etsoo/shared 1.0.91 → 1.0.92

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

@@ -2,10 +2,6 @@
  * Storage interface
  */
 export interface IStorage {
-    /**
-     * Current instance index
-     */
-    readonly instanceIndex: number;
     /**
      * Get data
      * @param key Key name
@@ -50,27 +46,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,9 @@
-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
-     */
-    private readonly instanceCountField;
-    private _instanceIndex;
-    /**
-     * Current instance index
-     */
-    get instanceIndex(): number;
-    /**
-     * Constructor
-     * @param persistedFields Persisted fields
-     * @param callback Field and data callback
-     */
-    constructor(persistedFields: string[], callback: IStorageInitCallback);
     /**
      * Get data
      * @param key Key name
@@ -64,15 +48,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

@@ -8,34 +8,6 @@ const Utils_1 = require("../Utils");
  * https://developer.mozilla.org/en-US/docs/Web/API/Storage
  */
 class WindowStorage {
-    /**
-     * Constructor
-     * @param persistedFields Persisted fields
-     * @param callback Field and data callback
-     */
-    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
@@ -93,9 +65,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 +74,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/storage/IStorage.d.ts

@@ -2,10 +2,6 @@
  * Storage interface
  */
 export interface IStorage {
-    /**
-     * Current instance index
-     */
-    readonly instanceIndex: number;
     /**
      * Get data
      * @param key Key name
@@ -50,27 +46,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,9 @@
-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
-     */
-    private readonly instanceCountField;
-    private _instanceIndex;
-    /**
-     * Current instance index
-     */
-    get instanceIndex(): number;
-    /**
-     * Constructor
-     * @param persistedFields Persisted fields
-     * @param callback Field and data callback
-     */
-    constructor(persistedFields: string[], callback: IStorageInitCallback);
     /**
      * Get data
      * @param key Key name
@@ -64,15 +48,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

@@ -5,34 +5,6 @@ import { Utils } from '../Utils';
  * https://developer.mozilla.org/en-US/docs/Web/API/Storage
  */
 export class WindowStorage {
-    /**
-     * Constructor
-     * @param persistedFields Persisted fields
-     * @param callback Field and data callback
-     */
-    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
@@ -90,9 +62,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 +71,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.92",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/storage/IStorage.ts

@@ -2,11 +2,6 @@
  * Storage interface
  */
 export interface IStorage {
-    /**
-     * Current instance index
-     */
-    readonly instanceIndex: number;
-
     /**
      * Get data
      * @param key Key name
@@ -58,31 +53,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,49 +1,12 @@
 import { StorageUtils } from '../StorageUtils';
 import { Utils } from '../Utils';
-import { IStorage, IStorageInitCallback } from './IStorage';
+import { IStorage } 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 persistedFields Persisted fields
-     * @param callback Field and data callback
-     */
-    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);
-        });
-    }
-
     /**
      * Get data
      * @param key Key name
@@ -135,9 +98,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 +108,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');
-});