earnrate 0.2.4 → 0.2.6

package/dist/cli/wallet.js

@@ -2,6 +2,8 @@ import { parseArgs } from 'node:util';
 import { CLI_NAME } from "../brand.js";
 import { FileWalletStore } from "../data/file-store.js";
 import { loadCatalog, loadWallet, walletPath } from "../data/load.js";
+import { isValuationProfile, profileText, VALUATION_PROFILES, } from "../engine/profiles.js";
+import { membershipName } from "../engine/memberships.js";
 import { knownMemberships, searchCards } from "../engine/setup.js";
 import { formatCardInfo, formatNotes } from "../format/cards.js";
 import { displayPath, RUNTIME_ERROR, USAGE_ERROR } from "./run.js";
@@ -40,19 +42,35 @@ ${CARD_OPTIONS}
 `,
     update: `Usage: ${CLI_NAME} update <card-id> [options]
 
-Changes a card in your wallet: picks for this period, label, anniversary or
-activations. Picks for the current period are merged with ones already set.
+Changes a card in your wallet: picks for this period, label, anniversary,
+activations or welcome bonus. Picks for the current period are merged with
+ones already set.
 
 ${CARD_OPTIONS}
 `,
     remove: `Usage: ${CLI_NAME} remove <card-id>
 
-Removes a card from your wallet, with its tracked cap usage.
+Removes a card from your wallet, with its tracked cap usage and bonus
+progress. Your memberships and point values stay.
 `,
     memberships: `Usage: ${CLI_NAME} memberships [<membership>...] [--none]
 
 With no arguments, shows your memberships and the ones earnrate knows. With
-names, replaces the list. --none clears it.
+names, replaces the list. --none clears it. No cards need to be saved first.
+`,
+    values: `Usage: ${CLI_NAME} values [<currency>=<cents>...] [--profile <name>]
+
+What your points are worth to you, in cents per point, saved in your wallet
+file; every answer then uses them unless you pass --valuation. With no
+arguments, shows them.
+
+Examples:
+  ${CLI_NAME} values UR=1.5 MR=1.6
+  ${CLI_NAME} values UR=default          back to earnrate's value
+  ${CLI_NAME} values --profile points-heavy
+
+Options:
+  --profile <name>       flat (${profileText('flat')}) or points-heavy (${profileText('points-heavy')}).
 `,
 };
 const HINTS = {
@@ -118,6 +136,7 @@ export async function runWalletCommand(command, argv, io) {
                 'bonus-by': { type: 'string' },
                 'no-bonus': { type: 'boolean' },
                 none: { type: 'boolean' },
+                profile: { type: 'string' },
                 help: { type: 'boolean', short: 'h' },
             },
         });
@@ -160,6 +179,32 @@ export async function runWalletCommand(command, argv, io) {
         io.stdout(`${header}${result.cards.map(formatCardInfo).join('\n')}\n`);
         return 0;
     }
+    if (command === 'values') {
+        const changes = {};
+        if (values.profile !== undefined) {
+            if (!isValuationProfile(values.profile))
+                return usage(`Unknown profile "${values.profile}". Use flat or points-heavy.`);
+            Object.assign(changes, VALUATION_PROFILES[values.profile]);
+        }
+        for (const arg of positionals) {
+            const [id, value] = arg.split('=');
+            const cents = value === 'default' ? null : Number(value);
+            if (!id ||
+                value === undefined ||
+                (cents !== null && !Number.isFinite(cents)))
+                return usage(`"${arg}" isn't <currency>=<cents>, like UR=1.5.`);
+            changes[id] = cents;
+        }
+        if (Object.keys(changes).length === 0) {
+            const held = await heldWallet(io);
+            const set = Object.entries(held?.valuations ?? {});
+            io.stdout(`${set.length > 0 ? `Yours: ${set.map(([id, v]) => `${id}=${typeof v === 'number' ? String(v) : JSON.stringify(v)}`).join(' ')}` : "Yours: earnrate's defaults"}\nCurrencies: ${catalog.currencies.map((c) => c.id).join(', ')}\n`);
+            return 0;
+        }
+        return report(await store.setValuations(changes), `Point values updated in ${where}: ${Object.entries(changes)
+            .map(([id, c]) => `${id} ${c === null ? 'back to the default' : `${String(c)}¢`}`)
+            .join(', ')}.`, null, io);
+    }
     if (command === 'memberships') {
         if (positionals.length === 0 && !values.none) {
             const held = await heldWallet(io);
@@ -171,7 +216,7 @@ export async function runWalletCommand(command, argv, io) {
         }
         const list = values.none ? [] : positionals;
         return report(await store.setMemberships(list), list.length > 0
-            ? `Memberships set to ${list.join(', ')} in ${where}.`
+            ? `Memberships set to ${list.map((m) => `${membershipName(catalog, m)} (${m})`).join(', ')} in ${where}.`
             : `Memberships cleared in ${where}.`, null, io);
     }
     if (positionals.length !== 1) {

package/dist/data/file-store.js

@@ -1,7 +1,8 @@
 import { bookPurchase } from "../engine/record.js";
-import { addToWallet, removeFromWallet, updateInWallet, withMemberships, } from "../engine/wallet-change.js";
+import { addToWallet, removeFromWallet, updateInWallet, withMemberships, withValuations, } from "../engine/wallet-change.js";
 import { loadWallet } from "./load.js";
-import { addCardText, commitWalletText, readWalletText, removeCardText, setMembershipsText, updateCardText, writeProgress, } from "./wallet-edit.js";
+import { emptyWallet, } from "./store.js";
+import { addCardText, commitWalletText, EMPTY_WALLET_TEXT, readWalletText, removeCardText, setMembershipsText, setValuationsText, updateCardText, writeProgress, } from "./wallet-edit.js";
 const failed = (error) => ({ ok: false, error });
 const errorText = (e) => (e instanceof Error ? e.message : String(e));
 const queues = new Map();
@@ -56,7 +57,7 @@ export class FileWalletStore {
             }
         });
     }
