@etsoo/shared 1.0.71 → 1.0.75

package/README.md

@@ -122,7 +122,9 @@ 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

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

@@ -8,7 +8,8 @@ test('Tests for getDataChanges', () => {
         brand: '',
         price: '6.0',
         amount: '',
-        enabled: true
+        enabled: true,
+        value: undefined
     };
     const initData = {
         id: 1,

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

@@ -117,7 +117,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

@@ -62,8 +62,13 @@ var Utils;
             // Ignore fields, no process
             if (ignoreFields.includes(key))
                 return;
-            // Contract with init value
+            // Compare with init value
             const initValue = Reflect.get(initData, key);
+            if (value == null && initValue == null) {
+                // Both are null, it's equal
+                Reflect.deleteProperty(input, key);
+                return;
+            }
             if (initValue != null) {
                 const newValue = DataTypes_1.DataTypes.convert(value, initValue);
                 if (newValue === initValue) {
@@ -227,20 +232,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

@@ -117,7 +117,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

@@ -59,8 +59,13 @@ export var Utils;
             // Ignore fields, no process
             if (ignoreFields.includes(key))
                 return;
-            // Contract with init value
+            // Compare with init value
             const initValue = Reflect.get(initData, key);
+            if (value == null && initValue == null) {
+                // Both are null, it's equal
+                Reflect.deleteProperty(input, key);
+                return;
+            }
             if (initValue != null) {
                 const newValue = DataTypes.convert(value, initValue);
                 if (newValue === initValue) {
@@ -224,20 +229,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.71",
+    "version": "1.0.75",
     "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

@@ -115,9 +115,15 @@ export namespace Utils {
             // Ignore fields, no process
             if (ignoreFields.includes(key)) return;
 
-            // Contract with init value
+            // Compare with init value
             const initValue = Reflect.get(initData, key);
 
+            if (value == null && initValue == null) {
+                // Both are null, it's equal
+                Reflect.deleteProperty(input, key);
+                return;
+            }
+
             if (initValue != null) {
                 const newValue = DataTypes.convert(value, initValue);
                 if (newValue === initValue) {
@@ -309,26 +315,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);
+            }
+        });
     };
 
     /**