feat(money): one decimals setting for the dataset, not one per currency
`Settings.digits` replaces `CurrencyDef.digits`. Every amount rounds to it, whatever its currency, and `digitsFor` is gone: the sixteen call sites read the setting, and the domain functions that took a currency table purely to look digits up take a `digits: number` instead. Schema 6. The owner asked for this with the cost in front of them, and the cost is real: a dataset mixing minor units cannot be described any more. Yen at 0 beside kroner at 2 has no correct global value — 2 gives ¥1234.56, an amount yen cannot represent; 0 rounds 49.95 DKK to 50 and drifts the carry from the bank. Nothing in the app warns. docs/specs/2026-09-02-global-decimals-design.md argues it in full, including what re-adding a per-currency override would take, and AGENTS.md §1 now says not to reintroduce one without revisiting the decision. The 5 -> 6 step takes the MAXIMUM of the per-currency digits, not the base currency's. A dataset holding a three-decimal currency already has three-decimal amounts in it, and adopting the base's 2 would truncate the next edit of one; the maximum can only keep more precision, never less. On every dataset this app has written all four currencies record 2, so nothing rounds differently than before. Changing the setting does not rewrite stored amounts. 49.95 stays 49.95 and shows as 50; totals recompute at the new precision. Rewriting each Money is a destructive whole-dataset write, which §1 owes a backup export first, and it is lossy one way. Display turned out to be the hole in the plan. src/ui/format.ts pinned minimumFractionDigits: 2 in a module-level Intl.NumberFormat, so it never read the dataset at all — equally broken under per-currency digits, where a JPY rendered "3,333.00", so a pre-existing gap rather than a regression. Shipping a Settings control that display ignores would look broken at 0 and be lossy at 3, hiding precision the dataset holds. So format.ts takes digits like roundMoney does, useMoneyFormat() binds them for the 64 call sites, and postRowCells takes the formatter as an argument because it is a plain helper, not a component. currencyDigits.test.ts is rewritten rather than deleted. Driving a dataset at ZERO decimals through rounding, both FX directions, both split modes, plan division, the fold and the month view still tells a real implementation from one assuming 2 — it just cannot prove per-currency flow, because there is none. It also asserts that raising the setting to 2 changes what the fold produces. Verified in Chrome, not only in tests: a v5 dataset with digits 2/0/3 written straight into IndexedDB migrates to a setting of 3, the table loses its Decimals column, and editing the control persists schema 6 with digits stripped from each currency and income left at 20000.55. The same month reads 600/206 at zero decimals and 600.000/205.561 at three, so the figures recompute rather than merely reformat. Not verified here: the .ods in a real spreadsheet. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
This commit is contained in:
co-authored by
Claude Opus 5
parent
ebef56eef4
commit
8d2b2ca881
@@ -223,3 +223,33 @@ describe("rule versions on import", () => {
|
||||
expect(() => parseDatasetJson(JSON.stringify(data))).toThrow(/everySecondTuesday/);
|
||||
});
|
||||
});
|
||||
|
||||
describe("the decimal-places setting on import", () => {
|
||||
test("a valid setting round-trips", () => {
|
||||
const data = populated();
|
||||
data.settings.digits = 0;
|
||||
expect(parseDatasetJson(exportDatasetJson(data)).settings.digits).toBe(0);
|
||||
});
|
||||
|
||||
test.each([
|
||||
["missing", undefined],
|
||||
["fractional", 1.5],
|
||||
["negative", -1],
|
||||
["beyond four places", 5],
|
||||
["a string", "2"],
|
||||
])("a %s setting is refused", (_label, value) => {
|
||||
const data = populated() as any;
|
||||
if (value === undefined) delete data.settings.digits;
|
||||
else data.settings.digits = value;
|
||||
expect(() => parseDatasetJson(JSON.stringify(data))).toThrow(ImportValidationError);
|
||||
});
|
||||
|
||||
test("a per-currency digits left over in a hand-edited file is ignored, not refused", () => {
|
||||
// An unknown field is not a reason to refuse the owner's only backup.
|
||||
const data = populated() as any;
|
||||
data.currencies[0].digits = 3;
|
||||
const out = parseDatasetJson(JSON.stringify(data));
|
||||
expect("digits" in out.currencies[0]!).toBe(false);
|
||||
expect(out.settings.digits).toBe(2);
|
||||
});
|
||||
});
|
||||
|
||||
+19
-9
@@ -59,8 +59,13 @@ const CURRENCY_CODE = /^[A-Z]{2,8}$/;
|
||||
|
||||
/**
|
||||
* Validates the currency table itself, before anything is checked against it.
|
||||
* A table with a duplicate code would make `digitsFor` resolve arbitrarily,
|
||||
* and a non-integer or absurd `digits` would round money to nonsense.
|
||||
* A duplicate code would make two definitions compete for the same identity —
|
||||
* the code keys the FX table and every stored Money.
|
||||
*
|
||||
* Decimal places are NOT checked here any more: they are one dataset-wide
|
||||
* setting, validated below. A per-currency `digits` surviving in a hand-edited
|
||||
* file is dropped rather than refused — an unknown field is no reason to turn
|
||||
* away the owner's only backup.
|
||||
*/
|
||||
function requireCurrencyTable(data: Record<string, unknown>): CurrencyDef[] {
|
||||
const raw = data.currencies;
|
||||
@@ -88,12 +93,6 @@ function requireCurrencyTable(data: Record<string, unknown>): CurrencyDef[] {
|
||||
}
|
||||
seen.add(code);
|
||||
|
||||
const digits = entry.digits;
|
||||
if (typeof digits !== "number" || !Number.isInteger(digits) || digits < 0 || digits > 4) {
|
||||
throw new ImportValidationError(
|
||||
`Currency "${code}" has invalid decimal places ${String(digits)}; expected an integer 0-4`,
|
||||
);
|
||||
}
|
||||
if (entry.symbol !== undefined && typeof entry.symbol !== "string") {
|
||||
throw new ImportValidationError(`Currency "${code}" has a non-string symbol`);
|
||||
}
|
||||
@@ -103,7 +102,6 @@ function requireCurrencyTable(data: Record<string, unknown>): CurrencyDef[] {
|
||||
|
||||
table.push({
|
||||
code,
|
||||
digits,
|
||||
...(typeof entry.symbol === "string" ? { symbol: entry.symbol } : {}),
|
||||
...(typeof entry.name === "string" ? { name: entry.name } : {}),
|
||||
});
|
||||
@@ -145,6 +143,10 @@ export function parseDatasetJson(text: string): Dataset {
|
||||
|
||||
const data = dataset as unknown as Record<string, unknown>;
|
||||
const currencies = requireCurrencyTable(data);
|
||||
// The validated table replaces the raw one, so what comes back is normalised:
|
||||
// trimmed symbols and names, and no stray per-currency `digits` left over
|
||||
// from a hand-edited or pre-v6 file.
|
||||
dataset.currencies = currencies;
|
||||
const defined = new Set(currencies.map((currency) => currency.code));
|
||||
requireArray(data, "posts");
|
||||
requireArray(data, "months");
|
||||
@@ -152,6 +154,14 @@ export function parseDatasetJson(text: string): Dataset {
|
||||
requireArray(data, "fxRates");
|
||||
|
||||
requireCurrency(dataset.settings.baseCurrency, "settings.baseCurrency", defined);
|
||||
// One setting, every currency. Bad digits here would round every amount in
|
||||
// the dataset to nonsense, so this is checked before anything is folded.
|
||||
const digits = dataset.settings.digits;
|
||||
if (typeof digits !== "number" || !Number.isInteger(digits) || digits < 0 || digits > 4) {
|
||||
throw new ImportValidationError(
|
||||
`settings.digits is ${String(digits)}; expected a whole number of decimal places between 0 and 4`,
|
||||
);
|
||||
}
|
||||
if (!MONTH_ID.test(dataset.settings.foldStartMonth)) {
|
||||
throw new ImportValidationError(
|
||||
`Invalid foldStartMonth "${dataset.settings.foldStartMonth}"`,
|
||||
|
||||
+2
-3
@@ -2,7 +2,6 @@ import { zipSync, strToU8 } from "fflate";
|
||||
import { chargesForPurchaseInMonth, sliceAmountForMonth } from "../domain/charges.ts";
|
||||
import { monthRange } from "../domain/months.ts";
|
||||
import { roundMoney } from "../domain/money.ts";
|
||||
import { digitsFor } from "../domain/currencies.ts";
|
||||
import { datasetMonthSpan, monthView, summaryView } from "../domain/views.ts";
|
||||
import type { MonthViewModel } from "../domain/views.ts";
|
||||
import type { PostMonthFigures } from "../domain/fold.ts";
|
||||
@@ -32,7 +31,7 @@ function summarySheet(dataset: Dataset, months: MonthId[], byMonth: FiguresByMon
|
||||
rows.push([
|
||||
text(post.name),
|
||||
...perMonth.map(num),
|
||||
num(roundMoney(perMonth.reduce((a, b) => a + b, 0), digitsFor(dataset.currencies, base))),
|
||||
num(roundMoney(perMonth.reduce((a, b) => a + b, 0), dataset.settings.digits)),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -88,7 +87,7 @@ function purchasesSheet(dataset: Dataset, months: MonthId[]): Sheet {
|
||||
monthId,
|
||||
base,
|
||||
dataset.fxRates,
|
||||
dataset.currencies,
|
||||
dataset.settings.digits,
|
||||
);
|
||||
for (const charge of charges) {
|
||||
rows.push([
|
||||
|
||||
Reference in New Issue
Block a user