-    // Changes other than adding a card need a wallet file to change.
+    // Changing or removing a card needs a wallet file to change.
     existing(apply) {
         return (wallet) => wallet === null
             ? `No wallet at ${this.where} yet. Add a card first to create it.`
@@ -69,12 +70,13 @@ export class FileWalletStore {
         return this.change(this.existing((w) => updateInWallet(this.catalog, w, input, today)), (text, change) => updateCardText(text ?? '', input.id, change.fields));
     }
     removeCard(cardId) {
-        return this.change(this.existing((w) => w.cards.length === 1 && w.cards[0]?.id === cardId
-            ? failed(`${cardId} is the last card in ${this.where}. To start over, delete that file; to swap cards, add the new one first.`)
-            : removeFromWallet(w, cardId)), (text) => removeCardText(text ?? '', cardId));
+        return this.change(this.existing((w) => removeFromWallet(w, cardId)), (text) => removeCardText(text ?? '', cardId));
     }
     setMemberships(memberships) {
-        return this.change(this.existing((w) => withMemberships(this.catalog, w, memberships)), (text, change) => setMembershipsText(text ?? '', change.wallet.memberships));
+        return this.change((w) => withMemberships(this.catalog, w ?? emptyWallet(), memberships), (text, change) => setMembershipsText(text ?? EMPTY_WALLET_TEXT, change.wallet.memberships));
+    }
+    setValuations(changes) {
+        return this.change((w) => withValuations(this.catalog, w ?? emptyWallet(), changes), (text) => setValuationsText(text ?? EMPTY_WALLET_TEXT, changes));
     }
     record(purchase, merchant) {
         return withWalletLock(this.where, async () => {

package/dist/data/integrity.js

@@ -60,8 +60,19 @@ function cardProblems(card, catalog, merchantIds) {
     for (const id of card.welcome_offer?.not_with ?? [])
         if (!cardIds.has(id))
             problems.push(`${where} welcome_offer.not_with: unknown card '${id}'`);
-    for (const m of card.requires_membership?.members_shop_at ?? [])
-        checkMerchant(m, 'requires_membership');
+    const memberships = new Set(catalog.memberships.map((m) => m.id));
+    for (const id of [
+        ...(card.requires_membership === undefined
+            ? []
+            : [card.requires_membership]),
+        ...card.rules.flatMap((r) => r.requires?.membership ?? []),
+    ])
+        if (!memberships.has(id))
+            problems.push(`${where}: unknown membership '${id}' (data/memberships.yaml)`);
+    if (card.requires_membership !== undefined &&
+        catalog.memberships.find((m) => m.id === card.requires_membership)
+            ?.annual_fee === undefined)
+        problems.push(`${where}: requires_membership '${card.requires_membership}' has no annual_fee`);
     if (card.pools_into) {
         if (!currencies.has(card.pools_into.currency)) {
             problems.push(`${where} pools_into: unknown currency '${card.pools_into.currency}'`);
@@ -167,6 +178,8 @@ export function catalogProblems(catalog) {
         ['category', catalog.categories.map((c) => c.id)],
         ['currency', catalog.currencies.map((c) => c.id)],
         ['card', catalog.cards.map((c) => c.id)],
+        ['membership', catalog.memberships.map((m) => m.id)],
+        ['issuer', catalog.issuers.map((i) => i.id)],
     ]) {
         for (const id of duplicates(ids))
             problems.push(`duplicate ${kind} id '${id}'`);
@@ -187,8 +200,15 @@ export function catalogProblems(catalog) {
                 problems.push(`merchant ${m.id}: booked_via '${via}' is not a merchant`);
         }
     }
+    for (const m of catalog.memberships)
+        for (const id of m.members_shop_at)
+            if (!merchantIds.has(id))
+                problems.push(`membership ${m.id}: members_shop_at '${id}' is not a merchant`);
+    const issuers = new Set(catalog.issuers.map((i) => i.id));
     for (const card of catalog.cards) {
         problems.push(...cardProblems(card, catalog, merchantIds));
+        if (!issuers.has(card.issuer))
+            problems.push(`${card.id}: unknown issuer '${card.issuer}' (data/issuers.yaml)`);
     }
     return problems;
 }

package/dist/data/load.js

@@ -8,6 +8,8 @@ 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";
 export const DATA_DIR = fileURLToPath(new URL('../../data/', import.meta.url));
@@ -30,14 +32,23 @@ async function loadCards(dir) {
     }));
 }
 export async function loadCatalog(dir = DATA_DIR) {
-    const [categories, currencies, 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),
         readYaml(path.join(dir, 'merchants', 'overrides.yaml'), MerchantsFileSchema),
     ]);
-    return { categories, currencies, cards, merchants: { seed, overrides } };
+    return {
+        categories,
+        currencies,
+        issuers,
+        memberships,
+        cards,
+        merchants: { seed, overrides },
+    };
 }
 // MCP clients pass config values through without a shell, so "~" or
 // "${HOME}" can arrive as literal text; expand them here.

