@stll/money 0.2.3 → 0.3.1

package/dist/index.d.ts

@@ -110,6 +110,12 @@ export type ProrateHourlyCentsInput = {
   hourlyRateCents: CentsAmount;
 };
 export declare const prorateHourlyCents: ({ billedMinutes, hourlyRateCents }: ProrateHourlyCentsInput) => CentsAmount;
+type TimeEntryAmountInput = {
+  billedMinutes: number;
+  rateAtEntry: CentsAmount;
+  noCharge: boolean;
+};
+export declare const timeEntryAmount: (entry: TimeEntryAmountInput) => CentsAmount;
 export type ApplyMarkupCentsInput = {
   amountCents: CentsAmount;
   markupPercent: number;

package/dist/index.js

@@ -171,18 +171,34 @@ const toMajorUnits = ({ amountCents, currency }) => amountCents / 10 ** currency
 * RangeError would take the whole board down with it.
 */
 const formatMoneyCents = ({ amountCents, currency, locale, fractionDigits }) => {
-	const major = toMajorUnits({
-		amountCents,
-		currency
+	const minorDigits = currencyMinorUnitDigits(currency);
+	const digits = fractionDigits ?? minorDigits;
+	if (!Number.isInteger(digits) || digits < 0 || digits > 100) return panic("Money fraction digits must be an integer from 0 to 100");
+	const magnitude = BigInt(Math.abs(cents(amountCents)));
+	const negative = amountCents < 0 || Object.is(amountCents, -0);
+	const displayUnits = digits >= minorDigits ? magnitude * 10n ** BigInt(digits - minorDigits) : (magnitude + 10n ** BigInt(minorDigits - digits) / 2n) / 10n ** BigInt(minorDigits - digits);
+	const scale = 10n ** BigInt(digits);
+	const whole = displayUnits / scale;
+	const fraction = (displayUnits % scale).toString().padStart(digits, "0");
+	const formatted = Result.try(() => {
+		const formatter = new Intl.NumberFormat(locale, {
+			style: "currency",
+			currency,
+			minimumFractionDigits: digits,
+			maximumFractionDigits: digits
+		});
+		const digitFormatter = new Intl.NumberFormat(locale, { useGrouping: false });
+		const localizedFraction = fraction.split("").map((digit) => digitFormatter.format(Number(digit))).join("");
+		const negativeSubunit = negative && whole === 0n;
+		let template = whole;
+		if (negative) template = negativeSubunit ? -1n : -whole;
+		return formatter.formatToParts(template).map((part) => {
+			if (part.type === "fraction") return localizedFraction;
+			if (negativeSubunit && part.type === "integer") return digitFormatter.format(0);
+			return part.value;
+		}).join("");
 	});
-	const digits = fractionDigits ?? currencyMinorUnitDigits(currency);
-	const formatted = Result.try(() => new Intl.NumberFormat(locale, {
-		style: "currency",
-		currency,
-		minimumFractionDigits: digits,
-		maximumFractionDigits: digits
-	}).format(major));
-	return formatted.isErr() ? `${major.toFixed(digits)} ${currency}` : formatted.value;
+	return formatted.isErr() ? `${negative ? "-" : ""}${whole}${digits === 0 ? "" : `.${fraction}`} ${currency}` : formatted.value;
 };
 //#endregion
 //#region src/index.ts
@@ -212,6 +228,10 @@ const prorateHourlyCents = ({ billedMinutes, hourlyRateCents }) => {
 	const product = BigInt(billedMinutes) * BigInt(hourlyRateCents);
 	return cents(Number((product + 30n) / 60n));
 };
+const timeEntryAmount = (entry) => entry.noCharge ? cents(0) : prorateHourlyCents({
+	billedMinutes: entry.billedMinutes,
+	hourlyRateCents: entry.rateAtEntry
+});
 const applyMarkupCents = ({ amountCents, markupPercent }) => {
 	assertNonNegativeInteger("amountCents", amountCents);
 	assertNonNegativeInteger("markupPercent", markupPercent);
@@ -277,4 +297,4 @@ var MoneyTotals = class {
 	}
 };
 //#endregion
-export { MoneyTotals, addCents, applyMarkupCents, cents, currencyCents, currencyMinorUnitDigits, formatMoneyCents, prorateHourlyCents, toMajorUnits, toMinorUnits, tryToMinorUnits, unsafeCents };
+export { MoneyTotals, addCents, applyMarkupCents, cents, currencyCents, currencyMinorUnitDigits, formatMoneyCents, prorateHourlyCents, timeEntryAmount, toMajorUnits, toMinorUnits, tryToMinorUnits, unsafeCents };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/money",
-  "version": "0.2.3",
+  "version": "0.3.1",
   "description": "Branded minor-unit monetary amounts and currency-safe billing arithmetic.",
   "keywords": [
     "billing",