@oh-my-pi/hashline 15.10.4 → 15.10.5

package/dist/types/diff-preview.d.ts

@@ -1,12 +1,14 @@
 /**
  * Re-number a unified diff that uses the `+<lineNum>|content` /
  * `-<lineNum>|content` / ` <lineNum>|content` line format into a compact
- * preview that anchors every line to its post-edit position. Added lines,
- * removed lines, and context lines all end up with a hashline-style anchor
- * so a follow-up edit can reuse them directly.
+ * current-file preview. Removed lines are counted for stats and post-edit
+ * offset tracking, but omitted from the preview. Added and context lines are
+ * anchored to their post-edit positions so a follow-up edit can reuse visible
+ * concrete lines directly. Long contiguous added runs are summarized with a
+ * `…` marker instead of echoing every inserted line.
  *
  * This is intentionally decoupled from the diff producer: anything that
  * emits the `<sign><lineNum>|<content>` shape works.
  */
 import type { CompactDiffOptions, CompactDiffPreview } from "./types";
-export declare function buildCompactDiffPreview(diff: string, _options?: CompactDiffOptions): CompactDiffPreview;
+export declare function buildCompactDiffPreview(diff: string, options?: CompactDiffOptions): CompactDiffPreview;

package/dist/types/types.d.ts

@@ -103,9 +103,11 @@ export interface CompactDiffPreview {
     addedLines: number;
     removedLines: number;
 }
-/** Optional knobs for {@link buildCompactDiffPreview}. Reserved for future use. */
+/** Optional knobs for {@link buildCompactDiffPreview}. */
 export interface CompactDiffOptions {
-    /** Maximum entries kept on each side of an unchanged-context truncation (default 2). */
+    /** Added lines kept on each side of a long added-run elision (default 2). */
+    maxAddedRunContext?: number;
+    /** Back-compat alias for {@link maxAddedRunContext}. */
     maxUnchangedRun?: number;
 }
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/hashline",
-	"version": "15.10.4",
+	"version": "15.10.5",
 	"description": "Hashline: a compact, line-anchored patch language and applier. Pluggable FS/IO so it works over disk, in-memory, or any custom backend.",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",

package/src/diff-preview.ts

@@ -1,49 +1,112 @@
 /**
  * Re-number a unified diff that uses the `+<lineNum>|content` /
  * `-<lineNum>|content` / ` <lineNum>|content` line format into a compact
- * preview that anchors every line to its post-edit position. Added lines,
- * removed lines, and context lines all end up with a hashline-style anchor
- * so a follow-up edit can reuse them directly.
+ * current-file preview. Removed lines are counted for stats and post-edit
+ * offset tracking, but omitted from the preview. Added and context lines are
+ * anchored to their post-edit positions so a follow-up edit can reuse visible
+ * concrete lines directly. Long contiguous added runs are summarized with a
+ * `…` marker instead of echoing every inserted line.
  *
  * This is intentionally decoupled from the diff producer: anything that
  * emits the `<sign><lineNum>|<content>` shape works.
  */
 import type { CompactDiffOptions, CompactDiffPreview } from "./types";
 
