@pierre/diffs 1.1.0-beta.1 → 1.1.0-beta.10

package/dist/utils/setWrapperNodeProps.js

@@ -1,23 +1,30 @@
 //#region src/utils/setWrapperNodeProps.ts
-function setPreNodeProperties(pre, { diffIndicators, disableBackground, disableLineNumbers, overflow, split, themeStyles, themeType, totalLines }) {
-	if (themeType === "system") delete pre.dataset.themeType;
-	else pre.dataset.themeType = themeType;
+function setPreNodeProperties(pre, { type, diffIndicators, disableBackground, disableLineNumbers, overflow, split, themeStyles, themeType, totalLines }) {
+	if (type === "diff") {
+		pre.setAttribute("data-diff", "");
+		pre.removeAttribute("data-file");
+	} else {
+		pre.setAttribute("data-file", "");
+		pre.removeAttribute("data-diff");
+	}
+	if (themeType === "system") pre.removeAttribute("data-theme-type");
+	else pre.setAttribute("data-theme-type", themeType);
 	switch (diffIndicators) {
 		case "bars":
 		case "classic":
-			pre.dataset.indicators = diffIndicators;
+			pre.setAttribute("data-indicators", diffIndicators);
 			break;
 		case "none":
-			delete pre.dataset.indicators;
+			pre.removeAttribute("data-indicators");
 			break;
 	}
-	if (disableLineNumbers) pre.dataset.disableLineNumbers = "";
-	else delete pre.dataset.disableLineNumbers;
-	if (disableBackground) delete pre.dataset.background;
-	else pre.dataset.background = "";
-	pre.dataset.type = split ? "split" : "file";
-	pre.dataset.overflow = overflow;
-	pre.dataset.diffs = "";
+	if (disableLineNumbers) pre.setAttribute("data-disable-line-numbers", "");
+	else pre.removeAttribute("data-disable-line-numbers");
+	if (disableBackground) pre.removeAttribute("data-background");
+	else pre.setAttribute("data-background", "");
+	if (type === "diff") pre.setAttribute("data-diff-type", split ? "split" : "single");
+	else pre.removeAttribute("data-diff-type");
+	pre.setAttribute("data-overflow", overflow);
 	pre.tabIndex = 0;
 	pre.style = themeStyles;
 	pre.style.setProperty("--diffs-min-number-column-width-default", `${`${totalLines}`.length}ch`);

package/dist/utils/setWrapperNodeProps.js.map

@@ -1 +1 @@
-{"version":3,"file":"setWrapperNodeProps.js","names":[],"sources":["../../src/utils/setWrapperNodeProps.ts"],"sourcesContent":["import type { PrePropertiesConfig } from '../types';\n\nexport function setPreNodeProperties(\n  pre: HTMLPreElement,\n  {\n    diffIndicators,\n    disableBackground,\n    disableLineNumbers,\n    overflow,\n    split,\n    themeStyles,\n    themeType,\n    totalLines,\n  }: PrePropertiesConfig\n): HTMLPreElement {\n  if (themeType === 'system') {\n    delete pre.dataset.themeType;\n  } else {\n    pre.dataset.themeType = themeType;\n  }\n  switch (diffIndicators) {\n    case 'bars':\n    case 'classic':\n      pre.dataset.indicators = diffIndicators;\n      break;\n    case 'none':\n      delete pre.dataset.indicators;\n      break;\n  }\n  if (disableLineNumbers) {\n    pre.dataset.disableLineNumbers = '';\n  } else {\n    delete pre.dataset.disableLineNumbers;\n  }\n  if (disableBackground) {\n    delete pre.dataset.background;\n  } else {\n    pre.dataset.background = '';\n  }\n  pre.dataset.type = split ? 'split' : 'file';\n  pre.dataset.overflow = overflow;\n  pre.dataset.diffs = '';\n  pre.tabIndex = 0;\n  // Set theme color custom properties as inline styles on pre element\n  pre.style = themeStyles;\n  // Set CSS custom property for line number column width\n  pre.style.setProperty(\n    '--diffs-min-number-column-width-default',\n    `${`${totalLines}`.length}ch`\n  );\n  return pre;\n}\n"],"mappings":";AAEA,SAAgB,qBACd,KACA,EACE,gBACA,mBACA,oBACA,UACA,OACA,aACA,WACA,cAEc;AAChB,KAAI,cAAc,SAChB,QAAO,IAAI,QAAQ;KAEnB,KAAI,QAAQ,YAAY;AAE1B,SAAQ,gBAAR;EACE,KAAK;EACL,KAAK;AACH,OAAI,QAAQ,aAAa;AACzB;EACF,KAAK;AACH,UAAO,IAAI,QAAQ;AACnB;;AAEJ,KAAI,mBACF,KAAI,QAAQ,qBAAqB;KAEjC,QAAO,IAAI,QAAQ;AAErB,KAAI,kBACF,QAAO,IAAI,QAAQ;KAEnB,KAAI,QAAQ,aAAa;AAE3B,KAAI,QAAQ,OAAO,QAAQ,UAAU;AACrC,KAAI,QAAQ,WAAW;AACvB,KAAI,QAAQ,QAAQ;AACpB,KAAI,WAAW;AAEf,KAAI,QAAQ;AAEZ,KAAI,MAAM,YACR,2CACA,GAAG,GAAG,aAAa,OAAO,IAC3B;AACD,QAAO"}
+{"version":3,"file":"setWrapperNodeProps.js","names":[],"sources":["../../src/utils/setWrapperNodeProps.ts"],"sourcesContent":["import type { PrePropertiesConfig } from '../types';\n\nexport function setPreNodeProperties(\n  pre: HTMLPreElement,\n  {\n    type,\n    diffIndicators,\n    disableBackground,\n    disableLineNumbers,\n    overflow,\n    split,\n    themeStyles,\n    themeType,\n    totalLines,\n  }: PrePropertiesConfig\n): HTMLPreElement {\n  if (type === 'diff') {\n    pre.setAttribute('data-diff', '');\n    pre.removeAttribute('data-file');\n  } else {\n    pre.setAttribute('data-file', '');\n    pre.removeAttribute('data-diff');\n  }\n  if (themeType === 'system') {\n    pre.removeAttribute('data-theme-type');\n  } else {\n    pre.setAttribute('data-theme-type', themeType);\n  }\n  switch (diffIndicators) {\n    case 'bars':\n    case 'classic':\n      pre.setAttribute('data-indicators', diffIndicators);\n      break;\n    case 'none':\n      pre.removeAttribute('data-indicators');\n      break;\n  }\n  if (disableLineNumbers) {\n    pre.setAttribute('data-disable-line-numbers', '');\n  } else {\n    pre.removeAttribute('data-disable-line-numbers');\n  }\n  if (disableBackground) {\n    pre.removeAttribute('data-background');\n  } else {\n    pre.setAttribute('data-background', '');\n  }\n  if (type === 'diff') {\n    pre.setAttribute('data-diff-type', split ? 'split' : 'single');\n  } else {\n    pre.removeAttribute('data-diff-type');\n  }\n  pre.setAttribute('data-overflow', overflow);\n  pre.tabIndex = 0;\n  // Set theme color custom properties as inline styles on pre element\n  pre.style = themeStyles;\n  // Set CSS custom property for line number column width\n  pre.style.setProperty(\n    '--diffs-min-number-column-width-default',\n    `${`${totalLines}`.length}ch`\n  );\n  return pre;\n}\n"],"mappings":";AAEA,SAAgB,qBACd,KACA,EACE,MACA,gBACA,mBACA,oBACA,UACA,OACA,aACA,WACA,cAEc;AAChB,KAAI,SAAS,QAAQ;AACnB,MAAI,aAAa,aAAa,GAAG;AACjC,MAAI,gBAAgB,YAAY;QAC3B;AACL,MAAI,aAAa,aAAa,GAAG;AACjC,MAAI,gBAAgB,YAAY;;AAElC,KAAI,cAAc,SAChB,KAAI,gBAAgB,kBAAkB;KAEtC,KAAI,aAAa,mBAAmB,UAAU;AAEhD,SAAQ,gBAAR;EACE,KAAK;EACL,KAAK;AACH,OAAI,aAAa,mBAAmB,eAAe;AACnD;EACF,KAAK;AACH,OAAI,gBAAgB,kBAAkB;AACtC;;AAEJ,KAAI,mBACF,KAAI,aAAa,6BAA6B,GAAG;KAEjD,KAAI,gBAAgB,4BAA4B;AAElD,KAAI,kBACF,KAAI,gBAAgB,kBAAkB;KAEtC,KAAI,aAAa,mBAAmB,GAAG;AAEzC,KAAI,SAAS,OACX,KAAI,aAAa,kBAAkB,QAAQ,UAAU,SAAS;KAE9D,KAAI,gBAAgB,iBAAiB;AAEvC,KAAI,aAAa,iBAAiB,SAAS;AAC3C,KAAI,WAAW;AAEf,KAAI,QAAQ;AAEZ,KAAI,MAAM,YACR,2CACA,GAAG,GAAG,aAAa,OAAO,IAC3B;AACD,QAAO"}

package/dist/utils/splitFileContents.d.ts

@@ -0,0 +1,12 @@
+//#region src/utils/splitFileContents.d.ts
+/**
+ * Splits file contents into lines using the same logic as diff parsing.
+ * - Preserves trailing newlines on each line
+ *
+ * @param contents - The raw file contents string
+ * @returns Array of lines with newlines preserved
+ */
+declare function splitFileContents(contents: string): string[];
+//#endregion
+export { splitFileContents };
+//# sourceMappingURL=splitFileContents.d.ts.map

package/dist/utils/splitFileContents.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"splitFileContents.d.ts","names":["splitFileContents"],"sources":["../../src/utils/splitFileContents.d.ts"],"sourcesContent":["/**\n * Splits file contents into lines using the same logic as diff parsing.\n * - Preserves trailing newlines on each line\n *\n * @param contents - The raw file contents string\n * @returns Array of lines with newlines preserved\n */\nexport declare function splitFileContents(contents: string): string[];\n//# sourceMappingURL=splitFileContents.d.ts.map"],"mappings":";;AAOA;;;;;;iBAAwBA,iBAAAA"}

package/dist/utils/splitFileContents.js

@@ -0,0 +1,17 @@
+import { SPLIT_WITH_NEWLINES } from "../constants.js";
+
+//#region src/utils/splitFileContents.ts
+/**
+* Splits file contents into lines using the same logic as diff parsing.
+* - Preserves trailing newlines on each line
+*
+* @param contents - The raw file contents string
+* @returns Array of lines with newlines preserved
+*/
+function splitFileContents(contents) {
+	return contents !== "" ? contents.split(SPLIT_WITH_NEWLINES) : [];
+}
+
+//#endregion
+export { splitFileContents };
+//# sourceMappingURL=splitFileContents.js.map

package/dist/utils/splitFileContents.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"splitFileContents.js","names":[],"sources":["../../src/utils/splitFileContents.ts"],"sourcesContent":["import { SPLIT_WITH_NEWLINES } from '../constants';\n\n/**\n * Splits file contents into lines using the same logic as diff parsing.\n * - Preserves trailing newlines on each line\n *\n * @param contents - The raw file contents string\n * @returns Array of lines with newlines preserved\n */\nexport function splitFileContents(contents: string): string[] {\n  return contents !== '' ? contents.split(SPLIT_WITH_NEWLINES) : [];\n}\n"],"mappings":";;;;;;;;;;AASA,SAAgB,kBAAkB,UAA4B;AAC5D,QAAO,aAAa,KAAK,SAAS,MAAM,oBAAoB,GAAG,EAAE"}

