@etsoo/shared 1.0.81 → 1.0.82

package/lib/cjs/StorageUtils.d.ts

@@ -15,12 +15,17 @@ 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
      * @param defaultValue Default value
      */
-    function getLocalData<T, M = T | undefined>(key: string, defaultValue?: M): M extends T ? M : undefined;
+    function getLocalData<T>(key: string, defaultValue: T): T;
     /**
      * Get local storage object data
      * @param key Key name
@@ -30,7 +35,13 @@ export declare namespace StorageUtils {
      * Get session storage data
      * @param key Key name
      */
-    function getSessionData<T, M = T | undefined>(key: string, defaultValue?: M): M extends T ? M : undefined;
+    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
      * @param key Key name

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

@@ -134,6 +134,13 @@ export declare namespace Utils {
      * @returns Updated fields
      */
     function objectUpdated(objNew: {}, objPrev: {}, ignoreFields?: string[], strict?: number): string[];
+    /**
+     * 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
@@ -141,7 +148,7 @@ export declare namespace Utils {
      * @param defaultValue Default value
      * @returns Parsed value
      */
-    function parseString<T, M = T | undefined>(input: string | undefined | null, defaultValue?: M): M extends T ? M : undefined;
+    function parseString<T>(input: string | undefined | null, defaultValue: T): T;
     /**
      * Remove non letters
      * @param input Input string

package/lib/cjs/Utils.js

@@ -268,6 +268,7 @@ var Utils;
     Utils.objectUpdated = objectUpdated;
     /**
      * 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

package/lib/mjs/StorageUtils.d.ts

@@ -15,12 +15,17 @@ 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
      * @param defaultValue Default value
      */
-    function getLocalData<T, M = T | undefined>(key: string, defaultValue?: M): M extends T ? M : undefined;
+    function getLocalData<T>(key: string, defaultValue: T): T;
     /**
      * Get local storage object data
      * @param key Key name
@@ -30,7 +35,13 @@ export declare namespace StorageUtils {
      * Get session storage data
      * @param key Key name
      */
-    function getSessionData<T, M = T | undefined>(key: string, defaultValue?: M): M extends T ? M : undefined;
+    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
      * @param key Key name

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

@@ -134,6 +134,13 @@ export declare namespace Utils {
      * @returns Updated fields
      */
     function objectUpdated(objNew: {}, objPrev: {}, ignoreFields?: string[], strict?: number): string[];
+    /**
+     * 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
@@ -141,7 +148,7 @@ export declare namespace Utils {
      * @param defaultValue Default value
      * @returns Parsed value
      */
-    function parseString<T, M = T | undefined>(input: string | undefined | null, defaultValue?: M): M extends T ? M : undefined;
+    function parseString<T>(input: string | undefined | null, defaultValue: T): T;
     /**
      * Remove non letters
      * @param input Input string

package/lib/mjs/Utils.js

@@ -265,6 +265,7 @@ export var Utils;
     Utils.objectUpdated = objectUpdated;
     /**
      * 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

package/package.json

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

package/src/StorageUtils.ts

@@ -44,20 +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, M = T | undefined>(
+    export function getLocalData<T>(
         key: string,
-        defaultValue?: M
-    ): M extends T ? M : undefined {
+        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<T, M>(data, defaultValue);
+        return Utils.parseString<T>(data, defaultValue);
     }
 
     /**
@@ -75,15 +91,31 @@ export namespace StorageUtils {
      * Get session storage data
      * @param key Key name
      */
-    export function getSessionData<T, M = T | undefined>(
+    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?: M
-    ): M extends T ? M : undefined {
+        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<T, M>(data, defaultValue);
+        return Utils.parseString<T>(data, defaultValue);
     }
 
     /**

package/src/Utils.ts

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