@classytic/labs 0.6.0 → 0.7.0

package/dist/domains/accounting/club-subscriptions/model.mjs

@@ -1,4 +1,5 @@
 import { defineLabModel } from "../../../model/define.mjs";
+import { formatMoney } from "../../../model/money.mjs";
 import { refuse } from "../../../model/index.mjs";
 import { z } from "zod";
 import { CLUB_MEMBER_STATES, clubMemberCrossesYear, solveClubSubscriptions } from "@classytic/stage/finance/accounting";
@@ -112,7 +113,7 @@ const clubSubscriptionsModel = defineLabModel({
 	},
 	goals: { found: (r) => r.found },
 	witness: (s) => ({ picked: s.members.map((_, i) => s.crossers.has(i)) }),
-	describe: (s, _st, r) => `Cash ${s.unit}${r.cashReceived}, income ${s.unit}${r.subscriptionIncome}, ${r.pickedCount} of ${r.crossersCount} members found.`
+	describe: (s, _st, r) => `Cash ${formatMoney(r.cashReceived, { currency: s.unit })}, income ${formatMoney(r.subscriptionIncome, { currency: s.unit })}, ${r.pickedCount} of ${r.crossersCount} members found.`
 });
 
 //#endregion

package/dist/domains/accounting/club-subscriptions/runtime.mjs

@@ -1,5 +1,6 @@
 'use client';
 
+import { formatMoney } from "../../../model/money.mjs";
 import { useLab } from "../../../runtime/use-lab.mjs";
 import { AuthoredActivityRuntime } from "../../../kit/authored-activity-runtime.mjs";
 import { clubSubscriptionsModel } from "./model.mjs";
@@ -17,35 +18,22 @@ function ClubSubscriptions(props) {
 		sceneLabel: "A club membership register across three years",
 		status: ({ reading, scenario }) => /* @__PURE__ */ jsxs(Fragment, { children: [
 			/* @__PURE__ */ jsx("strong", { children: reading.found ? "That is the difference" : `Found ${reading.pickedCount} of ${reading.crossersCount}` }),
-			/* @__PURE__ */ jsxs("span", { children: [
-				"cash ",
-				scenario.unit,
-				reading.cashReceived
-			] }),
-			/* @__PURE__ */ jsxs("span", { children: [
-				"income ",
-				scenario.unit,
-				reading.subscriptionIncome
-			] }),
-			/* @__PURE__ */ jsxs("span", { children: [
-				"gap ",
-				scenario.unit,
-				Math.abs(reading.gap)
-			] })
+			/* @__PURE__ */ jsxs("span", { children: ["cash ", formatMoney(reading.cashReceived, { currency: scenario.unit })] }),
+			/* @__PURE__ */ jsxs("span", { children: ["income ", formatMoney(reading.subscriptionIncome, { currency: scenario.unit })] }),
+			/* @__PURE__ */ jsxs("span", { children: ["gap ", formatMoney(Math.abs(reading.gap), { currency: scenario.unit })] })
 		] }),
 		evidence: ({ reading, scenario }) => /* @__PURE__ */ jsxs("p", { children: [
 			/* @__PURE__ */ jsxs("strong", { children: [
 				"cash ",
-				scenario.unit,
-				reading.cashReceived,
-				" · income ",
-				scenario.unit,
-				reading.subscriptionIncome
+				formatMoney(reading.cashReceived, { currency: scenario.unit }),
+				" · income",
+				" ",
+				formatMoney(reading.subscriptionIncome, { currency: scenario.unit })
 			] }),
 			" ",
 			/* @__PURE__ */ jsx("span", { children: reading.found ? "income follows the cricket, not the cash" : "the same members, counted two different ways" })
 		] }),
-		observation: ({ reading, scenario }) => reading.found ? `Those ${reading.crossersCount} members are the whole of the ${scenario.unit}${Math.abs(reading.gap)} difference. Everyone else paid for this year during this year, so their cash and their income are the same ${scenario.unit.trim()} in the same column. The gap is not a formula. It is the arcs.` : `${scenario.members.length - reading.crossersCount} members paid for this year during this year and cannot cause a difference. Look for a coin and a square in different columns, or a coin nobody has paid.`,
+		observation: ({ reading, scenario }) => reading.found ? `Those ${reading.crossersCount} members are the whole of the ${formatMoney(Math.abs(reading.gap), { currency: scenario.unit })} difference. Everyone else paid for this year during this year, so their cash and their income are the same ${scenario.unit.trim()} in the same column. The gap is not a formula. It is the arcs.` : `${scenario.members.length - reading.crossersCount} members paid for this year during this year and cannot cause a difference. Look for a coin and a square in different columns, or a coin nobody has paid.`,
 		children: /* @__PURE__ */ jsx(ClubSubscriptionsScene, {})
 	});
 }

