tmux-fuzzy-motion 0.0.8 → 0.0.10

package/dist/cli.js

@@ -40,19 +40,6 @@ const createTmuxClient = () => ({
 		return (await runProcess("tmux", args)).stdout;
 	}
 });
-const focusClientPane = async (tmux, paneId, clientTty) => {
-	try {
-		await tmux.run([
-			"switch-client",
-			"-c",
-			clientTty,
-			"-t",
-			paneId
-		]);
-	} catch (error) {
-		throw new Error("tmux-fuzzy-motion: client not found", { cause: error });
-	}
-};
 const enterCopyMode = async (tmux, paneId) => {
 	try {
 		await tmux.run([
@@ -117,20 +104,26 @@ const listWindowPanes = async (tmux, paneId) => {
 			"-t",
 			paneId,
 			"-F",
-			"#{pane_id}	#{pane_in_mode}	#{pane_width}	#{pane_height}	#{pane_current_path}	#{pane_left}	#{pane_top}	#{?pane_active,1,0}	#{window_zoomed_flag}"
+			"#{pane_id}	#{pane_in_mode}	#{pane_width}	#{pane_height}	#{pane_current_path}	#{pane_left}	#{pane_top}	#{?pane_active,1,0}	#{window_zoomed_flag}	#{pane-border-lines}"
 		])).trim();
 	} catch (error) {
 		throw new Error("tmux-fuzzy-motion: pane not found", { cause: error });
 	}
 	const panes = output.split("\n").filter((line) => line.length > 0).map((line) => {
-		const [resolvedPaneId, paneInMode, width, height, currentPath, left, top, active, zoomed] = line.split("	");
+		const [resolvedPaneId, paneInMode, width, height, currentPath, left, top, active, zoomed, borderLines] = line.split("	");
 		const numeric = [
 			width,
 			height,
 			left,
 			top
 		].map((value) => Number(value));
-		if (!resolvedPaneId || !paneInMode || !currentPath || [active, zoomed].some((value) => value === void 0) || numeric.some((value) => !Number.isFinite(value))) throw new Error("tmux-fuzzy-motion: failed to resolve window panes");
+		if (!resolvedPaneId || !paneInMode || !currentPath || [
+			active,
+			zoomed,
+			borderLines
+		].some((value) => value === void 0) || numeric.some((value) => !Number.isFinite(value))) throw new Error("tmux-fuzzy-motion: failed to resolve window panes");
+		if (borderLines !== "single" && borderLines !== "double" && borderLines !== "heavy" && borderLines !== "simple" && borderLines !== "number" && borderLines !== "spaces") throw new Error("tmux-fuzzy-motion: failed to resolve window panes");
+		const resolvedBorderLines = borderLines;
 		return {
 			paneId: resolvedPaneId,
 			inCopyMode: paneInMode === "1",
@@ -140,6 +133,7 @@ const listWindowPanes = async (tmux, paneId) => {
 			left: Number(left),
 			top: Number(top),
 			active: active === "1",
+			borderLines: resolvedBorderLines,
 			zoomed: zoomed === "1"
 		};
 	});
@@ -150,23 +144,6 @@ const listWindowPanes = async (tmux, paneId) => {
 		return rest;
 	});
 };
-const getPaneBorderLines = async (tmux, paneId) => {
-	let output = "";
-	try {
-		output = (await tmux.capture([
-			"show-options",
-			"-A",
-			"-wv",
-			"-t",
-			paneId,
-			"pane-border-lines"
-		])).trim();
-	} catch (error) {
-		throw new Error("tmux-fuzzy-motion: failed to resolve pane border lines", { cause: error });
-	}
-	if (output === "single" || output === "double" || output === "heavy" || output === "simple" || output === "number" || output === "spaces") return output;
-	throw new Error("tmux-fuzzy-motion: failed to resolve pane border lines");
-};
 const getTmuxVersion = async () => {
 	return (await runProcess("tmux", ["-V"])).stdout.trim();
 };
