@etsoo/shared 1.1.94 → 1.1.96

package/README.md

@@ -231,6 +231,7 @@ Numbers related utilities
 |---:|---|
 |format|Format number|
 |formatMoney|Format money number|
+|getCurrencySymbol|Get currency symbol or name from ISO code|
 |parse|Parse float value|
 |toExact|To the exact precision number avoiding precision lost|
 

package/__tests__/DateUtils.ts

@@ -71,6 +71,12 @@ test('Tests for formatForInput', () => {
 
     const result41 = DateUtils.formatForInput(d, 'datetime-local');
     expect(result41).toBe('2021-06-06T20:08:45');
+
+    const result5 = DateUtils.formatForInput('');
+    expect(result5).toBeUndefined();
+
+    const result51 = DateUtils.formatForInput(null);
+    expect(result51).toBeUndefined();
 });
 
 test('Tests for isExpired', () => {

package/__tests__/NumberUtils.ts

@@ -11,6 +11,17 @@ test('Tests for formatMoney', () => {
     expect(NumberUtils.formatMoney(1282, 'CNY', 'zh-CN', true)).toBe('¥1,282');
 });
 
+test('Tests for getCurrencySymbol', () => {
+    expect(NumberUtils.getCurrencySymbol('CNY')).toBe('¥');
+    expect(NumberUtils.getCurrencySymbol('USD')).toBe('$');
+
+    // When locale = 'en-US' will be failed with '$'
+    expect(NumberUtils.getCurrencySymbol('USD', 'symbol', 'zh-CN')).toBe('US$');
+    expect(NumberUtils.getCurrencySymbol('CNY', 'name', 'zh-CN')).toBe(
+        '人民币'
+    );
+});
+
 test('Tests for parse', () => {
     expect(NumberUtils.parse('123')).toBe(123);
     expect(NumberUtils.parse(Object(123))).toBe(123);

package/lib/cjs/DateUtils.d.ts

@@ -49,7 +49,7 @@ export declare namespace DateUtils {
      * @param date Input date
      * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
-    function formatForInput(date?: Date | string | null, hasSecondOrType?: boolean | string): string;
+    function formatForInput(date?: Date | string | null, hasSecondOrType?: boolean | string): string | undefined;
     /**
      * Get month's days
      * @param year Year

package/lib/cjs/DateUtils.js

@@ -97,11 +97,12 @@ var DateUtils;
      * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
     function formatForInput(date, hasSecondOrType) {
+        // Return when null
+        if (date == null || date === '')
+            return undefined;
         // Parse string as date
         if (typeof date === 'string')
             date = new Date(date);
-        // Default is now
-        date !== null && date !== void 0 ? date : (date = new Date());
         const hasSecond = typeof hasSecondOrType === 'string'
             ? hasSecondOrType === 'date'
                 ? undefined

package/lib/cjs/NumberUtils.d.ts

@@ -26,6 +26,14 @@ export declare namespace NumberUtils {
      * @returns Result
      */
     function formatMoney(input: number | bigint, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): string;
+    /**
+     * Get currency symbol or name from ISO code
+     * @param code ISO currency code, like USD / CNY
+     * @param display Display format
+     * @param locale Locale
+     * @returns Result
+     */
+    function getCurrencySymbol(code: string, display?: 'symbol' | 'narrowSymbol' | 'name', locale?: string): string | undefined;
     /**
      * Parse float value
      * @param rawData Raw data

package/lib/cjs/NumberUtils.js

@@ -50,6 +50,25 @@ var NumberUtils;
         return format(input, locale, options);
     }
     NumberUtils.formatMoney = formatMoney;
+    /**
+     * Get currency symbol or name from ISO code
+     * @param code ISO currency code, like USD / CNY
+     * @param display Display format
+     * @param locale Locale
+     * @returns Result
+     */
+    function getCurrencySymbol(code, display = 'narrowSymbol', locale) {
+        var _a;
+        const formatter = new Intl.NumberFormat(locale, {
+            style: 'currency',
+            currency: code,
+            currencyDisplay: display
+        });
+        const parts = formatter.formatToParts();
+        const symbol = (_a = parts.find((part) => part.type === 'currency')) === null || _a === void 0 ? void 0 : _a.value;
+        return symbol;
+    }
+    NumberUtils.getCurrencySymbol = getCurrencySymbol;
     /**
      * Parse float value
      * @param rawData Raw data

package/lib/mjs/DateUtils.d.ts

@@ -49,7 +49,7 @@ export declare namespace DateUtils {
      * @param date Input date
      * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
-    function formatForInput(date?: Date | string | null, hasSecondOrType?: boolean | string): string;
+    function formatForInput(date?: Date | string | null, hasSecondOrType?: boolean | string): string | undefined;
     /**
      * Get month's days
      * @param year Year

package/lib/mjs/DateUtils.js

@@ -94,11 +94,12 @@ export var DateUtils;
      * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
     function formatForInput(date, hasSecondOrType) {
+        // Return when null
+        if (date == null || date === '')
+            return undefined;
         // Parse string as date
         if (typeof date === 'string')
             date = new Date(date);
-        // Default is now
-        date !== null && date !== void 0 ? date : (date = new Date());
         const hasSecond = typeof hasSecondOrType === 'string'
             ? hasSecondOrType === 'date'
                 ? undefined

package/lib/mjs/NumberUtils.d.ts

@@ -26,6 +26,14 @@ export declare namespace NumberUtils {
      * @returns Result
      */
     function formatMoney(input: number | bigint, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): string;
+    /**
+     * Get currency symbol or name from ISO code
+     * @param code ISO currency code, like USD / CNY
+     * @param display Display format
+     * @param locale Locale
+     * @returns Result
+     */
+    function getCurrencySymbol(code: string, display?: 'symbol' | 'narrowSymbol' | 'name', locale?: string): string | undefined;
     /**
      * Parse float value
      * @param rawData Raw data

package/lib/mjs/NumberUtils.js

@@ -47,6 +47,25 @@ export var NumberUtils;
         return format(input, locale, options);
     }
     NumberUtils.formatMoney = formatMoney;
+    /**
+     * Get currency symbol or name from ISO code
+     * @param code ISO currency code, like USD / CNY
+     * @param display Display format
+     * @param locale Locale
+     * @returns Result
+     */
+    function getCurrencySymbol(code, display = 'narrowSymbol', locale) {
+        var _a;
+        const formatter = new Intl.NumberFormat(locale, {
+            style: 'currency',
+            currency: code,
+            currencyDisplay: display
+        });
+        const parts = formatter.formatToParts();
+        const symbol = (_a = parts.find((part) => part.type === 'currency')) === null || _a === void 0 ? void 0 : _a.value;
+        return symbol;
+    }
+    NumberUtils.getCurrencySymbol = getCurrencySymbol;
     /**
      * Parse float value
      * @param rawData Raw data

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.94",
+    "version": "1.1.96",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -58,8 +58,8 @@
         "@types/lodash.isequal": "^4.5.6",
         "jest": "^29.5.0",
         "jest-environment-jsdom": "^29.5.0",
-        "ts-jest": "^29.0.5",
-        "typescript": "^5.0.2"
+        "ts-jest": "^29.1.0",
+        "typescript": "^5.0.3"
     },
     "dependencies": {
         "lodash.isequal": "^4.5.0"

package/src/DateUtils.ts

@@ -153,12 +153,12 @@ export namespace DateUtils {
         date?: Date | string | null,
         hasSecondOrType?: boolean | string
     ) {
+        // Return when null
+        if (date == null || date === '') return undefined;
+
         // Parse string as date
         if (typeof date === 'string') date = new Date(date);
 
-        // Default is now
-        date ??= new Date();
-
         const hasSecond =
             typeof hasSecondOrType === 'string'
                 ? hasSecondOrType === 'date'

package/src/NumberUtils.ts

@@ -66,6 +66,30 @@ export namespace NumberUtils {
         return format(input, locale, options);
     }
 
+    /**
+     * Get currency symbol or name from ISO code
+     * @param code ISO currency code, like USD / CNY
+     * @param display Display format
+     * @param locale Locale
+     * @returns Result
+     */
+    export function getCurrencySymbol(
+        code: string,
+        display: 'symbol' | 'narrowSymbol' | 'name' = 'narrowSymbol',
+        locale?: string
+    ): string | undefined {
+        const formatter = new Intl.NumberFormat(locale, {
+            style: 'currency',
+            currency: code,
+            currencyDisplay: display
+        });
+
+        const parts = formatter.formatToParts();
+        const symbol = parts.find((part) => part.type === 'currency')?.value;
+
+        return symbol;
+    }
+
     /**
      * Parse float value
      * @param rawData Raw data