@nbtca/prompt 1.5.10 → 1.5.11

package/README.md

@@ -51,8 +51,6 @@ npm run check
 `check` runs formatting, lint, full TypeScript validation, tests, build, package
 consumer checks and dependency audit.
 
-Project guides and release notes live in the [Wiki](https://github.com/nbtca/Prompt/wiki).
-
 ## License
 
 MIT

package/dist/app/views/home.js

@@ -5,9 +5,9 @@ import { padEndV, visualWidth, wrapAnsiWithIndent } from '../../core/text.js';
 import { peekNextClassLine, peekTodayLines, peekWeekAheadInfo, peekUnresolvedCount, } from '../../features/schedule-view.js';
 import { loadCalendarOrThrow, peekCalendar, toDisplayEvent, renderEventBrief, } from '../../features/calendar.js';
 import { weekdayShortLabel } from '../../features/schedule-render.js';
-import { addLocalDays } from '../../core/calendar-day.js';
 import { passiveFooterHint } from '../chrome.js';
-import { campusWeekday } from '@nbtca/nbtcal/timetable';
+import { campusDateTime, campusIsoDate } from '@nbtca/nbtcal/timetable';
+import { isoDayDifference, localDayDifference, parseLocalDate } from '../../core/calendar-day.js';
 import { loadingLines } from '../../core/components/spinner.js';
 const WEEKDAYS = [1, 2, 3, 4, 5, 6, 7];
 function wrappedIndentedLines(label, cols, style) {
@@ -20,10 +20,11 @@ function wrappedRenderedLines(line, cols) {
     const content = line.startsWith(space.indent) ? line.slice(space.indent.length) : line;
     return wrappedIndentedLines(content, cols, (value) => value);
 }
+const DAY_MS = 86_400_000;
 const DAY_PROGRESS_WIDTH = 20;
 function renderDayProgress(now, cols) {
-    const minutesElapsed = now.getHours() * 60 + now.getMinutes();
-    const fraction = Math.min(1, Math.max(0, minutesElapsed / 1440));
+    const midnight = campusDateTime(campusIsoDate(now), '00:00');
+    const fraction = Math.min(1, Math.max(0, (now.getTime() - midnight.getTime()) / DAY_MS));
     const pct = Math.round(fraction * 100);
     const percentage = `${pct}%`;
     const width = Number.isFinite(cols) ? Math.max(1, Math.floor(cols)) : Number.POSITIVE_INFINITY;
@@ -149,8 +150,14 @@ function calendarSnapshot(cal, weekAheadInfo) {
         .map((event) => renderEventBrief(toDisplayEvent(event), now));
     if (!weekAheadInfo)
         return { eventLines };
-    const weekEnd = addLocalDays(weekAheadInfo.weekStartDate, 7);
-    const daySet = new Set(cal.inRange(weekAheadInfo.weekStartDate, weekEnd).map((event) => campusWeekday(event.start)));
+    const { weekStart } = weekAheadInfo;
+    const monday = campusDateTime(weekStart, '00:00');
+    const daySet = new Set(cal
+        .inRange(new Date(monday.getTime() - DAY_MS), new Date(monday.getTime() + 8 * DAY_MS))
+        .map((event) => 1 +
+        (event.isAllDay
+            ? localDayDifference(parseLocalDate(weekStart), event.start)
+            : isoDayDifference(weekStart, campusIsoDate(event.start)))));
     return {
         eventLines,
         weekAhead: {

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

@@ -1,11 +1,11 @@
-import { createTimetableSchedule, } from '@nbtca/nbtcal/timetable';
+import { campusIsoDate, 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 { renderNextClassBanner, renderWeekGrid, renderUnresolvedItems, renderTodayTimeline, weekdayShortLabel, renderTermDensity, renderMeetingDetail, renderDayTimeline, renderDaySwitcher, } from '../../features/schedule-render.js';
 import { sanitizeTerminalLine, visualWidth, wrapAnsiWithIndent } from '../../core/text.js';
-import { localDayDifference, parseLocalDate, parseLocalMonday } from '../../core/calendar-day.js';
+import { isoDayDifference } from '../../core/calendar-day.js';
 import { loadingLines } from '../../core/components/spinner.js';
 function heading(label) {
     return `${space.indent}${type.heading(label)}`;
@@ -90,7 +90,7 @@ function hubPreGridLines(state, now, cols) {
         lines.push(heading(trans.timetable.termNotStarted));
         lines.push(hint(fmt(trans.timetable.termStartsIn, {
             date: state.weekOne,
-            days: String(daysBetween(now, new Date(`${state.weekOne}T00:00:00`))),
+            days: String(daysUntil(now, state.weekOne)),
         })));
         lines.push('');
         lines.push(heading(trans.timetable.termPreviewWeek));
@@ -160,7 +160,7 @@ const TERM_PROGRESS_WIDTH = 20;
 function renderTermProgressBar(w, cols) {
     if (!w.nextBreakStart)
         return null;
-    const totalWeeks = Math.max(1, Math.round(localDayDifference(parseLocalMonday(w.weekOneMonday), parseLocalDate(w.nextBreakStart)) / 7));
+    const totalWeeks = Math.max(1, Math.round(isoDayDifference(w.weekOneMonday, w.nextBreakStart) / 7));
     const currentWeek = w.currentWeek;
     const labelText = fmt(t().timetable.weekLabel2, { week: `${currentWeek}/${totalWeeks}` });
     const label = type.hint(labelText);
@@ -177,8 +177,8 @@ function renderTermProgressBar(w, cols) {
         ? [`${indent}${bar}  ${label}`]
         : [`${indent}${bar}`, ...hintLines(labelText, cols)];
 }
-function daysBetween(a, b) {
-    return Math.max(0, localDayDifference(a, b));
+function daysUntil(now, date) {
+    return Math.max(0, isoDayDifference(campusIsoDate(now), date));
 }
 function renderPublicBody(state, now, bodyRows, cols) {
     const trans = t();
@@ -202,7 +202,7 @@ function renderPublicBody(state, now, bodyRows, cols) {
         if (w.nextBreakStart && w.nextBreakTitle) {
             lines.push(...hintLines(fmt(trans.timetable.daysUntilBreak, {
                 title: sanitizeTerminalLine(w.nextBreakTitle),
-                days: String(daysBetween(now, parseLocalDate(w.nextBreakStart))),
+                days: String(daysUntil(now, w.nextBreakStart)),
             }), cols));
         }
     }

package/dist/core/calendar-day.js

@@ -35,3 +35,6 @@ function localDayIndex(date) {
 export function localDayDifference(start, end) {
     return localDayIndex(end) - localDayIndex(start);
 }
+export function isoDayDifference(start, end) {
+    return (Date.parse(end) - Date.parse(start)) / DAY_MS;
+}

package/dist/features/schedule-render.js

@@ -1,4 +1,4 @@
-import { createTimetableSchedule } from '@nbtca/nbtcal/timetable';
+import { campusDateTime, campusIsoDate, createTimetableSchedule } from '@nbtca/nbtcal/timetable';
 import { countdownParts, isCountdownUrgent } from './calendar-query.js';
 import { c, type, space, glyph } from '../core/theme.js';
 import { pickIcon } from '../core/icons.js';
@@ -64,25 +64,6 @@ export function renderNextClassBanner(next, now, cols = Number.POSITIVE_INFINITY
     }
     return styleWhen(compactWhen);
 }
-export function renderTodayClasses(meetings, periods, now) {
-    const trans = t();
-    const sorted = [...meetings].sort((a, b) => a.startPeriod - b.startPeriod);
-    if (sorted.length === 0)
-        return `${space.indent}${type.hint(trans.timetable.noClassToday)}`;
-    const dot = pickIcon('·', '-');
-    const marker = pickIcon('▸', '>');
-    const lines = sorted.map((m) => {
-        const time = span(m, periods);
-        const startStr = periods.find((p) => p.period === m.startPeriod)?.start ?? '00:00';
-        const endStr = periods.find((p) => p.period === m.endPeriod)?.end ?? '23:59';
-        const nowStr = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
-        const live = nowStr >= startStr && nowStr <= endStr;
-        const head = live ? `${type.active(marker)} ` : '  ';
-        const loc = m.location ? `  ${dot}  ${type.hint(m.location)}` : '';
-        return `${space.indent}${head}${type.hint(time)}  ${live ? type.active(m.courseName) : type.body(m.courseName)}${loc}`;
-    });
-    return lines.join('\n');
-}
 export function weekdayShortLabel(wd) {
     const trans = t();
     const labels = [
@@ -101,7 +82,8 @@ function renderTimeline(meetings, periods, now, isToday, alwaysShowLocation, cur
     const sorted = [...meetings].sort((a, b) => a.startPeriod - b.startPeriod);
     if (sorted.length === 0)
         return `${space.indent}${type.hint(trans.timetable.noClassToday)}`;
-    const nowStr = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
+    const today = campusIsoDate(now);
+    const minute = Math.floor(now.getTime() / 60_000) * 60_000;
     const dot = pickIcon('·', '-');
     const rule = pickIcon('─', '-');
     const midConnector = pickIcon('┼', '+');
@@ -110,8 +92,9 @@ function renderTimeline(meetings, periods, now, isToday, alwaysShowLocation, cur
     const lines = sorted.map((m, i) => {
         const startStr = periods.find((p) => p.period === m.startPeriod)?.start ?? '00:00';
         const endStr = periods.find((p) => p.period === m.endPeriod)?.end ?? '23:59';
-        const isLive = isToday && nowStr >= startStr && nowStr <= endStr;
-        const isDone = isToday && nowStr > endStr;
+        const end = campusDateTime(today, endStr);
+        const isLive = isToday && campusDateTime(today, startStr).getTime() <= minute && minute <= end.getTime();
+        const isDone = isToday && minute > end.getTime();
         const isCursor = cursorPeriod !== undefined && m.startPeriod <= cursorPeriod && cursorPeriod <= m.endPeriod;
         const connector = i === 0 ? topConnector : midConnector;
         const marker = isLive ? type.active(pickIcon('▶', '>')) : ' ';
@@ -124,9 +107,6 @@ function renderTimeline(meetings, periods, now, isToday, alwaysShowLocation, cur
             compactStatusText = statusText;
         }
         else if (isLive) {
-            const end = new Date(now);
-            const [eh, em] = endStr.split(':').map((x) => Number.parseInt(x, 10));
-            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) })}`;

package/dist/features/schedule-view.js

@@ -1,9 +1,9 @@
-import { createTimetableSchedule } from '@nbtca/nbtcal/timetable';
-import { addLocalDays, parseLocalMonday } from '../core/calendar-day.js';
+import { campusDateTime, campusIsoDate, createTimetableSchedule, } from '@nbtca/nbtcal/timetable';
 import { renderNextClassBanner, renderTodayTimeline } from './schedule-render.js';
 import { loadCurrentPointer, loadTimetableCache } from './schedule-store.js';
 import { sanitizeTimetable } from './timetable-sanitize.js';
 const WEEKDAYS = [1, 2, 3, 4, 5, 6, 7];
+const WEEK_MS = 7 * 86_400_000;
 function loadCachedTimetable() {
     const pointer = loadCurrentPointer();
     if (!pointer)
@@ -69,8 +69,8 @@ export function peekWeekAheadInfo(now = new Date()) {
         if (week < 1)
             return null;
         const classDays = WEEKDAYS.map((weekday) => schedule.meetingsOnDay(week, weekday).length > 0);
-        const weekStartDate = addLocalDays(parseLocalMonday(cached.weekOneMonday), (week - 1) * 7);
-        return { weekStartDate, classDays };
+        const weekStart = campusDateTime(cached.weekOneMonday, '00:00').getTime() + (week - 1) * WEEK_MS;
+        return { weekStart: campusIsoDate(new Date(weekStart)), classDays };
     }
     catch {
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nbtca/prompt",
-  "version": "1.5.10",
+  "version": "1.5.11",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -46,8 +46,8 @@
     "interactive"
   ],
   "dependencies": {
-    "@nbtca/docs": "^0.3.0",
-    "@nbtca/nbtcal": "^0.4.0",
+    "@nbtca/docs": "^0.3.1",
+    "@nbtca/nbtcal": "^0.4.1",
     "chalk": "^5.6.2",
     "cheerio": "1.0.0",
     "fetch-cookie": "^3.2.0",