@heyhuynhgiabuu/pi-diff 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@heyhuynhgiabuu/pi-diff",
-	"version": "0.1.3",
+	"version": "0.1.5",
 	"description": "Shiki-powered terminal diff renderer for pi — syntax-highlighted, word-level diffs in split and unified views.",
 	"author": "huynhgiabuu",
 	"license": "MIT",

package/src/index.ts

@@ -225,6 +225,10 @@ function autoDeriveBgFromTheme(theme: any): void {
 		// Empty filler and context — match the base
 		BG_EMPTY = BG_BASE;
 
+		// Update RST to re-apply base bg after every reset — prevents black
+		// flashes between styled segments when toolSuccessBg is non-black
+		RST = `\x1b[0m${BG_BASE}`;
+
 		// Rebuild derived constants
 		DIVIDER = `${FG_RULE}│${RST}`;
 	} catch {
@@ -370,7 +374,7 @@ const MAX_WRAP_ROWS_NARROW = 1; // <120 cols (truncate, no wrap)
 // ANSI
 // ---------------------------------------------------------------------------
 
-const RST = "\x1b[0m";
+let RST = "\x1b[0m";
 const BOLD = "\x1b[1m";
 const DIM = "\x1b[2m";
 
@@ -400,7 +404,7 @@ const BORDER_BAR = "▌";
 /** Generate a dense diagonal stripe fill for empty filler cells.
  *  Solid ╱ characters — uniform direction like CSS diagonal hatching. */
 function stripes(w: number, _rowOffset: number): string {
-	return FG_STRIPE + "╱".repeat(w) + RST;
+	return BG_BASE + FG_STRIPE + "╱".repeat(w) + RST;
 }
 
 let DIVIDER = `${FG_RULE}│${RST}`;
@@ -433,7 +437,10 @@ function resolveDiffColors(theme?: any): DiffColors {
 		try {
 			const bgAnsi = theme.getBgAnsi("toolSuccessBg");
 			const parsed = parseAnsiRgb(bgAnsi);
-			if (parsed) BG_BASE = bgAnsi;
+			if (parsed) {
+				BG_BASE = bgAnsi;
+				RST = `\x1b[0m${BG_BASE}`;
+			}
 		} catch { /* ignore */ }
 	}
 
@@ -665,7 +672,7 @@ function summarize(a: number, d: number): string {
 }
 
 function rule(w: number): string {
-	return `${FG_RULE}${"─".repeat(w)}${RST}`;
+	return `${BG_BASE}${FG_RULE}${"─".repeat(w)}${RST}`;
 }
 
 /**
@@ -1002,7 +1009,7 @@ async function renderUnified(
 			const pad = Math.max(0, totalW - label.length - 2);
 			const half1 = Math.floor(pad / 2),
 				half2 = pad - half1;
-			out.push(`${FG_DIM}${"─".repeat(half1)}${label}${"─".repeat(half2)}${RST}`);
+			out.push(`${BG_BASE}${FG_DIM}${"─".repeat(half1)}${label}${"─".repeat(half2)}${RST}`);
 			idx++;
 			continue;
 		}
@@ -1062,7 +1069,7 @@ async function renderUnified(
 
 	out.push(rule(tw));
 	if (diff.lines.length > vis.length) {
-		out.push(`${FG_DIM}  … ${diff.lines.length - vis.length} more lines${RST}`);
+		out.push(`${BG_BASE}${FG_DIM}  … ${diff.lines.length - vis.length} more lines${RST}`);
 	}
 	return out.join("\n");
 }
@@ -1148,8 +1155,8 @@ async function renderSplit(
 		if (line.type === "sep") {
 			const gap = line.newNum;
 			const label = gap && gap > 0 ? `··· ${gap} lines ···` : "···";
-			const g = ` ${FG_DIM}${fit("", nw + 2)}${RST}${FG_RULE}│${RST} `;
-			return { gutter: g, contGutter: g, bodyRows: [`${FG_DIM}${fit(label, cw)}${RST}`] };
+			const g = `${BG_BASE} ${FG_DIM}${fit("", nw + 2)}${RST}${FG_RULE}│${RST} `;
+			return { gutter: g, contGutter: g, bodyRows: [`${BG_BASE}${FG_DIM}${fit(label, cw)}${RST}`] };
 		}
 
 		const isDel = line.type === "del",
@@ -1182,9 +1189,9 @@ async function renderSplit(
 
 	const out: string[] = [];
 	// Column headers — "old" / "new" positioned above line numbers
-	const hdrOld = `${" ".repeat(Math.max(0, nw - 2))}${dc.fgDel}${DIM}old${RST}`;
-	const hdrNew = `${" ".repeat(Math.max(0, nw - 2))}${dc.fgAdd}${DIM}new${RST}`;
-	out.push(`${hdrOld}${" ".repeat(Math.max(0, half - nw - 1))}${FG_RULE}┊${RST}${hdrNew}`);
+	const hdrOld = `${BG_BASE}${" ".repeat(Math.max(0, nw - 2))}${dc.fgDel}${DIM}old${RST}`;
+	const hdrNew = `${BG_BASE}${" ".repeat(Math.max(0, nw - 2))}${dc.fgAdd}${DIM}new${RST}`;
+	out.push(`${BG_BASE}${hdrOld}${" ".repeat(Math.max(0, half - nw - 1))}${FG_RULE}┊${RST}${hdrNew}`);
 	out.push(`${rule(half)}${FG_RULE}┊${RST}${rule(half)}`);
 
 	for (const r of vis) {
@@ -1230,7 +1237,7 @@ async function renderSplit(
 
 	out.push(`${rule(half)}${FG_RULE}┊${RST}${rule(half)}`);
 	if (rows.length > vis.length) {
-		out.push(`${FG_DIM}  … ${rows.length - vis.length} more lines${RST}`);
+		out.push(`${BG_BASE}${FG_DIM}  … ${rows.length - vis.length} more lines${RST}`);
 	}
 	return out.join("\n");
 }