lychiyu/frequi_origin
1
0
Fork 0
mirror of https://github.com/freqtrade/frequi.git synced 2024-11-11 02:33:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve typing in numberformat

Browse Source
This commit is contained in:
Matthias 2023-04-14 18:27:01 +02:00
parent 2fdbe2bbc9
commit abc1277e4f
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/shared/formatters/numberformat.ts
View File

@ -1,9 +1,9 @@
export function isUndefined(val): boolean {
return val === undefined || val === null;
export function isNotUndefined<T>(val: T | undefined | null): val is T {
return !(val === undefined || val === null);
}
export function formatPercent(value: number, decimals = 3): string {
return !isUndefined(value) ? `${(value * 100).toFixed(decimals)}%` : '';
return isNotUndefined(value) ? `${(value * 100).toFixed(decimals)}%` : '';
}
/**
@ -12,10 +12,9 @@ export function formatPercent(value: number, decimals = 3): string {
* @param decimals number of decimals (Defaults to 15)
* @returns Formatted string
*/
export function formatPrice(value: number, decimals = 15): string {
export function formatPrice(value: number | null, decimals = 15): string {
// const format = new Intl.NumberFormat('', {maximumFractionDigits: decimals}
// return !isUndefined(value) ? parseFloat(value.toFixed(decimals)).toString() : '';
return !isUndefined(value)
return isNotUndefined(value)
? value.toLocaleString('fullwide', {
useGrouping: false,
maximumFractionDigits: decimals,
@ -30,12 +29,12 @@ export function formatPrice(value: number, decimals = 15): string {
* @param decimals Decimals
* @returns
*/
export function formatPriceCurrency(price, currency: string, decimals = 3) {
export function formatPriceCurrency(price: number | null, currency: string, decimals = 3) {
return `${formatPrice(price, decimals)} ${currency}`;
}
export default {
isUndefined,
isNotUndefined,
formatPrice,
formatPercent,
};

4
src/shared/formatters/timeformat.ts
View File

@ -1,7 +1,7 @@
import { parse, toDate } from 'date-fns';
import { format, utcToZonedTime, zonedTimeToUtc } from 'date-fns-tz';
import humanizeDuration from 'humanize-duration';
import { isUndefined } from './numberformat';
import { isNotUndefined } from './numberformat';
/** Parse date from string, returns date in UTC! */
export function dateFromString(datestring: string, format: string): Date {
@ -61,7 +61,7 @@ export function timestampToDateString(ts: number | Date): string {
* @param datestring Input string (in the format yyyy-MM-dd)
*/
export function dateStringToTimeRange(datestring: string): string {
return isUndefined(datestring) ? '' : datestring.replace(/-/g, '');
return isNotUndefined(datestring) ? datestring.replace(/-/g, '') : '';
}
export function timestampHour(ts: number): number {