package/dist/domains/accounting/club-subscriptions/scene.mjs

@@ -1,9 +1,10 @@
 'use client';
 
+import { formatMoney } from "../../../model/money.mjs";
 import { STROKE } from "../../../kit/figure/figure.mjs";
 import { GripLock } from "../../../kit/figure/grip.mjs";
-import { useNarrow } from "../../../kit/figure/narrow.mjs";
 import { useLabView } from "../../../runtime/use-lab-view.mjs";
+import { useNarrow } from "../../../kit/figure/narrow.mjs";
 import { clubSubscriptionsModel } from "./model.mjs";
 import { useContext } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
@@ -22,8 +23,6 @@ const COL = 68;
 const ROW = 38;
 const CARD_COL = 46;
 const CARD_ROW = 32;
-const NUMBER = new Intl.NumberFormat("en-US", { maximumFractionDigits: 2 });
-const money = (v, unit) => `${unit}${NUMBER.format(v)}`;
 const STATE_LABEL = {
 	paid: "paid for this year, during this year",
 	arrearsSettled: "owed for last year, paid during this year",
@@ -274,7 +273,7 @@ function ClubSubscriptionsScene() {
 											padding: "3px 4px",
 											fontVariantNumeric: "tabular-nums"
 										},
-										children: r.debit ? money(r.debit, unit) : ""
+										children: r.debit ? formatMoney(r.debit, { currency: unit }) : ""
 									}),
 									/* @__PURE__ */ jsx("td", {
 										style: {
@@ -282,7 +281,7 @@ function ClubSubscriptionsScene() {
 											padding: "3px 4px",
 											fontVariantNumeric: "tabular-nums"
 										},
-										children: r.credit ? money(r.credit, unit) : ""
+										children: r.credit ? formatMoney(r.credit, { currency: unit }) : ""
 									})
 								]
 							}, r.label);
@@ -302,7 +301,7 @@ function ClubSubscriptionsScene() {
 										padding: "4px",
 										fontVariantNumeric: "tabular-nums"
 									},
-									children: money(sums.accountDebitTotal, unit)
+									children: formatMoney(sums.accountDebitTotal, { currency: unit })
 								}),
 								/* @__PURE__ */ jsx("td", {
 									style: {
@@ -310,7 +309,7 @@ function ClubSubscriptionsScene() {
 										padding: "4px",
 										fontVariantNumeric: "tabular-nums"
 									},
-									children: money(sums.accountCreditTotal, unit)
+									children: formatMoney(sums.accountCreditTotal, { currency: unit })
 								})
 							]
 						})] })]

package/dist/domains/accounting/company-statement-builder/activity.mjs

@@ -1,8 +1,8 @@
+import { formatMoney } from "../../../model/money.mjs";
 import { defineActivity } from "../../../runtime/activity.mjs";
 import { companyStatementBuilderModel } from "./model.mjs";
 
 //#region src/domains/accounting/company-statement-builder/activity.ts
