earnrate 0.2.4 → 0.2.5

package/dist/engine/memberships.js

@@ -1,30 +1,48 @@
-import { money } from "./text.js";
+import { money, words } from "./text.js";
+export function membership(catalog, id) {
+    return catalog.memberships.find((m) => m.id === id);
+}
+export function membershipName(catalog, id) {
+    return membership(catalog, id)?.name ?? words(id);
+}
+// "a Costco membership", for a sentence.
+export function withArticle(name) {
+    return `${/^[aeiou]/i.test(name) ? 'an' : 'a'} ${name}`;
+}
+// Tiers of one membership: holding one, the others in its group aren't
+// missing (BofA Preferred Rewards).
+export function sameGroup(catalog, a, b) {
+    const group = membership(catalog, a)?.group;
+    return group !== undefined && group === membership(catalog, b)?.group;
+}
 // Memberships the person already pays for: the ones they've said, the ones a
 // card they hold needs, and the ones their spending shows (only members shop
 // at Costco).
 export function paidMemberships(catalog, { memberships, heldCards = [], merchantIds = [], }) {
     const paid = new Set(memberships);
     for (const card of catalog.cards) {
-        const m = card.requires_membership;
-        if (!m)
-            continue;
-        if (heldCards.includes(card.id) ||
-            m.members_shop_at.some((id) => merchantIds.includes(id)))
-            paid.add(m.id);
+        const id = card.requires_membership;
+        if (id !== undefined && heldCards.includes(card.id))
+            paid.add(id);
     }
+    for (const m of catalog.memberships)
+        if (m.members_shop_at.some((id) => merchantIds.includes(id)))
+            paid.add(m.id);
     return paid;
 }
 // What these cards' memberships add, once each, leaving out the paid ones.
