@nbtca/prompt 1.5.0 → 1.5.2

package/dist/app/views/docs.js

@@ -4,9 +4,10 @@ import { TextField } from '../fields/text-field.js';
 import { renderDocs } from './docs-render.js';
 import { setVimKeysActive } from '../../core/vim-keys.js';
 import { pickIcon } from '../../core/icons.js';
-import { getCurrentLanguage, t } from '../../i18n/index.js';
+import { glyph } from '../../core/theme.js';
+import { fmt, getCurrentLanguage, t } from '../../i18n/index.js';
 import { sanitizeTerminalLine, truncate } from '../../core/text.js';
-import { localizeDocSections, fetchSections, fetchDocMetadata, fetchSectionMetadata, searchDocuments, getArchivedGroups, displayDocTitle, loadDocForReader, openDocsInBrowser, clearDocsCache, } from '../../features/docs.js';
+import { localizeDocSections, fetchSections, fetchDocMetadata, fetchSectionMetadata, searchDocuments, getArchivedGroups, displayDocTitle, loadDocForReader, openDocsInBrowser, docsUrlFromPath, clearDocsCache, } from '../../features/docs.js';
 let state = { mode: 'loading' };
 let sections = [];
 let archivedGroups = new Map();
@@ -23,7 +24,11 @@ let readerNavStack = [];
 let readerPrevState = null;
 let readerLoadingPrevState = null;
 let readerRequestId = 0;
+let lifecycleGeneration = 0;
 const DOC_HINT_WIDTH = 44;
+function isLifecycleActive(ctx, generation) {
+    return generation === lifecycleGeneration && ctx.signal?.aborted !== true;
+}
 function backLabel() {
     return t().common.back;
 }
@@ -43,6 +48,27 @@ function withoutErrorMessage(value) {
     delete next.errorMessage;
     return next;
 }
