tmux-fuzzy-motion 0.0.7 → 0.0.9

package/dist/cli.js

@@ -6,6 +6,7 @@ import { dirname, join, resolve } from "node:path";
 import { createConnection, createServer } from "node:net";
 import { tmpdir } from "node:os";
 import { createHash } from "node:crypto";
+import { statSync } from "node:fs";
 //#endregion
 //#region src/infra/process.ts
 const runProcess = async (command, args) => new Promise((resolve, reject) => {
@@ -4726,7 +4727,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));
@@ -4764,11 +4765,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) {
@@ -4815,9 +4857,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)) {
@@ -4828,7 +4880,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,
@@ -4841,10 +4893,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,
@@ -5749,7 +5800,17 @@ const createMatcher = (candidates, migemo) => {
 //#region src/commands/runtime.ts
 const sleep = async (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds));
 const resolveCliEntrypoint = () => process.argv[1] ?? resolve(process.cwd(), "dist/cli.js");
-const createDaemonSocketPath = () => join("/tmp", `tfm-${createHash("sha1").update(process.env.TMUX ?? "tmux-fuzzy-motion").digest("hex")}.sock`);
+const createDaemonIdentity = () => {
+	const entrypoint = resolveCliEntrypoint();
+	const entrypointMtimeMs = statSync(entrypoint).mtimeMs;
+	return [
+		process.env.TMUX ?? "tmux-fuzzy-motion",
+		process.execPath,
+		entrypoint,
+		String(entrypointMtimeMs)
+	].join("\0");
+};
+const createDaemonSocketPath = () => join("/tmp", `tfm-${createHash("sha1").update(createDaemonIdentity()).digest("hex")}.sock`);
 const pathExists = async (path) => {
 	try {
 		await access(path);
@@ -5798,7 +5859,7 @@ const isDaemonHealthy = async (socketPath) => new Promise((resolve) => {
 	});
 });
 const waitForDaemon = async (socketPath) => {
-	for (let attempt = 0; attempt < 40; attempt += 1) {
+	for (let attempt = 0; attempt < 200; attempt += 1) {
 		if (await isDaemonHealthy(socketPath)) return;
 		await sleep(25);
 	}
@@ -5950,6 +6011,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) => {
@@ -6025,9 +6087,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);
@@ -6044,7 +6111,7 @@ 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 };
@@ -6162,7 +6229,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 = [];
@@ -6170,7 +6241,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();
@@ -6213,7 +6284,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();
@@ -6531,7 +6602,7 @@ 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;
@@ -6570,10 +6641,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,
@@ -6582,8 +6652,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);

package/package.json

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