package/dist/utils/trimPatchContext.d.ts

@@ -0,0 +1,11 @@
+//#region src/utils/trimPatchContext.d.ts
+/**
+ * A utility function to trim out excess context lines from a patch file.  It
+ * will maintain line numbers, and properly update the hunk context markers, as
+ * well as be able to create new hunks where necessary if there's excessive
+ * context between changes
+ */
+declare function trimPatchContext(patch: string, contextSize?: number): string;
+//#endregion
+export { trimPatchContext };
+//# sourceMappingURL=trimPatchContext.d.ts.map

package/dist/utils/trimPatchContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"trimPatchContext.d.ts","names":["trimPatchContext"],"sources":["../../src/utils/trimPatchContext.d.ts"],"sourcesContent":["/**\n * A utility function to trim out excess context lines from a patch file.  It\n * will maintain line numbers, and properly update the hunk context markers, as\n * well as be able to create new hunks where necessary if there's excessive\n * context between changes\n */\nexport declare function trimPatchContext(patch: string, contextSize?: number): string;\n//# sourceMappingURL=trimPatchContext.d.ts.map"],"mappings":";;AAMA;;;;;iBAAwBA,gBAAAA"}

package/dist/utils/trimPatchContext.js

@@ -0,0 +1,99 @@
+import { HUNK_HEADER } from "../constants.js";
+
+//#region src/utils/trimPatchContext.ts
+/**
+* A utility function to trim out excess context lines from a patch file.  It
+* will maintain line numbers, and properly update the hunk context markers, as
+* well as be able to create new hunks where necessary if there's excessive
+* context between changes
+*/
+function trimPatchContext(patch, contextSize = 10) {
+	const lines = [];
+	let currentHunk;
+	for (const line of patch.split("\n")) {
+		const parsedHunkHeader = line.match(HUNK_HEADER);
+		if (parsedHunkHeader != null) {
+			if (currentHunk != null) {
+				if (currentHunk.hunkLines.length > 0) {
+					flushContextLines(currentHunk, contextSize);
+					flushHunk(currentHunk, lines);
+				}
+				currentHunk = void 0;
+			}
+			const additionStart = parseInt(parsedHunkHeader[3]);
+			const deletionStart = parseInt(parsedHunkHeader[1]);
+			const additionCount = parseInt(parsedHunkHeader[4] ?? "1");
+			const deletionCount = parseInt(parsedHunkHeader[2] ?? "1");
+			if (isNaN(additionStart) || isNaN(deletionStart) || isNaN(additionCount) || isNaN(deletionCount)) lines.push(line);
+			else currentHunk = {
+				hunkContextString: parsedHunkHeader[5] ?? "",
+				additionStart,
+				deletionStart,
+				additionCount: 0,
+				deletionCount: 0,
+				hunkLines: [],
+				contextLines: []
+			};
+			continue;
+		}
+		if (currentHunk == null) {
+			lines.push(line);
+			continue;
+		}
+		if (line.startsWith(" ")) {
+			currentHunk.contextLines.push(line);
+			if (currentHunk.hunkLines.length > 0 && currentHunk.contextLines.length === contextSize * 2 + 1) {
+				const removedItems = currentHunk.contextLines.slice(contextSize);
+				flushContextLines(currentHunk, contextSize);
+				const { additionCount: emittedAdditionCount, deletionCount: emittedDeletionCount } = currentHunk;
+				flushHunk(currentHunk, lines);
+				removedItems.shift();
+				currentHunk = {
+					hunkContextString: "",
+					additionStart: currentHunk.additionStart + emittedAdditionCount + 1,
+					deletionStart: currentHunk.deletionStart + emittedDeletionCount + 1,
+					deletionCount: 0,
+					additionCount: 0,
+					contextLines: removedItems,
+					hunkLines: []
+				};
+			}
+		} else if (line !== "") {
+			flushContextLines(currentHunk, contextSize);
+			currentHunk.hunkLines.push(line);
+			if (line.startsWith("+")) currentHunk.additionCount += 1;
+			else if (line.startsWith("-")) currentHunk.deletionCount += 1;
+		}
+	}
+	if (currentHunk != null && currentHunk.hunkLines.length > 0) {
+		flushContextLines(currentHunk, contextSize);
+		flushHunk(currentHunk, lines);
+	}
+	return lines.join("\n");
+}
+function flushContextLines(hunk, contextSize) {
+	if (hunk.contextLines.length > contextSize) if (hunk.hunkLines.length === 0) {
+		const difference = hunk.contextLines.length - contextSize;
+		hunk.contextLines.splice(0, difference);
+		hunk.additionStart += difference;
+		hunk.deletionStart += difference;
+	} else hunk.contextLines.length = contextSize;
+	if (hunk.contextLines.length > 0) {
+		hunk.hunkLines.push(...hunk.contextLines);
+		hunk.additionCount += hunk.contextLines.length;
+		hunk.deletionCount += hunk.contextLines.length;
+		hunk.contextLines.length = 0;
+	}
+	return hunk;
+}
+function flushHunk(hunk, lines) {
+	lines.push(`@@ -${formatHunkRange(hunk.deletionStart, hunk.deletionCount)} +${formatHunkRange(hunk.additionStart, hunk.additionCount)} @@${hunk.hunkContextString !== "" ? ` ${hunk.hunkContextString}` : ""}`);
+	lines.push(...hunk.hunkLines);
+}
+function formatHunkRange(start, count) {
+	return count === 1 ? `${start}` : `${start},${count}`;
+}
+
+//#endregion
+export { trimPatchContext };
+//# sourceMappingURL=trimPatchContext.js.map

