@etsoo/shared 1.0.79 → 1.0.80

package/__tests__/StorageUtils.ts

@@ -7,7 +7,7 @@ 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('boolean', false)).toBe(true);
     expect(StorageUtils.getSessionData('number', 0)).toBe(3.14);
     expect(StorageUtils.getSessionData('test', {})).toHaveProperty('id', 123);

package/__tests__/Utils.ts

@@ -103,6 +103,7 @@ test('Tests for parseString', () => {
     expect(Utils.parseString<string>('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(

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 | undefined;
+    function getLocalData<T, M = T | undefined>(key: string, defaultValue?: M): M extends T ? M : 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 | undefined;
+    function getSessionData<T, M = T | undefined>(key: string, defaultValue?: M): M extends T ? M : undefined;
     /**
      * Get session storage object data
      * @param key Key name

package/lib/cjs/Utils.d.ts

@@ -141,7 +141,7 @@ export declare namespace Utils {
      * @param defaultValue Default value
      * @returns Parsed value
      */
-    function parseString<T>(input: string | undefined | null, defaultValue?: T): T | undefined;
+    function parseString<T, M = T | undefined>(input: string | undefined | null, defaultValue?: M): M extends T ? M : undefined;
     /**
      * Remove non letters
      * @param input Input string

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 | undefined;
+    function getLocalData<T, M = T | undefined>(key: string, defaultValue?: M): M extends T ? M : 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 | undefined;
+    function getSessionData<T, M = T | undefined>(key: string, defaultValue?: M): M extends T ? M : undefined;
     /**
      * Get session storage object data
      * @param key Key name

package/lib/mjs/Utils.d.ts

@@ -141,7 +141,7 @@ export declare namespace Utils {
      * @param defaultValue Default value
      * @returns Parsed value
      */
-    function parseString<T>(input: string | undefined | null, defaultValue?: T): T | undefined;
+    function parseString<T, M = T | undefined>(input: string | undefined | null, defaultValue?: M): M extends T ? M : undefined;
     /**
      * Remove non letters
      * @param input Input string

package/package.json

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

package/src/StorageUtils.ts

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

package/src/Utils.ts

@@ -368,12 +368,12 @@ export namespace Utils {
      * @param defaultValue Default value
      * @returns Parsed value
      */
-    export function parseString<T>(
+    export function parseString<T, M = T | undefined>(
         input: string | undefined | null,
-        defaultValue?: T
-    ): T | undefined {
+        defaultValue?: M
+    ): M extends T ? M : undefined {
         // Undefined and empty case, return default value
-        if (input == null || input === '') return defaultValue;
+        if (input == null || input === '') return <any>defaultValue;
 
         // String
         if (typeof defaultValue === 'string') return <any>input;
@@ -382,7 +382,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,10 +390,10 @@ export namespace Utils {
             const json = JSON.parse(input);
 
             // Return
-            return <T>json;
+            return json;
         } catch {
             if (defaultValue == null) return <any>input;
-            return defaultValue;
+            return <any>defaultValue;
         }
     }