package/dist/data/store.js

@@ -1,7 +1,9 @@
 import { bookPurchase } from "../engine/record.js";
-import { addToWallet, removeFromWallet, updateInWallet, withMemberships, } from "../engine/wallet-change.js";
-import { WalletSchema } from "../schema/wallet.js";
+import { addToWallet, removeFromWallet, updateInWallet, withMemberships, withValuations, } from "../engine/wallet-change.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,7 +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((w) => withValuations(this.catalog, w ?? emptyWallet(), changes));
     }
     replace(wallet) {
         return this.change(() => ({ ok: true, wallet, fields: {}, notes: [] }));
@@ -70,6 +71,10 @@ export class JsonWalletStore {
     disconnect() {
         return Promise.resolve();
     }
+    // The backend doesn't record when it began.
+    started() {
+        return Promise.resolve(null);
+    }
     record(purchase, merchant) {
         return this.serialized(async () => {
             const wallet = await this.load();
@@ -84,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,83 @@ 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
+// after the last, a removed one loses its line. An inline map is rewritten.
+export function setValuationsText(text, changes) {
+    let out = text;
+    for (const [id, cents] of Object.entries(changes))
+        out = setValuationText(out, id, cents);
+    return out;
+}
+// The start of the line at `at`, moved up past the comments right above it,
+// so a comment stays with the line it describes.
+function aboveComments(text, at) {
+    let start = lineStart(text, at);
+    while (start > 0) {
+        const previous = lineStart(text, start - 1);
+        if (!text.slice(previous, start).trimStart().startsWith('#'))
+            break;
+        start = previous;
+    }
+    return start;
+}
+function setValuationText(text, id, cents) {
+    const root = rootMap(text);
+    const pair = root.items.find((p) => keyOf(p) === 'valuations');
+    const map = pair?.value;
+    const line = cents === null ? '' : `${id}: ${String(cents)}`;
+    if (!pair || map === null || (isMap(map) && map.items.length === 0)) {
+        if (cents === null)
+            return text;
+        const block = `valuations:\n  ${line}\n`;
+        if (pair) {
+            const start = range(pair.key)[0];
+            const end = afterLine(text, range(map ?? pair.key)[1] - 1);
+            return text.slice(0, start) + block + text.slice(end);
+        }
+        const before = root.items.find((p) => keyOf(p) === 'memberships' || keyOf(p) === 'cards');
+        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}`);
+    if (map.flow) {
+        const values = Object.entries(map.toJSON()).filter(([k]) => k !== id);
+        if (cents !== null)
+            values.push([id, cents]);
+        const entries = values.map(([k, v]) => `${k}: ${stringify(v, { flow: true }).trimEnd()}`);
+        const start = range(pair.key)[0];
+        const end = afterLine(text, range(map)[1] - 1);
+        return (text.slice(0, start) +
+            (entries.length === 0 ? '' : `valuations: { ${entries.join(', ')} }\n`) +
+            text.slice(end));
+    }
+    const own = map.items.find((p) => keyOf(p) === id);
+    if (own) {
+        if (cents === null) {
+            if (map.items.length === 1) {
+                const start = lineStart(text, range(pair.key)[0]);
+                return (text.slice(0, start) + text.slice(afterLine(text, range(map)[1] - 1)));
+            }
+            const start = lineStart(text, range(own.key)[0]);
+            return (text.slice(0, start) +
+                text.slice(afterLine(text, range(own.value)[1] - 1)));
+        }
+        const [start, end] = range(own.value);
+        return text.slice(0, start) + String(cents) + text.slice(end);
+    }
+    if (cents === null)
+        return text;
+    const first = map.items[0];
+    const last = map.items.at(-1);
+    const indent = ' '.repeat(column(text, range(first?.key)[0]));
+    return insertLines(text, afterLine(text, range(last?.value ?? last?.key)[1] - 1), `${indent}${line}\n`);
 }
 function flowUsage(booking) {
     const period = /^\d+$/.test(booking.period)
@@ -176,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);
@@ -196,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,14 @@
-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 { listed, money, shortDate } from "./text.js";
-const CHEAT_SHEET_ITEMS = [
+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 = [
     { label: 'Groceries', category: 'grocery.supermarket' },
     { label: 'Dining', category: 'dining' },
     { label: 'Gas', category: 'gas' },
@@ -18,7 +21,7 @@ const CHEAT_SHEET_ITEMS = [
 ];
 // The best card in the wallet for each everyday kind of purchase on `date`,
 // with caps, picks and activations as the wallet has them.
-export function cheatSheet(catalog, wallet, date, items = CHEAT_SHEET_ITEMS) {
+export function cheatSheet(catalog, wallet, date, items = EVERYDAY_PURCHASES) {
     const ranked = [];
     const rows = items.map((item) => {
         const merchant = 'merchant' in item
@@ -53,8 +56,8 @@ export function cheatSheet(catalog, wallet, date, items = CHEAT_SHEET_ITEMS) {
         const name = held.checkout_label ??
             catalog.cards.find((c) => c.id === held.id)?.name ??
             held.id;
-        // Rows where the bonus card matches the row's card, or comes within a
-        // point and three quarters of its rate (as single answers mention it).
+        // Rows where the bonus card matches the row's card, or is close to it
+        // (as single answers mention it).
         const matches = [];
         const near = [];
         for (const { label, cards } of ranked) {
@@ -62,9 +65,9 @@ export function cheatSheet(catalog, wallet, date, items = CHEAT_SHEET_ITEMS) {
             const own = cards.find((c) => c.cardId === held.id)?.effectiveReturnPct;
             if (best === undefined || own === undefined)
                 continue;
-            if (best - own < 1e-9)
+            if (best - own < EPSILON)
                 matches.push(label.toLowerCase());
-            else if (best - own <= 1 && own >= best * 0.75)
+            else if (isClose(own, best))
                 near.push(label.toLowerCase());
         }
         const where = [
@@ -97,14 +100,11 @@ export function cheatSheet(catalog, wallet, date, items = CHEAT_SHEET_ITEMS) {
 // 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.
-export function catalogCheatSheet(catalog, date, options, items = CHEAT_SHEET_ITEMS) {
+export function catalogCheatSheet(catalog, date, options, items = EVERYDAY_PURCHASES) {
     const rows = items.map((item) => {
         const top = exploreCards(catalog, 'merchant' in item
             ? {
-                merchant: catalog.merchants.seed.find((m) => m.id === item.merchant)
-                    ?.name ??
-                    catalog.merchants.overrides.find((m) => m.id === item.merchant)
-                        ?.name ??
+                merchant: resolveMerchantById(catalog, item.merchant, null)?.resolvedName ??
                     item.label,
                 category: null,
                 amount: null,
@@ -118,11 +118,7 @@ export function catalogCheatSheet(catalog, date, options, items = CHEAT_SHEET_IT
                 channel: null,
                 date,
             }, options).ranked[0];
-        const fee = top?.annualFee === null || top?.annualFee === undefined
-            ? null
-            : top.annualFee === 0
-                ? 'No annual fee.'
-                : `$${String(top.annualFee)} annual fee.`;
+        const fee = top ? `${capitalize(feeText(top))}.` : null;
         return {
             label: item.label,
             cardId: top?.cardId ?? null,

package/dist/engine/compare.js

@@ -0,0 +1,10 @@
+// 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.
+export function isClose(own, best) {
+    return best - own <= 1 && own >= best * 0.75;
+}

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))