earnrate 0.2.4 → 0.2.6

package/dist/engine/simulate.js

@@ -1,13 +1,13 @@
-import { resolveMerchant } from "../merchants/resolve.js";
+import { categoryResolution, findCategory, resolvePlace, } from "../merchants/resolve.js";
 import { evaluateCard, purchaseContext, usableAt } from "./evaluate.js";
-import { categoryResolution, findCategory, idealHolding, matchesFilters, } from "./explore.js";
+import { idealHolding, matchesFilters, } from "./explore.js";
 import { membershipCosts, membershipNote, paidMemberships, } from "./memberships.js";
 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, HALF_CENT } 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
@@ -16,7 +16,7 @@ export function resolveSpendLines(catalog, lines) {
         .filter((l) => l.monthly > 0)
         .map((l) => {
         const merchant = l.merchant !== null
-            ? resolveMerchant(catalog, l.merchant, null)
+            ? resolvePlace(catalog, l.merchant, null)
             : categoryResolution(catalog, l.category ?? 'other', null);
         return { label: merchant.resolvedName, monthly: l.monthly, merchant };
     });
@@ -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) => ({
@@ -224,7 +224,7 @@ function foldTies(pairs) {
     const folded = [];
     for (const pair of pairs) {
         const [a, b] = pair.cards;
-        const twin = folded.find((f) => Math.abs(f.net - pair.net) < 0.005 &&
+        const twin = folded.find((f) => Math.abs(f.net - pair.net) < HALF_CENT &&
             costs(f) === costs(pair) &&
             f.cards.some((c) => c.cardId === a?.cardId || c.cardId === b?.cardId));
         if (!twin) {
@@ -339,7 +339,8 @@ export function spendLineFor(catalog, what, monthly) {
     const category = findCategory(catalog, what);
     return { merchant: category === null ? what : null, category, monthly };
 }
+export const typicalSpend = (catalog) => TYPICAL_MONTHLY_SPEND.map((t) => spendLineFor(catalog, t.what, t.monthly));
 export function typicalSpendLines(catalog) {
-    return resolveSpendLines(catalog, TYPICAL_MONTHLY_SPEND.map((t) => spendLineFor(catalog, t.what, t.monthly)));
+    return resolveSpendLines(catalog, typicalSpend(catalog));
 }
-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

@@ -2,17 +2,36 @@ import { singleMcc } from "./evaluate.js";
 export const num = (n) => String(Number(n.toFixed(2)));
 export const pct = (n) => `${num(n)}%`;
 export const roundCents = (n) => Math.round(n * 100) / 100;
+// Ids for a message: "amex-gold, citi-double-cash".
+export const idList = (ids) => ids.join(', ');
+export const capitalize = (t) => t.charAt(0).toUpperCase() + t.slice(1);
+// "usbank.com" from "https://www.usbank.com/credit-cards/...".
+export function hostname(url) {
+    try {
+        return new URL(url).hostname.replace(/^www\./, '');
+    }
+    catch {
+        return url;
+    }
+}
 // 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)
@@ -40,7 +59,7 @@ export function categoryPhrase(catalog, id) {
 }
 export function earnText(catalog, rate, currency) {
     return currency === 'cash'
-        ? `${num(rate)}% cash back`
+        ? `${pct(rate)} cash back`
         : `${num(rate)}x ${currencyName(catalog, currency)}`;
 }
 export function codesAs(catalog, merchant) {
@@ -69,13 +88,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 +108,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

@@ -3,15 +3,15 @@ import { addMonths } from "./bonus.js";
 import { capByKey } from "./evaluate.js";
 import { choicePeriod, periodKey } from "./periods.js";
 import { knownMemberships, searchCards, setupNotes, } from "./setup.js";
+import { idList } from "./text.js";
 const failed = (error) => ({ ok: false, error });
-const list = (ids) => ids.join(', ');
 function findCatalogCard(catalog, id, today) {
     const card = catalog.cards.find((c) => c.id === id);
     if (card)
         return card;
     const near = searchCards(catalog, id, null, today).cards.map((c) => c.id);
     return near.length > 0
-        ? `No card '${id}' in earnrate. Closest: ${list(near)}.`
+        ? `No card '${id}' in earnrate. Closest: ${idList(near)}.`
         : `No card '${id}' in earnrate. Search the catalog to find its id.`;
 }
 function isAnniversary(text) {
@@ -51,7 +51,7 @@ export function cardFields(card, held, input, today) {
         for (const id of input.activated) {
             if (!needing.includes(id)) {
                 problems.push(needing.length > 0
-                    ? `'${id}' isn't a ${card.id} rule that needs activating. Those are: ${list(needing)}.`
+                    ? `'${id}' isn't a ${card.id} rule that needs activating. Those are: ${idList(needing)}.`
                     : `${card.id} has no rules that need activating.`);
             }
         }
@@ -62,14 +62,14 @@ export function cardFields(card, held, input, today) {
             const choice = card.choices.find((c) => c.id === choiceId);
             if (!choice) {
                 problems.push(card.choices.length > 0
-                    ? `${card.id} has no '${choiceId}' pick. Its picks are: ${list(card.choices.map((c) => c.id))}.`
+                    ? `${card.id} has no '${choiceId}' pick. Its picks are: ${idList(card.choices.map((c) => c.id))}.`
                     : `${card.id} has no categories to pick.`);
                 continue;
             }
             const options = Object.keys(choice.options);
             for (const p of picks) {
                 if (!options.includes(p)) {
-                    problems.push(`'${p}' isn't a ${choiceId} option for ${card.id}. Options: ${list(options)}.`);
+                    problems.push(`'${p}' isn't a ${choiceId} option for ${card.id}. Options: ${idList(options)}.`);
                 }
             }
             if (picks.length === 0 || picks.length > choice.pick) {
@@ -101,7 +101,7 @@ export function cardFields(card, held, input, today) {
                         .map((r) => r.id),
                 ];
                 problems.push(keys.length > 0
-                    ? `${card.id} has no cap '${key}'. Its caps are: ${list(keys)}.`
+                    ? `${card.id} has no cap '${key}'. Its caps are: ${idList(keys)}.`
                     : `${card.id} has no spending caps.`);
                 continue;
             }
@@ -206,7 +206,7 @@ export function updateInWallet(catalog, wallet, input, today) {
     const held = wallet.cards.find((c) => c.id === input.id);
     const card = catalog.cards.find((c) => c.id === input.id);
     if (!held || !card) {
-        return failed(`${input.id} isn't in the wallet. Cards: ${list(wallet.cards.map((c) => c.id))}.`);
+        return failed(`${input.id} isn't in the wallet. Cards: ${idList(wallet.cards.map((c) => c.id))}.`);
     }
     const fields = cardFields(card, held, input, today);
     if (typeof fields === 'string')
@@ -227,10 +227,8 @@ export function updateInWallet(catalog, wallet, input, today) {
 }
 export function removeFromWallet(wallet, id) {
     if (!wallet.cards.some((c) => c.id === id)) {
-        return failed(`${id} isn't in the wallet. Cards: ${list(wallet.cards.map((c) => c.id))}.`);
+        return failed(`${id} isn't in the wallet. Cards: ${idList(wallet.cards.map((c) => c.id))}.`);
     }
-    // Removing the last card leaves an empty wallet, which each store keeps
-    // in its own way (or refuses, for a wallet file).
     return {
         ok: true,
         wallet: { ...wallet, cards: wallet.cards.filter((c) => c.id !== id) },
@@ -242,7 +240,7 @@ export function withMemberships(catalog, wallet, memberships) {
     const known = knownMemberships(catalog);
     const unknown = memberships.filter((m) => !known.includes(m));
     if (unknown.length > 0) {
-        return failed(`No card uses ${unknown.map((m) => `'${m}'`).join(', ')}. Memberships earnrate knows: ${list(known)}.`);
+        return failed(`No card uses ${unknown.map((m) => `'${m}'`).join(', ')}. Memberships earnrate knows: ${idList(known)}.`);
     }
     return {
         ok: true,
@@ -251,3 +249,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: ${idList(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

@@ -1,20 +1,24 @@
+import { findMerchant } from "../merchants/resolve.js";
 import { bonusStatus } from "./bonus.js";
 import { activationGroup, capUsed, isActivated, pickedCategories, } from "./evaluate.js";
-import { daysBetween } from "./periods.js";
+import { membershipName } from "./memberships.js";
+import { daysBetween, inEffect, periodEnd } from "./periods.js";
 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 { CAP_PERIODS, categoryPhrase, choiceName, currencyLabel, earnText, listed, shortDate, wholeDollars, 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 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 = findMerchant(catalog, 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);
@@ -30,30 +34,22 @@ function optionName(catalog, card, choiceId, option) {
 function ruleParts(catalog, rule) {
     if (rule.match.choice !== undefined)
         return [`your ${choiceName(rule.match.choice)} picks`];
+    const merchants = rule.match.merchants ?? [];
+    // A long list of one kind of store reads as "select streaming services".
+    const kinds = new Set(merchants.map((m) => findMerchant(catalog, m)?.category));
+    const [kind] = kinds;
+    const merchantParts = merchants.length > 4 && kinds.size === 1 && kind !== undefined
+        ? [`select ${categoryPhrase(catalog, kind)}`]
+        : merchants.map((m) => merchantName(catalog, m));
     const parts = [
         ...(rule.match.categories ?? []).map((c) => categoryPhrase(catalog, c)),
-        ...(rule.match.merchants ?? []).map((m) => merchantName(catalog, m)),
+        ...merchantParts,
     ];
     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);
-    if (quarter) {
-        const end = ['03-31', '06-30', '09-30', '12-31'][Number(quarter[2]) - 1];
-        return `${quarter[1] ?? ''}-${end ?? ''}`;
-    }
-    const month = /^(\d{4})-(\d{2})$/.exec(period);
-    if (month) {
-        const last = new Date(Date.UTC(Number(month[1]), Number(month[2]), 0));
-        return last.toISOString().slice(0, 10);
-    }
-    return /^\d{4}$/.test(period) ? `${period}-12-31` : null;
-}
-const applies = (rule, today) => (rule.valid_from === undefined || rule.valid_from <= today) &&
-    (rule.valid_to === undefined || rule.valid_to >= today);
 const matchKeys = (rule) => rule.match.choice !== undefined
     ? []
     : [
@@ -65,9 +61,22 @@ const matchKeys = (rule) => rule.match.choice !== undefined
 // 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.
+// "first $1,500 a quarter, combined": how much of a rate's spending earns it.
+function capLimit(card, shown, rule) {
+    if (rule.cap === undefined)
+        return '';
+    const cap = typeof rule.cap === 'string'
+        ? card.caps.find((c) => c.id === rule.cap)
+        : rule.cap;
+    if (!cap)
+        return '';
+    const shared = typeof rule.cap === 'string' &&
+        shown.filter((r) => r.cap === rule.cap).length > 1;
+    return `first ${wholeDollars(cap.amount)} ${CAP_PERIODS[cap.period]}${shared ? ', combined' : ''}`;
+}
 function headlineRates(catalog, wallet, card, held, currency, today) {
     const shown = card.rules
-        .filter((r) => applies(r, today) &&
+        .filter((r) => inEffect(r, today) &&
         r.rate > card.base_rate &&
         (r.requires?.membership === undefined ||
             wallet.memberships.includes(r.requires.membership)))
@@ -83,8 +92,11 @@ function headlineRates(catalog, wallet, card, held, currency, today) {
         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 key = [
+            `${earnText(catalog, r.rate, currency)} on`,
+            capLimit(card, shown, r),
+            pending ? ', once activated' : '',
+        ].join('|');
         const whats = lines.get(key) ?? [];
         for (const part of ruleParts(catalog, r))
             if (!whats.includes(part))
@@ -92,7 +104,11 @@ function headlineRates(catalog, wallet, card, held, currency, today) {
         lines.set(key, whats);
     }
     return [
-        ...[...lines].map(([key, whats]) => `${key.replace('|activate', '')} ${listed(whats)}${key.endsWith('|activate') ? ' (once activated)' : ''}`),
+        ...[...lines].map(([key, whats]) => {
+            const [head = '', limit = '', activate = ''] = key.split('|');
+            const after = `${limit}${activate}`;
+            return `${head} ${listed(whats)}${after === '' ? '' : ` (${after.replace(/^, /, '')})`}`;
+        }),
         `${earnText(catalog, card.base_rate, currency)} on everything else`,
     ];
 }
@@ -107,9 +123,14 @@ function toActivate(catalog, card, held, today) {
             seen.add(g);
         const rules = card.rules.filter((r) => group.includes(r.id));
         const first = rules[0];
+        const deadline = first?.activate_by === undefined
+            ? ''
+            : `, activate by ${shortDate(first.activate_by)}`;
         const when = first?.valid_from !== undefined && first.valid_to !== undefined
-            ? ` (${first.valid_from} to ${first.valid_to})`
-            : '';
+            ? ` (${shortDate(first.valid_from)} to ${shortDate(first.valid_to)}${deadline})`
+            : deadline === ''
+                ? ''
+                : ` (${deadline.slice(2)})`;
         out.push(`${rules.map((r) => ruleWhat(catalog, r)).join(', ')}${when}`);
     }
     return out;
@@ -148,6 +169,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 +222,31 @@ export function walletSummary(catalog, wallet, today) {
             anniversary: held.anniversary ?? null,
         });
     }
-    return { memberships: wallet.memberships, cards };
+    return {
+        memberships: wallet.memberships,
+        membershipNames: wallet.memberships.map((m) => membershipName(catalog, m)),
+        pointValues: pointValues(catalog, wallet),
+        started: null,
+        cards,
+    };
+}
+function pointValues(catalog, wallet) {
+    return 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]),
+    }));
+}
+// The memberships and point values a wallet holds besides its cards, in
+// words: what replacing or deleting it would lose.
+export function savedSettingsText(catalog, wallet) {
+    return [
+        ...wallet.memberships.map((m) => membershipName(catalog, m)),
+        ...pointValues(catalog, wallet).map((v) => v.redemption === null
+            ? `${v.name} at ${String(v.centsPerUnit)}¢`
+            : `${v.name} redeemed ${v.redemption}`),
+    ];
 }

package/dist/format/card-text.js

@@ -1,35 +1,10 @@
 import { earnText } from "../engine/text.js";
 // Card names, fees and requirements as earnrate.dev and its static search
 // pages show them. Node-free: the site bundles it.
-const ISSUERS = {
-    amex: 'American Express',
-    'bank-of-america': 'Bank of America',
-    'capital-one': 'Capital One',
-    chase: 'Chase',
-    citi: 'Citi',
-    column: 'Bilt',
-    sofi: 'SoFi',
-    'td-bank': 'TD Bank',
-    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";
-// Whole dollars, for fees and caps.
-export const usd = (n) => `${n < 0 ? '−' : ''}$${Math.abs(Math.round(n)).toLocaleString('en-US')}`;
-export const issuerName = (id) => ISSUERS[id] ?? id;
+import { membershipName, membershipText } from "../engine/memberships.js";
+import { CAP_PERIODS, PICK_PERIODS, wholeDollars, words, } from "../engine/text.js";
+// An issuer's name as people know it, from data/issuers.yaml.
+export const issuerName = (catalog, id) => catalog.issuers.find((i) => i.id === id)?.name ?? id;
 export function cardText(catalog) {
     const cards = new Map(catalog.cards.map((c) => [c.id, c]));
     function shortName(id) {
@@ -43,7 +18,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';
@@ -51,8 +26,8 @@ export function cardText(catalog) {
             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)${needs}`;
-        return `${usd(fee)} a year${needs}`;
+            return `${wholeDollars(fee)} a year (${first === 0 ? 'waived' : wholeDollars(first)} the first year)${needs}`;
+        return `${wholeDollars(fee)} a year${needs}`;
     }
     // `until` is the last day a time-limited rate applies, already formatted.
     function requirementLines(cardId, r, until = null) {
@@ -60,14 +35,22 @@ export function cardText(catalog) {
         if (r.pick)
             lines.push(`Pick ${r.pick.options.map(words).join(' or ')} as a bonus category (${PICK_PERIODS[r.pick.period]})`);
         if (r.activation !== null)
-            lines.push(`Activate the bonus with ${issuerName(cards.get(cardId)?.issuer ?? '')} (free)`);
+            lines.push(`Activate the bonus with ${issuerName(catalog, 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 ${wholeDollars(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,
+        issuerName: (id) => issuerName(catalog, id),
+    };
 }

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