@@ -4727,7 +4704,7 @@ const capturePane = async (tmux, paneId) => {
 };
 //#endregion
 //#region src/core/width.ts
-const ANSI_PATTERN = /\u001B\[[0-9;]*m/gu;
+const ANSI_PATTERN$1 = /\u001B\[[0-9;]*m/gu;
 const RESET$2 = "\x1B[0m";
 const displayWidth = (value) => stringWidth(value);
 const codeUnitIndexToColumn = (value, index) => stringWidth(value.slice(0, index));
@@ -4765,11 +4742,52 @@ const codeUnitRangeToColumns = (value, start, end) => {
 	}
 	return columns;
 };
+const createCompactStyledDisplayCells = (value) => {
+	const cells = [];
+	let activeStyle = "";
+	let pendingStyle = "";
+	let styleOpen = false;
+	let lastVisibleCellIndex = -1;
+	let lastIndex = 0;
+	const appendChunk = (chunk) => {
+		for (const char of chunk) {
+			const width = Math.max(1, stringWidth(char));
+			const prefix = pendingStyle.length > 0 ? pendingStyle : !styleOpen && activeStyle.length > 0 ? activeStyle : "";
+			cells.push(`${prefix}${char}`);
+			if (prefix.length > 0) {
+				pendingStyle = "";
+				styleOpen = true;
+			}
+			lastVisibleCellIndex = cells.length - 1;
+			for (let offset = 1; offset < width; offset += 1) cells.push("");
+		}
+	};
+	const closeStyle = () => {
+		if (styleOpen && lastVisibleCellIndex >= 0) cells[lastVisibleCellIndex] = `${cells[lastVisibleCellIndex]}${RESET$2}`;
+		activeStyle = "";
+		pendingStyle = "";
+		styleOpen = false;
+	};
+	for (const match of value.matchAll(ANSI_PATTERN$1)) {
+		const start = match.index ?? 0;
+		appendChunk(value.slice(lastIndex, start));
+		const sequence = match[0];
+		if (sequence === RESET$2) closeStyle();
+		else {
+			activeStyle = `${activeStyle}${sequence}`;
+			pendingStyle = `${pendingStyle}${sequence}`;
+		}
+		lastIndex = start + sequence.length;
+	}
+	appendChunk(value.slice(lastIndex));
+	if (styleOpen) closeStyle();
+	return cells;
+};
 const createStyledDisplayCells = (value) => {
 	const cells = [];
 	let activeStyle = "";
 	let lastIndex = 0;
-	for (const match of value.matchAll(ANSI_PATTERN)) {
+	for (const match of value.matchAll(ANSI_PATTERN$1)) {
 		const start = match.index ?? 0;
 		const chunk = value.slice(lastIndex, start);
 		for (const char of chunk) {
@@ -4816,9 +4834,19 @@ const PATTERNS = [
 	}
 ];
 const isContainedByHigherPriority = (current, others) => others.some((candidate) => candidate.line === current.line && candidate.priority < current.priority && candidate.startIndex <= current.startIndex && candidate.endIndex >= current.endIndex);
+const dedupeLineCandidates = (candidates) => {
+	const byStartIndex = /* @__PURE__ */ new Map();
+	for (const candidate of candidates) {
+		const current = byStartIndex.get(candidate.startIndex);
+		if (!current || candidate.priority < current.priority) byStartIndex.set(candidate.startIndex, candidate);
+	}
+	const deduped = [...byStartIndex.values()];
+	return deduped.filter((candidate) => !isContainedByHigherPriority(candidate, deduped));
+};
 const extractCandidates = (lines) => {
 	const collected = [];
 	lines.forEach((lineText, lineIndex) => {
+		const lineCandidates = [];
 		PATTERNS.forEach(({ kind, pattern }, priority) => {
 			const regex = new RegExp(pattern.source, pattern.flags);
 			for (const match of lineText.matchAll(regex)) {
@@ -4829,7 +4857,7 @@ const extractCandidates = (lines) => {
 				if (width === 1 && kind !== "word") continue;
 				const col = codeUnitIndexToColumn(lineText, startIndex);
 				const charCol = codeUnitIndexToCharacterIndex(lineText, startIndex);
-				collected.push({
+				lineCandidates.push({
 					kind,
 					text,
 					line: lineIndex + 1,
@@ -4842,10 +4870,9 @@ const extractCandidates = (lines) => {
 				});
 			}
 		});
+		collected.push(...dedupeLineCandidates(lineCandidates));
 	});
-	return collected.filter((candidate, _, source) => {
-		return source.find((other) => other.line === candidate.line && other.startIndex === candidate.startIndex && other.priority <= candidate.priority) === candidate;
-	}).filter((candidate, _, source) => !isContainedByHigherPriority(candidate, source)).sort((left, right) => left.line - right.line || left.col - right.col || left.priority - right.priority).map((candidate) => ({
+	return collected.sort((left, right) => left.line - right.line || left.col - right.col || left.priority - right.priority).map((candidate) => ({
 		kind: candidate.kind,
 		text: candidate.text,
 		line: candidate.line,
@@ -5851,10 +5878,19 @@ const measureCellWidth = (cells, start) => {
 	return width;
 };
 const createOverlayRenderer = (lines) => {
-	const baseCellsByLine = lines.map((line) => createStyledDisplayCells(line));
-	const baseLines = baseCellsByLine.map((cells) => cells.join(""));
+	const baseLines = [...lines];
+	const baseCellsByLine = /* @__PURE__ */ new Map();
 	const targetLine = (target) => (target.screenLine ?? target.line) - 1;
 	const targetCol = (target) => target.screenCol ?? target.col;
+	const baseCellsForLine = (lineIndex) => {
+		const line = lines[lineIndex];
+		if (line === void 0) return;
+		const existing = baseCellsByLine.get(lineIndex);
+		if (existing) return existing;
+		const cells = createStyledDisplayCells(line);
+		baseCellsByLine.set(lineIndex, cells);
+		return cells;
+	};
 	return (targets) => {
 		const rendered = [...baseLines];
 		const mutableCells = /* @__PURE__ */ new Map();
@@ -5863,7 +5899,7 @@ const createOverlayRenderer = (lines) => {
 		const sorted = [...targets].sort((left, right) => targetLine(left) - targetLine(right) || targetCol(left) + left.primary - (targetCol(right) + right.primary));
 		for (const target of sorted) {
 			const lineIndex = targetLine(target);
-			const baseCells = baseCellsByLine[lineIndex];
+			const baseCells = baseCellsForLine(lineIndex);
 			if (!baseCells) continue;
 			let cells = mutableCells.get(lineIndex);
 			if (!cells) {
@@ -5961,6 +5997,7 @@ const withRawMode = async (input, output, callback) => {
 //#region src/commands/input.ts
 const QUERY_STYLE = "\x1B[48;5;236;38;5;252m";
 const RESET = "\x1B[0m";
+const ANSI_PATTERN = /\u001B\[[0-9;]*m/u;
 const HINT_CHARS = /* @__PURE__ */ new Set("ASDFGHJKLQWERTYUIOPZXCVBNM");
 const WORD_CHAR_PATTERN = /[a-z0-9_-]/u;
 const parsePopupArgs = (args) => {
@@ -6036,9 +6073,14 @@ const fitBodyToHeight = (lines, height) => {
 	return next;
 };
 const renderQueryOnBottomLine = (line, width, query) => {
+	if (query.length === 0) {
+		const cells = createCompactStyledDisplayCells(line);
+		while (cells.length < width) cells.push(" ");
+		const rendered = cells.slice(0, width).join("");
+		return ANSI_PATTERN.test(rendered) && !rendered.endsWith(RESET) ? `${rendered}${RESET}` : rendered;
+	}
 	const cells = createStyledDisplayCells(line);
 	while (cells.length < width) cells.push(" ");
-	if (query.length === 0) return cells.slice(0, width).join("");
 	const queryWidth = Math.min(width, stringWidth(query));
 	const start = Math.max(0, width - queryWidth);
 	const content = Array.from(query);
@@ -6055,15 +6097,20 @@ const renderQueryOnBottomLine = (line, width, query) => {
 	return cells.slice(0, width).join("");
 };
 const createFrame = (state, query, matches, renderOverlay) => {
-	const body = fitBodyToHeight(query.length > 0 && matches.length > 0 ? renderOverlay(matches) : state.displayLines, state.height);
+	const body = fitBodyToHeight(query.length > 0 && matches.length > 0 && renderOverlay ? renderOverlay(matches) : state.displayLines, state.height);
 	const lastLineIndex = Math.max(0, body.length - 1);
 	body[lastLineIndex] = renderQueryOnBottomLine(body[lastLineIndex] ?? "", state.width, query);
 	return { body };
 };
+const createInitialFrameOutput = (frame) => {
+	const full = frame.body.map((line) => line.trimEnd()).join("\n");
+	const sparse = frame.body.map((line, index) => [index, line.trimEnd()]).filter(([, line]) => line.length > 0).map(([index, line]) => `\u001B[${index + 1};1H${line}`).join("");
+	return sparse.length < full.length ? sparse : full;
+};
 const writeFullFrame = (output, frame) => {
 	output.write("\x1B[?7l");
 	clearScreen(output);
-	output.write(frame.body.join("\n"));
+	output.write(createInitialFrameOutput(frame));
 	output.write("\x1B[H\x1B[?7h");
 };
 const renderFrame = (output, frame, previousFrame) => {
@@ -6173,7 +6220,11 @@ const expectResponse = (response, type) => {
 	return response;
 };
 const runPopupJob = async (state, options) => {
-	const overlayRenderer = createOverlayRenderer(state.displayLines);
+	let overlayRenderer = null;
+	const getOverlayRenderer = () => {
+		overlayRenderer ??= createOverlayRenderer(state.displayLines);
+		return overlayRenderer;
+	};
 	let query = "";
 	let previousHints = /* @__PURE__ */ new Map();
 	let matches = [];
@@ -6181,7 +6232,7 @@ const runPopupJob = async (state, options) => {
 	const output = process.stdout;
 	await withRawMode(input, output, async () => {
 		const reader = createByteReader(input);
-		let previousFrame = renderFrame(output, createFrame(state, query, matches, overlayRenderer));
+		let previousFrame = renderFrame(output, createFrame(state, query, matches));
 		try {
 			while (true) {
 				const value = await reader.nextByte();
@@ -6224,7 +6275,7 @@ const runPopupJob = async (state, options) => {
 				}
 				matches = query.length === 0 ? [] : await options.onMatch(query, previousHints);
 				previousHints = new Map(matches.map((target) => [createTargetKey(target), target.hint]));
-				previousFrame = renderFrame(output, createFrame(state, query, matches, overlayRenderer), previousFrame);
+				previousFrame = renderFrame(output, createFrame(state, query, matches, matches.length > 0 ? getOverlayRenderer() : void 0), previousFrame);
 			}
 		} finally {
 			reader.close();
@@ -6542,14 +6593,14 @@ const composeDisplayLines = (panes, width, height, borderLines) => {
 	for (const pane of panes) pane.displayLines.forEach((line, lineIndex) => {
 		const row = rows[pane.top + lineIndex];
 		if (!row) return;
-		createStyledDisplayCells(line).forEach((cell, cellIndex) => {
+		createCompactStyledDisplayCells(line).forEach((cell, cellIndex) => {
 			const column = pane.left + cellIndex;
 			if (column < 0 || column >= row.length) return;
 			row[column] = cell;
 		});
 	});
 	drawPaneBorders(rows, occupied, borderLines);
-	return rows.map((row) => row.join(""));
+	return rows.map((row) => row.join("").trimEnd());
 };
 const buildCurrentState = async (tmux, pane, paneId, clientTty) => {
 	if (!pane.inCopyMode) await enterCopyMode(tmux, paneId);
@@ -6567,9 +6618,11 @@ const buildCurrentState = async (tmux, pane, paneId, clientTty) => {
 		}
 	};
 };
-const buildAllPaneState = async (tmux, pane, paneId, clientTty) => {
+const buildAllPaneState = async (tmux, paneId, clientTty) => {
 	const panes = await listWindowPanes(tmux, paneId);
-	const borderLines = await getPaneBorderLines(tmux, paneId);
+	const targetPane = panes.find((item) => item.paneId === paneId) ?? panes.find((item) => item.active) ?? panes[0];
+	if (!targetPane) throw new Error("tmux-fuzzy-motion: pane not found");
+	const borderLines = targetPane.borderLines;
 	const bounds = panes.reduce((accumulator, item) => ({
 		left: Math.min(accumulator.left, item.left),
 		top: Math.min(accumulator.top, item.top),
@@ -6581,10 +6634,9 @@ const buildAllPaneState = async (tmux, pane, paneId, clientTty) => {
 		right: Number.NEGATIVE_INFINITY,
 		bottom: Number.NEGATIVE_INFINITY
 	});
-	const snapshots = [];
-	for (const item of panes) {
+	const snapshots = await Promise.all(panes.map(async (item) => {
 		const capture = fitCaptureToHeight(await capturePane(tmux, item.paneId), item.height);
-		snapshots.push({
+		return {
 			paneId: item.paneId,
 			inCopyMode: item.inCopyMode,
 			width: item.width,
@@ -6593,8 +6645,8 @@ const buildAllPaneState = async (tmux, pane, paneId, clientTty) => {
 			top: item.top - bounds.top,
 			plainLines: capture.lines,
 			displayLines: capture.displayLines
-		});
-	}
+		};
+	}));
 	const width = Math.max(0, bounds.right - bounds.left);
 	const height = Math.max(0, bounds.bottom - bounds.top);
 	const x = buildPopupRelativePosition("x", bounds.left);
@@ -6604,11 +6656,11 @@ const buildAllPaneState = async (tmux, pane, paneId, clientTty) => {
 		paneId,
 		clientTty,
 		targetPane: {
-			paneId: pane.paneId,
-			width: pane.width,
-			height: pane.height,
-			inCopyMode: pane.inCopyMode,
-			currentPath: pane.currentPath
+			paneId: targetPane.paneId,
+			width: targetPane.width,
+			height: targetPane.height,
+			inCopyMode: targetPane.inCopyMode,
+			currentPath: targetPane.currentPath
 		},
 		bounds,
 		size: {
@@ -6631,7 +6683,7 @@ const buildAllPaneState = async (tmux, pane, paneId, clientTty) => {
 		}))
 	});
 	return {
-		currentPath: pane.currentPath,
+		currentPath: targetPane.currentPath,
 		x,
 		y,
 		state: {
@@ -6665,9 +6717,7 @@ const runStart = async (args) => {
 	const resultFile = join(tempDir, "result.json");
 	const socketPath = createDaemonSocketPath();
 	try {
-		const pane = await getPaneStartContext(tmux, paneId);
-		await focusClientPane(tmux, paneId, clientTty);
-		const popupState = scope === "all" ? await buildAllPaneState(tmux, pane, paneId, clientTty) : await buildCurrentState(tmux, pane, paneId, clientTty);
+		const popupState = scope === "all" ? await buildAllPaneState(tmux, paneId, clientTty) : await buildCurrentState(tmux, await getPaneStartContext(tmux, paneId), paneId, clientTty);
 		const state = popupState.state;
 		await writeFile(stateFile, JSON.stringify(state), "utf8");
 		await ensureDaemon(socketPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmux-fuzzy-motion",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "Fuzzy hint motion for tmux copy-mode",
   "type": "module",
   "files": [