@pierre/diffs 1.5.2 → 1.6.0

package/dist/utils/getHighlighterThemeStyles.js

@@ -6,7 +6,7 @@ function getHighlighterThemeStyles({ theme = DEFAULT_THEMES, highlighter, prefix
 	let styles = "";
 	if (typeof theme === "string") {
 		const themeData = highlighter.getTheme(theme);
-		const normalized = normalizeThemeColors(themeData);
+		const normalized = getThemeColors(themeData, highlighter);
 		styles += `color:${normalized.fg};`;
 		styles += `background-color:${normalized.bg};`;
 		styles += `${formatCSSVariablePrefix("global")}fg:${normalized.fg};`;
@@ -14,18 +14,28 @@ function getHighlighterThemeStyles({ theme = DEFAULT_THEMES, highlighter, prefix
 		styles += getGitVariables(themeData, prefix);
 	} else {
 		let themeData = highlighter.getTheme(theme.dark);
-		let normalized = normalizeThemeColors(themeData);
+		let normalized = getThemeColors(themeData, highlighter);
 		styles += `${formatCSSVariablePrefix("global")}dark:${normalized.fg};`;
 		styles += `${formatCSSVariablePrefix("global")}dark-bg:${normalized.bg};`;
 		styles += getGitVariables(themeData, "dark");
 		themeData = highlighter.getTheme(theme.light);
-		normalized = normalizeThemeColors(themeData);
+		normalized = getThemeColors(themeData, highlighter);
 		styles += `${formatCSSVariablePrefix("global")}light:${normalized.fg};`;
 		styles += `${formatCSSVariablePrefix("global")}light-bg:${normalized.bg};`;
 		styles += getGitVariables(themeData, "light");
 	}
 	return styles;
 }
+function getThemeColors(theme, highlighter) {
+	if (highlighter.name === "highlights" && theme.zed?.cssVariables === true) {
+		const prefix = formatCSSVariablePrefix("token");
+		return {
+			fg: `var(${prefix}foreground)`,
+			bg: `var(${prefix}background)`
+		};
+	}
+	return normalizeThemeColors(theme);
+}
 function getGitVariables(themeData, modePrefix) {
 	modePrefix = modePrefix != null ? `${modePrefix}-` : "";
 	let styles = "";

package/dist/utils/getHighlighterThemeStyles.js.map

@@ -1 +1 @@
-{"version":3,"file":"getHighlighterThemeStyles.js","names":[],"sources":["../../src/utils/getHighlighterThemeStyles.ts"],"sourcesContent":["import { normalizeThemeColors } from '@pierre/theming/color';\n\nimport { DEFAULT_THEMES } from '../constants';\nimport type {\n  DiffsHighlighter,\n  DiffsThemeNames,\n  ThemeRegistrationResolved,\n  ThemesType,\n} from '../types';\nimport { formatCSSVariablePrefix } from './formatCSSVariablePrefix';\n\ninterface GetHighlighterThemeStylesProps {\n  theme?: DiffsThemeNames | ThemesType;\n  highlighter: DiffsHighlighter;\n  prefix?: string;\n}\n\n// FIXME(amadeus): We'll probably need to\n// re-think this when it comes to removing inline\n// styles\n//\n// The base foreground/background now flow through @pierre/theming's\n// normalizeThemeColors, which preserves the theme's top-level fg/bg. The git\n// colors deliberately stay on the diffs-local 2-link lookup below (see\n// getGitVariables) to keep this output byte-identical; adopting\n// normalizeThemeColors' longer git chain is a separate, independently verified\n// follow-up rather than a side effect of this migration.\nexport function getHighlighterThemeStyles({\n  theme = DEFAULT_THEMES,\n  highlighter,\n  prefix,\n}: GetHighlighterThemeStylesProps): string {\n  let styles = '';\n  if (typeof theme === 'string') {\n    const themeData = highlighter.getTheme(theme);\n    const normalized = normalizeThemeColors(themeData);\n    styles += `color:${normalized.fg};`;\n    styles += `background-color:${normalized.bg};`;\n    styles += `${formatCSSVariablePrefix('global')}fg:${normalized.fg};`;\n    styles += `${formatCSSVariablePrefix('global')}bg:${normalized.bg};`;\n    styles += getGitVariables(themeData, prefix);\n  } else {\n    let themeData = highlighter.getTheme(theme.dark);\n    let normalized = normalizeThemeColors(themeData);\n    styles += `${formatCSSVariablePrefix('global')}dark:${normalized.fg};`;\n    styles += `${formatCSSVariablePrefix('global')}dark-bg:${normalized.bg};`;\n    styles += getGitVariables(themeData, 'dark');\n\n    themeData = highlighter.getTheme(theme.light);\n    normalized = normalizeThemeColors(themeData);\n    styles += `${formatCSSVariablePrefix('global')}light:${normalized.fg};`;\n    styles += `${formatCSSVariablePrefix('global')}light-bg:${normalized.bg};`;\n    styles += getGitVariables(themeData, 'light');\n  }\n  return styles;\n}\n\n// Emits the diffs git-status CSS variables (addition/deletion/modified colors)\n// for a resolved theme. This intentionally uses the diffs-local 2-link lookup\n// (gitDecoration.* → terminal.ansi*) and STOPS before the editorGutter.* tail\n// that @pierre/theming's normalizeThemeColors adds, so the emitted string stays\n// byte-identical to the pre-theming output. Adopting the gutter fallback for\n// diffs is a deliberate follow-up. A variable is omitted entirely when neither\n// source key is present, matching the previous behavior.\nfunction getGitVariables(\n  themeData: ThemeRegistrationResolved,\n  modePrefix?: string\n) {\n  modePrefix = modePrefix != null ? `${modePrefix}-` : '';\n  let styles = '';\n  const additionGreen =\n    themeData.colors?.['gitDecoration.addedResourceForeground'] ??\n    themeData.colors?.['terminal.ansiGreen'];\n  if (additionGreen != null) {\n    styles += `${formatCSSVariablePrefix('global')}${modePrefix}addition-color:${additionGreen};`;\n  }\n  const deletionRed =\n    themeData.colors?.['gitDecoration.deletedResourceForeground'] ??\n    themeData.colors?.['terminal.ansiRed'];\n  if (deletionRed != null) {\n    styles += `${formatCSSVariablePrefix('global')}${modePrefix}deletion-color:${deletionRed};`;\n  }\n  const modifiedBlue =\n    themeData.colors?.['gitDecoration.modifiedResourceForeground'] ??\n    themeData.colors?.['terminal.ansiBlue'];\n  if (modifiedBlue != null) {\n    styles += `${formatCSSVariablePrefix('global')}${modePrefix}modified-color:${modifiedBlue};`;\n  }\n  return styles;\n}\n"],"mappings":";;;;AA2BA,SAAgB,0BAA0B,EACxC,QAAQ,gBACR,aACA,UACyC;CACzC,IAAI,SAAS;CACb,IAAI,OAAO,UAAU,UAAU;EAC7B,MAAM,YAAY,YAAY,SAAS,KAAK;EAC5C,MAAM,aAAa,qBAAqB,SAAS;EACjD,UAAU,SAAS,WAAW,GAAG;EACjC,UAAU,oBAAoB,WAAW,GAAG;EAC5C,UAAU,GAAG,wBAAwB,QAAQ,EAAE,KAAK,WAAW,GAAG;EAClE,UAAU,GAAG,wBAAwB,QAAQ,EAAE,KAAK,WAAW,GAAG;EAClE,UAAU,gBAAgB,WAAW,MAAM;CAC7C,OAAO;EACL,IAAI,YAAY,YAAY,SAAS,MAAM,IAAI;EAC/C,IAAI,aAAa,qBAAqB,SAAS;EAC/C,UAAU,GAAG,wBAAwB,QAAQ,EAAE,OAAO,WAAW,GAAG;EACpE,UAAU,GAAG,wBAAwB,QAAQ,EAAE,UAAU,WAAW,GAAG;EACvE,UAAU,gBAAgB,WAAW,MAAM;EAE3C,YAAY,YAAY,SAAS,MAAM,KAAK;EAC5C,aAAa,qBAAqB,SAAS;EAC3C,UAAU,GAAG,wBAAwB,QAAQ,EAAE,QAAQ,WAAW,GAAG;EACrE,UAAU,GAAG,wBAAwB,QAAQ,EAAE,WAAW,WAAW,GAAG;EACxE,UAAU,gBAAgB,WAAW,OAAO;CAC9C;CACA,OAAO;AACT;AASA,SAAS,gBACP,WACA,YACA;CACA,aAAa,cAAc,OAAO,GAAG,WAAW,KAAK;CACrD,IAAI,SAAS;CACb,MAAM,gBACJ,UAAU,SAAS,4CACnB,UAAU,SAAS;CACrB,IAAI,iBAAiB,MACnB,UAAU,GAAG,wBAAwB,QAAQ,IAAI,WAAW,iBAAiB,cAAc;CAE7F,MAAM,cACJ,UAAU,SAAS,8CACnB,UAAU,SAAS;CACrB,IAAI,eAAe,MACjB,UAAU,GAAG,wBAAwB,QAAQ,IAAI,WAAW,iBAAiB,YAAY;CAE3F,MAAM,eACJ,UAAU,SAAS,+CACnB,UAAU,SAAS;CACrB,IAAI,gBAAgB,MAClB,UAAU,GAAG,wBAAwB,QAAQ,IAAI,WAAW,iBAAiB,aAAa;CAE5F,OAAO;AACT"}
+{"version":3,"file":"getHighlighterThemeStyles.js","names":[],"sources":["../../src/utils/getHighlighterThemeStyles.ts"],"sourcesContent":["import { normalizeThemeColors } from '@pierre/theming/color';\n\nimport { DEFAULT_THEMES } from '../constants';\nimport type {\n  DiffsHighlighter,\n  DiffsTheme,\n  DiffsThemeNames,\n  ThemesType,\n} from '../types';\nimport { formatCSSVariablePrefix } from './formatCSSVariablePrefix';\n\ninterface GetHighlighterThemeStylesProps {\n  theme?: DiffsThemeNames | ThemesType;\n  highlighter: DiffsHighlighter;\n  prefix?: string;\n}\n\nexport function getHighlighterThemeStyles({\n  theme = DEFAULT_THEMES,\n  highlighter,\n  prefix,\n}: GetHighlighterThemeStylesProps): string {\n  let styles = '';\n  if (typeof theme === 'string') {\n    const themeData = highlighter.getTheme(theme);\n    const normalized = getThemeColors(themeData, highlighter);\n    styles += `color:${normalized.fg};`;\n    styles += `background-color:${normalized.bg};`;\n    styles += `${formatCSSVariablePrefix('global')}fg:${normalized.fg};`;\n    styles += `${formatCSSVariablePrefix('global')}bg:${normalized.bg};`;\n    styles += getGitVariables(themeData, prefix);\n  } else {\n    let themeData = highlighter.getTheme(theme.dark);\n    let normalized = getThemeColors(themeData, highlighter);\n    styles += `${formatCSSVariablePrefix('global')}dark:${normalized.fg};`;\n    styles += `${formatCSSVariablePrefix('global')}dark-bg:${normalized.bg};`;\n    styles += getGitVariables(themeData, 'dark');\n\n    themeData = highlighter.getTheme(theme.light);\n    normalized = getThemeColors(themeData, highlighter);\n    styles += `${formatCSSVariablePrefix('global')}light:${normalized.fg};`;\n    styles += `${formatCSSVariablePrefix('global')}light-bg:${normalized.bg};`;\n    styles += getGitVariables(themeData, 'light');\n  }\n  return styles;\n}\n\n// cssVariables: true must use the same prefix for backgrounds and tokens.\n// Object palettes already include their configured prefix and defaults.\nfunction getThemeColors(theme: DiffsTheme, highlighter: DiffsHighlighter) {\n  if (highlighter.name === 'highlights' && theme.zed?.cssVariables === true) {\n    const prefix = formatCSSVariablePrefix('token');\n    return { fg: `var(${prefix}foreground)`, bg: `var(${prefix}background)` };\n  }\n  return normalizeThemeColors(theme);\n}\n\n// Keep the gitDecoration → terminal.ansi fallback; adding editorGutter colors\n// here would change diff backgrounds for existing themes.\nfunction getGitVariables(themeData: DiffsTheme, modePrefix?: string) {\n  modePrefix = modePrefix != null ? `${modePrefix}-` : '';\n  let styles = '';\n  const additionGreen =\n    themeData.colors?.['gitDecoration.addedResourceForeground'] ??\n    themeData.colors?.['terminal.ansiGreen'];\n  if (additionGreen != null) {\n    styles += `${formatCSSVariablePrefix('global')}${modePrefix}addition-color:${additionGreen};`;\n  }\n  const deletionRed =\n    themeData.colors?.['gitDecoration.deletedResourceForeground'] ??\n    themeData.colors?.['terminal.ansiRed'];\n  if (deletionRed != null) {\n    styles += `${formatCSSVariablePrefix('global')}${modePrefix}deletion-color:${deletionRed};`;\n  }\n  const modifiedBlue =\n    themeData.colors?.['gitDecoration.modifiedResourceForeground'] ??\n    themeData.colors?.['terminal.ansiBlue'];\n  if (modifiedBlue != null) {\n    styles += `${formatCSSVariablePrefix('global')}${modePrefix}modified-color:${modifiedBlue};`;\n  }\n  return styles;\n}\n"],"mappings":";;;;AAiBA,SAAgB,0BAA0B,EACxC,QAAQ,gBACR,aACA,UACyC;CACzC,IAAI,SAAS;CACb,IAAI,OAAO,UAAU,UAAU;EAC7B,MAAM,YAAY,YAAY,SAAS,KAAK;EAC5C,MAAM,aAAa,eAAe,WAAW,WAAW;EACxD,UAAU,SAAS,WAAW,GAAG;EACjC,UAAU,oBAAoB,WAAW,GAAG;EAC5C,UAAU,GAAG,wBAAwB,QAAQ,EAAE,KAAK,WAAW,GAAG;EAClE,UAAU,GAAG,wBAAwB,QAAQ,EAAE,KAAK,WAAW,GAAG;EAClE,UAAU,gBAAgB,WAAW,MAAM;CAC7C,OAAO;EACL,IAAI,YAAY,YAAY,SAAS,MAAM,IAAI;EAC/C,IAAI,aAAa,eAAe,WAAW,WAAW;EACtD,UAAU,GAAG,wBAAwB,QAAQ,EAAE,OAAO,WAAW,GAAG;EACpE,UAAU,GAAG,wBAAwB,QAAQ,EAAE,UAAU,WAAW,GAAG;EACvE,UAAU,gBAAgB,WAAW,MAAM;EAE3C,YAAY,YAAY,SAAS,MAAM,KAAK;EAC5C,aAAa,eAAe,WAAW,WAAW;EAClD,UAAU,GAAG,wBAAwB,QAAQ,EAAE,QAAQ,WAAW,GAAG;EACrE,UAAU,GAAG,wBAAwB,QAAQ,EAAE,WAAW,WAAW,GAAG;EACxE,UAAU,gBAAgB,WAAW,OAAO;CAC9C;CACA,OAAO;AACT;AAIA,SAAS,eAAe,OAAmB,aAA+B;CACxE,IAAI,YAAY,SAAS,gBAAgB,MAAM,KAAK,iBAAiB,MAAM;EACzE,MAAM,SAAS,wBAAwB,OAAO;EAC9C,OAAO;GAAE,IAAI,OAAO,OAAO;GAAc,IAAI,OAAO,OAAO;EAAa;CAC1E;CACA,OAAO,qBAAqB,KAAK;AACnC;AAIA,SAAS,gBAAgB,WAAuB,YAAqB;CACnE,aAAa,cAAc,OAAO,GAAG,WAAW,KAAK;CACrD,IAAI,SAAS;CACb,MAAM,gBACJ,UAAU,SAAS,4CACnB,UAAU,SAAS;CACrB,IAAI,iBAAiB,MACnB,UAAU,GAAG,wBAAwB,QAAQ,IAAI,WAAW,iBAAiB,cAAc;CAE7F,MAAM,cACJ,UAAU,SAAS,8CACnB,UAAU,SAAS;CACrB,IAAI,eAAe,MACjB,UAAU,GAAG,wBAAwB,QAAQ,IAAI,WAAW,iBAAiB,YAAY;CAE3F,MAAM,eACJ,UAAU,SAAS,+CACnB,UAAU,SAAS;CACrB,IAAI,gBAAgB,MAClB,UAAU,GAAG,wBAAwB,QAAQ,IAAI,WAAW,iBAAiB,aAAa;CAE5F,OAAO;AACT"}

package/dist/utils/getTokenOptions.d.ts

@@ -0,0 +1,7 @@
+import { CodeToTokensOptions } from "../highlighter/types.js";
+import { DiffsThemeNames, SupportedLanguages, ThemesType } from "../types.js";
+//#region src/utils/getTokenOptions.d.ts
+declare function getTokenOptions(lang: SupportedLanguages, theme: DiffsThemeNames | ThemesType, tokenizeMaxLineLength: number | undefined): CodeToTokensOptions;
+//#endregion
+export { getTokenOptions };
+//# sourceMappingURL=getTokenOptions.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getTokenOptions.d.ts","names":[],"sources":["../../src/utils/getTokenOptions.ts"],"mappings":";;;iBAQgB,gBACd,MAAM,oBACN,OAAO,kBAAkB,YACzB,4CACC"}

package/dist/utils/getTokenOptions.js

@@ -0,0 +1,16 @@
+import { formatCSSVariablePrefix } from "./formatCSSVariablePrefix.js";
+//#region src/utils/getTokenOptions.ts
+function getTokenOptions(lang, theme, tokenizeMaxLineLength) {
+	return {
+		lang,
+		...typeof theme === "string" ? { theme } : { themes: theme },
+		defaultColor: false,
+		cssVariablePrefix: formatCSSVariablePrefix("token"),
+		tokenizeMaxLineLength,
+		tokenizeTimeLimit: 0
+	};
+}
+//#endregion
+export { getTokenOptions };
+
+//# sourceMappingURL=getTokenOptions.js.map

package/dist/utils/getTokenOptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getTokenOptions.js","names":[],"sources":["../../src/utils/getTokenOptions.ts"],"sourcesContent":["import type {\n  CodeToTokensOptions,\n  DiffsThemeNames,\n  SupportedLanguages,\n  ThemesType,\n} from '../types';\nimport { formatCSSVariablePrefix } from './formatCSSVariablePrefix';\n\nexport function getTokenOptions(\n  lang: SupportedLanguages,\n  theme: DiffsThemeNames | ThemesType,\n  tokenizeMaxLineLength: number | undefined\n): CodeToTokensOptions {\n  return {\n    lang,\n    ...(typeof theme === 'string' ? { theme } : { themes: theme }),\n    defaultColor: false,\n    cssVariablePrefix: formatCSSVariablePrefix('token'),\n    tokenizeMaxLineLength,\n    // Timed aborts can leave incomplete tokens; limit line length instead.\n    tokenizeTimeLimit: 0,\n  };\n}\n"],"mappings":";;AAQA,SAAgB,gBACd,MACA,OACA,uBACqB;CACrB,OAAO;EACL;EACA,GAAI,OAAO,UAAU,WAAW,EAAE,MAAM,IAAI,EAAE,QAAQ,MAAM;EAC5D,cAAc;EACd,mBAAmB,wBAAwB,OAAO;EAClD;EAEA,mBAAmB;CACrB;AACF"}

package/dist/utils/hastToHtml.d.ts

@@ -0,0 +1,10 @@
+import { Nodes, RootContent } from "../node_modules/.pnpm/@types_hast@3.0.4/node_modules/@types/hast/index.js";
+//#region src/utils/hastToHtml.d.ts
+/**
+ * Serializes a HAST node or node array to HTML. Common token spans use a fast
+ * path; other nodes and attributes use hast-util-to-html's default serialization.
+ */
+declare function hastToHtml(tree: Nodes | RootContent[]): string;
+//#endregion
+export { hastToHtml };
+//# sourceMappingURL=hastToHtml.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"hastToHtml.d.ts","names":[],"sources":["../../src/utils/hastToHtml.ts"],"mappings":";;;;;;iBA4DgB,WAAW,MAAM,QAAQ"}

package/dist/utils/hastToHtml.js

@@ -0,0 +1,125 @@
+import { toHtml } from "hast-util-to-html";
+//#region src/utils/hastToHtml.ts
+const VOID_ELEMENTS = /* @__PURE__ */ new Set([
+	"area",
+	"base",
+	"basefont",
+	"bgsound",
+	"br",
+	"col",
+	"command",
+	"embed",
+	"frame",
+	"hr",
+	"image",
+	"img",
+	"input",
+	"keygen",
+	"link",
+	"meta",
+	"param",
+	"source",
+	"track",
+	"wbr"
+]);
+const DELEGATED_TAGS = /* @__PURE__ */ new Set([
+	"svg",
+	"template",
+	"script",
+	"style"
+]);
+const ATTRIBUTE_NAMES = {
+	class: "class",
+	className: "class",
+	id: "id",
+	role: "role",
+	style: "style",
+	tabIndex: "tabindex",
+	tabindex: "tabindex",
+	title: "title"
+};
+const DATA_ATTRIBUTE = /^data-[\w.:-]+$/;
+const TEXT_ESCAPE = /[<&]/g;
+const ATTRIBUTE_ESCAPE = /[\0"&'`]/g;
+const CHARACTER_REFERENCES = {
+	"<": "&#x3C;",
+	"&": "&#x26;",
+	"\"": "&#x22;",
+	"'": "&#x27;",
+	"`": "&#x60;",
+	"\0": "&#x0;"
+};
+const MAX_CACHED_STYLES = 256;
+/**
+* Serializes a HAST node or node array to HTML. Common token spans use a fast
+* path; other nodes and attributes use hast-util-to-html's default serialization.
+*/
+function hastToHtml(tree) {
+	const styles = /* @__PURE__ */ new Map();
+	return Array.isArray(tree) ? serializeChildren(tree, styles) : serializeNode(tree, styles);
+}
+function serializeChildren(children, styles) {
+	let html = "";
+	for (const child of children) html += serializeNode(child, styles);
+	return html;
+}
+function serializeNode(node, styles) {
+	switch (node.type) {
+		case "text": return escapeText(node.value);
+		case "element": return serializeElement(node, styles);
+		case "root": return serializeChildren(node.children, styles);
+		default: return toHtml(node);
+	}
+}
+function serializeElement(node, styles) {
+	const { tagName } = node;
+	if (tagName === "span" && node.children.length === 1 && node.children[0].type === "text" && typeof node.properties?.style === "string") {
+		let styleOnly = true;
+		for (const key in node.properties) if (key !== "style" && node.properties[key] != null) {
+			styleOnly = false;
+			break;
+		}
+		if (styleOnly) return `<span ${serializeStyle(node.properties.style, styles)}>${escapeText(node.children[0].value)}</span>`;
+	}
+	if (DELEGATED_TAGS.has(tagName)) return toHtml(node);
+	const attributes = serializeAttributes(node.properties, styles);
+	if (attributes == null) return toHtml(node);
+	const open = attributes === "" ? `<${tagName}>` : `<${tagName} ${attributes}>`;
+	const content = serializeChildren(node.children, styles);
+	if (content === "" && VOID_ELEMENTS.has(tagName.toLowerCase())) return open;
+	return `${open}${content}</${tagName}>`;
+}
+function serializeStyle(value, styles) {
+	let attribute = styles.get(value);
+	if (attribute == null) {
+		attribute = `style="${escapeAttribute(value)}"`;
+		if (styles.size < MAX_CACHED_STYLES) styles.set(value, attribute);
+	}
+	return attribute;
+}
+function serializeAttributes(properties, styles) {
+	let attributes = "";
+	for (const key in properties) {
+		const value = properties[key];
+		if (value == null) continue;
+		const name = ATTRIBUTE_NAMES[key] ?? (DATA_ATTRIBUTE.test(key) ? key : void 0);
+		if (name == null) return;
+		if (value === false || typeof value === "number" && Number.isNaN(value)) continue;
+		const attribute = key === "style" && typeof value === "string" ? serializeStyle(value, styles) : value === true ? name : `${name}="${escapeAttribute(Array.isArray(value) ? value.join(" ").trim() : String(value))}"`;
+		attributes += attributes === "" ? attribute : ` ${attribute}`;
+	}
+	return attributes;
+}
+function escapeText(value) {
+	return value.indexOf("<") < 0 && value.indexOf("&") < 0 ? value : value.replace(TEXT_ESCAPE, toCharacterReference);
+}
+function escapeAttribute(value) {
+	return value.replace(ATTRIBUTE_ESCAPE, toCharacterReference);
+}
+function toCharacterReference(character) {
+	return CHARACTER_REFERENCES[character];
+}
+//#endregion
+export { hastToHtml };
+
+//# sourceMappingURL=hastToHtml.js.map

package/dist/utils/hastToHtml.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hastToHtml.js","names":[],"sources":["../../src/utils/hastToHtml.ts"],"sourcesContent":["import type { Element, Nodes, Properties, RootContent } from 'hast';\nimport { toHtml } from 'hast-util-to-html';\n\n// Must match the html-void-elements list used by toHtml().\nconst VOID_ELEMENTS = new Set([\n  'area',\n  'base',\n  'basefont',\n  'bgsound',\n  'br',\n  'col',\n  'command',\n  'embed',\n  'frame',\n  'hr',\n  'image',\n  'img',\n  'input',\n  'keygen',\n  'link',\n  'meta',\n  'param',\n  'source',\n  'track',\n  'wbr',\n]);\n\n// These elements require schema, fragment or raw-text handling in toHtml().\nconst DELEGATED_TAGS = new Set(['svg', 'template', 'script', 'style']);\n\n// Boolean and comma-separated attributes require the full HTML schema.\nconst ATTRIBUTE_NAMES: Record<string, string | undefined> = {\n  class: 'class',\n  className: 'class',\n  id: 'id',\n  role: 'role',\n  style: 'style',\n  tabIndex: 'tabindex',\n  tabindex: 'tabindex',\n  title: 'title',\n};\nconst DATA_ATTRIBUTE = /^data-[\\w.:-]+$/;\n\nconst TEXT_ESCAPE = /[<&]/g;\nconst ATTRIBUTE_ESCAPE = /[\\0\"&'`]/g;\n// Must match stringify-entities' default hexadecimal encoding.\nconst CHARACTER_REFERENCES: Record<string, string> = {\n  '<': '&#x3C;',\n  '&': '&#x26;',\n  '\"': '&#x22;',\n  \"'\": '&#x27;',\n  '`': '&#x60;',\n  '\\0': '&#x0;',\n};\nconst MAX_CACHED_STYLES = 256;\n\n/**\n * Serializes a HAST node or node array to HTML. Common token spans use a fast\n * path; other nodes and attributes use hast-util-to-html's default serialization.\n */\nexport function hastToHtml(tree: Nodes | RootContent[]): string {\n  const styles = new Map<string, string>();\n  return Array.isArray(tree)\n    ? serializeChildren(tree, styles)\n    : serializeNode(tree, styles);\n}\n\nfunction serializeChildren(\n  children: readonly RootContent[],\n  styles: Map<string, string>\n): string {\n  let html = '';\n  for (const child of children) {\n    html += serializeNode(child, styles);\n  }\n  return html;\n}\n\nfunction serializeNode(node: Nodes, styles: Map<string, string>): string {\n  switch (node.type) {\n    case 'text':\n      return escapeText(node.value);\n    case 'element':\n      return serializeElement(node, styles);\n    case 'root':\n      return serializeChildren(node.children, styles);\n    default:\n      return toHtml(node);\n  }\n}\n\nfunction serializeElement(node: Element, styles: Map<string, string>): string {\n  const { tagName } = node;\n  if (\n    tagName === 'span' &&\n    node.children.length === 1 &&\n    node.children[0].type === 'text' &&\n    typeof node.properties?.style === 'string'\n  ) {\n    let styleOnly = true;\n    for (const key in node.properties) {\n      if (key !== 'style' && node.properties[key] != null) {\n        styleOnly = false;\n        break;\n      }\n    }\n    if (styleOnly) {\n      return `<span ${serializeStyle(node.properties.style, styles)}>${escapeText(node.children[0].value)}</span>`;\n    }\n  }\n  if (DELEGATED_TAGS.has(tagName)) {\n    return toHtml(node);\n  }\n  const attributes = serializeAttributes(node.properties, styles);\n  if (attributes == null) {\n    return toHtml(node);\n  }\n  const open =\n    attributes === '' ? `<${tagName}>` : `<${tagName} ${attributes}>`;\n  const content = serializeChildren(node.children, styles);\n  if (content === '' && VOID_ELEMENTS.has(tagName.toLowerCase())) {\n    return open;\n  }\n  return `${open}${content}</${tagName}>`;\n}\n\n// Cap the per-render cache because custom styles may be unique per token.\nfunction serializeStyle(value: string, styles: Map<string, string>): string {\n  let attribute = styles.get(value);\n  if (attribute == null) {\n    attribute = `style=\"${escapeAttribute(value)}\"`;\n    if (styles.size < MAX_CACHED_STYLES) styles.set(value, attribute);\n  }\n  return attribute;\n}\n\n// Returns undefined when a property needs the HTML schema to serialize.\nfunction serializeAttributes(\n  properties: Properties | undefined,\n  styles: Map<string, string>\n): string | undefined {\n  let attributes = '';\n  for (const key in properties) {\n    const value = properties[key];\n    if (value == null) {\n      continue;\n    }\n    const name =\n      ATTRIBUTE_NAMES[key] ?? (DATA_ATTRIBUTE.test(key) ? key : undefined);\n    if (name == null) {\n      return undefined;\n    }\n    if (value === false || (typeof value === 'number' && Number.isNaN(value))) {\n      continue;\n    }\n    const attribute =\n      key === 'style' && typeof value === 'string'\n        ? serializeStyle(value, styles)\n        : value === true\n          ? name\n          : `${name}=\"${escapeAttribute(\n              Array.isArray(value) ? value.join(' ').trim() : String(value)\n            )}\"`;\n    attributes += attributes === '' ? attribute : ` ${attribute}`;\n  }\n  return attributes;\n}\n\nfunction escapeText(value: string): string {\n  return value.indexOf('<') < 0 && value.indexOf('&') < 0\n    ? value\n    : value.replace(TEXT_ESCAPE, toCharacterReference);\n}\n\nfunction escapeAttribute(value: string): string {\n  return value.replace(ATTRIBUTE_ESCAPE, toCharacterReference);\n}\n\nfunction toCharacterReference(character: string): string {\n  return CHARACTER_REFERENCES[character];\n}\n"],"mappings":"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"}

package/dist/utils/hydratePartialDiff.js

@@ -19,6 +19,8 @@ function hydratePartialDiff(type, fileDiff, files) {
 			targetFileDiff.isPartial = false;
 			targetFileDiff.deletionLines = lines;
 			targetFileDiff.additionLines = lines;
+			targetFileDiff.deletionCharacterCount = newFile.contents.length;
+			targetFileDiff.additionCharacterCount = newFile.contents.length;
 			setHydratedCacheKey(targetFileDiff, null, newFile);
 			return targetFileDiff;
 		}
@@ -35,6 +37,8 @@ function hydrateTwoSidedFileDiff(fileDiff, oldFile, newFile) {
 	fileDiff.isPartial = false;
 	fileDiff.deletionLines = deletionLines;
 	fileDiff.additionLines = additionLines;
+	fileDiff.deletionCharacterCount = oldFile.contents.length;
+	fileDiff.additionCharacterCount = newFile.contents.length;
 	setHydratedCacheKey(fileDiff, oldFile, newFile);
 	return fileDiff;
 }

package/dist/utils/hydratePartialDiff.js.map

@@ -1 +1 @@
-{"version":3,"file":"hydratePartialDiff.js","names":[],"sources":["../../src/utils/hydratePartialDiff.ts"],"sourcesContent":["import type {\n  FileContents,\n  FileDiffLoadedFiles,\n  FileDiffMetadata,\n  Hunk,\n} from '../types';\nimport { cloneFileDiffMetadata } from './cloneFileDiffMetadata';\nimport { composeCacheKey } from './composeCacheKey';\nimport {\n  getHunkSideEndBoundary,\n  getHunkSideStartBoundary,\n} from './getHunkSideBoundaries';\nimport { splitFileContents } from './splitFileContents';\n\ninterface HydratedHunksResult {\n  hunks: Hunk[];\n  splitLineCount: number;\n  unifiedLineCount: number;\n}\n\n/**\n * Hydrates a partial diff in place with full file line arrays.\n */\nexport function hydratePartialDiff(\n  type: 'clone' | 'merge',\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): FileDiffMetadata {\n  const targetFileDiff =\n    type === 'clone' ? cloneFileDiffMetadata(fileDiff) : fileDiff;\n\n  if (!targetFileDiff.isPartial) {\n    throw new Error('hydratePartialDiff: fileDiff must be partial');\n  }\n\n  switch (targetFileDiff.type) {\n    case 'change':\n    case 'rename-changed': {\n      const oldFile = requireOldFile(targetFileDiff, files);\n      const newFile = requireNewFile(targetFileDiff, files);\n      return hydrateTwoSidedFileDiff(targetFileDiff, oldFile, newFile);\n    }\n    case 'rename-pure': {\n      const newFile = requireNewFile(targetFileDiff, files);\n      requireMissingOldFile(targetFileDiff, files);\n      const lines = splitFileContents(newFile.contents);\n      targetFileDiff.isPartial = false;\n      targetFileDiff.deletionLines = lines;\n      targetFileDiff.additionLines = lines;\n      setHydratedCacheKey(targetFileDiff, null, newFile);\n      return targetFileDiff;\n    }\n  }\n  throw new Error(\n    `hydratePartialDiff: ${targetFileDiff.type} diffs cannot be hydrated from loaded files`\n  );\n}\n\nfunction hydrateTwoSidedFileDiff(\n  fileDiff: FileDiffMetadata,\n  oldFile: FileContents,\n  newFile: FileContents\n): FileDiffMetadata {\n  const deletionLines = splitFileContents(oldFile.contents);\n  const additionLines = splitFileContents(newFile.contents);\n  const { hunks, splitLineCount, unifiedLineCount } = hydrateHunks(\n    fileDiff.hunks,\n    additionLines.length\n  );\n\n  fileDiff.hunks = hunks;\n  fileDiff.splitLineCount = splitLineCount;\n  fileDiff.unifiedLineCount = unifiedLineCount;\n  fileDiff.isPartial = false;\n  fileDiff.deletionLines = deletionLines;\n  fileDiff.additionLines = additionLines;\n  setHydratedCacheKey(fileDiff, oldFile, newFile);\n  return fileDiff;\n}\n\nfunction hydrateHunks(\n  hunks: Hunk[],\n  totalAdditionLines: number\n): HydratedHunksResult {\n  let splitLineCount = 0;\n  let unifiedLineCount = 0;\n  let lastHunkAdditionEnd = 0;\n\n  const hydratedHunks: Hunk[] = [];\n\n  for (const hunk of hunks) {\n    const additionLineIndex = Math.max(hunk.additionStart - 1, 0);\n    const deletionLineIndex = Math.max(hunk.deletionStart - 1, 0);\n    let contentAdditionLineIndex = additionLineIndex;\n    let contentDeletionLineIndex = deletionLineIndex;\n    let hunkAdditionLines = 0;\n    let hunkDeletionLines = 0;\n    let hunkSplitLineCount = 0;\n    let hunkUnifiedLineCount = 0;\n    const hunkContent: Hunk['hunkContent'] = [];\n\n    for (const content of hunk.hunkContent) {\n      if (content.type === 'context') {\n        hunkContent.push({\n          ...content,\n          additionLineIndex: contentAdditionLineIndex,\n          deletionLineIndex: contentDeletionLineIndex,\n        });\n        contentAdditionLineIndex += content.lines;\n        contentDeletionLineIndex += content.lines;\n        hunkSplitLineCount += content.lines;\n        hunkUnifiedLineCount += content.lines;\n        continue;\n      }\n\n      hunkContent.push({\n        ...content,\n        additionLineIndex: contentAdditionLineIndex,\n        deletionLineIndex: contentDeletionLineIndex,\n      });\n      contentAdditionLineIndex += content.additions;\n      contentDeletionLineIndex += content.deletions;\n      hunkAdditionLines += content.additions;\n      hunkDeletionLines += content.deletions;\n      hunkSplitLineCount += Math.max(content.additions, content.deletions);\n      hunkUnifiedLineCount += content.additions + content.deletions;\n    }\n\n    const collapsedBefore = Math.max(\n      getHunkSideStartBoundary(hunk.additionStart, hunk.additionCount) -\n        lastHunkAdditionEnd,\n      0\n    );\n    hydratedHunks.push({\n      ...hunk,\n      collapsedBefore,\n      additionLineIndex,\n      deletionLineIndex,\n      additionLines: hunkAdditionLines,\n      deletionLines: hunkDeletionLines,\n      hunkContent,\n      splitLineStart: splitLineCount + collapsedBefore,\n      unifiedLineStart: unifiedLineCount + collapsedBefore,\n      splitLineCount: hunkSplitLineCount,\n      unifiedLineCount: hunkUnifiedLineCount,\n    });\n\n    splitLineCount += collapsedBefore + hunkSplitLineCount;\n    unifiedLineCount += collapsedBefore + hunkUnifiedLineCount;\n    lastHunkAdditionEnd = getHunkSideEndBoundary(\n      hunk.additionStart,\n      hunk.additionCount\n    );\n  }\n\n  if (hydratedHunks.length > 0) {\n    const lastHunk = hydratedHunks[hydratedHunks.length - 1];\n    const lastHunkEnd = getHunkSideEndBoundary(\n      lastHunk.additionStart,\n      lastHunk.additionCount\n    );\n    const collapsedAfter = Math.max(totalAdditionLines - lastHunkEnd, 0);\n    splitLineCount += collapsedAfter;\n    unifiedLineCount += collapsedAfter;\n  }\n\n  return { hunks: hydratedHunks, splitLineCount, unifiedLineCount };\n}\n\nfunction requireOldFile(\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): FileContents {\n  if (files.oldFile == null) {\n    throw new Error(\n      `hydratePartialDiff: ${fileDiff.type} diff for ${fileDiff.name} requires oldFile`\n    );\n  }\n  return files.oldFile;\n}\n\nfunction requireNewFile(\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): FileContents {\n  if (files.newFile == null) {\n    throw new Error(\n      `hydratePartialDiff: ${fileDiff.type} diff for ${fileDiff.name} requires newFile`\n    );\n  }\n  return files.newFile;\n}\n\nfunction requireMissingOldFile(\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): void {\n  if (files.oldFile !== null) {\n    throw new Error(\n      `hydratePartialDiff: ${fileDiff.type} diff for ${fileDiff.name} requires oldFile to be null`\n    );\n  }\n}\n\nfunction getHydratedCacheKey(\n  fileDiff: FileDiffMetadata,\n  oldFile: FileContents | null,\n  newFile: FileContents | null\n): string | undefined {\n  if (fileDiff.cacheKey != null) {\n    return `${fileDiff.cacheKey}:hydrated`;\n  }\n  return getLoadedFileCacheKey(oldFile, newFile);\n}\n\nfunction setHydratedCacheKey(\n  fileDiff: FileDiffMetadata,\n  oldFile: FileContents | null,\n  newFile: FileContents | null\n): void {\n  const cacheKey = getHydratedCacheKey(fileDiff, oldFile, newFile);\n  if (cacheKey == null) {\n    delete fileDiff.cacheKey;\n    return;\n  }\n  fileDiff.cacheKey = cacheKey;\n}\n\nfunction getLoadedFileCacheKey(\n  oldFile: FileContents | null,\n  newFile: FileContents | null\n): string | undefined {\n  if (oldFile != null && newFile != null) {\n    return oldFile.cacheKey != null && newFile.cacheKey != null\n      ? composeCacheKey('hydrated-files', oldFile.cacheKey, newFile.cacheKey)\n      : undefined;\n  }\n  return oldFile?.cacheKey ?? newFile?.cacheKey;\n}\n"],"mappings":"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"}
+{"version":3,"file":"hydratePartialDiff.js","names":[],"sources":["../../src/utils/hydratePartialDiff.ts"],"sourcesContent":["import type {\n  FileContents,\n  FileDiffLoadedFiles,\n  FileDiffMetadata,\n  Hunk,\n} from '../types';\nimport { cloneFileDiffMetadata } from './cloneFileDiffMetadata';\nimport { composeCacheKey } from './composeCacheKey';\nimport {\n  getHunkSideEndBoundary,\n  getHunkSideStartBoundary,\n} from './getHunkSideBoundaries';\nimport { splitFileContents } from './splitFileContents';\n\ninterface HydratedHunksResult {\n  hunks: Hunk[];\n  splitLineCount: number;\n  unifiedLineCount: number;\n}\n\n/**\n * Hydrates a partial diff in place with full file line arrays.\n */\nexport function hydratePartialDiff(\n  type: 'clone' | 'merge',\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): FileDiffMetadata {\n  const targetFileDiff =\n    type === 'clone' ? cloneFileDiffMetadata(fileDiff) : fileDiff;\n\n  if (!targetFileDiff.isPartial) {\n    throw new Error('hydratePartialDiff: fileDiff must be partial');\n  }\n\n  switch (targetFileDiff.type) {\n    case 'change':\n    case 'rename-changed': {\n      const oldFile = requireOldFile(targetFileDiff, files);\n      const newFile = requireNewFile(targetFileDiff, files);\n      return hydrateTwoSidedFileDiff(targetFileDiff, oldFile, newFile);\n    }\n    case 'rename-pure': {\n      const newFile = requireNewFile(targetFileDiff, files);\n      requireMissingOldFile(targetFileDiff, files);\n      const lines = splitFileContents(newFile.contents);\n      targetFileDiff.isPartial = false;\n      targetFileDiff.deletionLines = lines;\n      targetFileDiff.additionLines = lines;\n      targetFileDiff.deletionCharacterCount = newFile.contents.length;\n      targetFileDiff.additionCharacterCount = newFile.contents.length;\n      setHydratedCacheKey(targetFileDiff, null, newFile);\n      return targetFileDiff;\n    }\n  }\n  throw new Error(\n    `hydratePartialDiff: ${targetFileDiff.type} diffs cannot be hydrated from loaded files`\n  );\n}\n\nfunction hydrateTwoSidedFileDiff(\n  fileDiff: FileDiffMetadata,\n  oldFile: FileContents,\n  newFile: FileContents\n): FileDiffMetadata {\n  const deletionLines = splitFileContents(oldFile.contents);\n  const additionLines = splitFileContents(newFile.contents);\n  const { hunks, splitLineCount, unifiedLineCount } = hydrateHunks(\n    fileDiff.hunks,\n    additionLines.length\n  );\n\n  fileDiff.hunks = hunks;\n  fileDiff.splitLineCount = splitLineCount;\n  fileDiff.unifiedLineCount = unifiedLineCount;\n  fileDiff.isPartial = false;\n  fileDiff.deletionLines = deletionLines;\n  fileDiff.additionLines = additionLines;\n  fileDiff.deletionCharacterCount = oldFile.contents.length;\n  fileDiff.additionCharacterCount = newFile.contents.length;\n  setHydratedCacheKey(fileDiff, oldFile, newFile);\n  return fileDiff;\n}\n\nfunction hydrateHunks(\n  hunks: Hunk[],\n  totalAdditionLines: number\n): HydratedHunksResult {\n  let splitLineCount = 0;\n  let unifiedLineCount = 0;\n  let lastHunkAdditionEnd = 0;\n\n  const hydratedHunks: Hunk[] = [];\n\n  for (const hunk of hunks) {\n    const additionLineIndex = Math.max(hunk.additionStart - 1, 0);\n    const deletionLineIndex = Math.max(hunk.deletionStart - 1, 0);\n    let contentAdditionLineIndex = additionLineIndex;\n    let contentDeletionLineIndex = deletionLineIndex;\n    let hunkAdditionLines = 0;\n    let hunkDeletionLines = 0;\n    let hunkSplitLineCount = 0;\n    let hunkUnifiedLineCount = 0;\n    const hunkContent: Hunk['hunkContent'] = [];\n\n    for (const content of hunk.hunkContent) {\n      if (content.type === 'context') {\n        hunkContent.push({\n          ...content,\n          additionLineIndex: contentAdditionLineIndex,\n          deletionLineIndex: contentDeletionLineIndex,\n        });\n        contentAdditionLineIndex += content.lines;\n        contentDeletionLineIndex += content.lines;\n        hunkSplitLineCount += content.lines;\n        hunkUnifiedLineCount += content.lines;\n        continue;\n      }\n\n      hunkContent.push({\n        ...content,\n        additionLineIndex: contentAdditionLineIndex,\n        deletionLineIndex: contentDeletionLineIndex,\n      });\n      contentAdditionLineIndex += content.additions;\n      contentDeletionLineIndex += content.deletions;\n      hunkAdditionLines += content.additions;\n      hunkDeletionLines += content.deletions;\n      hunkSplitLineCount += Math.max(content.additions, content.deletions);\n      hunkUnifiedLineCount += content.additions + content.deletions;\n    }\n\n    const collapsedBefore = Math.max(\n      getHunkSideStartBoundary(hunk.additionStart, hunk.additionCount) -\n        lastHunkAdditionEnd,\n      0\n    );\n    hydratedHunks.push({\n      ...hunk,\n      collapsedBefore,\n      additionLineIndex,\n      deletionLineIndex,\n      additionLines: hunkAdditionLines,\n      deletionLines: hunkDeletionLines,\n      hunkContent,\n      splitLineStart: splitLineCount + collapsedBefore,\n      unifiedLineStart: unifiedLineCount + collapsedBefore,\n      splitLineCount: hunkSplitLineCount,\n      unifiedLineCount: hunkUnifiedLineCount,\n    });\n\n    splitLineCount += collapsedBefore + hunkSplitLineCount;\n    unifiedLineCount += collapsedBefore + hunkUnifiedLineCount;\n    lastHunkAdditionEnd = getHunkSideEndBoundary(\n      hunk.additionStart,\n      hunk.additionCount\n    );\n  }\n\n  if (hydratedHunks.length > 0) {\n    const lastHunk = hydratedHunks[hydratedHunks.length - 1];\n    const lastHunkEnd = getHunkSideEndBoundary(\n      lastHunk.additionStart,\n      lastHunk.additionCount\n    );\n    const collapsedAfter = Math.max(totalAdditionLines - lastHunkEnd, 0);\n    splitLineCount += collapsedAfter;\n    unifiedLineCount += collapsedAfter;\n  }\n\n  return { hunks: hydratedHunks, splitLineCount, unifiedLineCount };\n}\n\nfunction requireOldFile(\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): FileContents {\n  if (files.oldFile == null) {\n    throw new Error(\n      `hydratePartialDiff: ${fileDiff.type} diff for ${fileDiff.name} requires oldFile`\n    );\n  }\n  return files.oldFile;\n}\n\nfunction requireNewFile(\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): FileContents {\n  if (files.newFile == null) {\n    throw new Error(\n      `hydratePartialDiff: ${fileDiff.type} diff for ${fileDiff.name} requires newFile`\n    );\n  }\n  return files.newFile;\n}\n\nfunction requireMissingOldFile(\n  fileDiff: FileDiffMetadata,\n  files: FileDiffLoadedFiles\n): void {\n  if (files.oldFile !== null) {\n    throw new Error(\n      `hydratePartialDiff: ${fileDiff.type} diff for ${fileDiff.name} requires oldFile to be null`\n    );\n  }\n}\n\nfunction getHydratedCacheKey(\n  fileDiff: FileDiffMetadata,\n  oldFile: FileContents | null,\n  newFile: FileContents | null\n): string | undefined {\n  if (fileDiff.cacheKey != null) {\n    return `${fileDiff.cacheKey}:hydrated`;\n  }\n  return getLoadedFileCacheKey(oldFile, newFile);\n}\n\nfunction setHydratedCacheKey(\n  fileDiff: FileDiffMetadata,\n  oldFile: FileContents | null,\n  newFile: FileContents | null\n): void {\n  const cacheKey = getHydratedCacheKey(fileDiff, oldFile, newFile);\n  if (cacheKey == null) {\n    delete fileDiff.cacheKey;\n    return;\n  }\n  fileDiff.cacheKey = cacheKey;\n}\n\nfunction getLoadedFileCacheKey(\n  oldFile: FileContents | null,\n  newFile: FileContents | null\n): string | undefined {\n  if (oldFile != null && newFile != null) {\n    return oldFile.cacheKey != null && newFile.cacheKey != null\n      ? composeCacheKey('hydrated-files', oldFile.cacheKey, newFile.cacheKey)\n      : undefined;\n  }\n  return oldFile?.cacheKey ?? newFile?.cacheKey;\n}\n"],"mappings":"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"}

package/dist/utils/parseDiffDecorations.d.ts

@@ -1,4 +1,5 @@
-import { DecorationItem } from "../types.js";
+import { DecorationItem } from "../highlighter/types.js";
+import "../types.js";
 import { ChangeObject } from "diff";
 //#region src/utils/parseDiffDecorations.d.ts
 interface CreateDiffSpanDecorationProps {

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

@@ -1 +1 @@
-{"version":3,"file":"parseDiffDecorations.d.ts","names":[],"sources":["../../src/utils/parseDiffDecorations.ts"],"mappings":";;;UAIU;EACR;EACA;EACA;;iBAGc,2BACd,MACA,WACA,cACC,gCAAgC;UASzB;EACR,MAAM;EACN;EACA;EACA;EACA;;iBAQc,iBACd,MACA,KACA,YACA,WACA,cACC"}
+{"version":3,"file":"parseDiffDecorations.d.ts","names":[],"sources":["../../src/utils/parseDiffDecorations.ts"],"mappings":";;;;UAIU;EACR;EACA;EACA;;iBAGc,2BACd,MACA,WACA,cACC,gCAAgC;UASzB;EACR,MAAM;EACN;EACA;EACA;EACA;;iBAQc,iBACd,MACA,KACA,YACA,WACA,cACC"}

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

@@ -1 +1 @@
-{"version":3,"file":"parseMergeConflictDiffFromFile.d.ts","names":[],"sources":["../../src/utils/parseMergeConflictDiffFromFile.ts"],"mappings":";;UAsDiB;EACf,UAAU;EACV,aAAa;EACb,cAAc;EACd,UAAU;EACV,YAAY;;UAGG,gCAAgC;EAG/C,UAAU;EACV;EACA;IACE;IACA;IACA;IACA;;;UAIM;EACR;EACA;;iBAqGc,6BACd,QAAQ,yBACR,UAAU,mBACT;iBAoBa,+BACd,MAAM,cACN,2BACC;iBAg0Ba,6BACd,UAAU,kBACV,UAAU,yCACT"}
+{"version":3,"file":"parseMergeConflictDiffFromFile.d.ts","names":[],"sources":["../../src/utils/parseMergeConflictDiffFromFile.ts"],"mappings":";;UAsDiB;EACf,UAAU;EACV,aAAa;EACb,cAAc;EACd,UAAU;EACV,YAAY;;UAGG,gCAAgC;EAG/C,UAAU;EACV;EACA;IACE;IACA;IACA;IACA;;;UAIM;EACR;EACA;;iBAqGc,6BACd,QAAQ,yBACR,UAAU,mBACT;iBAoBa,+BACd,MAAM,cACN,2BACC;iBAk0Ba,6BACd,UAAU,kBACV,UAAU,yCACT"}

package/dist/utils/parseMergeConflictDiffFromFile.js

@@ -71,6 +71,8 @@ function parseMergeConflictDiffFromFile(file, maxContextLines = 6) {
 		isPartial: false,
 		deletionLines: s.deletionLines,
 		additionLines: s.additionLines,
+		deletionCharacterCount: currentContents.length,
+		additionCharacterCount: incomingContents.length,
 		cacheKey: file.cacheKey != null ? `${file.cacheKey}:merge-conflict-diff` : void 0
 	};
 	return {