-const money = (value, currency) => `${value < 0 ? "−" : ""}${currency}${Math.abs(value).toLocaleString()}`;
 /**
 * Explore first: change the dividend and see profit stay put while retained earnings move; then place
 * the dividend and the debentures, and reflect on dividend policy. Three separate model goals (`dividendPlaced`, `retained`, `debenturePlaced`)
@@ -21,7 +21,7 @@ const companyStatementBuilderActivity = defineActivity(companyStatementBuilderMo
 			id: "adjust",
 			phase: "act",
 			title: "Set a dividend policy",
-			lead: `Change the dividend paid to shareholders and watch profit for the year and retained earnings. Retain at least ${money(s.retentionTarget, s.currency)}.`,
+			lead: `Change the dividend paid to shareholders and watch profit for the year and retained earnings. Retain at least ${formatMoney(s.retentionTarget, { currency: s.currency })}.`,
 			controls: ["dividends"],
 			goal: "retained"
 		},

package/dist/domains/accounting/company-statement-builder/model.mjs

@@ -1,4 +1,5 @@
 import { defineLabModel } from "../../../model/define.mjs";
+import { formatMoney } from "../../../model/money.mjs";
 import { refuse } from "../../../model/index.mjs";
 import { z } from "zod";
 import { solveDividendSettledCompanyScenario } from "@classytic/stage/finance/accounting";
@@ -143,7 +144,7 @@ const companyStatementBuilderModel = defineLabModel({
 		dividendPicked: true,
 		debenturePicked: true
 	}),
-	describe: (s, st, r) => `Profit for the year is ${s.currency}${r.profitForYear}. Dividend paid is ${s.currency}${st.dividends}.`
+	describe: (s, st, r) => `Profit for the year is ${formatMoney(r.profitForYear, { currency: s.currency })}. Dividend paid is ${formatMoney(st.dividends, { currency: s.currency })}.`
 });
 
 //#endregion

package/dist/domains/accounting/company-statement-builder/runtime.mjs

@@ -1,5 +1,6 @@
 'use client';
 
+import { formatMoney } from "../../../model/money.mjs";
 import { Readout, Stat, StatList } from "../../../kit/frame.mjs";
 import { useLab } from "../../../runtime/use-lab.mjs";
 import { AuthoredActivityRuntime } from "../../../kit/authored-activity-runtime.mjs";
@@ -17,16 +18,16 @@ function CompanyStatementBuilder(props) {
 		layout: "stack",
 		sceneLabel: "Profit flowing into retained earnings and the statement of financial position",
 		evidence: ({ state, reading, scenario }) => /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Readout, {
-			value: `${scenario.currency}${reading.closingRetainedEarnings}`,
+			value: formatMoney(reading.closingRetainedEarnings, { currency: scenario.currency }),
 			sub: "closing retained earnings"
 		}), /* @__PURE__ */ jsxs(StatList, { children: [/* @__PURE__ */ jsx(Stat, {
 			label: "profit for year",
-			value: `${scenario.currency}${reading.profitForYear}`
+			value: formatMoney(reading.profitForYear, { currency: scenario.currency })
 		}), /* @__PURE__ */ jsx(Stat, {
 			label: "dividend",
-			value: `${scenario.currency}${state.dividends}`
+			value: formatMoney(state.dividends, { currency: scenario.currency })
 		})] })] }),
-		observation: ({ state, reading, scenario }) => state.dividends === scenario.base.dividendsDeclared ? undefined : `Dividend ${scenario.currency}${state.dividends.toLocaleString()}: profit for the year is still ${scenario.currency}${reading.profitForYear.toLocaleString()}, and retained earnings are ${scenario.currency}${reading.closingRetainedEarnings.toLocaleString()}.`,
+		observation: ({ state, reading, scenario }) => state.dividends === scenario.base.dividendsDeclared ? undefined : `Dividend ${formatMoney(state.dividends, { currency: scenario.currency })}: profit for the year is still ${formatMoney(reading.profitForYear, { currency: scenario.currency })}, and retained earnings are ${formatMoney(reading.closingRetainedEarnings, { currency: scenario.currency })}.`,
 		children: /* @__PURE__ */ jsx(CompanyStatementScene, {})
 	});
 }

package/dist/domains/accounting/company-statement-builder/scene.mjs

@@ -1,7 +1,8 @@
 'use client';
 
+import { formatMoney } from "../../../model/money.mjs";
 import { Stat, StatList } from "../../../kit/frame.mjs";
-import { useShell } from "../../../kit/shell/context.mjs";
+import { useShellMeta } from "../../../kit/shell/context.mjs";
 import { useLabView } from "../../../runtime/use-lab-view.mjs";
 import { companyStatementBuilderModel } from "./model.mjs";
 import { CompanyStatementScene as CompanyStatementScene$1 } from "../accounting-scenes.mjs";
