@nbtca/prompt 1.4.2 → 1.5.1

package/dist/features/links.js

@@ -1,36 +1,51 @@
-import open from 'open';
 import chalk from 'chalk';
-import { runMenu, menuFooter } from '../core/components/menu.js';
-import { createSpinner } from '../core/ui.js';
-import { URLS } from '../config/data.js';
-import { t } from '../i18n/index.js';
-import { enterScreen, breadcrumb } from '../core/transitions.js';
-async function openUrl(url) {
-    const trans = t();
-    const s = createSpinner(trans.links.opening);
+import open from 'open';
+import { sanitizeTerminalLine } from '../core/text.js';
+import { fmt, t } from '../i18n/index.js';
+const BROWSER_LAUNCH_SETTLE_MS = 1000;
+function settleBrowserLauncher(child) {
+    return new Promise((resolve) => {
+        let settled = false;
+        const timer = setTimeout(() => {
+            finish(true);
+        }, BROWSER_LAUNCH_SETTLE_MS);
+        function finish(success) {
+            if (settled)
+                return;
+            settled = true;
+            child.off('close', onClose);
+            child.off('error', onError);
+            clearTimeout(timer);
+            resolve(success);
+        }
+        function onClose(code, signal) {
+            finish(code === 0 && signal === null);
+        }
+        function onError() {
+            finish(false);
+        }
+        child.once('close', onClose);
+        child.once('error', onError);
+        if (child.exitCode !== null || child.signalCode !== null) {
+            finish(child.exitCode === 0 && child.signalCode === null);
+            return;
+        }
+    });
+}
+export async function launchBrowserUrl(url) {
     try {
-        await open(url);
-        s.stop(trans.links.opened);
+        return await settleBrowserLauncher(await open(url));
     }
     catch {
-        s.error(trans.links.error);
-        console.log(chalk.dim(`  ${url}`));
+        return false;
     }
 }
-export async function showLinksMenu() {
-    const trans = t();
-    await enterScreen(breadcrumb(trans.menu.links));
-    const selected = await runMenu({
-        title: trans.links.choose,
-        options: [
-            { value: URLS.homepage, label: trans.links.website },
-            { value: URLS.github, label: trans.links.github },
-            { value: URLS.roadmap, label: trans.links.roadmap },
-            { value: URLS.repair, label: trans.links.repair },
-        ],
-        footer: menuFooter(),
-    });
-    if (selected === null)
-        return;
-    await openUrl(selected);
+export async function openUrlInBrowser(url) {
+    const safeUrl = sanitizeTerminalLine(url);
+    if (await launchBrowserUrl(safeUrl))
+        return true;
+    const trans = t().links;
+    console.error(chalk.red(trans.error));
+    console.error(chalk.dim(fmt(trans.openManually, { url: safeUrl })));
+    return false;
 }

package/dist/features/schedule-render.js

@@ -1,8 +1,9 @@
+import { createTimetableSchedule } from '@nbtca/nbtcal/timetable';
 import { countdownParts, isCountdownUrgent } from './calendar-query.js';
-import { meetingsInWeek, campusWeekday } from './schedule-query.js';
 import { c, type, space, glyph } from '../core/theme.js';
 import { pickIcon } from '../core/icons.js';
 import { padEndV, truncate, visualWidth, wrapAnsiToVisualWidth } from '../core/text.js';
+import { addLocalDays, parseLocalMonday } from '../core/calendar-day.js';
 import { t, fmt, getCurrentLanguage } from '../i18n/index.js';
 function span(m, periods) {
     const s = periods.find((p) => p.period === m.startPeriod)?.start ?? '';
@@ -14,9 +15,12 @@ export function renderNextClassBanner(next, now, cols = Number.POSITIVE_INFINITY
     if (!next)
         return '';
     const p = countdownParts(next.start, now);
-    const when = p.past ? trans.timetable.nowLabel
-        : p.days > 0 ? `${p.days}d ${p.hours}h`
-            : p.hours > 0 ? `${p.hours}h ${p.minutes}m`
+    const when = p.past
+        ? trans.timetable.nowLabel
+        : p.days > 0
+            ? `${p.days}d ${p.hours}h`
+            : p.hours > 0
+                ? `${p.hours}h ${p.minutes}m`
                 : `${p.minutes}m`;
     const styleWhen = isCountdownUrgent(p) ? c.warn : type.hint;
     const whenStyled = styleWhen(when);
@@ -82,8 +86,12 @@ export function renderTodayClasses(meetings, periods, now) {
 export function weekdayShortLabel(wd) {
     const trans = t();
     const labels = [
-        trans.timetable.weekdayMon, trans.timetable.weekdayTue, trans.timetable.weekdayWed,
-        trans.timetable.weekdayThu, trans.timetable.weekdayFri, trans.timetable.weekdaySat,
+        trans.timetable.weekdayMon,
+        trans.timetable.weekdayTue,
+        trans.timetable.weekdayWed,
+        trans.timetable.weekdayThu,
+        trans.timetable.weekdayFri,
+        trans.timetable.weekdaySat,
         trans.timetable.weekdaySun,
     ];
     return labels[wd - 1] ?? '';
@@ -108,7 +116,7 @@ function renderTimeline(meetings, periods, now, isToday, alwaysShowLocation, cur
         const connector = i === 0 ? topConnector : midConnector;
         const marker = isLive ? type.active(pickIcon('▶', '>')) : ' ';
         const timeCol = `${marker}${type.hint(startStr)} ${rule}${connector}${rule}`;
-        const styleName = (name) => (isLive ? type.active(name) : (isDone ? type.hint(name) : type.body(name)));
+        const styleName = (name) => isLive ? type.active(name) : isDone ? type.hint(name) : type.body(name);
         let statusText = '';
         let compactStatusText = '';
         if (isDone) {
@@ -118,14 +126,14 @@ function renderTimeline(meetings, periods, now, isToday, alwaysShowLocation, cur
         else if (isLive) {
             const end = new Date(now);
             const [eh, em] = endStr.split(':').map((x) => Number.parseInt(x, 10));
-            end.setHours(eh || 0, em || 0, 0, 0);
+            end.setHours(eh !== undefined && Number.isFinite(eh) ? eh : 0, em !== undefined && Number.isFinite(em) ? em : 0, 0, 0);
             const remaining = countdownParts(end, now);
             const mins = remaining.days * 1440 + remaining.hours * 60 + remaining.minutes;
             statusText = `${trans.timetable.classLive}  ${dot}  ${fmt(trans.timetable.minutesRemaining, { minutes: String(mins) })}`;
             compactStatusText = `${mins}m`;
         }
-        const showLoc = alwaysShowLocation ? Boolean(m.location) : (isLive && Boolean(m.location));
-        const locationText = showLoc ? m.location ?? '' : '';
+        const showLoc = alwaysShowLocation ? Boolean(m.location) : isLive && Boolean(m.location);
+        const locationText = showLoc ? (m.location ?? '') : '';
         const renderLine = (name, status, location, currentTimeCol = timeCol, indent = space.indent) => {
             const statusCol = status ? `   ${type.hint(status)}` : '';
             const locationCol = location ? `   ${type.hint(location)}` : '';
@@ -155,16 +163,14 @@ function renderTimeline(meetings, periods, now, isToday, alwaysShowLocation, cur
                 continue;
             return renderLine(truncate(m.courseName, courseWidth), '', '', compactTimeCol, indent);
         }
-        const timeOnly = [
-            `${space.indent}${compactTimeCol}`,
-            compactTimeCol,
-            type.hint(startStr),
-        ].find((candidate) => visualWidth(candidate) <= cols);
+        const timeOnly = [`${space.indent}${compactTimeCol}`, compactTimeCol, type.hint(startStr)].find((candidate) => visualWidth(candidate) <= cols);
         if (timeOnly)
             return timeOnly;
         return type.hint(startStr.slice(0, Math.max(0, Math.floor(cols))));
     });
-    const last = sorted[sorted.length - 1];
+    const last = sorted.at(-1);
+    if (!last)
+        return lines.join('\n');
     const lastEnd = periods.find((p) => p.period === last.endPeriod)?.end ?? '23:59';
     const fullEnd = `${space.indent}  ${type.hint(lastEnd)} ${rule}${bottomConnector}${rule} ${type.hint(trans.timetable.timelineEnd)}`;
     if (!Number.isFinite(cols) || visualWidth(fullEnd) <= cols) {
@@ -198,7 +204,7 @@ export function renderDaySwitcher(selectedWeekday, todayWeekday, cols = Number.P
             return type.cursor(`[${label}]`);
         return type.hint(label);
     });
-    const renderRange = (start, end) => (`${space.indent}${type.hint(leftArrow)}  ${labels.slice(start, end).join('   ')}  ${type.hint(rightArrow)}`);
+    const renderRange = (start, end) => `${space.indent}${type.hint(leftArrow)}  ${labels.slice(start, end).join('   ')}  ${type.hint(rightArrow)}`;
     const full = renderRange(0, labels.length);
     if (!Number.isFinite(cols) || visualWidth(full) <= cols)
         return full;
@@ -224,37 +230,22 @@ const WEEKDAY_KEYS = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'];
 const GAP_THRESHOLD_MINUTES = 30;
 function minutesOf(hhmm) {
     const [h, m] = hhmm.split(':').map((x) => Number.parseInt(x, 10));
-    return (h || 0) * 60 + (m || 0);
+    const hours = h !== undefined && Number.isFinite(h) ? h : 0;
+    const minutes = m !== undefined && Number.isFinite(m) ? m : 0;
+    return hours * 60 + minutes;
 }
-/** Centers raw (unstyled) text within a fixed width -- extra space splits
- * left/right (left gets the smaller half on an odd remainder). Used for
- * every weekday-header label and grid cell: most cells are short glyphs
- * ("." for no class, "|" for a continuation) sitting in a column sized for
- * that column's own longest real content, and left-anchoring them reads as
- * ragged leftover text rather than a clean grid -- centering them (and the
- * header labels above them) reads as an aligned table instead. Applied to
- * the raw content before any chalk styling wraps it, so this works
- * uniformly whether the eventual style adds a background (the cursor
- * token) or only a foreground color -- there's no special case to keep in
- * sync. */
 function centerInWidth(text, width) {
     const pad = Math.max(0, width - visualWidth(text));
     const left = Math.floor(pad / 2);
     const right = pad - left;
     return ' '.repeat(left) + text + ' '.repeat(right);
 }
-// A sensible floor for a column that's mostly empty cells and a short
-// weekday label -- prevents a completely classless day from collapsing to
-// an unreadably thin sliver.
 const MIN_COL_WIDTH = 8;
-export function renderWeekGrid(meetings, periods, weekNumber, now, cols = 80, cursor) {
-    const week = meetingsInWeek(meetings, weekNumber);
-    const todayWd = campusWeekday(now);
-    // Row labels are the period's real clock start-end range ("08:00-08:45"),
-    // always exactly 11 display columns — a bare start time answers "when do
-    // I need to be there" but leaves "when am I done" (and the class's real
-    // duration) to guesswork; the full range answers both. 12, not 11: one
-    // column of separating space before the first cell.
+export function renderWeekGrid(timetable, weekNumber, now, cols = 80, cursor) {
+    const schedule = createTimetableSchedule(timetable);
+    const week = schedule.meetingsInWeek(weekNumber);
+    const todayWd = schedule.weekdayAt(now);
+    const periods = timetable.periods;
     const rowHeadW = 12;
     const todayMark = pickIcon('•', '*');
     const connector = pickIcon('│', '|');
@@ -262,11 +253,6 @@ export function renderWeekGrid(meetings, periods, weekNumber, now, cols = 80, cu
     const sepGlyph = pickIcon('│', '|');
     const sep = type.hint(` ${sepGlyph} `);
     const sepW = 3; // " │ " / " | " -- always 3 display columns regardless of icon mode
-    // Each weekday column is sized to *that day's own* content only, never a
-    // different day's longer course name -- a single long Tuesday class no
-    // longer forces Monday through Sunday to share its width. Course name and
-    // location are on separate lines (see the row loop below), so neither has
-    // to compete with the other for room within one column either.
     const idealColWidths = WEEKDAY_KEYS.map((_, i) => {
         const wd = i + 1;
         const dayMeetings = week.filter((m) => m.weekday === wd);
@@ -275,30 +261,13 @@ export function renderWeekGrid(meetings, periods, weekNumber, now, cols = 80, cu
         const headerW = visualWidth(weekdayShortLabel(wd)) + (wd === todayWd ? visualWidth(todayMark) : 0);
         return Math.max(nameW, locW, headerW, MIN_COL_WIDTH);
     });
-    // If every column's own ideal width already fits the terminal, use it
-    // outright -- an empty (floor-width) day must never eat into a genuinely
-    // busy day's share just because both are capped by the same flat "1/7th
-    // of the remaining space" division. Only when the ideal *total* doesn't
-    // fit does every column shrink, proportionally to its own ideal width, so
-    // the row's total width never exceeds `cols` -- unlike a flat floor that
-    // stays fixed regardless of how little room is actually left.
     const fixedOverhead = space.indent.length + rowHeadW + 6 * sepW;
     const availableForCols = Math.max(0, cols - fixedOverhead);
     const totalIdealColW = idealColWidths.reduce((a, b) => a + b, 0);
     const colWidths = totalIdealColW <= availableForCols
         ? idealColWidths
-        // Floored at 3, not 1 -- truncate() itself can never shrink text below
-        // its own 3-column ellipsis ("..."), so a column narrower than that
-        // would make even the shortest weekday header ("Mon") overflow its own
-        // column when truncated. 3 is also exactly a bare weekday abbreviation's
-        // width, so at this floor a header never actually needs truncating.
         : idealColWidths.map((w) => Math.max(3, Math.floor(w * (availableForCols / totalIdealColW))));
     const totalW = rowHeadW + colWidths.reduce((a, b) => a + b, 0) + 6 * sepW;
-    // Consecutive periods of the same meeting collapse into one labeled cell
-    // at its starting period — later periods in its span show a plain
-    // connector instead of repeating the same course/location text down the
-    // whole column. A genuine conflict (two meetings both starting at the
-    // same weekday+period) shows whichever one is found first.
     const startingAt = (wd, period) => week.find((m) => m.weekday === wd && m.startPeriod === period);
     const continuingAt = (wd, period) => week.find((m) => m.weekday === wd && m.startPeriod < period && period <= m.endPeriod);
     const lines = [];
@@ -307,12 +276,8 @@ export function renderWeekGrid(meetings, periods, weekNumber, now, cols = 80, cu
         const wd = i + 1;
         const d = weekdayShortLabel(wd);
         const label = wd === todayWd ? `${d}${todayMark}` : d;
-        // Column width always starts out >= the label's own width (headerW is
-        // one of the terms idealColWidths maxes over), but proportional
-        // shrinking on a too-narrow terminal can push a column's *scaled*
-        // width below that -- truncate defensively so the header can never
-        // render wider than the column it's supposed to sit in.
-        const padded = centerInWidth(truncate(label, colWidths[i]), colWidths[i]);
+        const colWidth = colWidths[i] ?? 3;
+        const padded = centerInWidth(truncate(label, colWidth), colWidth);
         return wd === todayWd ? type.active(padded) : type.hint(padded);
     }).join(sep);
     lines.push(space.indent + blankHead + headerCells);
@@ -323,19 +288,15 @@ export function renderWeekGrid(meetings, periods, weekNumber, now, cols = 80, cu
         const locCells = [];
         for (let wdIdx = 0; wdIdx < 7; wdIdx++) {
             const wd = wdIdx + 1;
-            const colW = colWidths[wdIdx];
+            const colW = colWidths[wdIdx] ?? 3;
             const isToday = wd === todayWd;
-            const isCursor = cursor !== undefined && cursor.weekday === wd && cursor.period === p.period;
+            const isCursor = cursor?.weekday === wd && cursor.period === p.period;
             const starting = startingAt(wd, p.period);
             const isContinuation = !starting && continuingAt(wd, p.period);
-            const rawName = starting ? starting.courseName : (isContinuation ? connector : emptyGlyph);
-            const rawLoc = starting ? (starting.location ?? '') : (isContinuation ? connector : '');
+            const rawName = starting ? starting.courseName : isContinuation ? connector : emptyGlyph;
+            const rawLoc = starting ? (starting.location ?? '') : isContinuation ? connector : '';
             const paddedName = centerInWidth(truncate(rawName, colW), colW);
             const paddedLoc = centerInWidth(truncate(rawLoc, colW), colW);
-            // Cursor styling covers both lines of the cell -- it's one selected
-            // unit, not just its name half. Otherwise the course name (primary
-            // info) gets full styling on today/cursor; the location (supporting
-            // info) always stays dim, even on today's own column.
             if (isCursor) {
                 nameCells.push(type.cursor(paddedName));
                 locCells.push(type.cursor(paddedLoc));
@@ -362,12 +323,15 @@ function formatWeekRange(weeks) {
     if (weeks.length === 0)
         return '';
     const sorted = [...weeks].sort((a, b) => a - b);
-    const isContiguous = sorted.every((w, i) => i === 0 || w === sorted[i - 1] + 1);
+    const isContiguous = sorted.every((week, index) => {
+        const previous = sorted[index - 1];
+        return index === 0 || (previous !== undefined && week === previous + 1);
+    });
     if (isContiguous) {
-        return sorted.length > 1 ? `${sorted[0]}-${sorted[sorted.length - 1]}` : `${sorted[0]}`;
+        const first = sorted[0];
+        const last = sorted.at(-1);
+        return sorted.length > 1 ? `${first}-${last}` : `${first}`;
     }
-    // A genuinely non-contiguous week pattern is rare but must not crash or
-    // silently drop data -- fall back to listing every week.
     return sorted.join(', ');
 }
 export function renderMeetingDetail(meeting, periods, cols = Number.POSITIVE_INFINITY) {
@@ -378,15 +342,17 @@ export function renderMeetingDetail(meeting, periods, cols = Number.POSITIVE_INF
     if (meeting.location)
         rows.push([trans.timetable.detailLocation, meeting.location]);
     if (meeting.teacherNames.length > 0) {
-        rows.push([trans.timetable.detailTeacher, meeting.teacherNames.join(trans.timetable.teacherSeparator)]);
+        rows.push([
+            trans.timetable.detailTeacher,
+            meeting.teacherNames.join(trans.timetable.teacherSeparator),
+        ]);
     }
     rows.push([trans.timetable.detailWeeks, formatWeekRange(meeting.weeks)]);
     const width = Number.isFinite(cols) ? Math.max(1, Math.floor(cols)) : Number.POSITIVE_INFINITY;
     const indent = visualWidth(space.indent) < width ? space.indent : '';
     const contentWidth = Math.max(1, width - visualWidth(indent));
     const labelWidth = rows.reduce((w, [label]) => Math.max(w, visualWidth(label)), 0);
-    const lines = wrapAnsiToVisualWidth(type.heading(meeting.courseName), contentWidth)
-        .map((part) => `${indent}${part}`);
+    const lines = wrapAnsiToVisualWidth(type.heading(meeting.courseName), contentWidth).map((part) => `${indent}${part}`);
     lines.push('');
     for (const [label, value] of rows) {
         const inlinePrefix = `${indent}${type.label(padEndV(label, labelWidth))}   `;
@@ -430,23 +396,21 @@ export function renderUnresolvedItems(items, cols = Number.POSITIVE_INFINITY) {
         const detailPrefix = visualWidth(indent) + 2 < width ? `${indent}${type.hint(`${dot} `)}` : indent;
         const detailWidth = Math.max(1, width - visualWidth(detailPrefix));
         const continuation = ' '.repeat(visualWidth(detailPrefix));
-        lines.push(...wrapAnsiToVisualWidth(type.hint(detail), detailWidth)
-            .map((part, index) => `${index === 0 ? detailPrefix : continuation}${part}`));
+        lines.push(...wrapAnsiToVisualWidth(type.hint(detail), detailWidth).map((part, index) => `${index === 0 ? detailPrefix : continuation}${part}`));
     }
     return lines.join('\n');
 }
 const DENSITY_GLYPHS = [
-    ['·', ' '], ['░', '.'], ['▒', ':'], ['▓', '-'], ['█', '='],
+    ['·', ' '],
+    ['░', '.'],
+    ['▒', ':'],
+    ['▓', '-'],
+    ['█', '='],
 ];
 function levelGlyph(level) {
-    const pair = DENSITY_GLYPHS[Math.max(0, Math.min(4, level))] ?? DENSITY_GLYPHS[0];
+    const pair = DENSITY_GLYPHS[Math.max(0, Math.min(4, level))] ?? ['·', ' '];
     return pickIcon(pair[0], pair[1]);
 }
-/** Level 0 reads as an ordinary "no data" cell (matches renderWeekGrid's own
- * empty-cell treatment above); levels 1-3 use plain brand color; level 4
- * reuses type.active's exact bold+brand composition rather than inventing a
- * new top-tier shade — deliberately NOT the heatmap's green ramp, which
- * specifically means "club activity," not personal class load. */
 function applyDensityColor(glyphChar, level) {
     if (level <= 0)
         return type.hint(glyphChar);
@@ -455,8 +419,7 @@ function applyDensityColor(glyphChar, level) {
     return c.brand(glyphChar);
 }
 function weekStartDate(weekOneMonday, week) {
-    const base = new Date(`${weekOneMonday}T00:00:00`);
-    return new Date(base.getTime() + (week - 1) * 7 * 86400000);
+    return addLocalDays(parseLocalMonday(weekOneMonday), (week - 1) * 7);
 }
 function densityMonthText(weekOneMonday, startWeek, count, lang, maxWidth = Number.POSITIVE_INFINITY) {
     let text = '';
@@ -468,9 +431,9 @@ function densityMonthText(weekOneMonday, startWeek, count, lang, maxWidth = Numb
         if (month === previousMonth)
             continue;
         previousMonth = month;
-        const label = lang === 'zh'
-            ? `${month + 1}月`
-            : new Intl.DateTimeFormat('en-US', { month: 'short' }).format(date);
+        const label = new Intl.DateTimeFormat(lang === 'zh' ? 'zh-CN' : 'en-US', {
+            month: 'short',
+        }).format(date);
         const targetCol = index * 2;
         if (targetCol + visualWidth(label) > maxWidth)
             continue;
@@ -551,8 +514,7 @@ export function renderTermDensity(meetings, weekOneMonday, currentWeek, cols = N
     const indent = visualWidth(space.indent) < width ? space.indent : '';
     const contentWidth = Math.max(1, width - visualWidth(indent));
     const weeksPerChunk = Math.max(1, Math.floor((contentWidth + 1) / 2));
-    const lines = wrapAnsiToVisualWidth(type.heading(trans.timetable.termDensityTitle), contentWidth)
-        .map((part) => `${indent}${part}`);
+    const lines = wrapAnsiToVisualWidth(type.heading(trans.timetable.termDensityTitle), contentWidth).map((part) => `${indent}${part}`);
     lines.push('');
     for (let start = 0; start < numWeeks; start += weeksPerChunk) {
         if (start > 0)
@@ -560,8 +522,10 @@ export function renderTermDensity(meetings, weekOneMonday, currentWeek, cols = N
         const count = Math.min(weeksPerChunk, numWeeks - start);
         const chunkMonthText = densityMonthText(weekOneMonday, minWeek + start, count, lang, contentWidth);
         lines.push(`${indent}${chunkMonthText}`);
-        lines.push(`${indent}${levels.slice(start, start + count)
-            .map((level) => applyDensityColor(levelGlyph(level), level)).join(' ')}`);
+        lines.push(`${indent}${levels
+            .slice(start, start + count)
+            .map((level) => applyDensityColor(levelGlyph(level), level))
+            .join(' ')}`);
         if (currentWeekIndex >= start && currentWeekIndex < start + count) {
             const relativeIndex = currentWeekIndex - start;
             lines.push(`${indent}${type.hint(densityMarkerText(relativeIndex, contentWidth, markerGlyph, trans.timetable.termDensityThisWeek))}`);

package/dist/features/schedule-store.js

@@ -1,7 +1,27 @@
 import fs from 'fs';
 import path from 'path';
-import { getWritableConfigDir, getConfigDir, getWritableStateDir, getStateDir } from '../config/paths.js';
+import { getWritableConfigDir, getConfigDir, getWritableStateDir, getStateDir, } from '../config/paths.js';
+import { parseLocalMonday } from '../core/calendar-day.js';
+const TERM_PART_RE = /^[A-Za-z0-9_-]{1,32}$/;
+const TERM_KEY_RE = /^[A-Za-z0-9_-]{1,65}$/;
+function requireTermKey(value) {
+    if (!TERM_KEY_RE.test(value))
+        throw new TypeError('Invalid academic term key.');
+    return value;
+}
+function isLocalMonday(value) {
+    try {
+        parseLocalMonday(value);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 export function termKey(term) {
+    if (!TERM_PART_RE.test(term.academicYear) || !TERM_PART_RE.test(term.semester)) {
+        throw new TypeError('Invalid academic term code.');
+    }
     return `${term.academicYear}-${term.semester}`;
 }
 function readJson(file) {
@@ -17,42 +37,60 @@ function writeJson(file, value) {
     try {
         fs.chmodSync(file, 0o600);
     }
-    catch { /* best effort */ }
+    catch {
+        /* best effort */
+    }
 }
 function weekOnePath(dir) {
     return path.join(dir ?? getWritableConfigDir(), 'week-one.json');
 }
 export function saveWeekOne(termKey, iso, dir) {
+    requireTermKey(termKey);
+    parseLocalMonday(iso);
     const file = weekOnePath(dir);
     const store = readJson(file) ?? {};
     store[termKey] = iso;
     writeJson(file, store);
 }
 export function loadWeekOne(termKey, dir) {
+    if (!TERM_KEY_RE.test(termKey))
+        return null;
     const file = path.join(dir ?? getConfigDir(), 'week-one.json');
     const store = readJson(file);
-    return store?.[termKey] ?? null;
+    const value = store?.[termKey];
+    return typeof value === 'string' && isLocalMonday(value) ? value : null;
 }
 function cachePath(termKey, dir) {
-    return path.join(dir ?? getWritableStateDir(), `timetable-${termKey}.json`);
+    const stateDir = path.resolve(dir ?? getWritableStateDir());
+    const file = path.resolve(stateDir, `timetable-${requireTermKey(termKey)}.json`);
+    if (path.dirname(file) !== stateDir)
+        throw new TypeError('Invalid timetable cache path.');
+    return file;
 }
 export function saveTimetableCache(termKey, data, dir) {
     writeJson(cachePath(termKey, dir), data);
 }
 export function loadTimetableCache(termKey, dir) {
-    const file = path.join(dir ?? getStateDir(), `timetable-${termKey}.json`);
-    return readJson(file);
+    if (!TERM_KEY_RE.test(termKey))
+        return null;
+    return readJson(cachePath(termKey, dir ?? getStateDir()));
 }
 function currentPointerPath(dir) {
     return path.join(dir ?? getWritableStateDir(), 'current-term.json');
 }
 export function saveCurrentPointer(termKey, weekOneMonday, dir) {
+    requireTermKey(termKey);
+    parseLocalMonday(weekOneMonday);
     writeJson(currentPointerPath(dir), { termKey, weekOneMonday });
 }
 export function loadCurrentPointer(dir) {
     const file = path.join(dir ?? getStateDir(), 'current-term.json');
     const value = readJson(file);
-    if (!value || typeof value.termKey !== 'string' || typeof value.weekOneMonday !== 'string')
+    if (!value ||
+        typeof value.termKey !== 'string' ||
+        !TERM_KEY_RE.test(value.termKey) ||
+        typeof value.weekOneMonday !== 'string' ||
+        !isLocalMonday(value.weekOneMonday))
         return null;
     return { termKey: value.termKey, weekOneMonday: value.weekOneMonday };
 }
@@ -65,9 +103,13 @@ export function clearScheduleCache(dir) {
                 try {
                     fs.unlinkSync(path.join(stateDir, f));
                 }
-                catch { /* best effort */ }
+                catch {
+                    /* best effort */
+                }
             }
         }
     }
-    catch { /* best effort: dir may not exist */ }
+    catch {
+        /* best effort: dir may not exist */
+    }
 }