Skip to content

Open source personal finance application

fix(calculator): decimal from empty state shows 0.5 instead of .5, round division results

Ilya Komichev58e01ea3f05b
diff --git a/app/components/trnForm/utils/calculate.test.ts b/app/components/trnForm/utils/calculate.test.ts
index 987c7313..d4dd39bb 100644
--- a/app/components/trnForm/utils/calculate.test.ts
+++ b/app/components/trnForm/utils/calculate.test.ts
@@ -29,7 +29,7 @@ describe('calculator utils', () => {
expect(evaluateExpression('1.5+2.5')).toBe(4)
expect(evaluateExpression('10.5*2')).toBe(21)
expect(evaluateExpression('7.5/2.5')).toBe(3)
- expect(evaluateExpression('0.1+0.2')).toBeCloseTo(0.3)
+ expect(evaluateExpression('0.1+0.2')).toBe(0.3)
})
it('strips spaces and commas', () => {
@@ -64,6 +64,17 @@ describe('calculator utils', () => {
expect(evaluateExpression('9007199254740992*2')).toBe(0)
})
+ it('rounds to 8 decimal places to avoid floating-point noise', () => {
+ expect(evaluateExpression('10/3')).toBe(3.33333333)
+ expect(evaluateExpression('1/7')).toBe(0.14285714)
+ expect(evaluateExpression('0.1+0.2')).toBe(0.3)
+ })
+
+ it('does not round integers', () => {
+ expect(evaluateExpression('999999999')).toBe(999999999)
+ expect(evaluateExpression('100*100')).toBe(10000)
+ })
+
it('single number', () => {
expect(evaluateExpression('42')).toBe(42)
expect(evaluateExpression('0')).toBe(0)
@@ -136,6 +147,10 @@ describe('calculator utils', () => {
expect(createExpressionString('.', '10*')).toBe('10*0.')
})
+ it('adds 0. from empty expression', () => {
+ expect(createExpressionString('.', '')).toBe('0.')
+ })
+
it('does not add to number that already has decimal', () => {
expect(createExpressionString('.', '3.14')).toBe('3.14')
})
@@ -257,6 +272,25 @@ describe('calculator utils', () => {
expect(expr).toBe('20')
})
+ it('decimal from empty: .5 becomes 0.5', () => {
+ let expr = ''
+ expr = createExpressionString('.', expr) // '0.'
+ expect(expr).toBe('0.')
+ expr = createExpressionString('5', expr) // '0.5'
+ expr = createExpressionString('=', expr) // '0.5'
+ expect(expr).toBe('0.5')
+ })
+
+ it('division result is rounded: 10/3=', () => {
+ let expr = '0'
+ expr = createExpressionString('1', expr)
+ expr = createExpressionString('0', expr)
+ expr = createExpressionString('/', expr)
+ expr = createExpressionString('3', expr)
+ expr = createExpressionString('=', expr)
+ expect(expr).toBe('3.33333333')
+ })
+
it('decimal workflow: 0.5+1.5=', () => {
let expr = '0'
expr = createExpressionString('.', expr) // '0.'
diff --git a/app/components/trnForm/utils/calculate.ts b/app/components/trnForm/utils/calculate.ts
index 814d5537..d01b19a3 100644
--- a/app/components/trnForm/utils/calculate.ts
+++ b/app/components/trnForm/utils/calculate.ts
@@ -79,7 +79,11 @@ export function evaluateExpression(value: string): number {
const result = parseExpr()
- return Number.isFinite(result) && result <= Number.MAX_SAFE_INTEGER ? Math.abs(result) : 0
+ if (!Number.isFinite(result) || Math.abs(result) > Number.MAX_SAFE_INTEGER)
+ return 0
+
+ const abs = Math.abs(result)
+ return Number.isInteger(abs) ? abs : +abs.toFixed(config.decimalPlaces)
}
catch {
return 0
@@ -92,7 +96,7 @@ function handleDecimalPoint(expression: string, lastChar: string): string {
if (currentNumber.includes('.') || lastChar === '.')
return expression
- if (isOperator(lastChar))
+ if (!expression || isOperator(lastChar))
return `${expression}0.`
return `${expression}.`