@etsoo/shared 1.0.78 → 1.0.82

package/__tests__/StorageUtils.ts

@@ -7,7 +7,8 @@ test('Tests for all', () => {
     StorageUtils.setSessionData('number', 3.14);
     StorageUtils.setSessionData('test', { id: 123, name: 'test' });
 
-    expect(StorageUtils.getSessionData('string', '')).toBe('test');
+    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('test', {})).toHaveProperty('id', 123);

package/__tests__/Utils.ts

@@ -100,8 +100,12 @@ test('Tests for objectUpdated', () => {
 });
 
 test('Tests for parseString', () => {
+    expect(Utils.parseString<string>('test')).toBe('test');
     expect(Utils.parseString('test', '')).toBe('test');
     expect(Utils.parseString('true', false)).toBe(true);
+    expect(Utils.parseString('', false)).toBeFalsy();
+    expect(Utils.parseString<boolean>('')).toBeUndefined();
+    expect(Utils.parseString<number>(undefined)).toBeUndefined();
     expect(Utils.parseString('3.14', 0)).toBe(3.14);
     expect(Utils.parseString('2021/4/13', new Date())).toStrictEqual(
         new Date('2021/4/13')

package/lib/cjs/StorageUtils.d.ts

@@ -15,6 +15,11 @@ export declare namespace StorageUtils {
      * @param data Data, null for removal
      */
     function setSessionData(key: string, data: unknown): void;
+    /**
+     * Get local storage data
+     * @param key Key name
+     */
+    function getLocalData<T>(key: string): T | undefined;
     /**
      * Get local storage data
      * @param key Key name
@@ -30,6 +35,12 @@ export declare namespace StorageUtils {
      * Get session storage data
      * @param key Key name
      */
+    function getSessionData<T>(key: string): T | undefined;
+    /**
+     * Get session storage data
+     * @param key Key name
+     * @param defaultValue Default value
+     */
     function getSessionData<T>(key: string, defaultValue: T): T;
     /**
      * Get session storage object data

package/lib/cjs/StorageUtils.js

@@ -47,6 +47,9 @@ var StorageUtils;
     function getLocalData(key, defaultValue) {
         // Get storage
         const data = localStorage.getItem(key);
+        // No default value
+        if (defaultValue == null)
+            return Utils_1.Utils.parseString(data);
         // Return
         return Utils_1.Utils.parseString(data, defaultValue);
     }
@@ -70,6 +73,9 @@ var StorageUtils;
     function getSessionData(key, defaultValue) {
         // Get storage
         const data = sessionStorage.getItem(key);
+        // No default value
+        if (defaultValue == null)
+            return Utils_1.Utils.parseString(data);
         // Return
         return Utils_1.Utils.parseString(data, defaultValue);
     }

package/lib/cjs/Utils.d.ts

@@ -135,7 +135,15 @@ export declare namespace Utils {
      */
     function objectUpdated(objNew: {}, objPrev: {}, ignoreFields?: string[], strict?: number): string[];
     /**
-     * Parse string (JSON) to specific type
+     * Parse string (JSON) to specific type, no type conversion
+     * For type conversion, please use DataTypes.convert
+     * @param input Input string
+     * @returns Parsed value
+     */
+    function parseString<T>(input: string | undefined | null): T | undefined;
+    /**
+     * Parse string (JSON) to specific type, no type conversion
+     * For type conversion, please use DataTypes.convert
      * @param input Input string
      * @param defaultValue Default value
      * @returns Parsed value

package/lib/cjs/Utils.js

@@ -267,14 +267,16 @@ var Utils;
     }
     Utils.objectUpdated = objectUpdated;
     /**
-     * Parse string (JSON) to specific type
+     * Parse string (JSON) to specific type, no type conversion
+     * When return type depends on parameter value, uses function overloading, otherwise uses conditional type
+     * For type conversion, please use DataTypes.convert
      * @param input Input string
      * @param defaultValue Default value
      * @returns Parsed value
      */
     function parseString(input, defaultValue) {
-        // Undefined case, return default value
-        if (input == null)
+        // Undefined and empty case, return default value
+        if (input == null || input === '')
             return defaultValue;
         // String
         if (typeof defaultValue === 'string')
@@ -292,16 +294,11 @@ var Utils;
             // Return
             return json;
         }
-        catch (e) {
-            console.log('Utils.parseString error', e);
+        catch {
+            if (defaultValue == null)
+                return input;
             return defaultValue;
         }
-        /*
-        finally part will still return the boolean value
-        finally {
-            return defaultValue
-        }
-        */
     }
     Utils.parseString = parseString;
     /**

package/lib/mjs/StorageUtils.d.ts

@@ -15,6 +15,11 @@ export declare namespace StorageUtils {
      * @param data Data, null for removal
      */
     function setSessionData(key: string, data: unknown): void;
+    /**
+     * Get local storage data
+     * @param key Key name
+     */
+    function getLocalData<T>(key: string): T | undefined;
     /**
      * Get local storage data
      * @param key Key name
@@ -30,6 +35,12 @@ export declare namespace StorageUtils {
      * Get session storage data
      * @param key Key name
      */
+    function getSessionData<T>(key: string): T | undefined;
+    /**
+     * Get session storage data
+     * @param key Key name
+     * @param defaultValue Default value
+     */
     function getSessionData<T>(key: string, defaultValue: T): T;
     /**
      * Get session storage object data

package/lib/mjs/StorageUtils.js

@@ -44,6 +44,9 @@ export var StorageUtils;
     function getLocalData(key, defaultValue) {
         // Get storage
         const data = localStorage.getItem(key);
+        // No default value
+        if (defaultValue == null)
+            return Utils.parseString(data);
         // Return
         return Utils.parseString(data, defaultValue);
     }
@@ -67,6 +70,9 @@ export var StorageUtils;
     function getSessionData(key, defaultValue) {
         // Get storage
         const data = sessionStorage.getItem(key);
+        // No default value
+        if (defaultValue == null)
+            return Utils.parseString(data);
         // Return
         return Utils.parseString(data, defaultValue);
     }

package/lib/mjs/Utils.d.ts

@@ -135,7 +135,15 @@ export declare namespace Utils {
      */
     function objectUpdated(objNew: {}, objPrev: {}, ignoreFields?: string[], strict?: number): string[];
     /**
-     * Parse string (JSON) to specific type
+     * Parse string (JSON) to specific type, no type conversion
+     * For type conversion, please use DataTypes.convert
+     * @param input Input string
+     * @returns Parsed value
+     */
+    function parseString<T>(input: string | undefined | null): T | undefined;
+    /**
+     * Parse string (JSON) to specific type, no type conversion
+     * For type conversion, please use DataTypes.convert
      * @param input Input string
      * @param defaultValue Default value
      * @returns Parsed value

package/lib/mjs/Utils.js

@@ -264,14 +264,16 @@ export var Utils;
     }
     Utils.objectUpdated = objectUpdated;
     /**
-     * Parse string (JSON) to specific type
+     * Parse string (JSON) to specific type, no type conversion
+     * When return type depends on parameter value, uses function overloading, otherwise uses conditional type
+     * For type conversion, please use DataTypes.convert
      * @param input Input string
      * @param defaultValue Default value
      * @returns Parsed value
      */
     function parseString(input, defaultValue) {
-        // Undefined case, return default value
-        if (input == null)
+        // Undefined and empty case, return default value
+        if (input == null || input === '')
             return defaultValue;
         // String
         if (typeof defaultValue === 'string')
@@ -289,16 +291,11 @@ export var Utils;
             // Return
             return json;
         }
-        catch (e) {
-            console.log('Utils.parseString error', e);
+        catch {
+            if (defaultValue == null)
+                return input;
             return defaultValue;
         }
-        /*
-        finally part will still return the boolean value
-        finally {
-            return defaultValue
-        }
-        */
     }
     Utils.parseString = parseString;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.0.78",
+    "version": "1.0.82",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -55,13 +55,13 @@
     "dependencies": {},
     "devDependencies": {
         "@types/jest": "^27.0.3",
-        "@typescript-eslint/eslint-plugin": "^5.4.0",
-        "@typescript-eslint/parser": "^5.4.0",
-        "eslint": "^8.2.0",
+        "@typescript-eslint/eslint-plugin": "^5.8.0",
+        "@typescript-eslint/parser": "^5.8.0",
+        "eslint": "^8.5.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"
+        "jest": "^27.4.5",
+        "ts-jest": "^27.1.2",
+        "typescript": "^4.5.4"
     }
 }

package/src/StorageUtils.ts

@@ -44,17 +44,36 @@ export namespace StorageUtils {
         );
     }
 
+    /**
+     * Get local storage data
+     * @param key Key name
+     */
+    export function getLocalData<T>(key: string): T | undefined;
+
+    /**
+     * Get local storage data
+     * @param key Key name
+     * @param defaultValue Default value
+     */
+    export function getLocalData<T>(key: string, defaultValue: T): T;
+
     /**
      * Get local storage data
      * @param key Key name
      * @param defaultValue Default value
      */
-    export function getLocalData<T>(key: string, defaultValue: T) {
+    export function getLocalData<T>(
+        key: string,
+        defaultValue?: T
+    ): T | undefined {
         // Get storage
         const data = localStorage.getItem(key);
 
+        // No default value
+        if (defaultValue == null) return Utils.parseString<T>(data);
+
         // Return
-        return Utils.parseString(data, defaultValue);
+        return Utils.parseString<T>(data, defaultValue);
     }
 
     /**
@@ -72,12 +91,31 @@ export namespace StorageUtils {
      * Get session storage data
      * @param key Key name
      */
-    export function getSessionData<T>(key: string, defaultValue: T) {
+    export function getSessionData<T>(key: string): T | undefined;
+
+    /**
+     * Get session storage data
+     * @param key Key name
+     * @param defaultValue Default value
+     */
+    export function getSessionData<T>(key: string, defaultValue: T): T;
+
+    /**
+     * Get session storage data
+     * @param key Key name
+     */
+    export function getSessionData<T>(
+        key: string,
+        defaultValue?: T
+    ): T | undefined {
         // Get storage
         const data = sessionStorage.getItem(key);
 
+        // No default value
+        if (defaultValue == null) return Utils.parseString<T>(data);
+
         // Return
-        return Utils.parseString(data, defaultValue);
+        return Utils.parseString<T>(data, defaultValue);
     }
 
     /**

package/src/Utils.ts

@@ -362,7 +362,18 @@ export namespace Utils {
     }
 
     /**
-     * Parse string (JSON) to specific type
+     * Parse string (JSON) to specific type, no type conversion
+     * For type conversion, please use DataTypes.convert
+     * @param input Input string
+     * @returns Parsed value
+     */
+    export function parseString<T>(
+        input: string | undefined | null
+    ): T | undefined;
+
+    /**
+     * Parse string (JSON) to specific type, no type conversion
+     * For type conversion, please use DataTypes.convert
      * @param input Input string
      * @param defaultValue Default value
      * @returns Parsed value
@@ -370,9 +381,22 @@ export namespace Utils {
     export function parseString<T>(
         input: string | undefined | null,
         defaultValue: T
-    ): T {
-        // Undefined case, return default value
-        if (input == null) return defaultValue;
+    ): T;
+
+    /**
+     * Parse string (JSON) to specific type, no type conversion
+     * When return type depends on parameter value, uses function overloading, otherwise uses conditional type
+     * For type conversion, please use DataTypes.convert
+     * @param input Input string
+     * @param defaultValue Default value
+     * @returns Parsed value
+     */
+    export function parseString<T>(
+        input: string | undefined | null,
+        defaultValue?: T
+    ): T | undefined {
+        // Undefined and empty case, return default value
+        if (input == null || input === '') return <T>defaultValue;
 
         // String
         if (typeof defaultValue === 'string') return <any>input;
@@ -381,7 +405,7 @@ export namespace Utils {
             // Date
             if (defaultValue instanceof Date) {
                 const date = new Date(input);
-                if (date == null) return defaultValue;
+                if (date == null) return <any>defaultValue;
                 return <any>date;
             }
 
@@ -390,16 +414,10 @@ export namespace Utils {
 
             // Return
             return <T>json;
-        } catch (e) {
-            console.log('Utils.parseString error', e);
-            return defaultValue;
-        }
-        /*
-        finally part will still return the boolean value
-        finally {
-            return defaultValue
+        } catch {
+            if (defaultValue == null) return <any>input;
+            return <T>defaultValue;
         }
-        */
     }
 
     /**