@pierre/diffs 1.4.2 → 1.5.0

package/dist/editor/textMeasure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textMeasure.d.ts","names":[],"sources":["../../src/editor/textMeasure.ts"],"mappings":";cAUa;;;EASX;;EAEA;;EAEA;;EAEA;;EAGA,KAAK,MAAM;;;;;;;;;;;;;;;;EA+DX;;EAeA,iBAAiB;;;;;EA0CjB,iBACE,kBACA,sBACA;;EAoBF,uBAAuB;;;;;;EAYvB,oBAAoB;;;;;;EAiDpB;;;iBAYc,wBAAwB;;iBAiBxB,gCACd,cACA;;iBA6Cc,6BACd;;;;;;iBA2Bc,4BACd,cACA"}
+{"version":3,"file":"textMeasure.d.ts","names":[],"sources":["../../src/editor/textMeasure.ts"],"mappings":";cAUa;;;EAUX;;EAEA;;EAEA;;EAEA;;EAGA,KAAK,MAAM;;;;;;;;;;;;;;;;EA+DX;;EAwCA,iBAAiB;;;;;EA0CjB,iBACE,kBACA,sBACA;;EAoBF,uBAAuB;;;;;;EAYvB,oBAAoB;;;;;;EAiDpB;;;iBAYc,wBAAwB;;iBAiBxB,gCACd,cACA;;iBA6Cc,6BACd;;;;;;iBA2Bc,4BACd,cACA"}

package/dist/editor/textMeasure.js

