@etsoo/shared 1.2.16 → 1.2.18

package/README.md

@@ -248,7 +248,7 @@ Numbers related utilities
 |formatFileSize|Format file size|
 |formatMoney|Format money number|
 |getCurrencySymbol|Get currency symbol or name from ISO code|
-|parse|Parse float value|
+|parse|Parse to number, with or without default value|
 |toExact|To the exact precision number avoiding precision lost|
 
 ## StorageUtils

package/__tests__/NumberUtils.ts

@@ -25,7 +25,10 @@ test('Tests for getCurrencySymbol', () => {
 test('Tests for parse', () => {
     expect(NumberUtils.parse('123')).toBe(123);
     expect(NumberUtils.parse(Object(123))).toBe(123);
-    expect(isNaN(NumberUtils.parse('a'))).toBeTruthy();
+    expect(NumberUtils.parse('a')).toBeUndefined();
+    expect(NumberUtils.parse('a', 0)).toBe(0);
+    expect(NumberUtils.parse('')).toBeUndefined();
+    expect(NumberUtils.parse('', -1)).toBe(-1);
 });
 
 test('Tests for parseWithUnit', () => {

package/lib/cjs/ExtendUtils.js

@@ -77,7 +77,7 @@ var ExtendUtils;
      */
     function sleep(delay = 0) {
         return new Promise((resolve) => {
-            waitFor(() => resolve, delay);
+            waitFor(resolve, delay);
         });
     }
     ExtendUtils.sleep = sleep;

package/lib/cjs/NumberUtils.d.ts

@@ -42,10 +42,16 @@ export declare namespace NumberUtils {
      */
     function getCurrencySymbol(code: string, display?: 'symbol' | 'narrowSymbol' | 'name', locale?: string): string | undefined;
     /**
-     * Parse float value
+     * Parse number
      * @param rawData Raw data
      */
-    const parse: (rawData: unknown) => number;
+    function parse(rawData: unknown): number | undefined;
+    /**
+     * Parse number with default value
+     * @param rawData Raw data
+     * @param defaultValue Default value
+     */
+    function parse(rawData: unknown, defaultValue: number): number;
     /**
      * Parse float value and unit
      * @param input Input string

package/lib/cjs/NumberUtils.js

@@ -82,19 +82,21 @@ var NumberUtils;
         return symbol;
     }
     NumberUtils.getCurrencySymbol = getCurrencySymbol;
-    /**
-     * Parse float value
-     * @param rawData Raw data
-     */
-    NumberUtils.parse = (rawData) => {
-        if (rawData == null) {
-            return Number.NaN;
+    function parse(rawData, defaultValue) {
+        if (rawData == null || rawData === '') {
+            return defaultValue;
         }
         if (typeof rawData === 'number') {
+            if (isNaN(rawData))
+                return defaultValue;
             return rawData;
         }
-        return parseFloat(rawData.toString());
-    };
+        const p = parseFloat(rawData.toString());
+        if (isNaN(p))
+            return defaultValue;
+        return p;
+    }
+    NumberUtils.parse = parse;
     /**
      * Parse float value and unit
      * @param input Input string

package/lib/mjs/ExtendUtils.js

@@ -74,7 +74,7 @@ export var ExtendUtils;
      */
     function sleep(delay = 0) {
         return new Promise((resolve) => {
-            waitFor(() => resolve, delay);
+            waitFor(resolve, delay);
         });
     }
     ExtendUtils.sleep = sleep;

package/lib/mjs/NumberUtils.d.ts

@@ -42,10 +42,16 @@ export declare namespace NumberUtils {
      */
     function getCurrencySymbol(code: string, display?: 'symbol' | 'narrowSymbol' | 'name', locale?: string): string | undefined;
     /**
-     * Parse float value
+     * Parse number
      * @param rawData Raw data
      */
-    const parse: (rawData: unknown) => number;
+    function parse(rawData: unknown): number | undefined;
+    /**
+     * Parse number with default value
+     * @param rawData Raw data
+     * @param defaultValue Default value
+     */
+    function parse(rawData: unknown, defaultValue: number): number;
     /**
      * Parse float value and unit
      * @param input Input string

package/lib/mjs/NumberUtils.js

@@ -79,19 +79,21 @@ export var NumberUtils;
         return symbol;
     }
     NumberUtils.getCurrencySymbol = getCurrencySymbol;
-    /**
-     * Parse float value
-     * @param rawData Raw data
-     */
-    NumberUtils.parse = (rawData) => {
-        if (rawData == null) {
-            return Number.NaN;
+    function parse(rawData, defaultValue) {
+        if (rawData == null || rawData === '') {
+            return defaultValue;
         }
         if (typeof rawData === 'number') {
+            if (isNaN(rawData))
+                return defaultValue;
             return rawData;
         }
-        return parseFloat(rawData.toString());
-    };
+        const p = parseFloat(rawData.toString());
+        if (isNaN(p))
+            return defaultValue;
+        return p;
+    }
+    NumberUtils.parse = parse;
     /**
      * Parse float value and unit
      * @param input Input string

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.2.16",
+    "version": "1.2.18",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,8 +54,8 @@
     },
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "devDependencies": {
-        "@types/jest": "^29.5.5",
-        "@types/lodash.isequal": "^4.5.6",
+        "@types/jest": "^29.5.7",
+        "@types/lodash.isequal": "^4.5.7",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "ts-jest": "^29.1.1",

package/src/ExtendUtils.ts

@@ -81,7 +81,7 @@ export namespace ExtendUtils {
      */
     export function sleep(delay = 0) {
         return new Promise<void>((resolve) => {
-            waitFor(() => resolve, delay);
+            waitFor(resolve, delay);
         });
     }
 

package/src/NumberUtils.ts

@@ -106,20 +106,35 @@ export namespace NumberUtils {
     }
 
     /**
-     * Parse float value
+     * Parse number
      * @param rawData Raw data
      */
-    export const parse = (rawData: unknown): number => {
-        if (rawData == null) {
-            return Number.NaN;
+    export function parse(rawData: unknown): number | undefined;
+
+    /**
+     * Parse number with default value
+     * @param rawData Raw data
+     * @param defaultValue Default value
+     */
+    export function parse(rawData: unknown, defaultValue: number): number;
+
+    export function parse(
+        rawData: unknown,
+        defaultValue?: number
+    ): number | undefined {
+        if (rawData == null || rawData === '') {
+            return defaultValue;
         }
 
         if (typeof rawData === 'number') {
+            if (isNaN(rawData)) return defaultValue;
             return rawData;
         }
 
-        return parseFloat(rawData.toString());
-    };
+        const p = parseFloat(rawData.toString());
+        if (isNaN(p)) return defaultValue;
+        return p;
+    }
 
     /**
      * Parse float value and unit