@nbtca/prompt 1.4.2 → 1.5.1

package/dist/app/views/schedule-render.js

@@ -1,11 +1,13 @@
+import { createTimetableSchedule, } from '@nbtca/nbtcal/timetable';
 import { c, type, space, glyph } from '../../core/theme.js';
 import { pickIcon } from '../../core/icons.js';
 import { t, fmt } from '../../i18n/index.js';
 import { renderListFieldWithContext } from '../fields/list-field.js';
-import { currentWeekNumber, campusWeekday, meetingsOnDay, nextMeeting } from '../../features/schedule-query.js';
 import { renderNextClassBanner, renderWeekGrid, renderUnresolvedItems, renderTodayTimeline, weekdayShortLabel, renderTermDensity, renderMeetingDetail, renderDayTimeline, renderDaySwitcher, } from '../../features/schedule-render.js';
 import { renderEventBrief } from '../../features/calendar.js';
-import { visualWidth, wrapAnsiToVisualWidth } from '../../core/text.js';
+import { sanitizeTerminalLine, visualWidth, wrapAnsiWithIndent } from '../../core/text.js';
+import { localDayDifference, parseLocalDate, parseLocalMonday } from '../../core/calendar-day.js';
+import { loadingLines } from '../../core/components/spinner.js';
 function heading(label) {
     return `${space.indent}${type.heading(label)}`;
 }
