earnrate 0.2.5 → 0.2.6

package/dist/data/load.js

@@ -8,6 +8,7 @@ import { CONFIG_DIR, WALLET_ENV_VAR } from "../brand.js";
 import { CardSchema } from "../schema/card.js";
 import { CategoriesFileSchema } from "../schema/category.js";
 import { CurrenciesFileSchema } from "../schema/currency.js";
+import { IssuersFileSchema } from "../schema/issuer.js";
 import { MembershipsFileSchema } from "../schema/membership.js";
 import { MerchantsFileSchema } from "../schema/merchant.js";
 import { WalletSchema } from "../schema/wallet.js";
@@ -31,9 +32,10 @@ async function loadCards(dir) {
     }));
 }
 export async function loadCatalog(dir = DATA_DIR) {
-    const [categories, currencies, memberships, cards, seed, overrides] = await Promise.all([
+    const [categories, currencies, issuers, memberships, cards, seed, overrides] = await Promise.all([
         readYaml(path.join(dir, 'categories.yaml'), CategoriesFileSchema),
         readYaml(path.join(dir, 'currencies.yaml'), CurrenciesFileSchema),
+        readYaml(path.join(dir, 'issuers.yaml'), IssuersFileSchema),
         readYaml(path.join(dir, 'memberships.yaml'), MembershipsFileSchema),
         loadCards(path.join(dir, 'cards')),
         readYaml(path.join(dir, 'merchants', 'seed.yaml'), MerchantsFileSchema),
@@ -42,6 +44,7 @@ export async function loadCatalog(dir = DATA_DIR) {
     return {
         categories,
         currencies,
+        issuers,
         memberships,
         cards,
         merchants: { seed, overrides },

package/dist/data/store.js

@@ -1,7 +1,9 @@
 import { bookPurchase } from "../engine/record.js";
 import { addToWallet, removeFromWallet, updateInWallet, withMemberships, withValuations, } from "../engine/wallet-change.js";
-import { WalletSchema } from "../schema/wallet.js";
+import { WALLET_VERSION, WalletSchema } from "../schema/wallet.js";
 const failed = (error) => ({ ok: false, error });
+// Memberships and point values can be saved before any card.
+export const emptyWallet = () => WalletSchema.parse({ version: WALLET_VERSION });
 // A wallet stored as JSON text. Writes are serialized within this instance;
 // a backend shared across processes must serialize them itself (one Durable
 // Object per wallet does).
@@ -30,11 +32,7 @@ export class JsonWalletStore {
             const change = apply(before);
             if (!change.ok)
                 return failed(change.error);
-            // An empty wallet is stored as none: the schema needs a card.
-            if (change.wallet.cards.length === 0)
-                await this.backend.remove();
-            else
-                await this.backend.write(JSON.stringify(change.wallet));
+            await this.backend.write(JSON.stringify(change.wallet));
             return {
                 ok: true,
                 wallet: change.wallet,
@@ -58,10 +56,10 @@ export class JsonWalletStore {
         return this.change(this.needsWallet((w) => removeFromWallet(w, cardId)));
     }
     setMemberships(memberships) {
-        return this.change(this.needsWallet((w) => withMemberships(this.catalog, w, memberships)));
+        return this.change((w) => withMemberships(this.catalog, w ?? emptyWallet(), memberships));
     }
     setValuations(changes) {
-        return this.change(this.needsWallet((w) => withValuations(this.catalog, w, changes)));
+        return this.change((w) => withValuations(this.catalog, w ?? emptyWallet(), changes));
     }
     replace(wallet) {
         return this.change(() => ({ ok: true, wallet, fields: {}, notes: [] }));
@@ -91,17 +89,3 @@ export class JsonWalletStore {
         });
     }
 }
-export function memoryBackend(initial = null) {
-    let text = initial;
-    return {
-        read: () => Promise.resolve(text),
-        write: (next) => {
-            text = next;
-            return Promise.resolve();
-        },
-        remove: () => {
-            text = null;
-            return Promise.resolve();
-        },
-    };
-}

package/dist/data/wallet-edit.js

@@ -93,6 +93,17 @@ function cardsSeq(text) {
     }
     return { doc, cards };
 }
+function rootMap(text) {
+    const doc = parseDocument(text);
+    if (doc.errors.length > 0)
+        throw new Error(doc.errors[0]?.message);
+    const root = doc.contents;
+    if (!isMap(root))
+        throw new Error(`the wallet isn't a map; ${BY_HAND}`);
+    return root;
+}
+// A wallet with no cards yet, for memberships or point values saved first.
+export const EMPTY_WALLET_TEXT = `${NEW_WALLET}version: ${String(WALLET_VERSION)}\ncards: []\n`;
 function findCard(text, cardId) {
     const { cards } = cardsSeq(text);
     const card = cards.items.find((item) => isMap(item) && item.get('id') === cardId);
@@ -108,6 +119,17 @@ export function addCardText(text, entry) {
     if (text === null || text.trim() === '') {
         return `${NEW_WALLET}version: ${String(WALLET_VERSION)}\ncards:\n${cardLines(entry, '  ')}`;
     }
+    const pair = rootMap(text).items.find((p) => keyOf(p) === 'cards');
+    const value = pair?.value;
+    const none = value === null || (isSeq(value) && value.items.length === 0);
+    if (!pair || none) {
+        const block = `cards:\n${cardLines(entry, '  ')}`;
+        if (!pair)
+            return insertLines(text, text.length, block);
+        const start = lineStart(text, range(pair.key)[0]);
+        const end = afterLine(text, range(value ?? pair.key)[1] - 1);
+        return text.slice(0, start) + block + text.slice(end);
+    }
     const { cards } = cardsSeq(text);
     const first = cards.items[0];
     if (!isMap(first))
@@ -125,8 +147,13 @@ function cardLines(entry, dashIndent) {
 }
 export function removeCardText(text, cardId) {
     const card = findCard(text, cardId);
-    const start = lineStart(text, range(card)[0]);
     const end = afterLine(text, range(card)[1] - 1);
+    if (cardsSeq(text).cards.items.length === 1) {
+        const pair = rootMap(text).items.find((p) => keyOf(p) === 'cards');
+        const start = lineStart(text, range(pair?.key)[0]);
+        return `${text.slice(0, start)}cards: []\n${text.slice(end)}`;
+    }
+    const start = lineStart(text, range(card)[0]);
     return text.slice(0, start) + text.slice(end);
 }
 // Replaces each given field in place, or adds it after the card's last line.
@@ -156,10 +183,7 @@ export function updateCardText(text, cardId, fields) {
     return out;
 }
 export function setMembershipsText(text, memberships) {
-    const { doc } = cardsSeq(text);
-    const root = doc.contents;
-    if (!isMap(root))
-        throw new Error(`the wallet isn't a map; ${BY_HAND}`);
+    const root = rootMap(text);
     const line = `memberships: ${flowList(memberships)}\n`;
     const pair = root.items.find((p) => keyOf(p) === 'memberships');
     if (pair) {
@@ -168,7 +192,9 @@ export function setMembershipsText(text, memberships) {
         return text.slice(0, start) + line + text.slice(end);
     }
     const cards = root.items.find((p) => keyOf(p) === 'cards');
-    return insertLines(text, lineStart(text, range(cards?.key)[0]), line);
+    return cards
+        ? insertLines(text, lineStart(text, range(cards.key)[0]), line)
+        : insertLines(text, text.length, line);
 }
 // Point values, one currency at a time so the rest of the file, comments
 // included, stays as it was: a value is replaced in place, a new one goes
@@ -192,10 +218,7 @@ function aboveComments(text, at) {
     return start;
 }
 function setValuationText(text, id, cents) {
-    const { doc } = cardsSeq(text);
-    const root = doc.contents;
-    if (!isMap(root))
-        throw new Error(`the wallet isn't a map; ${BY_HAND}`);
+    const root = rootMap(text);
     const pair = root.items.find((p) => keyOf(p) === 'valuations');
     const map = pair?.value;
     const line = cents === null ? '' : `${id}: ${String(cents)}`;
@@ -209,7 +232,9 @@ function setValuationText(text, id, cents) {
             return text.slice(0, start) + block + text.slice(end);
         }
         const before = root.items.find((p) => keyOf(p) === 'memberships' || keyOf(p) === 'cards');
-        return insertLines(text, aboveComments(text, range(before?.key)[0]), block);
+        return before
+            ? insertLines(text, aboveComments(text, range(before.key)[0]), block)
+            : insertLines(text, text.length, block);
     }
     if (!isMap(map))
         throw new Error(`"valuations" isn't a map; ${BY_HAND}`);
@@ -251,7 +276,7 @@ function flowUsage(booking) {
         : booking.period;
     return `{ period: ${period}, spent: ${String(booking.after)} }`;
 }
-export function capUsageText(text, booking) {
+function capUsageText(text, booking) {
     const card = findCard(text, booking.cardId);
     const value = flowUsage(booking);
     const usage = card.get('cap_usage', true);
@@ -271,7 +296,7 @@ export function capUsageText(text, booking) {
     const at = afterLine(text, range(card)[1] - 1);
     return insertLines(text, at, `${indent}cap_usage:\n${indent}  ${booking.capKey}: ${value}\n`);
 }
-export function bonusSpentText(text, cardId, spent) {
+function bonusSpentText(text, cardId, spent) {
     const bonus = findCard(text, cardId).get('bonus', true);
     if (!isMap(bonus))
         throw new Error(`card '${cardId}' has no bonus`);

package/dist/engine/cheat-sheet.js

@@ -1,11 +1,11 @@
-import { resolveMerchantById } from "../merchants/resolve.js";
-import { categoryResolution, exploreCards, } from "./explore.js";
+import { categoryResolution, resolveMerchantById, } from "../merchants/resolve.js";
+import { exploreCards } from "./explore.js";
 import { bonusStatus } from "./bonus.js";
 import { EPSILON, isClose } from "./compare.js";
 import { periodKey } from "./periods.js";
 import { recommend } from "./recommend.js";
 import { setupNotes } from "./setup.js";
-import { feeText, listed, money, shortDate } from "./text.js";
+import { capitalize, feeText, listed, money, shortDate } from "./text.js";
 // The everyday kinds of purchase: the cheat sheet's rows and the site's
 // quick picks.
 export const EVERYDAY_PURCHASES = [
@@ -100,7 +100,6 @@ export function cheatSheet(catalog, wallet, date, items = EVERYDAY_PURCHASES) {
 // The best card earnrate knows for each everyday kind of purchase, for
 // someone who hasn't named any cards. Each row's note says what the card
 // costs or needs.
-const capitalized = (t) => t.charAt(0).toUpperCase() + t.slice(1);
 export function catalogCheatSheet(catalog, date, options, items = EVERYDAY_PURCHASES) {
     const rows = items.map((item) => {
         const top = exploreCards(catalog, 'merchant' in item
@@ -119,7 +118,7 @@ export function catalogCheatSheet(catalog, date, options, items = EVERYDAY_PURCH
                 channel: null,
                 date,
             }, options).ranked[0];
-        const fee = top ? `${capitalized(feeText(top))}.` : null;
+        const fee = top ? `${capitalize(feeText(top))}.` : null;
         return {
             label: item.label,
             cardId: top?.cardId ?? null,

package/dist/engine/compare.js

@@ -1,5 +1,7 @@
 // Returns closer than this are equal: floating-point noise, not a difference.
 export const EPSILON = 1e-9;
+// Dollar amounts closer than half a cent print the same.
+export const HALF_CENT = 0.005;
 // A card close to the best one: within a percentage point, and at least
 // three quarters of its rate. Answers and cheat sheets mention a welcome
 // bonus card when it's this close.

package/dist/engine/evaluate.js

@@ -1,4 +1,4 @@
-import { periodKey } from "./periods.js";
+import { inEffect, periodKey } from "./periods.js";
 export function purchaseContext(catalog, wallet, merchant, category, purchase) {
     return {
         category,
@@ -110,9 +110,7 @@ function applicability(card, rule, ctx, held, picked) {
         return 'no';
     if (rule.geography === 'us_only' && ctx.country !== 'US')
         return 'no';
-    if (rule.valid_from !== undefined && ctx.date < rule.valid_from)
-        return 'no';
-    if (rule.valid_to !== undefined && ctx.date > rule.valid_to)
+    if (!inEffect(rule, ctx.date))
         return 'no';
     const membership = rule.requires?.membership;
     if (membership !== undefined && !ctx.memberships.has(membership))

package/dist/engine/explore.js

@@ -1,4 +1,4 @@
-import { resolveMerchant } from "../merchants/resolve.js";
+import { categoryResolution, resolvePlace } from "../merchants/resolve.js";
 import { evaluateCard, purchaseContext } from "./evaluate.js";
 import { membershipName, membershipNeeded, paidMemberships, } from "./memberships.js";
 import { choicePeriod, periodKey } from "./periods.js";
@@ -6,7 +6,7 @@ import { recommend } from "./recommend.js";
 import { rotationGap } from "./rotation.js";
 import { membershipsUsed } from "./setup.js";
 import { optionName } from "./wallet-summary.js";
-import { CAP_PERIODS, categoryPhrase, choiceName, codesAs, earnText, money, PICK_PERIODS, pointValuesText, } from "./text.js";
+import { CAP_PERIODS, categoryPhrase, choiceName, codesAs, earnText, listed, money, PICK_PERIODS, pointValuesText, } from "./text.js";
 import { cardValuation } from "./valuation.js";
 import { EPSILON } from "./compare.js";
 export const ALL_PERSONAL_CARDS = {
@@ -49,38 +49,6 @@ export function idealHolding(card, date, picks = {}) {
             : {}),
     };
 }
-const plainWords = (s) => s
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, ' ')
-    .trim();
-// A category from everyday words: an alias ("groceries") first, then the
-// name, then the id, so "grocery" means supermarkets rather than the parent.
-export function findCategory(catalog, text) {
-    const wanted = plainWords(text);
-    if (wanted === '')
-        return null;
-    const by = (key) => catalog.categories.find((c) => key(c).map(plainWords).includes(wanted))?.id;
-    return (by((c) => c.aliases) ?? by((c) => [c.name]) ?? by((c) => [c.id]) ?? null);
-}
-export function categoryResolution(catalog, category, channel) {
-    const found = catalog.categories.find((c) => c.id === category);
-    if (!found)
-        throw new Error(`unknown category '${category}'`);
-    return {
-        input: found.name,
-        merchantId: null,
-        resolvedName: found.name,
-        category,
-        likelyMcc: null,
-        accepts: null,
-        ambiguity: null,
-        channel,
-        confidence: 'high',
-        source: 'category',
-        bookedVia: [],
-        inference: null,
-    };
-}
 function walletOf(held, options) {
     return {
         valuations: options.valuations,
@@ -185,7 +153,7 @@ function compareExplored(a, b) {
 export function exploreCards(catalog, query, options, resolved) {
     const merchant = resolved ??
         (query.merchant !== null
-            ? resolveMerchant(catalog, query.merchant, query.channel)
+            ? resolvePlace(catalog, query.merchant, query.channel)
             : categoryResolution(catalog, query.category ?? 'other', query.channel));
     const purchase = {
         merchant: merchant.input,
@@ -259,7 +227,7 @@ function exploreAssumptions(catalog, merchant, ranked, options) {
     assumptions.push('Assumes each card is set up for this purchase: the right category pick, any activation done, and none of its cap used yet. A card you hold may differ.');
     assumptions.push(options.memberships.length === 0
         ? 'Assumes no memberships (like Amazon Prime). Rates that need one are listed separately.'
-        : `Assumes these memberships: ${options.memberships.join(', ')}.`);
+        : `Assumes these memberships: ${listed(options.memberships.map((m) => membershipName(catalog, m)))}.`);
     const values = pointValuesText(catalog, ranked.slice(0, 10));
     if (values !== null)
         assumptions.push(values);

package/dist/engine/memberships.js

@@ -6,7 +6,7 @@ export function membershipName(catalog, id) {
     return membership(catalog, id)?.name ?? words(id);
 }
 // "a Costco membership", for a sentence.
-export function withArticle(name) {
+function withArticle(name) {
     return `${/^[aeiou]/i.test(name) ? 'an' : 'a'} ${name}`;
 }
 // Tiers of one membership: holding one, the others in its group aren't

package/dist/engine/offers.js

@@ -1,6 +1,7 @@
 import { bonusDollars } from "./bonus.js";
 import { matchesFilters } from "./explore.js";
 import { membershipCosts, paidMemberships } from "./memberships.js";
+import { inEffect } from "./periods.js";
 import { money, roundCents } from "./text.js";
 import { cardValuation } from "./valuation.js";
 function ineligibleText(catalog, wallet, notWith) {
@@ -41,7 +42,7 @@ export function compareOffers(catalog, wallet, filters, today) {
         if (!matchesFilters(card, { ...filters, issuer: null, includeClosed: true }))
             continue;
         const offer = card.welcome_offer;
-        if (!offer || (offer.valid_to !== undefined && offer.valid_to < today)) {
+        if (!offer || !inEffect(offer, today)) {
             withoutOffer.push(card.id);
             continue;
         }

package/dist/engine/periods.js

@@ -38,3 +38,21 @@ export function choicePeriod(card) {
     ];
     return periods.length > 1 ? null : (periods[0] ?? 'calendar_year');
 }
+// Whether a dated rule or offer is in effect on `date`; an open end has no
+// limit on that side.
+export const inEffect = (window, date) => (window.valid_from === undefined || window.valid_from <= date) &&
+    (window.valid_to === undefined || window.valid_to >= date);
+// The last day of a period key ("2026-Q4", "2026-10", "2026").
+export 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;
+}

package/dist/engine/recommend.js

@@ -1,10 +1,10 @@
-import { resolveMerchant, resolveMerchantById } from "../merchants/resolve.js";
+import { findMerchant, resolveMerchant, resolveMerchantById, } from "../merchants/resolve.js";
 import { bonusStatus } from "./bonus.js";
 import { evaluateCard, purchaseContext, usableAt, } from "./evaluate.js";
 import { daysBetween } from "./periods.js";
 import { rotationGap } from "./rotation.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 { CAP_ADJECTIVES, categoryPhrase, codesAs, currencyLabel, currencyName, earnText, money, NETWORK_NAMES, num, pct, pointValuesText, roundCents, shortDate, wholeDollars, } from "./text.js";
 import { cardValuation } from "./valuation.js";
 export const STALE_AFTER_DAYS = 180;
 // The warning when no card works; the CLI shows it as the answer instead.
@@ -104,7 +104,7 @@ function reasoningFor(catalog, wallet, entry, amount) {
         lines.push(`Pools into ${currencyName(catalog, currency)} because you hold ${heldPartners.join(' and ')}.`);
     }
     if (currency !== 'cash') {
-        lines.push(`Valued at ${num(valuation.centsPerUnit)}¢ per point: ${num(entry.effectiveReturnPct)}% back.`);
+        lines.push(`Valued at ${num(valuation.centsPerUnit)}¢ per point: ${pct(entry.effectiveReturnPct)} back.`);
     }
     return lines;
 }
@@ -144,7 +144,7 @@ function warningsFor(catalog, entry, purchase) {
         warnings.push(`Your chosen categories are set for ${evaluation.staleChoice}, not the current period, so chosen-category bonuses don't apply until you update them.`);
     }
     for (const rule of evaluation.needsActivation) {
-        warnings.push(`Activate this bonus with the issuer (it's free) to earn ${earnText(catalog, rule.rate, valuation.currency)} here${rule.valid_to === undefined ? '' : ` through ${shortDate(rule.valid_to)}`}.`);
+        warnings.push(`Activate this bonus with the issuer (it's free)${rule.activate_by === undefined ? '' : ` by ${shortDate(rule.activate_by)}`} to earn ${earnText(catalog, rule.rate, valuation.currency)} here${rule.valid_to === undefined ? '' : ` through ${shortDate(rule.valid_to)}`}.`);
     }
     return warnings;
 }
@@ -183,7 +183,7 @@ function tieNote(entries) {
             tied.some((e) => e.evaluation.best.cap !== null)
             ? 'because its rate has no cap'
             : 'by a fixed order; either works';
-    return `${names} also ${verb} ${num(winner.effectiveReturnPct)}% here. ${displayName(winner)} wins the tie ${why}.`;
+    return `${names} also ${verb} ${pct(winner.effectiveReturnPct)} here. ${displayName(winner)} wins the tie ${why}.`;
 }
 // Finds the closest point inside a currency's value range where the winner
 // stops winning, varying one currency at a time. Returns are linear in the
@@ -278,19 +278,18 @@ export function recommend(catalog, wallet, purchase, merchant = resolveMerchant(
             const twin = alts.find((e) => e.card.id !== winner.card.id &&
                 alt.effectiveReturnPct - e.effectiveReturnPct <= EPSILON);
             if (alt.card.id !== winner.card.id)
-                warnings.push(`${as}, ${displayName(alt)} wins (${num(alt.effectiveReturnPct)}%).`);
+                warnings.push(`${as}, ${displayName(alt)} wins (${pct(alt.effectiveReturnPct)}).`);
             else if (twin)
-                warnings.push(`${as}, ${displayName(twin)} earns as much (${num(twin.effectiveReturnPct)}%).`);
+                warnings.push(`${as}, ${displayName(twin)} earns as much (${pct(twin.effectiveReturnPct)}).`);
         }
     }
     if (!winner) {
         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 = [
-            ...catalog.merchants.overrides,
-            ...catalog.merchants.seed,
-        ].find((m) => m.id === merchant.merchantId);
+        const record = merchant.merchantId === null
+            ? undefined
+            : findMerchant(catalog, merchant.merchantId);
         const online = merchant.channel === 'in_store' &&
             merchant.merchantId !== null &&
             record?.online?.accepts !== undefined
@@ -300,7 +299,7 @@ export function recommend(catalog, wallet, purchase, merchant = resolveMerchant(
             ? rankEntries(catalog, wallet, { ...purchase, channel: 'online' }, online, online.category).entries[0]
             : undefined;
         if (alt)
-            warnings.push(`Ordering online instead? ${displayName(alt)} works there (${num(alt.effectiveReturnPct)}%).`);
+            warnings.push(`Ordering online instead? ${displayName(alt)} works there (${pct(alt.effectiveReturnPct)}).`);
     }
     else if (merchant.accepts === null &&
         (winner.card.network === 'amex' || winner.card.network === 'discover')) {
@@ -325,7 +324,7 @@ export function recommend(catalog, wallet, purchase, merchant = resolveMerchant(
         const alt = rankEntries(catalog, wallet, purchase, via, via.category)
             .entries[0];
         if (alt && alt.effectiveReturnPct > winner.effectiveReturnPct + EPSILON) {
-            notes.push(`If you book it as ${via.resolvedName}, ${displayName(alt)} earns ${num(alt.effectiveReturnPct)}%.`);
+            notes.push(`If you book it as ${via.resolvedName}, ${displayName(alt)} earns ${pct(alt.effectiveReturnPct)}.`);
         }
     }
     const open = bonusPick(catalog, wallet, entries, purchase.date);
@@ -341,7 +340,7 @@ export function recommend(catalog, wallet, purchase, merchant = resolveMerchant(
     const bonus = open && (open.behind || ties) ? open : null;
     const best = winner?.effectiveReturnPct ?? 0;
     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.`);
+        notes.push(`${displayName(open.entry)} earns ${pct(open.entry.effectiveReturnPct)} here, ${num(gap)} ${gap === 1 ? 'point' : 'points'} less than ${pct(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;
     // A tie among the top cards doesn't matter when a welcome bonus decides.
@@ -377,7 +376,7 @@ export function recommend(catalog, wallet, purchase, merchant = resolveMerchant(
             : `You're behind pace on ${displayName(bonus.entry)}'s welcome bonus: ${money(remaining)} more to spend by ${deadline}${pace}${worth}.${isBest
                 ? ''
                 : costHere === null
-                    ? ` It earns ${num(top.effectiveReturnPct)}% here against ${num(first.effectiveReturnPct)}% on ${displayName(entries[0] ?? bonus.entry)}, which the bonus outweighs.`
+                    ? ` It earns ${pct(top.effectiveReturnPct)} here against ${pct(first.effectiveReturnPct)} on ${displayName(entries[0] ?? bonus.entry)}, which the bonus outweighs.`
                     : ` Using it here earns ${money(costHere)} less than ${displayName(entries[0] ?? bonus.entry)}, which the bonus outweighs.`}`);
     }
     let confidence = merchant.confidence;

package/dist/engine/setup.js

@@ -2,19 +2,10 @@ import { isActivated, pickedCategories } from "./evaluate.js";
 import { membership, membershipName, sameGroup } from "./memberships.js";
 import { daysBetween } from "./periods.js";
 import { rotationGap } from "./rotation.js";
+import { idList, listed } from "./text.js";
 // Rules that start within this many days are worth activating now.
 const ACTIVATION_LOOKAHEAD_DAYS = 45;
-const ISSUER_NICKNAMES = {
-    amex: 'american express',
-    'bank-of-america': 'bofa boa bankofamerica',
-    'capital-one': 'capitalone',
-    citi: 'citibank',
-    usbank: 'us bank',
-    'wells-fargo': 'wf wellsfargo',
-    'td-bank': 'td',
-    column: 'bilt',
-};
-const words = (s) => s
+const searchWords = (s) => s
     .toLowerCase()
     .replace(/\+/g, ' plus ')
     .replace(/&/g, ' and ')
@@ -33,12 +24,12 @@ function editDistance(a, b) {
     }
     return row[b.length] ?? 0;
 }
-function matcher(card) {
+function matcher(catalog, card) {
     const haystack = [
-        ...words(card.id),
-        ...words(card.name),
-        ...words(card.issuer),
-        ...words(ISSUER_NICKNAMES[card.issuer] ?? ''),
+        ...searchWords(card.id),
+        ...searchWords(card.name),
+        ...searchWords(card.issuer),
+        ...(catalog.issuers.find((i) => i.id === card.issuer)?.search ?? []).flatMap(searchWords),
     ];
     const compact = haystack.join('');
     return (token) => haystack.some((w) => w.startsWith(token)) ||
@@ -108,12 +99,12 @@ export function cardInfo(catalog, card, wallet, today) {
 // issuer (as a prefix, or with a typo or two in a long word). With no full
 // match, the cards matching the most words come back instead.
 export function searchCards(catalog, query, wallet, today) {
-    const tokens = words(query);
+    const tokens = searchWords(query);
     const scored = catalog.cards.map((card) => {
-        const matches = matcher(card);
+        const matches = matcher(catalog, card);
         return { card, score: tokens.filter((t) => matches(t)).length };
     });
-    const byShortestId = (a, b) => words(a.card.id).length - words(b.card.id).length ||
+    const byShortestId = (a, b) => searchWords(a.card.id).length - searchWords(b.card.id).length ||
         a.card.id.localeCompare(b.card.id);
     const full = scored.filter((s) => s.score === tokens.length);
     const best = Math.max(0, ...scored.map((s) => s.score));
@@ -131,7 +122,6 @@ export function searchCards(catalog, query, wallet, today) {
         exact,
     };
 }
-const list = (ids) => ids.join(', ');
 // What a card in the wallet still needs before its answers are right.
 export function setupNotes(catalog, wallet, held, today) {
     const card = catalog.cards.find((c) => c.id === held.id);
@@ -145,11 +135,11 @@ export function setupNotes(catalog, wallet, held, today) {
             (staleChoice === null || choice.period === 'until_changed');
         if (current)
             continue;
-        const options = list(Object.keys(choice.options));
+        const options = idList(Object.keys(choice.options));
         notes.push({
             kind: 'pick',
             text: choice.default && picked.has(choice.id)
-                ? `${name}'s ${choice.id} pick is assumed to be ${list(choice.default)}, the default. Set it if a different one was picked (${String(choice.pick)} of: ${options}).`
+                ? `${name}'s ${choice.id} pick is assumed to be ${idList(choice.default)}, the default. Set it if a different one was picked (${String(choice.pick)} of: ${options}).`
                 : `${name} needs its ${choice.id} pick for this period (${String(choice.pick)} of: ${options}). Until then those categories earn the base rate.`,
         });
     }
@@ -158,14 +148,14 @@ export function setupNotes(catalog, wallet, held, today) {
     if (missing.length > 0) {
         notes.push({
             kind: 'membership',
-            text: `Some of ${name}'s rates need a membership: ${list(missing)}. Add any that apply to the wallet's memberships.`,
+            text: `Some of ${name}'s rates need ${listed(missing.map((m) => `${membershipName(catalog, m)} (${m})`), 'or')}; they're counted without it.`,
         });
     }
     const toActivate = activationRules(card, today).filter((id) => !isActivated(card, held, id));
     if (toActivate.length > 0) {
         notes.push({
             kind: 'activation',
-            text: `${name} has rates that apply only once activated with the issuer: ${list(toActivate)}. Mark the ones already activated.`,
+            text: `${name} has rates that apply only once activated with the issuer: ${idList(toActivate)}. Mark the ones already activated.`,
         });
     }
     if (needsAnniversary(card) && held.anniversary === undefined) {

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 { money, roundCents } from "./text.js";
 import { cardValuation } from "./valuation.js";
-import { EPSILON } from "./compare.js";
+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 };
     });
@@ -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} ${money(t.monthly)}`).join(', ')}. Give your own amounts for a closer answer.`;

package/dist/engine/text.js

@@ -2,6 +2,18 @@ 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, ' ');
 const dateWords = (date, options) => new Date(`${date}T12:00:00Z`).toLocaleDateString('en-US', {
@@ -47,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) {