@nbtca/prompt 1.4.2 → 1.5.1

package/dist/features/calendar-heatmap.js

@@ -1,12 +1,7 @@
-/**
- * Heatmap renderer for calendar activity.
- * GitHub-contributions-style grid: 7 weekday rows (Mon..Sun), week columns.
- */
 import chalk from 'chalk';
 import { pickIcon } from '../core/icons.js';
 import { space, type } from '../core/theme.js';
 import { t, getCurrentLanguage } from '../i18n/index.js';
-/** Parse a 'YYYY-MM-DD' date string into a UTC proxy Date (host-timezone-independent). */
 function parseBucketDate(date) {
     const parts = date.split('-').map(Number);
     const y = parts[0] ?? 0;
@@ -14,11 +9,9 @@ function parseBucketDate(date) {
     const d = parts[2] ?? 1;
     return new Date(Date.UTC(y, m - 1, d));
 }
-/** 0=Sun,1=Mon,...,6=Sat -> Mon-indexed 0..6 */
 function utcDayToMonIndex(utcDay) {
     return (utcDay + 6) % 7;
 }
-/** Map a count to a unicode intensity glyph (or ASCII fallback). */
 function countToGlyph(count) {
     if (count <= 0)
         return pickIcon('·', ' ');
@@ -30,46 +23,28 @@ function countToGlyph(count) {
         return pickIcon('▓', '-');
     return pickIcon('█', '=');
 }
-// A fixed 4-stop truecolor green ramp, not chalk's named green/greenBright --
-// those resolve to whatever the user's terminal theme defines for "green",
-// same problem the rest of the app's palette solved by specifying hex
-// directly (theme.ts's brand blue, brandGradient) instead of leaning on
-// ANSI color names. Kept muted/desaturated rather than a punchy grass
-// green so it sits quietly next to the app's own cool blue palette instead
-// of reading as a louder, disconnected accent.
 const HEATMAP_RAMP = ['#1b4332', '#2d6a4f', '#40916c', '#52b788'];
 const MAX_WEEK_COLUMNS = 53;
 const GRID_PREFIX_WIDTH = 6;
-/** Apply a green color ramp based on count. Identity when count is 0. */
 function applyColor(glyph, count, useColor) {
     if (!useColor || count <= 0)
         return glyph;
     const level = Math.min(count, HEATMAP_RAMP.length) - 1;
     return chalk.hex(HEATMAP_RAMP[level])(glyph);
 }
-/**
- * Render a GitHub-contributions-style heatmap grid.
- *
- * @param buckets  Dense daily buckets from nbtcal's .heatmap() call.
- * @param today    The "today" date (used to determine the end column).
- * @param options  Optional rendering options.
- */
 export function renderHeatmap(buckets, today, options) {
     const useColor = options?.color === true;
     const trans = t();
-    const cellWidth = options?.cols !== undefined
-        && options.cols < GRID_PREFIX_WIDTH + MAX_WEEK_COLUMNS * 2 ? 1 : 2;
+    const cellWidth = options?.cols !== undefined && options.cols < GRID_PREFIX_WIDTH + MAX_WEEK_COLUMNS * 2 ? 1 : 2;
     const availableColumns = options?.cols === undefined
         ? MAX_WEEK_COLUMNS
         : Math.floor((options.cols - GRID_PREFIX_WIDTH) / cellWidth);
     const numCols = Math.max(1, Math.min(MAX_WEEK_COLUMNS, availableColumns));
-    // Build a lookup map: 'YYYY-MM-DD' -> count
     const countByDate = new Map();
     for (const b of buckets) {
         countByDate.set(b.date, b.count);
     }
     const todayProxy = new Date(Date.UTC(today.getFullYear(), today.getMonth(), today.getDate()));
-    // Find the Monday that starts the week containing today
     const todayMonIndex = utcDayToMonIndex(todayProxy.getUTCDay());
     const gridEndMs = todayProxy.getTime() + (6 - todayMonIndex) * 86400000; // Sunday of today's week
     const gridStartMs = gridEndMs - (numCols * 7 - 1) * 86400000;
@@ -96,7 +71,11 @@ export function renderHeatmap(buckets, today, options) {
         columns.push(column);
     }
     const weekdayLabel = space.indent; // matches the grid rows' "Mo " prefix width
-    const monthFmt = new Intl.DateTimeFormat('en-US', { month: 'short', timeZone: 'UTC' });
+    const language = getCurrentLanguage();
+    const monthFmt = new Intl.DateTimeFormat(language === 'zh' ? 'zh-CN' : 'en-US', {
+        month: 'short',
+        timeZone: 'UTC',
+    });
     const cellsWidth = numCols * cellWidth;
     const monthChars = new Array(cellsWidth).fill(' ');
     let prevMonth = -1;
@@ -122,24 +101,22 @@ export function renderHeatmap(buckets, today, options) {
         }
     }
     const monthLabelLine = space.indent + weekdayLabel + monthChars.join('');
-    // Weekday labels (Mon/Wed/Fri only, index 0/2/4 in Mon-indexed scheme)
-    const lang = getCurrentLanguage();
-    const weekdayNames = lang === 'zh'
-        ? ['一', '  ', '三', '  ', '五', '  ', '  ']
-        : ['Mo', '  ', 'We', '  ', 'Fr', '  ', '  '];
-    // Build output lines
+    const weekdayNames = [
+        trans.timetable.weekdayMon.slice(0, 2),
+        '  ',
+        trans.timetable.weekdayWed.slice(0, 2),
+        '  ',
+        trans.timetable.weekdayFri.slice(0, 2),
+        '  ',
+        '  ',
+    ];
     const lines = [];
-    // Title line — same space.indent + type.heading treatment every other
-    // section heading in the app uses (this one was bare, so it sat flush
-    // against the terminal edge instead of matching the app's 3-space margin).
     lines.push(space.indent + type.heading(trans.calendar.heatmap.title));
     lines.push('');
-    // Month labels line
     lines.push(monthLabelLine);
-    // Grid rows (7 rows: Mon..Sun)
     for (let row = 0; row < 7; row++) {
         const wdLabel = weekdayNames[row] ?? '  ';
-        const cells = columns.map(col => {
+        const cells = columns.map((col) => {
             const cell = col[row];
             if (cell === null || cell === undefined)
                 return ' ';
@@ -148,7 +125,6 @@ export function renderHeatmap(buckets, today, options) {
         });
         lines.push(`${space.indent}${wdLabel} ${cells.join(cellWidth === 2 ? ' ' : '')}`);
     }
-    // Legend line
     const legendGlyphs = [
         pickIcon('·', ' '),
         pickIcon('░', '.'),

package/dist/features/calendar-query.js

@@ -16,8 +16,7 @@ export function filterEvents(events, query) {
     const q = query.trim().toLowerCase();
     if (!q)
         return events;
-    return events.filter((e) => (e.title ?? '').toLowerCase().includes(q) ||
-        (e.location ?? '').toLowerCase().includes(q));
+    return events.filter((e) => (e.title ?? '').toLowerCase().includes(q) || (e.location ?? '').toLowerCase().includes(q));
 }
 export function countdownParts(target, now) {
     const ms = target.getTime() - now.getTime();

package/dist/features/calendar-store.js

@@ -0,0 +1,27 @@
+import fs from 'fs';
+import path from 'path';
+import { getStateDir, getWritableStateDir } from '../config/paths.js';
+const FEED_FILE = 'calendar-feed.ics';
+const MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;
+export function saveFeedCache(text, dir) {
+    try {
+        fs.writeFileSync(path.join(dir ?? getWritableStateDir(), FEED_FILE), text, {
+            encoding: 'utf8',
+            mode: 0o600,
+        });
+    }
+    catch {
+        /* best effort */
+    }
+}
+export function loadFeedCache(dir, maxAgeMs = MAX_AGE_MS) {
+    try {
+        const file = path.join(dir ?? getStateDir(), FEED_FILE);
+        if (Date.now() - fs.statSync(file).mtimeMs > maxAgeMs)
+            return null;
+        return fs.readFileSync(file, 'utf8');
+    }
+    catch {
+        return null;
+    }
+}

package/dist/features/calendar.js

@@ -1,16 +1,12 @@
-import { loadCalendar, FeedFetchError, FeedParseError, eventToICS } from '@nbtca/nbtcal';
+import { fetchFeed, parseCalendar, createCalendar, FeedFetchError, FeedParseError, eventToICS, } from '@nbtca/nbtcal';
 import chalk from 'chalk';
-import { createSpinner, success, error } from '../core/ui.js';
 import { c, type, space, glyph } from '../core/theme.js';
-import { runMenu, menuFooter } from '../core/components/menu.js';
-import { runTextInput } from '../core/components/text-input.js';
 import { pickIcon } from '../core/icons.js';
-import { padEndV, truncate, visualWidth, wrapAnsiToVisualWidth } from '../core/text.js';
+import { padEndV, sanitizeTerminalLine, sanitizeTerminalText, truncate, visualWidth, wrapAnsiWithIndent, wrapAnsiToVisualWidth, } from '../core/text.js';
 import { t } from '../i18n/index.js';
-import { enterScreen, breadcrumb } from '../core/transitions.js';
-import { URLS } from '../config/data.js';
-import { renderHeatmap } from './calendar-heatmap.js';
-import { countdownParts, isCountdownUrgent, buildExportFilename, weekRange, monthRange, filterEvents } from './calendar-query.js';
+import { addLocalDays } from '../core/calendar-day.js';
+import { countdownParts, isCountdownUrgent, buildExportFilename } from './calendar-query.js';
+import { loadFeedCache, saveFeedCache } from './calendar-store.js';
 import { writeFileSync, existsSync } from 'fs';
 import { join } from 'path';
 function formatDate(date) {
@@ -27,25 +23,54 @@ function formatTime(date) {
     const minutes = String(date.getMinutes()).padStart(2, '0');
     return `${hours}:${minutes}`;
 }
-export async function loadCalendarOrThrow() {
+const MEMO_TTL_MS = 5 * 60 * 1000;
+let memo;
+let inFlight;
+export function peekCalendar() {
+    if (memo)
+        return memo.calendar;
+    const text = loadFeedCache();
+    if (text === null)
+        return undefined;
     try {
-        return await loadCalendar({ timeoutMs: 15000 });
+        memo = { calendar: createCalendar(parseCalendar(text)), fetchedAt: 0 };
+        return memo.calendar;
+    }
+    catch {
+        return undefined;
+    }
+}
+async function refetchCalendar(signal) {
+    try {
+        const text = await fetchFeed(undefined, {
+            timeoutMs: 15000,
+            ...(signal === undefined ? {} : { signal }),
+        });
+        memo = { calendar: createCalendar(parseCalendar(text)), fetchedAt: Date.now() };
+        saveFeedCache(text);
+        return memo.calendar;
     }
     catch (err) {
-        const detail = err instanceof FeedFetchError || err instanceof FeedParseError
-            ? err.message
-            : String(err);
+        const detail = sanitizeTerminalLine(err instanceof FeedFetchError || err instanceof FeedParseError ? err.message : String(err));
         throw new Error(`${t().calendar.error}: ${detail}`);
     }
 }
+export async function loadCalendarOrThrow(signal) {
+    if (memo && Date.now() - memo.fetchedAt < MEMO_TTL_MS)
+        return memo.calendar;
+    inFlight ??= refetchCalendar(signal).finally(() => {
+        inFlight = undefined;
+    });
+    return inFlight;
+}
 export function toDisplayEvent(e) {
     const trans = t();
     return {
         date: formatDate(e.start),
         time: e.isAllDay ? '' : formatTime(e.start),
-        title: e.title ?? trans.calendar.untitledEvent,
-        location: e.location ?? trans.calendar.tbdLocation,
-        description: e.description ?? '',
+        title: sanitizeTerminalLine(e.title ?? trans.calendar.untitledEvent),
+        location: sanitizeTerminalLine(e.location ?? trans.calendar.tbdLocation),
+        description: sanitizeTerminalText(e.description ?? ''),
         startDate: e.start,
         recurring: e.recurring,
         uid: e.uid,
@@ -59,7 +84,7 @@ export async function fetchInRange(start, end) {
 }
 export async function fetchHeatmapBuckets() {
     const now = new Date();
-    const start = new Date(now.getTime() - 365 * 24 * 60 * 60 * 1000);
+    const start = addLocalDays(now, -365);
     return (await loadCalendarOrThrow()).heatmap({ start, end: now, bucket: 'day' });
 }
 export function serializeEvents(events) {
@@ -77,14 +102,30 @@ export function serializeEvents(events) {
 export function renderEventsTable(events, options) {
     const trans = t();
     const useColor = options?.color !== false;
-    if (events.length === 0)
-        return `${space.indent}${type.hint(trans.calendar.noEvents)}`;
+    const width = options?.width === undefined || !Number.isFinite(options.width)
+        ? Number.POSITIVE_INFINITY
+        : Math.max(1, Math.floor(options.width));
+    if (events.length === 0) {
+        return wrapAnsiWithIndent(type.hint(trans.calendar.noEvents), width, space.indent).join('\n');
+    }
     const id = (s) => s;
     const applyDim = useColor ? chalk.dim : id;
     const applyCyan = useColor ? chalk.cyan : id;
     const applyBold = useColor ? chalk.bold : id;
     const applyGray = useColor ? chalk.gray : id;
-    // dateWidth must fit YYYY-MM-DD HH:MM (16 chars) for cross-year events
+    if (width < 68) {
+        const lines = [];
+        for (const event of events) {
+            if (lines.length > 0)
+                lines.push('');
+            const dateTime = event.time ? `${event.date} ${event.time}` : event.date;
+            const marker = event.recurring ? `${pickIcon('↻', '~')} ` : '';
+            lines.push(...wrapAnsiWithIndent(applyCyan(dateTime), width, space.indent));
+            lines.push(...wrapAnsiWithIndent(applyBold(`${marker}${event.title}`), width, space.indent));
+            lines.push(...wrapAnsiWithIndent(applyGray(`${pickIcon('⌖', '@')} ${event.location}`), width, space.indent));
+        }
+        return lines.join('\n');
+    }
     const dateWidth = 16;
     const titleWidth = 32;
     const locWidth = 14;
@@ -92,12 +133,8 @@ export function renderEventsTable(events, options) {
     const headerDate = padEndV(applyDim(trans.calendar.dateTime), dateWidth);
     const headerTitle = padEndV(applyDim(trans.calendar.eventName), titleWidth);
     const headerLoc = applyDim(trans.calendar.location);
-    // divider covers exactly: dateWidth + 2-char sep + titleWidth + 2-char sep + locWidth
     const divider = applyDim(sep.repeat(dateWidth + 2 + titleWidth + 2 + locWidth));
-    const lines = [
-        `  ${headerDate}  ${headerTitle}  ${headerLoc}`,
-        `  ${divider}`,
-    ];
+    const lines = [`  ${headerDate}  ${headerTitle}  ${headerLoc}`, `  ${divider}`];
     for (const event of events) {
         const dateTime = event.time ? `${event.date} ${event.time}` : event.date;
         const dateCol = padEndV(applyCyan(dateTime), dateWidth);
@@ -109,22 +146,12 @@ export function renderEventsTable(events, options) {
     }
     return lines.join('\n');
 }
-/** One compact line for an "at a glance" activity briefing: date/time · title,
- * with today's events picked out (bold + accent) so the one thing worth
- * noticing doesn't read the same as everything else in the list — and a
- * recurring marker, matching renderEventsTable's convention. Shared by Home's
- * dashboard panel and the Events hub so the two surfaces read consistently
- * instead of drifting into slightly different formats. */
 export function renderEventBrief(e, now) {
     const dot = pickIcon('·', '-');
-    const isToday = e.startDate.getFullYear() === now.getFullYear()
-        && e.startDate.getMonth() === now.getMonth()
-        && e.startDate.getDate() === now.getDate();
+    const isToday = e.startDate.getFullYear() === now.getFullYear() &&
+        e.startDate.getMonth() === now.getMonth() &&
+        e.startDate.getDate() === now.getDate();
     const dateTime = `${e.date}${e.time ? ' ' + e.time : ''}`;
-    // "Today" gets one consistent brand-colored signal across marker/date/
-    // title — c.warn (yellow) stays reserved for genuine time-pressure
-    // urgency (isCountdownUrgent below), not "happens today" alone, so the
-    // two alert levels never compete for the same color on one line.
     const marker = isToday ? type.active(pickIcon('●', '*')) : type.hint(pickIcon('·', '-'));
     const dateStyled = isToday ? type.active(dateTime) : type.hint(dateTime);
     const titleStyled = isToday ? type.active(e.title) : type.body(e.title);
@@ -157,157 +184,6 @@ export function renderCountdownBanner(event, now, cols = Number.POSITIVE_INFINIT
         .map((line, index) => `${index === 0 ? prefix : continuation}${line}`)
         .join('\n');
 }
-function renderSubscribeHint() {
-    const icon = pickIcon('◆', '*');
-    console.log(c.muted(`  ${icon} ${t().calendar.subscribeHint}: ${URLS.calendar}`));
-}
-/** Startup preview: auto-loads and displays upcoming events, then returns. */
-export async function showEventsPreview() {
-    const trans = t();
-    const s = createSpinner(trans.calendar.loading);
-    try {
-        const cal = await loadCalendarOrThrow();
-        const events = cal.upcoming({ days: 30 }).map(toDisplayEvent);
-        if (events.length === 0) {
-            s.stop(trans.calendar.noEvents);
-            console.log();
-            return;
-        }
-        s.stop(`${events.length} ${trans.calendar.eventsFound}`);
-        console.log();
-        console.log(renderEventsTable(events.slice(0, 5), { color: !!process.stdout.isTTY }));
-        console.log();
-        renderSubscribeHint();
-        console.log();
-    }
-    catch {
-        s.error(trans.calendar.error);
-        console.log();
-    }
-}
-/** Full interactive calendar hub: countdown + heatmap + a menu of range/search/past views. */
-export async function showCalendar() {
-    const trans = t();
-    await enterScreen(breadcrumb(trans.menu.events));
-    const spinner = createSpinner(trans.calendar.loading);
-    let cal;
-    try {
-        cal = await loadCalendarOrThrow();
-        spinner.stop();
-    }
-    catch {
-        spinner.error(trans.calendar.error);
-        console.log(c.muted('  ' + trans.calendar.errorHint));
-        console.log();
-        return;
-    }
-    const now = new Date();
-    const upcoming = cal.upcoming({ days: 30 });
-    console.log();
-    console.log(renderCountdownBanner(upcoming[0] ? toDisplayEvent(upcoming[0]) : undefined, now));
-    console.log();
-    console.log(renderHeatmap(cal.heatmap({ start: new Date(now.getTime() - 365 * 24 * 60 * 60 * 1000), end: now, bucket: 'day' }), now, { color: true }));
-    console.log();
-    while (true) {
-        const action = await runMenu({
-            title: trans.calendar.viewDetail,
-            options: [
-                { value: 'upcoming', label: trans.menu.events, hint: String(upcoming.length) },
-                { value: 'week', label: trans.calendar.thisWeek },
-                { value: 'month', label: trans.calendar.thisMonth },
-                { value: 'search', label: trans.calendar.search },
-                { value: 'past', label: trans.calendar.pastEvents },
-            ],
-            footer: menuFooter(),
-        });
-        if (action === null)
-            return;
-        if (action === 'upcoming')
-            await showEventList(upcoming, trans.menu.events);
-        else if (action === 'week') {
-            const r = weekRange(now);
-            await showEventList(cal.inRange(r.start, r.end), trans.calendar.thisWeek);
-        }
-        else if (action === 'month') {
-            const r = monthRange(now);
-            await showEventList(cal.inRange(r.start, r.end), trans.calendar.thisMonth);
-        }
-        else if (action === 'search')
-            await showSearch(cal);
-        else if (action === 'past')
-            await showEventList(cal.past({ days: 30 }).reverse(), trans.calendar.pastEvents);
-    }
-}
-async function showEventList(events, title) {
-    const trans = t();
-    if (events.length === 0) {
-        console.log(`${space.indent}${type.hint(trans.calendar.noEvents)}`);
-        console.log();
-        return;
-    }
-    const display = events.map(toDisplayEvent);
-    console.log();
-    console.log(renderEventsTable(display, { color: true }));
-    console.log();
-    const selected = await runMenu({
-        title,
-        options: events.map((_e, i) => ({
-            value: String(i),
-            label: `${display[i].date}${display[i].time ? ' ' + display[i].time : ''}  ${display[i].title}`,
-            hint: display[i].location,
-        })),
-        footer: menuFooter(),
-    });
-    if (selected === null)
-        return;
-    const raw = events[Number.parseInt(selected, 10)];
-    if (raw)
-        await showEventDetailRaw(raw);
-}
-async function showEventDetailRaw(raw) {
-    const trans = t();
-    const e = toDisplayEvent(raw);
-    console.log();
-    console.log(chalk.bold.cyan(`  ${e.title}`));
-    console.log(c.muted(`  ${e.date}${e.time ? ' ' + e.time : ''}  ${pickIcon('·', '|')}  ${e.location}`));
-    if (raw.recurring)
-        console.log(c.muted(`  ${pickIcon('↻', '~')} ${trans.calendar.recurringLabel}`));
-    if (e.description) {
-        console.log();
-        for (const line of e.description.trim().split('\n'))
-            console.log(`  ${line}`);
-    }
-    else
-        console.log(c.muted(`  ${trans.calendar.noDescription}`));
-    console.log();
-    const action = await runMenu({
-        title: e.title,
-        options: [{ value: 'export', label: trans.calendar.exportIcs }],
-        footer: menuFooter(),
-    });
-    if (action === 'export') {
-        const res = exportEventIcs(raw);
-        if (res.ok)
-            success(`${trans.calendar.exportSuccess}: ${res.path}`);
-        else
-            error(`${trans.calendar.exportError}: ${res.error ?? ''}`);
-    }
-}
-async function showSearch(cal) {
-    const trans = t();
-    const query = await runTextInput({ message: trans.calendar.searchPrompt, placeholder: trans.calendar.searchPlaceholder });
-    if (query === null || !query.trim())
-        return;
-    const now = new Date();
-    const pool = cal.inRange(now, new Date(now.getTime() + 365 * 24 * 60 * 60 * 1000));
-    const results = filterEvents(pool, query);
-    if (results.length === 0) {
-        console.log(`${space.indent}${type.hint(trans.calendar.searchNoResults)}`);
-        console.log();
-        return;
-    }
-    await showEventList(results, `${trans.calendar.search}: ${query.trim()}`);
-}
 export function exportEventIcs(event, dir = process.cwd()) {
     const base = buildExportFilename(event);
     let path = join(dir, base);