@@ -10,12 +11,11 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 //#region src/domains/accounting/company-statement-builder/scene.tsx
 function CompanyStatementScene() {
 	const { scenario, state, reading } = useLabView(companyStatementBuilderModel);
-	const { meta } = useShell();
+	const meta = useShellMeta();
 	const showsStatements = meta.sequence.shows("statements");
-	const fmt = (value) => `${value < 0 ? "−" : ""}${scenario.currency}${Math.abs(value).toLocaleString()}`;
 	const sectionStats = (sections) => sections.map((section) => /* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx("strong", { children: section.title }), /* @__PURE__ */ jsx(StatList, { children: section.lines.filter((line) => line.amount !== 0 || line.kind !== "detail").map((line) => /* @__PURE__ */ jsx(Stat, {
 		label: `${line.treatment === "subtract" ? "− " : ""}${line.label}`,
-		value: fmt(line.amount)
+		value: formatMoney(line.amount, { currency: scenario.currency })
 	}, line.id)) })] }, section.id));
 	const step = meta.sequence.current.id;
 	return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -24,7 +24,7 @@ function CompanyStatementScene() {
 			dividends: state.dividends,
 			closingRetainedEarnings: reading.closingRetainedEarnings,
 			debentures: scenario.debentures,
-			formatMoney: fmt
+			formatMoney: (value) => formatMoney(value, { currency: scenario.currency })
 		}),
 		step === "place-dividend" && reading.dividendMisplaced ? /* @__PURE__ */ jsx("p", {
 			className: "finance-aside-copy",

package/dist/domains/accounting/compound-interest/model.d.mts

@@ -36,10 +36,10 @@ export declare const compoundInterestModel: LabModel<z.ZodObject<{
     id: z.ZodString;
     phase: z.ZodEnum<{
       explain: "explain";
+      transfer: "transfer";
       predict: "predict";
       act: "act";
       observe: "observe";
-      transfer: "transfer";
     }>;
     title: z.ZodString;
     lead: z.ZodOptional<z.ZodString>;
@@ -64,7 +64,7 @@ export declare const compoundInterestModel: LabModel<z.ZodObject<{
   guided: boolean;
   steps?: {
     id: string;
-    phase: "explain" | "predict" | "act" | "observe" | "transfer";
+    phase: "explain" | "transfer" | "predict" | "act" | "observe";
     title: string;
     lead?: string | undefined;
     reveal?: string[] | undefined;
@@ -89,7 +89,7 @@ export declare const compoundInterestModel: LabModel<z.ZodObject<{
     guided: boolean;
     steps?: {
       id: string;
-      phase: "explain" | "predict" | "act" | "observe" | "transfer";
+      phase: "explain" | "transfer" | "predict" | "act" | "observe";
       title: string;
       lead?: string | undefined;
       reveal?: string[] | undefined;
@@ -114,7 +114,7 @@ export declare const compoundInterestModel: LabModel<z.ZodObject<{
     guided: boolean;
     steps?: {
       id: string;
-      phase: "explain" | "predict" | "act" | "observe" | "transfer";
+      phase: "explain" | "transfer" | "predict" | "act" | "observe";
       title: string;
       lead?: string | undefined;
       reveal?: string[] | undefined;
@@ -139,7 +139,7 @@ export declare const compoundInterestModel: LabModel<z.ZodObject<{
     guided: boolean;
     steps?: {
       id: string;
-      phase: "explain" | "predict" | "act" | "observe" | "transfer";
+      phase: "explain" | "transfer" | "predict" | "act" | "observe";
       title: string;
       lead?: string | undefined;
       reveal?: string[] | undefined;
@@ -164,7 +164,7 @@ export declare const compoundInterestModel: LabModel<z.ZodObject<{
     guided: boolean;
     steps?: {
       id: string;
-      phase: "explain" | "predict" | "act" | "observe" | "transfer";
+      phase: "explain" | "transfer" | "predict" | "act" | "observe";
       title: string;
       lead?: string | undefined;
       reveal?: string[] | undefined;

package/dist/domains/accounting/compound-interest/model.mjs

@@ -1,4 +1,5 @@
 import { defineLabModel } from "../../../model/define.mjs";
+import { formatMoney } from "../../../model/money.mjs";
 import { refuse } from "../../../model/index.mjs";
 import { authoredActivityStepSchema } from "../../../schemas/activity-authoring.mjs";
 import { z } from "zod";
@@ -124,7 +125,16 @@ const compoundInterestModel = defineLabModel({
 			frequency: s.frequency
 		};
 	},
-	describe: (s, st, r) => `At ${st.ratePct}% interest compounded ${st.frequency}, ${s.currency}${Math.round(st.principal).toLocaleString("en-US")} grows to ${s.currency}${Math.round(r.finalC).toLocaleString("en-US")} in ${st.years} years. Simple interest reaches ${s.currency}${Math.round(r.finalS).toLocaleString("en-US")}. Doubling time is about ${r.doublingYrs.toFixed(1)} years.`
+	describe: (s, st, r) => `At ${st.ratePct}% interest compounded ${st.frequency}, ${formatMoney(st.principal, {
+		currency: s.currency,
+		decimals: 0
+	})} grows to ${formatMoney(r.finalC, {
+		currency: s.currency,
+		decimals: 0
+	})} in ${st.years} years. Simple interest reaches ${formatMoney(r.finalS, {
+		currency: s.currency,
+		decimals: 0
+	})}. Doubling time is about ${r.doublingYrs.toFixed(1)} years.`
 });
 
 //#endregion

package/dist/domains/accounting/compound-interest/runtime.mjs

@@ -1,5 +1,6 @@
 'use client';
 
+import { formatMoney } from "../../../model/money.mjs";
 import { Stat, StatList } from "../../../kit/frame.mjs";
 import { useLab } from "../../../runtime/use-lab.mjs";
 import { AuthoredActivityRuntime } from "../../../kit/authored-activity-runtime.mjs";
@@ -17,23 +18,36 @@ function CompoundInterest(props) {
 		layout: "auto",
 		sceneLabel: "Compound interest: the money snowball",
 		status: ({ reading, scenario, state }) => {
-			const fmt = (n) => `${scenario.currency}${Math.round(n).toLocaleString("en-US")}`;
-			return `${state.years} yr · simple ${fmt(reading.finalS)} · compound ${fmt(reading.finalC)}`;
+			return `${state.years} yr · simple ${formatMoney(reading.finalS, {
+				currency: scenario.currency,
+				decimals: 0
+			})} · compound ${formatMoney(reading.finalC, {
+				currency: scenario.currency,
+				decimals: 0
+			})}`;
 		},
 		evidence: ({ reading, scenario, state }) => {
-			const fmt = (n) => `${scenario.currency}${Math.round(n).toLocaleString("en-US")}`;
 			return /* @__PURE__ */ jsxs(StatList, { children: [
 				/* @__PURE__ */ jsx(Stat, {
 					label: "Selected balance",
-					value: fmt(reading.finalC)
+					value: formatMoney(reading.finalC, {
+						currency: scenario.currency,
+						decimals: 0
+					})
 				}),
 				/* @__PURE__ */ jsx(Stat, {
 					label: "Simple interest equivalent",
-					value: fmt(reading.finalS)
+					value: formatMoney(reading.finalS, {
+						currency: scenario.currency,
+						decimals: 0
+					})
 				}),
 				/* @__PURE__ */ jsx(Stat, {
 					label: "Interest on interest",
-					value: fmt(reading.finalC - reading.finalS)
+					value: formatMoney(reading.finalC - reading.finalS, {
+						currency: scenario.currency,
+						decimals: 0
+					})
 				}),
 				/* @__PURE__ */ jsx(Stat, {
 					label: "Doubling time",

package/dist/domains/accounting/compound-interest/scene.mjs

@@ -1,10 +1,12 @@
 'use client';
 
+import { formatMoney } from "../../../model/money.mjs";
 import { FigText } from "../../../kit/figure/text.mjs";
 import { Figure, HUE, STROKE, alpha, tint } from "../../../kit/figure/figure.mjs";
-import { Curve, Marker } from "../../../kit/figure/plot.mjs";
 import { useControl } from "../../../runtime/use-control.mjs";
+import { Grounding } from "../../../kit/scene/materials.mjs";
 import { useLabView } from "../../../runtime/use-lab-view.mjs";
+import { Curve, Marker } from "../../../kit/figure/plot.mjs";
 import { compoundInterestModel } from "./model.mjs";
 import { PlotChart } from "../../../kit/finance-viz/plot-chart.mjs";
 import { useId } from "react";
@@ -26,11 +28,13 @@ function CompoundInterestScene() {
 	const { finalC, finalS, chartYears, maxA, multiple } = reading;
 	const r = ratePct / 100;
 	const m = frequency === "monthly" ? 12 : 1;
-	const fmt = (n) => `${currency}${Math.round(n).toLocaleString("en-US")}`;
 	const fmtAxis = (n) => {
 		if (n >= 1e6) return `${currency}${(n / 1e6).toFixed(n < 1e7 ? 1 : 0)}m`;
 		if (n >= 1e3) return `${currency}${(n / 1e3).toFixed(n < 1e4 ? 1 : 0)}k`;
-		return fmt(n);
+		return formatMoney(n, {
+			currency,
+			decimals: 0
+		});
 	};
 	const compoundAt = (y) => compoundAmount(principal, r, y, m);
 	const simpleAt = (y) => principal + simpleInterest(principal, r, y);
@@ -64,7 +68,10 @@ function CompoundInterestScene() {
 				/* @__PURE__ */ jsxs("span", {
 					"data-series": "simple",
 					children: [
-						/* @__PURE__ */ jsx("strong", { children: fmt(finalS) }),
+						/* @__PURE__ */ jsx("strong", { children: formatMoney(finalS, {
+							currency,
+							decimals: 0
+						}) }),
 						" ",
 						/* @__PURE__ */ jsx("small", {
 							className: "text-muted-foreground",
@@ -75,7 +82,10 @@ function CompoundInterestScene() {
 				/* @__PURE__ */ jsxs("span", {
 					"data-series": "compound",
 					children: [
-						/* @__PURE__ */ jsx("strong", { children: fmt(finalC) }),
+						/* @__PURE__ */ jsx("strong", { children: formatMoney(finalC, {
+							currency,
+							decimals: 0
+						}) }),
 						" ",
 						/* @__PURE__ */ jsx("small", {
 							className: "text-muted-foreground",
@@ -110,7 +120,13 @@ function CompoundInterestScene() {
 						locked: yearsKey.locked,
 						onRefuse: yearsKey.refuse
 					},
-					ariaLabel: `Compound vs simple interest; ${fmt(principal)} grows to ${fmt(finalC)} in ${years} years`,
+					ariaLabel: `Compound vs simple interest; ${formatMoney(principal, {
+						currency,
+						decimals: 0
+					})} grows to ${formatMoney(finalC, {
+						currency,
+						decimals: 0
+					})} in ${years} years`,
 					children: ({ X, Y: Yv, GY1 }) => {
 						const cPts = Array.from({ length: N + 1 }, (_, i) => {
 							const yy = i / N * chartYears;
@@ -167,7 +183,7 @@ function CompoundInterestScene() {
 				className: "compound-snowball shrink-0",
 				children: /* @__PURE__ */ jsxs(Figure, {
 					className: "compound-snowball-svg",
-					viewBox: [220, 190],
+					viewBox: [220, 206],
 					domain: "commerce",
 					label: `Your money grew ${multiple.toFixed(1)} times; each dashed ring marks a doubling of the deposit`,
 					children: [
@@ -196,12 +212,11 @@ function CompoundInterestScene() {
 								stopColor: COMPOUND
 							})]
 						})] }),
-						/* @__PURE__ */ jsx("ellipse", {
+						/* @__PURE__ */ jsx(Grounding, {
 							cx,
-							cy: cy + outerR + 6,
+							y: cy + outerR + 6,
 							rx: outerR * .72,
-							ry: 7,
-							fill: alpha(HUE.ink, 8)
+							ry: 7
 						}),
 						/* @__PURE__ */ jsx("circle", {
 							className: "finance-svg-animated",
@@ -256,7 +271,7 @@ function CompoundInterestScene() {
 						}),
 						/* @__PURE__ */ jsx(FigText, {
 							x: cx,
-							y: cy + outerR + 26,
+							y: cy + outerR + 38,
 							anchor: "middle",
 							size: "note",
 							tone: "soft",

package/dist/domains/accounting/control-account-builder/activity.mjs

@@ -1,10 +1,10 @@
+import { formatMoney } from "../../../model/money.mjs";
 import { defineActivity } from "../../../runtime/activity.mjs";
 import { controlAccountBuilderModel } from "./model.mjs";
 
 //#region src/domains/accounting/control-account-builder/activity.ts
-const money = (value) => `$${value.toLocaleString()}`;
 /** Build the sales ledger control, then the purchases ledger control, then explain the source and limit. */
-const controlAccountBuilderActivity = defineActivity(controlAccountBuilderModel, (s) => s.missing ? missingFigureActivity(s.missing) : {
+const controlAccountBuilderActivity = defineActivity(controlAccountBuilderModel, (s) => s.missing ? missingFigureActivity(s.missing, s.currency) : {
 	pattern: "allocation",
 	title: "Control Account Builder",
 	objectives: [
@@ -105,7 +105,7 @@ const controlAccountBuilderActivity = defineActivity(controlAccountBuilderModel,
 	}]
 });
 /** Incomplete records: post what is known, then find the one figure that balances the account. */
-function missingFigureActivity(m) {
+function missingFigureActivity(m, currency) {
 	const name = m.account === "sales" ? "customer account" : "supplier account";
 	return {
 		pattern: "allocation",
@@ -124,14 +124,14 @@ function missingFigureActivity(m) {
 				id: "find-missing",
 				phase: "explain",
 				title: "Find the missing figure",
-				lead: `The account closes at ${money(m.closingBalance)}, carried down. Both sides must then be equal.`,
+				lead: `The account closes at ${formatMoney(m.closingBalance, { currency })}, carried down. Both sides must then be equal.`,
 				success: "missing-ready"
 			},
 			{
 				id: "missing-shown",
 				phase: "observe",
 				title: "The figure that balances it",
-				lead: `${m.label} is ${money(m.amount)}: the only amount that makes the account balance.`,
+				lead: `${m.label} is ${formatMoney(m.amount, { currency })}: the only amount that makes the account balance.`,
 				reveal: ["missing"]
 			}
 		],
@@ -140,14 +140,14 @@ function missingFigureActivity(m) {
 			prompt: `What must ${m.label.toLowerCase()} have been?`,
 			choices: [{
 				value: "right",
-				label: money(m.amount)
+				label: formatMoney(m.amount, { currency })
 			}, ...m.slips.map((slip, i) => ({
 				value: `slip-${i}`,
-				label: money(slip.value),
+				label: formatMoney(slip.value, { currency }),
 				feedback: slip.why
 			}))],
 			answer: "right",
-			explain: `With the closing balance carried down, both sides total the same, so ${m.label.toLowerCase()} is ${money(m.amount)}.`
+			explain: `With the closing balance carried down, both sides total the same, so ${m.label.toLowerCase()} is ${formatMoney(m.amount, { currency })}.`
 		}],
 		success: [{
 			id: "missing-ready",

package/dist/domains/accounting/control-account-builder/model.mjs

@@ -1,4 +1,5 @@
 import { defineLabModel } from "../../../model/define.mjs";
+import { formatMoney } from "../../../model/money.mjs";
 import { refuse } from "../../../model/index.mjs";
 import { z } from "zod";
 import { solveControlAccount } from "@classytic/stage/finance/accounting";
@@ -161,6 +162,7 @@ const controlAccountBuilderModel = defineLabModel({
 			"purchases",
 			"both"
 		]).default("both").describe("control accounts taught in this task; excluded accounts have no posting steps or scene"),
+		currency: z.string().min(1).max(6).default("$").describe("the currency symbol printed before every amount"),
 		receivables: facts("receivables").default(DEFAULT_RECEIVABLES),
 		payables: facts("payables").default(DEFAULT_PAYABLES)
 	}),
@@ -243,7 +245,7 @@ const controlAccountBuilderModel = defineLabModel({
 		sales: { placements: Object.fromEntries(s.salesEntries.map((e) => [e.id, e.side])) },
 		purchases: { placements: Object.fromEntries(s.purchasesEntries.map((e) => [e.id, e.side])) }
 	}),
-	describe: (s, _st, r) => [s.scope !== "purchases" ? `Receivables control ${r.sales.ready ? `closes at $${r.sales.closingBalance}` : "is incomplete"}.` : "", s.scope !== "sales" ? `Payables control ${r.purchases.ready ? `closes at $${r.purchases.closingBalance}` : "is incomplete"}.` : ""].filter(Boolean).join(" ")
+	describe: (s, _st, r) => [s.scope !== "purchases" ? `Receivables control ${r.sales.ready ? `closes at ${formatMoney(r.sales.closingBalance, { currency: s.currency })}` : "is incomplete"}.` : "", s.scope !== "sales" ? `Payables control ${r.purchases.ready ? `closes at ${formatMoney(r.purchases.closingBalance, { currency: s.currency })}` : "is incomplete"}.` : ""].filter(Boolean).join(" ")
 });
 
 //#endregion

package/dist/domains/accounting/control-account-builder/runtime.mjs

@@ -1,5 +1,6 @@
 'use client';
 
+import { formatMoney } from "../../../model/money.mjs";
 import { Readout, Stat, StatList } from "../../../kit/frame.mjs";
 import { useLab } from "../../../runtime/use-lab.mjs";
 import { AuthoredActivityRuntime } from "../../../kit/authored-activity-runtime.mjs";
@@ -9,9 +10,8 @@ import { ControlAccountScene } from "./scene.mjs";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 
 //#region src/domains/accounting/control-account-builder/runtime.tsx
-const money = (value) => `$${value.toLocaleString()}`;
 /** Debit and credit totals of what has been posted so far. */
-function totals(entries, resolvedIds, hiddenId) {
+function totals(entries, resolvedIds, hiddenId, currency) {
 	const done = new Set(resolvedIds);
 	let dr = 0;
 	let cr = 0;
@@ -23,8 +23,8 @@ function totals(entries, resolvedIds, hiddenId) {
 		else cr += e.amount;
 	}
 	return {
-		dr: `${money(dr)}${unknownSide === "debit" ? " + ?" : ""}`,
-		cr: `${money(cr)}${unknownSide === "credit" ? " + ?" : ""}`
+		dr: `${formatMoney(dr, { currency })}${unknownSide === "debit" ? " + ?" : ""}`,
+		cr: `${formatMoney(cr, { currency })}${unknownSide === "credit" ? " + ?" : ""}`
 	};
 }
 function ControlAccountBuilder(props) {
@@ -40,7 +40,7 @@ function ControlAccountBuilder(props) {
 				const account = step === "sales" ? reading.sales : reading.purchases;
 				const entries = step === "sales" ? scenario.salesEntries : scenario.purchasesEntries;
 				const hidden = scenario.missing && !sequence.shows("missing") ? scenario.missing.entryId : undefined;
-				const { dr, cr } = totals(entries, account.resolvedIds, hidden);
+				const { dr, cr } = totals(entries, account.resolvedIds, hidden, scenario.currency);
 				return /* @__PURE__ */ jsxs(Fragment, { children: [
 					/* @__PURE__ */ jsxs("span", { children: [
 						account.resolvedIds.length,
@@ -54,31 +54,31 @@ function ControlAccountBuilder(props) {
 			}
 			if (scenario.missing) return /* @__PURE__ */ jsxs("span", { children: [
 				"closes at ",
-				money(scenario.missing.closingBalance),
+				formatMoney(scenario.missing.closingBalance, { currency: scenario.currency }),
 				", given"
 			] });
 			return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs("span", { children: [
 				"Receivables ",
-				money(reading.sales.closingBalance),
+				formatMoney(reading.sales.closingBalance, { currency: scenario.currency }),
 				" Dr"
 			] }), /* @__PURE__ */ jsxs("span", { children: [
 				"Payables ",
-				money(reading.purchases.closingBalance),
+				formatMoney(reading.purchases.closingBalance, { currency: scenario.currency }),
 				" Cr"
 			] })] });
 		},
-		evidence: ({ reading, sequence }) => {
+		evidence: ({ reading, scenario, sequence }) => {
 			const account = sequence.current.id === "sales" ? reading.sales : reading.purchases;
 			const label = sequence.current.id === "sales" ? "trade receivables" : "trade payables";
 			return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Readout, {
-				value: account.ready ? money(account.closingBalance) : "Not balanced yet",
+				value: account.ready ? formatMoney(account.closingBalance, { currency: scenario.currency }) : "Not balanced yet",
 				sub: `${sequence.current.id === "sales" ? "sales" : "purchases"} ledger closing balance`
 			}), /* @__PURE__ */ jsxs(StatList, { children: [/* @__PURE__ */ jsx(Stat, {
 				label: "balance represents",
 				value: label
 			}), /* @__PURE__ */ jsx(Stat, {
 				label: "independent-list check",
-				value: !account.ready ? "sealed until posted" : account.agrees == null ? "not supplied" : account.agrees ? "agrees" : `difference ${money(account.difference ?? 0)}`
+				value: !account.ready ? "sealed until posted" : account.agrees == null ? "not supplied" : account.agrees ? "agrees" : `difference ${formatMoney(account.difference ?? 0, { currency: scenario.currency })}`
 			})] })] });
 		},
 		observation: ({ reading }) => reading.purchases.ready ? "The payables control closes with a credit balance: the total still owed to suppliers." : reading.sales.ready ? "The receivables control closes with a debit balance: the total credit customers still owe." : "Each amount is one total for the period, taken from a book of prime entry.",