@pierre/diffs 1.1.4 → 1.1.6

package/dist/react/utils/useUnresolvedFileInstance.js

@@ -8,7 +8,7 @@ import { useCallback, useContext, useEffect, useLayoutEffect, useRef, useState }
 
 //#region src/react/utils/useUnresolvedFileInstance.ts
 const useIsometricEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
-function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLines, prerenderedHTML, hasConflictUtility, hasGutterRenderUtility }) {
+function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLines, prerenderedHTML, hasConflictUtility, hasGutterRenderUtility, hasCustomHeader, disableWorkerPool }) {
 	const [{ fileDiff, actions, markerRows }, setState] = useState(() => {
 		const { fileDiff: fileDiff$1, actions: actions$1, markerRows: markerRows$1 } = parseMergeConflictDiffFromFile(file, options?.maxContextLines);
 		return {
@@ -33,7 +33,13 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 	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 = new UnresolvedFile(mergeUnresolvedOptions({
+				hasConflictUtility,
+				hasCustomHeader,
+				hasGutterRenderUtility,
+				onMergeConflictAction,
+				options
+			}), !disableWorkerPool ? poolManager : void 0, true);
 			instanceRef.current.hydrate({
 				fileDiff,
 				actions,
@@ -51,7 +57,13 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 	useIsometricEffect(() => {
 		if (instanceRef.current == null) return;
 		const instance = instanceRef.current;
-		const newOptions = mergeUnresolvedOptions(options, onMergeConflictAction, hasConflictUtility, hasGutterRenderUtility);
+		const newOptions = mergeUnresolvedOptions({
+			hasConflictUtility,
+			hasCustomHeader,
+			hasGutterRenderUtility,
+			onMergeConflictAction,
+			options
+		});
 		const forceRender = !areOptionsEqual(instance.options, newOptions);
 		instance.setOptions(newOptions);
 		instance.render({
@@ -76,12 +88,13 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 		}, [])
 	};
 }
-function mergeUnresolvedOptions(options, onMergeConflictAction, hasConflictUtility, hasGutterRenderUtility) {
+function mergeUnresolvedOptions({ options, onMergeConflictAction, hasConflictUtility, hasCustomHeader, hasGutterRenderUtility }) {
 	return {
 		...options,
 		onMergeConflictAction,
 		hunkSeparators: options?.hunkSeparators === "custom" ? noopRender : options?.hunkSeparators,
 		mergeConflictActionsType: hasConflictUtility || options?.mergeConflictActionsType === "custom" ? noopRender : options?.mergeConflictActionsType,
+		renderCustomHeader: hasCustomHeader ? noopRender : void 0,
 		renderGutterUtility: hasGutterRenderUtility ? noopRender : void 0
 	};
 }

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

@@ -1 +1 @@
-{"version":3,"file":"useUnresolvedFileInstance.js","names":["fileDiff","actions","markerRows","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 {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n  MergeConflictMarkerRow,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport {\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../../utils/parseMergeConflictDiffFromFile';\nimport { noopRender } from '../constants';\nimport type { UnresolvedFileReactOptions } from '../UnresolvedFile';\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?: UnresolvedFileReactOptions<LAnnotation>;\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 | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\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, markerRows }, setState] = useState(() => {\n    const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(\n      file,\n      options?.maxContextLines\n    );\n    return { fileDiff, actions, markerRows };\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 onMergeConflictAction = useStableCallback(\n    (\n      payload: MergeConflictActionPayload,\n      instance: UnresolvedFile<LAnnotation>\n    ) => {\n      setState((prevState) => {\n        const { fileDiff, actions, markerRows } =\n          instance.resolveConflict(\n            payload.conflict.conflictIndex,\n            payload.resolution,\n            prevState.fileDiff\n          ) ?? {};\n        if (fileDiff == null || actions == null || markerRows == null) {\n          return prevState;\n        } else {\n          return { fileDiff, actions, markerRows };\n        }\n      });\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        markerRows,\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      markerRows,\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, markerRows, getInstance };\n}\n\nfunction mergeUnresolvedOptions<LAnnotation>(\n  options: UnresolvedFileReactOptions<LAnnotation> | 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":";;;;;;;;;AAmCA,MAAM,qBACJ,OAAO,WAAW,cAAc,YAAY;AAqB9C,SAAgB,0BAAuC,EACrD,MACA,SACA,iBACA,eACA,iBACA,oBACA,0BAC4F;CAC5F,MAAM,CAAC,EAAE,UAAU,SAAS,cAAc,YAAY,eAAe;EACnE,MAAM,EAAE,sBAAU,oBAAS,6BAAe,+BACxC,MACA,SAAS,gBACV;AACD,SAAO;GAAE;GAAU;GAAS;GAAY;GACxC;CAIF,MAAM,wBAAwB,mBAE1B,SACA,aACG;AACH,YAAU,cAAc;GACtB,MAAM,EAAE,sBAAU,oBAAS,6BACzB,SAAS,gBACP,QAAQ,SAAS,eACjB,QAAQ,YACR,UAAU,SACX,IAAI,EAAE;AACT,OAAIA,cAAY,QAAQC,aAAW,QAAQC,gBAAc,KACvD,QAAO;OAEP,QAAO;IAAE;IAAU;IAAS;IAAY;IAE1C;GAEL;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,IAAIC,eACxB,uBACE,SACA,uBACA,oBACA,uBACD,EACD,aACA,KACD;AACD,GAAK,YAAY,QAAQ,QAAQ;IAC/B;IACA;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;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;EAAY,aAJzC,kBAAkB;AACpC,UAAO,YAAY,WAAW;KAC7B,EAAE,CAAC;EAEoE;;AAG5E,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"}
+{"version":3,"file":"useUnresolvedFileInstance.js","names":["fileDiff","actions","markerRows","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 {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n  MergeConflictMarkerRow,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport {\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../../utils/parseMergeConflictDiffFromFile';\nimport { noopRender } from '../constants';\nimport type { UnresolvedFileReactOptions } from '../UnresolvedFile';\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?: UnresolvedFileReactOptions<LAnnotation>;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n}\n\ninterface UseUnresolvedFileInstanceReturn<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\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  hasCustomHeader,\n  disableWorkerPool,\n}: UseUnresolvedFileInstanceProps<LAnnotation>): UseUnresolvedFileInstanceReturn<LAnnotation> {\n  const [{ fileDiff, actions, markerRows }, setState] = useState(() => {\n    const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(\n      file,\n      options?.maxContextLines\n    );\n    return { fileDiff, actions, markerRows };\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 onMergeConflictAction = useStableCallback(\n    (\n      payload: MergeConflictActionPayload,\n      instance: UnresolvedFile<LAnnotation>\n    ) => {\n      setState((prevState) => {\n        const { fileDiff, actions, markerRows } =\n          instance.resolveConflict(\n            payload.conflict.conflictIndex,\n            payload.resolution,\n            prevState.fileDiff\n          ) ?? {};\n        if (fileDiff == null || actions == null || markerRows == null) {\n          return prevState;\n        } else {\n          return { fileDiff, actions, markerRows };\n        }\n      });\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          hasConflictUtility,\n          hasCustomHeader,\n          hasGutterRenderUtility,\n          onMergeConflictAction,\n          options,\n        }),\n        !disableWorkerPool ? poolManager : undefined,\n        true\n      );\n      void instanceRef.current.hydrate({\n        fileDiff,\n        actions,\n        markerRows,\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      hasConflictUtility,\n      hasCustomHeader,\n      hasGutterRenderUtility,\n      onMergeConflictAction,\n      options,\n    });\n    const forceRender = !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    void instance.render({\n      fileDiff,\n      actions,\n      markerRows,\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, markerRows, getInstance };\n}\n\ninterface MergeUnresolvedOptionsProps<LAnnotation> {\n  options: UnresolvedFileReactOptions<LAnnotation> | undefined;\n  onMergeConflictAction: UnresolvedFileOptions<LAnnotation>['onMergeConflictAction'];\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n}\n\nfunction mergeUnresolvedOptions<LAnnotation>({\n  options,\n  onMergeConflictAction,\n  hasConflictUtility,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n}: MergeUnresolvedOptionsProps<LAnnotation>): 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    renderCustomHeader: hasCustomHeader ? noopRender : undefined,\n    renderGutterUtility: hasGutterRenderUtility ? noopRender : undefined,\n  };\n}\n"],"mappings":";;;;;;;;;AAmCA,MAAM,qBACJ,OAAO,WAAW,cAAc,YAAY;AAuB9C,SAAgB,0BAAuC,EACrD,MACA,SACA,iBACA,eACA,iBACA,oBACA,wBACA,iBACA,qBAC4F;CAC5F,MAAM,CAAC,EAAE,UAAU,SAAS,cAAc,YAAY,eAAe;EACnE,MAAM,EAAE,sBAAU,oBAAS,6BAAe,+BACxC,MACA,SAAS,gBACV;AACD,SAAO;GAAE;GAAU;GAAS;GAAY;GACxC;CAIF,MAAM,wBAAwB,mBAE1B,SACA,aACG;AACH,YAAU,cAAc;GACtB,MAAM,EAAE,sBAAU,oBAAS,6BACzB,SAAS,gBACP,QAAQ,SAAS,eACjB,QAAQ,YACR,UAAU,SACX,IAAI,EAAE;AACT,OAAIA,cAAY,QAAQC,aAAW,QAAQC,gBAAc,KACvD,QAAO;OAEP,QAAO;IAAE;IAAU;IAAS;IAAY;IAE1C;GAEL;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,IAAIC,eACxB,uBAAuB;IACrB;IACA;IACA;IACA;IACA;IACD,CAAC,EACF,CAAC,oBAAoB,cAAc,QACnC,KACD;AACD,GAAK,YAAY,QAAQ,QAAQ;IAC/B;IACA;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,uBAAuB;GACxC;GACA;GACA;GACA;GACA;GACD,CAAC;EACF,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;AAYF,QAAO;EAAE;EAAK,gBAVS,kBAEN;AACf,UAAO,YAAY,SAAS,gBAAgB;KAC3C,EAAE,CAAC;EAMwB;EAAU;EAAS;EAAY,aAJzC,kBAAkB;AACpC,UAAO,YAAY,WAAW;KAC7B,EAAE,CAAC;EAEoE;;AAW5E,SAAS,uBAAoC,EAC3C,SACA,uBACA,oBACA,iBACA,0BAC+E;AAC/E,QAAO;EACL,GAAG;EACH;EACA,gBACE,SAAS,mBAAmB,WACxB,aACA,SAAS;EAEf,0BACE,sBAAsB,SAAS,6BAA6B,WACxD,aACA,SAAS;EACf,oBAAoB,kBAAkB,aAAa;EACnD,qBAAqB,yBAAyB,aAAa;EAC5D"}

package/dist/renderers/DiffHunksRenderer.d.ts

@@ -1,10 +1,16 @@
-import { AnnotationSpan, BaseDiffOptions, BaseDiffOptionsWithDefaults, CustomPreProperties, DiffLineAnnotation, ExpansionDirections, FileDiffMetadata, HunkData, HunkExpansionRegion, LineTypes, RenderDiffOptions, RenderRange, ThemeTypes, ThemedDiffResult } from "../types.js";
+import { AnnotationSpan, BaseDiffOptions, BaseDiffOptionsWithDefaults, CustomPreProperties, DiffLineAnnotation, ExpansionDirections, FileDiffMetadata, FileHeaderRenderMode, HunkData, HunkExpansionRegion, LineTypes, RenderDiffOptions, RenderRange, ThemedDiffResult } from "../types.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
 import "../worker/index.js";
 import { DiffLineMetadata } from "../utils/iterateOverDiff.js";
 import { Element, ElementContent, Properties } from "hast";
 
 //#region src/renderers/DiffHunksRenderer.d.ts
+interface DiffHunksRendererOptions extends BaseDiffOptions {
+  headerRenderMode?: FileHeaderRenderMode;
+}
+interface DiffHunksRendererOptionsWithDefaults extends Omit<BaseDiffOptionsWithDefaults, 'themeType'> {
+  headerRenderMode: FileHeaderRenderMode;
+}
 interface UnifiedLineDecorationProps {
   type: 'context' | 'context-expanded' | 'change';
   lineType: LineTypes;
@@ -65,7 +71,7 @@ interface HunksRenderResult {
   bufferAfter: number;
 }
 declare class DiffHunksRenderer<LAnnotation = undefined> {
-  options: BaseDiffOptions;
+  options: DiffHunksRendererOptions;
   private onRenderUpdate?;
   private workerManager?;
   readonly __id: string;
@@ -76,12 +82,11 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   private additionAnnotations;
   private computedLang;
   private renderCache;
-  constructor(options?: BaseDiffOptions, onRenderUpdate?: (() => unknown) | undefined, workerManager?: WorkerPoolManager | undefined);
+  constructor(options?: DiffHunksRendererOptions, onRenderUpdate?: (() => unknown) | undefined, workerManager?: WorkerPoolManager | undefined);
   cleanUp(): void;
   recycle(): void;
-  setOptions(options: BaseDiffOptions): void;
-  private mergeOptions;
-  setThemeType(themeType: ThemeTypes): void;
+  setOptions(options: DiffHunksRendererOptions): void;
+  mergeOptions(options: Partial<DiffHunksRendererOptions>): void;
   expandHunk(index: number, direction: ExpansionDirections, expansionLineCount?: number): void;
   getExpandedHunk(hunkIndex: number): HunkExpansionRegion;
   getExpandedHunksMap(): Map<number, HunkExpansionRegion>;
@@ -96,13 +101,13 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   protected createAnnotationElement(span: AnnotationSpan): Element;
   protected getUnifiedInjectedRowsForLine?: (ctx: RenderedLineContext) => UnifiedInjectedRowPlacement | undefined;
   protected getSplitInjectedRowsForLine?: (ctx: RenderedLineContext) => SplitInjectedRowPlacement | undefined;
-  protected getOptionsWithDefaults(): BaseDiffOptionsWithDefaults;
+  protected getOptionsWithDefaults(): DiffHunksRendererOptionsWithDefaults;
   private initializeHighlighter;
   hydrate(diff: FileDiffMetadata | undefined): void;
   private getRenderOptions;
   renderDiff(diff?: FileDiffMetadata | undefined, renderRange?: RenderRange): HunksRenderResult | undefined;
   asyncRender(diff: FileDiffMetadata, renderRange?: RenderRange): Promise<HunksRenderResult>;
-  protected createPreElement(split: boolean, totalLines: number, themeStyles: string, baseThemeType: 'light' | 'dark' | undefined, customProperties?: CustomPreProperties): Element;
+  protected createPreElement(split: boolean, totalLines: number, customProperties?: CustomPreProperties): Element;
   private asyncHighlight;
   private renderDiffWithHighlighter;
   onHighlightSuccess(diff: FileDiffMetadata, result: ThemedDiffResult, options: RenderDiffOptions): void;
@@ -116,5 +121,5 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   private renderHeader;
 }
 //#endregion
-export { DiffHunksRenderer, HunksRenderResult, InjectedRow, LineDecoration, RenderedLineContext, SplitInjectedRow, SplitInjectedRowPlacement, SplitLineDecorationProps, UnifiedInjectedRowPlacement, UnifiedLineDecorationProps };
+export { DiffHunksRenderer, DiffHunksRendererOptions, DiffHunksRendererOptionsWithDefaults, HunksRenderResult, InjectedRow, LineDecoration, RenderedLineContext, SplitInjectedRow, SplitInjectedRowPlacement, SplitLineDecorationProps, UnifiedInjectedRowPlacement, 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","Properties","AnnotationSpan","BaseDiffOptions","BaseDiffOptionsWithDefaults","CustomPreProperties","DiffLineAnnotation","ExpansionDirections","FileDiffMetadata","HunkData","HunkExpansionRegion","LineTypes","RenderDiffOptions","RenderRange","ThemedDiffResult","ThemeTypes","DiffLineMetadata","WorkerPoolManager","UnifiedLineDecorationProps","SplitLineDecorationProps","LineDecoration","RenderedLineContext","InjectedRow","SplitInjectedRow","UnifiedInjectedRowPlacement","SplitInjectedRowPlacement","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 InjectedRow {\n    content: HASTElement;\n    gutter: HASTElement;\n}\nexport interface SplitInjectedRow {\n    deletion: InjectedRow | undefined;\n    addition: InjectedRow | undefined;\n}\nexport interface UnifiedInjectedRowPlacement {\n    before?: InjectedRow[];\n    after?: InjectedRow[];\n}\nexport interface SplitInjectedRowPlacement {\n    before?: SplitInjectedRow[];\n    after?: SplitInjectedRow[];\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 getUnifiedInjectedRowsForLine?: (ctx: RenderedLineContext) => UnifiedInjectedRowPlacement | undefined;\n    protected getSplitInjectedRowsForLine?: (ctx: RenderedLineContext) => SplitInjectedRowPlacement | 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":"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"}
+{"version":3,"file":"DiffHunksRenderer.d.ts","names":["ElementContent","Element","HASTElement","Properties","AnnotationSpan","BaseDiffOptions","BaseDiffOptionsWithDefaults","CustomPreProperties","DiffLineAnnotation","ExpansionDirections","FileDiffMetadata","FileHeaderRenderMode","HunkData","HunkExpansionRegion","LineTypes","RenderDiffOptions","RenderRange","ThemedDiffResult","DiffLineMetadata","WorkerPoolManager","DiffHunksRendererOptions","DiffHunksRendererOptionsWithDefaults","Omit","UnifiedLineDecorationProps","SplitLineDecorationProps","LineDecoration","RenderedLineContext","InjectedRow","SplitInjectedRow","UnifiedInjectedRowPlacement","SplitInjectedRowPlacement","HunksRenderResult","DiffHunksRenderer","LAnnotation","Partial","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, FileHeaderRenderMode, HunkData, HunkExpansionRegion, LineTypes, RenderDiffOptions, RenderRange, ThemedDiffResult } from '../types';\nimport type { DiffLineMetadata } from '../utils/iterateOverDiff';\nimport type { WorkerPoolManager } from '../worker';\nexport interface DiffHunksRendererOptions extends BaseDiffOptions {\n    headerRenderMode?: FileHeaderRenderMode;\n}\nexport interface DiffHunksRendererOptionsWithDefaults extends Omit<BaseDiffOptionsWithDefaults, 'themeType'> {\n    headerRenderMode: FileHeaderRenderMode;\n}\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 InjectedRow {\n    content: HASTElement;\n    gutter: HASTElement;\n}\nexport interface SplitInjectedRow {\n    deletion: InjectedRow | undefined;\n    addition: InjectedRow | undefined;\n}\nexport interface UnifiedInjectedRowPlacement {\n    before?: InjectedRow[];\n    after?: InjectedRow[];\n}\nexport interface SplitInjectedRowPlacement {\n    before?: SplitInjectedRow[];\n    after?: SplitInjectedRow[];\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: DiffHunksRendererOptions;\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?: DiffHunksRendererOptions, onRenderUpdate?: (() => unknown) | undefined, workerManager?: WorkerPoolManager | undefined);\n    cleanUp(): void;\n    recycle(): void;\n    setOptions(options: DiffHunksRendererOptions): void;\n    mergeOptions(options: Partial<DiffHunksRendererOptions>): 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 getUnifiedInjectedRowsForLine?: (ctx: RenderedLineContext) => UnifiedInjectedRowPlacement | undefined;\n    protected getSplitInjectedRowsForLine?: (ctx: RenderedLineContext) => SplitInjectedRowPlacement | undefined;\n    protected getOptionsWithDefaults(): DiffHunksRendererOptionsWithDefaults;\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, 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":"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"}

package/dist/renderers/DiffHunksRenderer.js

@@ -62,10 +62,6 @@ var DiffHunksRenderer = class {
 			...options
 		};
 	}
-	setThemeType(themeType) {
-		if (this.getOptionsWithDefaults().themeType === themeType) return;
-		this.mergeOptions({ themeType });
-	}
 	expandHunk(index, direction, expansionLineCount = this.getOptionsWithDefaults().expansionLineCount) {
 		const region = { ...this.expandedHunks.get(index) ?? {
 			fromStart: 0,
@@ -108,7 +104,7 @@ var DiffHunksRenderer = class {
 		return createAnnotationElement(span);
 	}
 	getOptionsWithDefaults() {
-		const { diffIndicators = "bars", diffStyle = "split", disableBackground = false, disableFileHeader = false, disableLineNumbers = false, disableVirtualizationBuffers = false, collapsed = false, expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, expansionLineCount = 100, hunkSeparators = "line-info", lineDiffType = "word-alt", maxLineDiffLength = 1e3, overflow = "scroll", theme = DEFAULT_THEMES, themeType = "system", tokenizeMaxLineLength = 1e3, useCSSClasses = false } = this.options;
+		const { diffIndicators = "bars", diffStyle = "split", disableBackground = false, disableFileHeader = false, disableLineNumbers = false, disableVirtualizationBuffers = false, collapsed = false, expandUnchanged = false, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, expansionLineCount = 100, hunkSeparators = "line-info", lineDiffType = "word-alt", maxLineDiffLength = 1e3, overflow = "scroll", theme = DEFAULT_THEMES, headerRenderMode = "default", tokenizeMaxLineLength = 1e3, useCSSClasses = false } = this.options;
 		return {
 			diffIndicators,
 			diffStyle,
@@ -125,7 +121,7 @@ var DiffHunksRenderer = class {
 			maxLineDiffLength,
 			overflow,
 			theme: this.workerManager?.getDiffRenderOptions().theme ?? theme,
-			themeType,
+			headerRenderMode,
 			tokenizeMaxLineLength,
 			useCSSClasses
 		};
@@ -148,9 +144,6 @@ var DiffHunksRenderer = class {
 			renderRange: void 0
 		};
 		if (this.workerManager?.isWorkingPool() === true && this.renderCache.result == null) this.workerManager.highlightDiffAST(this, this.diff);
-		else this.asyncHighlight(diff).then(({ result, options: options$1 }) => {
-			this.onHighlightSuccess(diff, result, options$1);
-		});
 	}
 	getRenderOptions(diff) {
 		const options = (() => {
@@ -225,17 +218,15 @@ var DiffHunksRenderer = class {
 		const { result } = await this.asyncHighlight(diff);
 		return this.processDiffResult(diff, renderRange, result);
 	}
-	createPreElement(split, totalLines, themeStyles, baseThemeType, customProperties) {
-		const { diffIndicators, disableBackground, disableLineNumbers, overflow, themeType } = this.getOptionsWithDefaults();
+	createPreElement(split, totalLines, customProperties) {
+		const { diffIndicators, disableBackground, disableLineNumbers, overflow } = this.getOptionsWithDefaults();
 		return createPreElement({
 			type: "diff",
 			diffIndicators,
 			disableBackground,
 			disableLineNumbers,
 			overflow,
-			themeStyles,
 			split,
-			themeType: baseThemeType ?? themeType,
 			totalLines,
 			customProperties
 		});
@@ -515,7 +506,7 @@ var DiffHunksRenderer = class {
 		additionsContentAST = shouldIncludeAdditions && hasContent ? additionsContentAST : void 0;
 		deletionsContentAST = shouldIncludeDeletions && hasContent ? deletionsContentAST : void 0;
 		unifiedContentAST = unified && hasContent ? unifiedContentAST : void 0;
-		const preNode = this.createPreElement(deletionsContentAST != null && additionsContentAST != null, totalLines, themeStyles, baseThemeType);
+		const preNode = this.createPreElement(deletionsContentAST != null && additionsContentAST != null, totalLines);
 		return {
 			unifiedGutterAST: unified && hasContent ? context.unifiedGutterAST.children : void 0,
 			unifiedContentAST,
@@ -527,7 +518,7 @@ var DiffHunksRenderer = class {
 			preNode,
 			themeStyles,
 			baseThemeType,
-			headerElement: !disableFileHeader ? this.renderHeader(this.diff, themeStyles, baseThemeType) : void 0,
+			headerElement: !disableFileHeader ? this.renderHeader(this.diff) : void 0,
 			totalLines,
 			rowCount: context.rowCount,
 			bufferBefore: renderRange.bufferBefore,
@@ -626,12 +617,11 @@ var DiffHunksRenderer = class {
 			additionSpan
 		};
 	}
-	renderHeader(diff, themeStyles, baseThemeType) {
-		const { themeType } = this.getOptionsWithDefaults();
+	renderHeader(diff) {
+		const { headerRenderMode } = this.getOptionsWithDefaults();
 		return createFileHeaderElement({
 			fileOrDiff: diff,
-			themeStyles,
-			themeType: baseThemeType ?? themeType
+			mode: headerRenderMode
 		});
 	}
 };