@nbtca/prompt 1.5.5 → 1.5.6

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

@@ -1,14 +1,14 @@
 import { type, space } from '../../core/theme.js';
 import { t } from '../../i18n/index.js';
 import { renderListFieldWithContext } from '../fields/list-field.js';
-import { visualWidth, wrapAnsiToVisualWidth, wrapAnsiWithIndent } from '../../core/text.js';
+import { visualWidth, wrapAnsiHanging, wrapAnsiWithIndent } from '../../core/text.js';
 import { loadingLines } from '../../core/components/spinner.js';
 function hintLines(label, cols) {
     return wrapAnsiWithIndent(type.hint(label), cols, space.indent);
 }
 function renderReader(lines, cols) {
     const contentWidth = Math.max(1, Math.min(80, cols - visualWidth(space.indent)));
-    return lines.flatMap((line) => wrapAnsiToVisualWidth(line, contentWidth).map((part) => `${space.indent}${part}`));
+    return lines.flatMap((line) => wrapAnsiHanging(line, contentWidth).map((part) => `${space.indent}${part}`));
 }
 function listFieldForState(state) {
     switch (state.mode) {

package/dist/core/text.js

@@ -212,8 +212,37 @@ function renderWrappedSegment(tokens, start, end, activeSgr, activeOsc8) {
     const osc8AtEnd = advanceOsc8(activeOsc8, tokens, start, end);
     return osc8AtEnd ? `${withReset}${OSC8_CLOSE}` : withReset;
 }
-export function wrapAnsiToVisualWidth(str, maxWidth) {
+const NO_LINE_START = /^[。．、，；：？！）］｝〉》」』】〕・ー～…‥%‰°℃,.;:?!)\]}>]$/u;
+const NO_LINE_END = /^[（［｛〈《「『【〔([{<]$/u;
+function visibleAt(tokens, index) {
+    const token = tokens[index];
+    return token && !token.sgr && token.width > 0 ? token : undefined;
+}
+/**
+ * Pulls a break earlier so a line never begins with closing punctuation or ends
+ * with an opening bracket. Moving the break back keeps every line inside the
+ * width, which letting the character hang past the edge would not.
+ */
+function applyKinsoku(tokens, start, end) {
+    let candidate = end;
+    while (candidate > start + 1) {
+        const opensNext = visibleAt(tokens, candidate);
+        const closesLine = visibleAt(tokens, candidate - 1);
+        if (opensNext && NO_LINE_START.test(opensNext.raw)) {
+            candidate -= 1;
+            continue;
+        }
+        if (closesLine && NO_LINE_END.test(closesLine.raw)) {
+            candidate -= 1;
+            continue;
+        }
+        return candidate;
+    }
+    return end;
+}
+export function wrapAnsiToVisualWidth(str, maxWidth, continuationWidth = maxWidth) {
     const widthLimit = Math.max(1, Math.floor(maxWidth));
+    const nextLimit = Math.max(1, Math.floor(continuationWidth));
     if (!Number.isFinite(maxWidth) || visualWidth(str) <= widthLimit)
         return [str];
     const tokens = tokenizeForWrapping(str);
@@ -234,7 +263,8 @@ export function wrapAnsiToVisualWidth(str, maxWidth) {
                 index += 1;
                 continue;
             }
-            if (width + token.width > widthLimit && hasVisible)
+            const limit = lines.length === 0 ? widthLimit : nextLimit;
+            if (width + token.width > limit && hasVisible)
                 break;
             width += token.width;
             hasVisible = true;
@@ -260,6 +290,11 @@ export function wrapAnsiToVisualWidth(str, maxWidth) {
             end = Math.max(index, start + 1);
             next = end;
         }
+        if (end === next) {
+            const adjusted = applyKinsoku(tokens, start, end);
+            end = adjusted;
+            next = adjusted;
+        }
         lines.push(renderWrappedSegment(tokens, start, end, activeSgr, activeOsc8));
         activeSgr = advanceSgr(activeSgr, tokens, start, next);
         activeOsc8 = advanceOsc8(activeOsc8, tokens, start, next);
@@ -267,6 +302,18 @@ export function wrapAnsiToVisualWidth(str, maxWidth) {
     }
     return lines.length > 0 ? lines : [''];
 }
+const LEADING_MARKER = /^(\s*)((?:[-*+•]|\d{1,3}[.)])\s+)?/u;
+export function wrapAnsiHanging(str, maxWidth) {
+    const width = Number.isFinite(maxWidth)
+        ? Math.max(1, Math.floor(maxWidth))
+        : Number.POSITIVE_INFINITY;
+    const match = LEADING_MARKER.exec(stripAnsi(str));
+    const hang = visualWidth((match?.[1] ?? '') + (match?.[2] ?? ''));
+    if (hang === 0 || hang >= width)
+        return wrapAnsiToVisualWidth(str, width);
+    const continuation = ' '.repeat(hang);
+    return wrapAnsiToVisualWidth(str, width, width - hang).map((line, index) => index === 0 ? line : continuation + line);
+}
 export function wrapAnsiWithIndent(str, maxWidth, preferredIndent = '') {
     const width = Number.isFinite(maxWidth)
         ? Math.max(1, Math.floor(maxWidth))

package/package.json

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