@nbtca/prompt 1.0.26 → 1.1.0

package/dist/features/calendar-heatmap.js

@@ -0,0 +1,169 @@
+/**
+ * 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 { 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;
+    const m = parts[1] ?? 1;
+    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('·', ' ');
+    if (count === 1)
+        return pickIcon('░', '.');
+    if (count === 2)
+        return pickIcon('▒', ':');
+    if (count === 3)
+        return pickIcon('▓', '-');
+    return pickIcon('█', '=');
+}
+/** Apply a green color ramp based on count. Identity when count is 0. */
+function applyColor(glyph, count, useColor) {
+    if (!useColor || count <= 0)
+        return glyph;
+    if (count === 1)
+        return chalk.green(glyph);
+    if (count === 2)
+        return chalk.green(glyph);
+    if (count === 3)
+        return chalk.greenBright(glyph);
+    return chalk.bold.greenBright(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();
+    // Build a lookup map: 'YYYY-MM-DD' -> count
+    const countByDate = new Map();
+    for (const b of buckets) {
+        countByDate.set(b.date, b.count);
+    }
+    // Determine the grid window.
+    // The grid ends at "today" (aligned to Mon-start week column).
+    // The grid starts 365 days before today.
+    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
+    // Grid start: 52 full weeks back from the start of today's week, plus today's partial week
+    // Total columns = 53 weeks
+    const numCols = 53;
+    const gridStartMs = gridEndMs - (numCols * 7 - 1) * 86400000;
+    const gridStart = new Date(gridStartMs);
+    const columns = [];
+    let cursor = new Date(gridStart.getTime());
+    for (let col = 0; col < numCols; col++) {
+        const column = [];
+        for (let row = 0; row < 7; row++) {
+            const cursorMonIdx = utcDayToMonIndex(cursor.getUTCDay());
+            if (cursorMonIdx === row) {
+                const y = cursor.getUTCFullYear();
+                const m = String(cursor.getUTCMonth() + 1).padStart(2, '0');
+                const d = String(cursor.getUTCDate()).padStart(2, '0');
+                const dateStr = `${y}-${m}-${d}`;
+                const count = countByDate.get(dateStr) ?? 0;
+                column.push({ date: dateStr, count });
+                cursor = new Date(cursor.getTime() + 86400000);
+            }
+            else {
+                column.push(null);
+            }
+        }
+        columns.push(column);
+    }
+    // Month labels row. Labels are 3-letter English abbreviations (universal and
+    // single-width, so alignment holds in any language). Each grid column occupies
+    // 2 terminal cells (glyph + joining space); we write each month's label into a
+    // character buffer starting at the column where that month begins, letting it
+    // overflow rightward into the spacing of the following columns (months are
+    // ~4-5 columns apart, so labels never collide).
+    const weekdayLabel = '   '; // 3-char prefix, matches the grid rows' "Mo " prefix
+    const monthFmt = new Intl.DateTimeFormat('en-US', { month: 'short', timeZone: 'UTC' });
+    const cellsWidth = numCols * 2;
+    const monthChars = new Array(cellsWidth).fill(' ');
+    let prevMonth = -1;
+    for (let col = 0; col < numCols; col++) {
+        let labelDate = null;
+        for (let row = 0; row < 7; row++) {
+            const cell = columns[col]?.[row];
+            if (cell !== null && cell !== undefined) {
+                labelDate = parseBucketDate(cell.date);
+                break;
+            }
+        }
+        if (labelDate === null)
+            continue;
+        const month = labelDate.getUTCMonth();
+        if (month !== prevMonth) {
+            prevMonth = month;
+            const label = monthFmt.format(labelDate); // e.g. "Jun"
+            const start = col * 2;
+            for (let i = 0; i < label.length && start + i < cellsWidth; i++) {
+                monthChars[start + i] = label[i] ?? ' ';
+            }
+        }
+    }
+    const monthLabelLine = 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 lines = [];
+    // Title line
+    lines.push(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 cell = col[row];
+            if (cell === null || cell === undefined)
+                return ' ';
+            const glyph = countToGlyph(cell.count);
+            return applyColor(glyph, cell.count, useColor);
+        });
+        lines.push(`${wdLabel} ${cells.join(' ')}`);
+    }
+    // Legend line
+    const legendGlyphs = [
+        pickIcon('·', ' '),
+        pickIcon('░', '.'),
+        pickIcon('▒', ':'),
+        pickIcon('▓', '-'),
+        pickIcon('█', '='),
+    ];
+    const legendColored = useColor
+        ? [
+            legendGlyphs[0] ?? '·',
+            applyColor(legendGlyphs[1] ?? '░', 1, true),
+            applyColor(legendGlyphs[2] ?? '▒', 2, true),
+            applyColor(legendGlyphs[3] ?? '▓', 3, true),
+            applyColor(legendGlyphs[4] ?? '█', 4, true),
+        ]
+        : legendGlyphs;
+    lines.push('');
+    lines.push(`${trans.calendar.heatmap.legendLess} ${legendColored.join('')} ${trans.calendar.heatmap.legendMore}`);
+    return lines.join('\n');
+}

