earnrate 0.2.3 → 0.2.5

package/dist/engine/wallet-summary.js

@@ -4,49 +4,43 @@ import { daysBetween } from "./periods.js";
 import { STALE_AFTER_DAYS } from "./recommend.js";
 import { rotationGap } from "./rotation.js";
 import { activationRules } from "./setup.js";
-import { categoryPhrase, earnText } from "./text.js";
-import { cardValuation } from "./valuation.js";
-const NUMBERS = {
-    one: '1',
-    two: '2',
-    three: '3',
-    four: '4',
-    five: '5',
-    six: '6',
-};
-// "five-percent" reads "5%"; other ids read as words.
-export function choiceName(id) {
-    return id
-        .replace(/\b(one|two|three|four|five|six)-percent\b/g, (_, n) => `${NUMBERS[n] ?? n}%`)
-        .replace(/[-_.]/g, ' ');
-}
-const listed = (parts) => parts.length <= 2
-    ? parts.join(' and ')
-    : `${parts.slice(0, -1).join(', ')} and ${parts.at(-1) ?? ''}`;
+import { categoryPhrase, choiceName, currencyLabel, earnText, listed, words, } from "./text.js";
+import { cardValuation, currencyValuation } from "./valuation.js";
+// Travel-site bookings ("Flight through Amex Travel") read mid-sentence in
+// 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];
-    return all.find((m) => m.id === id)?.name ?? id.replace(/[-_.]/g, ' ');
+    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 option.replace(/[-_.]/g, ' ');
+        return words(option);
     const parts = [
         ...o.categories.map((c) => categoryPhrase(catalog, c)),
         ...o.merchants.map((m) => merchantName(catalog, m)),
     ];
     if (o.online)
         parts.push('online shopping');
-    return parts.length > 0 ? listed(parts) : option.replace(/[-_.]/g, ' ');
+    return parts.length > 0 ? listed(parts) : words(option);
 }
