@etsoo/shared 1.0.83 → 1.0.87

package/README.md

@@ -95,8 +95,6 @@ DOM/window related utilities
 |isJSONContentType|Is JSON content type|
 |mergeFormData|Merge form data to primary one|
 |mergeURLSearchParams|Merge URL search parameters|
-|saveCountry|Save country name|
-|saveCulture|Save culture name|
 |setFocus|Set HTML element focus by name|
 
 ## ExtendUtils

package/lib/cjs/DomUtils.d.ts

@@ -8,11 +8,11 @@ export declare namespace DomUtils {
     /**
      * Language cache parameter name
      */
-    const Culture = "culture";
+    const CultureField = "culture";
     /**
      * Country cache parameter name
      */
-    const Country = "country";
+    const CountryField = "country";
     /**
      * Clear form data
      * @param data Form data
@@ -94,16 +94,6 @@ export declare namespace DomUtils {
      * @param data New simple object data to merge
      */
     function mergeURLSearchParams(base: URLSearchParams, data: DataTypes.SimpleObject): URLSearchParams;
-    /**
-     * Save country name
-     * @param country Country name
-     */
-    function saveCountry(country: string): void;
-    /**
-     * Save culture name
-     * @param culture Culture name
-     */
-    function saveCulture(culture: string): void;
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

package/lib/cjs/DomUtils.js

@@ -16,11 +16,11 @@ var DomUtils;
     /**
      * Language cache parameter name
      */
-    DomUtils.Culture = 'culture';
+    DomUtils.CultureField = 'culture';
     /**
      * Country cache parameter name
      */
-    DomUtils.Country = 'country';
+    DomUtils.CountryField = 'country';
     /**
      * Clear form data
      * @param data Form data
@@ -156,12 +156,12 @@ var DomUtils;
      * Current detected country
      */
     DomUtils.detectedCountry = (() => {
+        var _a, _b;
         // URL first, then local storage
         let country;
         try {
             country =
-                new URL(location.href).searchParams.get(DomUtils.Country) ||
-                    localStorage.getItem(DomUtils.Country);
+                (_b = (_a = new URL(location.href).searchParams.get(DomUtils.CountryField)) !== null && _a !== void 0 ? _a : sessionStorage.getItem(DomUtils.CountryField)) !== null && _b !== void 0 ? _b : localStorage.getItem(DomUtils.CountryField);
         }
         catch {
             country = null;
@@ -173,12 +173,12 @@ var DomUtils;
      * Current detected culture
      */
     DomUtils.detectedCulture = (() => {
+        var _a, _b;
         // URL first, then local storage
         let culture;
         try {
             culture =
-                new URL(location.href).searchParams.get(DomUtils.Culture) ||
-                    localStorage.getItem(DomUtils.Culture);
+                (_b = (_a = new URL(location.href).searchParams.get(DomUtils.CultureField)) !== null && _a !== void 0 ? _a : sessionStorage.getItem(DomUtils.CultureField)) !== null && _b !== void 0 ? _b : localStorage.getItem(DomUtils.CultureField);
         }
         catch {
             culture = null;
@@ -342,22 +342,6 @@ var DomUtils;
         return base;
     }
     DomUtils.mergeURLSearchParams = mergeURLSearchParams;
-    /**
-     * Save country name
-     * @param country Country name
-     */
-    function saveCountry(country) {
-        localStorage.setItem(DomUtils.Country, country);
-    }
-    DomUtils.saveCountry = saveCountry;
-    /**
-     * Save culture name
-     * @param culture Culture name
-     */
-    function saveCulture(culture) {
-        localStorage.setItem(DomUtils.Culture, culture);
-    }
-    DomUtils.saveCulture = saveCulture;
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

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

@@ -5,29 +5,33 @@ export interface 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 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
      * @param data  Data, null for removal
+     * @param persistance Persist the data, false will stop persistance
      */
-    setData(key: string, data: unknown): void;
+    setData(key: string, data: unknown, persistance?: boolean): void;
 }
 /**
  * Storage constructor interface
  */
 export interface IStorageConstructor {
-    new (globalFields: string[]): IStorage;
+    new (globalFields: string[], callback: (field: string, data: string | null) => string | null): IStorage;
 }

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

@@ -8,28 +8,33 @@ export declare class WindowStorage implements IStorage {
     /**
      * Constructor
      * @param globalFields Global fields
+     * @param callback Field and data callback
      */
-    constructor(globalFields: string[]);
+    constructor(globalFields: string[], callback: (field: string, data: string | null) => string | null);
     /**
      * 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 To the persisted data, false will stop persistance
      */
-    setData(key: string, data: unknown): void;
+    setData(key: string, data: unknown, persistance?: boolean): void;
 }

package/lib/cjs/storage/WindowStorage.js

@@ -11,30 +11,36 @@ class WindowStorage {
     /**
      * Constructor
      * @param globalFields Global fields
+     * @param callback Field and data callback
      */
-    constructor(globalFields) {
+    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 = localStorage.getItem(field);
-            if (data != null) {
+            const data = callback(field, localStorage.getItem(field));
+            if (data == null)
+                sessionStorage.removeItem(field);
+            else
                 sessionStorage.setItem(field, data);
-            }
         });
     }
     /**
      * 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);
@@ -44,10 +50,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);
@@ -56,10 +65,15 @@ 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) {
+    setData(key, data, persistance) {
+        if (persistance) {
+            StorageUtils_1.StorageUtils.setLocalData(key, data);
+            return;
+        }
         StorageUtils_1.StorageUtils.setSessionData(key, data);
-        if (this.globalFields.includes(key)) {
+        if (persistance !== false && this.globalFields.includes(key)) {
             StorageUtils_1.StorageUtils.setLocalData(key, data);
         }
     }

package/lib/mjs/DomUtils.d.ts

@@ -8,11 +8,11 @@ export declare namespace DomUtils {
     /**
      * Language cache parameter name
      */
-    const Culture = "culture";
+    const CultureField = "culture";
     /**
      * Country cache parameter name
      */
-    const Country = "country";
+    const CountryField = "country";
     /**
      * Clear form data
      * @param data Form data
@@ -94,16 +94,6 @@ export declare namespace DomUtils {
      * @param data New simple object data to merge
      */
     function mergeURLSearchParams(base: URLSearchParams, data: DataTypes.SimpleObject): URLSearchParams;
-    /**
-     * Save country name
-     * @param country Country name
-     */
-    function saveCountry(country: string): void;
-    /**
-     * Save culture name
-     * @param culture Culture name
-     */
-    function saveCulture(culture: string): void;
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

package/lib/mjs/DomUtils.js

@@ -13,11 +13,11 @@ export var DomUtils;
     /**
      * Language cache parameter name
      */
-    DomUtils.Culture = 'culture';
+    DomUtils.CultureField = 'culture';
     /**
      * Country cache parameter name
      */
-    DomUtils.Country = 'country';
+    DomUtils.CountryField = 'country';
     /**
      * Clear form data
      * @param data Form data
@@ -153,12 +153,12 @@ export var DomUtils;
      * Current detected country
      */
     DomUtils.detectedCountry = (() => {
+        var _a, _b;
         // URL first, then local storage
         let country;
         try {
             country =
-                new URL(location.href).searchParams.get(DomUtils.Country) ||
-                    localStorage.getItem(DomUtils.Country);
+                (_b = (_a = new URL(location.href).searchParams.get(DomUtils.CountryField)) !== null && _a !== void 0 ? _a : sessionStorage.getItem(DomUtils.CountryField)) !== null && _b !== void 0 ? _b : localStorage.getItem(DomUtils.CountryField);
         }
         catch {
             country = null;
@@ -170,12 +170,12 @@ export var DomUtils;
      * Current detected culture
      */
     DomUtils.detectedCulture = (() => {
+        var _a, _b;
         // URL first, then local storage
         let culture;
         try {
             culture =
-                new URL(location.href).searchParams.get(DomUtils.Culture) ||
-                    localStorage.getItem(DomUtils.Culture);
+                (_b = (_a = new URL(location.href).searchParams.get(DomUtils.CultureField)) !== null && _a !== void 0 ? _a : sessionStorage.getItem(DomUtils.CultureField)) !== null && _b !== void 0 ? _b : localStorage.getItem(DomUtils.CultureField);
         }
         catch {
             culture = null;
@@ -339,22 +339,6 @@ export var DomUtils;
         return base;
     }
     DomUtils.mergeURLSearchParams = mergeURLSearchParams;
-    /**
-     * Save country name
-     * @param country Country name
-     */
-    function saveCountry(country) {
-        localStorage.setItem(DomUtils.Country, country);
-    }
-    DomUtils.saveCountry = saveCountry;
-    /**
-     * Save culture name
-     * @param culture Culture name
-     */
-    function saveCulture(culture) {
-        localStorage.setItem(DomUtils.Culture, culture);
-    }
-    DomUtils.saveCulture = saveCulture;
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

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

@@ -5,29 +5,33 @@ export interface 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 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
      * @param data  Data, null for removal
+     * @param persistance Persist the data, false will stop persistance
      */
-    setData(key: string, data: unknown): void;
+    setData(key: string, data: unknown, persistance?: boolean): void;
 }
 /**
  * Storage constructor interface
  */
 export interface IStorageConstructor {
-    new (globalFields: string[]): IStorage;
+    new (globalFields: string[], callback: (field: string, data: string | null) => string | null): IStorage;
 }

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

@@ -8,28 +8,33 @@ export declare class WindowStorage implements IStorage {
     /**
      * Constructor
      * @param globalFields Global fields
+     * @param callback Field and data callback
      */
-    constructor(globalFields: string[]);
+    constructor(globalFields: string[], callback: (field: string, data: string | null) => string | null);
     /**
      * 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 To the persisted data, false will stop persistance
      */
-    setData(key: string, data: unknown): void;
+    setData(key: string, data: unknown, persistance?: boolean): void;
 }

package/lib/mjs/storage/WindowStorage.js

@@ -8,30 +8,36 @@ export class WindowStorage {
     /**
      * Constructor
      * @param globalFields Global fields
+     * @param callback Field and data callback
      */
-    constructor(globalFields) {
+    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 = localStorage.getItem(field);
-            if (data != null) {
+            const data = callback(field, localStorage.getItem(field));
+            if (data == null)
+                sessionStorage.removeItem(field);
+            else
                 sessionStorage.setItem(field, data);
-            }
         });
     }
     /**
      * 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);
@@ -41,10 +47,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);
@@ -53,10 +62,15 @@ 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) {
+    setData(key, data, persistance) {
+        if (persistance) {
+            StorageUtils.setLocalData(key, data);
+            return;
+        }
         StorageUtils.setSessionData(key, data);
-        if (this.globalFields.includes(key)) {
+        if (persistance !== false && this.globalFields.includes(key)) {
             StorageUtils.setLocalData(key, data);
         }
     }

package/package.json

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

package/src/DomUtils.ts

@@ -15,12 +15,12 @@ export namespace DomUtils {
     /**
      * Language cache parameter name
      */
-    export const Culture = 'culture';
+    export const CultureField = 'culture';
 
     /**
      * Country cache parameter name
      */
-    export const Country = 'country';
+    export const CountryField = 'country';
 
     /**
      * Clear form data
@@ -198,8 +198,9 @@ export namespace DomUtils {
         let country: string | null;
         try {
             country =
-                new URL(location.href).searchParams.get(Country) ||
-                localStorage.getItem(Country);
+                new URL(location.href).searchParams.get(CountryField) ??
+                sessionStorage.getItem(CountryField) ??
+                localStorage.getItem(CountryField);
         } catch {
             country = null;
         }
@@ -216,8 +217,9 @@ export namespace DomUtils {
         let culture: string | null;
         try {
             culture =
-                new URL(location.href).searchParams.get(Culture) ||
-                localStorage.getItem(Culture);
+                new URL(location.href).searchParams.get(CultureField) ??
+                sessionStorage.getItem(CultureField) ??
+                localStorage.getItem(CultureField);
         } catch {
             culture = null;
         }
@@ -415,22 +417,6 @@ export namespace DomUtils {
         return base;
     }
 
-    /**
-     * Save country name
-     * @param country Country name
-     */
-    export function saveCountry(country: string) {
-        localStorage.setItem(Country, country);
-    }
-
-    /**
-     * Save culture name
-     * @param culture Culture name
-     */
-    export function saveCulture(culture: string) {
-        localStorage.setItem(Culture, culture);
-    }
-
     /**
      * Set HTML element focus by name
      * @param name Element name or first collection item

package/src/storage/IStorage.ts

@@ -5,33 +5,40 @@ export interface 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 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
      * @param data  Data, null for removal
+     * @param persistance Persist the data, false will stop persistance
      */
-    setData(key: string, data: unknown): void;
+    setData(key: string, data: unknown, persistance?: boolean): void;
 }
 
 /**
  * Storage constructor interface
  */
 export interface IStorageConstructor {
-    new (globalFields: string[]): IStorage;
+    new (
+        globalFields: string[],
+        callback: (field: string, data: string | null) => string | null
+    ): IStorage;
 }

package/src/storage/WindowStorage.ts

@@ -10,43 +10,56 @@ export class WindowStorage implements IStorage {
     /**
      * Constructor
      * @param globalFields Global fields
+     * @param callback Field and data callback
      */
-    constructor(private globalFields: string[]) {
+    constructor(
+        private globalFields: string[],
+        callback: (field: string, data: string | null) => string | null
+    ) {
         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 = localStorage.getItem(field);
-            if (data != null) {
-                sessionStorage.setItem(field, data);
-            }
+            const data = callback(field, localStorage.getItem(field));
+            if (data == null) sessionStorage.removeItem(field);
+            else sessionStorage.setItem(field, data);
         });
     }
 
     /**
      * 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);
@@ -58,11 +71,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);
     }
 
@@ -70,10 +88,16 @@ 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) {
+    setData(key: string, data: unknown, persistance?: boolean) {
+        if (persistance) {
+            StorageUtils.setLocalData(key, data);
+            return;
+        }
+
         StorageUtils.setSessionData(key, data);
-        if (this.globalFields.includes(key)) {
+        if (persistance !== false && this.globalFields.includes(key)) {
             StorageUtils.setLocalData(key, data);
         }
     }