@@ -4,6 +4,7 @@ const TEXT_WIDTH_CACHE_LIMIT = 4096;
 const COMBINING_MARK_PATTERN = /\p{Mark}/u;
 var Metrics = class {
 	#root;
+	#canvas;
 	#canvasCtx;
 	#font;
 	#textWidthCache = /* @__PURE__ */ new Map();
@@ -19,7 +20,8 @@ var Metrics = class {
 	init(root) {
 		if (this.#root === root && this.#canvasCtx !== void 0 && this.ch !== -1) return;
 		this.#root = root;
-		this.#canvasCtx ??= document.createElement("canvas").getContext("2d") ?? void 0;
+		this.#canvas ??= h("canvas", { style: { display: "none" } });
+		this.#canvasCtx ??= this.#canvas.getContext("2d") ?? void 0;
 		if (this.#canvasCtx === void 0) throw new Error("Could not get canvas context");
 		const parent = root.parentElement;
 		if (parent !== null) {
@@ -32,7 +34,7 @@ var Metrics = class {
 		const font = fontSize + " " + fontFamily;
 		if (this.#font !== font || this.ch === -1) {
 			this.#font = font;
-			this.#canvasCtx.font = font;
+			this.#setCanvasFont(font);
 			this.ch = this.canvasMeasureTextWidth("0");
 			this.clearTextWidthCache();
 		}
@@ -56,13 +58,35 @@ var Metrics = class {
 	*/
 	remeasureCharacterWidth() {
 		if (this.#canvasCtx === void 0 || this.#font === void 0) return false;
-		this.#canvasCtx.font = this.#font;
+		this.#setCanvasFont(this.#font);
 		const ch = this.canvasMeasureTextWidth("0");
 		const characterWidthChanged = ch !== this.ch;
 		if (characterWidthChanged) this.ch = ch;
 		const textWidthCacheCleared = this.#clearTextWidthCache();
 		return characterWidthChanged || textWidthCacheCleared;
 	}
+	/**
+	* Set the canvas font while the canvas is connected to the document.
+	*
+	* WebKit resolves a canvas font from the canvas element's computed style at
+	* assignment. A detached canvas has none, so WebKit ignores user-installed
+	* fonts and measures the fallback family while the DOM renders the real font,
+	* shifting every caret and selection in hosts that allow user-installed fonts
+	* (WKWebView, Playwright WebKit). Connecting the canvas for the assignment
+	* makes it measure the same font the DOM renders.
+	*/
+	#setCanvasFont(font) {
+		const root = this.#root;
+		const canvas = this.#canvas;
+		const canvasCtx = this.#canvasCtx;
+		if (root == null || canvas == null || canvasCtx == null) throw new Error("Metrics not initialized");
+		root.append(canvas);
+		try {
+			canvasCtx.font = font;
+		} finally {
+			canvas.remove();
+		}
+	}
 	/** measure the width of the text */
 	measureTextWidth(text) {
 		if (!text.includes("	")) return this.#measureTextWidthWithoutTabs(text);

package/dist/editor/textMeasure.js.map

@@ -1 +1 @@
-{"version":3,"file":"textMeasure.js","names":[],"sources":["../../src/editor/textMeasure.ts"],"sourcesContent":["import { getGraphemeSegmenter, h, round } from './utils';\n\n// Upper bound on cached DOM text-width measurements. The cache only holds\n// non-ASCII runs (emoji, ZWJ sequences, variation selectors, combining marks),\n// so it stays small for ordinary code, but capping it prevents unbounded growth\n// on emoji-heavy documents. Past the cap the oldest entry is evicted.\nconst TEXT_WIDTH_CACHE_LIMIT = 4096;\n\nconst COMBINING_MARK_PATTERN = /\\p{Mark}/u;\n\nexport class Metrics {\n  #root?: HTMLElement;\n  #canvasCtx?: CanvasRenderingContext2D;\n  #font?: string;\n\n  // Memoizes domMeasureTextWidth() results\n  #textWidthCache = new Map<string, number>();\n\n  /** Width of the '0' character. */\n  ch: number = -1;\n  /** Size of a tab(\\t) character. */\n  tabSize: number = 2;\n  /** Height of the code line. */\n  lineHeight: number = 20;\n  /** Padding top of the root element. */\n  paddingTop: number = 0;\n\n  /** initialize the metrics */\n  init(root: HTMLElement): void {\n    if (\n      this.#root === root &&\n      this.#canvasCtx !== undefined &&\n      this.ch !== -1\n    ) {\n      // already initialized\n      return;\n    }\n\n    this.#root = root;\n    this.#canvasCtx ??=\n      document.createElement('canvas').getContext('2d') ?? undefined;\n    if (this.#canvasCtx === undefined) {\n      throw new Error('Could not get canvas context');\n    }\n\n    const parent = root.parentElement;\n    if (parent !== null) {\n      const { paddingTop } = getComputedStyle(parent);\n      if (paddingTop.endsWith('px')) {\n        this.paddingTop = parseFloat(paddingTop.slice(0, -2));\n      }\n    }\n\n    const { fontSize, fontFamily, tabSize, lineHeight } =\n      getComputedStyle(root);\n    if (lineHeight.endsWith('px')) {\n      this.lineHeight = parseFloat(lineHeight.slice(0, -2));\n    } else if (fontSize.endsWith('px')) {\n      this.lineHeight = round(\n        parseFloat(fontSize.slice(0, -2)) * parseFloat(lineHeight)\n      );\n    }\n    const font = fontSize + ' ' + fontFamily;\n    if (this.#font !== font || this.ch === -1) {\n      this.#font = font;\n      this.#canvasCtx.font = font;\n      this.ch = this.canvasMeasureTextWidth('0');\n      // Cached DOM widths were measured against the previous font.\n      this.clearTextWidthCache();\n    }\n    const nextTabSize = parseInt(tabSize, 10);\n    if (!Number.isNaN(nextTabSize)) {\n      this.tabSize = nextTabSize;\n    }\n  }\n\n  /**\n   * Re-measure the '0' character width against the font that is loaded right\n   * now, returning true when measurement-dependent UI should refresh.\n   *\n   * A custom web font can finish loading after the editor first renders.\n   * Until then canvas measureText reports the fallback font's width, and\n   * getComputedStyle returns the same font-family string before and after the\n   * file arrives, so init()'s font guard never re-measures on its own. Call\n   * this once fonts have settled (e.g. on document.fonts.ready) to replace a\n   * width measured against the fallback font with the real glyph width. Font\n   * completion can also change DOM-measured emoji/ZWJ widths while leaving the\n   * ASCII width unchanged, and the computed font string stays the same in both\n   * cases. The boolean return lets the caller skip re-rendering when there is no\n   * measured state to refresh.\n   */\n  remeasureCharacterWidth(): boolean {\n    if (this.#canvasCtx === undefined || this.#font === undefined) {\n      return false;\n    }\n    this.#canvasCtx.font = this.#font;\n    const ch = this.canvasMeasureTextWidth('0');\n    const characterWidthChanged = ch !== this.ch;\n    if (characterWidthChanged) {\n      this.ch = ch;\n    }\n    const textWidthCacheCleared = this.#clearTextWidthCache();\n    return characterWidthChanged || textWidthCacheCleared;\n  }\n\n  /** measure the width of the text */\n  measureTextWidth(text: string): number {\n    if (!text.includes('\\t')) {\n      return this.#measureTextWidthWithoutTabs(text);\n    }\n    if (this.#canvasCtx === undefined) {\n      throw new Error('Metrics not initialized');\n    }\n    const asciiColumns = getExpandedAsciiTextColumns(text, this.tabSize);\n    if (asciiColumns !== -1) {\n      return asciiColumns * this.ch;\n    }\n\n    let width = 0;\n    let runStart = 0;\n    const tabStopWidth = this.tabSize * this.ch;\n    for (let i = 0; i < text.length; i++) {\n      if (text.charCodeAt(i) !== /* '\\t' */ 9) {\n        continue;\n      }\n\n      if (i > runStart) {\n        width += this.#measureTextWidthWithoutTabs(text.slice(runStart, i));\n      }\n      // CSS tab stops are pixel positions, so wide glyphs before a tab must\n      // contribute their measured width rather than one logical column.\n      if (tabStopWidth > 0) {\n        const remainder = width % tabStopWidth;\n        width += remainder === 0 ? tabStopWidth : tabStopWidth - remainder;\n      }\n      runStart = i + 1;\n    }\n\n    if (runStart < text.length) {\n      width += this.#measureTextWidthWithoutTabs(text.slice(runStart));\n    }\n    return round(width);\n  }\n\n  /**\n   * Pixel width from a wrapped segment's start up to a character. Tabs advance\n   * from the segment start so their stops line up with the rendered text.\n   */\n  segmentTextWidth(\n    lineText: string,\n    segmentStart: number,\n    character: number\n  ): number {\n    if (character <= segmentStart) {\n      return 0;\n    }\n    const segmentText = lineText.slice(segmentStart, character);\n    const asciiColumns = getExpandedAsciiTextColumns(segmentText, this.tabSize);\n    return asciiColumns !== -1\n      ? asciiColumns * this.ch\n      : this.measureTextWidth(segmentText);\n  }\n\n  #measureTextWidthWithoutTabs(text: string): number {\n    if (needsDomTextMeasurement(text)) {\n      return this.domMeasureTextWidth(text);\n    }\n    return this.canvasMeasureTextWidth(text);\n  }\n\n  /** measure the width of the text using the canvas measureText API */\n  canvasMeasureTextWidth(text: string): number {\n    if (this.#canvasCtx === undefined) {\n      throw new Error('Metrics not initialized');\n    }\n    return round(this.#canvasCtx.measureText(text).width);\n  }\n\n  /**\n   * measure the width of the text using the DOM\n   * this is slow because it cause a reflow, use it for non-ascii text;\n   * results are memoized per text so repeated measurements skip the reflow\n   */\n  domMeasureTextWidth(text: string): number {\n    if (this.#root === undefined) {\n      throw new Error('Metrics not initialized');\n    }\n    const cacheKey = text + '|' + this.#font;\n    const cached = this.#textWidthCache.get(cacheKey);\n    if (cached !== undefined) {\n      return cached;\n    }\n    const measureEl = h(\n      'span',\n      {\n        style: {\n          position: 'absolute',\n          top: '0',\n          left: '0',\n          visibility: 'hidden',\n          pointerEvents: 'none',\n          whiteSpace: 'pre',\n          font: 'inherit',\n        },\n        textContent: text,\n      },\n      this.#root\n    );\n    let width: number;\n    try {\n      // round() to match canvasMeasureTextWidth and ch; otherwise the DOM path\n      // returns raw sub-pixel widths and caret/selection offsets drift between\n      // ASCII and non-ASCII runs on the same line.\n      width = round(measureEl.getBoundingClientRect().width);\n    } finally {\n      measureEl.remove();\n    }\n    if (this.#textWidthCache.size >= TEXT_WIDTH_CACHE_LIMIT) {\n      const oldestKey = this.#textWidthCache.keys().next().value;\n      if (oldestKey !== undefined) {\n        this.#textWidthCache.delete(oldestKey);\n      }\n    }\n    this.#textWidthCache.set(cacheKey, width);\n    return width;\n  }\n\n  /**\n   * discard memoized DOM text widths\n   * call this when the inherited font may have changed without re-running\n   * init(), e.g. on a layout reflow, so stale widths are not reused\n   */\n  clearTextWidthCache(): void {\n    this.#clearTextWidthCache();\n  }\n\n  #clearTextWidthCache(): boolean {\n    const hadCachedTextWidths = this.#textWidthCache.size > 0;\n    this.#textWidthCache.clear();\n    return hadCachedTextWidths;\n  }\n}\n\n/** Check if the text needs DOM text measurement. */\nexport function needsDomTextMeasurement(text: string): boolean {\n  for (let i = 0; i < text.length; i++) {\n    const code = text.charCodeAt(i);\n    if (\n      (code >= 0xd800 && code <= 0xdfff) ||\n      code === 0x200d ||\n      code === 0xfe0e ||\n      code === 0xfe0f ||\n      (code > 0x7f && COMBINING_MARK_PATTERN.test(text.charAt(i)))\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\n/** snap the text offset to the Unicode boundary */\nexport function snapTextOffsetToUnicodeBoundary(\n  text: string,\n  offset: number\n): number {\n  const boundedOffset = Math.max(0, Math.min(offset, text.length));\n  if (\n    boundedOffset === 0 ||\n    boundedOffset === text.length ||\n    !needsDomTextMeasurement(text)\n  ) {\n    return boundedOffset;\n  }\n  // Avoid measuring a caret position inside one visual emoji/grapheme.\n  // Browser caret movement can report offsets around UTF-16 surrogate\n  // pairs and emoji joiners; measuring a partial sequence gives a\n  // replacement-glyph width.\n  const segmenter = getGraphemeSegmenter();\n  if (segmenter !== undefined) {\n    for (const segment of segmenter.segment(text)) {\n      const segmentStart = segment.index;\n      const segmentEnd = segmentStart + segment.segment.length;\n      if (boundedOffset > segmentStart && boundedOffset < segmentEnd) {\n        return segmentEnd;\n      }\n      if (boundedOffset <= segmentStart) {\n        break;\n      }\n    }\n    return boundedOffset;\n  }\n  // Degraded path for engines lacking Intl.Segmenter: snap out of a\n  // surrogate pair by stepping over code points.\n  let segmentStart = 0;\n  for (const codePoint of text) {\n    const segmentEnd = segmentStart + codePoint.length;\n    if (boundedOffset > segmentStart && boundedOffset < segmentEnd) {\n      return segmentEnd;\n    }\n    if (boundedOffset <= segmentStart) {\n      break;\n    }\n    segmentStart = segmentEnd;\n  }\n  return boundedOffset;\n}\n\n/** get the offsets of the Unicode grapheme clusters in the text */\nexport function getUnicodeMeasurementOffsets(\n  text: string\n): number[] | undefined {\n  if (!needsDomTextMeasurement(text)) {\n    return undefined;\n  }\n  const offsets = [0];\n  const segmenter = getGraphemeSegmenter();\n  if (segmenter !== undefined) {\n    for (const segment of segmenter.segment(text)) {\n      offsets.push(segment.index + segment.segment.length);\n    }\n    return offsets;\n  }\n  // Degraded path for engines lacking Intl.Segmenter: step by code point.\n  let offset = 0;\n  for (const codePoint of text) {\n    offset += codePoint.length;\n    offsets.push(offset);\n  }\n  return offsets;\n}\n\n/**\n * Count the rendered columns of ASCII text, advancing each tab to the next\n * fixed tab stop (a multiple of tabSize) to match CSS `tab-size`. Returns -1\n * for non-ASCII text, which must be measured glyph-by-glyph instead.\n */\nexport function getExpandedAsciiTextColumns(\n  text: string,\n  tabSize: number\n): number {\n  let columns = 0;\n  for (let i = 0; i < text.length; i++) {\n    const code = text.charCodeAt(i);\n    if (code > 127) {\n      return -1;\n    }\n    columns += code === /* '\\t' */ 9 ? tabSize - (columns % tabSize) : 1;\n  }\n  return columns;\n}\n"],"mappings":"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"}
+{"version":3,"file":"textMeasure.js","names":[],"sources":["../../src/editor/textMeasure.ts"],"sourcesContent":["import { getGraphemeSegmenter, h, round } from './utils';\n\n// Upper bound on cached DOM text-width measurements. The cache only holds\n// non-ASCII runs (emoji, ZWJ sequences, variation selectors, combining marks),\n// so it stays small for ordinary code, but capping it prevents unbounded growth\n// on emoji-heavy documents. Past the cap the oldest entry is evicted.\nconst TEXT_WIDTH_CACHE_LIMIT = 4096;\n\nconst COMBINING_MARK_PATTERN = /\\p{Mark}/u;\n\nexport class Metrics {\n  #root?: HTMLElement;\n  #canvas?: HTMLCanvasElement;\n  #canvasCtx?: CanvasRenderingContext2D;\n  #font?: string;\n\n  // Memoizes domMeasureTextWidth() results\n  #textWidthCache = new Map<string, number>();\n\n  /** Width of the '0' character. */\n  ch: number = -1;\n  /** Size of a tab(\\t) character. */\n  tabSize: number = 2;\n  /** Height of the code line. */\n  lineHeight: number = 20;\n  /** Padding top of the root element. */\n  paddingTop: number = 0;\n\n  /** initialize the metrics */\n  init(root: HTMLElement): void {\n    if (\n      this.#root === root &&\n      this.#canvasCtx !== undefined &&\n      this.ch !== -1\n    ) {\n      // already initialized\n      return;\n    }\n\n    this.#root = root;\n    this.#canvas ??= h('canvas', { style: { display: 'none' } });\n    this.#canvasCtx ??= this.#canvas.getContext('2d') ?? undefined;\n    if (this.#canvasCtx === undefined) {\n      throw new Error('Could not get canvas context');\n    }\n\n    const parent = root.parentElement;\n    if (parent !== null) {\n      const { paddingTop } = getComputedStyle(parent);\n      if (paddingTop.endsWith('px')) {\n        this.paddingTop = parseFloat(paddingTop.slice(0, -2));\n      }\n    }\n\n    const { fontSize, fontFamily, tabSize, lineHeight } =\n      getComputedStyle(root);\n    if (lineHeight.endsWith('px')) {\n      this.lineHeight = parseFloat(lineHeight.slice(0, -2));\n    } else if (fontSize.endsWith('px')) {\n      this.lineHeight = round(\n        parseFloat(fontSize.slice(0, -2)) * parseFloat(lineHeight)\n      );\n    }\n    const font = fontSize + ' ' + fontFamily;\n    if (this.#font !== font || this.ch === -1) {\n      this.#font = font;\n      this.#setCanvasFont(font);\n      this.ch = this.canvasMeasureTextWidth('0');\n      // Cached DOM widths were measured against the previous font.\n      this.clearTextWidthCache();\n    }\n    const nextTabSize = parseInt(tabSize, 10);\n    if (!Number.isNaN(nextTabSize)) {\n      this.tabSize = nextTabSize;\n    }\n  }\n\n  /**\n   * Re-measure the '0' character width against the font that is loaded right\n   * now, returning true when measurement-dependent UI should refresh.\n   *\n   * A custom web font can finish loading after the editor first renders.\n   * Until then canvas measureText reports the fallback font's width, and\n   * getComputedStyle returns the same font-family string before and after the\n   * file arrives, so init()'s font guard never re-measures on its own. Call\n   * this once fonts have settled (e.g. on document.fonts.ready) to replace a\n   * width measured against the fallback font with the real glyph width. Font\n   * completion can also change DOM-measured emoji/ZWJ widths while leaving the\n   * ASCII width unchanged, and the computed font string stays the same in both\n   * cases. The boolean return lets the caller skip re-rendering when there is no\n   * measured state to refresh.\n   */\n  remeasureCharacterWidth(): boolean {\n    if (this.#canvasCtx === undefined || this.#font === undefined) {\n      return false;\n    }\n    this.#setCanvasFont(this.#font);\n    const ch = this.canvasMeasureTextWidth('0');\n    const characterWidthChanged = ch !== this.ch;\n    if (characterWidthChanged) {\n      this.ch = ch;\n    }\n    const textWidthCacheCleared = this.#clearTextWidthCache();\n    return characterWidthChanged || textWidthCacheCleared;\n  }\n\n  /**\n   * Set the canvas font while the canvas is connected to the document.\n   *\n   * WebKit resolves a canvas font from the canvas element's computed style at\n   * assignment. A detached canvas has none, so WebKit ignores user-installed\n   * fonts and measures the fallback family while the DOM renders the real font,\n   * shifting every caret and selection in hosts that allow user-installed fonts\n   * (WKWebView, Playwright WebKit). Connecting the canvas for the assignment\n   * makes it measure the same font the DOM renders.\n   */\n  #setCanvasFont(font: string): void {\n    const root = this.#root;\n    const canvas = this.#canvas;\n    const canvasCtx = this.#canvasCtx;\n    if (root == null || canvas == null || canvasCtx == null) {\n      throw new Error('Metrics not initialized');\n    }\n    root.append(canvas);\n    try {\n      canvasCtx.font = font;\n    } finally {\n      canvas.remove();\n    }\n  }\n\n  /** measure the width of the text */\n  measureTextWidth(text: string): number {\n    if (!text.includes('\\t')) {\n      return this.#measureTextWidthWithoutTabs(text);\n    }\n    if (this.#canvasCtx === undefined) {\n      throw new Error('Metrics not initialized');\n    }\n    const asciiColumns = getExpandedAsciiTextColumns(text, this.tabSize);\n    if (asciiColumns !== -1) {\n      return asciiColumns * this.ch;\n    }\n\n    let width = 0;\n    let runStart = 0;\n    const tabStopWidth = this.tabSize * this.ch;\n    for (let i = 0; i < text.length; i++) {\n      if (text.charCodeAt(i) !== /* '\\t' */ 9) {\n        continue;\n      }\n\n      if (i > runStart) {\n        width += this.#measureTextWidthWithoutTabs(text.slice(runStart, i));\n      }\n      // CSS tab stops are pixel positions, so wide glyphs before a tab must\n      // contribute their measured width rather than one logical column.\n      if (tabStopWidth > 0) {\n        const remainder = width % tabStopWidth;\n        width += remainder === 0 ? tabStopWidth : tabStopWidth - remainder;\n      }\n      runStart = i + 1;\n    }\n\n    if (runStart < text.length) {\n      width += this.#measureTextWidthWithoutTabs(text.slice(runStart));\n    }\n    return round(width);\n  }\n\n  /**\n   * Pixel width from a wrapped segment's start up to a character. Tabs advance\n   * from the segment start so their stops line up with the rendered text.\n   */\n  segmentTextWidth(\n    lineText: string,\n    segmentStart: number,\n    character: number\n  ): number {\n    if (character <= segmentStart) {\n      return 0;\n    }\n    const segmentText = lineText.slice(segmentStart, character);\n    const asciiColumns = getExpandedAsciiTextColumns(segmentText, this.tabSize);\n    return asciiColumns !== -1\n      ? asciiColumns * this.ch\n      : this.measureTextWidth(segmentText);\n  }\n\n  #measureTextWidthWithoutTabs(text: string): number {\n    if (needsDomTextMeasurement(text)) {\n      return this.domMeasureTextWidth(text);\n    }\n    return this.canvasMeasureTextWidth(text);\n  }\n\n  /** measure the width of the text using the canvas measureText API */\n  canvasMeasureTextWidth(text: string): number {\n    if (this.#canvasCtx === undefined) {\n      throw new Error('Metrics not initialized');\n    }\n    return round(this.#canvasCtx.measureText(text).width);\n  }\n\n  /**\n   * measure the width of the text using the DOM\n   * this is slow because it cause a reflow, use it for non-ascii text;\n   * results are memoized per text so repeated measurements skip the reflow\n   */\n  domMeasureTextWidth(text: string): number {\n    if (this.#root === undefined) {\n      throw new Error('Metrics not initialized');\n    }\n    const cacheKey = text + '|' + this.#font;\n    const cached = this.#textWidthCache.get(cacheKey);\n    if (cached !== undefined) {\n      return cached;\n    }\n    const measureEl = h(\n      'span',\n      {\n        style: {\n          position: 'absolute',\n          top: '0',\n          left: '0',\n          visibility: 'hidden',\n          pointerEvents: 'none',\n          whiteSpace: 'pre',\n          font: 'inherit',\n        },\n        textContent: text,\n      },\n      this.#root\n    );\n    let width: number;\n    try {\n      // round() to match canvasMeasureTextWidth and ch; otherwise the DOM path\n      // returns raw sub-pixel widths and caret/selection offsets drift between\n      // ASCII and non-ASCII runs on the same line.\n      width = round(measureEl.getBoundingClientRect().width);\n    } finally {\n      measureEl.remove();\n    }\n    if (this.#textWidthCache.size >= TEXT_WIDTH_CACHE_LIMIT) {\n      const oldestKey = this.#textWidthCache.keys().next().value;\n      if (oldestKey !== undefined) {\n        this.#textWidthCache.delete(oldestKey);\n      }\n    }\n    this.#textWidthCache.set(cacheKey, width);\n    return width;\n  }\n\n  /**\n   * discard memoized DOM text widths\n   * call this when the inherited font may have changed without re-running\n   * init(), e.g. on a layout reflow, so stale widths are not reused\n   */\n  clearTextWidthCache(): void {\n    this.#clearTextWidthCache();\n  }\n\n  #clearTextWidthCache(): boolean {\n    const hadCachedTextWidths = this.#textWidthCache.size > 0;\n    this.#textWidthCache.clear();\n    return hadCachedTextWidths;\n  }\n}\n\n/** Check if the text needs DOM text measurement. */\nexport function needsDomTextMeasurement(text: string): boolean {\n  for (let i = 0; i < text.length; i++) {\n    const code = text.charCodeAt(i);\n    if (\n      (code >= 0xd800 && code <= 0xdfff) ||\n      code === 0x200d ||\n      code === 0xfe0e ||\n      code === 0xfe0f ||\n      (code > 0x7f && COMBINING_MARK_PATTERN.test(text.charAt(i)))\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\n/** snap the text offset to the Unicode boundary */\nexport function snapTextOffsetToUnicodeBoundary(\n  text: string,\n  offset: number\n): number {\n  const boundedOffset = Math.max(0, Math.min(offset, text.length));\n  if (\n    boundedOffset === 0 ||\n    boundedOffset === text.length ||\n    !needsDomTextMeasurement(text)\n  ) {\n    return boundedOffset;\n  }\n  // Avoid measuring a caret position inside one visual emoji/grapheme.\n  // Browser caret movement can report offsets around UTF-16 surrogate\n  // pairs and emoji joiners; measuring a partial sequence gives a\n  // replacement-glyph width.\n  const segmenter = getGraphemeSegmenter();\n  if (segmenter !== undefined) {\n    for (const segment of segmenter.segment(text)) {\n      const segmentStart = segment.index;\n      const segmentEnd = segmentStart + segment.segment.length;\n      if (boundedOffset > segmentStart && boundedOffset < segmentEnd) {\n        return segmentEnd;\n      }\n      if (boundedOffset <= segmentStart) {\n        break;\n      }\n    }\n    return boundedOffset;\n  }\n  // Degraded path for engines lacking Intl.Segmenter: snap out of a\n  // surrogate pair by stepping over code points.\n  let segmentStart = 0;\n  for (const codePoint of text) {\n    const segmentEnd = segmentStart + codePoint.length;\n    if (boundedOffset > segmentStart && boundedOffset < segmentEnd) {\n      return segmentEnd;\n    }\n    if (boundedOffset <= segmentStart) {\n      break;\n    }\n    segmentStart = segmentEnd;\n  }\n  return boundedOffset;\n}\n\n/** get the offsets of the Unicode grapheme clusters in the text */\nexport function getUnicodeMeasurementOffsets(\n  text: string\n): number[] | undefined {\n  if (!needsDomTextMeasurement(text)) {\n    return undefined;\n  }\n  const offsets = [0];\n  const segmenter = getGraphemeSegmenter();\n  if (segmenter !== undefined) {\n    for (const segment of segmenter.segment(text)) {\n      offsets.push(segment.index + segment.segment.length);\n    }\n    return offsets;\n  }\n  // Degraded path for engines lacking Intl.Segmenter: step by code point.\n  let offset = 0;\n  for (const codePoint of text) {\n    offset += codePoint.length;\n    offsets.push(offset);\n  }\n  return offsets;\n}\n\n/**\n * Count the rendered columns of ASCII text, advancing each tab to the next\n * fixed tab stop (a multiple of tabSize) to match CSS `tab-size`. Returns -1\n * for non-ASCII text, which must be measured glyph-by-glyph instead.\n */\nexport function getExpandedAsciiTextColumns(\n  text: string,\n  tabSize: number\n): number {\n  let columns = 0;\n  for (let i = 0; i < text.length; i++) {\n    const code = text.charCodeAt(i);\n    if (code > 127) {\n      return -1;\n    }\n    columns += code === /* '\\t' */ 9 ? tabSize - (columns % tabSize) : 1;\n  }\n  return columns;\n}\n"],"mappings":"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"}

package/dist/highlighter/languages/attachResolvedLanguages.js

@@ -9,8 +9,15 @@ function attachResolvedLanguages(resolvedLanguages, highlighter) {
 			lang = resolvedLang;
 			ResolvedLanguages.set(resolvedLang.name, lang);
 		}
-		AttachedLanguages.add(lang.name);
+		const grammar = lang.data.find((grammar) => grammar.name === lang.name || grammar.aliases?.includes(lang.name) === true);
+		if (grammar == null) throw new Error(`attachResolvedLanguages: No returned grammar declares "${lang.name}" as its name or an alias.`);
 		highlighter.loadLanguageSync(lang.data);
+		try {
+			highlighter.getLanguage(lang.name);
+		} catch {
+			throw new Error(`attachResolvedLanguages: "${grammar.name}" is already loaded without alias "${lang.name}". Load the alias first or give the grammar a unique name.`);
+		}
+		AttachedLanguages.add(lang.name);
 	}
 }
 //#endregion

package/dist/highlighter/languages/attachResolvedLanguages.js.map

@@ -1 +1 @@
-{"version":3,"file":"attachResolvedLanguages.js","names":[],"sources":["../../../src/highlighter/languages/attachResolvedLanguages.ts"],"sourcesContent":["import type { DiffsHighlighter } from '../../types';\nimport type { ResolvedLanguage } from '../../worker';\nimport { AttachedLanguages, ResolvedLanguages } from './constants';\n\nexport function attachResolvedLanguages(\n  resolvedLanguages: ResolvedLanguage | ResolvedLanguage[],\n  highlighter: DiffsHighlighter\n): void {\n  resolvedLanguages = Array.isArray(resolvedLanguages)\n    ? resolvedLanguages\n    : [resolvedLanguages];\n\n  for (const resolvedLang of resolvedLanguages) {\n    if (AttachedLanguages.has(resolvedLang.name)) continue;\n    let lang = ResolvedLanguages.get(resolvedLang.name);\n    if (lang == null) {\n      lang = resolvedLang;\n      ResolvedLanguages.set(resolvedLang.name, lang);\n    }\n    AttachedLanguages.add(lang.name);\n    highlighter.loadLanguageSync(lang.data);\n  }\n}\n"],"mappings":";;AAIA,SAAgB,wBACd,mBACA,aACM;CACN,oBAAoB,MAAM,QAAQ,iBAAiB,IAC/C,oBACA,CAAC,iBAAiB;CAEtB,KAAK,MAAM,gBAAgB,mBAAmB;EAC5C,IAAI,kBAAkB,IAAI,aAAa,IAAI,GAAG;EAC9C,IAAI,OAAO,kBAAkB,IAAI,aAAa,IAAI;EAClD,IAAI,QAAQ,MAAM;GAChB,OAAO;GACP,kBAAkB,IAAI,aAAa,MAAM,IAAI;EAC/C;EACA,kBAAkB,IAAI,KAAK,IAAI;EAC/B,YAAY,iBAAiB,KAAK,IAAI;CACxC;AACF"}
+{"version":3,"file":"attachResolvedLanguages.js","names":[],"sources":["../../../src/highlighter/languages/attachResolvedLanguages.ts"],"sourcesContent":["import type { DiffsHighlighter } from '../../types';\nimport type { ResolvedLanguage } from '../../worker';\nimport { AttachedLanguages, ResolvedLanguages } from './constants';\n\nexport function attachResolvedLanguages(\n  resolvedLanguages: ResolvedLanguage | ResolvedLanguage[],\n  highlighter: DiffsHighlighter\n): void {\n  resolvedLanguages = Array.isArray(resolvedLanguages)\n    ? resolvedLanguages\n    : [resolvedLanguages];\n\n  for (const resolvedLang of resolvedLanguages) {\n    if (AttachedLanguages.has(resolvedLang.name)) continue;\n    let lang = ResolvedLanguages.get(resolvedLang.name);\n    if (lang == null) {\n      lang = resolvedLang;\n      ResolvedLanguages.set(resolvedLang.name, lang);\n    }\n    const grammar = lang.data.find(\n      (grammar) =>\n        grammar.name === lang.name ||\n        grammar.aliases?.includes(lang.name) === true\n    );\n    if (grammar == null) {\n      throw new Error(\n        `attachResolvedLanguages: No returned grammar declares \"${lang.name}\" as its name or an alias.`\n      );\n    }\n    highlighter.loadLanguageSync(lang.data);\n    // Shiki can skip an already-loaded grammar, including any newly added aliases.\n    try {\n      highlighter.getLanguage(lang.name);\n    } catch {\n      throw new Error(\n        `attachResolvedLanguages: \"${grammar.name}\" is already loaded without alias \"${lang.name}\". Load the alias first or give the grammar a unique name.`\n      );\n    }\n    AttachedLanguages.add(lang.name);\n  }\n}\n"],"mappings":";;AAIA,SAAgB,wBACd,mBACA,aACM;CACN,oBAAoB,MAAM,QAAQ,iBAAiB,IAC/C,oBACA,CAAC,iBAAiB;CAEtB,KAAK,MAAM,gBAAgB,mBAAmB;EAC5C,IAAI,kBAAkB,IAAI,aAAa,IAAI,GAAG;EAC9C,IAAI,OAAO,kBAAkB,IAAI,aAAa,IAAI;EAClD,IAAI,QAAQ,MAAM;GAChB,OAAO;GACP,kBAAkB,IAAI,aAAa,MAAM,IAAI;EAC/C;EACA,MAAM,UAAU,KAAK,KAAK,MACvB,YACC,QAAQ,SAAS,KAAK,QACtB,QAAQ,SAAS,SAAS,KAAK,IAAI,MAAM,IAC7C;EACA,IAAI,WAAW,MACb,MAAM,IAAI,MACR,0DAA0D,KAAK,KAAK,2BACtE;EAEF,YAAY,iBAAiB,KAAK,IAAI;EAEtC,IAAI;GACF,YAAY,YAAY,KAAK,IAAI;EACnC,QAAQ;GACN,MAAM,IAAI,MACR,6BAA6B,QAAQ,KAAK,qCAAqC,KAAK,KAAK,2DAC3F;EACF;EACA,kBAAkB,IAAI,KAAK,IAAI;CACjC;AACF"}

package/dist/highlighter/languages/registerCustomLanguage.d.ts

@@ -2,7 +2,9 @@ import { DynamicImportLanguageRegistration } from "shiki";
 //#region src/highlighter/languages/registerCustomLanguage.d.ts
 /**
  * Register a custom language loader and optionally map it to
- * file names or extensions.
+ * file names or extensions. The registered name must match a returned
+ * grammar's name or aliases; registering a loader does not automatically add a
+ * grammar alias.
  */
 declare function registerCustomLanguage(lang: string, loader: DynamicImportLanguageRegistration,
 /**

package/dist/highlighter/languages/registerCustomLanguage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerCustomLanguage.d.ts","names":[],"sources":["../../../src/highlighter/languages/registerCustomLanguage.ts"],"mappings":";;;;;;iBASgB,uBACd,cACA,QAAQ,mCAOR;;;;;;;AAAA"}
+{"version":3,"file":"registerCustomLanguage.d.ts","names":[],"sources":["../../../src/highlighter/languages/registerCustomLanguage.ts"],"mappings":";;;;;;;;iBAWgB,uBACd,cACA,QAAQ,mCAOR;;;;;;;AAAA"}

package/dist/highlighter/languages/registerCustomLanguage.js

@@ -3,7 +3,9 @@ import { setCustomExtension } from "../../utils/getFiletypeFromFileName.js";
 //#region src/highlighter/languages/registerCustomLanguage.ts
 /**
 * Register a custom language loader and optionally map it to
-* file names or extensions.
+* file names or extensions. The registered name must match a returned
+* grammar's name or aliases; registering a loader does not automatically add a
+* grammar alias.
 */
 function registerCustomLanguage(lang, loader, extensionsOrFilenames = []) {
 	if (lang === "text" || lang === "ansi") throw new Error("registerCustomLanguage: 'text' and 'ansi' are reserved language names");

package/dist/highlighter/languages/registerCustomLanguage.js.map

@@ -1 +1 @@
-{"version":3,"file":"registerCustomLanguage.js","names":[],"sources":["../../../src/highlighter/languages/registerCustomLanguage.ts"],"sourcesContent":["import type { DynamicImportLanguageRegistration } from 'shiki';\n\nimport { setCustomExtension } from '../../utils/getFiletypeFromFileName';\nimport { RegisteredCustomLanguages } from './constants';\n\n/**\n * Register a custom language loader and optionally map it to\n * file names or extensions.\n */\nexport function registerCustomLanguage(\n  lang: string,\n  loader: DynamicImportLanguageRegistration,\n  /**\n   * File names or extensions to map to this language. Use exact filenames\n   * (e.g., \"Dockerfile\", \"CMakeLists.txt\") or extension tokens without a dot\n   * (e.g., \"proto\", \"foo\"). Compound extensions are supported\n   * (e.g., \"blade.php\").\n   */\n  extensionsOrFilenames: string[] = []\n): void {\n  if (lang === 'text' || lang === 'ansi') {\n    throw new Error(\n      \"registerCustomLanguage: 'text' and 'ansi' are reserved language names\"\n    );\n  }\n  if (RegisteredCustomLanguages.has(lang)) {\n    console.error(\n      `registerCustomLanguage: lang: ${lang} is already registered`\n    );\n    return;\n  }\n  RegisteredCustomLanguages.set(lang, loader);\n  for (const extension of extensionsOrFilenames) {\n    setCustomExtension(extension, lang);\n  }\n}\n"],"mappings":";;;;;;;AASA,SAAgB,uBACd,MACA,QAOA,wBAAkC,CAAC,GAC7B;CACN,IAAI,SAAS,UAAU,SAAS,QAC9B,MAAM,IAAI,MACR,uEACF;CAEF,IAAI,0BAA0B,IAAI,IAAI,GAAG;EACvC,QAAQ,MACN,iCAAiC,KAAK,uBACxC;EACA;CACF;CACA,0BAA0B,IAAI,MAAM,MAAM;CAC1C,KAAK,MAAM,aAAa,uBACtB,mBAAmB,WAAW,IAAI;AAEtC"}
+{"version":3,"file":"registerCustomLanguage.js","names":[],"sources":["../../../src/highlighter/languages/registerCustomLanguage.ts"],"sourcesContent":["import type { DynamicImportLanguageRegistration } from 'shiki';\n\nimport { setCustomExtension } from '../../utils/getFiletypeFromFileName';\nimport { RegisteredCustomLanguages } from './constants';\n\n/**\n * Register a custom language loader and optionally map it to\n * file names or extensions. The registered name must match a returned\n * grammar's name or aliases; registering a loader does not automatically add a\n * grammar alias.\n */\nexport function registerCustomLanguage(\n  lang: string,\n  loader: DynamicImportLanguageRegistration,\n  /**\n   * File names or extensions to map to this language. Use exact filenames\n   * (e.g., \"Dockerfile\", \"CMakeLists.txt\") or extension tokens without a dot\n   * (e.g., \"proto\", \"foo\"). Compound extensions are supported\n   * (e.g., \"blade.php\").\n   */\n  extensionsOrFilenames: string[] = []\n): void {\n  if (lang === 'text' || lang === 'ansi') {\n    throw new Error(\n      \"registerCustomLanguage: 'text' and 'ansi' are reserved language names\"\n    );\n  }\n  if (RegisteredCustomLanguages.has(lang)) {\n    console.error(\n      `registerCustomLanguage: lang: ${lang} is already registered`\n    );\n    return;\n  }\n  RegisteredCustomLanguages.set(lang, loader);\n  for (const extension of extensionsOrFilenames) {\n    setCustomExtension(extension, lang);\n  }\n}\n"],"mappings":";;;;;;;;;AAWA,SAAgB,uBACd,MACA,QAOA,wBAAkC,CAAC,GAC7B;CACN,IAAI,SAAS,UAAU,SAAS,QAC9B,MAAM,IAAI,MACR,uEACF;CAEF,IAAI,0BAA0B,IAAI,IAAI,GAAG;EACvC,QAAQ,MACN,iCAAiC,KAAK,uBACxC;EACA;CACF;CACA,0BAA0B,IAAI,MAAM,MAAM;CAC1C,KAAK,MAAM,aAAa,uBACtB,mBAAmB,WAAW,IAAI;AAEtC"}

package/dist/index.d.ts

@@ -11,7 +11,7 @@ import { Virtualizer, VirtualizerConfig, VirtualizerScrollOptions } from "./comp
 import { VirtualizedFile } from "./components/VirtualizedFile.js";
 import { VIRTUALIZED_FILE_DIFF_LAYOUT_CHECKPOINT_INTERVAL, VirtualizedFileDiff } from "./components/VirtualizedFileDiff.js";
 import { CODE_VIEW_DIFF_OPTION_KEYS, CODE_VIEW_FILE_OPTION_KEYS, CodeView, CodeViewCoordinator, CodeViewCreateEditorOptions, CodeViewItemEditCompleteEventMap, CodeViewItemEditCompleteHandler, CodeViewLineSelection, CodeViewMode, CodeViewModeItemMap, CodeViewOptions, CodeViewRenderedDiffItem, CodeViewRenderedFileItem, CodeViewRenderedItem, CodeViewScrollListener, CodeViewSlotSnapshot } from "./components/CodeView.js";
-import { ALTERNATE_FILE_NAMES_GIT, CODE_VIEW_FOOTER_ATTRIBUTE, CODE_VIEW_HEADER_ATTRIBUTE, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_DEVELOPMENT_BUILD, DIFFS_SCROLLBAR_GUTTER_MEASURED_PROPERTY, DIFFS_SCROLLBAR_MEASURE_ATTRIBUTE, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, SPLIT_WITH_NEWLINES, THEME_CSS_ATTRIBUTE, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE } from "./constants.js";
+import { CODE_VIEW_FOOTER_ATTRIBUTE, CODE_VIEW_HEADER_ATTRIBUTE, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_DEVELOPMENT_BUILD, DIFFS_SCROLLBAR_GUTTER_MEASURED_PROPERTY, DIFFS_SCROLLBAR_MEASURE_ATTRIBUTE, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, SPLIT_WITH_NEWLINES, THEME_CSS_ATTRIBUTE, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE } from "./constants.js";
 import { CodeToTokenTransformStreamOptions, RecallToken, ShikiStreamTokenizerEnqueueResult, ShikiStreamTokenizerOptions } from "./shiki-stream/types.js";
 import { ShikiStreamTokenizer } from "./shiki-stream/tokenizer.js";
 import { CodeToTokenTransformStream } from "./shiki-stream/stream.js";
@@ -111,4 +111,4 @@ import { setLanguageOverride } from "./utils/setLanguageOverride.js";
 import { setPreNodeProperties } from "./utils/setWrapperNodeProps.js";
 import { trimPatchContext } from "./utils/trimPatchContext.js";
 import { codeToHtml, createCssVariablesTheme as createCSSVariablesTheme } from "shiki";
-export { ALTERNATE_FILE_NAMES_GIT, type AnnotationLineMap, type AnnotationSide, type AnnotationSpan, type AppliedThemeStyleCache, AttachedLanguages, AttachedThemes, type BaseCodeOptions, type BaseDiffOptions, type BaseDiffOptionsWithDefaults, type BundledLanguage, CODE_VIEW_DIFF_OPTION_KEYS, CODE_VIEW_FILE_OPTION_KEYS, CODE_VIEW_FOOTER_ATTRIBUTE, CODE_VIEW_HEADER_ATTRIBUTE, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, type ChangeContent, type ChangeTypes, type CodeColumnType, type CodeToHastOptions, CodeToTokenTransformStream, CodeToTokenTransformStreamOptions, CodeView, CodeViewCoordinator, CodeViewCreateEditorOptions, type CodeViewDiffItem, type CodeViewFileItem, type CodeViewItem, CodeViewItemEditCompleteEventMap, CodeViewItemEditCompleteHandler, type CodeViewItemScrollTarget, type CodeViewLayout, type CodeViewLineScrollTarget, CodeViewLineSelection, CodeViewMode, CodeViewModeItemMap, CodeViewOptions, type CodeViewPositionScrollTarget, type CodeViewRangeScrollTarget, CodeViewRenderedDiffItem, CodeViewRenderedFileItem, CodeViewRenderedItem, type CodeViewScrollBehavior, CodeViewScrollListener, type CodeViewScrollTarget, CodeViewSlotSnapshot, type ConflictResolverTypes, type ContextContent, CreateFileHeaderElementProps, type CreatePatchOptionsNonabortable, type CustomPreProperties, CustomThemeLoader, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_DEVELOPMENT_BUILD, DIFFS_SCROLLBAR_GUTTER_MEASURED_PROPERTY, DIFFS_SCROLLBAR_MEASURE_ATTRIBUTE, DIFFS_TAG_NAME, type DecorationItem, type DiffAcceptRejectHunkConfig, type DiffAcceptRejectHunkType, type DiffFileInput, DiffHunksRenderer, DiffHunksRendererOptions, DiffHunksRendererOptionsWithDefaults, type DiffIndicators, type DiffLineAnnotation, type DiffLineEventBaseProps, type DiffTokenEventBaseProps, type DiffsHighlighter, type DiffsThemeNames, EMPTY_RENDER_RANGE, EXTENSION_TO_FILE_FORMAT, type ExpansionDirections, type ExtensionFormatMap, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, File, type FileContents, FileDiff, type FileDiffContentsLoader, FileDiffEditChangeHandler, type FileDiffEditCompleteEvent, FileDiffEditCompleteHandler, FileDiffHydrationProps, type FileDiffLoadedChangedFiles, type FileDiffLoadedFiles, type FileDiffLoadedPureRenamedFile, type FileDiffMetadata, FileDiffOptions, FileDiffRenderBaseProps, FileDiffRenderProps, FileDiffType, FileEditChangeHandler, type FileEditCompleteEvent, FileEditCompleteHandler, type FileHeaderRenderMode, FileHydrateProps, FileOptions, FileRenderProps, FileRenderResult, FileRenderer, FileRendererOptions, FileStream, FileStreamOptions, type ForceDiffPlainTextOptions, type ForceFilePlainTextOptions, GIT_DIFF_FILE_BREAK_REGEX, type GapSpan, GetHoveredLineResult, GetLineIndexUtility, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, type HighlightedToken, type HighlighterTypes, type Hunk, type HunkData, type HunkExpansionRegion, type HunkLineType, type HunkSeparators, HunksRenderResult, INDEX_LINE_METADATA, InjectedRow, InteractionManager, InteractionManagerBaseOptions, InteractionManagerMode, InteractionManagerOptions, type LanguageRegistration, type LineAnnotation, LineAnnotationPosition, LineDecoration, type LineDiffTypes, type LineEventBaseProps, type LineInfo, type LineSpans, type LineTypes, LogTypes, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, type MaybeDiffFileInput, type MergeConflictActionPayload, MergeConflictActionTarget, MergeConflictActionsTypeOption, type MergeConflictMarkerRow, type MergeConflictMarkerRowType, type MergeConflictRegion, type MergeConflictResolution, type NumericScrollLineAnchor, type ObservedAnnotationNodes, type ObservedGridNodes, OnDiffLineClickProps, OnDiffLineEnterLeaveProps, OnLineClickProps, OnLineEnterLeaveProps, OnTokenEventProps, ParsedLine, type ParsedPatch, type PendingCodeViewLayoutReset, type PostRenderPhase, type PrePropertiesConfig, type ProcessFileConflictData, RecallToken, RegisteredCustomLanguages, type RenderDiffFilesResult, type RenderDiffOptions, type RenderDiffResult, type RenderFileMetadata, type RenderFileOptions, type RenderFileResult, type RenderHeaderFilenameSuffixCallback, type RenderHeaderMetadataCallback, type RenderHeaderPrefixCallback, RenderMergeConflictActions, type RenderRange, type RenderWindow, type RenderedDiffASTCache, type RenderedFileASTCache, RenderedLineContext, ResizeManager, ResizeManagerColumnVariableMode, ResizeManagerSetupOptions, ResolvedLanguages, ResolvingLanguages, SPLIT_WITH_NEWLINES, SVGSpriteNames, SVGSpriteSheet, ScrollSyncManager, type SelectedLineRange, type SelectionPoint, type SelectionSide, SelectionWriteOptions, type SharedRenderState, ShikiStreamTokenizer, ShikiStreamTokenizerEnqueueResult, ShikiStreamTokenizerOptions, type ShikiTransformer, type SmoothScrollSettings, SplitInjectedRow, SplitInjectedRowPlacement, SplitLineDecorationProps, type StickySpecs, type SupportedLanguages, THEME_CSS_ATTRIBUTE, type ThemeRegistration, type ThemeRegistrationResolved, type ThemeTypes, type ThemedDiffResult, type ThemedFileResult, type ThemedToken, type ThemesType, type TokenEventBase, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnifiedInjectedRowPlacement, UnifiedLineDecorationProps, UnresolvedFile, UnresolvedFileHydrationProps, UnresolvedFileOptions, UnresolvedFileRenderProps, VIRTUALIZED_FILE_DIFF_LAYOUT_CHECKPOINT_INTERVAL, type VirtualFileMetrics, type VirtualWindowSpecs, VirtualizedFile, VirtualizedFileDiff, Virtualizer, VirtualizerConfig, VirtualizerScrollOptions, areDiffLineAnnotationsEqual, areDiffRenderOptionsEqual, areDiffTargetsEqual, areFileRenderOptionsEqual, areFilesEqual, areHunkDataEqual, areLanguagesAttached, areLineAnnotationsEqual, areObjectsEqual, areOptionsEqual, arePrePropertiesEqual, areRenderRangesEqual, areSelectionsEqual, areThemesAttached, areThemesEqual, areVirtualWindowSpecsEqual, areWorkerStatsEqual, attachResolvedLanguages, attachResolvedThemes, cleanLastNewline, cleanUpResolvedLanguages, cleanUpResolvedThemes, clearRenderQueue, cloneFileDiffMetadata, cloneHunks, codeToHtml, createAnnotationElement, createAnnotationWrapperNode, createCSSVariablesTheme, createDiffSpanDecoration, createEmptyRowBuffer, createFileHeaderElement, createGutterGap, createGutterItem, createGutterUtilityContentNode, createGutterUtilityElement, createGutterWrapper, createHastElement, createIconElement, createNoNewlineElement, createPreElement, createPreWrapperProperties, createRowNodes, createSeparator, createSpanFromToken, createStyleElement, createTextNodeElement, createThemeStyleElement, createTransformerWithState, createUnsafeCSSStyleNode, createWindowFromScrollPosition, dequeueRender, detachString, diffAcceptRejectHunk, disposeHighlighter, findCodeElement, formatCSSVariablePrefix, getCustomExtensionsMap, getCustomExtensionsVersion, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineAnnotationSource, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, getUnresolvedDiffHunksRendererOptions, hasResolvedLanguages, hasResolvedThemes, hydratePartialDiff, isDefaultRenderRange, isDiffAnnotation, isDiffAnnotationCollection, isFileAnnotation, isFileAnnotationCollection, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, patchScrollbarGutterSize, pluckInteractionOptions, prefersReducedMotion, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, recordLineAnnotationSource, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, releaseStringDetachBuffer, renderDiffWithHighlighter, renderFileWithHighlighter, replaceCustomExtensions, resolveConflict, resolveLanguage, resolveLanguages, resolveRegion, resolveTheme, resolveThemes, setCustomExtension, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapThemeCSS, wrapUnsafeCSS };
+export { type AnnotationLineMap, type AnnotationSide, type AnnotationSpan, type AppliedThemeStyleCache, AttachedLanguages, AttachedThemes, type BaseCodeOptions, type BaseDiffOptions, type BaseDiffOptionsWithDefaults, type BundledLanguage, CODE_VIEW_DIFF_OPTION_KEYS, CODE_VIEW_FILE_OPTION_KEYS, CODE_VIEW_FOOTER_ATTRIBUTE, CODE_VIEW_HEADER_ATTRIBUTE, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, type ChangeContent, type ChangeTypes, type CodeColumnType, type CodeToHastOptions, CodeToTokenTransformStream, CodeToTokenTransformStreamOptions, CodeView, CodeViewCoordinator, CodeViewCreateEditorOptions, type CodeViewDiffItem, type CodeViewFileItem, type CodeViewItem, CodeViewItemEditCompleteEventMap, CodeViewItemEditCompleteHandler, type CodeViewItemScrollTarget, type CodeViewLayout, type CodeViewLineScrollTarget, CodeViewLineSelection, CodeViewMode, CodeViewModeItemMap, CodeViewOptions, type CodeViewPositionScrollTarget, type CodeViewRangeScrollTarget, CodeViewRenderedDiffItem, CodeViewRenderedFileItem, CodeViewRenderedItem, type CodeViewScrollBehavior, CodeViewScrollListener, type CodeViewScrollTarget, CodeViewSlotSnapshot, type ConflictResolverTypes, type ContextContent, CreateFileHeaderElementProps, type CreatePatchOptionsNonabortable, type CustomPreProperties, CustomThemeLoader, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_DEVELOPMENT_BUILD, DIFFS_SCROLLBAR_GUTTER_MEASURED_PROPERTY, DIFFS_SCROLLBAR_MEASURE_ATTRIBUTE, DIFFS_TAG_NAME, type DecorationItem, type DiffAcceptRejectHunkConfig, type DiffAcceptRejectHunkType, type DiffFileInput, DiffHunksRenderer, DiffHunksRendererOptions, DiffHunksRendererOptionsWithDefaults, type DiffIndicators, type DiffLineAnnotation, type DiffLineEventBaseProps, type DiffTokenEventBaseProps, type DiffsHighlighter, type DiffsThemeNames, EMPTY_RENDER_RANGE, EXTENSION_TO_FILE_FORMAT, type ExpansionDirections, type ExtensionFormatMap, FILENAME_HEADER_REGEX, FILE_CONTEXT_BLOB, File, type FileContents, FileDiff, type FileDiffContentsLoader, FileDiffEditChangeHandler, type FileDiffEditCompleteEvent, FileDiffEditCompleteHandler, FileDiffHydrationProps, type FileDiffLoadedChangedFiles, type FileDiffLoadedFiles, type FileDiffLoadedPureRenamedFile, type FileDiffMetadata, FileDiffOptions, FileDiffRenderBaseProps, FileDiffRenderProps, FileDiffType, FileEditChangeHandler, type FileEditCompleteEvent, FileEditCompleteHandler, type FileHeaderRenderMode, FileHydrateProps, FileOptions, FileRenderProps, FileRenderResult, FileRenderer, FileRendererOptions, FileStream, FileStreamOptions, type ForceDiffPlainTextOptions, type ForceFilePlainTextOptions, GIT_DIFF_FILE_BREAK_REGEX, type GapSpan, GetHoveredLineResult, GetLineIndexUtility, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, type HighlightedToken, type HighlighterTypes, type Hunk, type HunkData, type HunkExpansionRegion, type HunkLineType, type HunkSeparators, HunksRenderResult, INDEX_LINE_METADATA, InjectedRow, InteractionManager, InteractionManagerBaseOptions, InteractionManagerMode, InteractionManagerOptions, type LanguageRegistration, type LineAnnotation, LineAnnotationPosition, LineDecoration, type LineDiffTypes, type LineEventBaseProps, type LineInfo, type LineSpans, type LineTypes, LogTypes, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, type MaybeDiffFileInput, type MergeConflictActionPayload, MergeConflictActionTarget, MergeConflictActionsTypeOption, type MergeConflictMarkerRow, type MergeConflictMarkerRowType, type MergeConflictRegion, type MergeConflictResolution, type NumericScrollLineAnchor, type ObservedAnnotationNodes, type ObservedGridNodes, OnDiffLineClickProps, OnDiffLineEnterLeaveProps, OnLineClickProps, OnLineEnterLeaveProps, OnTokenEventProps, ParsedLine, type ParsedPatch, type PendingCodeViewLayoutReset, type PostRenderPhase, type PrePropertiesConfig, type ProcessFileConflictData, RecallToken, RegisteredCustomLanguages, type RenderDiffFilesResult, type RenderDiffOptions, type RenderDiffResult, type RenderFileMetadata, type RenderFileOptions, type RenderFileResult, type RenderHeaderFilenameSuffixCallback, type RenderHeaderMetadataCallback, type RenderHeaderPrefixCallback, RenderMergeConflictActions, type RenderRange, type RenderWindow, type RenderedDiffASTCache, type RenderedFileASTCache, RenderedLineContext, ResizeManager, ResizeManagerColumnVariableMode, ResizeManagerSetupOptions, ResolvedLanguages, ResolvingLanguages, SPLIT_WITH_NEWLINES, SVGSpriteNames, SVGSpriteSheet, ScrollSyncManager, type SelectedLineRange, type SelectionPoint, type SelectionSide, SelectionWriteOptions, type SharedRenderState, ShikiStreamTokenizer, ShikiStreamTokenizerEnqueueResult, ShikiStreamTokenizerOptions, type ShikiTransformer, type SmoothScrollSettings, SplitInjectedRow, SplitInjectedRowPlacement, SplitLineDecorationProps, type StickySpecs, type SupportedLanguages, THEME_CSS_ATTRIBUTE, type ThemeRegistration, type ThemeRegistrationResolved, type ThemeTypes, type ThemedDiffResult, type ThemedFileResult, type ThemedToken, type ThemesType, type TokenEventBase, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnifiedInjectedRowPlacement, UnifiedLineDecorationProps, UnresolvedFile, UnresolvedFileHydrationProps, UnresolvedFileOptions, UnresolvedFileRenderProps, VIRTUALIZED_FILE_DIFF_LAYOUT_CHECKPOINT_INTERVAL, type VirtualFileMetrics, type VirtualWindowSpecs, VirtualizedFile, VirtualizedFileDiff, Virtualizer, VirtualizerConfig, VirtualizerScrollOptions, areDiffLineAnnotationsEqual, areDiffRenderOptionsEqual, areDiffTargetsEqual, areFileRenderOptionsEqual, areFilesEqual, areHunkDataEqual, areLanguagesAttached, areLineAnnotationsEqual, areObjectsEqual, areOptionsEqual, arePrePropertiesEqual, areRenderRangesEqual, areSelectionsEqual, areThemesAttached, areThemesEqual, areVirtualWindowSpecsEqual, areWorkerStatsEqual, attachResolvedLanguages, attachResolvedThemes, cleanLastNewline, cleanUpResolvedLanguages, cleanUpResolvedThemes, clearRenderQueue, cloneFileDiffMetadata, cloneHunks, codeToHtml, createAnnotationElement, createAnnotationWrapperNode, createCSSVariablesTheme, createDiffSpanDecoration, createEmptyRowBuffer, createFileHeaderElement, createGutterGap, createGutterItem, createGutterUtilityContentNode, createGutterUtilityElement, createGutterWrapper, createHastElement, createIconElement, createNoNewlineElement, createPreElement, createPreWrapperProperties, createRowNodes, createSeparator, createSpanFromToken, createStyleElement, createTextNodeElement, createThemeStyleElement, createTransformerWithState, createUnsafeCSSStyleNode, createWindowFromScrollPosition, dequeueRender, detachString, diffAcceptRejectHunk, disposeHighlighter, findCodeElement, formatCSSVariablePrefix, getCustomExtensionsMap, getCustomExtensionsVersion, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineAnnotationSource, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, getUnresolvedDiffHunksRendererOptions, hasResolvedLanguages, hasResolvedThemes, hydratePartialDiff, isDefaultRenderRange, isDiffAnnotation, isDiffAnnotationCollection, isFileAnnotation, isFileAnnotationCollection, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, patchScrollbarGutterSize, pluckInteractionOptions, prefersReducedMotion, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, recordLineAnnotationSource, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, releaseStringDetachBuffer, renderDiffWithHighlighter, renderFileWithHighlighter, replaceCustomExtensions, resolveConflict, resolveLanguage, resolveLanguages, resolveRegion, resolveTheme, resolveThemes, setCustomExtension, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapThemeCSS, wrapUnsafeCSS };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { ALTERNATE_FILE_NAMES_GIT, CODE_VIEW_FOOTER_ATTRIBUTE, CODE_VIEW_HEADER_ATTRIBUTE, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_DEVELOPMENT_BUILD, DIFFS_SCROLLBAR_GUTTER_MEASURED_PROPERTY, DIFFS_SCROLLBAR_MEASURE_ATTRIBUTE, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, SPLIT_WITH_NEWLINES, THEME_CSS_ATTRIBUTE, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE } from "./constants.js";
+import { CODE_VIEW_FOOTER_ATTRIBUTE, CODE_VIEW_HEADER_ATTRIBUTE, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_DEVELOPMENT_BUILD, DIFFS_SCROLLBAR_GUTTER_MEASURED_PROPERTY, DIFFS_SCROLLBAR_MEASURE_ATTRIBUTE, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, SPLIT_WITH_NEWLINES, THEME_CSS_ATTRIBUTE, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE } from "./constants.js";
 import { AttachedLanguages, RegisteredCustomLanguages, ResolvedLanguages, ResolvingLanguages } from "./highlighter/languages/constants.js";
 import { areLanguagesAttached } from "./highlighter/languages/areLanguagesAttached.js";
 import { attachResolvedLanguages } from "./highlighter/languages/attachResolvedLanguages.js";
@@ -107,4 +107,4 @@ import { parseLineType } from "./utils/parseLineType.js";
 import { setLanguageOverride } from "./utils/setLanguageOverride.js";
 import { trimPatchContext } from "./utils/trimPatchContext.js";
 import { codeToHtml, createCssVariablesTheme as createCSSVariablesTheme } from "shiki";
-export { ALTERNATE_FILE_NAMES_GIT, AttachedLanguages, AttachedThemes, CODE_VIEW_DIFF_OPTION_KEYS, CODE_VIEW_FILE_OPTION_KEYS, CODE_VIEW_FOOTER_ATTRIBUTE, CODE_VIEW_HEADER_ATTRIBUTE, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, CodeToTokenTransformStream, CodeView, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_DEVELOPMENT_BUILD, DIFFS_SCROLLBAR_GUTTER_MEASURED_PROPERTY, DIFFS_SCROLLBAR_MEASURE_ATTRIBUTE, DIFFS_TAG_NAME, DiffHunksRenderer, EMPTY_RENDER_RANGE, EXTENSION_TO_FILE_FORMAT, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, File, FileDiff, FileRenderer, FileStream, GIT_DIFF_FILE_BREAK_REGEX, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, InteractionManager, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, RegisteredCustomLanguages, ResizeManager, ResolvedLanguages, ResolvingLanguages, SPLIT_WITH_NEWLINES, SVGSpriteSheet, ScrollSyncManager, ShikiStreamTokenizer, THEME_CSS_ATTRIBUTE, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnresolvedFile, VIRTUALIZED_FILE_DIFF_LAYOUT_CHECKPOINT_INTERVAL, VirtualizedFile, VirtualizedFileDiff, Virtualizer, areDiffLineAnnotationsEqual, areDiffRenderOptionsEqual, areDiffTargetsEqual, areFileRenderOptionsEqual, areFilesEqual, areHunkDataEqual, areLanguagesAttached, areLineAnnotationsEqual, areObjectsEqual, areOptionsEqual, arePrePropertiesEqual, areRenderRangesEqual, areSelectionsEqual, areThemesAttached, areThemesEqual, areVirtualWindowSpecsEqual, areWorkerStatsEqual, attachResolvedLanguages, attachResolvedThemes, cleanLastNewline, cleanUpResolvedLanguages, cleanUpResolvedThemes, clearRenderQueue, cloneFileDiffMetadata, cloneHunks, codeToHtml, createAnnotationElement, createAnnotationWrapperNode, createCSSVariablesTheme, createDiffSpanDecoration, createEmptyRowBuffer, createFileHeaderElement, createGutterGap, createGutterItem, createGutterUtilityContentNode, createGutterUtilityElement, createGutterWrapper, createHastElement, createIconElement, createNoNewlineElement, createPreElement, createPreWrapperProperties, createRowNodes, createSeparator, createSpanFromToken, createStyleElement, createTextNodeElement, createThemeStyleElement, createTransformerWithState, createUnsafeCSSStyleNode, createWindowFromScrollPosition, dequeueRender, detachString, diffAcceptRejectHunk, disposeHighlighter, findCodeElement, formatCSSVariablePrefix, getCustomExtensionsMap, getCustomExtensionsVersion, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineAnnotationSource, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, getUnresolvedDiffHunksRendererOptions, hasResolvedLanguages, hasResolvedThemes, hydratePartialDiff, isDefaultRenderRange, isDiffAnnotation, isDiffAnnotationCollection, isFileAnnotation, isFileAnnotationCollection, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, patchScrollbarGutterSize, pluckInteractionOptions, prefersReducedMotion, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, recordLineAnnotationSource, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, releaseStringDetachBuffer, renderDiffWithHighlighter, renderFileWithHighlighter, replaceCustomExtensions, resolveConflict, resolveLanguage, resolveLanguages, resolveRegion, resolveTheme, resolveThemes, setCustomExtension, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapThemeCSS, wrapUnsafeCSS };
+export { AttachedLanguages, AttachedThemes, CODE_VIEW_DIFF_OPTION_KEYS, CODE_VIEW_FILE_OPTION_KEYS, CODE_VIEW_FOOTER_ATTRIBUTE, CODE_VIEW_HEADER_ATTRIBUTE, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, CodeToTokenTransformStream, CodeView, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_DEVELOPMENT_BUILD, DIFFS_SCROLLBAR_GUTTER_MEASURED_PROPERTY, DIFFS_SCROLLBAR_MEASURE_ATTRIBUTE, DIFFS_TAG_NAME, DiffHunksRenderer, EMPTY_RENDER_RANGE, EXTENSION_TO_FILE_FORMAT, FILENAME_HEADER_REGEX, FILE_CONTEXT_BLOB, File, FileDiff, FileRenderer, FileStream, GIT_DIFF_FILE_BREAK_REGEX, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, InteractionManager, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, RegisteredCustomLanguages, ResizeManager, ResolvedLanguages, ResolvingLanguages, SPLIT_WITH_NEWLINES, SVGSpriteSheet, ScrollSyncManager, ShikiStreamTokenizer, THEME_CSS_ATTRIBUTE, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnresolvedFile, VIRTUALIZED_FILE_DIFF_LAYOUT_CHECKPOINT_INTERVAL, VirtualizedFile, VirtualizedFileDiff, Virtualizer, areDiffLineAnnotationsEqual, areDiffRenderOptionsEqual, areDiffTargetsEqual, areFileRenderOptionsEqual, areFilesEqual, areHunkDataEqual, areLanguagesAttached, areLineAnnotationsEqual, areObjectsEqual, areOptionsEqual, arePrePropertiesEqual, areRenderRangesEqual, areSelectionsEqual, areThemesAttached, areThemesEqual, areVirtualWindowSpecsEqual, areWorkerStatsEqual, attachResolvedLanguages, attachResolvedThemes, cleanLastNewline, cleanUpResolvedLanguages, cleanUpResolvedThemes, clearRenderQueue, cloneFileDiffMetadata, cloneHunks, codeToHtml, createAnnotationElement, createAnnotationWrapperNode, createCSSVariablesTheme, createDiffSpanDecoration, createEmptyRowBuffer, createFileHeaderElement, createGutterGap, createGutterItem, createGutterUtilityContentNode, createGutterUtilityElement, createGutterWrapper, createHastElement, createIconElement, createNoNewlineElement, createPreElement, createPreWrapperProperties, createRowNodes, createSeparator, createSpanFromToken, createStyleElement, createTextNodeElement, createThemeStyleElement, createTransformerWithState, createUnsafeCSSStyleNode, createWindowFromScrollPosition, dequeueRender, detachString, diffAcceptRejectHunk, disposeHighlighter, findCodeElement, formatCSSVariablePrefix, getCustomExtensionsMap, getCustomExtensionsVersion, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineAnnotationSource, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, getUnresolvedDiffHunksRendererOptions, hasResolvedLanguages, hasResolvedThemes, hydratePartialDiff, isDefaultRenderRange, isDiffAnnotation, isDiffAnnotationCollection, isFileAnnotation, isFileAnnotationCollection, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, patchScrollbarGutterSize, pluckInteractionOptions, prefersReducedMotion, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, recordLineAnnotationSource, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, releaseStringDetachBuffer, renderDiffWithHighlighter, renderFileWithHighlighter, replaceCustomExtensions, resolveConflict, resolveLanguage, resolveLanguages, resolveRegion, resolveTheme, resolveThemes, setCustomExtension, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapThemeCSS, wrapUnsafeCSS };

package/dist/react/utils/useFileDiffInstance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFileDiffInstance.d.ts","names":[],"sources":["../../../src/react/utils/useFileDiffInstance.ts"],"mappings":";;;;;;UA8DU,yBAAyB,aAAa;EAC9C,WAAW;EACX,UAAU;EACV,UAAU;EACV,SAAS,gBAAgB,aAAa;EACtC,eAAe,2BAA2B,aAAa;EACvD;EACA,iBAAiB,mBAAmB;EACpC,eAAe;EACf;EACA,UAAU;EACV;EACA;EACA;EACA;EACA,eAAe,0BAA0B,aAAa;EACtD,iBAAiB,4BAA4B,aAAa;;UAGlD,0BAA0B;EAClC,UAAU;EACV,IAAI,MAAM;EACV,kBAAkB;EAClB,sBAAsB,YAAY,mBAAmB;;iBAGvC,oBAAoB,aAAa,SAC/C,UACA,SACA,SACA,SACA,eACA,cACA,iBACA,eACA,iBACA,SACA,wBACA,iBACA,mBACA,MACA,cAAc,eACd,gBAAgB,mBACf,yBACD,aACA,SACE,0BAA0B"}
+{"version":3,"file":"useFileDiffInstance.d.ts","names":[],"sources":["../../../src/react/utils/useFileDiffInstance.ts"],"mappings":";;;;;;UA+DU,yBAAyB,aAAa;EAC9C,WAAW;EACX,UAAU;EACV,UAAU;EACV,SAAS,gBAAgB,aAAa;EACtC,eAAe,2BAA2B,aAAa;EACvD;EACA,iBAAiB,mBAAmB;EACpC,eAAe;EACf;EACA,UAAU;EACV;EACA;EACA;EACA;EACA,eAAe,0BAA0B,aAAa;EACtD,iBAAiB,4BAA4B,aAAa;;UAGlD,0BAA0B;EAClC,UAAU;EACV,IAAI,MAAM;EACV,kBAAkB;EAClB,sBAAsB,YAAY,mBAAmB;;iBAGvC,oBAAoB,aAAa,SAC/C,UACA,SACA,SACA,SACA,eACA,cACA,iBACA,eACA,iBACA,SACA,wBACA,iBACA,mBACA,MACA,cAAc,eACd,gBAAgB,mBACf,yBACD,aACA,SACE,0BAA0B"}

package/dist/react/utils/useFileDiffInstance.js

@@ -10,7 +10,7 @@ import { useCreateEditor } from "../EditContext.js";
 import { noopRender } from "../constants.js";
 import { WorkerPoolContext } from "../WorkerPoolContext.js";
 import { useVirtualizer } from "../Virtualizer.js";
-import { useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef } from "react";
+import { useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 //#region src/react/utils/useFileDiffInstance.ts
 const useIsomorphicLayoutEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
 function useFileDiffInstance({ fileDiff, oldFile, newFile, options, editorOptions, editStateKey, lineAnnotations, selectedLines, prerenderedHTML, metrics, hasGutterRenderUtility, hasCustomHeader, disableWorkerPool, edit, onEditChange: _onEditChange, onEditComplete: _onEditComplete }) {
@@ -18,6 +18,7 @@ function useFileDiffInstance({ fileDiff, oldFile, newFile, options, editorOption
 	const controlledSelection = selectedLines !== void 0;
 	const poolManager = useContext(WorkerPoolContext);
 	const createEditor = useCreateEditor();
+	const [asyncAttachError, setAsyncAttachError] = useState();
 	const handleOnEditChange = useStableCallback((event) => _onEditChange?.(event));
 	const onEditChange = _onEditChange != null ? handleOnEditChange : void 0;
 	const acceptedCache = useRef(null);
@@ -56,6 +57,7 @@ function useFileDiffInstance({ fileDiff, oldFile, newFile, options, editorOption
 	});
 	const instanceRef = useRef(null);
 	const disposeEditorRef = useRef(null);
+	const pendingAttachRef = useRef(null);
 	const getEditor = useStableCallback(() => {
 		if (createEditor == null) throw new Error("FileDiff: EditContext is not attached");
 		return createEditor("file-diff", editorOptions ?? {}, editStateKey);
@@ -79,7 +81,6 @@ function useFileDiffInstance({ fileDiff, oldFile, newFile, options, editorOption
 				onEditComplete,
 				options
 			}), !disableWorkerPool ? poolManager : void 0, true);
-			if (edit && disposeEditorRef.current == null) disposeEditorRef.current = applyEdit(instanceRef.current, getEditor);
 			instanceRef.current.hydrate({
 				fileDiff: effectiveFileDiff,
 				fileContainer,
@@ -88,6 +89,7 @@ function useFileDiffInstance({ fileDiff, oldFile, newFile, options, editorOption
 			});
 		} else {
 			if (instanceRef.current == null) throw new Error("useFileDiffInstance: A FileDiff instance should exist when unmounting");
+			pendingAttachRef.current = null;
 			instanceRef.current.cleanUp();
 			instanceRef.current = null;
 			disposeEditorRef.current = null;
@@ -106,10 +108,13 @@ function useFileDiffInstance({ fileDiff, oldFile, newFile, options, editorOption
 		});
 		const forceRender = newOptions !== void 0 && !areOptionsEqual(instance.options, newOptions);
 		instance.setOptions(newOptions);
-		if (!edit && disposeEditorRef.current != null) {
-			const { current: disposeEditor } = disposeEditorRef;
-			disposeEditorRef.current = null;
-			disposeEditor();
+		if (!edit) {
+			pendingAttachRef.current = null;
+			if (disposeEditorRef.current != null) {
+				const { current: disposeEditor } = disposeEditorRef;
+				disposeEditorRef.current = null;
+				disposeEditor();
+			}
 		}
 		const resolved = resolveAcceptedValues(effectiveFileDiff, lineAnnotations, acceptedCache);
 		instance.render({
@@ -118,15 +123,46 @@ function useFileDiffInstance({ fileDiff, oldFile, newFile, options, editorOption
 			lineAnnotations: resolved.lineAnnotations
 		});
 		if (selectedLines !== void 0) instance.setSelectedLines(selectedLines);
-		if (edit && disposeEditorRef.current == null) disposeEditorRef.current = applyEdit(instance, getEditor);
+		if (!edit || disposeEditorRef.current != null) return;
+		if (createEditor == null) throw new Error("FileDiff: EditContext is not attached");
+		const attach = () => {
+			if (instanceRef.current !== instance || disposeEditorRef.current != null || !instance.__canAttachEditor()) return;
+			disposeEditorRef.current = applyEdit(instance, getEditor);
+		};
+		if (instance.__canAttachEditor()) {
+			pendingAttachRef.current = null;
+			attach();
+			return;
+		}
+		const promise = instance.__prepareForEditing();
+		if (promise == null) {
+			pendingAttachRef.current = null;
+			return;
+		}
+		if (pendingAttachRef.current?.promise === promise) return;
+		const pending = { promise };
+		pendingAttachRef.current = pending;
+		promise.then(() => {
+			if (pendingAttachRef.current !== pending) return;
+			attach();
+			pendingAttachRef.current = null;
+		}).catch((error) => {
+			if (pendingAttachRef.current === pending) {
+				pendingAttachRef.current = null;
+				setAsyncAttachError(error);
+			}
+		});
 	});
+	const getHoveredLine = useCallback(() => {
+		return instanceRef.current?.getHoveredLine();
+	}, []);
+	const getAnnotationSlotName = useCallback((annotation) => instanceRef.current?.getAnnotationSlotName(annotation) ?? getLineAnnotationName(annotation), []);
+	if (asyncAttachError != null) throw asyncAttachError;
 	return {
 		fileDiff: effectiveFileDiff,
 		ref,
-		getHoveredLine: useCallback(() => {
-			return instanceRef.current?.getHoveredLine();
-		}, []),
-		getAnnotationSlotName: useCallback((annotation) => instanceRef.current?.getAnnotationSlotName(annotation) ?? getLineAnnotationName(annotation), [])
+		getHoveredLine,
+		getAnnotationSlotName
 	};
 }
 function useEffectiveFileDiff({ acceptedCache, fileDiff, newFile, oldFile, parseDiffOptions }) {

package/dist/react/utils/useFileDiffInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFileDiffInstance.js","names":[],"sources":["../../../src/react/utils/useFileDiffInstance.ts"],"sourcesContent":["import {\n  type RefObject,\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useMemo,\n  useRef,\n} from 'react';\n\nimport {\n  FileDiff,\n  type FileDiffEditChangeHandler,\n  type FileDiffEditCompleteEvent,\n  type FileDiffEditCompleteHandler,\n  type FileDiffOptions,\n} from '../../components/FileDiff';\nimport { VirtualizedFileDiff } from '../../components/VirtualizedFileDiff';\nimport type { Editor, EditorChangeEvent, EditorOptions } from '../../edit';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  SelectedLineRange,\n  VirtualFileMetrics,\n} from '../../types';\nimport { areDiffTargetsEqual } from '../../utils/areDiffTargetsEqual';\nimport { areFileTargetsEqual } from '../../utils/areFileTargetsEqual';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport { getLineAnnotationName } from '../../utils/getLineAnnotationName';\nimport { parseDiffFromFile } from '../../utils/parseDiffFromFile';\nimport { noopRender } from '../constants';\nimport { useCreateEditor } from '../EditContext';\nimport { useVirtualizer } from '../Virtualizer';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsomorphicLayoutEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface AcceptedFilePair {\n  oldFile: FileContents | null;\n  newFile: FileContents | null;\n}\n\ninterface AcceptedCompletion<LAnnotation> {\n  fileDiff: {\n    installed: FileDiffMetadata;\n    stale: FileDiffMetadata;\n  } | null;\n  filePair: {\n    fileDiff: FileDiffMetadata;\n    installed: AcceptedFilePair;\n    stale: AcceptedFilePair;\n  } | null;\n  annotations: {\n    installed: DiffLineAnnotation<LAnnotation>[] | undefined;\n    stale: DiffLineAnnotation<LAnnotation>[];\n  } | null;\n}\n\ninterface UseFileDiffInstanceProps<LAnnotation, Caret> {\n  fileDiff?: FileDiffMetadata;\n  oldFile?: FileContents | null;\n  newFile?: FileContents | null;\n  options: FileDiffOptions<LAnnotation, Caret> | undefined;\n  editorOptions: EditorOptions<'file-diff', LAnnotation, Caret> | undefined;\n  editStateKey: string | undefined;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  metrics?: VirtualFileMetrics;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n  edit: boolean;\n  onEditChange?: FileDiffEditChangeHandler<LAnnotation, Caret>;\n  onEditComplete?: FileDiffEditCompleteHandler<LAnnotation, Caret>;\n}\n\ninterface UseFileDiffInstanceReturn<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getAnnotationSlotName(annotation: DiffLineAnnotation<LAnnotation>): string;\n}\n\nexport function useFileDiffInstance<LAnnotation, Caret>({\n  fileDiff,\n  oldFile,\n  newFile,\n  options,\n  editorOptions,\n  editStateKey,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  metrics,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n  edit,\n  onEditChange: _onEditChange,\n  onEditComplete: _onEditComplete,\n}: UseFileDiffInstanceProps<\n  LAnnotation,\n  Caret\n>): UseFileDiffInstanceReturn<LAnnotation> {\n  const simpleVirtualizer = useVirtualizer();\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const createEditor = useCreateEditor<LAnnotation, Caret>();\n  const handleOnEditChange = useStableCallback(\n    (event: EditorChangeEvent<'file-diff', LAnnotation, Caret>) =>\n      _onEditChange?.(event)\n  );\n  const onEditChange = _onEditChange != null ? handleOnEditChange : undefined;\n  // An accepted completion installs its diff on the instance immediately,\n  // but the fileDiff/lineAnnotations props stay pre-edit until the owner's\n  // state update lands. This holds the accepted values so the renders in\n  // between do not repaint pre-edit state.\n  const acceptedCache = useRef<AcceptedCompletion<LAnnotation> | null>(null);\n  const handleOnEditComplete = useStableCallback(\n    (event: FileDiffEditCompleteEvent<LAnnotation, Caret>) => {\n      const decision = _onEditComplete?.(event) ?? 'reject';\n      if (decision === 'accept') {\n        acceptedCache.current = {\n          fileDiff: {\n            installed: event.fileDiff,\n            stale: event.originalFileDiff,\n          },\n          filePair:\n            fileDiff == null\n              ? {\n                  fileDiff: event.fileDiff,\n                  installed: { oldFile: event.oldFile, newFile: event.newFile },\n                  stale: { oldFile: oldFile ?? null, newFile: newFile ?? null },\n                }\n              : null,\n          annotations: {\n            installed: event.lineAnnotations,\n            stale: event.originalLineAnnotations,\n          },\n        };\n      }\n      return decision;\n    }\n  );\n  const onEditComplete =\n    _onEditComplete != null ? handleOnEditComplete : undefined;\n  // File-pair inputs parse here. While the file props still match the pair\n  // from acceptance time (stale) or the completion event's files (installed),\n  // the parse is the accepted diff itself; any other pair clears the record\n  // and parses fresh.\n  const effectiveFileDiff = useEffectiveFileDiff({\n    acceptedCache,\n    fileDiff,\n    newFile,\n    oldFile,\n    parseDiffOptions: options?.parseDiffOptions,\n  });\n  const instanceRef = useRef<\n    | FileDiff<LAnnotation, Caret>\n    | VirtualizedFileDiff<LAnnotation, Caret>\n    | null\n  >(null);\n  const disposeEditorRef = useRef<() => void>(null);\n  const getEditor = useStableCallback(() => {\n    if (createEditor == null) {\n      throw new Error('FileDiff: EditContext is not attached');\n    }\n    return createEditor('file-diff', editorOptions ?? {}, editStateKey);\n  });\n  const ref = useStableCallback((fileContainer: HTMLElement | null) => {\n    if (fileContainer != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'useFileDiffInstance: An instance should not already exist when a node is created'\n        );\n      }\n      if (simpleVirtualizer != null) {\n        instanceRef.current = new VirtualizedFileDiff(\n          mergeFileDiffOptions({\n            controlledSelection,\n            hasCustomHeader,\n            hasGutterRenderUtility,\n            onEditChange,\n            onEditComplete,\n            options,\n          }),\n          simpleVirtualizer,\n          metrics,\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      } else {\n        instanceRef.current = new FileDiff(\n          mergeFileDiffOptions({\n            controlledSelection,\n            hasCustomHeader,\n            hasGutterRenderUtility,\n            onEditChange,\n            onEditComplete,\n            options,\n          }),\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      }\n      if (edit && disposeEditorRef.current == null) {\n        disposeEditorRef.current = applyEdit(instanceRef.current, getEditor);\n      }\n      void instanceRef.current.hydrate({\n        fileDiff: effectiveFileDiff,\n        fileContainer,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error(\n          'useFileDiffInstance: A FileDiff instance should exist when unmounting'\n        );\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n      disposeEditorRef.current = null;\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    const { current: instance } = instanceRef;\n    if (instance == null) return;\n    const newOptions = mergeFileDiffOptions({\n      controlledSelection,\n      hasCustomHeader,\n      hasGutterRenderUtility,\n      onEditChange,\n      onEditComplete,\n      options,\n    });\n    // setOptions(undefined) is a no-op, so an undefined merge result never\n    // requires a forced render — comparing it against the instance's\n    // constructor-default options would force a full render on every commit.\n    const forceRender =\n      newOptions !== undefined &&\n      !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    // Detach editor before rendering if required\n    if (!edit && disposeEditorRef.current != null) {\n      const { current: disposeEditor } = disposeEditorRef;\n      disposeEditorRef.current = null;\n      disposeEditor();\n    }\n    const resolved = resolveAcceptedValues(\n      effectiveFileDiff,\n      lineAnnotations,\n      acceptedCache\n    );\n    void instance.render({\n      forceRender,\n      fileDiff: resolved.fileDiff,\n      lineAnnotations: resolved.lineAnnotations,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n    // Attach editor after rendering if required\n    if (edit && disposeEditorRef.current == null) {\n      disposeEditorRef.current = applyEdit(instance, getEditor);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n  const getAnnotationSlotName = useCallback(\n    (annotation: DiffLineAnnotation<LAnnotation>): string =>\n      instanceRef.current?.getAnnotationSlotName(annotation) ??\n      getLineAnnotationName(annotation),\n    []\n  );\n\n  return {\n    fileDiff: effectiveFileDiff,\n    ref,\n    getHoveredLine,\n    getAnnotationSlotName,\n  };\n}\n\ninterface UseEffectiveFileDiffProps<LAnnotation, Caret> {\n  acceptedCache: RefObject<AcceptedCompletion<LAnnotation> | null>;\n  fileDiff: FileDiffMetadata | undefined;\n  newFile: FileContents | null | undefined;\n  oldFile: FileContents | null | undefined;\n  parseDiffOptions: FileDiffOptions<LAnnotation, Caret>['parseDiffOptions'];\n}\n\n// Resolves the diff the instance renders: the `fileDiff` prop when given;\n// otherwise the accepted edit's cached diff while the file props still name the\n// pair it was accepted against; otherwise a fresh parse of the file props. A\n// cached pair that no longer matches is dropped on the way. Kept in its own hook\n// because the render-time ref read and write are deliberate; the boundary lets\n// the calling hook stay compilable.\nfunction useEffectiveFileDiff<LAnnotation, Caret>({\n  acceptedCache,\n  fileDiff,\n  newFile,\n  oldFile,\n  parseDiffOptions,\n}: UseEffectiveFileDiffProps<LAnnotation, Caret>): FileDiffMetadata {\n  /* oxlint-disable react/immutability react/refs -- accepted edit output must\n   * replace stale file-pair props during render */\n  const effectiveFileDiff = useMemo(() => {\n    if (fileDiff != null) {\n      return fileDiff;\n    }\n    const { current: accepted } = acceptedCache;\n    const filePair = accepted?.filePair;\n    if (accepted != null && filePair != null) {\n      if (\n        isSameFilePair(oldFile, newFile, filePair.stale) ||\n        isSameFilePair(oldFile, newFile, filePair.installed)\n      ) {\n        return filePair.fileDiff;\n      }\n      accepted.filePair = null;\n    }\n    return parseDiffFromFile(\n      oldFile ?? null,\n      newFile ?? null,\n      parseDiffOptions\n    );\n  }, [acceptedCache, fileDiff, oldFile, newFile, parseDiffOptions]);\n  /* oxlint-enable react/immutability react/refs */\n\n  return effectiveFileDiff;\n}\n\n// Whether the file props name the same files as a recorded pair.\nfunction isSameFilePair(\n  oldFile: FileContents | null | undefined,\n  newFile: FileContents | null | undefined,\n  filePair: AcceptedFilePair\n): boolean {\n  return (\n    areFileTargetsEqual(oldFile ?? undefined, filePair.oldFile ?? undefined) &&\n    areFileTargetsEqual(newFile ?? undefined, filePair.newFile ?? undefined)\n  );\n}\n\n// Render the installed values in place of props that still match their stale\n// counterparts. Any other prop value clears its slot — filePair settles in\n// the parse memo instead — and the ref clears once all three have.\nfunction resolveAcceptedValues<LAnnotation>(\n  fileDiff: FileDiffMetadata,\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined,\n  acceptedCache: RefObject<AcceptedCompletion<LAnnotation> | null>\n): {\n  fileDiff: FileDiffMetadata;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n} {\n  const { current: accepted } = acceptedCache;\n  if (accepted == null) {\n    return { fileDiff, lineAnnotations };\n  }\n  const { fileDiff: acceptedDiff, annotations: acceptedAnnotations } = accepted;\n  let resolvedFileDiff = fileDiff;\n  if (acceptedDiff != null) {\n    if (areDiffTargetsEqual(fileDiff, acceptedDiff.stale)) {\n      resolvedFileDiff = acceptedDiff.installed;\n    } else {\n      accepted.fileDiff = null;\n    }\n  }\n  let resolvedAnnotations = lineAnnotations;\n  if (acceptedAnnotations != null) {\n    if (lineAnnotations === acceptedAnnotations.stale) {\n      resolvedAnnotations = acceptedAnnotations.installed;\n    } else {\n      accepted.annotations = null;\n    }\n  }\n  if (\n    accepted.fileDiff == null &&\n    accepted.annotations == null &&\n    accepted.filePair == null\n  ) {\n    acceptedCache.current = null;\n  }\n  return { fileDiff: resolvedFileDiff, lineAnnotations: resolvedAnnotations };\n}\n\ninterface MergeFileDiffOptionsProps<LAnnotation, Caret> {\n  controlledSelection: boolean;\n  hasCustomHeader: boolean;\n  hasGutterRenderUtility: boolean;\n  onEditChange?: FileDiffEditChangeHandler<LAnnotation, Caret>;\n  onEditComplete?: FileDiffEditCompleteHandler<LAnnotation, Caret>;\n  options: FileDiffOptions<LAnnotation, Caret> | undefined;\n}\n\nfunction mergeFileDiffOptions<LAnnotation, Caret>({\n  options,\n  controlledSelection,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n  onEditChange,\n  onEditComplete,\n}: MergeFileDiffOptionsProps<LAnnotation, Caret>):\n  | FileDiffOptions<LAnnotation, Caret>\n  | undefined {\n  const needsReactOverrides =\n    controlledSelection ||\n    hasGutterRenderUtility ||\n    hasCustomHeader ||\n    onEditChange != null ||\n    onEditComplete != null;\n\n  if (!needsReactOverrides) {\n    return options;\n  }\n\n  return {\n    ...options,\n    controlledSelection,\n    renderCustomHeader: hasCustomHeader\n      ? noopRender\n      : options?.renderCustomHeader,\n    renderGutterUtility: hasGutterRenderUtility\n      ? noopRender\n      : options?.renderGutterUtility,\n    onEditChange,\n    onEditComplete,\n  };\n}\n\nfunction applyEdit<LAnnotation, Caret>(\n  instance: FileDiff<LAnnotation, Caret>,\n  getEditor: () => Editor<'file-diff', LAnnotation, Caret>\n): () => void {\n  const editor = getEditor();\n  try {\n    return editor.edit(instance);\n  } catch (error) {\n    editor.cleanUp();\n    throw error;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"useFileDiffInstance.js","names":[],"sources":["../../../src/react/utils/useFileDiffInstance.ts"],"sourcesContent":["import {\n  type RefObject,\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useMemo,\n  useRef,\n  useState,\n} from 'react';\n\nimport {\n  FileDiff,\n  type FileDiffEditChangeHandler,\n  type FileDiffEditCompleteEvent,\n  type FileDiffEditCompleteHandler,\n  type FileDiffOptions,\n} from '../../components/FileDiff';\nimport { VirtualizedFileDiff } from '../../components/VirtualizedFileDiff';\nimport type { Editor, EditorChangeEvent, EditorOptions } from '../../edit';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  SelectedLineRange,\n  VirtualFileMetrics,\n} from '../../types';\nimport { areDiffTargetsEqual } from '../../utils/areDiffTargetsEqual';\nimport { areFileTargetsEqual } from '../../utils/areFileTargetsEqual';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport { getLineAnnotationName } from '../../utils/getLineAnnotationName';\nimport { parseDiffFromFile } from '../../utils/parseDiffFromFile';\nimport { noopRender } from '../constants';\nimport { useCreateEditor } from '../EditContext';\nimport { useVirtualizer } from '../Virtualizer';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsomorphicLayoutEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface AcceptedFilePair {\n  oldFile: FileContents | null;\n  newFile: FileContents | null;\n}\n\ninterface AcceptedCompletion<LAnnotation> {\n  fileDiff: {\n    installed: FileDiffMetadata;\n    stale: FileDiffMetadata;\n  } | null;\n  filePair: {\n    fileDiff: FileDiffMetadata;\n    installed: AcceptedFilePair;\n    stale: AcceptedFilePair;\n  } | null;\n  annotations: {\n    installed: DiffLineAnnotation<LAnnotation>[] | undefined;\n    stale: DiffLineAnnotation<LAnnotation>[];\n  } | null;\n}\n\ninterface UseFileDiffInstanceProps<LAnnotation, Caret> {\n  fileDiff?: FileDiffMetadata;\n  oldFile?: FileContents | null;\n  newFile?: FileContents | null;\n  options: FileDiffOptions<LAnnotation, Caret> | undefined;\n  editorOptions: EditorOptions<'file-diff', LAnnotation, Caret> | undefined;\n  editStateKey: string | undefined;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  metrics?: VirtualFileMetrics;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n  edit: boolean;\n  onEditChange?: FileDiffEditChangeHandler<LAnnotation, Caret>;\n  onEditComplete?: FileDiffEditCompleteHandler<LAnnotation, Caret>;\n}\n\ninterface UseFileDiffInstanceReturn<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getAnnotationSlotName(annotation: DiffLineAnnotation<LAnnotation>): string;\n}\n\nexport function useFileDiffInstance<LAnnotation, Caret>({\n  fileDiff,\n  oldFile,\n  newFile,\n  options,\n  editorOptions,\n  editStateKey,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  metrics,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n  edit,\n  onEditChange: _onEditChange,\n  onEditComplete: _onEditComplete,\n}: UseFileDiffInstanceProps<\n  LAnnotation,\n  Caret\n>): UseFileDiffInstanceReturn<LAnnotation> {\n  const simpleVirtualizer = useVirtualizer();\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const createEditor = useCreateEditor<LAnnotation, Caret>();\n  const [asyncAttachError, setAsyncAttachError] = useState<unknown>();\n  const handleOnEditChange = useStableCallback(\n    (event: EditorChangeEvent<'file-diff', LAnnotation, Caret>) =>\n      _onEditChange?.(event)\n  );\n  const onEditChange = _onEditChange != null ? handleOnEditChange : undefined;\n  // An accepted completion installs its diff on the instance immediately,\n  // but the fileDiff/lineAnnotations props stay pre-edit until the owner's\n  // state update lands. This holds the accepted values so the renders in\n  // between do not repaint pre-edit state.\n  const acceptedCache = useRef<AcceptedCompletion<LAnnotation> | null>(null);\n  const handleOnEditComplete = useStableCallback(\n    (event: FileDiffEditCompleteEvent<LAnnotation, Caret>) => {\n      const decision = _onEditComplete?.(event) ?? 'reject';\n      if (decision === 'accept') {\n        acceptedCache.current = {\n          fileDiff: {\n            installed: event.fileDiff,\n            stale: event.originalFileDiff,\n          },\n          filePair:\n            fileDiff == null\n              ? {\n                  fileDiff: event.fileDiff,\n                  installed: { oldFile: event.oldFile, newFile: event.newFile },\n                  stale: { oldFile: oldFile ?? null, newFile: newFile ?? null },\n                }\n              : null,\n          annotations: {\n            installed: event.lineAnnotations,\n            stale: event.originalLineAnnotations,\n          },\n        };\n      }\n      return decision;\n    }\n  );\n  const onEditComplete =\n    _onEditComplete != null ? handleOnEditComplete : undefined;\n  // File-pair inputs parse here. While the file props still match the pair\n  // from acceptance time (stale) or the completion event's files (installed),\n  // the parse is the accepted diff itself; any other pair clears the record\n  // and parses fresh.\n  const effectiveFileDiff = useEffectiveFileDiff({\n    acceptedCache,\n    fileDiff,\n    newFile,\n    oldFile,\n    parseDiffOptions: options?.parseDiffOptions,\n  });\n  const instanceRef = useRef<\n    | FileDiff<LAnnotation, Caret>\n    | VirtualizedFileDiff<LAnnotation, Caret>\n    | null\n  >(null);\n  const disposeEditorRef = useRef<() => void>(null);\n  const pendingAttachRef = useRef<{ promise: Promise<void> } | null>(null);\n  const getEditor = useStableCallback(() => {\n    if (createEditor == null) {\n      throw new Error('FileDiff: EditContext is not attached');\n    }\n    return createEditor('file-diff', editorOptions ?? {}, editStateKey);\n  });\n  const ref = useStableCallback((fileContainer: HTMLElement | null) => {\n    if (fileContainer != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'useFileDiffInstance: An instance should not already exist when a node is created'\n        );\n      }\n      if (simpleVirtualizer != null) {\n        instanceRef.current = new VirtualizedFileDiff(\n          mergeFileDiffOptions({\n            controlledSelection,\n            hasCustomHeader,\n            hasGutterRenderUtility,\n            onEditChange,\n            onEditComplete,\n            options,\n          }),\n          simpleVirtualizer,\n          metrics,\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      } else {\n        instanceRef.current = new FileDiff(\n          mergeFileDiffOptions({\n            controlledSelection,\n            hasCustomHeader,\n            hasGutterRenderUtility,\n            onEditChange,\n            onEditComplete,\n            options,\n          }),\n          !disableWorkerPool ? poolManager : undefined,\n          true\n        );\n      }\n      void instanceRef.current.hydrate({\n        fileDiff: effectiveFileDiff,\n        fileContainer,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error(\n          'useFileDiffInstance: A FileDiff instance should exist when unmounting'\n        );\n      }\n      pendingAttachRef.current = null;\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n      disposeEditorRef.current = null;\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    const { current: instance } = instanceRef;\n    if (instance == null) return;\n    const newOptions = mergeFileDiffOptions({\n      controlledSelection,\n      hasCustomHeader,\n      hasGutterRenderUtility,\n      onEditChange,\n      onEditComplete,\n      options,\n    });\n    // setOptions(undefined) is a no-op, so an undefined merge result never\n    // requires a forced render — comparing it against the instance's\n    // constructor-default options would force a full render on every commit.\n    const forceRender =\n      newOptions !== undefined &&\n      !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    // Detach editor before rendering if required\n    if (!edit) {\n      pendingAttachRef.current = null;\n      if (disposeEditorRef.current != null) {\n        const { current: disposeEditor } = disposeEditorRef;\n        disposeEditorRef.current = null;\n        disposeEditor();\n      }\n    }\n    const resolved = resolveAcceptedValues(\n      effectiveFileDiff,\n      lineAnnotations,\n      acceptedCache\n    );\n    void instance.render({\n      forceRender,\n      fileDiff: resolved.fileDiff,\n      lineAnnotations: resolved.lineAnnotations,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n    if (!edit || disposeEditorRef.current != null) {\n      return;\n    }\n    if (createEditor == null) {\n      throw new Error('FileDiff: EditContext is not attached');\n    }\n\n    const attach = (): void => {\n      if (\n        instanceRef.current !== instance ||\n        disposeEditorRef.current != null ||\n        !instance.__canAttachEditor()\n      ) {\n        return;\n      }\n      disposeEditorRef.current = applyEdit(instance, getEditor);\n    };\n    // If we're all ready to attach the editor, lets go ahead\n    // and do that synchronously\n    if (instance.__canAttachEditor()) {\n      pendingAttachRef.current = null;\n      attach();\n      return;\n    }\n    const promise = instance.__prepareForEditing();\n    // If we can't hydrate the files... this will come back undefined,\n    // which means there's nothing we can do\n    if (promise == null) {\n      pendingAttachRef.current = null;\n      return;\n    }\n    // If we are already waiting on a hydration to finish, then there's nothing\n    // we need to do\n    if (pendingAttachRef.current?.promise === promise) {\n      return;\n    }\n    const pending = { promise };\n    pendingAttachRef.current = pending;\n    void promise\n      .then(() => {\n        if (pendingAttachRef.current !== pending) {\n          return;\n        }\n        attach();\n        pendingAttachRef.current = null;\n      })\n      .catch((error: unknown) => {\n        if (pendingAttachRef.current === pending) {\n          pendingAttachRef.current = null;\n          setAsyncAttachError(error);\n        }\n      });\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n  const getAnnotationSlotName = useCallback(\n    (annotation: DiffLineAnnotation<LAnnotation>): string =>\n      instanceRef.current?.getAnnotationSlotName(annotation) ??\n      getLineAnnotationName(annotation),\n    []\n  );\n\n  if (asyncAttachError != null) {\n    throw asyncAttachError;\n  }\n\n  return {\n    fileDiff: effectiveFileDiff,\n    ref,\n    getHoveredLine,\n    getAnnotationSlotName,\n  };\n}\n\ninterface UseEffectiveFileDiffProps<LAnnotation, Caret> {\n  acceptedCache: RefObject<AcceptedCompletion<LAnnotation> | null>;\n  fileDiff: FileDiffMetadata | undefined;\n  newFile: FileContents | null | undefined;\n  oldFile: FileContents | null | undefined;\n  parseDiffOptions: FileDiffOptions<LAnnotation, Caret>['parseDiffOptions'];\n}\n\n// Resolves the diff the instance renders: the `fileDiff` prop when given;\n// otherwise the accepted edit's cached diff while the file props still name the\n// pair it was accepted against; otherwise a fresh parse of the file props. A\n// cached pair that no longer matches is dropped on the way. Kept in its own hook\n// because the render-time ref read and write are deliberate; the boundary lets\n// the calling hook stay compilable.\nfunction useEffectiveFileDiff<LAnnotation, Caret>({\n  acceptedCache,\n  fileDiff,\n  newFile,\n  oldFile,\n  parseDiffOptions,\n}: UseEffectiveFileDiffProps<LAnnotation, Caret>): FileDiffMetadata {\n  /* oxlint-disable react/immutability react/refs -- accepted edit output must\n   * replace stale file-pair props during render */\n  const effectiveFileDiff = useMemo(() => {\n    if (fileDiff != null) {\n      return fileDiff;\n    }\n    const { current: accepted } = acceptedCache;\n    const filePair = accepted?.filePair;\n    if (accepted != null && filePair != null) {\n      if (\n        isSameFilePair(oldFile, newFile, filePair.stale) ||\n        isSameFilePair(oldFile, newFile, filePair.installed)\n      ) {\n        return filePair.fileDiff;\n      }\n      accepted.filePair = null;\n    }\n    return parseDiffFromFile(\n      oldFile ?? null,\n      newFile ?? null,\n      parseDiffOptions\n    );\n  }, [acceptedCache, fileDiff, oldFile, newFile, parseDiffOptions]);\n  /* oxlint-enable react/immutability react/refs */\n\n  return effectiveFileDiff;\n}\n\n// Whether the file props name the same files as a recorded pair.\nfunction isSameFilePair(\n  oldFile: FileContents | null | undefined,\n  newFile: FileContents | null | undefined,\n  filePair: AcceptedFilePair\n): boolean {\n  return (\n    areFileTargetsEqual(oldFile ?? undefined, filePair.oldFile ?? undefined) &&\n    areFileTargetsEqual(newFile ?? undefined, filePair.newFile ?? undefined)\n  );\n}\n\n// Render the installed values in place of props that still match their stale\n// counterparts. Any other prop value clears its slot — filePair settles in\n// the parse memo instead — and the ref clears once all three have.\nfunction resolveAcceptedValues<LAnnotation>(\n  fileDiff: FileDiffMetadata,\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined,\n  acceptedCache: RefObject<AcceptedCompletion<LAnnotation> | null>\n): {\n  fileDiff: FileDiffMetadata;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n} {\n  const { current: accepted } = acceptedCache;\n  if (accepted == null) {\n    return { fileDiff, lineAnnotations };\n  }\n  const { fileDiff: acceptedDiff, annotations: acceptedAnnotations } = accepted;\n  let resolvedFileDiff = fileDiff;\n  if (acceptedDiff != null) {\n    if (areDiffTargetsEqual(fileDiff, acceptedDiff.stale)) {\n      resolvedFileDiff = acceptedDiff.installed;\n    } else {\n      accepted.fileDiff = null;\n    }\n  }\n  let resolvedAnnotations = lineAnnotations;\n  if (acceptedAnnotations != null) {\n    if (lineAnnotations === acceptedAnnotations.stale) {\n      resolvedAnnotations = acceptedAnnotations.installed;\n    } else {\n      accepted.annotations = null;\n    }\n  }\n  if (\n    accepted.fileDiff == null &&\n    accepted.annotations == null &&\n    accepted.filePair == null\n  ) {\n    acceptedCache.current = null;\n  }\n  return { fileDiff: resolvedFileDiff, lineAnnotations: resolvedAnnotations };\n}\n\ninterface MergeFileDiffOptionsProps<LAnnotation, Caret> {\n  controlledSelection: boolean;\n  hasCustomHeader: boolean;\n  hasGutterRenderUtility: boolean;\n  onEditChange?: FileDiffEditChangeHandler<LAnnotation, Caret>;\n  onEditComplete?: FileDiffEditCompleteHandler<LAnnotation, Caret>;\n  options: FileDiffOptions<LAnnotation, Caret> | undefined;\n}\n\nfunction mergeFileDiffOptions<LAnnotation, Caret>({\n  options,\n  controlledSelection,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n  onEditChange,\n  onEditComplete,\n}: MergeFileDiffOptionsProps<LAnnotation, Caret>):\n  | FileDiffOptions<LAnnotation, Caret>\n  | undefined {\n  const needsReactOverrides =\n    controlledSelection ||\n    hasGutterRenderUtility ||\n    hasCustomHeader ||\n    onEditChange != null ||\n    onEditComplete != null;\n\n  if (!needsReactOverrides) {\n    return options;\n  }\n\n  return {\n    ...options,\n    controlledSelection,\n    renderCustomHeader: hasCustomHeader\n      ? noopRender\n      : options?.renderCustomHeader,\n    renderGutterUtility: hasGutterRenderUtility\n      ? noopRender\n      : options?.renderGutterUtility,\n    onEditChange,\n    onEditComplete,\n  };\n}\n\nfunction applyEdit<LAnnotation, Caret>(\n  instance: FileDiff<LAnnotation, Caret>,\n  getEditor: () => Editor<'file-diff', LAnnotation, Caret>\n): () => void {\n  const editor = getEditor();\n  try {\n    return editor.edit(instance);\n  } catch (error) {\n    editor.cleanUp();\n    throw error;\n  }\n}\n"],"mappings":"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"}

package/dist/renderers/DiffHunksRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":";;;;;;;UAoJiB,iCAAiC;EAChD,mBAAmB;;UAGJ,6CAA6C,KAC5D;EAGA,kBAAkB;;UAGH;EACf;EACA,UAAU;EACV;EACA;;UAGe;EACf;EACA;EACA;;UAGe;EACf,gBAAgB;EAChB,mBAAmB;EACnB,oBAAoB;;UAUL;EACf;EACA;EACA;EACA;EACA;EACA,eAAe;EACf,eAAe;;UAGA;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,UAAU;;UAGK;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,kBAAkB;EAClB,mBAAmB;EACnB,oBAAoB;EACpB,qBAAqB;EACrB,oBAAoB;EACpB,qBAAqB;EACrB,UAAU;EACV;EACA,SAAS;EACT,eAAe;EACf;EACA;EACA;EACA;EACA;EACA;;cAKW,kBAAkB;EAgCpB,SAAS;UACR;UAGA;UACA;WApCD;UAED;UAIA;UAEA;UAEA;UACA;UAEA;UACA;UAGA;UAGA;UAQA;EAER,YACS,UAAS,0BACR,sBACN,YAAY,mBAAmB,yBAEzB,8CACA,gBAAgB;EASnB;EAOA;;;;;;;;;;EAmBA,iBACL,MAAM,kBACN,eAAe;;EAgEV;;;;EAQA;;;;;;;;;;EAiBA,4BAA4B;UAqC3B;MA4BG,aAAa;EAIjB;EAMA,WAAW,SAAS;EAIpB,aAAa,SAAS,QAAQ;EAI9B,WACL,eACA,WAAW,qBACX;EA0BK,gBAAgB,oBAAoB;EAIpC,uBAAuB,YAAY;;EAKnC,oBACL,eAAe,YAAY;EAKtB,mBACL,iBAAiB,mBAAmB;;;;;;;EAyB/B,kBACL,YAAY,YAAY,MAAM,oBAC9B,6BACA;UA+HM;EAUD,oBACL,cAAc,0BAA0B;UA8DlC;UAeA;UAaA;YAOE,2BACR,YACC,6BAA6B;YAStB,yBACR,MACA,QACC,2BAA2B;UAetB;YAKU,iCAChB,KAAK,wBACF;YAGa,+BAChB,KAAK,wBACF;YAEK,0BAA0B;EAiDvB,yBAAyB,QAAQ;EAYvC,QAAQ,MAAM;UAmCb;EAQD,2BAA2B,KAChC;UAeM;;;;;;EA2CD,qBAAqB,MAAM,mBAAmB;UAwB7C;EAiCD,WACL,OAAM,8BACN,cAAa,cACZ;EAiJU,YACX,MAAM,kBACN,cAAa,cACZ,QAAQ;YAMD,iBACR,gBACA,oBACA,mBAAmB,sBAClB;UAeW;UAuBN;EA2CD,mBACL,MAAM,kBACN,QAAQ,kBACR,SAAS,mBACT;UAQM;UAqCA;UAgBA;UAuBA;EAaD,iBAAiB;UAIhB;UAIA;EAgjBD,cACL,6CACA,QAAQ,oBACP;EAyBI,cACL,QAAQ,mBACR,WAAU,mBACT;EAkDI,eACL,QAAQ,mBACR,eAAc;EAKT,kBACL,UAAU,kBACV;UAqBM;UAiEA;UA+DA;UASA"}
+{"version":3,"file":"DiffHunksRenderer.d.ts","names":[],"sources":["../../src/renderers/DiffHunksRenderer.ts"],"mappings":";;;;;;;UAoJiB,iCAAiC;EAChD,mBAAmB;;UAGJ,6CAA6C,KAC5D;EAGA,kBAAkB;;UAGH;EACf;EACA,UAAU;EACV;EACA;;UAGe;EACf;EACA;EACA;;UAGe;EACf,gBAAgB;EAChB,mBAAmB;EACnB,oBAAoB;;UAUL;EACf;EACA;EACA;EACA;EACA;EACA,eAAe;EACf,eAAe;;UAGA;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,UAAU;;UAGK;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,SAAS;EACT,QAAQ;;UAGO;EACf,UAAU;EACV,kBAAkB;EAClB,mBAAmB;EACnB,oBAAoB;EACpB,qBAAqB;EACrB,oBAAoB;EACpB,qBAAqB;EACrB,UAAU;EACV;EACA,SAAS;EACT,eAAe;EACf;EACA;EACA;EACA;EACA;EACA;;cAKW,kBAAkB;EAgCpB,SAAS;UACR;UAGA;UACA;WApCD;UAED;UAIA;UAEA;UAEA;UACA;UAEA;UACA;UAGA;UAGA;UAQA;EAER,YACS,UAAS,0BACR,sBACN,YAAY,mBAAmB,yBAEzB,8CACA,gBAAgB;EASnB;EAQA;;;;;;;;;;EA4BA,iBACL,MAAM,kBACN,eAAe;;EA0EV;;;;EAWA;;;;;;;;;;EAiBA,4BAA4B;UAqC3B;MA4BG,aAAa;EAIjB;EAMA,WAAW,SAAS;EAIpB,aAAa,SAAS,QAAQ;EAI9B,WACL,eACA,WAAW,qBACX;EA0BK,gBAAgB,oBAAoB;EAIpC,uBAAuB,YAAY;;EAKnC,oBACL,eAAe,YAAY;EAKtB,mBACL,iBAAiB,mBAAmB;;;;;;;EAyB/B,kBACL,YAAY,YAAY,MAAM,oBAC9B,6BACA;UA+HM;EAWD,oBACL,cAAc,0BAA0B;UAkElC;UAwBA;UAaA;YAOE,2BACR,YACC,6BAA6B;YAStB,yBACR,MACA,QACC,2BAA2B;UAetB;YAKU,iCAChB,KAAK,wBACF;YAGa,+BAChB,KAAK,wBACF;YAEK,0BAA0B;EAiDvB,yBAAyB,QAAQ;EAYvC,QAAQ,MAAM;UAmCb;EAQD,2BAA2B,KAChC;UAeM;;;;;;EA2CD,qBAAqB,MAAM,mBAAmB;UAwB7C;EAiCD,WACL,OAAM,8BACN,cAAa,cACZ;EAiJU,YACX,MAAM,kBACN,cAAa,cACZ,QAAQ;YAMD,iBACR,gBACA,oBACA,mBAAmB,sBAClB;UAeW;UAuBN;EA2CD,mBACL,MAAM,kBACN,QAAQ,kBACR,SAAS,mBACT;UAQM;UAqCA;UAgBA;UAuBA;EAaD,iBAAiB;UAIhB;UAIA;EAgjBD,cACL,6CACA,QAAQ,oBACP;EAyBI,cACL,QAAQ,mBACR,WAAU,mBACT;EAkDI,eACL,QAAQ,mBACR,eAAc;EAKT,kBACL,UAAU,kBACV;UAqBM;UAiEA;UA+DA;UASA"}