-function ruleWhat(catalog, rule) {
+// What a rule covers, as a list of phrases.
+function ruleParts(catalog, rule) {
     if (rule.match.choice !== undefined)
-        return `your ${choiceName(rule.match.choice)} picks`;
+        return [`your ${choiceName(rule.match.choice)} picks`];
     const parts = [
         ...(rule.match.categories ?? []).map((c) => categoryPhrase(catalog, c)),
         ...(rule.match.merchants ?? []).map((m) => merchantName(catalog, m)),
     ];
-    return parts.length > 0 ? listed(parts) : rule.id.replace(/[-_.]/g, ' ');
+    return parts.length > 0 ? parts : [words(rule.id)];
+}
+function ruleWhat(catalog, rule) {
+    return listed(ruleParts(catalog, rule));
 }
 function periodEnd(period) {
     const quarter = /^(\d{4})-Q([1-4])$/.exec(period);
@@ -63,14 +57,45 @@ function periodEnd(period) {
 }
 const applies = (rule, today) => (rule.valid_from === undefined || rule.valid_from <= today) &&
     (rule.valid_to === undefined || rule.valid_to >= today);
-function headlineRates(catalog, card, currency, today) {
-    const best = card.rules
-        .filter((r) => applies(r, today) && r.rate > card.base_rate)
-        .sort((a, b) => b.rate - a.rate)
-        .slice(0, 4)
-        .map((r) => `${earnText(catalog, r.rate, currency)} on ${ruleWhat(catalog, r)}${r.requires?.activation ? ' (once activated)' : ''}`);
+const matchKeys = (rule) => rule.match.choice !== undefined
+    ? []
+    : [
+        ...(rule.match.categories ?? []).map((c) => `category:${c}`),
+        ...(rule.match.merchants ?? []).map((m) => `merchant:${m}`),
+    ];
+// Every bonus rate the cardholder gets now, best first, so none reads as the
+// base rate. Rates behind a membership the wallet lacks are left out, and so
+// is a lower tier that an uncapped, always-on higher rate fully covers (Prime
+// Visa's 3% without Prime, once Prime is held). Rules at the same rate share
+// a line.
+function headlineRates(catalog, wallet, card, held, currency, today) {
+    const shown = card.rules
+        .filter((r) => applies(r, today) &&
+        r.rate > card.base_rate &&
+        (r.requires?.membership === undefined ||
+            wallet.memberships.includes(r.requires.membership)))
+        .sort((a, b) => b.rate - a.rate);
+    const lines = new Map();
+    for (const r of shown) {
+        const keys = matchKeys(r);
+        const higher = shown
+            .filter((h) => h.rate > r.rate &&
+            h.cap === undefined &&
+            (!h.requires?.activation || isActivated(card, held, h.id)))
+            .flatMap(matchKeys);
+        if (keys.length > 0 && keys.every((k) => higher.includes(k)))
+            continue;
+        const pending = r.requires?.activation && !isActivated(card, held, r.id);
+        const head = `${earnText(catalog, r.rate, currency)} on`;
+        const key = pending ? `${head}|activate` : head;
+        const whats = lines.get(key) ?? [];
+        for (const part of ruleParts(catalog, r))
+            if (!whats.includes(part))
+                whats.push(part);
+        lines.set(key, whats);
+    }
     return [
-        ...best,
+        ...[...lines].map(([key, whats]) => `${key.replace('|activate', '')} ${listed(whats)}${key.endsWith('|activate') ? ' (once activated)' : ''}`),
         `${earnText(catalog, card.base_rate, currency)} on everything else`,
     ];
 }
@@ -113,7 +138,7 @@ function capSummaries(catalog, card, held, today) {
         const label = shared?.rotating
             ? 'the rotating bonus categories'
             : [...new Set(covered.map((r) => ruleWhat(catalog, r)))].join(', ') ||
-                key.replace(/[-_.]/g, ' ');
+                words(key);
         return {
             key,
             label,
@@ -126,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) {
@@ -142,6 +174,9 @@ export function walletSummary(catalog, wallet, today) {
             onlyAt: card.only_at ?? null,
             bonus: bonusStatus(catalog, wallet, held, today),
             currency: valuation.currency,
+            currencyName: valuation.currency === 'cash'
+                ? 'cash back'
+                : currencyLabel(catalog, valuation.currency),
             centsPerUnit: valuation.centsPerUnit,
             lastVerified: card.last_verified,
             verifiedBy: card.verified_by,
@@ -152,7 +187,10 @@ export function walletSummary(catalog, wallet, today) {
                 ? {
                     period: held.chosen.period,
                     current: pickedCategories(card, held, today).staleChoice === null,
-                    until: periodEnd(held.chosen.period),
+                    // Picks that carry over have no end date.
+                    until: card.choices.every((c) => c.period === 'until_changed')
+                        ? null
+                        : periodEnd(held.chosen.period),
                     picks: held.chosen.picks,
                     pickNames: Object.fromEntries(Object.entries(held.chosen.picks).map(([choice, options]) => [
                         choiceName(choice),
@@ -160,11 +198,19 @@ export function walletSummary(catalog, wallet, today) {
                     ])),
                 }
                 : null,
-            rates: headlineRates(catalog, card, valuation.currency, today),
+            rates: headlineRates(catalog, wallet, card, held, valuation.currency, today),
             activated: held.activated,
             toActivate: toActivate(catalog, card, held, 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,31 +13,12 @@ const ISSUERS = {
     usbank: 'U.S. Bank',
     'wells-fargo': 'Wells Fargo',
 };
-export const MEMBERSHIPS = {
-    'amazon-prime': 'Amazon Prime',
-    'bank-of-america-account': 'Bank of America 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',
-};
-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 const words = (id) => id.replace(/[-_.]/g, ' ');
+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 const membershipName = (id) => MEMBERSHIPS[id] ?? words(id);
 export function cardText(catalog) {
     const cards = new Map(catalog.cards.map((c) => [c.id, c]));
     function shortName(id) {
@@ -50,15 +31,17 @@ export function cardText(catalog) {
     }
     function feeLabel(id) {
         const card = cards.get(id);
+        const m = card?.requires_membership;
+        const needs = m === undefined ? '' : `; needs ${membershipText(catalog, m)}`;
         const fee = card?.annual_fee;
         if (fee === undefined)
             return 'Annual fee not on file';
         if (fee === 0)
-            return 'No annual fee';
+            return `No annual fee${needs}`;
         const first = card?.first_year_fee;
         if (first !== undefined && first !== fee)
-            return `${usd(fee)} a year (${first === 0 ? 'waived' : usd(first)} the first year)`;
-        return `${usd(fee)} a year`;
+            return `${usd(fee)} a year (${first === 0 ? 'waived' : usd(first)} the first year)${needs}`;
+        return `${usd(fee)} a year${needs}`;
     }
     // `until` is the last day a time-limited rate applies, already formatted.
     function requirementLines(cardId, r, until = null) {
@@ -68,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,18 +1,17 @@
-const NETWORKS = {
-    visa: 'Visa',
-    mastercard: 'Mastercard',
-    amex: 'Amex',
-    discover: 'Discover',
-    store: 'store card',
-};
+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} (${money(card.requiresMembership.annualFee)} a year; membership id ${card.requiresMembership.id})`,
+            ]
+            : []),
         ...(card.memberships.length > 0
             ? [`rates that need a membership: ${card.memberships.join(', ')}`]
             : []),
@@ -23,7 +22,7 @@ export function formatCardInfo(card) {
         ...(card.onlyAt ? [`works only at ${card.onlyAt.join(', ')}`] : []),
     ];
     return [
-        `${card.id}: ${card.name} (${NETWORKS[card.network]}${fee})${card.held ? ' [in wallet]' : ''}`,
+        `${card.id}: ${card.name} (${NETWORK_NAMES[card.network] ?? card.network}${fee})${card.held ? ' [in wallet]' : ''}`,
         ...needs.map((n) => `    ${n}`),
     ].join('\n');
 }

package/dist/format/explore.js

@@ -1,7 +1,10 @@
-import { feeText, money, pct } from "../engine/text.js";
-const wholeUsd = (n) => money(Math.round(n));
+import { membershipName, membershipNote, } from "../engine/memberships.js";
+import { choiceName, feeText, money, pct, wholeDollars, words, } from "../engine/text.js";
+const membershipFees = (memberships) => memberships
+    .map((m) => ` + ${wholeDollars(m.annualFee)} for ${m.name}`)
+    .join('');
 const TOP_BEST = 10;
-export function formatExploration(r, all) {
+export function formatExploration(r, catalog, all) {
     const m = r.merchant;
     const title = m.source === 'category'
         ? m.resolvedName.toLowerCase()
@@ -20,7 +23,7 @@ export function formatExploration(r, all) {
             lines.push(`    ${c}`);
         const upgrade = e.withMembership[0];
         if (upgrade)
-            lines.push(`    With ${upgrade.membership}: ${pct(upgrade.effectiveReturnPct)}.`);
+            lines.push(`    With ${membershipName(catalog, upgrade.membership)}: ${pct(upgrade.effectiveReturnPct)}.`);
         for (const w of e.warnings)
             lines.push(`    ! ${w}`);
     });
@@ -32,8 +35,8 @@ export function formatExploration(r, all) {
     return `${lines.join('\n')}\n`;
 }
 function picksText(picks) {
-    const parts = Object.entries(picks).map(([choice, options]) => `${choice}: ${options.join(', ')}`);
-    return parts.length === 0 ? '' : ` (picks ${parts.join('; ')})`;
+    const parts = Object.entries(picks).map(([choice, options]) => `${options.map(words).join(' and ')} as its ${choiceName(choice)} ${options.length === 1 ? 'pick' : 'picks'}`);
+    return parts.length === 0 ? '' : ` (with ${parts.join('; ')})`;
 }
 function cardNamer(catalog) {
     return (id) => catalog.cards.find((c) => c.id === id)?.name ?? id;
@@ -56,7 +59,7 @@ export function formatCatalogSimulation(r, catalog, all) {
         return 'No cards match.\n';
     const top = all ? 20 : TOP_SIMULATED;
     const lines = [
-        `A year of this spending: ${wholeUsd(first.spend)}.`,
+        `A year of this spending: ${wholeDollars(first.spend)}.`,
         '',
         'Best single cards (rewards minus annual fee, per year):',
     ];
@@ -64,13 +67,13 @@ export function formatCatalogSimulation(r, catalog, all) {
         const card = s.cards[0];
         if (!card)
             return;
-        lines.push(`${String(i + 1).padStart(2)}. ${name(card.cardId)}  ${wholeUsd(s.net)}  (${wholeUsd(s.rewards)} rewards, ${wholeUsd(s.annualFees)} fee)${picksText(card.picks)}`);
+        lines.push(`${String(i + 1).padStart(2)}. ${name(card.cardId)}  ${wholeDollars(s.net)}  (${wholeDollars(s.rewards)} rewards, ${wholeDollars(s.annualFees)} fee${membershipFees(s.memberships)})${picksText(card.picks)}`);
     });
     const pairs = r.pairs.slice(0, top);
     if (pairs.length > 0) {
         lines.push('', 'Best two-card pairs:');
         pairs.forEach((s, i) => {
-            lines.push(`${String(i + 1).padStart(2)}. ${s.cards.map((c) => `${name(c.cardId)}${picksText(c.picks)}`).join(' + ')}  ${wholeUsd(s.net)}`);
+            lines.push(`${String(i + 1).padStart(2)}. ${s.cards.map((c) => `${name(c.cardId)}${picksText(c.picks)}`).join(' + ')}  ${wholeDollars(s.net)}`);
             if (s.alternatives.length > 0)
                 lines.push(`    Same result with ${s.alternatives.map(name).join(' or ')} as the second card.`);
             for (const split of splitText(s, name))
@@ -92,7 +95,7 @@ export function formatCatalogSimulation(r, catalog, all) {
 export function formatAdditions(r, catalog, all) {
     const name = cardNamer(catalog);
     const lines = [
-        `Your wallet earns about ${wholeUsd(r.current.rewards)} a year on this spending${r.current.annualFees > 0 ? `, with ${wholeUsd(r.current.annualFees)} in annual fees` : ''}.`,
+        `Your wallet earns about ${wholeDollars(r.current.rewards)} a year on this spending${r.current.annualFees > 0 ? `, with ${wholeDollars(r.current.annualFees)} in annual fees: ${wholeDollars(r.current.net)} after fees` : ''}.`,
     ];
     for (const split of splitText(r.current, name))
         lines.push(`  ${split}`);
@@ -101,14 +104,19 @@ export function formatAdditions(r, catalog, all) {
         lines.push('', 'No card would add more than its annual fee costs.');
     }
     else {
-        lines.push('', 'Cards that would add the most (after their annual fee):');
+        lines.push('', 'Cards that would add the most (after their annual fee and any membership they need):');
         gains.slice(0, all ? 20 : TOP_SIMULATED).forEach((a, i) => {
-            lines.push(`${String(i + 1).padStart(2)}. ${name(a.cardId)}  +${wholeUsd(a.gain)} a year  (+${wholeUsd(a.extraRewards)} rewards, ${wholeUsd(a.annualFee)} fee)${picksText(a.picks)}`);
+            lines.push(`${String(i + 1).padStart(2)}. ${name(a.cardId)}  +${wholeDollars(a.gain)} a year  (+${wholeDollars(a.extraRewards)} rewards, ${wholeDollars(a.annualFee)} fee${membershipFees(a.simulation.memberships.filter((m) => m.cardIds.includes(a.cardId)))})${picksText(a.picks)}`);
         });
     }
-    const notes = new Set(r.current.notes);
+    const notes = new Set([
+        ...r.current.notes,
+        ...gains
+            .slice(0, all ? 20 : TOP_SIMULATED)
+            .flatMap((a) => a.simulation.memberships.map((m) => membershipNote(catalog, m))),
+    ]);
     if (notes.size > 0)
         lines.push('', ...notes);
-    lines.push('', 'Assumes your picks carry over, rotating categories get activated, and caps start fresh.');
+    lines.push('', 'Assumes your picks carry over, rotating categories get activated, and caps start fresh. Annual fees are counted in full: statement credits and perks that offset them are left out. Each kind of spending lists the card that earns the most on it over the whole year, so a one-quarter bonus may not show.');
     return `${lines.join('\n')}\n`;
 }

package/dist/format/offers.js

@@ -1,17 +1,6 @@
-import { feeText, money } from "../engine/text.js";
+import { offerTerms } from "../engine/offers.js";
+import { feeText, money, shortDate, wholeDollars } from "../engine/text.js";
 const TOP = 10;
-function reward(o, currencyName) {
-    const amount = o.dollars !== null
-        ? money(o.dollars)
-        : `${(o.points ?? 0).toLocaleString('en-US')} ${currencyName}`;
-    return o.varies ? `Up to ${amount}` : amount;
-}
-const asOf = (date) => new Date(`${date}T12:00:00Z`).toLocaleDateString('en-US', {
-    month: 'short',
-    day: 'numeric',
-    year: 'numeric',
-    timeZone: 'UTC',
-});
 export function formatOffers(c, currencyName, all) {
     if (c.offers.length === 0) {
         return `No published welcome offers match.${c.withoutOffer.length > 0 ? ` ${String(c.withoutOffer.length)} matching card(s) have none on file.` : ''}\n`;
@@ -21,17 +10,19 @@ export function formatOffers(c, currencyName, all) {
     const lines = [];
     shown.forEach((o, i) => {
         const weeks = (o.months * 52) / 12;
-        const pace = o.spend > 0 ? ` (about ${money(Math.round(o.spend / weeks))} a week)` : '';
-        const spend = o.spend > 0
-            ? `after ${money(o.spend)} in ${String(o.months)} month${o.months === 1 ? '' : 's'}${pace}`
-            : 'with no spending required';
-        lines.push(`${String(i + 1).padStart(2)}. ${o.cardName.padEnd(width)}  about ${money(Math.round(o.firstYearValue))} the first year`, `    ${reward(o, currencyName(o.currency))} ${spend}. ${feeText(o)[0]?.toUpperCase() ?? ''}${feeText(o).slice(1)}.${o.held ? ' In your wallet.' : ''}`);
-        lines.push(`    ${o.validTo ? `Offer ends ${o.validTo}. ` : ''}Public offer as of ${asOf(o.lastVerified)}; yours may differ.`);
+        const pace = o.spend > 0 ? ` (about ${wholeDollars(o.spend / weeks)} a week)` : '';
+        lines.push(`${String(i + 1).padStart(2)}. ${o.cardName.padEnd(width)}  about ${wholeDollars(o.firstYearValue)} the first year`, `    ${offerTerms(o, currencyName(o.currency))}${pace}. ${feeText(o)[0]?.toUpperCase() ?? ''}${feeText(o).slice(1)}.${o.membershipFee > 0 ? ` Needs a ${money(o.membershipFee)} membership, counted in the first year.` : ''}${o.held ? ' In your wallet.' : ''}`);
+        lines.push(`    ${o.validTo ? `Offer ends ${shortDate(o.validTo)}. ` : ''}Public offer as of ${shortDate(o.lastVerified)}; yours may differ.`);
+        if (o.ineligible)
+            lines.push(`    ${o.ineligible}`);
         if (o.note)
             lines.push(`    ${o.note}`);
     });
-    if (c.offers.length > shown.length)
-        lines.push(`  + ${String(c.offers.length - shown.length)} more (--all lists them)`);
+    const ruledOut = c.offers.filter((o) => o.ineligible !== null && !shown.includes(o));
+    if (ruledOut.length > 0)
+        lines.push(`  ${String(ruledOut.length)} more left out as likely not eligible with a card you hold: ${ruledOut.map((o) => o.cardName).join(', ')}.`);
+    if (c.offers.length > shown.length + ruledOut.length)
+        lines.push(`  + ${String(c.offers.length - shown.length - ruledOut.length)} more (--all lists them)`);
     if (c.withoutOffer.length > 0)
         lines.push('', `${String(c.withoutOffer.length)} matching card(s) have no published offer on file.`);
     lines.push('', ...c.notes);

package/dist/format/recommendation.js

@@ -1,7 +1,7 @@
-import { money, pct } from "../engine/text.js";
+import { dollarsAndCents, money, pct } from "../engine/text.js";
+import { noCardText } from "../engine/recommend.js";
 export const plain = (_format, text) => text;
 const TOP = 3;
-const cents = (n) => `$${n.toFixed(2)}`;
 const label = (c) => c.checkoutLabel ?? c.cardName;
 function header(rec, purchase) {
     const m = rec.merchant;
@@ -24,13 +24,15 @@ function header(rec, purchase) {
         parts.push(m.channel === 'online' ? 'online' : 'in-store');
     return parts.join(' · ');
 }
-function cardLines(cards, style) {
+function cardLines(cards, style, bonusPick) {
+    const rankWidth = Math.max(...cards.map((c) => c.rank));
     const nameWidth = Math.max(...cards.map((c) => label(c).length));
     const pctWidth = Math.max(...cards.map((c) => pct(c.effectiveReturnPct).length));
     const lines = [];
-    cards.forEach((c, i) => {
-        const earned = c.earned === null ? '' : `  ${cents(c.earned)}`;
-        lines.push(`  ${String(i + 1)}. ${label(c).padEnd(nameWidth)}  ${pct(c.effectiveReturnPct).padStart(pctWidth)}${earned}`);
+    cards.forEach((c) => {
+        const earned = c.earned === null ? '' : `  ${dollarsAndCents(c.earned)}`;
+        const pick = c.cardId === bonusPick ? '  ← the pick, for its welcome bonus' : '';
+        lines.push(`  ${String(c.rank).padStart(String(rankWidth).length)}. ${label(c).padEnd(nameWidth)}  ${pct(c.effectiveReturnPct).padStart(pctWidth)}${earned}${pick}`);
         for (const r of c.reasoning)
             lines.push(style('dim', `     ${r}`));
         for (const w of c.warnings)
@@ -48,9 +50,9 @@ function excludedLines(excluded) {
 export function formatRecommendation(rec, purchase, { all = false, style = plain, notices = [], } = {}) {
     const lines = [header(rec, purchase), ''];
     const top = rec.ranked.find((r) => r.cardId === rec.decision?.cardId) ?? rec.ranked[0];
-    const noCard = `None of your cards work at ${rec.merchant.resolvedName}.`;
+    const noCard = noCardText(rec.merchant.resolvedName);
     if (rec.decision && top) {
-        const earned = top.earned === null ? '' : `, about ${cents(top.earned)}`;
+        const earned = top.earned === null ? '' : `, about ${dollarsAndCents(top.earned)}`;
         const confidence = rec.decision.confidence;
         const why = rec.bonus ? ' for its welcome bonus' : '';
         lines.push(`${style('bold', `Use ${label(top)}${why}: ${pct(top.effectiveReturnPct)} back${earned}.`)} ${confidence[0]?.toUpperCase() ?? ''}${confidence.slice(1)} confidence.`);
@@ -60,9 +62,13 @@ export function formatRecommendation(rec, purchase, { all = false, style = plain
     else {
         lines.push(style('bold', noCard));
     }
-    const shown = all ? rec.ranked : rec.ranked.slice(0, TOP);
+    const bonusPick = rec.bonus?.cardId ?? null;
+    const ranked = rec.ranked.map((c, i) => ({ ...c, rank: i + 1 }));
+    const shown = all
+        ? ranked
+        : ranked.filter((c, i) => i < TOP || c.cardId === bonusPick);
     if (shown.length > 0)
-        lines.push('', ...cardLines(shown, style));
+        lines.push('', ...cardLines(shown, style, bonusPick));
     const hidden = rec.ranked.length - shown.length;
     if (hidden > 0) {
         lines.push(style('dim', `  + ${String(hidden)} more ${hidden === 1 ? 'card' : 'cards'} (--all lists them)`));

package/dist/format/wallet-yaml.js

@@ -1,10 +1,11 @@
-import { parse, stringify } from 'yaml';
+import { Document, parse, visit } from 'yaml';
 import { walletProblems } from "../data/integrity.js";
-import { WalletSchema } from "../schema/wallet.js";
+import { WALLET_VERSION, WalletSchema } from "../schema/wallet.js";
 // A wallet as the YAML file the CLI reads, for moving it between the
 // website, the remote server and the command line. Node-free.
 function compact(wallet) {
     return {
+        version: wallet.version ?? WALLET_VERSION,
         ...(Object.keys(wallet.valuations).length > 0
             ? { valuations: wallet.valuations }
             : {}),
@@ -26,8 +27,22 @@ function compact(wallet) {
         })),
     };
 }
+// Dates, periods and anniversaries are quoted: YAML 1.1 parsers read a bare 2026-10-15 as a
+// date, not a string.
+function quotedYaml(value) {
+    const doc = new Document(value);
+    visit(doc, {
+        Scalar(key, node) {
+            if (key === 'value' &&
+                typeof node.value === 'string' &&
+                /^(\d{4}(-|$)|\d{2}-\d{2}$)/.test(node.value))
+                node.type = 'QUOTE_DOUBLE';
+        },
+    });
+    return doc.toString();
+}
 export function walletYaml(wallet) {
-    return `# Your earnrate wallet: the cards you hold, by id. Never card numbers.\n# For the command line, save it as ~/.earnrate/wallet.yaml\n\n${stringify(compact(wallet))}`;
+    return `# Your earnrate wallet: the cards you hold, by id. Never card numbers.\n# For the command line, save it as ~/.earnrate/wallet.yaml\n\n${quotedYaml(compact(wallet))}`;
 }
 export function parseWalletYaml(text, catalog) {
     let raw;

package/dist/format/wallet.js

@@ -1,24 +1,11 @@
-import { money } from "../engine/text.js";
-const NETWORKS = {
-    visa: 'Visa',
-    mastercard: 'Mastercard',
-    amex: 'American Express',
-    discover: 'Discover',
-    store: 'store card',
-};
-const day = (date) => new Date(`${date}T12:00:00Z`).toLocaleDateString('en-US', {
-    month: 'short',
-    day: 'numeric',
-    year: 'numeric',
-    timeZone: 'UTC',
-});
+import { money, NETWORK_NAMES, shortDate } from "../engine/text.js";
 export function formatWalletSummary(summary) {
     const cards = summary.cards.map((c) => {
         const label = c.checkoutLabel
             ? `, shown at checkout as "${c.checkoutLabel}"`
             : '';
         const lines = [
-            `- ${c.cardName} (${c.cardId})${label}: ${NETWORKS[c.network] ?? c.network}, ${c.currency} at ${String(c.centsPerUnit)}¢. Data checked ${c.lastVerified}${c.dataIsStale ? ' (old; check the issuer)' : ''}.`,
+            `- ${c.cardName} (${c.cardId})${label}: ${NETWORK_NAMES[c.network] ?? c.network}, ${c.currencyName} at ${String(c.centsPerUnit)}¢. Data checked ${c.lastVerified}${c.dataIsStale ? ' (old; check the issuer)' : ''}.`,
             `  Earns: ${c.rates.join('; ')}.`,
         ];
         if (c.onlyAt)
@@ -27,10 +14,14 @@ export function formatWalletSummary(summary) {
             const picks = Object.entries(c.chosen.pickNames)
                 .map(([choice, names]) => `${choice}: ${names.join(', ')}`)
                 .join('; ');
-            const until = c.chosen.until ? `, through ${day(c.chosen.until)}` : '';
-            lines.push(c.chosen.current
-                ? `  Picks for ${c.chosen.period}${until}: ${picks}. Pick again after that.`
-                : `  Picks are for ${c.chosen.period}, which is over: ask for this period's picks.`);
+            const until = c.chosen.until
+                ? `, through ${shortDate(c.chosen.until)}`
+                : '';
+            lines.push(!c.chosen.current
+                ? `  Picks are for ${c.chosen.period}, which is over: ask for this period's picks.`
+                : c.chosen.until === null
+                    ? `  Picks: ${picks}. They stay until the user changes them.`
+                    : `  Picks for ${c.chosen.period}${until}: ${picks}. Pick again after that.`);
         }
         if (c.toActivate.length > 0)
             lines.push(`  Not activated yet: ${c.toActivate.join('; ')}. Activating once with the issuer covers each group.`);
@@ -39,6 +30,8 @@ export function formatWalletSummary(summary) {
         for (const cap of c.caps)
             if (cap.remaining !== null)
                 lines.push(`  Cap on ${cap.label}: ${money(cap.spent)} of ${money(cap.amount)} used for ${cap.currentPeriod ?? ''} (cap key ${cap.key}).`);
+        if (c.anniversary !== null)
+            lines.push(`  Account anniversary: ${c.anniversary}.`);
         const b = c.bonus;
         if (b?.state === 'open' && b.spend !== null)
             lines.push(`  Welcome bonus: ${money(b.spent)} of ${money(b.spend)} spent, due ${b.deadline ?? ''}.`);
@@ -49,7 +42,10 @@ export function formatWalletSummary(summary) {
     const memberships = summary.memberships.length > 0
         ? `Memberships: ${summary.memberships.join(', ')}.`
         : 'Memberships: none saved.';
-    return [...cards, memberships].join('\n');
+    const values = summary.pointValues.length > 0
+        ? `Point values in the wallet: ${summary.pointValues.map((v) => `${v.name} at ${String(v.centsPerUnit)}¢${v.redemption === null ? '' : ` (redeemed ${v.redemption})`}`).join(', ')}. Others use earnrate's defaults.`
+        : "Point values: earnrate's defaults.";
+    return [...cards, memberships, values].join('\n');
 }
 export function formatBooking(amount, cardId, cap, bonus) {
     const messages = [];