+async function runBrowserOpen(ctx, path) {
+    let opened;
+    await ctx.runClassic(async () => {
+        opened =
+            path === undefined
+                ? await openDocsInBrowser(undefined, ctx.signal)
+                : await openDocsInBrowser(path, ctx.signal);
+    });
+    return opened;
+}
+async function openBrowserFromView(ctx, path, generation = lifecycleGeneration) {
+    const opened = await runBrowserOpen(ctx, path);
+    if (!isLifecycleActive(ctx, generation) || opened === true)
+        return;
+    const url = docsUrlFromPath(path);
+    state = {
+        ...state,
+        errorMessage: sanitizeTerminalLine(`${t().docs.browserError}. ${fmt(t().links.openManually, { url })}`),
+    };
+    ctx.rerender();
+}
 function buildSectionsField() {
     const trans = t();
     const options = [
@@ -184,6 +210,9 @@ function replaceSection(section) {
     sections = sections.map((current) => (current.key === section.key ? section : current));
 }
 async function openSectionFiles(ctx, section) {
+    const generation = lifecycleGeneration;
+    if (!isLifecycleActive(ctx, generation))
+        return;
     const requestId = ++metadataRequestId;
     currentSectionKey = section.key;
     state = {
@@ -192,8 +221,9 @@ async function openSectionFiles(ctx, section) {
     };
     ctx.rerender();
     try {
-        const hydrated = await fetchSectionMetadata(section);
-        if (requestId !== metadataRequestId ||
+        const hydrated = await fetchSectionMetadata(section, ctx.signal);
+        if (!isLifecycleActive(ctx, generation) ||
+            requestId !== metadataRequestId ||
             state.mode !== 'files' ||
             currentSectionKey !== section.key)
             return;
@@ -205,15 +235,20 @@ async function openSectionFiles(ctx, section) {
         };
     }
     catch {
-        if (requestId !== metadataRequestId ||
+        if (!isLifecycleActive(ctx, generation) ||
+            requestId !== metadataRequestId ||
             state.mode !== 'files' ||
             currentSectionKey !== section.key)
             return;
         state = { ...state, errorMessage: t().docs.loadError };
     }
-    ctx.rerender();
+    if (isLifecycleActive(ctx, generation))
+        ctx.rerender();
 }
 async function openArchivedFiles(ctx, groupKey, groupFiles) {
+    const generation = lifecycleGeneration;
+    if (!isLifecycleActive(ctx, generation))
+        return;
     const requestId = ++metadataRequestId;
     currentArchivedGroupKey = groupKey;
     state = {
@@ -222,8 +257,9 @@ async function openArchivedFiles(ctx, groupKey, groupFiles) {
     };
     ctx.rerender();
     try {
-        const hydrated = await fetchDocMetadata(groupFiles);
-        if (requestId !== metadataRequestId ||
+        const hydrated = await fetchDocMetadata(groupFiles, ctx.signal);
+        if (!isLifecycleActive(ctx, generation) ||
+            requestId !== metadataRequestId ||
             state.mode !== 'archivedFiles' ||
             currentArchivedGroupKey !== groupKey)
             return;
@@ -234,7 +270,8 @@ async function openArchivedFiles(ctx, groupKey, groupFiles) {
         };
     }
     catch {
-        if (requestId !== metadataRequestId ||
+        if (!isLifecycleActive(ctx, generation) ||
+            requestId !== metadataRequestId ||
             state.mode !== 'archivedFiles' ||
             currentArchivedGroupKey !== groupKey)
             return;
@@ -243,15 +280,19 @@ async function openArchivedFiles(ctx, groupKey, groupFiles) {
             errorMessage: t().docs.loadError,
         };
     }
-    ctx.rerender();
+    if (isLifecycleActive(ctx, generation))
+        ctx.rerender();
 }
 async function runSearch(ctx, query) {
+    const generation = lifecycleGeneration;
+    if (!isLifecycleActive(ctx, generation))
+        return;
     const requestId = ++searchRequestId;
     state = { mode: 'searchLoading' };
     ctx.rerender();
     try {
-        const matches = await searchDocuments(query);
-        if (requestId !== searchRequestId)
+        const matches = await searchDocuments(query, ctx.signal);
+        if (!isLifecycleActive(ctx, generation) || requestId !== searchRequestId)
             return;
         currentSearchResults = matches;
         state = {
@@ -261,15 +302,19 @@ async function runSearch(ctx, query) {
         };
     }
     catch {
-        if (requestId !== searchRequestId)
+        if (!isLifecycleActive(ctx, generation) || requestId !== searchRequestId)
             return;
         currentSearchResults = [];
         goToSections();
         state = { ...state, errorMessage: t().docs.loadError };
     }
-    ctx.rerender();
+    if (isLifecycleActive(ctx, generation))
+        ctx.rerender();
 }
 async function openInReader(ctx, path, pushCurrent) {
+    const generation = lifecycleGeneration;
+    if (!isLifecycleActive(ctx, generation))
+        return;
     const requestId = ++readerRequestId;
     const previousState = state;
     const previousPath = readerCurrentPath;
@@ -277,8 +322,8 @@ async function openInReader(ctx, path, pushCurrent) {
     state = { mode: 'readerLoading' };
     ctx.rerender();
     try {
-        const doc = await loadDocForReader(path);
-        if (requestId !== readerRequestId)
+        const doc = await loadDocForReader(path, ctx.signal);
+        if (!isLifecycleActive(ctx, generation) || requestId !== readerRequestId)
             return;
         if (pushCurrent && previousPath)
             readerNavStack.push(previousPath);
@@ -293,7 +338,7 @@ async function openInReader(ctx, path, pushCurrent) {
         ctx.resetScroll();
     }
     catch {
-        if (requestId !== readerRequestId)
+        if (!isLifecycleActive(ctx, generation) || requestId !== readerRequestId)
             return;
         readerLoadingPrevState = null;
         const fallbackState = pushCurrent && previousState.mode === 'reader'
@@ -301,7 +346,8 @@ async function openInReader(ctx, path, pushCurrent) {
             : previousState;
         state = { ...fallbackState, errorMessage: t().docs.loadError };
     }
-    ctx.rerender();
+    if (isLifecycleActive(ctx, generation))
+        ctx.rerender();
 }
 function enterReaderFrom(ctx, path) {
     readerPrevState = state;
@@ -313,6 +359,9 @@ export const docsView = {
     id: 'docs',
     title: t().menu.docs,
     async load(ctx) {
+        const generation = loaded ? lifecycleGeneration : ++lifecycleGeneration;
+        if (!isLifecycleActive(ctx, generation))
+            return;
         if (loaded) {
             const language = getCurrentLanguage();
             if (loadedLanguage !== language) {
@@ -330,8 +379,8 @@ export const docsView = {
         state = { mode: 'loading' };
         ctx.rerender();
         try {
-            const nextSections = await fetchSections();
-            if (requestId !== sectionsRequestId)
+            const nextSections = await fetchSections(ctx.signal);
+            if (!isLifecycleActive(ctx, generation) || requestId !== sectionsRequestId)
                 return;
             sections = nextSections;
             loaded = true;
@@ -339,11 +388,21 @@ export const docsView = {
             goToSections();
         }
         catch {
-            if (requestId !== sectionsRequestId)
+            if (!isLifecycleActive(ctx, generation) || requestId !== sectionsRequestId)
                 return;
             state = { mode: 'error', errorMessage: t().docs.loadError };
         }
-        ctx.rerender();
+        if (isLifecycleActive(ctx, generation))
+            ctx.rerender();
+    },
+    dispose() {
+        lifecycleGeneration += 1;
+        sectionsRequestId += 1;
+        metadataRequestId += 1;
+        searchRequestId += 1;
+        readerRequestId += 1;
+        clearDocsCache();
+        setVimKeysActive(true);
     },
     render(ctx) {
         const maxVisible = computeMaxVisible(ctx.bodyRows);
@@ -354,9 +413,15 @@ export const docsView = {
         state.readerLinksField?.setMaxVisible(maxVisible);
         return renderDocs(state, ctx.size.cols, ctx.bodyRows);
     },
+    isBusy() {
+        return (state.mode === 'loading' || state.mode === 'searchLoading' || state.mode === 'readerLoading');
+    },
     capturesInput() {
         return state.mode === 'search';
     },
+    scrollsBody() {
+        return state.mode === 'reader' && state.readerLinksField === undefined;
+    },
     capturesPageKeys() {
         return (state.mode === 'sections' ||
             state.mode === 'files' ||
@@ -378,7 +443,7 @@ export const docsView = {
             const dot = pickIcon('·', '-');
             const hasLinks = (state.readerLinks?.length ?? 0) > 0;
             const linkHint = hasLinks ? `f ${trans.docs.readerLinksHint} ${dot} ` : '';
-            const pageHint = `PgUp/PgDn ${dot} `;
+            const pageHint = `${glyph.updown()} PgUp/PgDn ${dot} `;
             const localFull = `${pageHint}${linkHint}b ${trans.docs.openBrowser} ${dot} Esc ${dot} q ${trans.menu.hintQuit}`;
             const localCompact = `${pageHint}${hasLinks ? `f ${dot} ` : ''}b ${dot} Esc ${dot} q`;
             return fitFooterHint(cols, `${digitTabHint(tabCount)}${localFull}`, localFull, localCompact, `${hasLinks ? 'f ' : ''}b Esc q`, 'Esc q', 'q');
@@ -479,7 +544,7 @@ export const docsView = {
                     return;
                 }
                 if (result.selected === '__browser__') {
-                    void ctx.runClassic(() => openDocsInBrowser());
+                    void openBrowserFromView(ctx);
                     return;
                 }
                 const section = sections.find((s) => s.key === result.selected);
@@ -586,7 +651,7 @@ export const docsView = {
                     return;
                 }
                 if (key === 'b') {
-                    void ctx.runClassic(() => openDocsInBrowser(readerCurrentPath ?? undefined));
+                    void openBrowserFromView(ctx, readerCurrentPath ?? undefined);
                     return;
                 }
                 return;

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

@@ -4,6 +4,7 @@ import { renderListFieldWithContext } from '../fields/list-field.js';
 import { renderCountdownBanner, renderEventBrief } from '../../features/calendar.js';
 import { renderHeatmap } from '../../features/calendar-heatmap.js';
 import { wrapAnsiWithIndent } from '../../core/text.js';
+import { loadingLines } from '../../core/components/spinner.js';
 function wrappedIndentedLines(label, cols, style) {
     return wrapAnsiWithIndent(style(label), cols ?? Number.POSITIVE_INFINITY, space.indent);
 }
@@ -61,7 +62,7 @@ export function renderEvents(state, now, bodyRows = 100, cols) {
     const trans = t();
     switch (state.mode) {
         case 'loading':
-            return wrappedIndentedLines(trans.calendar.loading, cols, type.hint);
+            return loadingLines(trans.calendar.loading, cols);
         case 'hub':
             return renderHubBody(state, now, bodyRows, cols);
         case 'heatmap':

package/dist/app/views/events.js

@@ -93,21 +93,32 @@ export const eventsView = {
     id: 'events',
     title: t().menu.events,
     async load(ctx) {
+        if (ctx.signal?.aborted)
+            return;
         state = { mode: 'loading' };
         ctx.rerender();
         try {
-            calendar = await loadCalendarOrThrow();
+            const loadedCalendar = await loadCalendarOrThrow(ctx.signal);
+            if (ctx.signal?.aborted)
+                return;
+            calendar = loadedCalendar;
             goToHub();
         }
         catch {
+            if (ctx.signal?.aborted)
+                return;
             state = { mode: 'error', errorMessage: t().calendar.error };
         }
-        ctx.rerender();
+        if (!ctx.signal?.aborted)
+            ctx.rerender();
     },
     render(ctx) {
         state.listField?.setMaxVisible(computeMaxVisible(ctx.bodyRows));
         return renderEvents(state, new Date(), ctx.bodyRows, ctx.size.cols);
     },
+    isBusy() {
+        return state.mode === 'loading';
+    },
     capturesInput() {
         return state.mode === 'search';
     },

package/dist/app/views/home.js

@@ -3,11 +3,12 @@ import { t } from '../../i18n/index.js';
 import { pickIcon } from '../../core/icons.js';
 import { padEndV, visualWidth, wrapAnsiWithIndent } from '../../core/text.js';
 import { peekNextClassLine, peekTodayLines, peekWeekAheadInfo, peekUnresolvedCount, } from '../../features/schedule-view.js';
-import { loadCalendarOrThrow, toDisplayEvent, renderEventBrief } from '../../features/calendar.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 { loadingLines } from '../../core/components/spinner.js';
 const WEEKDAYS = [1, 2, 3, 4, 5, 6, 7];
 function wrappedIndentedLines(label, cols, style) {
     return wrapAnsiWithIndent(style(label), cols, space.indent);
@@ -15,9 +16,6 @@ function wrappedIndentedLines(label, cols, style) {
 function panelHeading(label, cols) {
     return wrappedIndentedLines(label, cols, type.heading);
 }
-function loadingLines(cols) {
-    return wrappedIndentedLines(t().common.loading, cols, type.hint);
-}
 function wrappedRenderedLines(line, cols) {
     const content = line.startsWith(space.indent) ? line.slice(space.indent.length) : line;
     return wrappedIndentedLines(content, cols, (value) => value);
@@ -111,7 +109,10 @@ export function renderHome(data, now, bodyRows = 100, cols = 80) {
         lines.push(...wrappedIndentedLines(`${pickIcon('⚠', '!')} ${trans.timetable.hubUnresolved} · ${data.unresolvedCount}`, cols, c.warn));
         lines.push('');
     }
-    lines.push(...panelHeading(trans.menu.events, cols));
+    const eventsStale = data.eventsLoadFailed === true && (data.eventLines?.length ?? 0) > 0;
+    lines.push(...(eventsStale
+        ? wrappedIndentedLines(`${type.heading(trans.menu.events)}  ${type.hint(`${pickIcon('·', '-')} ${trans.calendar.stale}`)}`, cols, (value) => value)
+        : panelHeading(trans.menu.events, cols)));
     if (data.eventLines && data.eventLines.length > 0) {
         const remaining = Number.isFinite(bodyRows)
             ? Math.max(0, Math.floor(bodyRows) - lines.length)
@@ -129,7 +130,7 @@ export function renderHome(data, now, bodyRows = 100, cols = 80) {
         }
     }
     else if (data.loading) {
-        lines.push(...loadingLines(cols));
+        lines.push(...loadingLines(trans.common.loading, cols));
     }
     else if (data.eventsLoadFailed) {
         lines.push(...wrappedIndentedLines(trans.calendar.error, cols, type.hint));
@@ -139,6 +140,25 @@ export function renderHome(data, now, bodyRows = 100, cols = 80) {
     }
     return lines;
 }
+const HOME_EVENT_FETCH_CAP = 15;
+function calendarSnapshot(cal, weekAheadInfo) {
+    const now = new Date();
+    const eventLines = cal
+        .upcoming({ days: 30 })
+        .slice(0, HOME_EVENT_FETCH_CAP)
+        .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)));
+    return {
+        eventLines,
+        weekAhead: {
+            classDays: weekAheadInfo.classDays,
+            eventDays: WEEKDAYS.map((weekday) => daySet.has(weekday)),
+        },
+    };
+}
 let data = { loading: true };
 export const homeView = {
     id: 'home',
@@ -147,6 +167,8 @@ export const homeView = {
         return passiveFooterHint(tabCount, cols);
     },
     async load(ctx) {
+        if (ctx.signal?.aborted)
+            return;
         const weekAheadInfo = peekWeekAheadInfo();
         try {
             data = {
@@ -160,33 +182,33 @@ export const homeView = {
         catch {
             data = { loading: true };
         }
+        const cached = peekCalendar();
+        if (cached)
+            data = { ...data, ...calendarSnapshot(cached, weekAheadInfo) };
+        if (ctx.signal?.aborted)
+            return;
         ctx.rerender();
-        const HOME_EVENT_FETCH_CAP = 15;
         try {
-            const cal = await loadCalendarOrThrow();
-            const now = new Date();
-            const items = cal.upcoming({ days: 30 }).slice(0, HOME_EVENT_FETCH_CAP).map(toDisplayEvent);
-            const eventLines = items.map((e) => renderEventBrief(e, now));
-            let weekAhead = data.weekAhead;
-            if (weekAheadInfo) {
-                const weekEnd = addLocalDays(weekAheadInfo.weekStartDate, 7);
-                const weekEvents = cal.inRange(weekAheadInfo.weekStartDate, weekEnd);
-                const daySet = new Set(weekEvents.map((event) => campusWeekday(event.start)));
-                weekAhead = {
-                    classDays: weekAheadInfo.classDays,
-                    eventDays: WEEKDAYS.map((weekday) => daySet.has(weekday)),
-                };
-            }
-            data = weekAhead ? { ...data, eventLines, weekAhead } : { ...data, eventLines };
+            const cal = await loadCalendarOrThrow(ctx.signal);
+            if (ctx.signal?.aborted)
+                return;
+            data = { ...data, ...calendarSnapshot(cal, weekAheadInfo) };
         }
         catch {
+            if (ctx.signal?.aborted)
+                return;
             data = { ...data, eventsLoadFailed: true };
         }
         finally {
-            data = { ...data, loading: false };
-            ctx.rerender();
+            if (!ctx.signal?.aborted) {
+                data = { ...data, loading: false };
+                ctx.rerender();
+            }
         }
     },
+    isBusy() {
+        return data.loading === true;
+    },
     render(ctx) {
         return renderHome(data, new Date(), ctx.bodyRows, ctx.size.cols);
     },

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

@@ -7,6 +7,7 @@ import { renderNextClassBanner, renderWeekGrid, renderUnresolvedItems, renderTod
 import { renderEventBrief } from '../../features/calendar.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)}`;
 }
@@ -189,7 +190,7 @@ function renderPublicBody(state, now, bodyRows, cols) {
     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));
@@ -240,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':
@@ -251,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), ''] : []),