@nbtca/prompt 1.5.1 → 1.5.3

package/dist/app/app.js

@@ -23,6 +23,7 @@ export async function runApp() {
     let clockTimer;
     let busyTimer;
     let painted;
+    let lastBody = { length: 0, height: 0 };
     const viewIds = getAppTabs().map((tab) => tab.id);
     const nativeViews = {
         home: homeView,
@@ -76,9 +77,11 @@ export async function runApp() {
         const tabs = getAppTabs();
         const chrome = resolveChromeLayout(rows);
         const header = renderHeader(tabs, view, cols, chrome.headerLines);
-        const footer = renderFooter(view, cols, tabs.length, active?.footerHint?.(tabs.length, cols), chrome.footerLines);
         const body = active?.render(ctx) ?? [];
         const bodyScroll = active?.capturesInput?.() ? Number.MAX_SAFE_INTEGER : scroll;
+        const height = computeBodyRows(rows, chrome.headerLines, chrome.footerLines);
+        lastBody = { length: body.length, height };
+        const footer = renderFooter(view, cols, tabs.length, active?.footerHint?.(tabs.length, cols), chrome.footerLines, active?.scrollsBody?.() === true ? scrollPercent() : undefined);
         const lines = composeFrameLines(header, body, footer, rows, cols, bodyScroll);
         const patch = diffFrame(painted?.cols === cols ? painted.lines : undefined, lines);
         painted = { cols, lines };
@@ -86,6 +89,19 @@ export async function runApp() {
             process.stdout.write(patch);
         scheduleBusyTick(active?.isBusy?.() === true);
     }
+    function maxScroll() {
+        return Math.max(0, lastBody.length - lastBody.height);
+    }
+    function scrollPercent() {
+        const max = maxScroll();
+        if (max === 0)
+            return undefined;
+        return `${Math.round((Math.min(scroll, max) / max) * 100)}%`;
+    }
+    function scrollTo(next) {
+        scroll = Math.min(Math.max(0, next), maxScroll());
+        render();
+    }
     function scheduleBusyTick(busy) {
         if (busy && running && busyTimer === undefined) {
             busyTimer = setTimeout(() => {
@@ -139,8 +155,16 @@ export async function runApp() {
                 return;
             }
             const page = Math.max(1, ctx.bodyRows - 2);
-            scroll = Math.max(0, scroll + g.scrollBy * page);
-            render();
+            scrollTo(scroll + g.scrollBy * page);
+            return;
+        }
+        if ((g.scrollLines !== undefined || g.scrollTo !== undefined) && active?.scrollsBody?.()) {
+            if (g.scrollTo === 'top')
+                scrollTo(0);
+            else if (g.scrollTo === 'end')
+                scrollTo(maxScroll());
+            else
+                scrollTo(scroll + (g.scrollLines ?? 0));
             return;
         }
         active?.handleKey?.(key, ctx);

package/dist/app/chrome.js

@@ -110,12 +110,23 @@ function interactiveFooterHint(tabCount, cols) {
     ];
     return fitFooterHint(cols, ...candidates);
 }
-export function renderFooter(_active, cols, tabCount, overrideHint, lineCount = FOOTER_LINES) {
+export function renderFooter(_active, cols, tabCount, overrideHint, lineCount = FOOTER_LINES, position) {
     if (lineCount === 0)
         return [];
     const rule = renderRule(cols);
     const hintText = overrideHint ?? interactiveFooterHint(tabCount, cols);
     const indent = visualWidth(space.indent + hintText) <= cols ? space.indent : '';
     const hint = indent + type.hint(hintText);
-    return lineCount === 1 ? [hint] : [rule, hint];
+    return lineCount === 1
+        ? [withPosition(hint, hintText, indent, position, cols)]
+        : [rule, withPosition(hint, hintText, indent, position, cols)];
+}
+function withPosition(hint, hintText, indent, position, cols) {
+    if (position === undefined)
+        return hint;
+    const margin = visualWidth(space.indent) < cols ? space.indent : '';
+    const gap = cols - visualWidth(indent + hintText) - visualWidth(position) - visualWidth(margin);
+    if (gap < 2)
+        return hint;
+    return hint + ' '.repeat(gap) + type.hint(position) + margin;
 }

package/dist/app/keys.js

@@ -117,8 +117,16 @@ export function routeGlobalKey(key, viewIds, current) {
     }
     if (key === '\x1b[5~')
         return { scrollBy: -1, handled: true };
-    if (key === '\x1b[6~')
+    if (key === '\x1b[6~' || key === ' ')
         return { scrollBy: 1, handled: true };
+    if (key === '\x1b[A')
+        return { scrollLines: -1, handled: true };
+    if (key === '\x1b[B')
+        return { scrollLines: 1, handled: true };
+    if (key === '\x1b[H')
+        return { scrollTo: 'top', handled: true };
+    if (key === '\x1b[F')
+        return { scrollTo: 'end', handled: true };
     if (/^[1-9]$/.test(key)) {
         const idx = Number(key) - 1;
         if (idx < viewIds.length)

package/dist/app/views/docs.js

@@ -4,6 +4,7 @@ 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 { 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, docsUrlFromPath, clearDocsCache, } from '../../features/docs.js';
@@ -418,6 +419,9 @@ export const docsView = {
     capturesInput() {
         return state.mode === 'search';
     },
+    scrollsBody() {
+        return state.mode === 'reader' && state.readerLinksField === undefined;
+    },
     capturesPageKeys() {
         return (state.mode === 'sections' ||
             state.mode === 'files' ||
@@ -439,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');

package/dist/features/calendar.js

@@ -4,7 +4,7 @@ import { c, type, space, glyph } from '../core/theme.js';
 import { pickIcon } from '../core/icons.js';
 import { padEndV, sanitizeTerminalLine, sanitizeTerminalText, truncate, visualWidth, wrapAnsiWithIndent, wrapAnsiToVisualWidth, } from '../core/text.js';
 import { t } from '../i18n/index.js';
-import { addLocalDays } from '../core/calendar-day.js';
+import { addLocalDays, localDayDifference } from '../core/calendar-day.js';
 import { countdownParts, isCountdownUrgent, buildExportFilename } from './calendar-query.js';
 import { loadFeedCache, saveFeedCache } from './calendar-store.js';
 import { writeFileSync, existsSync } from 'fs';
@@ -146,17 +146,38 @@ export function renderEventsTable(events, options) {
     }
     return lines.join('\n');
 }
+export function eventProximity(startDate, now) {
+    const days = localDayDifference(now, startDate);
+    if (days <= 0)
+        return 'today';
+    if (days === 1)
+        return 'tomorrow';
+    if (days <= 7)
+        return 'week';
+    return 'later';
+}
+const SOURCE_TAG = /^(\[[^\]]{1,16}\])(\s+)(?=\S)/;
+function styleTitle(title, style) {
+    const match = SOURCE_TAG.exec(title);
+    if (!match?.[1] || !match[2])
+        return style(title);
+    return `${type.hint(match[1])}${match[2]}${style(title.slice(match[0].length))}`;
+}
 export function renderEventBrief(e, now) {
     const dot = pickIcon('·', '-');
-    const isToday = e.startDate.getFullYear() === now.getFullYear() &&
-        e.startDate.getMonth() === now.getMonth() &&
-        e.startDate.getDate() === now.getDate();
+    const proximity = eventProximity(e.startDate, now);
+    const dateStyle = proximity === 'today'
+        ? type.active
+        : proximity === 'tomorrow'
+            ? c.brand
+            : proximity === 'week'
+                ? type.body
+                : type.hint;
     const dateTime = `${e.date}${e.time ? ' ' + e.time : ''}`;
-    const marker = isToday ? type.active(pickIcon('●', '*')) : type.hint(pickIcon('·', '-'));
-    const dateStyled = isToday ? type.active(dateTime) : type.hint(dateTime);
-    const titleStyled = isToday ? type.active(e.title) : type.body(e.title);
-    const recurringMark = e.recurring ? ` ${pickIcon('↻', '~')}` : '';
-    return `${space.indent}${marker} ${dateStyled}  ${dot}  ${titleStyled}${recurringMark}`;
+    const marker = proximity === 'today' ? type.active(pickIcon('●', '*')) : dateStyle(pickIcon('·', '-'));
+    const titleStyled = styleTitle(e.title, proximity === 'today' ? type.active : type.body);
+    const recurringMark = e.recurring ? ` ${type.hint(pickIcon('↻', '~'))}` : '';
+    return `${space.indent}${marker} ${dateStyle(dateTime)}  ${type.hint(dot)}  ${titleStyled}${recurringMark}`;
 }
 export function renderCountdownBanner(event, now, cols = Number.POSITIVE_INFINITY) {
     if (!event)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nbtca/prompt",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "type": "module",
   "main": "dist/index.js",
   "exports": {