@dungle-scrubs/tallow 0.9.4 → 0.9.6

package/node_modules/@mariozechner/pi-tui/src/components/select-list.ts

@@ -1,8 +1,14 @@
-import { getEditorKeybindings } from "../keybindings.js";
+import { getKeybindings } from "../keybindings.js";
 import type { Component } from "../tui.js";
-import { truncateToWidth } from "../utils.js";
+import { truncateToWidth, visibleWidth } from "../utils.js";
+
+const DEFAULT_PRIMARY_COLUMN_WIDTH = 32;
+const PRIMARY_COLUMN_GAP = 2;
+const MIN_DESCRIPTION_WIDTH = 10;
 
 const normalizeToSingleLine = (text: string): string => text.replace(/[\r\n]+/g, " ").trim();
+const clamp = (value: number, min: number, max: number): number =>
+	Math.max(min, Math.min(value, max));
 
 export interface SelectItem {
 	value: string;
@@ -18,22 +24,43 @@ export interface SelectListTheme {
 	noMatch: (text: string) => string;
 }
 
+export interface SelectListTruncatePrimaryContext {
+	text: string;
+	maxWidth: number;
+	columnWidth: number;
+	item: SelectItem;
+	isSelected: boolean;
+}
+
+export interface SelectListLayoutOptions {
+	minPrimaryColumnWidth?: number;
+	maxPrimaryColumnWidth?: number;
+	truncatePrimary?: (context: SelectListTruncatePrimaryContext) => string;
+}
+
 export class SelectList implements Component {
 	private items: SelectItem[] = [];
 	private filteredItems: SelectItem[] = [];
 	private selectedIndex: number = 0;
 	private maxVisible: number = 5;
 	private theme: SelectListTheme;
+	private layout: SelectListLayoutOptions;
 
 	public onSelect?: (item: SelectItem) => void;
 	public onCancel?: () => void;
 	public onSelectionChange?: (item: SelectItem) => void;
 
-	constructor(items: SelectItem[], maxVisible: number, theme: SelectListTheme) {
+	constructor(
+		items: SelectItem[],
+		maxVisible: number,
+		theme: SelectListTheme,
+		layout: SelectListLayoutOptions = {}
+	) {
 		this.items = items;
 		this.filteredItems = items;
 		this.maxVisible = maxVisible;
 		this.theme = theme;
+		this.layout = layout;
 	}
 
 	setFilter(filter: string): void {
@@ -61,6 +88,8 @@ export class SelectList implements Component {
 			return lines;
 		}
 
+		const primaryColumnWidth = this.getPrimaryColumnWidth();
+
 		// Calculate visible range with scrolling
 		const startIndex = Math.max(
 			0,
@@ -80,68 +109,9 @@ export class SelectList implements Component {
 			const descriptionSingleLine = item.description
 				? normalizeToSingleLine(item.description)
 				: undefined;
-
-			let line = "";
-			if (isSelected) {
-				// Use arrow indicator for selection - entire line uses selectedText color
-				const prefixWidth = 2; // "↗ " is 2 characters visually
-				const displayValue = item.label || item.value;
-
-				if (descriptionSingleLine && width > 40) {
-					// Calculate how much space we have for value + description
-					const maxValueWidth = Math.min(30, width - prefixWidth - 4);
-					const truncatedValue = truncateToWidth(displayValue, maxValueWidth, "");
-					const spacing = " ".repeat(Math.max(1, 32 - truncatedValue.length));
-
-					// Calculate remaining space for description using visible widths
-					const descriptionStart = prefixWidth + truncatedValue.length + spacing.length;
-					const remainingWidth = width - descriptionStart - 2; // -2 for safety
-
-					if (remainingWidth > 10) {
-						const truncatedDesc = truncateToWidth(descriptionSingleLine, remainingWidth, "");
-						// Apply selectedText to entire line content
-						line = this.theme.selectedText(`↗ ${truncatedValue}${spacing}${truncatedDesc}`);
-					} else {
-						// Not enough space for description
-						const maxWidth = width - prefixWidth - 2;
-						line = this.theme.selectedText(`↗ ${truncateToWidth(displayValue, maxWidth, "")}`);
-					}
-				} else {
-					// No description or not enough width
-					const maxWidth = width - prefixWidth - 2;
-					line = this.theme.selectedText(`↗ ${truncateToWidth(displayValue, maxWidth, "")}`);
-				}
-			} else {
-				const displayValue = item.label || item.value;
-				const prefix = "  ";
-
-				if (descriptionSingleLine && width > 40) {
-					// Calculate how much space we have for value + description
-					const maxValueWidth = Math.min(30, width - prefix.length - 4);
-					const truncatedValue = truncateToWidth(displayValue, maxValueWidth, "");
-					const spacing = " ".repeat(Math.max(1, 32 - truncatedValue.length));
-
-					// Calculate remaining space for description
-					const descriptionStart = prefix.length + truncatedValue.length + spacing.length;
-					const remainingWidth = width - descriptionStart - 2; // -2 for safety
-
-					if (remainingWidth > 10) {
-						const truncatedDesc = truncateToWidth(descriptionSingleLine, remainingWidth, "");
-						const descText = this.theme.description(spacing + truncatedDesc);
-						line = prefix + truncatedValue + descText;
-					} else {
-						// Not enough space for description
-						const maxWidth = width - prefix.length - 2;
-						line = prefix + truncateToWidth(displayValue, maxWidth, "");
-					}
-				} else {
-					// No description or not enough width
-					const maxWidth = width - prefix.length - 2;
-					line = prefix + truncateToWidth(displayValue, maxWidth, "");
-				}
-			}
-
-			lines.push(line);
+			lines.push(
+				this.renderItem(item, isSelected, width, descriptionSingleLine, primaryColumnWidth)
+			);
 		}
 
 		// Add scroll indicators if needed
@@ -155,34 +125,130 @@ export class SelectList implements Component {
 	}
 
 	handleInput(keyData: string): void {
-		const kb = getEditorKeybindings();
+		const kb = getKeybindings();
 		// Up arrow - wrap to bottom when at top
-		if (kb.matches(keyData, "selectUp")) {
+		if (kb.matches(keyData, "tui.select.up")) {
 			this.selectedIndex =
 				this.selectedIndex === 0 ? this.filteredItems.length - 1 : this.selectedIndex - 1;
 			this.notifySelectionChange();
 		}
 		// Down arrow - wrap to top when at bottom
-		else if (kb.matches(keyData, "selectDown")) {
+		else if (kb.matches(keyData, "tui.select.down")) {
 			this.selectedIndex =
 				this.selectedIndex === this.filteredItems.length - 1 ? 0 : this.selectedIndex + 1;
 			this.notifySelectionChange();
 		}
 		// Enter
-		else if (kb.matches(keyData, "selectConfirm")) {
+		else if (kb.matches(keyData, "tui.select.confirm")) {
 			const selectedItem = this.filteredItems[this.selectedIndex];
 			if (selectedItem && this.onSelect) {
 				this.onSelect(selectedItem);
 			}
 		}
 		// Escape or Ctrl+C
-		else if (kb.matches(keyData, "selectCancel")) {
+		else if (kb.matches(keyData, "tui.select.cancel")) {
 			if (this.onCancel) {
 				this.onCancel();
 			}
 		}
 	}
 
+	private renderItem(
+		item: SelectItem,
+		isSelected: boolean,
+		width: number,
+		descriptionSingleLine: string | undefined,
+		primaryColumnWidth: number
+	): string {
+		const prefix = isSelected ? "→ " : "  ";
+		const prefixWidth = visibleWidth(prefix);
+
+		if (descriptionSingleLine && width > 40) {
+			const effectivePrimaryColumnWidth = Math.max(
+				1,
+				Math.min(primaryColumnWidth, width - prefixWidth - 4)
+			);
+			const maxPrimaryWidth = Math.max(1, effectivePrimaryColumnWidth - PRIMARY_COLUMN_GAP);
+			const truncatedValue = this.truncatePrimary(
+				item,
+				isSelected,
+				maxPrimaryWidth,
+				effectivePrimaryColumnWidth
+			);
+			const truncatedValueWidth = visibleWidth(truncatedValue);
+			const spacing = " ".repeat(Math.max(1, effectivePrimaryColumnWidth - truncatedValueWidth));
+			const descriptionStart = prefixWidth + truncatedValueWidth + spacing.length;
+			const remainingWidth = width - descriptionStart - 2; // -2 for safety
+
+			if (remainingWidth > MIN_DESCRIPTION_WIDTH) {
+				const truncatedDesc = truncateToWidth(descriptionSingleLine, remainingWidth, "");
+				if (isSelected) {
+					return this.theme.selectedText(`${prefix}${truncatedValue}${spacing}${truncatedDesc}`);
+				}
+
+				const descText = this.theme.description(spacing + truncatedDesc);
+				return prefix + truncatedValue + descText;
+			}
+		}
+
+		const maxWidth = width - prefixWidth - 2;
+		const truncatedValue = this.truncatePrimary(item, isSelected, maxWidth, maxWidth);
+		if (isSelected) {
+			return this.theme.selectedText(`${prefix}${truncatedValue}`);
+		}
+
+		return prefix + truncatedValue;
+	}
+
+	private getPrimaryColumnWidth(): number {
+		const { min, max } = this.getPrimaryColumnBounds();
+		const widestPrimary = this.filteredItems.reduce((widest, item) => {
+			return Math.max(widest, visibleWidth(this.getDisplayValue(item)) + PRIMARY_COLUMN_GAP);
+		}, 0);
+
+		return clamp(widestPrimary, min, max);
+	}
+
+	private getPrimaryColumnBounds(): { min: number; max: number } {
+		const rawMin =
+			this.layout.minPrimaryColumnWidth ??
+			this.layout.maxPrimaryColumnWidth ??
+			DEFAULT_PRIMARY_COLUMN_WIDTH;
+		const rawMax =
+			this.layout.maxPrimaryColumnWidth ??
+			this.layout.minPrimaryColumnWidth ??
+			DEFAULT_PRIMARY_COLUMN_WIDTH;
+
+		return {
+			min: Math.max(1, Math.min(rawMin, rawMax)),
+			max: Math.max(1, Math.max(rawMin, rawMax)),
+		};
+	}
+
+	private truncatePrimary(
+		item: SelectItem,
+		isSelected: boolean,
+		maxWidth: number,
+		columnWidth: number
+	): string {
+		const displayValue = this.getDisplayValue(item);
+		const truncatedValue = this.layout.truncatePrimary
+			? this.layout.truncatePrimary({
+					text: displayValue,
+					maxWidth,
+					columnWidth,
+					item,
+					isSelected,
+				})
+			: truncateToWidth(displayValue, maxWidth, "");
+
+		return truncateToWidth(truncatedValue, maxWidth, "");
+	}
+
+	private getDisplayValue(item: SelectItem): string {
+		return item.label || item.value;
+	}
+
 	private notifySelectionChange(): void {
 		const selectedItem = this.filteredItems[this.selectedIndex];
 		if (selectedItem && this.onSelectionChange) {

package/node_modules/@mariozechner/pi-tui/src/components/settings-list.ts

@@ -1,5 +1,5 @@
 import { fuzzyFilter } from "../fuzzy.js";
-import { getEditorKeybindings } from "../keybindings.js";
+import { getKeybindings } from "../keybindings.js";
 import type { Component } from "../tui.js";
 import { truncateToWidth, visibleWidth, wrapTextWithAnsi } from "../utils.js";
 import { Input } from "./input.js";
@@ -45,9 +45,6 @@ export class SettingsList implements Component {
 	// Submenu state
 	private submenuComponent: Component | null = null;
 	private submenuItemIndex: number | null = null;
-	private lastRenderLineCount = 0;
-	private nextMinLineCount = 0;
-	private layoutTransitionCallback?: () => void;
 
 	constructor(
 		items: SettingItem[],
@@ -69,13 +66,7 @@ export class SettingsList implements Component {
 		}
 	}
 
-	/**
-	 * Update an item's current value.
-	 *
-	 * @param id - Setting identifier
-	 * @param newValue - New value to display
-	 * @returns Nothing
-	 */
+	/** Update an item's currentValue */
 	updateValue(id: string, newValue: string): void {
 		const item = this.items.find((i) => i.id === id);
 		if (item) {
@@ -83,35 +74,17 @@ export class SettingsList implements Component {
 		}
 	}
 
-	/**
-	 * Set a callback fired before submenu-driven layout transitions.
-	 *
-	 * Callers can use this to reset TUI render-grace state before the settings
-	 * list expands into, or collapses out of, a submenu.
-	 *
-	 * @param callback - Transition callback, or undefined to clear it
-	 * @returns Nothing
-	 */
-	setLayoutTransitionCallback(callback?: () => void): void {
-		this.layoutTransitionCallback = callback;
-	}
-
 	invalidate(): void {
 		this.submenuComponent?.invalidate?.();
 	}
 
 	render(width: number): string[] {
-		const lines = this.submenuComponent
-			? this.submenuComponent.render(width)
-			: this.renderMainList(width);
-
-		if (this.nextMinLineCount > lines.length) {
-			lines.push(...Array.from({ length: this.nextMinLineCount - lines.length }, () => ""));
+		// If submenu is active, render it instead
+		if (this.submenuComponent) {
+			return this.submenuComponent.render(width);
 		}
 
-		this.nextMinLineCount = 0;
-		this.lastRenderLineCount = lines.length;
-		return lines;
+		return this.renderMainList(width);
 	}
 
 	private renderMainList(width: number): string[] {
@@ -211,19 +184,19 @@ export class SettingsList implements Component {
 		}
 
 		// Main list input handling
-		const kb = getEditorKeybindings();
+		const kb = getKeybindings();
 		const displayItems = this.searchEnabled ? this.filteredItems : this.items;
-		if (kb.matches(data, "selectUp")) {
+		if (kb.matches(data, "tui.select.up")) {
 			if (displayItems.length === 0) return;
 			this.selectedIndex =
 				this.selectedIndex === 0 ? displayItems.length - 1 : this.selectedIndex - 1;
-		} else if (kb.matches(data, "selectDown")) {
+		} else if (kb.matches(data, "tui.select.down")) {
 			if (displayItems.length === 0) return;
 			this.selectedIndex =
 				this.selectedIndex === displayItems.length - 1 ? 0 : this.selectedIndex + 1;
-		} else if (kb.matches(data, "selectConfirm") || data === " ") {
+		} else if (kb.matches(data, "tui.select.confirm") || data === " ") {
 			this.activateItem();
-		} else if (kb.matches(data, "selectCancel")) {
+		} else if (kb.matches(data, "tui.select.cancel")) {
 			this.onCancel();
 		} else if (this.searchEnabled && this.searchInput) {
 			const sanitized = data.replace(/ /g, "");
@@ -242,10 +215,7 @@ export class SettingsList implements Component {
 		if (!item) return;
 
 		if (item.submenu) {
-			// Preserve height for the first submenu frame so the TUI doesn't treat
-			// the editor→submenu swap as a destructive shrink/expand transition.
-			this.nextMinLineCount = this.lastRenderLineCount;
-			this.layoutTransitionCallback?.();
+			// Open submenu, passing current value so it can pre-select correctly
 			this.submenuItemIndex = this.selectedIndex;
 			this.submenuComponent = item.submenu(item.currentValue, (selectedValue?: string) => {
 				if (selectedValue !== undefined) {
@@ -264,16 +234,7 @@ export class SettingsList implements Component {
 		}
 	}
 
-	/**
-	 * Close the active submenu and restore the main settings list.
-	 *
-	 * @returns Nothing
-	 */
 	private closeSubmenu(): void {
-		// Preserve one frame of the submenu height so the transition back to the
-		// main settings list doesn't trigger a screen-clearing shrink redraw.
-		this.nextMinLineCount = this.lastRenderLineCount;
-		this.layoutTransitionCallback?.();
 		this.submenuComponent = null;
 		// Restore selection to the item that opened the submenu
 		if (this.submenuItemIndex !== null) {

package/node_modules/@mariozechner/pi-tui/src/index.ts

@@ -4,33 +4,25 @@
 export {
 	type AutocompleteItem,
 	type AutocompleteProvider,
+	type AutocompleteSuggestions,
 	CombinedAutocompleteProvider,
 	type SlashCommand,
 } from "./autocomplete.js";
-// Border styles
-export {
-	type BorderStyle,
-	defaultBorderStyle,
-	FLAT,
-	ROUNDED,
-	SHARP,
-	setDefaultBorderStyle,
-} from "./border-styles.js";
 // Components
-export { BorderedBox, type BorderedBoxOptions } from "./components/bordered-box.js";
 export { Box } from "./components/box.js";
 export { CancellableLoader } from "./components/cancellable-loader.js";
 export { Editor, type EditorOptions, type EditorTheme } from "./components/editor.js";
-export {
-	Image,
-	type ImageOptions,
-	type ImageTheme,
-	setNextImageFilePath,
-} from "./components/image.js";
+export { Image, type ImageOptions, type ImageTheme } from "./components/image.js";
 export { Input } from "./components/input.js";
-export { Loader, type LoaderOptions, type MessageTransformContext } from "./components/loader.js";
+export { Loader } from "./components/loader.js";
 export { type DefaultTextStyle, Markdown, type MarkdownTheme } from "./components/markdown.js";
-export { type SelectItem, SelectList, type SelectListTheme } from "./components/select-list.js";
+export {
+	type SelectItem,
+	SelectList,
+	type SelectListLayoutOptions,
+	type SelectListTheme,
+	type SelectListTruncatePrimaryContext,
+} from "./components/select-list.js";
 export {
 	type SettingItem,
 	SettingsList,
@@ -45,34 +37,28 @@ export type { EditorComponent } from "./editor-component.js";
 export { type FuzzyMatch, fuzzyFilter, fuzzyMatch } from "./fuzzy.js";
 // Keybindings
 export {
-	DEFAULT_EDITOR_KEYBINDINGS,
-	type EditorAction,
-	type EditorKeybindingsConfig,
-	EditorKeybindingsManager,
-	getEditorKeybindings,
 	getKeybindings,
 	type Keybinding,
+	type KeybindingConflict,
 	type KeybindingDefinition,
+	type KeybindingDefinitions,
 	type Keybindings,
 	type KeybindingsConfig,
 	KeybindingsManager,
-	setEditorKeybindings,
 	setKeybindings,
 	TUI_KEYBINDINGS,
 } from "./keybindings.js";
 // Keyboard input handling
 export {
+	decodeKittyPrintable,
 	isKeyRelease,
 	isKeyRepeat,
 	isKittyProtocolActive,
-	isMouseEvent,
 	Key,
 	type KeyEventType,
 	type KeyId,
-	type MouseEvent,
 	matchesKey,
 	parseKey,
-	parseMouseEvent,
 	setKittyProtocolActive,
 } from "./keys.js";
 // Input buffering for batch splitting
@@ -83,15 +69,12 @@ export { ProcessTerminal, type Terminal } from "./terminal.js";
 export {
 	allocateImageId,
 	type CellDimensions,
-	calculateImageLayout,
-	createImageMetadata,
+	calculateImageRows,
 	deleteAllKittyImages,
 	deleteKittyImage,
 	detectCapabilities,
-	detectImageFormat,
 	encodeITerm2,
 	encodeKitty,
-	formatImageDimensions,
 	getCapabilities,
 	getCellDimensions,
 	getGifDimensions,
@@ -99,16 +82,14 @@ export {
 	getJpegDimensions,
 	getPngDimensions,
 	getWebpDimensions,
+	hyperlink,
 	type ImageDimensions,
-	type ImageFormat,
-	type ImageLayout,
-	type ImageMetadata,
 	type ImageProtocol,
 	type ImageRenderOptions,
 	imageFallback,
-	imageFormatToMime,
 	renderImage,
 	resetCapabilitiesCache,
+	setCapabilities,
 	setCellDimensions,
 	type TerminalCapabilities,
 } from "./terminal-image.js";
@@ -126,4 +107,4 @@ export {
 	TUI,
 } from "./tui.js";
 // Utilities
-export { fileLink, hyperlink, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "./utils.js";
+export { truncateToWidth, visibleWidth, wrapTextWithAnsi } from "./utils.js";