@pierre/diffs 1.1.0-beta.9 → 1.1.1

package/dist/react/utils/useFileDiffInstance.js

@@ -1,6 +1,7 @@
 import { FileDiff } from "../../components/FileDiff.js";
 import { VirtualizedFileDiff } from "../../components/VirtualizedFileDiff.js";
 import { areOptionsEqual } from "../../utils/areOptionsEqual.js";
+import { noopRender } from "../constants.js";
 import { useVirtualizer } from "../Virtualizer.js";
 import { WorkerPoolContext } from "../WorkerPoolContext.js";
 import { useStableCallback } from "./useStableCallback.js";
@@ -8,15 +9,15 @@ import { useCallback, useContext, useEffect, useLayoutEffect, useRef } from "rea
 
 //#region src/react/utils/useFileDiffInstance.ts
 const useIsometricEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
-function useFileDiffInstance({ oldFile, newFile, fileDiff, options, lineAnnotations, selectedLines, prerenderedHTML, metrics }) {
+function useFileDiffInstance({ oldFile, newFile, fileDiff, options, lineAnnotations, selectedLines, prerenderedHTML, metrics, hasGutterRenderUtility }) {
 	const simpleVirtualizer = useVirtualizer();
 	const poolManager = useContext(WorkerPoolContext);
 	const instanceRef = useRef(null);
 	const ref = useStableCallback((fileContainer) => {
 		if (fileContainer != null) {
 			if (instanceRef.current != null) throw new Error("useFileDiffInstance: An instance should not already exist when a node is created");
-			if (simpleVirtualizer != null) instanceRef.current = new VirtualizedFileDiff(options, simpleVirtualizer, metrics, poolManager, true);
-			else instanceRef.current = new FileDiff(options, poolManager, true);
+			if (simpleVirtualizer != null) instanceRef.current = new VirtualizedFileDiff(mergeFileDiffOptions(options, hasGutterRenderUtility), simpleVirtualizer, metrics, poolManager, true);
+			else instanceRef.current = new FileDiff(mergeFileDiffOptions(options, hasGutterRenderUtility), poolManager, true);
 			instanceRef.current.hydrate({
 				fileDiff,
 				oldFile,
@@ -32,10 +33,11 @@ function useFileDiffInstance({ oldFile, newFile, fileDiff, options, lineAnnotati
 		}
 	});
 	useIsometricEffect(() => {
-		if (instanceRef.current == null) return;
-		const instance = instanceRef.current;
-		const forceRender = !areOptionsEqual(instance.options, options);
-		instance.setOptions(options);
+		const { current: instance } = instanceRef;
+		if (instance == null) return;
+		const newOptions = mergeFileDiffOptions(options, hasGutterRenderUtility);
+		const forceRender = !areOptionsEqual(instance.options, newOptions);
+		instance.setOptions(newOptions);
 		instance.render({
 			forceRender,
 			fileDiff,
@@ -52,6 +54,13 @@ function useFileDiffInstance({ oldFile, newFile, fileDiff, options, lineAnnotati
 		}, [])
 	};
 }
+function mergeFileDiffOptions(options, hasGutterRenderUtility) {
+	if (hasGutterRenderUtility) return {
+		...options,
+		renderGutterUtility: noopRender
+	};
+	return options;
+}
 
 //#endregion
 export { useFileDiffInstance };

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

@@ -1 +1 @@
-{"version":3,"file":"useFileDiffInstance.js","names":[],"sources":["../../../src/react/utils/useFileDiffInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n} from 'react';\n\nimport { FileDiff, type FileDiffOptions } from '../../components/FileDiff';\nimport { VirtualizedFileDiff } from '../../components/VirtualizedFileDiff';\nimport type { SelectedLineRange } from '../../managers/LineSelectionManager';\nimport type { GetHoveredLineResult } from '../../managers/MouseEventManager';\nimport type {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  VirtualFileMetrics,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport { useVirtualizer } from '../Virtualizer';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsometricEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseFileDiffInstanceProps<LAnnotation> {\n  oldFile?: FileContents;\n  newFile?: FileContents;\n  fileDiff?: FileDiffMetadata;\n  options: FileDiffOptions<LAnnotation> | undefined;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  metrics?: VirtualFileMetrics;\n}\n\ninterface UseFileDiffInstanceReturn {\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n}\n\nexport function useFileDiffInstance<LAnnotation>({\n  oldFile,\n  newFile,\n  fileDiff,\n  options,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  metrics,\n}: UseFileDiffInstanceProps<LAnnotation>): UseFileDiffInstanceReturn {\n  const simpleVirtualizer = useVirtualizer();\n  const poolManager = useContext(WorkerPoolContext);\n  const instanceRef = useRef<\n    FileDiff<LAnnotation> | VirtualizedFileDiff<LAnnotation> | null\n  >(null);\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          options,\n          simpleVirtualizer,\n          metrics,\n          poolManager,\n          true\n        );\n      } else {\n        instanceRef.current = new FileDiff(options, poolManager, true);\n      }\n      void instanceRef.current.hydrate({\n        fileDiff,\n        oldFile,\n        newFile,\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    }\n  });\n\n  useIsometricEffect(() => {\n    if (instanceRef.current == null) return;\n    const instance = instanceRef.current;\n    const forceRender = !areOptionsEqual(instance.options, options);\n    instance.setOptions(options);\n    void instance.render({\n      forceRender,\n      fileDiff,\n      oldFile,\n      newFile,\n      lineAnnotations,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n\n  return { ref, getHoveredLine };\n}\n"],"mappings":";;;;;;;;;AAuBA,MAAM,qBACJ,OAAO,WAAW,cAAc,YAAY;AAkB9C,SAAgB,oBAAiC,EAC/C,SACA,SACA,UACA,SACA,iBACA,eACA,iBACA,WACmE;CACnE,MAAM,oBAAoB,gBAAgB;CAC1C,MAAM,cAAc,WAAW,kBAAkB;CACjD,MAAM,cAAc,OAElB,KAAK;CACP,MAAM,MAAM,mBAAmB,kBAAsC;AACnE,MAAI,iBAAiB,MAAM;AACzB,OAAI,YAAY,WAAW,KACzB,OAAM,IAAI,MACR,mFACD;AAEH,OAAI,qBAAqB,KACvB,aAAY,UAAU,IAAI,oBACxB,SACA,mBACA,SACA,aACA,KACD;OAED,aAAY,UAAU,IAAI,SAAS,SAAS,aAAa,KAAK;AAEhE,GAAK,YAAY,QAAQ,QAAQ;IAC/B;IACA;IACA;IACA;IACA;IACA;IACD,CAAC;SACG;AACL,OAAI,YAAY,WAAW,KACzB,OAAM,IAAI,MACR,wEACD;AAEH,eAAY,QAAQ,SAAS;AAC7B,eAAY,UAAU;;GAExB;AAEF,0BAAyB;AACvB,MAAI,YAAY,WAAW,KAAM;EACjC,MAAM,WAAW,YAAY;EAC7B,MAAM,cAAc,CAAC,gBAAgB,SAAS,SAAS,QAAQ;AAC/D,WAAS,WAAW,QAAQ;AAC5B,EAAK,SAAS,OAAO;GACnB;GACA;GACA;GACA;GACA;GACD,CAAC;AACF,MAAI,kBAAkB,OACpB,UAAS,iBAAiB,cAAc;GAE1C;AAQF,QAAO;EAAE;EAAK,gBANS,kBAEN;AACf,UAAO,YAAY,SAAS,gBAAgB;KAC3C,EAAE,CAAC;EAEwB"}
+{"version":3,"file":"useFileDiffInstance.js","names":[],"sources":["../../../src/react/utils/useFileDiffInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n} from 'react';\n\nimport { FileDiff, type FileDiffOptions } from '../../components/FileDiff';\nimport { VirtualizedFileDiff } from '../../components/VirtualizedFileDiff';\nimport type {\n  GetHoveredLineResult,\n  SelectedLineRange,\n} from '../../managers/InteractionManager';\nimport type {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  VirtualFileMetrics,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport { noopRender as renderGutterUtility } from '../constants';\nimport { useVirtualizer } from '../Virtualizer';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsometricEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseFileDiffInstanceProps<LAnnotation> {\n  oldFile?: FileContents;\n  newFile?: FileContents;\n  fileDiff?: FileDiffMetadata;\n  options: FileDiffOptions<LAnnotation> | undefined;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  metrics?: VirtualFileMetrics;\n  hasGutterRenderUtility: boolean;\n}\n\ninterface UseFileDiffInstanceReturn {\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n}\n\nexport function useFileDiffInstance<LAnnotation>({\n  oldFile,\n  newFile,\n  fileDiff,\n  options,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  metrics,\n  hasGutterRenderUtility,\n}: UseFileDiffInstanceProps<LAnnotation>): UseFileDiffInstanceReturn {\n  const simpleVirtualizer = useVirtualizer();\n  const poolManager = useContext(WorkerPoolContext);\n  const instanceRef = useRef<\n    FileDiff<LAnnotation> | VirtualizedFileDiff<LAnnotation> | null\n  >(null);\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(options, hasGutterRenderUtility),\n          simpleVirtualizer,\n          metrics,\n          poolManager,\n          true\n        );\n      } else {\n        instanceRef.current = new FileDiff(\n          mergeFileDiffOptions(options, hasGutterRenderUtility),\n          poolManager,\n          true\n        );\n      }\n      void instanceRef.current.hydrate({\n        fileDiff,\n        oldFile,\n        newFile,\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    }\n  });\n\n  useIsometricEffect(() => {\n    const { current: instance } = instanceRef;\n    if (instance == null) return;\n    const newOptions = mergeFileDiffOptions(options, hasGutterRenderUtility);\n    const forceRender = !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    void instance.render({\n      forceRender,\n      fileDiff,\n      oldFile,\n      newFile,\n      lineAnnotations,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n\n  return { ref, getHoveredLine };\n}\n\nfunction mergeFileDiffOptions<LAnnotation>(\n  options: FileDiffOptions<LAnnotation> | undefined,\n  hasGutterRenderUtility: boolean\n): FileDiffOptions<LAnnotation> | undefined {\n  if (hasGutterRenderUtility) {\n    return { ...options, renderGutterUtility };\n  }\n  return options;\n}\n"],"mappings":";;;;;;;;;;AA0BA,MAAM,qBACJ,OAAO,WAAW,cAAc,YAAY;AAmB9C,SAAgB,oBAAiC,EAC/C,SACA,SACA,UACA,SACA,iBACA,eACA,iBACA,SACA,0BACmE;CACnE,MAAM,oBAAoB,gBAAgB;CAC1C,MAAM,cAAc,WAAW,kBAAkB;CACjD,MAAM,cAAc,OAElB,KAAK;CACP,MAAM,MAAM,mBAAmB,kBAAsC;AACnE,MAAI,iBAAiB,MAAM;AACzB,OAAI,YAAY,WAAW,KACzB,OAAM,IAAI,MACR,mFACD;AAEH,OAAI,qBAAqB,KACvB,aAAY,UAAU,IAAI,oBACxB,qBAAqB,SAAS,uBAAuB,EACrD,mBACA,SACA,aACA,KACD;OAED,aAAY,UAAU,IAAI,SACxB,qBAAqB,SAAS,uBAAuB,EACrD,aACA,KACD;AAEH,GAAK,YAAY,QAAQ,QAAQ;IAC/B;IACA;IACA;IACA;IACA;IACA;IACD,CAAC;SACG;AACL,OAAI,YAAY,WAAW,KACzB,OAAM,IAAI,MACR,wEACD;AAEH,eAAY,QAAQ,SAAS;AAC7B,eAAY,UAAU;;GAExB;AAEF,0BAAyB;EACvB,MAAM,EAAE,SAAS,aAAa;AAC9B,MAAI,YAAY,KAAM;EACtB,MAAM,aAAa,qBAAqB,SAAS,uBAAuB;EACxE,MAAM,cAAc,CAAC,gBAAgB,SAAS,SAAS,WAAW;AAClE,WAAS,WAAW,WAAW;AAC/B,EAAK,SAAS,OAAO;GACnB;GACA;GACA;GACA;GACA;GACD,CAAC;AACF,MAAI,kBAAkB,OACpB,UAAS,iBAAiB,cAAc;GAE1C;AAQF,QAAO;EAAE;EAAK,gBANS,kBAEN;AACf,UAAO,YAAY,SAAS,gBAAgB;KAC3C,EAAE,CAAC;EAEwB;;AAGhC,SAAS,qBACP,SACA,wBAC0C;AAC1C,KAAI,uBACF,QAAO;EAAE,GAAG;EAAS;EAAqB;AAE5C,QAAO"}

package/dist/react/utils/useFileInstance.d.ts

@@ -1,6 +1,5 @@
 import { FileContents, LineAnnotation, VirtualFileMetrics } from "../../types.js";
-import { SelectedLineRange } from "../../managers/LineSelectionManager.js";
-import { GetHoveredLineResult } from "../../managers/MouseEventManager.js";
+import { GetHoveredLineResult, SelectedLineRange } from "../../managers/InteractionManager.js";
 import { FileOptions } from "../../components/File.js";
 
 //#region src/react/utils/useFileInstance.d.ts
@@ -11,6 +10,7 @@ interface UseFileInstanceProps<LAnnotation> {
   selectedLines: SelectedLineRange | null | undefined;
   prerenderedHTML: string | undefined;
   metrics?: VirtualFileMetrics;
+  hasGutterRenderUtility: boolean;
 }
 interface UseFileInstanceReturn {
   ref(node: HTMLElement | null): void;
@@ -22,7 +22,8 @@ declare function useFileInstance<LAnnotation>({
   lineAnnotations,
   selectedLines,
   prerenderedHTML,
-  metrics
+  metrics,
+  hasGutterRenderUtility
 }: UseFileInstanceProps<LAnnotation>): UseFileInstanceReturn;
 //#endregion
 export { useFileInstance };

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

@@ -1 +1 @@
-{"version":3,"file":"useFileInstance.d.ts","names":["FileOptions","SelectedLineRange","GetHoveredLineResult","FileContents","LineAnnotation","VirtualFileMetrics","UseFileInstanceProps","LAnnotation","UseFileInstanceReturn","HTMLElement","useFileInstance","file","options","lineAnnotations","selectedLines","prerenderedHTML","metrics"],"sources":["../../../src/react/utils/useFileInstance.d.ts"],"sourcesContent":["import { type FileOptions } from '../../components/File';\nimport type { SelectedLineRange } from '../../managers/LineSelectionManager';\nimport type { GetHoveredLineResult } from '../../managers/MouseEventManager';\nimport type { FileContents, LineAnnotation, VirtualFileMetrics } from '../../types';\ninterface UseFileInstanceProps<LAnnotation> {\n    file: FileContents;\n    options: FileOptions<LAnnotation> | undefined;\n    lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;\n    selectedLines: SelectedLineRange | null | undefined;\n    prerenderedHTML: string | undefined;\n    metrics?: VirtualFileMetrics;\n}\ninterface UseFileInstanceReturn {\n    ref(node: HTMLElement | null): void;\n    getHoveredLine(): GetHoveredLineResult<'file'> | undefined;\n}\nexport declare function useFileInstance<LAnnotation>({ file, options, lineAnnotations, selectedLines, prerenderedHTML, metrics }: UseFileInstanceProps<LAnnotation>): UseFileInstanceReturn;\nexport {};\n//# sourceMappingURL=useFileInstance.d.ts.map"],"mappings":";;;;;;UAIUM;QACAH;EADAG,OAAAA,EAEGN,WAFHM,CAEeC,WAFKA,CAAAA,GAAAA,SAAAA;EACpBJ,eAAAA,EAEWC,cAFXD,CAE0BI,WAF1BJ,CAAAA,EAAAA,GAAAA,SAAAA;EACeI,aAAAA,EAENN,iBAFMM,GAAAA,IAAAA,GAAAA,SAAAA;EAAZP,eAAAA,EAAAA,MAAAA,GAAAA,SAAAA;EACuBO,OAAAA,CAAAA,EAGtBF,kBAHsBE;;UAK1BC,qBAAAA,CAJSP;EAELI,GAAAA,CAAAA,IAAAA,EAGAI,WAHAJ,GAAAA,IAAAA,CAAAA,EAAAA,IAAAA;EAAkB,cAAA,EAAA,EAIVH,oBAJU,CAAA,MAAA,CAAA,GAAA,SAAA;AAAA;AAMRQ,iBAAAA,eAAeH,CAAAA,WAAA,CAAA,CAAA;EAAA,IAAA;EAAA,OAAA;EAAA,eAAA;EAAA,aAAA;EAAA,eAAA;EAAA;AAAA,CAAA,EAA2FD,oBAA3F,CAAgHC,WAAhH,CAAA,CAAA,EAA+HC,qBAA/H"}
+{"version":3,"file":"useFileInstance.d.ts","names":["FileOptions","GetHoveredLineResult","SelectedLineRange","FileContents","LineAnnotation","VirtualFileMetrics","UseFileInstanceProps","LAnnotation","UseFileInstanceReturn","HTMLElement","useFileInstance","file","options","lineAnnotations","selectedLines","prerenderedHTML","metrics","hasGutterRenderUtility"],"sources":["../../../src/react/utils/useFileInstance.d.ts"],"sourcesContent":["import { type FileOptions } from '../../components/File';\nimport type { GetHoveredLineResult, SelectedLineRange } from '../../managers/InteractionManager';\nimport type { FileContents, LineAnnotation, VirtualFileMetrics } from '../../types';\ninterface UseFileInstanceProps<LAnnotation> {\n    file: FileContents;\n    options: FileOptions<LAnnotation> | undefined;\n    lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;\n    selectedLines: SelectedLineRange | null | undefined;\n    prerenderedHTML: string | undefined;\n    metrics?: VirtualFileMetrics;\n    hasGutterRenderUtility: boolean;\n}\ninterface UseFileInstanceReturn {\n    ref(node: HTMLElement | null): void;\n    getHoveredLine(): GetHoveredLineResult<'file'> | undefined;\n}\nexport declare function useFileInstance<LAnnotation>({ file, options, lineAnnotations, selectedLines, prerenderedHTML, metrics, hasGutterRenderUtility }: UseFileInstanceProps<LAnnotation>): UseFileInstanceReturn;\nexport {};\n//# sourceMappingURL=useFileInstance.d.ts.map"],"mappings":";;;;;UAGUM;QACAH;EADAG,OAAAA,EAEGN,WAFHM,CAEeC,WAFKA,CAAAA,GAAAA,SAAAA;EACpBJ,eAAAA,EAEWC,cAFXD,CAE0BI,WAF1BJ,CAAAA,EAAAA,GAAAA,SAAAA;EACeI,aAAAA,EAENL,iBAFMK,GAAAA,IAAAA,GAAAA,SAAAA;EAAZP,eAAAA,EAAAA,MAAAA,GAAAA,SAAAA;EACuBO,OAAAA,CAAAA,EAGtBF,kBAHsBE;EAAfH,sBAAAA,EAAAA,OAAAA;;UAMXI,qBAAAA,CAHIH;EAAkB,GAAA,CAAA,IAAA,EAIlBI,WAJkB,GAAA,IAAA,CAAA,EAAA,IAAA;EAGtBD,cAAAA,EAAAA,EAEYP,oBADRQ,CAAAA,MAAAA,CAAAA,GAAAA,SACQR;AAEtB;AAAuDU,iBAA/BD,eAA+BC,CAAAA,WAAAA,CAAAA,CAAAA;EAAAA,IAAAA;EAAAA,OAAAA;EAAAA,eAAAA;EAAAA,aAAAA;EAAAA,eAAAA;EAAAA,OAAAA;EAAAA;AAAAA,CAAAA,EAAmGL,oBAAnGK,CAAwHJ,WAAxHI,CAAAA,CAAAA,EAAuIH,qBAAvIG"}

package/dist/react/utils/useFileInstance.js

@@ -1,6 +1,7 @@
 import { File } from "../../components/File.js";
 import { VirtualizedFile } from "../../components/VirtualizedFile.js";
 import { areOptionsEqual } from "../../utils/areOptionsEqual.js";
+import { noopRender } from "../constants.js";
 import { useVirtualizer } from "../Virtualizer.js";
 import { WorkerPoolContext } from "../WorkerPoolContext.js";
 import { useStableCallback } from "./useStableCallback.js";
@@ -8,15 +9,15 @@ import { useCallback, useContext, useEffect, useLayoutEffect, useRef } from "rea
 
 //#region src/react/utils/useFileInstance.ts
 const useIsometricEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
-function useFileInstance({ file, options, lineAnnotations, selectedLines, prerenderedHTML, metrics }) {
+function useFileInstance({ file, options, lineAnnotations, selectedLines, prerenderedHTML, metrics, hasGutterRenderUtility }) {
 	const simpleVirtualizer = useVirtualizer();
 	const poolManager = useContext(WorkerPoolContext);
 	const instanceRef = useRef(null);
 	const ref = useStableCallback((node) => {
 		if (node != null) {
 			if (instanceRef.current != null) throw new Error("File: An instance should not already exist when a node is created");
-			if (simpleVirtualizer != null) instanceRef.current = new VirtualizedFile(options, simpleVirtualizer, metrics, poolManager, true);
-			else instanceRef.current = new File(options, poolManager, true);
+			if (simpleVirtualizer != null) instanceRef.current = new VirtualizedFile(mergeFileOptions(options, hasGutterRenderUtility), simpleVirtualizer, metrics, poolManager, true);
+			else instanceRef.current = new File(mergeFileOptions(options, hasGutterRenderUtility), poolManager, true);
 			instanceRef.current.hydrate({
 				file,
 				fileContainer: node,
@@ -31,8 +32,9 @@ function useFileInstance({ file, options, lineAnnotations, selectedLines, preren
 	});
 	useIsometricEffect(() => {
 		if (instanceRef.current == null) return;
-		const forceRender = !areOptionsEqual(instanceRef.current.options, options);
-		instanceRef.current.setOptions(options);
+		const newOptions = mergeFileOptions(options, hasGutterRenderUtility);
+		const forceRender = !areOptionsEqual(instanceRef.current.options, newOptions);
+		instanceRef.current.setOptions(newOptions);
 		instanceRef.current.render({
 			file,
 			lineAnnotations,
@@ -47,6 +49,13 @@ function useFileInstance({ file, options, lineAnnotations, selectedLines, preren
 		}, [])
 	};
 }
+function mergeFileOptions(options, hasGutterRenderUtility) {
+	if (hasGutterRenderUtility) return {
+		...options,
+		renderGutterUtility: noopRender
+	};
+	return options;
+}
 
 //#endregion
 export { useFileInstance };

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

@@ -1 +1 @@
-{"version":3,"file":"useFileInstance.js","names":[],"sources":["../../../src/react/utils/useFileInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n} from 'react';\n\nimport { File, type FileOptions } from '../../components/File';\nimport { VirtualizedFile } from '../../components/VirtualizedFile';\nimport type { SelectedLineRange } from '../../managers/LineSelectionManager';\nimport type { GetHoveredLineResult } from '../../managers/MouseEventManager';\nimport type {\n  FileContents,\n  LineAnnotation,\n  VirtualFileMetrics,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport { useVirtualizer } from '../Virtualizer';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsometricEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseFileInstanceProps<LAnnotation> {\n  file: FileContents;\n  options: FileOptions<LAnnotation> | undefined;\n  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  metrics?: VirtualFileMetrics;\n}\n\ninterface UseFileInstanceReturn {\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'file'> | undefined;\n}\n\nexport function useFileInstance<LAnnotation>({\n  file,\n  options,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  metrics,\n}: UseFileInstanceProps<LAnnotation>): UseFileInstanceReturn {\n  const simpleVirtualizer = useVirtualizer();\n  const poolManager = useContext(WorkerPoolContext);\n  const instanceRef = useRef<\n    File<LAnnotation> | VirtualizedFile<LAnnotation> | null\n  >(null);\n  const ref = useStableCallback((node: HTMLElement | null) => {\n    if (node != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'File: An instance should not already exist when a node is created'\n        );\n      }\n      if (simpleVirtualizer != null) {\n        instanceRef.current = new VirtualizedFile(\n          options,\n          simpleVirtualizer,\n          metrics,\n          poolManager,\n          true\n        );\n      } else {\n        instanceRef.current = new File(options, poolManager, true);\n      }\n      void instanceRef.current.hydrate({\n        file,\n        fileContainer: node,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error('File: A File instance should exist when unmounting');\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n    }\n  });\n\n  useIsometricEffect(() => {\n    if (instanceRef.current == null) return;\n    const forceRender = !areOptionsEqual(instanceRef.current.options, options);\n    instanceRef.current.setOptions(options);\n    void instanceRef.current.render({ file, lineAnnotations, forceRender });\n    if (selectedLines !== undefined) {\n      instanceRef.current.setSelectedLines(selectedLines);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'file'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n  return { ref, getHoveredLine };\n}\n"],"mappings":";;;;;;;;;AAsBA,MAAM,qBACJ,OAAO,WAAW,cAAc,YAAY;AAgB9C,SAAgB,gBAA6B,EAC3C,MACA,SACA,iBACA,eACA,iBACA,WAC2D;CAC3D,MAAM,oBAAoB,gBAAgB;CAC1C,MAAM,cAAc,WAAW,kBAAkB;CACjD,MAAM,cAAc,OAElB,KAAK;CACP,MAAM,MAAM,mBAAmB,SAA6B;AAC1D,MAAI,QAAQ,MAAM;AAChB,OAAI,YAAY,WAAW,KACzB,OAAM,IAAI,MACR,oEACD;AAEH,OAAI,qBAAqB,KACvB,aAAY,UAAU,IAAI,gBACxB,SACA,mBACA,SACA,aACA,KACD;OAED,aAAY,UAAU,IAAI,KAAK,SAAS,aAAa,KAAK;AAE5D,GAAK,YAAY,QAAQ,QAAQ;IAC/B;IACA,eAAe;IACf;IACA;IACD,CAAC;SACG;AACL,OAAI,YAAY,WAAW,KACzB,OAAM,IAAI,MAAM,qDAAqD;AAEvE,eAAY,QAAQ,SAAS;AAC7B,eAAY,UAAU;;GAExB;AAEF,0BAAyB;AACvB,MAAI,YAAY,WAAW,KAAM;EACjC,MAAM,cAAc,CAAC,gBAAgB,YAAY,QAAQ,SAAS,QAAQ;AAC1E,cAAY,QAAQ,WAAW,QAAQ;AACvC,EAAK,YAAY,QAAQ,OAAO;GAAE;GAAM;GAAiB;GAAa,CAAC;AACvE,MAAI,kBAAkB,OACpB,aAAY,QAAQ,iBAAiB,cAAc;GAErD;AAOF,QAAO;EAAE;EAAK,gBALS,kBAEN;AACf,UAAO,YAAY,SAAS,gBAAgB;KAC3C,EAAE,CAAC;EACwB"}
+{"version":3,"file":"useFileInstance.js","names":[],"sources":["../../../src/react/utils/useFileInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n} from 'react';\n\nimport { File, type FileOptions } from '../../components/File';\nimport { VirtualizedFile } from '../../components/VirtualizedFile';\nimport type {\n  GetHoveredLineResult,\n  SelectedLineRange,\n} from '../../managers/InteractionManager';\nimport type {\n  FileContents,\n  LineAnnotation,\n  VirtualFileMetrics,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport { noopRender as renderGutterUtility } from '../constants';\nimport { useVirtualizer } from '../Virtualizer';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsometricEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseFileInstanceProps<LAnnotation> {\n  file: FileContents;\n  options: FileOptions<LAnnotation> | undefined;\n  lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  metrics?: VirtualFileMetrics;\n  hasGutterRenderUtility: boolean;\n}\n\ninterface UseFileInstanceReturn {\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'file'> | undefined;\n}\n\nexport function useFileInstance<LAnnotation>({\n  file,\n  options,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  metrics,\n  hasGutterRenderUtility,\n}: UseFileInstanceProps<LAnnotation>): UseFileInstanceReturn {\n  const simpleVirtualizer = useVirtualizer();\n  const poolManager = useContext(WorkerPoolContext);\n  const instanceRef = useRef<\n    File<LAnnotation> | VirtualizedFile<LAnnotation> | null\n  >(null);\n  const ref = useStableCallback((node: HTMLElement | null) => {\n    if (node != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'File: An instance should not already exist when a node is created'\n        );\n      }\n      if (simpleVirtualizer != null) {\n        instanceRef.current = new VirtualizedFile(\n          mergeFileOptions(options, hasGutterRenderUtility),\n          simpleVirtualizer,\n          metrics,\n          poolManager,\n          true\n        );\n      } else {\n        instanceRef.current = new File(\n          mergeFileOptions(options, hasGutterRenderUtility),\n          poolManager,\n          true\n        );\n      }\n      void instanceRef.current.hydrate({\n        file,\n        fileContainer: node,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error('File: A File instance should exist when unmounting');\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n    }\n  });\n\n  useIsometricEffect(() => {\n    if (instanceRef.current == null) return;\n    const newOptions = mergeFileOptions(options, hasGutterRenderUtility);\n    const forceRender = !areOptionsEqual(\n      instanceRef.current.options,\n      newOptions\n    );\n    instanceRef.current.setOptions(newOptions);\n    void instanceRef.current.render({ file, lineAnnotations, forceRender });\n    if (selectedLines !== undefined) {\n      instanceRef.current.setSelectedLines(selectedLines);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'file'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n  return { ref, getHoveredLine };\n}\n\nfunction mergeFileOptions<LAnnotation>(\n  options: FileOptions<LAnnotation> | undefined,\n  hasGutterRenderUtility: boolean\n): FileOptions<LAnnotation> | undefined {\n  if (hasGutterRenderUtility) {\n    return { ...options, renderGutterUtility };\n  }\n  return options;\n}\n"],"mappings":";;;;;;;;;;AAyBA,MAAM,qBACJ,OAAO,WAAW,cAAc,YAAY;AAiB9C,SAAgB,gBAA6B,EAC3C,MACA,SACA,iBACA,eACA,iBACA,SACA,0BAC2D;CAC3D,MAAM,oBAAoB,gBAAgB;CAC1C,MAAM,cAAc,WAAW,kBAAkB;CACjD,MAAM,cAAc,OAElB,KAAK;CACP,MAAM,MAAM,mBAAmB,SAA6B;AAC1D,MAAI,QAAQ,MAAM;AAChB,OAAI,YAAY,WAAW,KACzB,OAAM,IAAI,MACR,oEACD;AAEH,OAAI,qBAAqB,KACvB,aAAY,UAAU,IAAI,gBACxB,iBAAiB,SAAS,uBAAuB,EACjD,mBACA,SACA,aACA,KACD;OAED,aAAY,UAAU,IAAI,KACxB,iBAAiB,SAAS,uBAAuB,EACjD,aACA,KACD;AAEH,GAAK,YAAY,QAAQ,QAAQ;IAC/B;IACA,eAAe;IACf;IACA;IACD,CAAC;SACG;AACL,OAAI,YAAY,WAAW,KACzB,OAAM,IAAI,MAAM,qDAAqD;AAEvE,eAAY,QAAQ,SAAS;AAC7B,eAAY,UAAU;;GAExB;AAEF,0BAAyB;AACvB,MAAI,YAAY,WAAW,KAAM;EACjC,MAAM,aAAa,iBAAiB,SAAS,uBAAuB;EACpE,MAAM,cAAc,CAAC,gBACnB,YAAY,QAAQ,SACpB,WACD;AACD,cAAY,QAAQ,WAAW,WAAW;AAC1C,EAAK,YAAY,QAAQ,OAAO;GAAE;GAAM;GAAiB;GAAa,CAAC;AACvE,MAAI,kBAAkB,OACpB,aAAY,QAAQ,iBAAiB,cAAc;GAErD;AAOF,QAAO;EAAE;EAAK,gBALS,kBAEN;AACf,UAAO,YAAY,SAAS,gBAAgB;KAC3C,EAAE,CAAC;EACwB;;AAGhC,SAAS,iBACP,SACA,wBACsC;AACtC,KAAI,uBACF,QAAO;EAAE,GAAG;EAAS;EAAqB;AAE5C,QAAO"}

package/dist/react/utils/useUnresolvedFileInstance.d.ts

@@ -0,0 +1,35 @@
+import { DiffLineAnnotation, FileContents, FileDiffMetadata } from "../../types.js";
+import { GetHoveredLineResult, SelectedLineRange } from "../../managers/InteractionManager.js";
+import { MergeConflictDiffAction } from "../../utils/parseMergeConflictDiffFromFile.js";
+import { UnresolvedFileHunksRendererOptions } from "../../renderers/UnresolvedFileHunksRenderer.js";
+import { UnresolvedFile } from "../../components/UnresolvedFile.js";
+
+//#region src/react/utils/useUnresolvedFileInstance.d.ts
+interface UseUnresolvedFileInstanceProps<LAnnotation> {
+  file: FileContents;
+  options?: Omit<UnresolvedFileHunksRendererOptions, 'onMergeConflictAction'>;
+  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;
+  selectedLines: SelectedLineRange | null | undefined;
+  prerenderedHTML: string | undefined;
+  hasConflictUtility: boolean;
+  hasGutterRenderUtility: boolean;
+}
+interface UseUnresolvedFileInstanceReturn<LAnnotation> {
+  fileDiff: FileDiffMetadata;
+  actions: MergeConflictDiffAction[];
+  ref(node: HTMLElement | null): void;
+  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;
+  getInstance(): UnresolvedFile<LAnnotation> | undefined;
+}
+declare function useUnresolvedFileInstance<LAnnotation>({
+  file,
+  options,
+  lineAnnotations,
+  selectedLines,
+  prerenderedHTML,
+  hasConflictUtility,
+  hasGutterRenderUtility
+}: UseUnresolvedFileInstanceProps<LAnnotation>): UseUnresolvedFileInstanceReturn<LAnnotation>;
+//#endregion
+export { useUnresolvedFileInstance };
+//# sourceMappingURL=useUnresolvedFileInstance.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useUnresolvedFileInstance.d.ts","names":["UnresolvedFile","GetHoveredLineResult","SelectedLineRange","UnresolvedFileHunksRendererOptions","DiffLineAnnotation","FileContents","FileDiffMetadata","MergeConflictDiffAction","UseUnresolvedFileInstanceProps","LAnnotation","Omit","UseUnresolvedFileInstanceReturn","HTMLElement","useUnresolvedFileInstance","file","options","lineAnnotations","selectedLines","prerenderedHTML","hasConflictUtility","hasGutterRenderUtility"],"sources":["../../../src/react/utils/useUnresolvedFileInstance.d.ts"],"sourcesContent":["import { UnresolvedFile } from '../../components/UnresolvedFile';\nimport type { GetHoveredLineResult, SelectedLineRange } from '../../managers/InteractionManager';\nimport type { UnresolvedFileHunksRendererOptions } from '../../renderers/UnresolvedFileHunksRenderer';\nimport type { DiffLineAnnotation, FileContents, FileDiffMetadata } from '../../types';\nimport { type MergeConflictDiffAction } from '../../utils/parseMergeConflictDiffFromFile';\ninterface UseUnresolvedFileInstanceProps<LAnnotation> {\n    file: FileContents;\n    options?: Omit<UnresolvedFileHunksRendererOptions, 'onMergeConflictAction'>;\n    lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n    selectedLines: SelectedLineRange | null | undefined;\n    prerenderedHTML: string | undefined;\n    hasConflictUtility: boolean;\n    hasGutterRenderUtility: boolean;\n}\ninterface UseUnresolvedFileInstanceReturn<LAnnotation> {\n    fileDiff: FileDiffMetadata;\n    actions: MergeConflictDiffAction[];\n    ref(node: HTMLElement | null): void;\n    getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n    getInstance(): UnresolvedFile<LAnnotation> | undefined;\n}\nexport declare function useUnresolvedFileInstance<LAnnotation>({ file, options, lineAnnotations, selectedLines, prerenderedHTML, hasConflictUtility, hasGutterRenderUtility }: UseUnresolvedFileInstanceProps<LAnnotation>): UseUnresolvedFileInstanceReturn<LAnnotation>;\nexport {};\n//# sourceMappingURL=useUnresolvedFileInstance.d.ts.map"],"mappings":";;;;;;;UAKUQ;QACAH;EADAG,OAAAA,CAAAA,EAEIE,IAFJF,CAESL,kCAFqBM,EAAAA,uBAAA,CAAA;EAC9BJ,eAAAA,EAEWD,kBAFXC,CAE8BI,WAF9BJ,CAAAA,EAAAA,GAAAA,SAAAA;EACSF,aAAAA,EAEAD,iBAFAC,GAAAA,IAAAA,GAAAA,SAAAA;EAALO,eAAAA,EAAAA,MAAAA,GAAAA,SAAAA;EAC0BD,kBAAAA,EAAAA,OAAAA;EAAnBL,sBAAAA,EAAAA,OAAAA;;UAMXO,+BAL0B,CAAA,WAAA,CAAA,CAAA;EAK1BA,QAAAA,EACIL,gBADJK;EACIL,OAAAA,EACDC,uBADCD,EAAAA;EACDC,GAAAA,CAAAA,IAAAA,EACCK,WADDL,GAAAA,IAAAA,CAAAA,EAAAA,IAAAA;EACCK,cAAAA,EAAAA,EACQX,oBADRW,CAAAA,MAAAA,CAAAA,GAAAA,SAAAA;EACQX,WAAAA,EAAAA,EACHD,cADGC,CACYQ,WADZR,CAAAA,GAAAA,SAAAA;;AACHD,iBAEKa,yBAFLb,CAAAA,WAAAA,CAAAA,CAAAA;EAAAA,IAAAA;EAAAA,OAAAA;EAAAA,eAAAA;EAAAA,aAAAA;EAAAA,eAAAA;EAAAA,kBAAAA;EAAAA;AAAAA,CAAAA,EAE4JQ,8BAF5JR,CAE2LS,WAF3LT,CAAAA,CAAAA,EAE0MW,+BAF1MX,CAE0OS,WAF1OT,CAAAA"}

package/dist/react/utils/useUnresolvedFileInstance.js

@@ -0,0 +1,88 @@
+import { parseMergeConflictDiffFromFile } from "../../utils/parseMergeConflictDiffFromFile.js";
+import { UnresolvedFile } from "../../components/UnresolvedFile.js";
+import { areOptionsEqual } from "../../utils/areOptionsEqual.js";
+import { noopRender } from "../constants.js";
+import { WorkerPoolContext } from "../WorkerPoolContext.js";
+import { useStableCallback } from "./useStableCallback.js";
+import { useCallback, useContext, useEffect, useLayoutEffect, useRef, useState } from "react";
+
+//#region src/react/utils/useUnresolvedFileInstance.ts
+const useIsometricEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
+function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLines, prerenderedHTML, hasConflictUtility, hasGutterRenderUtility }) {
+	const [{ fileDiff, actions }, setState] = useState(() => {
+		const { fileDiff: fileDiff$1, actions: actions$1 } = parseMergeConflictDiffFromFile(file);
+		return {
+			fileDiff: fileDiff$1,
+			actions: actions$1
+		};
+	});
+	const activeFileRef = useRef(file);
+	const onMergeConflictAction = useStableCallback((payload, instance) => {
+		const activeFile = activeFileRef.current;
+		const newFile = instance.resolveConflict(payload.conflict.conflictIndex, payload.resolution, activeFile);
+		if (newFile == null) return;
+		activeFileRef.current = newFile;
+		const { fileDiff: fileDiff$1, actions: actions$1 } = parseMergeConflictDiffFromFile(newFile);
+		setState({
+			fileDiff: fileDiff$1,
+			actions: actions$1
+		});
+	});
+	const poolManager = useContext(WorkerPoolContext);
+	const instanceRef = useRef(null);
+	const ref = useStableCallback((fileContainer) => {
+		if (fileContainer != null) {
+			if (instanceRef.current != null) throw new Error("useUnresolvedFileInstance: An instance should not already exist when a node is created");
+			instanceRef.current = new UnresolvedFile(mergeUnresolvedOptions(options, onMergeConflictAction, hasConflictUtility, hasGutterRenderUtility), poolManager, true);
+			instanceRef.current.hydrate({
+				fileDiff,
+				actions,
+				fileContainer,
+				lineAnnotations,
+				prerenderedHTML
+			});
+		} else {
+			if (instanceRef.current == null) throw new Error("useUnresolvedFileInstance: A UnresolvedFile instance should exist when unmounting");
+			instanceRef.current.cleanUp();
+			instanceRef.current = null;
+		}
+	});
+	useIsometricEffect(() => {
+		if (instanceRef.current == null) return;
+		const instance = instanceRef.current;
+		const newOptions = mergeUnresolvedOptions(options, onMergeConflictAction, hasConflictUtility, hasGutterRenderUtility);
+		const forceRender = !areOptionsEqual(instance.options, newOptions);
+		instance.setOptions(newOptions);
+		instance.render({
+			fileDiff,
+			actions,
+			lineAnnotations,
+			forceRender
+		});
+		if (selectedLines !== void 0) instance.setSelectedLines(selectedLines);
+	});
+	return {
+		ref,
+		getHoveredLine: useCallback(() => {
+			return instanceRef.current?.getHoveredLine();
+		}, []),
+		fileDiff,
+		actions,
+		getInstance: useCallback(() => {
+			return instanceRef.current ?? void 0;
+		}, [])
+	};
+}
+function mergeUnresolvedOptions(options, onMergeConflictAction, hasConflictUtility, hasGutterRenderUtility) {
+	return {
+		...options,
+		onMergeConflictAction,
+		hunkSeparators: options?.hunkSeparators === "custom" ? noopRender : options?.hunkSeparators,
+		mergeConflictActionsType: hasConflictUtility || options?.mergeConflictActionsType === "custom" ? noopRender : options?.mergeConflictActionsType,
+		renderGutterUtility: hasGutterRenderUtility ? noopRender : void 0
+	};
+}
+
+//#endregion
+export { useUnresolvedFileInstance };
+//# sourceMappingURL=useUnresolvedFileInstance.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useUnresolvedFileInstance.js","names":["UnresolvedFileClass"],"sources":["../../../src/react/utils/useUnresolvedFileInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n  useState,\n} from 'react';\n\nimport {\n  UnresolvedFile,\n  UnresolvedFile as UnresolvedFileClass,\n  type UnresolvedFileOptions,\n} from '../../components/UnresolvedFile';\nimport type {\n  GetHoveredLineResult,\n  SelectedLineRange,\n} from '../../managers/InteractionManager';\nimport type { UnresolvedFileHunksRendererOptions } from '../../renderers/UnresolvedFileHunksRenderer';\nimport type {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport {\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../../utils/parseMergeConflictDiffFromFile';\nimport { noopRender } from '../constants';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsometricEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseUnresolvedFileInstanceProps<LAnnotation> {\n  file: FileContents;\n  options?: Omit<UnresolvedFileHunksRendererOptions, 'onMergeConflictAction'>;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n}\n\ninterface UseUnresolvedFileInstanceReturn<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  actions: MergeConflictDiffAction[];\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getInstance(): UnresolvedFile<LAnnotation> | undefined;\n}\n\nexport function useUnresolvedFileInstance<LAnnotation>({\n  file,\n  options,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  hasConflictUtility,\n  hasGutterRenderUtility,\n}: UseUnresolvedFileInstanceProps<LAnnotation>): UseUnresolvedFileInstanceReturn<LAnnotation> {\n  const [{ fileDiff, actions }, setState] = useState(() => {\n    const { fileDiff, actions } = parseMergeConflictDiffFromFile(file);\n    return { fileDiff, actions };\n  });\n  // UnresolvedFile is intentionally uncontrolled in React. Keep an internal\n  // source-of-truth file so sequential conflict actions apply to the latest\n  // resolved contents rather than the initial prop value.\n  const activeFileRef = useRef(file);\n  const onMergeConflictAction = useStableCallback(\n    (\n      payload: MergeConflictActionPayload,\n      instance: UnresolvedFile<LAnnotation>\n    ) => {\n      const activeFile = activeFileRef.current;\n      const newFile = instance.resolveConflict(\n        payload.conflict.conflictIndex,\n        payload.resolution,\n        activeFile\n      );\n      if (newFile == null) return;\n      activeFileRef.current = newFile;\n      const { fileDiff, actions } = parseMergeConflictDiffFromFile(newFile);\n      setState({ fileDiff, actions });\n    }\n  );\n  const poolManager = useContext(WorkerPoolContext);\n  const instanceRef = useRef<UnresolvedFileClass<LAnnotation> | null>(null);\n  const ref = useStableCallback((fileContainer: HTMLElement | null) => {\n    if (fileContainer != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'useUnresolvedFileInstance: An instance should not already exist when a node is created'\n        );\n      }\n      instanceRef.current = new UnresolvedFileClass(\n        mergeUnresolvedOptions(\n          options,\n          onMergeConflictAction,\n          hasConflictUtility,\n          hasGutterRenderUtility\n        ),\n        poolManager,\n        true\n      );\n      void instanceRef.current.hydrate({\n        fileDiff,\n        actions,\n        fileContainer,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error(\n          'useUnresolvedFileInstance: A UnresolvedFile instance should exist when unmounting'\n        );\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n    }\n  });\n\n  useIsometricEffect(() => {\n    if (instanceRef.current == null) return;\n    const instance = instanceRef.current;\n    const newOptions = mergeUnresolvedOptions(\n      options,\n      onMergeConflictAction,\n      hasConflictUtility,\n      hasGutterRenderUtility\n    );\n    const forceRender = !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    void instance.render({\n      fileDiff,\n      actions,\n      lineAnnotations,\n      forceRender,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n\n  const getInstance = useCallback(() => {\n    return instanceRef.current ?? undefined;\n  }, []);\n\n  return { ref, getHoveredLine, fileDiff, actions, getInstance };\n}\n\nfunction mergeUnresolvedOptions<LAnnotation>(\n  options: UnresolvedFileHunksRendererOptions | undefined,\n  onMergeConflictAction: UnresolvedFileOptions<LAnnotation>['onMergeConflictAction'],\n  hasConflictUtility: boolean,\n  hasGutterRenderUtility: boolean\n): UnresolvedFileOptions<LAnnotation> {\n  return {\n    ...options,\n    onMergeConflictAction,\n    hunkSeparators:\n      options?.hunkSeparators === 'custom'\n        ? noopRender\n        : options?.hunkSeparators,\n    // Add a placeholder type for the custom render\n    mergeConflictActionsType:\n      hasConflictUtility || options?.mergeConflictActionsType === 'custom'\n        ? noopRender\n        : options?.mergeConflictActionsType,\n    renderGutterUtility: hasGutterRenderUtility ? noopRender : undefined,\n  };\n}\n"],"mappings":";;;;;;;;;AAkCA,MAAM,qBACJ,OAAO,WAAW,cAAc,YAAY;AAoB9C,SAAgB,0BAAuC,EACrD,MACA,SACA,iBACA,eACA,iBACA,oBACA,0BAC4F;CAC5F,MAAM,CAAC,EAAE,UAAU,WAAW,YAAY,eAAe;EACvD,MAAM,EAAE,sBAAU,uBAAY,+BAA+B,KAAK;AAClE,SAAO;GAAE;GAAU;GAAS;GAC5B;CAIF,MAAM,gBAAgB,OAAO,KAAK;CAClC,MAAM,wBAAwB,mBAE1B,SACA,aACG;EACH,MAAM,aAAa,cAAc;EACjC,MAAM,UAAU,SAAS,gBACvB,QAAQ,SAAS,eACjB,QAAQ,YACR,WACD;AACD,MAAI,WAAW,KAAM;AACrB,gBAAc,UAAU;EACxB,MAAM,EAAE,sBAAU,uBAAY,+BAA+B,QAAQ;AACrE,WAAS;GAAE;GAAU;GAAS,CAAC;GAElC;CACD,MAAM,cAAc,WAAW,kBAAkB;CACjD,MAAM,cAAc,OAAgD,KAAK;CACzE,MAAM,MAAM,mBAAmB,kBAAsC;AACnE,MAAI,iBAAiB,MAAM;AACzB,OAAI,YAAY,WAAW,KACzB,OAAM,IAAI,MACR,yFACD;AAEH,eAAY,UAAU,IAAIA,eACxB,uBACE,SACA,uBACA,oBACA,uBACD,EACD,aACA,KACD;AACD,GAAK,YAAY,QAAQ,QAAQ;IAC/B;IACA;IACA;IACA;IACA;IACD,CAAC;SACG;AACL,OAAI,YAAY,WAAW,KACzB,OAAM,IAAI,MACR,oFACD;AAEH,eAAY,QAAQ,SAAS;AAC7B,eAAY,UAAU;;GAExB;AAEF,0BAAyB;AACvB,MAAI,YAAY,WAAW,KAAM;EACjC,MAAM,WAAW,YAAY;EAC7B,MAAM,aAAa,uBACjB,SACA,uBACA,oBACA,uBACD;EACD,MAAM,cAAc,CAAC,gBAAgB,SAAS,SAAS,WAAW;AAClE,WAAS,WAAW,WAAW;AAC/B,EAAK,SAAS,OAAO;GACnB;GACA;GACA;GACA;GACD,CAAC;AACF,MAAI,kBAAkB,OACpB,UAAS,iBAAiB,cAAc;GAE1C;AAYF,QAAO;EAAE;EAAK,gBAVS,kBAEN;AACf,UAAO,YAAY,SAAS,gBAAgB;KAC3C,EAAE,CAAC;EAMwB;EAAU;EAAS,aAJ7B,kBAAkB;AACpC,UAAO,YAAY,WAAW;KAC7B,EAAE,CAAC;EAEwD;;AAGhE,SAAS,uBACP,SACA,uBACA,oBACA,wBACoC;AACpC,QAAO;EACL,GAAG;EACH;EACA,gBACE,SAAS,mBAAmB,WACxB,aACA,SAAS;EAEf,0BACE,sBAAsB,SAAS,6BAA6B,WACxD,aACA,SAAS;EACf,qBAAqB,yBAAyB,aAAa;EAC5D"}

package/dist/renderers/DiffHunksRenderer.d.ts

@@ -1,9 +1,43 @@
-import { BaseDiffOptions, DiffLineAnnotation, ExpansionDirections, FileDiffMetadata, HunkData, HunkExpansionRegion, RenderDiffOptions, RenderRange, ThemeTypes, ThemedDiffResult } from "../types.js";
+import { AnnotationSpan, BaseDiffOptions, BaseDiffOptionsWithDefaults, CustomPreProperties, DiffLineAnnotation, ExpansionDirections, FileDiffMetadata, HunkData, HunkExpansionRegion, LineTypes, RenderDiffOptions, RenderRange, ThemeTypes, ThemedDiffResult } from "../types.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
 import "../worker/index.js";
-import { Element, ElementContent } from "hast";
+import { DiffLineMetadata } from "../utils/iterateOverDiff.js";
+import { Element, ElementContent, Properties } from "hast";
 
 //#region src/renderers/DiffHunksRenderer.d.ts
+interface UnifiedLineDecorationProps {
+  type: 'context' | 'context-expanded' | 'change';
+  lineType: LineTypes;
+  additionLineIndex: number | undefined;
+  deletionLineIndex: number | undefined;
+}
+interface SplitLineDecorationProps {
+  side: 'deletions' | 'additions';
+  type: 'context' | 'context-expanded' | 'change';
+  lineIndex: number | undefined;
+}
+interface LineDecoration {
+  gutterLineType: LineTypes;
+  gutterProperties?: Properties;
+  contentProperties?: Properties;
+}
+interface RenderedLineContext {
+  type: 'context' | 'context-expanded' | 'change';
+  hunkIndex: number;
+  lineIndex: number;
+  unifiedLineIndex: number;
+  splitLineIndex: number;
+  deletionLine?: DiffLineMetadata;
+  additionLine?: DiffLineMetadata;
+}
+interface InlineRow {
+  content: Element;
+  gutter: Element;
+}
+interface SplitInlineRow {
+  deletion: InlineRow | undefined;
+  addition: InlineRow | undefined;
+}
 interface HunksRenderResult {
   unifiedGutterAST: ElementContent[] | undefined;
   unifiedContentAST: ElementContent[] | undefined;
@@ -40,17 +74,27 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   setOptions(options: BaseDiffOptions): void;
   private mergeOptions;
   setThemeType(themeType: ThemeTypes): void;
-  expandHunk(index: number, direction: ExpansionDirections): void;
+  expandHunk(index: number, direction: ExpansionDirections, expansionLineCount?: number): void;
   getExpandedHunk(hunkIndex: number): HunkExpansionRegion;
   getExpandedHunksMap(): Map<number, HunkExpansionRegion>;
   setLineAnnotations(lineAnnotations: DiffLineAnnotation<LAnnotation>[]): void;
-  private getOptionsWithDefaults;
+  protected getUnifiedLineDecoration({
+    lineType
+  }: UnifiedLineDecorationProps): LineDecoration;
+  protected getSplitLineDecoration({
+    side,
+    type
+  }: SplitLineDecorationProps): LineDecoration;
+  protected createAnnotationElement(span: AnnotationSpan): Element;
+  protected getUnifiedInlineRowsForLine?: (ctx: RenderedLineContext) => InlineRow[] | undefined;
+  protected getSplitInlineRowsForLine?: (ctx: RenderedLineContext) => SplitInlineRow[] | undefined;
+  protected getOptionsWithDefaults(): BaseDiffOptionsWithDefaults;
   private initializeHighlighter;
   hydrate(diff: FileDiffMetadata | undefined): void;
   private getRenderOptions;
   renderDiff(diff?: FileDiffMetadata | undefined, renderRange?: RenderRange): HunksRenderResult | undefined;
   asyncRender(diff: FileDiffMetadata, renderRange?: RenderRange): Promise<HunksRenderResult>;
-  private createPreElement;
+  protected createPreElement(split: boolean, totalLines: number, themeStyles: string, baseThemeType: 'light' | 'dark' | undefined, customProperties?: CustomPreProperties): Element;
   private asyncHighlight;
   private renderDiffWithHighlighter;
   onHighlightSuccess(diff: FileDiffMetadata, result: ThemedDiffResult, options: RenderDiffOptions): void;
@@ -64,5 +108,5 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   private renderHeader;
 }
 //#endregion
-export { DiffHunksRenderer, HunksRenderResult };
+export { DiffHunksRenderer, HunksRenderResult, InlineRow, LineDecoration, RenderedLineContext, SplitInlineRow, SplitLineDecorationProps, UnifiedLineDecorationProps };
 //# sourceMappingURL=DiffHunksRenderer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"DiffHunksRenderer.d.ts","names":["ElementContent","Element","HASTElement","BaseDiffOptions","DiffLineAnnotation","ExpansionDirections","FileDiffMetadata","HunkData","HunkExpansionRegion","RenderDiffOptions","RenderRange","ThemedDiffResult","ThemeTypes","WorkerPoolManager","HunksRenderResult","DiffHunksRenderer","LAnnotation","Map","Promise"],"sources":["../../src/renderers/DiffHunksRenderer.d.ts"],"sourcesContent":["import type { ElementContent, Element as HASTElement } from 'hast';\nimport type { BaseDiffOptions, DiffLineAnnotation, ExpansionDirections, FileDiffMetadata, HunkData, HunkExpansionRegion, RenderDiffOptions, RenderRange, ThemedDiffResult, ThemeTypes } from '../types';\nimport type { WorkerPoolManager } from '../worker';\nexport interface HunksRenderResult {\n    unifiedGutterAST: ElementContent[] | undefined;\n    unifiedContentAST: ElementContent[] | undefined;\n    deletionsGutterAST: ElementContent[] | undefined;\n    deletionsContentAST: ElementContent[] | undefined;\n    additionsGutterAST: ElementContent[] | undefined;\n    additionsContentAST: ElementContent[] | undefined;\n    hunkData: HunkData[];\n    css: string;\n    preNode: HASTElement;\n    headerElement: HASTElement | undefined;\n    totalLines: number;\n    themeStyles: string;\n    baseThemeType: 'light' | 'dark' | undefined;\n    rowCount: number;\n    bufferBefore: number;\n    bufferAfter: number;\n}\nexport declare class DiffHunksRenderer<LAnnotation = undefined> {\n    options: BaseDiffOptions;\n    private onRenderUpdate?;\n    private workerManager?;\n    readonly __id: string;\n    private highlighter;\n    private diff;\n    private expandedHunks;\n    private deletionAnnotations;\n    private additionAnnotations;\n    private computedLang;\n    private renderCache;\n    constructor(options?: BaseDiffOptions, onRenderUpdate?: (() => unknown) | undefined, workerManager?: WorkerPoolManager | undefined);\n    cleanUp(): void;\n    recycle(): void;\n    setOptions(options: BaseDiffOptions): void;\n    private mergeOptions;\n    setThemeType(themeType: ThemeTypes): void;\n    expandHunk(index: number, direction: ExpansionDirections): void;\n    getExpandedHunk(hunkIndex: number): HunkExpansionRegion;\n    getExpandedHunksMap(): Map<number, HunkExpansionRegion>;\n    setLineAnnotations(lineAnnotations: DiffLineAnnotation<LAnnotation>[]): void;\n    private getOptionsWithDefaults;\n    private initializeHighlighter;\n    hydrate(diff: FileDiffMetadata | undefined): void;\n    private getRenderOptions;\n    renderDiff(diff?: FileDiffMetadata | undefined, renderRange?: RenderRange): HunksRenderResult | undefined;\n    asyncRender(diff: FileDiffMetadata, renderRange?: RenderRange): Promise<HunksRenderResult>;\n    private createPreElement;\n    private asyncHighlight;\n    private renderDiffWithHighlighter;\n    onHighlightSuccess(diff: FileDiffMetadata, result: ThemedDiffResult, options: RenderDiffOptions): void;\n    onHighlightError(error: unknown): void;\n    private processDiffResult;\n    renderCodeAST(type: 'unified' | 'deletions' | 'additions', result: HunksRenderResult): ElementContent[] | undefined;\n    renderFullAST(result: HunksRenderResult, children?: ElementContent[]): HASTElement;\n    renderFullHTML(result: HunksRenderResult, tempChildren?: ElementContent[]): string;\n    renderPartialHTML(children: ElementContent[], columnType?: 'unified' | 'deletions' | 'additions'): string;\n    private getAnnotations;\n    private renderHeader;\n}\n//# sourceMappingURL=DiffHunksRenderer.d.ts.map"],"mappings":";;;;;;UAGiBc,iBAAAA;oBACKd;qBACCA;EAFNc,kBAAAA,EAGOd,cAHU,EAAA,GAAA,SAAA;EACZA,mBAAAA,EAGGA,cAHHA,EAAAA,GAAAA,SAAAA;EACCA,kBAAAA,EAGCA,cAHDA,EAAAA,GAAAA,SAAAA;EACCA,mBAAAA,EAGCA,cAHDA,EAAAA,GAAAA,SAAAA;EACCA,QAAAA,EAGXO,QAHWP,EAAAA;EACDA,GAAAA,EAAAA,MAAAA;EACCA,OAAAA,EAGZE,OAHYF;EACXO,aAAAA,EAGKL,OAHLK,GAAAA,SAAAA;EAEDL,UAAAA,EAAAA,MAAAA;EACMA,WAAAA,EAAAA,MAAAA;EAAW,aAAA,EAAA,OAAA,GAAA,MAAA,GAAA,SAAA;EAQTa,QAAAA,EAAAA,MAAAA;EACRZ,YAAAA,EAAAA,MAAAA;EAWaA,WAAAA,EAAAA,MAAAA;;AAGFA,cAfHY,iBAeGZ,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAEIS,OAAAA,EAhBfT,eAgBeS;EACaP,QAAAA,cAAAA;EACDG,QAAAA,aAAAA;EACDA,SAAAA,IAAAA,EAAAA,MAAAA;EAAZS,QAAAA,WAAAA;EACgCD,QAAAA,IAAAA;EAAnBZ,QAAAA,aAAAA;EAGtBE,QAAAA,mBAAAA;EAEIA,QAAAA,mBAAAA;EAA4CI,QAAAA,YAAAA;EAAcI,QAAAA,WAAAA;EAC1DR,WAAAA,CAAAA,OAAAA,CAAAA,EAfIH,eAeJG,EAAAA,cAAAA,CAAAA,EAAAA,CAAAA,GAAAA,GAAAA,OAAAA,CAAAA,GAAAA,SAAAA,EAAAA,aAAAA,CAAAA,EAfmFO,iBAenFP,GAAAA,SAAAA;EAAgCI,OAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAAsBI,OAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAARI,UAAAA,CAAAA,OAAAA,EAZ5Cf,eAY4Ce,CAAAA,EAAAA,IAAAA;EAIvCZ,QAAAA,YAAAA;EAA0BK,YAAAA,CAAAA,SAAAA,EAd3BC,UAc2BD,CAAAA,EAAAA,IAAAA;EAA2BF,UAAAA,CAAAA,KAAAA,EAAAA,MAAAA,EAAAA,SAAAA,EAbzCJ,mBAayCI,CAAAA,EAAAA,IAAAA;EAGXK,eAAAA,CAAAA,SAAAA,EAAAA,MAAAA,CAAAA,EAf/BN,mBAe+BM;EAAoBd,mBAAAA,CAAAA,CAAAA,EAdhEiB,GAcgEjB,CAAAA,MAAAA,EAdpDQ,mBAcoDR,CAAAA;EACjEc,kBAAAA,CAAAA,eAAAA,EAdcV,kBAcdU,CAdiCE,WAcjCF,CAAAA,EAAAA,CAAAA,EAAAA,IAAAA;EAA8Bd,QAAAA,sBAAAA;EAAmBE,QAAAA,qBAAAA;EAChDY,OAAAA,CAAAA,IAAAA,EAZTR,gBAYSQ,GAAAA,SAAAA,CAAAA,EAAAA,IAAAA;EAAkCd,QAAAA,gBAAAA;EAC7BA,UAAAA,CAAAA,IAAAA,CAAAA,EAXVM,gBAWUN,GAAAA,SAAAA,EAAAA,WAAAA,CAAAA,EAXkCU,WAWlCV,CAAAA,EAXgDc,iBAWhDd,GAAAA,SAAAA;EAAc,WAAA,CAAA,IAAA,EAVxBM,gBAUwB,EAAA,WAAA,CAAA,EAVQI,WAUR,CAAA,EAVsBQ,OAUtB,CAV8BJ,iBAU9B,CAAA;;;;2BANjBR,0BAA0BK,2BAA2BF;;;qEAGXK,oBAAoBd;wBACjEc,8BAA8Bd,mBAAmBE;yBAChDY,kCAAkCd;8BAC7BA"}
+{"version":3,"file":"DiffHunksRenderer.d.ts","names":["ElementContent","Element","HASTElement","Properties","AnnotationSpan","BaseDiffOptions","BaseDiffOptionsWithDefaults","CustomPreProperties","DiffLineAnnotation","ExpansionDirections","FileDiffMetadata","HunkData","HunkExpansionRegion","LineTypes","RenderDiffOptions","RenderRange","ThemedDiffResult","ThemeTypes","DiffLineMetadata","WorkerPoolManager","UnifiedLineDecorationProps","SplitLineDecorationProps","LineDecoration","RenderedLineContext","InlineRow","SplitInlineRow","HunksRenderResult","DiffHunksRenderer","LAnnotation","Map","lineType","side","type","Promise"],"sources":["../../src/renderers/DiffHunksRenderer.d.ts"],"sourcesContent":["import type { ElementContent, Element as HASTElement, Properties } from 'hast';\nimport type { AnnotationSpan, BaseDiffOptions, BaseDiffOptionsWithDefaults, CustomPreProperties, DiffLineAnnotation, ExpansionDirections, FileDiffMetadata, HunkData, HunkExpansionRegion, LineTypes, RenderDiffOptions, RenderRange, ThemedDiffResult, ThemeTypes } from '../types';\nimport type { DiffLineMetadata } from '../utils/iterateOverDiff';\nimport type { WorkerPoolManager } from '../worker';\nexport interface UnifiedLineDecorationProps {\n    type: 'context' | 'context-expanded' | 'change';\n    lineType: LineTypes;\n    additionLineIndex: number | undefined;\n    deletionLineIndex: number | undefined;\n}\nexport interface SplitLineDecorationProps {\n    side: 'deletions' | 'additions';\n    type: 'context' | 'context-expanded' | 'change';\n    lineIndex: number | undefined;\n}\nexport interface LineDecoration {\n    gutterLineType: LineTypes;\n    gutterProperties?: Properties;\n    contentProperties?: Properties;\n}\nexport interface RenderedLineContext {\n    type: 'context' | 'context-expanded' | 'change';\n    hunkIndex: number;\n    lineIndex: number;\n    unifiedLineIndex: number;\n    splitLineIndex: number;\n    deletionLine?: DiffLineMetadata;\n    additionLine?: DiffLineMetadata;\n}\nexport interface InlineRow {\n    content: HASTElement;\n    gutter: HASTElement;\n}\nexport interface SplitInlineRow {\n    deletion: InlineRow | undefined;\n    addition: InlineRow | undefined;\n}\nexport interface HunksRenderResult {\n    unifiedGutterAST: ElementContent[] | undefined;\n    unifiedContentAST: ElementContent[] | undefined;\n    deletionsGutterAST: ElementContent[] | undefined;\n    deletionsContentAST: ElementContent[] | undefined;\n    additionsGutterAST: ElementContent[] | undefined;\n    additionsContentAST: ElementContent[] | undefined;\n    hunkData: HunkData[];\n    css: string;\n    preNode: HASTElement;\n    headerElement: HASTElement | undefined;\n    totalLines: number;\n    themeStyles: string;\n    baseThemeType: 'light' | 'dark' | undefined;\n    rowCount: number;\n    bufferBefore: number;\n    bufferAfter: number;\n}\nexport declare class DiffHunksRenderer<LAnnotation = undefined> {\n    options: BaseDiffOptions;\n    private onRenderUpdate?;\n    private workerManager?;\n    readonly __id: string;\n    private highlighter;\n    private diff;\n    private expandedHunks;\n    private deletionAnnotations;\n    private additionAnnotations;\n    private computedLang;\n    private renderCache;\n    constructor(options?: BaseDiffOptions, onRenderUpdate?: (() => unknown) | undefined, workerManager?: WorkerPoolManager | undefined);\n    cleanUp(): void;\n    recycle(): void;\n    setOptions(options: BaseDiffOptions): void;\n    private mergeOptions;\n    setThemeType(themeType: ThemeTypes): void;\n    expandHunk(index: number, direction: ExpansionDirections, expansionLineCount?: number): void;\n    getExpandedHunk(hunkIndex: number): HunkExpansionRegion;\n    getExpandedHunksMap(): Map<number, HunkExpansionRegion>;\n    setLineAnnotations(lineAnnotations: DiffLineAnnotation<LAnnotation>[]): void;\n    protected getUnifiedLineDecoration({ lineType }: UnifiedLineDecorationProps): LineDecoration;\n    protected getSplitLineDecoration({ side, type }: SplitLineDecorationProps): LineDecoration;\n    protected createAnnotationElement(span: AnnotationSpan): HASTElement;\n    protected getUnifiedInlineRowsForLine?: (ctx: RenderedLineContext) => InlineRow[] | undefined;\n    protected getSplitInlineRowsForLine?: (ctx: RenderedLineContext) => SplitInlineRow[] | undefined;\n    protected getOptionsWithDefaults(): BaseDiffOptionsWithDefaults;\n    private initializeHighlighter;\n    hydrate(diff: FileDiffMetadata | undefined): void;\n    private getRenderOptions;\n    renderDiff(diff?: FileDiffMetadata | undefined, renderRange?: RenderRange): HunksRenderResult | undefined;\n    asyncRender(diff: FileDiffMetadata, renderRange?: RenderRange): Promise<HunksRenderResult>;\n    protected createPreElement(split: boolean, totalLines: number, themeStyles: string, baseThemeType: 'light' | 'dark' | undefined, customProperties?: CustomPreProperties): HASTElement;\n    private asyncHighlight;\n    private renderDiffWithHighlighter;\n    onHighlightSuccess(diff: FileDiffMetadata, result: ThemedDiffResult, options: RenderDiffOptions): void;\n    onHighlightError(error: unknown): void;\n    private processDiffResult;\n    renderCodeAST(type: 'unified' | 'deletions' | 'additions', result: HunksRenderResult): ElementContent[] | undefined;\n    renderFullAST(result: HunksRenderResult, children?: ElementContent[]): HASTElement;\n    renderFullHTML(result: HunksRenderResult, tempChildren?: ElementContent[]): string;\n    renderPartialHTML(children: ElementContent[], columnType?: 'unified' | 'deletions' | 'additions'): string;\n    private getAnnotations;\n    private renderHeader;\n}\n//# sourceMappingURL=DiffHunksRenderer.d.ts.map"],"mappings":";;;;;;;UAIiBoB,0BAAAA;;YAEHP;EAFGO,iBAAAA,EAAAA,MAAAA,GAAAA,SAA0B;EAM1BC,iBAAAA,EAAAA,MAAAA,GAAwB,SAAA;AAKzC;AACoBR,UANHQ,wBAAAA,CAMGR;EACGV,IAAAA,EAAAA,WAAAA,GAAAA,WAAAA;EACCA,IAAAA,EAAAA,SAAAA,GAAAA,kBAAAA,GAAAA,QAAAA;EAAU,SAAA,EAAA,MAAA,GAAA,SAAA;AAElC;AASiBqB,UAdAF,cAAAA,CAeJpB;EAGIuB,cAAAA,EAjBGZ,SAiBW;EAIda,gBAAAA,CAAAA,EApBMvB,UAoBW;EACZH,iBAAAA,CAAAA,EApBEG,UAoBFH;;AAEEA,UApBPuB,mBAAAA,CAoBOvB;EACCA,IAAAA,EAAAA,SAAAA,GAAAA,kBAAAA,GAAAA,QAAAA;EACDA,SAAAA,EAAAA,MAAAA;EACCA,SAAAA,EAAAA,MAAAA;EACXW,gBAAAA,EAAAA,MAAAA;EAEDT,cAAAA,EAAAA,MAAAA;EACMA,YAAAA,CAAAA,EArBAgB,gBAqBAhB;EAAW,YAAA,CAAA,EApBXgB,gBAoBW;AAQ9B;AACab,UA3BImB,SAAAA,CA2BJnB;EAWaA,OAAAA,EArCbH,OAqCaG;EAA+Ec,MAAAA,EApC7FjB,OAoC6FiB;;AAK7EF,UAvCXQ,cAAAA,CAuCWR;EACaR,QAAAA,EAvC3Be,SAuC2Bf,GAAAA,SAAAA;EACDG,QAAAA,EAvC1BY,SAuC0BZ,GAAAA,SAAAA;;AACbiB,UAtCVH,iBAAAA,CAsCUG;EACgCD,gBAAAA,EAtCrC5B,cAsCqC4B,EAAAA,GAAAA,SAAAA;EAAnBpB,iBAAAA,EArCjBR,cAqCiBQ,EAAAA,GAAAA,SAAAA;EACCsB,kBAAAA,EArCjB9B,cAqCiB8B,EAAAA,GAAAA,SAAAA;EAAYV,mBAAAA,EApC5BpB,cAoC4BoB,EAAAA,GAAAA,SAAAA;EAA6BE,kBAAAA,EAnC1DtB,cAmC0DsB,EAAAA,GAAAA,SAAAA;EAC3CS,mBAAAA,EAnCd/B,cAmCc+B,EAAAA,GAAAA,SAAAA;EAAMC,QAAAA,EAlC/BrB,QAkC+BqB,EAAAA;EAAQX,GAAAA,EAAAA,MAAAA;EAA2BC,OAAAA,EAhCnEpB,OAgCmEoB;EACpClB,aAAAA,EAhCzBF,OAgCyBE,GAAAA,SAAAA;EAAiBF,UAAAA,EAAAA,MAAAA;EACXqB,WAAAA,EAAAA,MAAAA;EAAwBC,aAAAA,EAAAA,OAAAA,GAAAA,MAAAA,GAAAA,SAAAA;EAC1BD,QAAAA,EAAAA,MAAAA;EAAwBE,YAAAA,EAAAA,MAAAA;EAChCnB,WAAAA,EAAAA,MAAAA;;AAIlBI,cA/BDiB,iBA+BCjB,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAA4CK,OAAAA,EA9BrDV,eA8BqDU;EAAcW,QAAAA,cAAAA;EAC1DhB,QAAAA,aAAAA;EAAgCK,SAAAA,IAAAA,EAAAA,MAAAA;EAAsBW,QAAAA,WAAAA;EAARO,QAAAA,IAAAA;EACoF1B,QAAAA,aAAAA;EAAsBL,QAAAA,mBAAAA;EAGjJQ,QAAAA,mBAAAA;EAA0BM,QAAAA,YAAAA;EAA2BF,QAAAA,WAAAA;EAGXY,WAAAA,CAAAA,OAAAA,CAAAA,EA3B7CrB,eA2B6CqB,EAAAA,cAAAA,CAAAA,EAAAA,CAAAA,GAAAA,GAAAA,OAAAA,CAAAA,GAAAA,SAAAA,EAAAA,aAAAA,CAAAA,EA3BkCP,iBA2BlCO,GAAAA,SAAAA;EAAoB1B,OAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EACjE0B,OAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAA8B1B,UAAAA,CAAAA,OAAAA,EAzBhCK,eAyBgCL,CAAAA,EAAAA,IAAAA;EAAmBE,QAAAA,YAAAA;EAChDwB,YAAAA,CAAAA,SAAAA,EAxBCT,UAwBDS,CAAAA,EAAAA,IAAAA;EAAkC1B,UAAAA,CAAAA,KAAAA,EAAAA,MAAAA,EAAAA,SAAAA,EAvBpBS,mBAuBoBT,EAAAA,kBAAAA,CAAAA,EAAAA,MAAAA,CAAAA,EAAAA,IAAAA;EAC7BA,eAAAA,CAAAA,SAAAA,EAAAA,MAAAA,CAAAA,EAvBQY,mBAuBRZ;EAAc,mBAAA,CAAA,CAAA,EAtBnB6B,GAsBmB,CAAA,MAAA,EAtBPjB,mBAsBO,CAAA;sCArBNJ,mBAAmBoB;;;KACNR,6BAA6BE;;;;KAC7BD,2BAA2BC;0CACpClB,iBAAiBF;gDACXqB,wBAAwBC;8CAC1BD,wBAAwBE;sCAChCnB;;gBAEtBI;;oBAEIA,4CAA4CK,cAAcW;oBAC1DhB,gCAAgCK,cAAckB,QAAQP;sJAC4EnB,sBAAsBL;;;2BAGjJQ,0BAA0BM,2BAA2BF;;;qEAGXY,oBAAoB1B;wBACjE0B,8BAA8B1B,mBAAmBE;yBAChDwB,kCAAkC1B;8BAC7BA"}