-export function buildCompactDiffPreview(diff: string, _options: CompactDiffOptions = {}): CompactDiffPreview {
+const DEFAULT_ADDED_RUN_CONTEXT_LINES = 2;
+
+const PREVIEW_ELISION_MARKER = "…";
+const RAW_ELISION_MARKERS = new Set(["...", PREVIEW_ELISION_MARKER, `+${PREVIEW_ELISION_MARKER}`]);
+
+function appendPreviewLine(output: string[], line: string): void {
+	const normalized = RAW_ELISION_MARKERS.has(line) ? PREVIEW_ELISION_MARKER : line;
+	if (normalized === PREVIEW_ELISION_MARKER && output[output.length - 1] === PREVIEW_ELISION_MARKER) return;
+	output.push(normalized);
+}
+
+interface ParsedDiffLine {
+	kind: "+" | "-" | " ";
+	lineNumber: number;
+	content: string;
+}
+
+function normalizeAddedRunContext(value: number | undefined): number {
+	if (value === undefined || !Number.isFinite(value)) return DEFAULT_ADDED_RUN_CONTEXT_LINES;
+	return Math.max(1, Math.trunc(value));
+}
+
+function parseNumberedDiffLine(line: string): ParsedDiffLine | undefined {
+	const kind = line[0];
+	if (kind !== "+" && kind !== "-" && kind !== " ") return undefined;
+
+	const body = line.slice(1);
+	const sep = body.indexOf("|");
+	if (sep === -1) return undefined;
+
+	const lineNumber = Number.parseInt(body.slice(0, sep), 10);
+	if (!Number.isFinite(lineNumber)) return undefined;
+
+	return { kind, lineNumber, content: body.slice(sep + 1) };
+}
+
+function appendAddedRun(output: string[], run: string[], edgeLines: number): void {
+	if (run.length === 0) return;
+
+	const collapseThreshold = edgeLines * 2 + 1;
+	if (run.length <= collapseThreshold) {
+		for (const text of run) appendPreviewLine(output, text);
+		return;
+	}
+
+	for (let i = 0; i < edgeLines; i++) appendPreviewLine(output, run[i]);
+	appendPreviewLine(output, PREVIEW_ELISION_MARKER);
+	for (let i = run.length - edgeLines; i < run.length; i++) appendPreviewLine(output, run[i]);
+}
+
+export function buildCompactDiffPreview(diff: string, options: CompactDiffOptions = {}): CompactDiffPreview {
 	const lines = diff.length === 0 ? [] : diff.split("\n");
+	const addedRunContext = normalizeAddedRunContext(options.maxAddedRunContext ?? options.maxUnchangedRun);
 	let addedLines = 0;
 	let removedLines = 0;
+	const formatted: string[] = [];
+	const addedRun: string[] = [];
+
+	const flushAddedRun = (): void => {
+		appendAddedRun(formatted, addedRun, addedRunContext);
+		addedRun.length = 0;
+	};
 
 	// External diff producers number `+` lines with the post-edit line number,
 	// `-` lines with the pre-edit line number, and context lines with the
 	// pre-edit line number. To emit fresh line numbers usable for follow-up
 	// edits, convert context-line numbers to post-edit positions by tracking
 	// the running offset (added so far - removed so far) as we walk the diff.
-	const formatted = lines.map(line => {
-		const kind = line[0];
-		if (kind !== "+" && kind !== "-" && kind !== " ") return line;
-
-		const body = line.slice(1);
-		const sep = body.indexOf("|");
-		if (sep === -1) return line;
-
-		const lineNumber = Number.parseInt(body.slice(0, sep), 10);
-		const content = body.slice(sep + 1);
+	for (const line of lines) {
+		const parsed = parseNumberedDiffLine(line);
+		if (!parsed) {
+			flushAddedRun();
+			appendPreviewLine(formatted, line);
+			continue;
+		}
 
-		switch (kind) {
-			case "+":
+		switch (parsed.kind) {
+			case "+": {
 				addedLines++;
-				return `+${lineNumber}:${content}`;
+				addedRun.push(`${parsed.lineNumber}:${parsed.content}`);
+				break;
+			}
 			case "-":
+				flushAddedRun();
 				removedLines++;
-				return `-${lineNumber}:${content}`;
+				break;
 			default: {
-				const newLineNumber = lineNumber + addedLines - removedLines;
-				return ` ${newLineNumber}:${content}`;
+				flushAddedRun();
+				const newLineNumber = parsed.lineNumber + addedLines - removedLines;
+				appendPreviewLine(formatted, `${newLineNumber}:${parsed.content}`);
+				break;
 			}
 		}
-	});
+	}
+	flushAddedRun();
 
 	return { preview: formatted.join("\n"), addedLines, removedLines };
 }

package/src/types.ts

@@ -103,9 +103,11 @@ export interface CompactDiffPreview {
 	removedLines: number;
 }
 
-/** Optional knobs for {@link buildCompactDiffPreview}. Reserved for future use. */
+/** Optional knobs for {@link buildCompactDiffPreview}. */
 export interface CompactDiffOptions {
-	/** Maximum entries kept on each side of an unchanged-context truncation (default 2). */
+	/** Added lines kept on each side of a long added-run elision (default 2). */
+	maxAddedRunContext?: number;
+	/** Back-compat alias for {@link maxAddedRunContext}. */
 	maxUnchangedRun?: number;
 }