@@ -13,10 +15,7 @@ function hint(label) {
     return `${space.indent}${type.hint(label)}`;
 }
 function wrappedIndentedLines(label, cols, style) {
-    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));
-    return wrapAnsiToVisualWidth(style(label), contentWidth).map((part) => `${indent}${part}`);
+    return wrapAnsiWithIndent(style(label), cols, space.indent);
 }
 function headingLines(label, cols) {
     return wrappedIndentedLines(label, cols, type.heading);
@@ -51,8 +50,12 @@ function renderShortcutLines(shortcuts, cols, compact = false) {
     const available = Math.max(1, cols - visualWidth(space.indent));
     const parts = shortcuts.map((shortcut) => {
         const text = compact
-            ? shortcut.showKey === false ? `[${shortcut.key}] ${shortcut.label}` : `[${shortcut.key}]`
-            : shortcut.showKey === false ? `[${shortcut.label}]` : `[${shortcut.key}] ${shortcut.label}`;
+            ? shortcut.showKey === false
+                ? `[${shortcut.key}] ${shortcut.label}`
+                : `[${shortcut.key}]`
+            : shortcut.showKey === false
+                ? `[${shortcut.label}]`
+                : `[${shortcut.key}] ${shortcut.label}`;
         return shortcut.warn ? c.warn(text) : type.hint(text);
     });
     const lines = [];
@@ -76,20 +79,19 @@ function hubPreGridLines(state, now, cols) {
     const tt = state.timetable;
     if (!tt || !state.weekOne)
         return null;
-    const week = currentWeekNumber(state.weekOne, now);
+    const schedule = createTimetableSchedule(tt, { weekOneMonday: state.weekOne });
+    const week = schedule.weekAt(now);
     const lines = [];
-    const banner = renderNextClassBanner(nextMeeting(tt.meetings, tt.periods, state.weekOne, now), now, cols);
-    lines.push(banner || hint(trans.timetable.noNextClass));
+    let next = null;
+    try {
+        next = schedule.next(now);
+    }
+    catch { }
+    const banner = renderNextClassBanner(next, now, cols);
+    lines.push(...(banner ? [banner] : hintLines(trans.timetable.noNextClass, cols)));
     lines.push('');
-    const todayWd = campusWeekday(now);
+    const todayWd = schedule.weekdayAt(now);
     if (week < 1) {
-        // weekOne can be a *future* date -- auto-inferred while on break, it
-        // deliberately points at the upcoming term (see academic-calendar.ts)
-        // so it's ready the moment classes start. There is no "today" to show
-        // yet, but the timetable's real week-1 data is already fetched -- show
-        // it as an explicit preview rather than showing no grid at all
-        // regardless of terminal height. The "Week 1 preview" heading keeps it
-        // unambiguous that this isn't "happening right now".
         lines.push(heading(trans.timetable.termNotStarted));
         lines.push(hint(fmt(trans.timetable.termStartsIn, {
             date: state.weekOne,
@@ -99,49 +101,32 @@ function hubPreGridLines(state, now, cols) {
         lines.push(heading(trans.timetable.termPreviewWeek));
         return { inlineLines: lines, fallbackLines: [...lines], week: 1, tt };
     }
-    const today = meetingsOnDay(tt.meetings, todayWd, week);
+    const today = schedule.meetingsOnDay(week, todayWd);
     const weekHeading = heading(trans.timetable.hubWeek);
     const inlineLines = [
         ...lines,
-        heading(fmt(trans.timetable.todayHeading, { weekday: weekdayShortLabel(todayWd), week: String(week) })),
+        heading(fmt(trans.timetable.todayHeading, {
+            weekday: weekdayShortLabel(todayWd),
+            week: String(week),
+        })),
         ...renderTodayTimeline(today, tt.periods, now, cols).split('\n'),
         weekHeading,
     ];
     return { inlineLines, fallbackLines: [...lines, weekHeading], week, tt };
 }
-// Below this width, even an all-empty grid's own per-column floor (3, plus
-// row-head and separator overhead) leaves each of the 7 columns too cramped
-// to show real content -- a technically-fitting but practically unreadable
-// grid isn't better than the single-day view, so width gates the decision
-// just as much as height does.
 const MIN_GRID_COLS = 100;
-/** The one place that decides "does the real week grid fit inline (plus a
- * floor reserved for the shortcut bar), or does the hub fall back to the
- * single-day view." Both branches represent the exact same gridCursor, just
- * rendered differently, so unlike the old non-interactive strip fallback
- * this decision no longer needs to be exposed to key handling -- arrow
- * keys/Enter are always meaningful in hub mode regardless of which branch is
- * currently on screen. */
 function gridFitsInline(precedingLineCount, tt, week, now, bodyRows, cols, cursor, reservedRows) {
     if (cols < MIN_GRID_COLS)
         return false;
-    const gridLines = renderWeekGrid(tt.meetings, tt.periods, week, now, cols, cursor).split('\n');
+    const gridLines = renderWeekGrid(tt, week, now, cols, cursor).split('\n');
     return precedingLineCount + gridLines.length <= bodyRows - reservedRows;
 }
-/** Renders the full weekday x period grid if it (plus a floor reserved for
- * the shortcut bar) fits within bodyRows and cols, otherwise a single day's
- * detailed timeline -- the day the cursor's own weekday points at (today, by
- * default). A large terminal genuinely has no excuse to not show the whole
- * week; a small one is better served by one day shown properly than seven
- * days crammed into unreadable slivers. Shared by the "this week" and "term
- * hasn't started yet, preview week 1" branches of renderHubBody -- the same
- * measure-and-fallback decision, just against a different week number. */
 function renderAdaptiveWeekGrid(inlineLines, fallbackLines, tt, week, todayWd, now, bodyRows, cols, cursor, reservedRows) {
     if (gridFitsInline(inlineLines.length, tt, week, now, bodyRows, cols, cursor, reservedRows)) {
-        return [...inlineLines, ...renderWeekGrid(tt.meetings, tt.periods, week, now, cols, cursor).split('\n')];
+        return [...inlineLines, ...renderWeekGrid(tt, week, now, cols, cursor).split('\n')];
     }
     const selectedWd = cursor?.weekday ?? todayWd;
-    const dayMeetings = meetingsOnDay(tt.meetings, selectedWd, week);
+    const dayMeetings = createTimetableSchedule(tt).meetingsOnDay(week, selectedWd);
     return [
         ...fallbackLines,
         renderDaySwitcher(selectedWd, todayWd, cols),
@@ -164,7 +149,7 @@ function renderHubBody(state, now, bodyRows, cols) {
         }
         tail.push(...shortcutLines);
         const content = pre
-            ? renderAdaptiveWeekGrid(pre.inlineLines, pre.fallbackLines, pre.tt, pre.week, campusWeekday(now), now, rows, cols, state.gridCursor, tail.length)
+            ? renderAdaptiveWeekGrid(pre.inlineLines, pre.fallbackLines, pre.tt, pre.week, createTimetableSchedule(pre.tt).weekdayAt(now), now, rows, cols, state.gridCursor, tail.length)
             : [];
         return { content, tail };
     };
@@ -174,19 +159,14 @@ function renderHubBody(state, now, bodyRows, cols) {
     const compact = build(renderShortcutLines(shortcuts, cols, true));
     if (compact.tail.length >= rows)
         return rows > 0 ? compact.tail.slice(-rows) : [];
-    return [
-        ...compact.content.slice(0, rows - compact.tail.length),
-        ...compact.tail,
-    ];
+    return [...compact.content.slice(0, rows - compact.tail.length), ...compact.tail];
 }
 const TERM_PROGRESS_WIDTH = 20;
-function renderTermProgressBar(w, now, cols) {
+function renderTermProgressBar(w, cols) {
     if (!w.nextBreakStart)
         return null;
-    const weekOneMs = new Date(`${w.weekOneMonday}T00:00:00`).getTime();
-    const nextBreakMs = new Date(`${w.nextBreakStart}T00:00:00`).getTime();
-    const totalWeeks = Math.max(1, Math.round((nextBreakMs - weekOneMs) / (7 * 86400000)));
-    const currentWeek = currentWeekNumber(w.weekOneMonday, now);
+    const totalWeeks = Math.max(1, Math.round(localDayDifference(parseLocalMonday(w.weekOneMonday), parseLocalDate(w.nextBreakStart)) / 7));
+    const currentWeek = w.currentWeek;
     const labelText = fmt(t().timetable.weekLabel2, { week: `${currentWeek}/${totalWeeks}` });
     const label = type.hint(labelText);
     const width = Number.isFinite(cols) ? Math.max(1, Math.floor(cols)) : Number.POSITIVE_INFINITY;
@@ -203,31 +183,31 @@ function renderTermProgressBar(w, now, cols) {
         : [`${indent}${bar}`, ...hintLines(labelText, cols)];
 }
 function daysBetween(a, b) {
-    return Math.max(0, Math.ceil((b.getTime() - a.getTime()) / 86400000));
+    return Math.max(0, localDayDifference(a, b));
 }
 function renderPublicBody(state, now, bodyRows, cols) {
     const trans = t();
     const lines = [];
     const w = state.publicWindow;
     if (w === undefined) {
-        lines.push(...hintLines(trans.common.loading, cols));
+        lines.push(...loadingLines(trans.common.loading, cols));
     }
     else if (w === null) {
         lines.push(...hintLines(trans.timetable.publicUnavailable, cols));
     }
     else if (w.status === 'onBreak') {
-        lines.push(...headingLines(fmt(trans.timetable.onBreak, { title: w.breakTitle }), cols));
+        lines.push(...headingLines(fmt(trans.timetable.onBreak, { title: sanitizeTerminalLine(w.breakTitle) }), cols));
     }
     else {
         const semesterLabel = w.semester === '1' ? trans.timetable.semester1 : trans.timetable.semester2;
-        lines.push(...headingLines(`${fmt(trans.timetable.academicYearSuffix, { year: w.academicYear })} · ${semesterLabel} · ${fmt(trans.timetable.weekLabel2, { week: String(w.currentWeek) })}`, cols));
-        const bar = renderTermProgressBar(w, now, cols);
+        lines.push(...headingLines(`${fmt(trans.timetable.academicYearSuffix, { year: sanitizeTerminalLine(w.academicYear) })} · ${semesterLabel} · ${fmt(trans.timetable.weekLabel2, { week: String(w.currentWeek) })}`, cols));
+        const bar = renderTermProgressBar(w, cols);
         if (bar)
             lines.push(...bar);
         if (w.nextBreakStart && w.nextBreakTitle) {
             lines.push(...hintLines(fmt(trans.timetable.daysUntilBreak, {
-                title: w.nextBreakTitle,
-                days: String(daysBetween(now, new Date(`${w.nextBreakStart}T00:00:00`))),
+                title: sanitizeTerminalLine(w.nextBreakTitle),
+                days: String(daysBetween(now, parseLocalDate(w.nextBreakStart))),
             }), cols));
         }
     }
@@ -261,7 +241,7 @@ export function renderSchedule(state, now, bodyRows = 100, cols = 80) {
     const trans = t();
     switch (state.mode) {
         case 'loading':
-            return hintLines(trans.common.loading, cols);
+            return loadingLines(trans.common.loading, cols);
         case 'public':
             return renderPublicBody(state, now, bodyRows, cols);
         case 'needsLoginId':
@@ -272,7 +252,7 @@ export function renderSchedule(state, now, bodyRows = 100, cols = 80) {
         case 'needsLoginPassword':
             return state.passwordField?.render(cols) ?? [];
         case 'authenticating':
-            return hintLines(state.statusMessage ?? trans.common.loading, cols);
+            return loadingLines(state.statusMessage ?? trans.common.loading, cols);
         case 'needsWeekOne':
             return [
                 ...(state.errorMessage ? [...hintLines(state.errorMessage, cols), ''] : []),
@@ -283,20 +263,17 @@ export function renderSchedule(state, now, bodyRows = 100, cols = 80) {
         case 'week': {
             if (!state.timetable || !state.weekOne)
                 return [hint(trans.timetable.genericError)];
-            const week = currentWeekNumber(state.weekOne, now);
+            const schedule = createTimetableSchedule(state.timetable, {
+                weekOneMonday: state.weekOne,
+            });
+            const week = Math.max(1, schedule.weekAt(now));
             const weekLines = [heading(trans.timetable.hubWeek), ''];
-            // Standalone week mode gets the *whole* bodyRows to itself (no
-            // banner/today-section eating into it first, unlike the hub's own
-            // inline area) -- reached via the `w` shortcut specifically so a
-            // marginal terminal that couldn't fit the grid inline the hub still
-            // gets a real shot at it here, falling back to the single-day view
-            // only if even the full screen isn't enough.
-            return renderAdaptiveWeekGrid(weekLines, weekLines, state.timetable, week, campusWeekday(now), now, bodyRows, cols, state.gridCursor, 2);
+            return renderAdaptiveWeekGrid(weekLines, weekLines, state.timetable, week, schedule.weekdayAt(now), now, bodyRows, cols, state.gridCursor, 2);
         }
         case 'termDensity':
-            return state.timetable && state.weekOne
-                ? renderTermDensity(state.timetable.meetings, state.weekOne, currentWeekNumber(state.weekOne, now), cols).split('\n')
-                : [hint(trans.timetable.genericError)];
+            if (!state.timetable || !state.weekOne)
+                return [hint(trans.timetable.genericError)];
+            return renderTermDensity(state.timetable.meetings, state.weekOne, createTimetableSchedule(state.timetable, { weekOneMonday: state.weekOne }).weekAt(now), cols).split('\n');
         case 'termPicker':
             return state.termField?.render(bodyRows, cols) ?? [];
         case 'unresolved':