-export function membershipCosts(cards, paid) {
+export function membershipCosts(catalog, cards, paid) {
     const costs = new Map();
     for (const card of cards) {
-        const m = card.requires_membership;
+        const m = card.requires_membership === undefined
+            ? undefined
+            : membership(catalog, card.requires_membership);
         if (!m || paid.has(m.id))
             continue;
         const cost = costs.get(m.id) ?? {
             id: m.id,
             name: m.name,
-            annualFee: m.annual_fee,
+            annualFee: m.annual_fee ?? 0,
             cardIds: [],
         };
         cost.cardIds.push(card.id);
@@ -32,14 +50,22 @@ export function membershipCosts(cards, paid) {
     }
     return [...costs.values()];
 }
+// "a Costco membership ($65 a year)"
+export function membershipText(catalog, id) {
+    const m = membership(catalog, id);
+    const name = withArticle(m?.name ?? words(id));
+    return m?.annual_fee === undefined
+        ? name
+        : `${name} (${money(m.annual_fee)} a year)`;
+}
 // The card's membership as a condition, unless it's paid for.
-export function membershipNeeded(card, paid) {
-    const m = card.requires_membership;
-    return m && !paid.has(m.id)
-        ? [`Needs ${m.name} (${money(m.annual_fee)} a year).`]
+export function membershipNeeded(catalog, card, paid) {
+    const id = card.requires_membership;
+    return id !== undefined && !paid.has(id)
+        ? [`Needs ${membershipText(catalog, id)}.`]
         : [];
 }
 export function membershipNote(catalog, m) {
     const names = m.cardIds.map((id) => catalog.cards.find((c) => c.id === id)?.name ?? id);
-    return `${names.join(' and ')} ${names.length === 1 ? 'needs' : 'need'} ${m.name}, ${money(m.annualFee)} a year, counted here like an annual fee. If you're already a member, add it to your memberships.`;
+    return `${names.join(' and ')} ${names.length === 1 ? 'needs' : 'need'} ${withArticle(m.name)}, ${money(m.annualFee)} a year, counted here like an annual fee. If you're already a member, add it to your memberships.`;
 }

package/dist/engine/offers.js

@@ -1,7 +1,7 @@
 import { bonusDollars } from "./bonus.js";
 import { matchesFilters } from "./explore.js";
 import { membershipCosts, paidMemberships } from "./memberships.js";
-import { roundCents } from "./text.js";
+import { money, roundCents } from "./text.js";
 import { cardValuation } from "./valuation.js";
 function ineligibleText(catalog, wallet, notWith) {
     const held = wallet.cards
@@ -13,6 +13,18 @@ function ineligibleText(catalog, wallet, notWith) {
         ? null
         : `Likely not eligible: you hold ${held.join(' and ')}, and the issuer's terms rule out its cardholders.`;
 }
+export const OFFERS_MAY_DIFFER = 'Yours may differ: issuers test and target offers, so use the one shown to you when you apply.';
+// "Up to 60,000 Chase Ultimate Rewards after $4,000 in purchases within 3
+// months": one wording for the site, the search pages and the CLI.
+export function offerTerms(o, currencyName) {
+    const amount = o.points !== null && o.points !== undefined
+        ? `${o.points.toLocaleString('en-US')} ${currencyName}`
+        : money(o.dollars ?? 0);
+    const spend = o.spend > 0
+        ? `after ${money(o.spend)} in purchases within ${String(o.months)} month${o.months === 1 ? '' : 's'}`
+        : 'with no spending required';
+    return `${o.varies ? 'Up to ' : ''}${amount} ${spend}`;
+}
 export function compareOffers(catalog, wallet, filters, today) {
     const held = new Set(wallet.cards.map((c) => c.id));
     const paid = paidMemberships(catalog, {
@@ -37,7 +49,7 @@ export function compareOffers(catalog, wallet, filters, today) {
         const value = bonusDollars(card, valuation.centsPerUnit, offer.points, offer.dollars) ??
             0;
         const firstYearFee = card.first_year_fee ?? card.annual_fee ?? null;
-        const membershipFee = membershipCosts([card], paid)[0]?.annualFee ?? 0;
+        const membershipFee = membershipCosts(catalog, [card], paid)[0]?.annualFee ?? 0;
         offers.push({
             cardId: card.id,
             cardName: card.name,
@@ -68,8 +80,8 @@ export function compareOffers(catalog, wallet, filters, today) {
         a.cardId.localeCompare(b.cardId));
     const notes = [
         `Compares the ${String(catalog.cards.length)} cards earnrate knows, not every card on the market.`,
-        "Each offer is the public one on the issuer's page on the date shown, checked weekly. Yours may differ: issuers test and target offers, so use the one shown to you when you apply. Issuers also limit who can get a bonus; each card's note says how.",
-        "First-year value is the bonus at your point values minus the first year's annual fee. It leaves out what the card earns on your spending and any credits or perks.",
+        `Each offer is the public one on the issuer's page on the date shown, checked weekly. ${OFFERS_MAY_DIFFER} Issuers also limit who can get a bonus; each card's note says how.`,
+        "First-year value is the bonus at your point values minus the first year's annual fee and any membership the card needs that you don't have. It leaves out what the card earns on your spending and any credits or perks.",
     ];
     return { offers, withoutOffer, notes };
 }

package/dist/engine/profiles.js

@@ -2,6 +2,14 @@ export const VALUATION_PROFILES = {
     flat: { MR: 1.0, UR: 1.0 },
     'points-heavy': { MR: 1.7, UR: 1.7 },
 };
+// "MR and UR at 1.7¢": what a profile sets, for help text.
+export function profileText(profile) {
+    const values = Object.entries(VALUATION_PROFILES[profile]);
+    const cents = [...new Set(values.map(([, v]) => v))];
+    return cents.length === 1
+        ? `${values.map(([id]) => id).join(' and ')} at ${String(cents[0])}¢`
+        : values.map(([id, v]) => `${id} at ${String(v)}¢`).join(', ');
+}
 export function isValuationProfile(name) {
     return Object.hasOwn(VALUATION_PROFILES, name);
 }

package/dist/engine/recommend.js

@@ -3,21 +3,13 @@ import { bonusStatus } from "./bonus.js";
 import { evaluateCard, purchaseContext, usableAt, } from "./evaluate.js";
 import { daysBetween } from "./periods.js";
 import { rotationGap } from "./rotation.js";
-import { categoryPhrase, codesAs, currencyLabel, currencyName, earnText, money, NETWORK_NAMES, num, pointValuesText, shortDate, } from "./text.js";
+import { EPSILON, isClose } from "./compare.js";
+import { CAP_ADJECTIVES, categoryPhrase, codesAs, currencyLabel, currencyName, earnText, money, NETWORK_NAMES, num, pointValuesText, roundCents, shortDate, wholeDollars, } from "./text.js";
 import { cardValuation } from "./valuation.js";
-// An on-pace welcome bonus card is mentioned when it's this close to the
-// best card: within a point, and at least three quarters of its rate.
-const CLOSE_PCT = 1;
-const CLOSE_SHARE = 0.75;
-const EPSILON = 1e-9;
 export const STALE_AFTER_DAYS = 180;
+// The warning when no card works; the CLI shows it as the answer instead.
+export const noCardText = (merchant) => `None of your cards work at ${merchant}.`;
 const NEAR_CAP_SHARE = 0.2;
-const PERIOD_WORDS = {
-    month: 'monthly',
-    quarter: 'quarterly',
-    calendar_year: 'calendar-year',
-    cardmember_year: 'cardmember-year',
-};
 const displayName = (e) => e.held.checkout_label ?? e.card.name;
 // "Worth X or more" must hold at X itself, so round up; "less than X" rounds down.
 const roundUp = (n) => String(Math.ceil(n * 100 - EPSILON) / 100);
@@ -121,7 +113,7 @@ function warningsFor(catalog, entry, purchase) {
     const { best, nominal } = evaluation;
     const warnings = [];
     const capLabel = (e) => e.cap
-        ? `${money(e.cap.cap.amount)} ${PERIOD_WORDS[e.cap.cap.period] ?? ''} cap`
+        ? `${money(e.cap.cap.amount)} ${CAP_ADJECTIVES[e.cap.cap.period]} cap`
         : '';
     if (best.cap && best.rule) {
         const { remaining, cap, period } = best.cap;
@@ -292,7 +284,7 @@ export function recommend(catalog, wallet, purchase, merchant = resolveMerchant(
         }
     }
     if (!winner) {
-        warnings.push(`None of your cards work at ${merchant.resolvedName}.`);
+        warnings.push(noCardText(merchant.resolvedName));
         // Only where the merchant's data says what its website takes: without
         // that, every network is assumed, and a gas pump has no website.
         const record = [
@@ -348,10 +340,7 @@ export function recommend(catalog, wallet, purchase, merchant = resolveMerchant(
     const ties = !isBest && gap <= EPSILON;
     const bonus = open && (open.behind || ties) ? open : null;
     const best = winner?.effectiveReturnPct ?? 0;
-    if (open &&
-        !bonus &&
-        gap <= CLOSE_PCT &&
-        open.entry.effectiveReturnPct >= best * CLOSE_SHARE) {
+    if (open && !bonus && isClose(open.entry.effectiveReturnPct, best)) {
         notes.push(`${displayName(open.entry)} earns ${num(open.entry.effectiveReturnPct)}% here, ${num(gap)} ${gap === 1 ? 'point' : 'points'} less than ${num(best)}%, and would help its welcome bonus (${money(open.status.remaining ?? 0)} more by ${open.status.deadline ?? ''}). You're on pace, so this uses the higher rate.`);
     }
     const chosen = bonus?.entry ?? winner;
@@ -369,7 +358,7 @@ export function recommend(catalog, wallet, purchase, merchant = resolveMerchant(
         const daysLeft = status.daysLeft ?? 0;
         const costHere = ties || top.earned === null || first.earned === null
             ? null
-            : Math.round((first.earned - top.earned) * 100) / 100;
+            : roundCents(first.earned - top.earned);
         bonusResult = {
             cardId: top.cardId,
             checkoutLabel: top.checkoutLabel,
@@ -380,11 +369,9 @@ export function recommend(catalog, wallet, purchase, merchant = resolveMerchant(
             costHere,
         };
         const pace = daysLeft >= 7
-            ? ` (about ${money(Math.round(remaining / (daysLeft / 7)))} a week)`
+            ? ` (about ${wholeDollars(remaining / (daysLeft / 7))} a week)`
             : '';
-        const worth = status.value === null
-            ? ''
-            : `, worth about ${money(Math.round(status.value))}`;
+        const worth = status.value === null ? '' : `, worth about ${wholeDollars(status.value)}`;
         notes.unshift(ties
             ? `${displayName(bonus.entry)} earns as much here as any of your cards, so it's the pick: it helps its welcome bonus, ${money(remaining)} more to spend by ${deadline}${worth}.`
             : `You're behind pace on ${displayName(bonus.entry)}'s welcome bonus: ${money(remaining)} more to spend by ${deadline}${pace}${worth}.${isBest

package/dist/engine/setup.js

@@ -1,4 +1,5 @@
 import { isActivated, pickedCategories } from "./evaluate.js";
+import { membership, membershipName, sameGroup } from "./memberships.js";
 import { daysBetween } from "./periods.js";
 import { rotationGap } from "./rotation.js";
 // Rules that start within this many days are worth activating now.
@@ -57,9 +58,6 @@ export function activationRules(card, today) {
             daysBetween(today, r.valid_from) <= ACTIVATION_LOOKAHEAD_DAYS))
         .map((r) => r.id);
 }
-// Bank of America Preferred Rewards tiers: a person holds one at a time, so
-// with one saved the others aren't missing.
-const TIER = /^bofa-rewards-/;
 export function membershipsUsed(card) {
     return [
         ...new Set(card.rules.flatMap((r) => r.requires?.membership === undefined ? [] : [r.requires.membership])),
@@ -70,13 +68,13 @@ export function membershipsUsed(card) {
 export function membershipsFor(card) {
     return [
         ...membershipsUsed(card),
-        ...(card.requires_membership ? [card.requires_membership.id] : []),
+        ...(card.requires_membership ? [card.requires_membership] : []),
     ];
 }
 export function knownMemberships(catalog) {
-    return [...new Set(catalog.cards.flatMap(membershipsFor))].sort();
+    return catalog.memberships.map((m) => m.id).sort();
 }
-export function cardInfo(card, wallet, today) {
+export function cardInfo(catalog, card, wallet, today) {
     return {
         id: card.id,
         name: card.name,
@@ -95,13 +93,13 @@ export function cardInfo(card, wallet, today) {
             default: c.default ?? null,
         })),
         memberships: membershipsUsed(card),
-        requiresMembership: card.requires_membership
-            ? {
-                id: card.requires_membership.id,
-                name: card.requires_membership.name,
-                annualFee: card.requires_membership.annual_fee,
-            }
-            : null,
+        requiresMembership: card.requires_membership === undefined
+            ? null
+            : {
+                id: card.requires_membership,
+                name: membershipName(catalog, card.requires_membership),
+                annualFee: membership(catalog, card.requires_membership)?.annual_fee ?? 0,
+            },
         activation: activationRules(card, today),
         needsAnniversary: needsAnniversary(card),
     };
@@ -129,7 +127,7 @@ export function searchCards(catalog, query, wallet, today) {
                 .sort(byShortestId)
                 .slice(0, 5);
     return {
-        cards: chosen.map((s) => cardInfo(s.card, wallet, today)),
+        cards: chosen.map((s) => cardInfo(catalog, s.card, wallet, today)),
         exact,
     };
 }
@@ -155,8 +153,8 @@ export function setupNotes(catalog, wallet, held, today) {
                 : `${name} needs its ${choice.id} pick for this period (${String(choice.pick)} of: ${options}). Until then those categories earn the base rate.`,
         });
     }
-    const hasTier = wallet.memberships.some((m) => TIER.test(m));
-    const missing = membershipsUsed(card).filter((m) => !wallet.memberships.includes(m) && !(hasTier && TIER.test(m)));
+    // With one tier of a group saved, the others aren't missing.
+    const missing = membershipsUsed(card).filter((m) => !wallet.memberships.some((held) => held === m || sameGroup(catalog, held, m)));
     if (missing.length > 0) {
         notes.push({
             kind: 'membership',

package/dist/engine/simulate.js

@@ -5,9 +5,9 @@ import { membershipCosts, membershipNote, paidMemberships, } from "./memberships
 import { choicePeriod, periodKey } from "./periods.js";
 import { applyBooking, capBooking } from "./record.js";
 import { rotationGap } from "./rotation.js";
-import { roundCents } from "./text.js";
+import { money, roundCents } from "./text.js";
 import { cardValuation } from "./valuation.js";
-const EPSILON = 1e-9;
+import { EPSILON } from "./compare.js";
 const MONTHS = 12;
 const SHORTLIST = 8; // best single cards considered for pairs
 const PER_LINE = 2; // plus the best cards for each spending line
@@ -129,7 +129,7 @@ held = []) {
         heldCards: held,
         merchantIds: lines.map((l) => l.merchant.merchantId),
     });
-    const memberships = membershipCosts(cards.map((c) => c.card), paid);
+    const memberships = membershipCosts(catalog, cards.map((c) => c.card), paid);
     const membershipFees = memberships.reduce((sum, m) => sum + m.annualFee, 0);
     const notes = [];
     for (const m of memberships)
@@ -146,7 +146,7 @@ held = []) {
         else if (!held.includes(card.id) &&
             card.first_year_fee !== undefined &&
             card.first_year_fee !== card.annual_fee)
-            notes.push(`${card.name}'s fee is $${String(card.first_year_fee)} the first year; the yearly figure uses the $${String(card.annual_fee)} that follows.`);
+            notes.push(`${card.name}'s fee is ${money(card.first_year_fee)} the first year; the yearly figure uses the ${money(card.annual_fee)} that follows.`);
     }
     return {
         cards: wallet.cards.map((h) => ({
@@ -342,4 +342,4 @@ export function spendLineFor(catalog, what, monthly) {
 export function typicalSpendLines(catalog) {
     return resolveSpendLines(catalog, TYPICAL_MONTHLY_SPEND.map((t) => spendLineFor(catalog, t.what, t.monthly)));
 }
-export const TYPICAL_SPEND_NOTE = `No spending was given, so this uses rough typical monthly amounts for a U.S. household: ${TYPICAL_MONTHLY_SPEND.map((t) => `${t.what} $${String(t.monthly)}`).join(', ')}. Give your own amounts for a closer answer.`;
+export const TYPICAL_SPEND_NOTE = `No spending was given, so this uses rough typical monthly amounts for a U.S. household: ${TYPICAL_MONTHLY_SPEND.map((t) => `${t.what} ${money(t.monthly)}`).join(', ')}. Give your own amounts for a closer answer.`;

package/dist/engine/text.js

@@ -4,15 +4,22 @@ export const pct = (n) => `${num(n)}%`;
 export const roundCents = (n) => Math.round(n * 100) / 100;
 // An id in words: "gas-ev-charging" reads "gas ev charging".
 export const words = (id) => id.replace(/[-_.]/g, ' ');
-// "Dec 31, 2026" from YYYY-MM-DD, the same in every time zone.
-export const shortDate = (date) => new Date(`${date}T12:00:00Z`).toLocaleDateString('en-US', {
-    month: 'short',
-    day: 'numeric',
-    year: 'numeric',
+const dateWords = (date, options) => new Date(`${date}T12:00:00Z`).toLocaleDateString('en-US', {
+    ...options,
     timeZone: 'UTC',
 });
-// Whole dollars stay whole ($2,800); anything else shows cents ($0.40).
-export const money = (n) => `$${n.toLocaleString('en-US', { minimumFractionDigits: Number.isInteger(n) ? 0 : 2, maximumFractionDigits: 2 })}`;
+// From YYYY-MM-DD, the same in every time zone: "Dec 31, 2026",
+// "December 31, 2026", "December 2026".
+export const shortDate = (date) => dateWords(date, { month: 'short', day: 'numeric', year: 'numeric' });
+export const longDate = (date) => dateWords(date, { month: 'long', day: 'numeric', year: 'numeric' });
+export const monthYear = (date) => dateWords(date, { month: 'long', year: 'numeric' });
+// Always cents ($4.00), for what one purchase earns. A loss reads −$4.00.
+export const dollarsAndCents = (n) => `${n < 0 ? '−' : ''}$${Math.abs(n).toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`;
+// Rounded to whole dollars ($2,800), for fees, caps and yearly totals.
+export const wholeDollars = (n) => money(Math.round(n));
+// Whole dollars stay whole ($2,800); anything else shows cents ($0.40). A
+// loss reads −$618.
+export const money = (n) => `${n < 0 ? '−' : ''}$${Math.abs(n).toLocaleString('en-US', { minimumFractionDigits: Number.isInteger(n) ? 0 : 2, maximumFractionDigits: 2 })}`;
 export function feeText(fees) {
     const { annualFee, firstYearFee } = fees;
     if (annualFee === null)
@@ -69,13 +76,13 @@ export const NETWORK_NAMES = {
 };
 // A name with its own "and" ("drugstores and pharmacies") would run into the
 // list's: those lists use commas only, with those names last.
-export const listed = (parts) => {
+export const listed = (parts, joiner = 'and') => {
     const anded = parts.filter((p) => p.includes(' and '));
     if (anded.length > 0)
         return [...parts.filter((p) => !p.includes(' and ')), ...anded].join(', ');
     return parts.length <= 2
-        ? parts.join(' and ')
-        : `${parts.slice(0, -1).join(', ')} and ${parts.at(-1) ?? ''}`;
+        ? parts.join(` ${joiner} `)
+        : `${parts.slice(0, -1).join(', ')} ${joiner} ${parts.at(-1) ?? ''}`;
 };
 const NUMBERS = {
     one: '1',
@@ -89,16 +96,23 @@ const NUMBERS = {
 export function choiceName(id) {
     return words(id.replace(/\b(one|two|three|four|five|six)-percent\b/g, (_, n) => `${NUMBERS[n] ?? n}%`));
 }
-// Display names for membership ids in the card data.
-export const MEMBERSHIPS = {
-    'amazon-prime': 'Amazon Prime',
-    'bank-of-america-account': 'Bank of America checking or savings',
-    'bank-of-america-small-business-account': 'Bank of America small business checking or savings',
-    'bofa-rewards-member': 'BofA Rewards Member',
-    'bofa-rewards-preferred-plus': 'BofA Rewards Preferred Plus',
-    'bofa-rewards-preferred-honors': 'BofA Rewards Preferred Honors',
-    'bofa-rewards-premier': 'BofA Rewards Premier',
-    costco: 'Costco membership',
-    'nordy-club-ambassador': 'Nordy Club Ambassador',
+// Period words in one place: a cap of $1,500 "a quarter", a "quarterly" cap,
+// a category picked "each quarter".
+export const CAP_PERIODS = {
+    month: 'a month',
+    quarter: 'a quarter',
+    calendar_year: 'a calendar year',
+    cardmember_year: 'a cardmember year',
+};
+export const CAP_ADJECTIVES = {
+    month: 'monthly',
+    quarter: 'quarterly',
+    calendar_year: 'calendar-year',
+    cardmember_year: 'cardmember-year',
+};
+export const PICK_PERIODS = {
+    month: 'each month',
+    quarter: 'each quarter',
+    calendar_year: 'each year',
+    until_changed: 'until you change it',
 };
-export const membershipName = (id) => MEMBERSHIPS[id] ?? words(id);

package/dist/engine/valuation.js

@@ -1,4 +1,4 @@
-function currencyValuation(catalog, wallet, currencyId) {
+export function currencyValuation(catalog, wallet, currencyId) {
     const currency = catalog.currencies.find((c) => c.id === currencyId);
     if (!currency)
         throw new Error(`unknown currency '${currencyId}'`);

package/dist/engine/wallet-change.js

@@ -251,3 +251,20 @@ export function withMemberships(catalog, wallet, memberships) {
         notes: [],
     };
 }
+// Point values in cents per point, by currency id; null goes back to
+// earnrate's default for that currency.
+export function withValuations(catalog, wallet, changes) {
+    const unknown = Object.keys(changes).filter((id) => !catalog.currencies.some((c) => c.id === id));
+    if (unknown.length > 0)
+        return failed(`Unknown currency ${unknown.map((id) => `'${id}'`).join(', ')}. Currencies: ${list(catalog.currencies.map((c) => c.id))}.`);
+    const odd = Object.entries(changes).filter(([, cents]) => cents !== null && !(cents > 0 && cents <= MAX_CENTS));
+    if (odd.length > 0)
+        return failed(`A point is worth more than 0¢ and at most ${String(MAX_CENTS)}¢; check ${odd.map(([id]) => id).join(', ')}.`);
+    const valuations = Object.fromEntries([
+        ...Object.entries(wallet.valuations).filter(([id]) => !(id in changes)),
+        ...Object.entries(changes).filter(([, cents]) => cents !== null),
+    ]);
+    return { ok: true, wallet: { ...wallet, valuations }, fields: {}, notes: [] };
+}
+// Higher than any program's points are worth, even transferred.
+const MAX_CENTS = 5;

package/dist/engine/wallet-summary.js

@@ -5,16 +5,19 @@ import { STALE_AFTER_DAYS } from "./recommend.js";
 import { rotationGap } from "./rotation.js";
 import { activationRules } from "./setup.js";
 import { categoryPhrase, choiceName, currencyLabel, earnText, listed, words, } from "./text.js";
-import { cardValuation } from "./valuation.js";
+import { cardValuation, currencyValuation } from "./valuation.js";
 // Travel-site bookings ("Flight through Amex Travel") read mid-sentence in
-// lower case and plural; brand names keep theirs.
+// lower case and plural; brand names ("Airbnb through Amex Travel") keep theirs.
 const BOOKING = /^(Attraction|Car rental|Cruise|Flight|Hotel|Vacation rental)\b/;
 function merchantName(catalog, id) {
     const all = [...catalog.merchants.overrides, ...catalog.merchants.seed];
-    const name = all.find((m) => m.id === id)?.name ?? words(id);
-    return name.replace(BOOKING, (kind) => `${kind.toLowerCase()}s`);
+    const merchant = all.find((m) => m.id === id);
+    const name = merchant?.name ?? words(id);
+    return merchant?.kind === 'booking'
+        ? name.replace(BOOKING, (kind) => `${kind.toLowerCase()}s`)
+        : name;
 }
-function optionName(catalog, card, choiceId, option) {
+export function optionName(catalog, card, choiceId, option) {
     const o = card.choices.find((c) => c.id === choiceId)?.options[option];
     if (!o)
         return words(option);
@@ -148,6 +151,13 @@ function capSummaries(catalog, card, held, today) {
         };
     });
 }
+// "into a SoFi account", for a wallet that values points by a redemption.
+function redemptionOf(catalog, currency, v) {
+    if (typeof v !== 'object' || v.redemption === undefined)
+        return null;
+    const names = catalog.currencies.find((c) => c.id === currency)?.redemption_names;
+    return names?.[v.redemption] ?? `as ${words(v.redemption)}`;
+}
 export function walletSummary(catalog, wallet, today) {
     const cards = [];
     for (const held of wallet.cards) {
@@ -194,5 +204,13 @@ export function walletSummary(catalog, wallet, today) {
             anniversary: held.anniversary ?? null,
         });
     }
-    return { memberships: wallet.memberships, cards };
+    const pointValues = Object.keys(wallet.valuations)
+        .filter((id) => catalog.currencies.some((c) => c.id === id))
+        .map((id) => ({
+        currency: id,
+        name: currencyLabel(catalog, id),
+        centsPerUnit: currencyValuation(catalog, wallet, id).centsPerUnit,
+        redemption: redemptionOf(catalog, id, wallet.valuations[id]),
+    }));
+    return { memberships: wallet.memberships, pointValues, started: null, cards };
 }

package/dist/format/card-text.js

@@ -13,22 +13,11 @@ const ISSUERS = {
     usbank: 'U.S. Bank',
     'wells-fargo': 'Wells Fargo',
 };
-export const PICK_PERIODS = {
-    month: 'each month',
-    quarter: 'each quarter',
-    calendar_year: 'each year',
-    until_changed: 'until you change it',
-};
-export const CAP_PERIODS = {
-    month: 'a month',
-    quarter: 'a quarter',
-    calendar_year: 'a year',
-    cardmember_year: 'a card year',
-};
-export { MEMBERSHIPS, membershipName, words } from "../engine/text.js";
-import { membershipName, words } from "../engine/text.js";
+export { CAP_PERIODS, PICK_PERIODS, words } from "../engine/text.js";
+import { membershipName, membershipText } from "../engine/memberships.js";
+import { CAP_PERIODS, PICK_PERIODS, wholeDollars, words, } from "../engine/text.js";
 // Whole dollars, for fees and caps.
-export const usd = (n) => `${n < 0 ? '−' : ''}$${Math.abs(Math.round(n)).toLocaleString('en-US')}`;
+export const usd = wholeDollars;
 export const issuerName = (id) => ISSUERS[id] ?? id;
 export function cardText(catalog) {
     const cards = new Map(catalog.cards.map((c) => [c.id, c]));
@@ -43,7 +32,7 @@ export function cardText(catalog) {
     function feeLabel(id) {
         const card = cards.get(id);
         const m = card?.requires_membership;
-        const needs = m ? `; needs ${m.name} (${usd(m.annual_fee)} a year)` : '';
+        const needs = m === undefined ? '' : `; needs ${membershipText(catalog, m)}`;
         const fee = card?.annual_fee;
         if (fee === undefined)
             return 'Annual fee not on file';
@@ -62,12 +51,19 @@ export function cardText(catalog) {
         if (r.activation !== null)
             lines.push(`Activate the bonus with ${issuerName(cards.get(cardId)?.issuer ?? '')} (free)`);
         if (r.membership !== null)
-            lines.push(`With ${membershipName(r.membership)}`);
+            lines.push(`With ${membershipName(catalog, r.membership)}`);
         if (until !== null)
             lines.push(`This rate runs through ${until}`);
         if (r.cap)
-            lines.push(`Up to ${usd(r.cap.amount)} of spending ${CAP_PERIODS[r.cap.period] ?? ''}, then ${earnText(catalog, r.cap.thenRate, r.cap.currency)}`);
+            lines.push(`Up to ${usd(r.cap.amount)} of spending ${CAP_PERIODS[r.cap.period]}, then ${earnText(catalog, r.cap.thenRate, r.cap.currency)}`);
         return lines;
     }
-    return { cards, shortName, feeLabel, requirementLines };
+    const memberName = (id) => membershipName(catalog, id);
+    return {
+        cards,
+        shortName,
+        feeLabel,
+        requirementLines,
+        membershipName: memberName,
+    };
 }

package/dist/format/cards.js

@@ -1,15 +1,15 @@
-import { NETWORK_NAMES } from "../engine/text.js";
+import { money, NETWORK_NAMES } from "../engine/text.js";
 export function formatCardInfo(card) {
     const fee = card.annualFee === null
         ? ''
         : card.annualFee === 0
             ? ', no annual fee'
-            : `, $${String(card.annualFee)} a year`;
+            : `, ${money(card.annualFee)} a year`;
     const needs = [
         ...card.choices.map((c) => `${c.id}: pick ${String(c.pick)} of ${c.options.join(', ')}${c.default ? ` (default ${c.default.join(', ')})` : ''}`),
         ...(card.requiresMembership
             ? [
-                `needs ${card.requiresMembership.name} ($${String(card.requiresMembership.annualFee)} a year; membership id ${card.requiresMembership.id})`,
+                `needs ${card.requiresMembership.name} (${money(card.requiresMembership.annualFee)} a year; membership id ${card.requiresMembership.id})`,
             ]
             : []),
         ...(card.memberships.length > 0