package/dist/features/calendar.js

@@ -1,60 +1,73 @@
 /**
- * ICS calendar module
+ * Calendar module
  * Fetches and renders upcoming events with Unicode box table.
+ * Data layer powered by @nbtca/nbtcal.
  */
-import ICAL from 'ical.js';
+import { loadCalendar, FeedFetchError, FeedParseError } from '@nbtca/nbtcal';
 import chalk from 'chalk';
 import { select, isCancel } from '@clack/prompts';
 import { info, createSpinner } from '../core/ui.js';
 import { pickIcon } from '../core/icons.js';
 import { padEndV, truncate } from '../core/text.js';
 import { t } from '../i18n/index.js';
-import { APP_INFO, URLS } from '../config/data.js';
-export async function fetchEvents() {
+import { URLS } from '../config/data.js';
+import { renderHeatmap } from './calendar-heatmap.js';
+function formatDate(date) {
+    const now = new Date();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    if (date.getFullYear() !== now.getFullYear()) {
+        return `${date.getFullYear()}-${month}-${day}`;
+    }
+    return `${month}-${day}`;
+}
+function formatTime(date) {
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    return `${hours}:${minutes}`;
+}
+/**
+ * Load the calendar, wrapping errors with a localized message.
+ */
+async function loadCalendarOrThrow() {
     try {
-        const controller = new AbortController();
-        const timeout = setTimeout(() => controller.abort(), 5000);
-        const response = await fetch('https://ical.nbtca.space', {
-            signal: controller.signal,
-            headers: { 'User-Agent': `NBTCA-CLI/${APP_INFO.version}` },
-        });
-        clearTimeout(timeout);
-        if (!response.ok)
-            throw new Error(`HTTP ${response.status}`);
-        const data = await response.text();
-        const jcalData = ICAL.parse(data);
-        const comp = new ICAL.Component(jcalData);
-        const vevents = comp.getAllSubcomponents('vevent');
-        const events = [];
-        const now = new Date();
-        const thirtyDaysLater = new Date(now.getTime() + 30 * 24 * 60 * 60 * 1000);
-        for (const vevent of vevents) {
-            const event = new ICAL.Event(vevent);
-            const startDate = event.startDate.toJSDate();
-            if (startDate >= now && startDate <= thirtyDaysLater) {
-                const trans = t();
-                const untitledEvent = trans.calendar.untitledEvent;
-                const tbdLocation = trans.calendar.tbdLocation;
-                events.push({
-                    date: formatDate(startDate),
-                    time: formatTime(startDate),
-                    title: event.summary || untitledEvent,
-                    location: event.location || tbdLocation,
-                    description: event.description || '',
-                    startDate
-                });
-            }
-        }
-        events.sort((a, b) => a.startDate.getTime() - b.startDate.getTime());
-        return events;
+        return await loadCalendar({ timeoutMs: 15000 });
     }
     catch (err) {
-        const detail = err instanceof Error
-            ? (err.name === 'AbortError' ? 'Request timed out' : err.message)
+        const detail = err instanceof FeedFetchError || err instanceof FeedParseError
+            ? err.message
             : String(err);
         throw new Error(`${t().calendar.error}: ${detail}`);
     }
 }
+/**
+ * Map a nbtcal CalendarEvent to prompt's Event type.
+ */
+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 ?? '',
+        startDate: e.start,
+    };
+}
+/**
+ * Fetch upcoming events (next 30 days), including recurring occurrences.
+ */
+export async function fetchEvents() {
+    return (await loadCalendarOrThrow()).upcoming({ days: 30 }).map(toDisplayEvent);
+}
+/**
+ * Fetch trailing-year heatmap buckets.
+ */
+export async function fetchHeatmapBuckets() {
+    const now = new Date();
+    const start = new Date(now.getTime() - 365 * 24 * 60 * 60 * 1000);
+    return (await loadCalendarOrThrow()).heatmap({ start, end: now, bucket: 'day' });
+}
 export function serializeEvents(events) {
     return events.map((event) => ({
         date: event.date,
@@ -62,23 +75,9 @@ export function serializeEvents(events) {
         title: event.title,
         location: event.location,
         description: event.description,
-        startDateISO: event.startDate.toISOString()
+        startDateISO: event.startDate.toISOString(),
     }));
 }
-function formatDate(date) {
-    const now = new Date();
-    const month = String(date.getMonth() + 1).padStart(2, '0');
-    const day = String(date.getDate()).padStart(2, '0');
-    if (date.getFullYear() !== now.getFullYear()) {
-        return `${date.getFullYear()}-${month}-${day}`;
-    }
-    return `${month}-${day}`;
-}
-function formatTime(date) {
-    const hours = String(date.getHours()).padStart(2, '0');
-    const minutes = String(date.getMinutes()).padStart(2, '0');
-    return `${hours}:${minutes}`;
-}
 /**
  * Render events as a Unicode box-drawing table
  */
@@ -153,8 +152,18 @@ export async function showCalendar() {
     const trans = t();
     const s = createSpinner(trans.calendar.loading);
     try {
-        const events = await fetchEvents();
+        const cal = await loadCalendarOrThrow();
+        const events = cal.upcoming({ days: 30 }).map(toDisplayEvent);
         s.stop(`${events.length} ${trans.calendar.eventsFound}`);
+        // Render heatmap header
+        const now = new Date();
+        const heatmapBuckets = cal.heatmap({
+            start: new Date(now.getTime() - 365 * 24 * 60 * 60 * 1000),
+            end: now,
+            bucket: 'day',
+        });
+        console.log();
+        console.log(renderHeatmap(heatmapBuckets, now, { color: true }));
         displayEvents(events);
         if (events.length > 0) {
             const options = [

package/dist/features/docs.js

@@ -3,7 +3,7 @@
  * 获取并渲染Markdown文档
  */
 import { marked } from 'marked';
-import TerminalRenderer from 'marked-terminal';
+import { markedTerminal } from 'marked-terminal';
 import chalk from 'chalk';
 import open from 'open';
 import { select, isCancel, confirm, text } from '@clack/prompts';
@@ -56,9 +56,7 @@ function ensureMarkedConfigured() {
     if (_markedConfigured)
         return;
     _markedConfigured = true;
-    marked.use({
-        renderer: new TerminalRenderer(getRendererOptions(getTerminalType()))
-    });
+    marked.use(markedTerminal(getRendererOptions(getTerminalType())));
 }
 // ─── marked-terminal renderer ─────────────────────────────────────────────────
 function getRendererOptions(type) {
@@ -293,7 +291,7 @@ function cleanMarkdownContent(content, type = getTerminalType()) {
     if (type === 'basic') {
         c = c.replace(/!\[([^\]]*)\]\([^)]+\)/g, (_, alt) => `${pickIcon('📎', '[image]')} ${alt || 'image'}`);
     }
-    else if (type === 'enhanced') {
+    else {
         c = c.replace(/!\[([^\]]*)\]\(([^)]+)\)/g, (_, alt, url) => {
             const filename = url.split('/').pop() || url;
             return `${pickIcon('🖼️', '[image]')} **${alt || 'image'}** _(${filename})_`;

package/dist/i18n/locales/en.json

@@ -48,7 +48,12 @@
     "tbdLocation": "TBD",
     "subscribeHint": "Subscribe to calendar",
     "viewDetail": "Select an event for details:",
-    "noDescription": "No additional details"
+    "noDescription": "No additional details",
+    "heatmap": {
+      "title": "Activity (last 12 months)",
+      "legendLess": "Less",
+      "legendMore": "More"
+    }
   },
   "docs": {
     "loading": "Loading documentation list...",
@@ -187,6 +192,7 @@
     "flagInterval": "Refresh interval (status --watch)",
     "flagTimeout": "HTTP timeout (status)",
     "flagRetries": "Retry count (status)",
+    "flagHeatmap": "Activity heatmap (events)",
     "flagPlain": "Disable colors",
     "flagNoLogo": "Skip logo",
     "unknownCommand": "Unknown command: {command}",

package/dist/i18n/locales/zh.json

@@ -48,7 +48,12 @@
     "tbdLocation": "待定",
     "subscribeHint": "订阅日历",
     "viewDetail": "选择活动查看详情:",
-    "noDescription": "暂无详细信息"
+    "noDescription": "暂无详细信息",
+    "heatmap": {
+      "title": "近一年活跃度",
+      "legendLess": "少",
+      "legendMore": "多"
+    }
   },
   "docs": {
     "loading": "正在加载文档列表...",
@@ -187,6 +192,7 @@
     "flagInterval": "刷新间隔（status --watch）",
     "flagTimeout": "HTTP 超时时间（status）",
     "flagRetries": "重试次数（status）",
+    "flagHeatmap": "活动热力图 (events)",
     "flagPlain": "禁用颜色",
     "flagNoLogo": "跳过 Logo",
     "unknownCommand": "未知命令: {command}",

package/dist/index.js

@@ -4,7 +4,8 @@
 import chalk from 'chalk';
 import open from 'open';
 import { main } from './main.js';
-import { fetchEvents, renderEventsTable, serializeEvents } from './features/calendar.js';
+import { fetchEvents, fetchHeatmapBuckets, renderEventsTable, serializeEvents } from './features/calendar.js';
+import { renderHeatmap } from './features/calendar-heatmap.js';
 import { checkServices, countServiceHealth, hasServiceFailures, renderServiceStatusTable, serializeServiceStatus } from './features/status.js';
 import { pickIcon } from './core/icons.js';
 import { applyColorModePreference } from './config/preferences.js';
@@ -35,7 +36,7 @@ const URL_ACTIONS = {
     github: URLS.github,
     roadmap: URLS.roadmap
 };
-const KNOWN_FLAGS = new Set(['--help', '--version', '--open', '--json', '--plain', '--no-logo', '--watch', '--today']);
+const KNOWN_FLAGS = new Set(['--help', '--version', '--open', '--json', '--plain', '--no-logo', '--watch', '--today', '--heatmap']);
 const KNOWN_FLAG_PREFIXES = ['--interval=', '--timeout=', '--retries=', '--next='];
 const STATUS_WATCH_INTERVAL_MIN = 3;
 const STATUS_WATCH_INTERVAL_MAX = 300;
@@ -81,6 +82,7 @@ function getAllowedFlagsFor(command) {
         case 'events':
             allowed.add('--json');
             allowed.add('--today');
+            allowed.add('--heatmap');
             return allowed;
         case 'status':
             allowed.add('--json');
@@ -160,6 +162,7 @@ function printHelp() {
     console.log(`  --help             ${c.flagHelp}`);
     console.log(`  --open             ${c.flagOpen}`);
     console.log(`  --json             ${c.flagJson}`);
+    console.log(`  --heatmap          ${c.flagHeatmap}`);
     console.log(`  --today            ${c.flagToday}`);
     console.log(`  --next=<n>         ${c.flagNext}`);
     console.log(`  --watch            ${c.flagWatch}`);
@@ -170,6 +173,17 @@ function printHelp() {
     console.log(`  --no-logo          ${c.flagNoLogo}`);
 }
 async function runEventsCommand(flags) {
+    if (flags.has('--heatmap')) {
+        const buckets = await fetchHeatmapBuckets();
+        if (flags.has('--json')) {
+            process.stdout.write(JSON.stringify(buckets, null, 2) + '\n');
+        }
+        else {
+            const useColor = !flags.has('--plain') && !!process.stdout.isTTY;
+            console.log(renderHeatmap(buckets, new Date(), { color: useColor }));
+        }
+        return;
+    }
     let events = await fetchEvents();
     if (flags.has('--today')) {
         const now = new Date();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nbtca/prompt",
-  "version": "1.0.26",
+  "version": "1.1.0",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -25,7 +25,7 @@
     "clean": "rm -rf dist",
     "prebuild": "npm run clean",
     "prepublishOnly": "npm run build",
-    "test": "npm run build && bash scripts/test-cli.sh"
+    "test": "npm run build && vitest run && bash scripts/test-cli.sh"
   },
   "keywords": [
     "cli",
@@ -39,19 +39,19 @@
   ],
   "dependencies": {
     "@clack/prompts": "^1.2.0",
+    "@nbtca/nbtcal": "^0.2.1",
     "chalk": "^5.6.2",
     "gradient-string": "^3.0.0",
-    "ical.js": "^2.2.1",
     "marked": "^15.0.12",
     "marked-terminal": "^7.0.0",
     "open": "^11.0.0"
   },
   "devDependencies": {
     "@types/gradient-string": "^1.1.6",
-    "@types/marked-terminal": "^3.1.3",
     "@types/node": "^22.19.17",
     "tsx": "^4.21.0",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vitest": "^3.2.4"
   },
   "engines": {
     "node": ">=20.12.0"