From 67960922d0046f04f06da32f1652b3489aa8cb7c Mon Sep 17 00:00:00 2001 From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com> Date: Wed, 8 Oct 2025 18:33:18 +0530 Subject: [PATCH 1/3] fix: display 0 instead of negative usage values --- src/lib/layout/usage.svelte | 2 +- src/lib/layout/usageMultiple.svelte | 5 ++- .../usage/[[invoice]]/+page.svelte | 23 +++++++---- .../overview/+layout.svelte | 10 ++--- .../settings/usage/[[invoice]]/+page.svelte | 39 ++++++++++++------- .../deployments/deploymentMetrics.svelte | 5 ++- 6 files changed, 55 insertions(+), 29 deletions(-) diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte index 9f5889b04..b084fb626 100644 --- a/src/lib/layout/usage.svelte +++ b/src/lib/layout/usage.svelte @@ -119,7 +119,7 @@ {#if count} - {formatNumberWithCommas(total)} + {formatNumberWithCommas(Math.max(0, total))} {countMetadata.title}
diff --git a/src/lib/layout/usageMultiple.svelte b/src/lib/layout/usageMultiple.svelte index 421b0892b..bc8bc8734 100644 --- a/src/lib/layout/usageMultiple.svelte +++ b/src/lib/layout/usageMultiple.svelte @@ -41,7 +41,10 @@ {#if count} - {@const totalCount = total.reduce((a, b) => a + b, 0)} + {@const totalCount = Math.max( + 0, + total.reduce((a, b) => a + b, 0) + )} {formatNumberWithCommas(totalCount)} diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte index a9422df60..b947a1102 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte @@ -445,24 +445,31 @@ {#if data.organizationUsage.storageTotal} {@const totalGbHours = mbSecondsToGBHours( - data.organizationUsage.executionsMBSecondsTotal + - data.organizationUsage.buildsMBSecondsTotal + Math.max( + 0, + data.organizationUsage.executionsMBSecondsTotal + + data.organizationUsage.buildsMBSecondsTotal + ) )} {@const progressBarStorageDate = [ { - size: mbSecondsToGBHours(data.organizationUsage.executionsMBSecondsTotal), + size: mbSecondsToGBHours( + Math.max(0, data.organizationUsage.executionsMBSecondsTotal) + ), color: '#85DBD8', tooltip: { title: 'Executions', - label: `${(Math.round(mbSecondsToGBHours(data.organizationUsage.executionsMBSecondsTotal) * 100) / 100).toLocaleString('en-US')} GB hours` + label: `${(Math.round(mbSecondsToGBHours(Math.max(0, data.organizationUsage.executionsMBSecondsTotal)) * 100) / 100).toLocaleString('en-US')} GB hours` } }, { - size: mbSecondsToGBHours(data.organizationUsage.buildsMBSecondsTotal), + size: mbSecondsToGBHours( + Math.max(0, data.organizationUsage.buildsMBSecondsTotal) + ), color: '#FE9567', tooltip: { title: 'Deployments', - label: `${(Math.round(mbSecondsToGBHours(data.organizationUsage.buildsMBSecondsTotal) * 100) / 100).toLocaleString('en-US')} GB hours` + label: `${(Math.round(mbSecondsToGBHours(Math.max(0, data.organizationUsage.buildsMBSecondsTotal)) * 100) / 100).toLocaleString('en-US')} GB hours` } } ]} @@ -505,7 +512,9 @@ - {formatNumberWithCommas(data.organizationUsage.authPhoneTotal)} + {formatNumberWithCommas( + Math.max(0, data.organizationUsage.authPhoneTotal) + )} OTPs diff --git a/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte index 44027867a..efeb8da3e 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte @@ -4,7 +4,7 @@ export function totalMetrics(set: Array): number { if (!set) return 0; - return total((set as Metric[]).map((c) => c.value)); + return Math.max(0, total((set as Metric[]).map((c) => c.value))); } @@ -100,7 +100,7 @@ {#if $usage} - {@const storage = humanFileSize($usage.filesStorageTotal ?? 0)} + {@const storage = humanFileSize(Math.max(0, $usage.filesStorageTotal ?? 0))} - {formatNum($usage.documentsTotal ?? 0)} + {formatNum(Math.max(0, $usage.documentsTotal ?? 0))} Rows
@@ -177,7 +177,7 @@
- {formatNum($usage.usersTotal ?? 0)} + {formatNum(Math.max(0, $usage.usersTotal ?? 0))} Users
@@ -199,7 +199,7 @@
- {formatNum($usage.executionsTotal ?? 0)} + {formatNum(Math.max(0, $usage.executionsTotal ?? 0))} Executions
diff --git a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte index 31fc89017..d0cf04644 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte @@ -24,10 +24,12 @@ $: usersTotal = data.usage.usersTotal; $: executions = data.usage.executions; $: executionsTotal = data.usage.executionsTotal; - $: storage = + $: storage = Math.max( + 0, data.usage.filesStorageTotal + - data.usage.deploymentsStorageTotal + - data.usage.buildsStorageTotal; + data.usage.deploymentsStorageTotal + + data.usage.buildsStorageTotal + ); $: imageTransformations = data.usage.imageTransformations; $: imageTransformationsTotal = data.usage.imageTransformationsTotal; $: dbReads = data.usage.databasesReads; @@ -36,11 +38,17 @@ $: legendData = [ { name: 'Reads', - value: data.usage.databasesReads.reduce((sum, item) => sum + item.value, 0) + value: Math.max( + 0, + data.usage.databasesReads.reduce((sum, item) => sum + item.value, 0) + ) }, { name: 'Writes', - value: data.usage.databasesWrites.reduce((sum, item) => sum + item.value, 0) + value: Math.max( + 0, + data.usage.databasesWrites.reduce((sum, item) => sum + item.value, 0) + ) } ]; @@ -132,7 +140,7 @@ Total user in your project. {#if users} - {@const current = formatNum(usersTotal)} + {@const current = formatNum(Math.max(0, usersTotal))} {current} @@ -208,7 +216,7 @@ Total unique image transformations in your project. {#if imageTransformations} - {@const current = formatNum(imageTransformationsTotal)} + {@const current = formatNum(Math.max(0, imageTransformationsTotal))}

@@ -246,7 +254,7 @@ Calculated for all functions that are executed in this project. {#if executions} - {@const current = formatNum(executionsTotal)} + {@const current = formatNum(Math.max(0, executionsTotal))} {current} @@ -356,23 +364,26 @@ {#if data.usage.executionsMbSecondsTotal} {@const totalGbHours = mbSecondsToGBHours( - data.usage.executionsMbSecondsTotal + data.usage.buildsMbSecondsTotal + Math.max( + 0, + data.usage.executionsMbSecondsTotal + data.usage.buildsMbSecondsTotal + ) )} {@const progressBarStorageDate = [ { - size: mbSecondsToGBHours(data.usage.executionsMbSecondsTotal), + size: mbSecondsToGBHours(Math.max(0, data.usage.executionsMbSecondsTotal)), color: '#85DBD8', tooltip: { title: 'Executions', - label: `${(Math.round(mbSecondsToGBHours(data.usage.executionsMbSecondsTotal) * 100) / 100).toLocaleString('en-US')} GB hours` + label: `${(Math.round(mbSecondsToGBHours(Math.max(0, data.usage.executionsMbSecondsTotal)) * 100) / 100).toLocaleString('en-US')} GB hours` } }, { - size: mbSecondsToGBHours(data.usage.buildsMbSecondsTotal), + size: mbSecondsToGBHours(Math.max(0, data.usage.buildsMbSecondsTotal)), color: '#FE9567', tooltip: { title: 'Deployments', - label: `${(Math.round(mbSecondsToGBHours(data.usage.buildsMbSecondsTotal) * 100) / 100).toLocaleString('en-US')} GB hours` + label: `${(Math.round(mbSecondsToGBHours(Math.max(0, data.usage.buildsMbSecondsTotal)) * 100) / 100).toLocaleString('en-US')} GB hours` } } ]} @@ -405,7 +416,7 @@

- {formatNumberWithCommas(data.usage.authPhoneTotal)} + {formatNumberWithCommas(Math.max(0, data.usage.authPhoneTotal))} OTPs diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte index 6a3fbb1e0..cdb59c7c5 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte @@ -84,7 +84,10 @@ metric.value = time !== '0s' ? time : '-'; } else { - metric.value = usage[metric.id] ?? '-'; + metric.value = + usage[metric.id] !== undefined + ? Math.max(0, usage[metric.id]).toString() + : '-'; } return metric; }); From 242a2649c1d3ddab23abea03fc32fd5f421e7892 Mon Sep 17 00:00:00 2001 From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com> Date: Thu, 9 Oct 2025 11:38:39 +0530 Subject: [PATCH 2/3] used helper functions and expanded current ones --- src/lib/helpers/numbers.ts | 27 ++++++++++-- src/lib/helpers/string.ts | 5 ++- src/lib/layout/usage.svelte | 2 +- src/lib/layout/usageMultiple.svelte | 7 +--- .../usage/[[invoice]]/+page.svelte | 23 ++++------- .../overview/+layout.svelte | 11 ++--- .../settings/usage/[[invoice]]/+page.svelte | 41 +++++++------------ .../deployments/deploymentMetrics.svelte | 3 +- 8 files changed, 59 insertions(+), 60 deletions(-) diff --git a/src/lib/helpers/numbers.ts b/src/lib/helpers/numbers.ts index ce1c0a0bb..43309650e 100644 --- a/src/lib/helpers/numbers.ts +++ b/src/lib/helpers/numbers.ts @@ -18,21 +18,40 @@ export function toDecimals(num: number, decimals: number = 1): number { return parseFloat(num.toFixed(decimals)); } -export function formatNumberWithCommas(number: number): string { +export function formatNumberWithCommas(number: number, min: number = 0): string { if (isNaN(number)) return String(number); + const value = Math.max(min, number); const formatter = new Intl.NumberFormat('en'); - return formatter.format(number); + return formatter.format(value); } -export function formatCurrency(number: number, locale = 'en-US', currency = 'USD'): string { +export function formatCurrency( + number: number, + locale = 'en-US', + currency = 'USD', + min: number = 0 +): string { if (isNaN(number)) return String(number); + const value = Math.max(min, number); const formatter = new Intl.NumberFormat(locale, { style: 'currency', currency }); - return formatter.format(number); + return formatter.format(value); } export function isWithinSafeRange(val: number) { return Math.abs(val) < Number.MAX_SAFE_INTEGER; } + +/** + * Clamps a number to a minimum value + * + * @export + * @param {number} value + * @param {number} min + * @returns {number} + */ +export function clampMin(value: number, min: number = 0): number { + return Math.max(min, value || 0); +} diff --git a/src/lib/helpers/string.ts b/src/lib/helpers/string.ts index 91dd9a37c..77df5102f 100644 --- a/src/lib/helpers/string.ts +++ b/src/lib/helpers/string.ts @@ -45,8 +45,9 @@ const formatter = Intl.NumberFormat('en', { notation: 'compact' }); -export function formatNum(number: number): string { - return formatter.format(number); +export function formatNum(number: number, min: number = 0): string { + const value = Math.max(min, number); + return formatter.format(value); } /** diff --git a/src/lib/layout/usage.svelte b/src/lib/layout/usage.svelte index b084fb626..9f5889b04 100644 --- a/src/lib/layout/usage.svelte +++ b/src/lib/layout/usage.svelte @@ -119,7 +119,7 @@ {#if count} - {formatNumberWithCommas(Math.max(0, total))} + {formatNumberWithCommas(total)} {countMetadata.title}
diff --git a/src/lib/layout/usageMultiple.svelte b/src/lib/layout/usageMultiple.svelte index bc8bc8734..85f5091ca 100644 --- a/src/lib/layout/usageMultiple.svelte +++ b/src/lib/layout/usageMultiple.svelte @@ -4,7 +4,7 @@ import { Card, SecondaryTabs, SecondaryTabsItem } from '$lib/components'; import { page } from '$app/state'; import { type Models } from '@appwrite.io/console'; - import { formatNumberWithCommas } from '$lib/helpers/numbers'; + import { formatNumberWithCommas, clampMin } from '$lib/helpers/numbers'; import { Layout, Typography } from '@appwrite.io/pink-svelte'; export let title: string; @@ -41,10 +41,7 @@ {#if count} - {@const totalCount = Math.max( - 0, - total.reduce((a, b) => a + b, 0) - )} + {@const totalCount = clampMin(total.reduce((a, b) => a + b, 0))} {formatNumberWithCommas(totalCount)} diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte index b947a1102..a9422df60 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte @@ -445,31 +445,24 @@ {#if data.organizationUsage.storageTotal} {@const totalGbHours = mbSecondsToGBHours( - Math.max( - 0, - data.organizationUsage.executionsMBSecondsTotal + - data.organizationUsage.buildsMBSecondsTotal - ) + data.organizationUsage.executionsMBSecondsTotal + + data.organizationUsage.buildsMBSecondsTotal )} {@const progressBarStorageDate = [ { - size: mbSecondsToGBHours( - Math.max(0, data.organizationUsage.executionsMBSecondsTotal) - ), + size: mbSecondsToGBHours(data.organizationUsage.executionsMBSecondsTotal), color: '#85DBD8', tooltip: { title: 'Executions', - label: `${(Math.round(mbSecondsToGBHours(Math.max(0, data.organizationUsage.executionsMBSecondsTotal)) * 100) / 100).toLocaleString('en-US')} GB hours` + label: `${(Math.round(mbSecondsToGBHours(data.organizationUsage.executionsMBSecondsTotal) * 100) / 100).toLocaleString('en-US')} GB hours` } }, { - size: mbSecondsToGBHours( - Math.max(0, data.organizationUsage.buildsMBSecondsTotal) - ), + size: mbSecondsToGBHours(data.organizationUsage.buildsMBSecondsTotal), color: '#FE9567', tooltip: { title: 'Deployments', - label: `${(Math.round(mbSecondsToGBHours(Math.max(0, data.organizationUsage.buildsMBSecondsTotal)) * 100) / 100).toLocaleString('en-US')} GB hours` + label: `${(Math.round(mbSecondsToGBHours(data.organizationUsage.buildsMBSecondsTotal) * 100) / 100).toLocaleString('en-US')} GB hours` } } ]} @@ -512,9 +505,7 @@ - {formatNumberWithCommas( - Math.max(0, data.organizationUsage.authPhoneTotal) - )} + {formatNumberWithCommas(data.organizationUsage.authPhoneTotal)} OTPs diff --git a/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte index efeb8da3e..4c6fb4341 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/+layout.svelte @@ -1,10 +1,11 @@ @@ -100,7 +101,7 @@ {#if $usage} - {@const storage = humanFileSize(Math.max(0, $usage.filesStorageTotal ?? 0))} + {@const storage = humanFileSize($usage.filesStorageTotal ?? 0)} - {formatNum(Math.max(0, $usage.documentsTotal ?? 0))} + {formatNum($usage.documentsTotal ?? 0)} Rows
@@ -177,7 +178,7 @@
- {formatNum(Math.max(0, $usage.usersTotal ?? 0))} + {formatNum($usage.usersTotal ?? 0)} Users
@@ -199,7 +200,7 @@
- {formatNum(Math.max(0, $usage.executionsTotal ?? 0))} + {formatNum($usage.executionsTotal ?? 0)} Executions
diff --git a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte index d0cf04644..76d4d5e1e 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte @@ -10,7 +10,7 @@ import { total } from '$lib/layout/usage.svelte'; import { BillingPlan } from '$lib/constants.js'; import { base } from '$app/paths'; - import { formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers'; + import { formatCurrency, formatNumberWithCommas, clampMin } from '$lib/helpers/numbers'; import { getCountryName } from '$lib/helpers/diallingCodes.js'; import { Accordion, Icon, Layout, Link, Table, Typography } from '@appwrite.io/pink-svelte'; import { IconChartSquareBar } from '@appwrite.io/pink-icons-svelte'; @@ -24,12 +24,10 @@ $: usersTotal = data.usage.usersTotal; $: executions = data.usage.executions; $: executionsTotal = data.usage.executionsTotal; - $: storage = Math.max( - 0, + $: storage = data.usage.filesStorageTotal + - data.usage.deploymentsStorageTotal + - data.usage.buildsStorageTotal - ); + data.usage.deploymentsStorageTotal + + data.usage.buildsStorageTotal; $: imageTransformations = data.usage.imageTransformations; $: imageTransformationsTotal = data.usage.imageTransformationsTotal; $: dbReads = data.usage.databasesReads; @@ -38,17 +36,11 @@ $: legendData = [ { name: 'Reads', - value: Math.max( - 0, - data.usage.databasesReads.reduce((sum, item) => sum + item.value, 0) - ) + value: clampMin(data.usage.databasesReads.reduce((sum, item) => sum + item.value, 0)) }, { name: 'Writes', - value: Math.max( - 0, - data.usage.databasesWrites.reduce((sum, item) => sum + item.value, 0) - ) + value: clampMin(data.usage.databasesWrites.reduce((sum, item) => sum + item.value, 0)) } ]; @@ -140,7 +132,7 @@ Total user in your project. {#if users} - {@const current = formatNum(Math.max(0, usersTotal))} + {@const current = formatNum(usersTotal)} {current} @@ -216,7 +208,7 @@ Total unique image transformations in your project. {#if imageTransformations} - {@const current = formatNum(Math.max(0, imageTransformationsTotal))} + {@const current = formatNum(imageTransformationsTotal)}

@@ -254,7 +246,7 @@ Calculated for all functions that are executed in this project. {#if executions} - {@const current = formatNum(Math.max(0, executionsTotal))} + {@const current = formatNum(executionsTotal)} {current} @@ -364,26 +356,23 @@ {#if data.usage.executionsMbSecondsTotal} {@const totalGbHours = mbSecondsToGBHours( - Math.max( - 0, - data.usage.executionsMbSecondsTotal + data.usage.buildsMbSecondsTotal - ) + data.usage.executionsMbSecondsTotal + data.usage.buildsMbSecondsTotal )} {@const progressBarStorageDate = [ { - size: mbSecondsToGBHours(Math.max(0, data.usage.executionsMbSecondsTotal)), + size: mbSecondsToGBHours(data.usage.executionsMbSecondsTotal), color: '#85DBD8', tooltip: { title: 'Executions', - label: `${(Math.round(mbSecondsToGBHours(Math.max(0, data.usage.executionsMbSecondsTotal)) * 100) / 100).toLocaleString('en-US')} GB hours` + label: `${(Math.round(mbSecondsToGBHours(data.usage.executionsMbSecondsTotal) * 100) / 100).toLocaleString('en-US')} GB hours` } }, { - size: mbSecondsToGBHours(Math.max(0, data.usage.buildsMbSecondsTotal)), + size: mbSecondsToGBHours(data.usage.buildsMbSecondsTotal), color: '#FE9567', tooltip: { title: 'Deployments', - label: `${(Math.round(mbSecondsToGBHours(Math.max(0, data.usage.buildsMbSecondsTotal)) * 100) / 100).toLocaleString('en-US')} GB hours` + label: `${(Math.round(mbSecondsToGBHours(data.usage.buildsMbSecondsTotal) * 100) / 100).toLocaleString('en-US')} GB hours` } } ]} @@ -416,7 +405,7 @@

- {formatNumberWithCommas(Math.max(0, data.usage.authPhoneTotal))} + {formatNumberWithCommas(data.usage.authPhoneTotal)} OTPs diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte index cdb59c7c5..731cd4513 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte @@ -9,6 +9,7 @@ import { UsageCard } from '$lib/components'; import { humanFileSize } from '$lib/helpers/sizeConvertion'; import { formatTimeDetailed } from '$lib/helpers/timeConversion'; + import { clampMin } from '$lib/helpers/numbers'; const now = new Date(); const rangeOptions = [ @@ -86,7 +87,7 @@ } else { metric.value = usage[metric.id] !== undefined - ? Math.max(0, usage[metric.id]).toString() + ? clampMin(usage[metric.id]).toString() : '-'; } return metric; From 460fc7870bff2e22060511eb86d55a8c079d1655 Mon Sep 17 00:00:00 2001 From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com> Date: Thu, 9 Oct 2025 11:58:16 +0530 Subject: [PATCH 3/3] used clamp inside expansion --- src/lib/helpers/numbers.ts | 6 ++---- src/lib/helpers/string.ts | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lib/helpers/numbers.ts b/src/lib/helpers/numbers.ts index 43309650e..a3ad303b5 100644 --- a/src/lib/helpers/numbers.ts +++ b/src/lib/helpers/numbers.ts @@ -20,9 +20,8 @@ export function toDecimals(num: number, decimals: number = 1): number { export function formatNumberWithCommas(number: number, min: number = 0): string { if (isNaN(number)) return String(number); - const value = Math.max(min, number); const formatter = new Intl.NumberFormat('en'); - return formatter.format(value); + return formatter.format(clampMin(number, min)); } export function formatCurrency( @@ -32,12 +31,11 @@ export function formatCurrency( min: number = 0 ): string { if (isNaN(number)) return String(number); - const value = Math.max(min, number); const formatter = new Intl.NumberFormat(locale, { style: 'currency', currency }); - return formatter.format(value); + return formatter.format(clampMin(number, min)); } export function isWithinSafeRange(val: number) { diff --git a/src/lib/helpers/string.ts b/src/lib/helpers/string.ts index 77df5102f..6f867f86c 100644 --- a/src/lib/helpers/string.ts +++ b/src/lib/helpers/string.ts @@ -1,3 +1,5 @@ +import { clampMin } from './numbers'; + /** * Capitalizes the first letter of a string * @@ -46,8 +48,7 @@ const formatter = Intl.NumberFormat('en', { }); export function formatNum(number: number, min: number = 0): string { - const value = Math.max(min, number); - return formatter.format(value); + return formatter.format(clampMin(number, min)); } /**