@etsoo/shared 1.0.78 → 1.0.79

package/__tests__/Utils.ts

@@ -100,8 +100,10 @@ test('Tests for objectUpdated', () => {
 });
 
 test('Tests for parseString', () => {
-    expect(Utils.parseString('test', '')).toBe('test');
+    expect(Utils.parseString<string>('test')).toBe('test');
     expect(Utils.parseString('true', false)).toBe(true);
+    expect(Utils.parseString('', false)).toBeFalsy();
+    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

@@ -20,7 +20,7 @@ export declare namespace StorageUtils {
      * @param key Key name
      * @param defaultValue Default value
      */
-    function getLocalData<T>(key: string, defaultValue: T): T;
+    function getLocalData<T>(key: string, defaultValue?: T): T | undefined;
     /**
      * Get local storage object data
      * @param key Key name
@@ -30,7 +30,7 @@ export declare namespace StorageUtils {
      * Get session storage data
      * @param key Key name
      */
-    function getSessionData<T>(key: string, defaultValue: T): T;
+    function getSessionData<T>(key: string, defaultValue?: T): T | undefined;
     /**
      * Get session storage object data
      * @param key Key name

package/lib/cjs/Utils.d.ts

@@ -135,12 +135,13 @@ 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
      * @param defaultValue Default value
      * @returns Parsed value
      */
-    function parseString<T>(input: string | undefined | null, defaultValue: T): T;
+    function parseString<T>(input: string | undefined | null, defaultValue?: T): T | undefined;
     /**
      * Remove non letters
      * @param input Input string

package/lib/cjs/Utils.js

@@ -267,14 +267,15 @@ var Utils;
     }
     Utils.objectUpdated = objectUpdated;
     /**
-     * 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
      * @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 +293,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

@@ -20,7 +20,7 @@ export declare namespace StorageUtils {
      * @param key Key name
      * @param defaultValue Default value
      */
-    function getLocalData<T>(key: string, defaultValue: T): T;
+    function getLocalData<T>(key: string, defaultValue?: T): T | undefined;
     /**
      * Get local storage object data
      * @param key Key name
@@ -30,7 +30,7 @@ export declare namespace StorageUtils {
      * Get session storage data
      * @param key Key name
      */
-    function getSessionData<T>(key: string, defaultValue: T): T;
+    function getSessionData<T>(key: string, defaultValue?: T): T | undefined;
     /**
      * Get session storage object data
      * @param key Key name

package/lib/mjs/Utils.d.ts

@@ -135,12 +135,13 @@ 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
      * @param defaultValue Default value
      * @returns Parsed value
      */
-    function parseString<T>(input: string | undefined | null, defaultValue: T): T;
+    function parseString<T>(input: string | undefined | null, defaultValue?: T): T | undefined;
     /**
      * Remove non letters
      * @param input Input string

package/lib/mjs/Utils.js

@@ -264,14 +264,15 @@ export var Utils;
     }
     Utils.objectUpdated = objectUpdated;
     /**
-     * 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
      * @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 +290,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.79",
     "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

@@ -49,7 +49,7 @@ export namespace StorageUtils {
      * @param key Key name
      * @param defaultValue Default value
      */
-    export function getLocalData<T>(key: string, defaultValue: T) {
+    export function getLocalData<T>(key: string, defaultValue?: T) {
         // Get storage
         const data = localStorage.getItem(key);
 
@@ -72,7 +72,7 @@ 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, defaultValue?: T) {
         // Get storage
         const data = sessionStorage.getItem(key);
 

package/src/Utils.ts

@@ -362,17 +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
      * @param defaultValue Default value
      * @returns Parsed value
      */
     export function parseString<T>(
         input: string | undefined | null,
-        defaultValue: T
-    ): T {
-        // Undefined case, return default value
-        if (input == null) return defaultValue;
+        defaultValue?: T
+    ): T | undefined {
+        // Undefined and empty case, return default value
+        if (input == null || input === '') return defaultValue;
 
         // String
         if (typeof defaultValue === 'string') return <any>input;
@@ -390,16 +391,10 @@ export namespace Utils {
 
             // Return
             return <T>json;
-        } catch (e) {
-            console.log('Utils.parseString error', e);
+        } catch {
+            if (defaultValue == null) return <any>input;
             return defaultValue;
         }
-        /*
-        finally part will still return the boolean value
-        finally {
-            return defaultValue
-        }
-        */
     }
 
     /**