package/dist/utils/trimPatchContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trimPatchContext.js","names":["lines: string[]","currentHunk: CurrentHunk | undefined"],"sources":["../../src/utils/trimPatchContext.ts"],"sourcesContent":["import { HUNK_HEADER } from '../constants';\n\ninterface CurrentHunk {\n  hunkContextString: string;\n  additionStart: number;\n  deletionStart: number;\n  additionCount: number;\n  deletionCount: number;\n  hunkLines: string[];\n  contextLines: string[];\n}\n\n/**\n * A utility function to trim out excess context lines from a patch file.  It\n * will maintain line numbers, and properly update the hunk context markers, as\n * well as be able to create new hunks where necessary if there's excessive\n * context between changes\n */\nexport function trimPatchContext(patch: string, contextSize = 10): string {\n  const lines: string[] = [];\n\n  let currentHunk: CurrentHunk | undefined;\n  for (const line of patch.split('\\n')) {\n    const parsedHunkHeader = line.match(HUNK_HEADER);\n    // If we've come across a new hunk boundary, then we should close out the\n    // current hunk and setup a new one\n    if (parsedHunkHeader != null) {\n      if (currentHunk != null) {\n        if (currentHunk.hunkLines.length > 0) {\n          flushContextLines(currentHunk, contextSize);\n          flushHunk(currentHunk, lines);\n        }\n        currentHunk = undefined;\n      }\n\n      const additionStart = parseInt(parsedHunkHeader[3]);\n      const deletionStart = parseInt(parsedHunkHeader[1]);\n      const additionCount = parseInt(parsedHunkHeader[4] ?? '1');\n      const deletionCount = parseInt(parsedHunkHeader[2] ?? '1');\n\n      // If we can't parse valid numbers out of the hunk header\n      // lets just skip the hunk altogether\n      if (\n        isNaN(additionStart) ||\n        isNaN(deletionStart) ||\n        isNaN(additionCount) ||\n        isNaN(deletionCount)\n      ) {\n        lines.push(line);\n      } else {\n        currentHunk = {\n          hunkContextString: parsedHunkHeader[5] ?? '',\n          additionStart,\n          deletionStart,\n          additionCount: 0,\n          deletionCount: 0,\n          hunkLines: [],\n          contextLines: [],\n        };\n      }\n      continue;\n    }\n\n    // If we don't have a current hunk, then we should just assume this is\n    // general metadata\n    if (currentHunk == null) {\n      lines.push(line);\n      continue;\n    }\n\n    // If we are dealing with a context line...\n    if (line.startsWith(' ')) {\n      currentHunk.contextLines.push(line);\n      // If we've exceeded double our context window size + 1, that means we\n      // should create a new hunk...\n      if (\n        currentHunk.hunkLines.length > 0 &&\n        currentHunk.contextLines.length === contextSize * 2 + 1\n      ) {\n        const removedItems = currentHunk.contextLines.slice(contextSize);\n        flushContextLines(currentHunk, contextSize);\n        const {\n          additionCount: emittedAdditionCount,\n          deletionCount: emittedDeletionCount,\n        } = currentHunk;\n        flushHunk(currentHunk, lines);\n\n        removedItems.shift();\n        currentHunk = {\n          // NOTE(amadeus): Not sure there's an easy way to manage this context\n          // string stuff, so lets just remove it from auto generated hunks\n          hunkContextString: '',\n          additionStart: currentHunk.additionStart + emittedAdditionCount + 1,\n          deletionStart: currentHunk.deletionStart + emittedDeletionCount + 1,\n          deletionCount: 0,\n          additionCount: 0,\n          contextLines: removedItems,\n          hunkLines: [],\n        };\n      }\n    } else if (line !== '') {\n      flushContextLines(currentHunk, contextSize);\n      currentHunk.hunkLines.push(line);\n      if (line.startsWith('+')) {\n        currentHunk.additionCount += 1;\n      } else if (line.startsWith('-')) {\n        currentHunk.deletionCount += 1;\n      }\n    }\n  }\n\n  if (currentHunk != null && currentHunk.hunkLines.length > 0) {\n    flushContextLines(currentHunk, contextSize);\n    flushHunk(currentHunk, lines);\n  }\n\n  return lines.join('\\n');\n}\n\nfunction flushContextLines(hunk: CurrentHunk, contextSize: number) {\n  if (hunk.contextLines.length > contextSize) {\n    // If this context group is at the beginning of the hunk, truncate from the\n    // beginning\n    if (hunk.hunkLines.length === 0) {\n      const difference = hunk.contextLines.length - contextSize;\n      hunk.contextLines.splice(0, difference);\n      hunk.additionStart += difference;\n      hunk.deletionStart += difference;\n    }\n    // Otherwise truncate from the end\n    else {\n      hunk.contextLines.length = contextSize;\n    }\n  }\n  if (hunk.contextLines.length > 0) {\n    hunk.hunkLines.push(...hunk.contextLines);\n    hunk.additionCount += hunk.contextLines.length;\n    hunk.deletionCount += hunk.contextLines.length;\n    hunk.contextLines.length = 0;\n  }\n  return hunk;\n}\n\nfunction flushHunk(hunk: CurrentHunk, lines: string[]) {\n  lines.push(\n    `@@ -${formatHunkRange(hunk.deletionStart, hunk.deletionCount)} +${formatHunkRange(hunk.additionStart, hunk.additionCount)} @@${hunk.hunkContextString !== '' ? ` ${hunk.hunkContextString}` : ''}`\n  );\n  lines.push(...hunk.hunkLines);\n}\n\nfunction formatHunkRange(start: number, count: number): string {\n  return count === 1 ? `${start}` : `${start},${count}`;\n}\n"],"mappings":";;;;;;;;;AAkBA,SAAgB,iBAAiB,OAAe,cAAc,IAAY;CACxE,MAAMA,QAAkB,EAAE;CAE1B,IAAIC;AACJ,MAAK,MAAM,QAAQ,MAAM,MAAM,KAAK,EAAE;EACpC,MAAM,mBAAmB,KAAK,MAAM,YAAY;AAGhD,MAAI,oBAAoB,MAAM;AAC5B,OAAI,eAAe,MAAM;AACvB,QAAI,YAAY,UAAU,SAAS,GAAG;AACpC,uBAAkB,aAAa,YAAY;AAC3C,eAAU,aAAa,MAAM;;AAE/B,kBAAc;;GAGhB,MAAM,gBAAgB,SAAS,iBAAiB,GAAG;GACnD,MAAM,gBAAgB,SAAS,iBAAiB,GAAG;GACnD,MAAM,gBAAgB,SAAS,iBAAiB,MAAM,IAAI;GAC1D,MAAM,gBAAgB,SAAS,iBAAiB,MAAM,IAAI;AAI1D,OACE,MAAM,cAAc,IACpB,MAAM,cAAc,IACpB,MAAM,cAAc,IACpB,MAAM,cAAc,CAEpB,OAAM,KAAK,KAAK;OAEhB,eAAc;IACZ,mBAAmB,iBAAiB,MAAM;IAC1C;IACA;IACA,eAAe;IACf,eAAe;IACf,WAAW,EAAE;IACb,cAAc,EAAE;IACjB;AAEH;;AAKF,MAAI,eAAe,MAAM;AACvB,SAAM,KAAK,KAAK;AAChB;;AAIF,MAAI,KAAK,WAAW,IAAI,EAAE;AACxB,eAAY,aAAa,KAAK,KAAK;AAGnC,OACE,YAAY,UAAU,SAAS,KAC/B,YAAY,aAAa,WAAW,cAAc,IAAI,GACtD;IACA,MAAM,eAAe,YAAY,aAAa,MAAM,YAAY;AAChE,sBAAkB,aAAa,YAAY;IAC3C,MAAM,EACJ,eAAe,sBACf,eAAe,yBACb;AACJ,cAAU,aAAa,MAAM;AAE7B,iBAAa,OAAO;AACpB,kBAAc;KAGZ,mBAAmB;KACnB,eAAe,YAAY,gBAAgB,uBAAuB;KAClE,eAAe,YAAY,gBAAgB,uBAAuB;KAClE,eAAe;KACf,eAAe;KACf,cAAc;KACd,WAAW,EAAE;KACd;;aAEM,SAAS,IAAI;AACtB,qBAAkB,aAAa,YAAY;AAC3C,eAAY,UAAU,KAAK,KAAK;AAChC,OAAI,KAAK,WAAW,IAAI,CACtB,aAAY,iBAAiB;YACpB,KAAK,WAAW,IAAI,CAC7B,aAAY,iBAAiB;;;AAKnC,KAAI,eAAe,QAAQ,YAAY,UAAU,SAAS,GAAG;AAC3D,oBAAkB,aAAa,YAAY;AAC3C,YAAU,aAAa,MAAM;;AAG/B,QAAO,MAAM,KAAK,KAAK;;AAGzB,SAAS,kBAAkB,MAAmB,aAAqB;AACjE,KAAI,KAAK,aAAa,SAAS,YAG7B,KAAI,KAAK,UAAU,WAAW,GAAG;EAC/B,MAAM,aAAa,KAAK,aAAa,SAAS;AAC9C,OAAK,aAAa,OAAO,GAAG,WAAW;AACvC,OAAK,iBAAiB;AACtB,OAAK,iBAAiB;OAItB,MAAK,aAAa,SAAS;AAG/B,KAAI,KAAK,aAAa,SAAS,GAAG;AAChC,OAAK,UAAU,KAAK,GAAG,KAAK,aAAa;AACzC,OAAK,iBAAiB,KAAK,aAAa;AACxC,OAAK,iBAAiB,KAAK,aAAa;AACxC,OAAK,aAAa,SAAS;;AAE7B,QAAO;;AAGT,SAAS,UAAU,MAAmB,OAAiB;AACrD,OAAM,KACJ,OAAO,gBAAgB,KAAK,eAAe,KAAK,cAAc,CAAC,IAAI,gBAAgB,KAAK,eAAe,KAAK,cAAc,CAAC,KAAK,KAAK,sBAAsB,KAAK,IAAI,KAAK,sBAAsB,KAChM;AACD,OAAM,KAAK,GAAG,KAAK,UAAU;;AAG/B,SAAS,gBAAgB,OAAe,OAAuB;AAC7D,QAAO,UAAU,IAAI,GAAG,UAAU,GAAG,MAAM,GAAG"}

package/dist/worker/WorkerPoolManager.d.ts

@@ -57,19 +57,19 @@ declare class WorkerPoolManager {
   private initializeWorkers;
   private drainQueue;
   highlightFileAST(instance: FileRendererInstance, file: FileContents): void;
-  getPlainFileAST(file: FileContents): ThemedFileResult | undefined;
+  getPlainFileAST(file: FileContents, startingLine: number, totalLines: number, lines?: string[]): ThemedFileResult | undefined;
   highlightDiffAST(instance: DiffRendererInstance, diff: FileDiffMetadata): void;
-  getPlainDiffAST(diff: FileDiffMetadata, startingLine: number, totalLines: number, expandedHunks?: Map<number, HunkExpansionRegion> | true): ThemedDiffResult | undefined;
+  getPlainDiffAST(diff: FileDiffMetadata, startingLine: number, totalLines: number, expandedHunks?: Map<number, HunkExpansionRegion> | true, collapsedContextThreshold?: number): ThemedDiffResult | undefined;
   terminate(): void;
   private terminateWorkers;
   getStats(): WorkerStats;
   private submitTask;
-  private submitTask;
   private resolveLanguagesAndExecuteTask;
   private handleWorkerMessage;
   private _queuedDrain;
   private queueDrain;
   private assignWorkerToTask;
+  private clearWorkerTask;
   private executeTask;
   private getAvailableWorker;
   private generateRequestId;

package/dist/worker/WorkerPoolManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerPoolManager.d.ts","names":["options: WorkerPoolOptions"],"sources":["../../src/worker/WorkerPoolManager.ts"],"sourcesContent":[],"mappings":";;;;;UAqDU,eAAA;aACG,SAAA,CAAU,eAAe;EAL/B,SAIG,EAEG,SAAA,CAAU,MAFb,CAAA,MAAA,EAE4B,gBAF5B,CAAA;;UAYA,eAAA,CAXa;EACe,QAAA,EAAA,EAAA,IAAA;;AAAf,cAcV,iBAAA,CAdU;EAAA,QAUb,OAAA;EAIV,QAAa,WAAA;EAoBQ,QAAA,aAAA;EAEf,QAAA,WAAA;EACA,QAAA,OAAA;EACA,QAAA,SAAA;EACA,QAAA,YAAA;EACC,QAAA,aAAA;EAYoB,QAAA,gBAAA;EAAe,QAAA,aAAA;EAMf,QAAA,kBAAA;EAAmB,QAAA,eAAA;EAM3B,QAAA,SAAA;EAsBf,QAAA,SAAA;EACA,QAAA,gBAAA;EACA,WAAA,CAAA,OAAA,EAtDiB,iBAsDjB,EAAA;IAAA,KAAA;IAAA,KAAA;IAAA,YAAA;IAAA;EAAA,CAAA,EAhDG,iCAgDH;EACS,aAAA,CAAA,CAAA,EAAA,OAAA;EAAR,kBAAA,CAAA,IAAA,EArCsB,YAqCtB,CAAA,EArCqC,gBAqCrC,GAAA,SAAA;EAAkC,kBAAA,CAAA,IAAA,EA/BZ,gBA+BY,CAAA,EA/BO,gBA+BP,GAAA,SAAA;EAoDb,aAAA,CAAA,CAAA,EA7EP,eA6EO;EAKA,kBAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAiDU,kBAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EASE,gBAAA,CAAA;IAAA,KAAA;IAAA,YAAA;IAAA;EAAA,CAAA,EAnHjC,OAmHiC,CAnHzB,sBAmHyB,CAAA,CAAA,EAnHC,OAmHD,CAAA,IAAA,CAAA;EAMhB,oBAAA,CAAA,CAAA,EArEI,iBAqEJ;EA0BR,oBAAA,CAAA,CAAA,EA1FY,iBA0FZ;EAAuB,QAAA,yBAAA;EAoBP,uBAAA,CAAA,QAAA,EA7DM,eA6DN,CAAA,EAAA,GAAA,GAAA,IAAA;EAA4B,yBAAA,CAAA,QAAA,EApDpB,eAoDoB,CAAA,EAAA,IAAA;EAoI7B,sBAAA,CAAA,QAAA,EAAA,CAAA,KAAA,EAlLP,WAkLO,EAAA,GAAA,OAAA,CAAA,EAAA,GAAA,GAAA,IAAA;EAA4B,QAAA,0BAAA;EAoBjC,QAAA,sBAAA;EAAe,mBAAA,CAAA,QAAA,EA5KzB,oBA4KyB,GA5KF,oBA4KE,CAAA,EAAA,IAAA;EAczB,aAAA,CAAA,CAAA,EAAA,OAAA;EACJ,UAAA,CAAA,SAAA,CAAA,EAvKoB,kBAuKpB,EAAA,CAAA,EAvKgD,OAuKhD,CAAA,IAAA,CAAA;EAsBA,QAAA,iBAAA;EAGsB,QAAA,UAAA;EAAZ,gBAAA,CAAA,QAAA,EA5DS,oBA4DT,EAAA,IAAA,EA5DqC,YA4DrC,CAAA,EAAA,IAAA;EACf,eAAA,CAAA,IAAA,EAzCmB,YAyCnB,CAAA,EAzCkC,gBAyClC,GAAA,SAAA;EA+BS,gBAAA,CAAA,QAAA,EA1DA,oBA0DA,EAAA,IAAA,EAzDJ,gBAyDI,CAAA,EAAA,IAAA;EAAA,eAAA,CAAA,IAAA,EAnCJ,gBAmCI,EAAA,YAAA,EAAA,MAAA,EAAA,UAAA,EAAA,MAAA,EAAA,aAAA,CAAA,EAhCM,GAgCN,CAAA,MAAA,EAhCkB,mBAgClB,CAAA,GAAA,IAAA,CAAA,EA/BT,gBA+BS,GAAA,SAAA;;;cAAA"}
+{"version":3,"file":"WorkerPoolManager.d.ts","names":["LRUMapPkg","FileContents","FileDiffMetadata","HunkExpansionRegion","RenderDiffOptions","RenderDiffResult","RenderFileOptions","RenderFileResult","SupportedLanguages","ThemedDiffResult","ThemedFileResult","DiffRendererInstance","FileRendererInstance","WorkerInitializationRenderOptions","WorkerPoolOptions","WorkerRenderingOptions","WorkerStats","GetCachesResult","LRUMap","ThemeSubscriber","WorkerPoolManager","langs","theme","lineDiffType","tokenizeMaxLineLength","Partial","Promise","Map"],"sources":["../../src/worker/WorkerPoolManager.d.ts"],"sourcesContent":["import LRUMapPkg from 'lru_map';\nimport type { FileContents, FileDiffMetadata, HunkExpansionRegion, RenderDiffOptions, RenderDiffResult, RenderFileOptions, RenderFileResult, SupportedLanguages, ThemedDiffResult, ThemedFileResult } from '../types';\nimport type { DiffRendererInstance, FileRendererInstance, WorkerInitializationRenderOptions, WorkerPoolOptions, WorkerRenderingOptions, WorkerStats } from './types';\ninterface GetCachesResult {\n    fileCache: LRUMapPkg.LRUMap<string, RenderFileResult>;\n    diffCache: LRUMapPkg.LRUMap<string, RenderDiffResult>;\n}\ninterface ThemeSubscriber {\n    rerender(): void;\n}\nexport declare class WorkerPoolManager {\n    private options;\n    private highlighter;\n    private renderOptions;\n    private initialized;\n    private workers;\n    private taskQueue;\n    private pendingTasks;\n    private nextRequestId;\n    private themeSubscribers;\n    private workersFailed;\n    private instanceRequestMap;\n    private statSubscribers;\n    private fileCache;\n    private diffCache;\n    private _queuedBroadcast;\n    constructor(options: WorkerPoolOptions, { langs, theme, lineDiffType, tokenizeMaxLineLength }: WorkerInitializationRenderOptions);\n    isWorkingPool(): boolean;\n    getFileResultCache(file: FileContents): RenderFileResult | undefined;\n    getDiffResultCache(diff: FileDiffMetadata): RenderDiffResult | undefined;\n    inspectCaches(): GetCachesResult;\n    evictFileFromCache(cacheKey: string): boolean;\n    evictDiffFromCache(cacheKey: string): boolean;\n    setRenderOptions({ theme, lineDiffType, tokenizeMaxLineLength }: Partial<WorkerRenderingOptions>): Promise<void>;\n    getFileRenderOptions(): RenderFileOptions;\n    getDiffRenderOptions(): RenderDiffOptions;\n    private setRenderOptionsOnWorkers;\n    subscribeToThemeChanges(instance: ThemeSubscriber): () => void;\n    unsubscribeToThemeChanges(instance: ThemeSubscriber): void;\n    subscribeToStatChanges(callback: (stats: WorkerStats) => unknown): () => void;\n    private queueBroadcastStateChanges;\n    private _broadcastStateChanges;\n    cleanUpPendingTasks(instance: FileRendererInstance | DiffRendererInstance): void;\n    isInitialized(): boolean;\n    initialize(languages?: SupportedLanguages[]): Promise<void>;\n    private initializeWorkers;\n    private drainQueue;\n    highlightFileAST(instance: FileRendererInstance, file: FileContents): void;\n    getPlainFileAST(file: FileContents, startingLine: number, totalLines: number, lines?: string[]): ThemedFileResult | undefined;\n    highlightDiffAST(instance: DiffRendererInstance, diff: FileDiffMetadata): void;\n    getPlainDiffAST(diff: FileDiffMetadata, startingLine: number, totalLines: number, expandedHunks?: Map<number, HunkExpansionRegion> | true, collapsedContextThreshold?: number): ThemedDiffResult | undefined;\n    terminate(): void;\n    private terminateWorkers;\n    getStats(): WorkerStats;\n    private submitTask;\n    private resolveLanguagesAndExecuteTask;\n    private handleWorkerMessage;\n    private _queuedDrain;\n    private queueDrain;\n    private assignWorkerToTask;\n    private clearWorkerTask;\n    private executeTask;\n    private getAvailableWorker;\n    private generateRequestId;\n}\nexport {};\n//# sourceMappingURL=WorkerPoolManager.d.ts.map"],"mappings":"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"}

package/dist/worker/WorkerPoolManager.js

@@ -22,7 +22,7 @@ var WorkerPoolManager = class {
 	renderOptions;
 	initialized = false;
 	workers = [];
-	taskQueue = [];
+	taskQueue = /* @__PURE__ */ new Map();
 	pendingTasks = /* @__PURE__ */ new Map();
 	nextRequestId = 0;
 	themeSubscribers = /* @__PURE__ */ new Set();
@@ -173,11 +173,12 @@ var WorkerPoolManager = class {
 		for (const callback of this.statSubscribers) callback(stats);
 	};
 	cleanUpPendingTasks(instance) {
-		this.taskQueue = this.taskQueue.filter((task) => {
-			if ("instance" in task) return task.instance !== instance;
-			return true;
-		});
-		for (const [id, task] of Array.from(this.pendingTasks)) if ("instance" in task && task.instance === instance) this.pendingTasks.delete(id);
+		this.taskQueue.delete(instance);
+		const requestId = this.instanceRequestMap.get(instance);
+		if (requestId != null) {
+			this.pendingTasks.delete(requestId);
+			this.instanceRequestMap.delete(instance);
+		}
 		this.queueBroadcastStateChanges();
 	}
 	isInitialized() {
@@ -266,14 +267,13 @@ var WorkerPoolManager = class {
 	}
 	drainQueue = () => {
 		this._queuedDrain = void 0;
-		if (this.initialized !== true || this.taskQueue.length === 0) return;
-		while (this.taskQueue.length > 0) {
-			const task = this.taskQueue[0];
+		if (this.initialized !== true || this.taskQueue.size === 0) return;
+		for (const [instance, task] of this.taskQueue) {
+			if (this.instanceRequestMap.has(instance)) continue;
 			const langs = getLangsFromTask(task);
 			const availableWorker = this.getAvailableWorker(langs);
 			if (availableWorker == null) break;
 			this.assignWorkerToTask(task, availableWorker);
-			this.taskQueue.shift();
 			this.resolveLanguagesAndExecuteTask(availableWorker, task, langs);
 		}
 		this.queueBroadcastStateChanges();
@@ -286,12 +286,17 @@ var WorkerPoolManager = class {
 			file
 		});
 	}
-	getPlainFileAST(file) {
+	getPlainFileAST(file, startingLine, totalLines, lines) {
 		if (this.highlighter == null) {
 			this.initialize();
 			return;
 		}
-		return renderFileWithHighlighter(file, this.highlighter, this.renderOptions, true);
+		return renderFileWithHighlighter(file, this.highlighter, this.renderOptions, {
+			forcePlainText: true,
+			startingLine,
+			totalLines,
+			lines
+		});
 	}
 	highlightDiffAST(instance, diff) {
 		if ((diff.lang ?? getFiletypeFromFileName(diff.name)) === "text") return;
@@ -301,12 +306,13 @@ var WorkerPoolManager = class {
 			diff
 		});
 	}
-	getPlainDiffAST(diff, startingLine, totalLines, expandedHunks) {
+	getPlainDiffAST(diff, startingLine, totalLines, expandedHunks, collapsedContextThreshold) {
 		return this.highlighter != null ? renderDiffWithHighlighter(diff, this.highlighter, this.renderOptions, {
 			forcePlainText: true,
 			startingLine,
 			totalLines,
-			expandedHunks
+			expandedHunks,
+			collapsedContextThreshold
 		}) : void 0;
 	}
 	terminate() {
@@ -314,7 +320,7 @@ var WorkerPoolManager = class {
 		this.fileCache.clear();
 		this.diffCache.clear();
 		this.instanceRequestMap.clear();
-		this.taskQueue.length = 0;
+		this.taskQueue.clear();
 		this.pendingTasks.clear();
 		this.highlighter = void 0;
 		this.initialized = false;
@@ -335,7 +341,7 @@ var WorkerPoolManager = class {
 			totalWorkers: this.workers.length,
 			workersFailed: this.workersFailed,
 			busyWorkers: this.workers.filter((w) => w.request_id != null).length,
-			queuedTasks: this.taskQueue.length,
+			queuedTasks: this.taskQueue.size,
 			pendingTasks: this.pendingTasks.size,
 			themeSubscribers: this.themeSubscribers.size,
 			fileCacheSize: this.fileCache.size,
@@ -370,17 +376,18 @@ var WorkerPoolManager = class {
 				};
 			}
 		})();
-		this.instanceRequestMap.set(instance, id);
-		this.taskQueue.push(task);
+		this.taskQueue.set(instance, task);
 		this.queueDrain();
 	}
 	async resolveLanguagesAndExecuteTask(availableWorker, task, langs) {
-		if (task.type === "file" || task.type === "diff") {
+		try {
 			const workerMissingLangs = langs.filter((lang) => !availableWorker.langs.has(lang));
 			if (workerMissingLangs.length > 0) if (hasResolvedLanguages(workerMissingLangs)) task.request.resolvedLanguages = getResolvedLanguages(workerMissingLangs);
 			else task.request.resolvedLanguages = await resolveLanguages(workerMissingLangs);
+			this.executeTask(availableWorker, task);
+		} catch {
+			this.clearWorkerTask(task, availableWorker);
 		}
-		this.executeTask(availableWorker, task);
 	}
 	handleWorkerMessage(managedWorker, response) {
 		const task = this.pendingTasks.get(response.id);
@@ -430,11 +437,9 @@ var WorkerPoolManager = class {
 		} catch (error) {
 			if (error !== IGNORE_RESPONSE) console.error(error, task, response);
 		}
-		if (task != null && "instance" in task && this.instanceRequestMap.get(task.instance) === response.id) this.instanceRequestMap.delete(task.instance);
-		this.pendingTasks.delete(response.id);
-		managedWorker.request_id = void 0;
+		if (task != null) this.clearWorkerTask(task, managedWorker);
 		this.queueBroadcastStateChanges();
-		if (this.taskQueue.length > 0) this.queueDrain();
+		if (this.taskQueue.size > 0) this.queueDrain();
 	}
 	_queuedDrain;
 	queueDrain() {
@@ -444,16 +449,24 @@ var WorkerPoolManager = class {
 	}
 	assignWorkerToTask(task, managedWorker) {
 		managedWorker.request_id = task.id;
+		if ("instance" in task) {
+			this.taskQueue.delete(task.instance);
+			this.instanceRequestMap.set(task.instance, task.id);
+		}
 		this.pendingTasks.set(task.id, task);
 	}
+	clearWorkerTask(task, managedWorker) {
+		managedWorker.request_id = void 0;
+		if ("instance" in task) this.instanceRequestMap.delete(task.instance);
+		this.pendingTasks.delete(task.id);
+	}
 	executeTask(managedWorker, task) {
 		this.assignWorkerToTask(task, managedWorker);
 		for (const lang of getLangsFromTask(task)) managedWorker.langs.add(lang);
 		try {
 			managedWorker.worker.postMessage(task.request);
 		} catch (error) {
-			managedWorker.request_id = void 0;
-			this.pendingTasks.delete(task.id);
+			this.clearWorkerTask(task, managedWorker);
 			console.error("Failed to post message to worker:", error);
 			if ("instance" in task) task.instance.onHighlightError(error);
 			else if ("reject" in task) task.reject(error);