@etsoo/shared 1.0.72 → 1.0.76

package/README.md

@@ -122,13 +122,16 @@ Storage related utilities
 |setLocalData|Set local storage data|
 |setSessionData|Set session storage data|
 |getLocalData|Get local storage data|
+|getLocalObject|Get local storage object data|
 |getSessionData|Get session storage data|
+|getSessionObject|Get session storage object data|
 
 ## Utils
 String and other related utilities
 
 |Name|Description|
 |---:|---|
+|charsToNumber|Base64 chars to number|
 |formatInitial|Format inital character to lower case or upper case|
 |formatString|Format string with parameters|
 |getDataChanges|Get data changed fields with input data updated|
@@ -137,6 +140,7 @@ String and other related utilities
 |mergeFormData|Merge form data to primary one|
 |mergeClasses|Merge class names|
 |newGUID|Create a GUID|
+|numberToChars|Number to base64 chars|
 |objectEqual|Test two objects are equal or not|
 |parseString|Parse string (JSON) to specific type|
 |setLabels|Set source with new labels|

package/__tests__/DomUtils.ts

@@ -245,6 +245,12 @@ test('Tests for headersToObject', () => {
     );
 });
 
+test('Tests for isFormData', () => {
+    const formData = new FormData();
+    expect(DomUtils.isFormData(formData)).toBeTruthy();
+    expect(DomUtils.isFormData({})).toBeFalsy();
+});
+
 test('Tests for isJSONContentType', () => {
     expect(DomUtils.isJSONContentType('application/problem+json')).toBeTruthy();
     expect(DomUtils.isJSONContentType('application/javascript')).toBeTruthy();

package/__tests__/StorageUtils.ts

@@ -12,3 +12,17 @@ test('Tests for all', () => {
     expect(StorageUtils.getSessionData('number', 0)).toBe(3.14);
     expect(StorageUtils.getSessionData('test', {})).toHaveProperty('id', 123);
 });
+
+test('Tests for getLocalObject', () => {
+    StorageUtils.setLocalData('test', { id: 123, name: 'test' });
+    const data = StorageUtils.getLocalObject<{ id: number }>('test');
+    expect(data?.id).toBe(123);
+    expect(data).toHaveProperty('name', 'test');
+});
+
+test('Tests for getSessionObject', () => {
+    StorageUtils.setSessionData('test', { id: 123, name: 'test' });
+    const data = StorageUtils.getSessionObject<{ id: number }>('test');
+    expect(data?.id).toBe(123);
+    expect(data).toHaveProperty('name', 'test');
+});

package/__tests__/Utils.ts

@@ -67,6 +67,13 @@ test('Tests for newGUID', () => {
     expect(id1.length).toBe(id2.length);
 });
 
+test('Tests for numberToChars and charsToNumber', () => {
+    const num = 1638777042242;
+    const chars = Utils.numberToChars(num);
+    expect(chars).toEqual('QmpkdVgv');
+    expect(Utils.charsToNumber(chars)).toEqual(num);
+});
+
 test('Tests for removeNonLetters', () => {
     const input = '1234-5678@abc.';
     const result = '12345678abc';

package/lib/cjs/StorageUtils.d.ts

@@ -21,9 +21,19 @@ export declare namespace StorageUtils {
      * @param defaultValue Default value
      */
     function getLocalData<T>(key: string, defaultValue: T): T;
+    /**
+     * Get local storage object data
+     * @param key Key name
+     */
+    function getLocalObject<T extends {}>(key: string): T | undefined;
     /**
      * Get session storage data
      * @param key Key name
      */
     function getSessionData<T>(key: string, defaultValue: T): T;
+    /**
+     * Get session storage object data
+     * @param key Key name
+     */
+    function getSessionObject<T extends {}>(key: string): T | undefined;
 }

package/lib/cjs/StorageUtils.js

@@ -51,6 +51,18 @@ var StorageUtils;
         return Utils_1.Utils.parseString(data, defaultValue);
     }
     StorageUtils.getLocalData = getLocalData;
+    /**
+     * Get local storage object data
+     * @param key Key name
+     */
+    function getLocalObject(key) {
+        // Get storage
+        const data = localStorage.getItem(key);
+        if (data == null)
+            return undefined;
+        return JSON.parse(data);
+    }
+    StorageUtils.getLocalObject = getLocalObject;
     /**
      * Get session storage data
      * @param key Key name
@@ -62,4 +74,16 @@ var StorageUtils;
         return Utils_1.Utils.parseString(data, defaultValue);
     }
     StorageUtils.getSessionData = getSessionData;
+    /**
+     * Get session storage object data
+     * @param key Key name
+     */
+    function getSessionObject(key) {
+        // Get storage
+        const data = sessionStorage.getItem(key);
+        if (data == null)
+            return undefined;
+        return JSON.parse(data);
+    }
+    StorageUtils.getSessionObject = getSessionObject;
 })(StorageUtils = exports.StorageUtils || (exports.StorageUtils = {}));

package/lib/cjs/Utils.d.ts

@@ -35,6 +35,12 @@ declare global {
  * Utilities
  */
 export declare namespace Utils {
+    /**
+     * Base64 chars to number
+     * @param base64Chars Base64 chars
+     * @returns Number
+     */
+    function charsToNumber(base64Chars: string): number;
     /**
      * Format inital character to lower case or upper case
      * @param input Input string
@@ -89,6 +95,12 @@ export declare namespace Utils {
      * Create a GUID
      */
     function newGUID(): string;
+    /**
+     * Number to base64 chars
+     * @param num Input number
+     * @returns Result
+     */
+    function numberToChars(num: number): string;
     /**
      * Test two objects are equal or not
      * @param obj1 Object 1
@@ -117,7 +129,7 @@ export declare namespace Utils {
      * @param labels Labels
      * @param reference Key reference dictionary
      */
-    const setLabels: (source: {}, labels: DataTypes.StringRecord, reference?: Readonly<DataTypes.StringDictionary>) => void;
+    const setLabels: (source: {}, labels: DataTypes.StringRecord, reference?: Readonly<DataTypes.StringDictionary> | undefined) => void;
     /**
      * Snake name to works, 'snake_name' to 'Snake Name'
      * @param name Name text

package/lib/cjs/Utils.js

@@ -29,6 +29,20 @@ String.prototype.removeNonLetters = function () {
  */
 var Utils;
 (function (Utils) {
+    /**
+     * Base64 chars to number
+     * @param base64Chars Base64 chars
+     * @returns Number
+     */
+    function charsToNumber(base64Chars) {
+        const chars = typeof Buffer === 'undefined'
+            ? [...atob(base64Chars)].map((char) => char.charCodeAt(0))
+            : [...Buffer.from(base64Chars, 'base64')];
+        return chars.reduce((previousValue, currentValue, currentIndex) => {
+            return previousValue + currentValue * Math.pow(128, currentIndex);
+        }, 0);
+    }
+    Utils.charsToNumber = charsToNumber;
     /**
      * Format inital character to lower case or upper case
      * @param input Input string
@@ -149,6 +163,27 @@ var Utils;
         });
     }
     Utils.newGUID = newGUID;
+    /**
+     * Number to base64 chars
+     * @param num Input number
+     * @returns Result
+     */
+    function numberToChars(num) {
+        const codes = [];
+        while (num > 0) {
+            const code = num % 128;
+            codes.push(code);
+            num = (num - code) / 128;
+        }
+        if (typeof Buffer === 'undefined') {
+            return btoa(String.fromCharCode(...codes));
+        }
+        else {
+            const buffer = Buffer.from(codes);
+            return buffer.toString('base64');
+        }
+    }
+    Utils.numberToChars = numberToChars;
     /**
      * Test two objects are equal or not
      * @param obj1 Object 1
@@ -232,20 +267,18 @@ var Utils;
      * @param labels Labels
      * @param reference Key reference dictionary
      */
-    Utils.setLabels = (source, labels, reference = {}) => {
-        const newLabels = Object.keys(source).reduce((newLabels, key, _index, _keys) => {
+    Utils.setLabels = (source, labels, reference) => {
+        Object.keys(source).forEach((key) => {
             var _a;
             // Reference key
-            const labelKey = (_a = reference[key]) !== null && _a !== void 0 ? _a : key;
+            const labelKey = reference == null ? key : (_a = reference[key]) !== null && _a !== void 0 ? _a : key;
             // Label
             const label = labels[labelKey];
             if (label != null) {
                 // If found, update
-                newLabels[key] = String(label);
+                Reflect.set(source, key, label);
             }
-            return newLabels;
-        }, {});
-        Object.assign(source, newLabels);
+        });
     };
     /**
      * Snake name to works, 'snake_name' to 'Snake Name'

package/lib/mjs/StorageUtils.d.ts

@@ -21,9 +21,19 @@ export declare namespace StorageUtils {
      * @param defaultValue Default value
      */
     function getLocalData<T>(key: string, defaultValue: T): T;
+    /**
+     * Get local storage object data
+     * @param key Key name
+     */
+    function getLocalObject<T extends {}>(key: string): T | undefined;
     /**
      * Get session storage data
      * @param key Key name
      */
     function getSessionData<T>(key: string, defaultValue: T): T;
+    /**
+     * Get session storage object data
+     * @param key Key name
+     */
+    function getSessionObject<T extends {}>(key: string): T | undefined;
 }

package/lib/mjs/StorageUtils.js

@@ -48,6 +48,18 @@ export var StorageUtils;
         return Utils.parseString(data, defaultValue);
     }
     StorageUtils.getLocalData = getLocalData;
+    /**
+     * Get local storage object data
+     * @param key Key name
+     */
+    function getLocalObject(key) {
+        // Get storage
+        const data = localStorage.getItem(key);
+        if (data == null)
+            return undefined;
+        return JSON.parse(data);
+    }
+    StorageUtils.getLocalObject = getLocalObject;
     /**
      * Get session storage data
      * @param key Key name
@@ -59,4 +71,16 @@ export var StorageUtils;
         return Utils.parseString(data, defaultValue);
     }
     StorageUtils.getSessionData = getSessionData;
+    /**
+     * Get session storage object data
+     * @param key Key name
+     */
+    function getSessionObject(key) {
+        // Get storage
+        const data = sessionStorage.getItem(key);
+        if (data == null)
+            return undefined;
+        return JSON.parse(data);
+    }
+    StorageUtils.getSessionObject = getSessionObject;
 })(StorageUtils || (StorageUtils = {}));

package/lib/mjs/Utils.d.ts

@@ -35,6 +35,12 @@ declare global {
  * Utilities
  */
 export declare namespace Utils {
+    /**
+     * Base64 chars to number
+     * @param base64Chars Base64 chars
+     * @returns Number
+     */
+    function charsToNumber(base64Chars: string): number;
     /**
      * Format inital character to lower case or upper case
      * @param input Input string
@@ -89,6 +95,12 @@ export declare namespace Utils {
      * Create a GUID
      */
     function newGUID(): string;
+    /**
+     * Number to base64 chars
+     * @param num Input number
+     * @returns Result
+     */
+    function numberToChars(num: number): string;
     /**
      * Test two objects are equal or not
      * @param obj1 Object 1
@@ -117,7 +129,7 @@ export declare namespace Utils {
      * @param labels Labels
      * @param reference Key reference dictionary
      */
-    const setLabels: (source: {}, labels: DataTypes.StringRecord, reference?: Readonly<DataTypes.StringDictionary>) => void;
+    const setLabels: (source: {}, labels: DataTypes.StringRecord, reference?: Readonly<DataTypes.StringDictionary> | undefined) => void;
     /**
      * Snake name to works, 'snake_name' to 'Snake Name'
      * @param name Name text

package/lib/mjs/Utils.js

@@ -26,6 +26,20 @@ String.prototype.removeNonLetters = function () {
  */
 export var Utils;
 (function (Utils) {
+    /**
+     * Base64 chars to number
+     * @param base64Chars Base64 chars
+     * @returns Number
+     */
+    function charsToNumber(base64Chars) {
+        const chars = typeof Buffer === 'undefined'
+            ? [...atob(base64Chars)].map((char) => char.charCodeAt(0))
+            : [...Buffer.from(base64Chars, 'base64')];
+        return chars.reduce((previousValue, currentValue, currentIndex) => {
+            return previousValue + currentValue * Math.pow(128, currentIndex);
+        }, 0);
+    }
+    Utils.charsToNumber = charsToNumber;
     /**
      * Format inital character to lower case or upper case
      * @param input Input string
@@ -146,6 +160,27 @@ export var Utils;
         });
     }
     Utils.newGUID = newGUID;
+    /**
+     * Number to base64 chars
+     * @param num Input number
+     * @returns Result
+     */
+    function numberToChars(num) {
+        const codes = [];
+        while (num > 0) {
+            const code = num % 128;
+            codes.push(code);
+            num = (num - code) / 128;
+        }
+        if (typeof Buffer === 'undefined') {
+            return btoa(String.fromCharCode(...codes));
+        }
+        else {
+            const buffer = Buffer.from(codes);
+            return buffer.toString('base64');
+        }
+    }
+    Utils.numberToChars = numberToChars;
     /**
      * Test two objects are equal or not
      * @param obj1 Object 1
@@ -229,20 +264,18 @@ export var Utils;
      * @param labels Labels
      * @param reference Key reference dictionary
      */
-    Utils.setLabels = (source, labels, reference = {}) => {
-        const newLabels = Object.keys(source).reduce((newLabels, key, _index, _keys) => {
+    Utils.setLabels = (source, labels, reference) => {
+        Object.keys(source).forEach((key) => {
             var _a;
             // Reference key
-            const labelKey = (_a = reference[key]) !== null && _a !== void 0 ? _a : key;
+            const labelKey = reference == null ? key : (_a = reference[key]) !== null && _a !== void 0 ? _a : key;
             // Label
             const label = labels[labelKey];
             if (label != null) {
                 // If found, update
-                newLabels[key] = String(label);
+                Reflect.set(source, key, label);
             }
-            return newLabels;
-        }, {});
-        Object.assign(source, newLabels);
+        });
     };
     /**
      * Snake name to works, 'snake_name' to 'Snake Name'

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.0.72",
+    "version": "1.0.76",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,14 +54,14 @@
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "dependencies": {},
     "devDependencies": {
-        "@types/jest": "^27.0.2",
-        "@typescript-eslint/eslint-plugin": "^5.0.0",
-        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^8.0.1",
-        "eslint-config-airbnb-base": "^14.2.1",
-        "eslint-plugin-import": "^2.25.2",
-        "jest": "^27.2.5",
-        "ts-jest": "^27.0.5",
-        "typescript": "^4.4.4"
+        "@types/jest": "^27.0.3",
+        "@typescript-eslint/eslint-plugin": "^5.4.0",
+        "@typescript-eslint/parser": "^5.4.0",
+        "eslint": "^8.2.0",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-plugin-import": "^2.25.3",
+        "jest": "^27.3.1",
+        "ts-jest": "^27.0.7",
+        "typescript": "^4.5.2"
     }
 }

package/src/StorageUtils.ts

@@ -57,6 +57,17 @@ export namespace StorageUtils {
         return Utils.parseString(data, defaultValue);
     }
 
+    /**
+     * Get local storage object data
+     * @param key Key name
+     */
+    export function getLocalObject<T extends {}>(key: string) {
+        // Get storage
+        const data = localStorage.getItem(key);
+        if (data == null) return undefined;
+        return <T>JSON.parse(data);
+    }
+
     /**
      * Get session storage data
      * @param key Key name
@@ -68,4 +79,15 @@ export namespace StorageUtils {
         // Return
         return Utils.parseString(data, defaultValue);
     }
+
+    /**
+     * Get session storage object data
+     * @param key Key name
+     */
+    export function getSessionObject<T extends {}>(key: string) {
+        // Get storage
+        const data = sessionStorage.getItem(key);
+        if (data == null) return undefined;
+        return <T>JSON.parse(data);
+    }
 }

package/src/Utils.ts

@@ -77,6 +77,22 @@ String.prototype.removeNonLetters = function (this: string) {
  * Utilities
  */
 export namespace Utils {
+    /**
+     * Base64 chars to number
+     * @param base64Chars Base64 chars
+     * @returns Number
+     */
+    export function charsToNumber(base64Chars: string) {
+        const chars =
+            typeof Buffer === 'undefined'
+                ? [...atob(base64Chars)].map((char) => char.charCodeAt(0))
+                : [...Buffer.from(base64Chars, 'base64')];
+
+        return chars.reduce((previousValue, currentValue, currentIndex) => {
+            return previousValue + currentValue * Math.pow(128, currentIndex);
+        }, 0);
+    }
+
     /**
      * Format inital character to lower case or upper case
      * @param input Input string
@@ -218,6 +234,27 @@ export namespace Utils {
         });
     }
 
+    /**
+     * Number to base64 chars
+     * @param num Input number
+     * @returns Result
+     */
+    export function numberToChars(num: number) {
+        const codes = [];
+        while (num > 0) {
+            const code = num % 128;
+            codes.push(code);
+            num = (num - code) / 128;
+        }
+
+        if (typeof Buffer === 'undefined') {
+            return btoa(String.fromCharCode(...codes));
+        } else {
+            const buffer = Buffer.from(codes);
+            return buffer.toString('base64');
+        }
+    }
+
     /**
      * Test two objects are equal or not
      * @param obj1 Object 1
@@ -315,26 +352,20 @@ export namespace Utils {
     export const setLabels = (
         source: {},
         labels: DataTypes.StringRecord,
-        reference: Readonly<DataTypes.StringDictionary> = {}
+        reference?: Readonly<DataTypes.StringDictionary>
     ) => {
-        const newLabels = Object.keys(source).reduce(
-            (newLabels, key, _index, _keys) => {
-                // Reference key
-                const labelKey = reference[key] ?? key;
+        Object.keys(source).forEach((key) => {
+            // Reference key
+            const labelKey = reference == null ? key : reference[key] ?? key;
 
-                // Label
-                const label = labels[labelKey];
+            // Label
+            const label = labels[labelKey];
 
-                if (label != null) {
-                    // If found, update
-                    newLabels[key] = String(label);
-                }
-
-                return newLabels;
-            },
-            {} as DataTypes.StringDictionary
-        );
-        Object.assign(source, newLabels);
+            if (label != null) {
+                // If found, update
+                Reflect.set(source, key, label);
+            }
+        });
     };
 
     /**