@pierre/diffs 1.1.3 → 1.1.5

package/dist/components/UnresolvedFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFile.d.ts","names":["HunksRenderResult","UnresolvedFileHunksRenderer","UnresolvedFileHunksRendererOptions","FileContents","FileDiffMetadata","MergeConflictActionPayload","MergeConflictMarkerRow","MergeConflictResolution","MergeConflictDiffAction","WorkerPoolManager","FileDiff","FileDiffOptions","FileDiffRenderProps","RenderMergeConflictActions","LAnnotation","UnresolvedFile","HTMLElement","DocumentFragment","MergeConflictActionsTypeOption","UnresolvedFileOptions","Omit","UnresolvedFileRenderProps","UnresolvedFileHydrationProps","GetOrComputeDiffProps","ResolveConflictReturn","UnresolvedFileDataCache","HTMLPreElement","getUnresolvedDiffHunksRendererOptions"],"sources":["../../src/components/UnresolvedFile.d.ts"],"sourcesContent":["import type { HunksRenderResult } from '../renderers/DiffHunksRenderer';\nimport { UnresolvedFileHunksRenderer, type UnresolvedFileHunksRendererOptions } from '../renderers/UnresolvedFileHunksRenderer';\nimport type { FileContents, FileDiffMetadata, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictResolution } from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport { FileDiff, type FileDiffOptions, type FileDiffRenderProps } from './FileDiff';\nexport type RenderMergeConflictActions<LAnnotation> = (action: MergeConflictDiffAction, instance: UnresolvedFile<LAnnotation>) => HTMLElement | DocumentFragment | null | undefined;\nexport type MergeConflictActionsTypeOption<LAnnotation> = 'none' | 'default' | RenderMergeConflictActions<LAnnotation>;\nexport interface UnresolvedFileOptions<LAnnotation> extends Omit<FileDiffOptions<LAnnotation>, 'diffStyle'> {\n    onPostRender?(node: HTMLElement, instance: UnresolvedFile<LAnnotation>): unknown;\n    mergeConflictActionsType?: MergeConflictActionsTypeOption<LAnnotation>;\n    onMergeConflictAction?(payload: MergeConflictActionPayload, instance: UnresolvedFile<LAnnotation>): void;\n    onMergeConflictResolve?(file: FileContents, payload: MergeConflictActionPayload): void;\n    maxContextLines?: number;\n}\nexport interface UnresolvedFileRenderProps<LAnnotation> extends Omit<FileDiffRenderProps<LAnnotation>, 'oldFile' | 'newFile'> {\n    file?: FileContents;\n    actions?: (MergeConflictDiffAction | undefined)[];\n    markerRows?: MergeConflictMarkerRow[];\n}\nexport interface UnresolvedFileHydrationProps<LAnnotation> extends Omit<UnresolvedFileRenderProps<LAnnotation>, 'file'> {\n    file?: FileContents;\n    fileContainer: HTMLElement;\n    prerenderedHTML?: string;\n}\ninterface GetOrComputeDiffProps {\n    file: FileContents | undefined;\n    fileDiff: FileDiffMetadata | undefined;\n    actions: (MergeConflictDiffAction | undefined)[] | undefined;\n    markerRows: MergeConflictMarkerRow[] | undefined;\n}\ninterface ResolveConflictReturn {\n    file: FileContents;\n    fileDiff: FileDiffMetadata;\n    actions: (MergeConflictDiffAction | undefined)[];\n    markerRows: MergeConflictMarkerRow[];\n}\ntype UnresolvedFileDataCache = GetOrComputeDiffProps;\nexport declare class UnresolvedFile<LAnnotation = undefined> extends FileDiff<LAnnotation> {\n    options: UnresolvedFileOptions<LAnnotation>;\n    readonly __id: string;\n    protected computedCache: UnresolvedFileDataCache;\n    private conflictActions;\n    private markerRows;\n    private conflictActionCache;\n    constructor(options?: UnresolvedFileOptions<LAnnotation>, workerManager?: WorkerPoolManager | undefined, isContainerManaged?: boolean);\n    setOptions(options: UnresolvedFileOptions<LAnnotation> | undefined): void;\n    protected createHunksRenderer(options: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRenderer<LAnnotation>;\n    protected getHunksRendererOptions(options: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRendererOptions;\n    protected applyPreNodeAttributes(pre: HTMLPreElement, result: HunksRenderResult): void;\n    cleanUp(): void;\n    private getOrComputeDiff;\n    hydrate(props: UnresolvedFileHydrationProps<LAnnotation>): void;\n    rerender(): void;\n    render(props?: UnresolvedFileRenderProps<LAnnotation>): boolean;\n    resolveConflict(conflictIndex: number, resolution: MergeConflictResolution, fileDiff?: FileDiffMetadata | undefined): ResolveConflictReturn | undefined;\n    private resolveConflictAndRender;\n    private setActiveMergeConflictState;\n    private handleMergeConflictActionClick;\n    private renderMergeConflictActionSlots;\n    private renderMergeConflictAction;\n    private clearMergeConflictActionCache;\n}\nexport declare function getUnresolvedDiffHunksRendererOptions<LAnnotation>(options?: UnresolvedFileOptions<LAnnotation>, baseOptions?: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRendererOptions;\nexport {};\n//# sourceMappingURL=UnresolvedFile.d.ts.map"],"mappings":"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"}
+{"version":3,"file":"UnresolvedFile.d.ts","names":["HunksRenderResult","UnresolvedFileHunksRenderer","UnresolvedFileHunksRendererOptions","FileContents","FileDiffMetadata","MergeConflictActionPayload","MergeConflictMarkerRow","MergeConflictResolution","MergeConflictDiffAction","WorkerPoolManager","FileDiff","FileDiffOptions","FileDiffRenderProps","RenderMergeConflictActions","LAnnotation","UnresolvedFile","HTMLElement","DocumentFragment","MergeConflictActionsTypeOption","UnresolvedFileOptions","Omit","UnresolvedFileRenderProps","UnresolvedFileHydrationProps","GetOrComputeDiffProps","ResolveConflictReturn","UnresolvedFileDataCache","HTMLPreElement","getUnresolvedDiffHunksRendererOptions"],"sources":["../../src/components/UnresolvedFile.d.ts"],"sourcesContent":["import type { HunksRenderResult } from '../renderers/DiffHunksRenderer';\nimport { UnresolvedFileHunksRenderer, type UnresolvedFileHunksRendererOptions } from '../renderers/UnresolvedFileHunksRenderer';\nimport type { FileContents, FileDiffMetadata, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictResolution } from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport { FileDiff, type FileDiffOptions, type FileDiffRenderProps } from './FileDiff';\nexport type RenderMergeConflictActions<LAnnotation> = (action: MergeConflictDiffAction, instance: UnresolvedFile<LAnnotation>) => HTMLElement | DocumentFragment | null | undefined;\nexport type MergeConflictActionsTypeOption<LAnnotation> = 'none' | 'default' | RenderMergeConflictActions<LAnnotation>;\nexport interface UnresolvedFileOptions<LAnnotation> extends Omit<FileDiffOptions<LAnnotation>, 'diffStyle'> {\n    onPostRender?(node: HTMLElement, instance: UnresolvedFile<LAnnotation>): unknown;\n    mergeConflictActionsType?: MergeConflictActionsTypeOption<LAnnotation>;\n    onMergeConflictAction?(payload: MergeConflictActionPayload, instance: UnresolvedFile<LAnnotation>): void;\n    onMergeConflictResolve?(file: FileContents, payload: MergeConflictActionPayload): void;\n    maxContextLines?: number;\n}\nexport interface UnresolvedFileRenderProps<LAnnotation> extends Omit<FileDiffRenderProps<LAnnotation>, 'oldFile' | 'newFile'> {\n    file?: FileContents;\n    actions?: (MergeConflictDiffAction | undefined)[];\n    markerRows?: MergeConflictMarkerRow[];\n}\nexport interface UnresolvedFileHydrationProps<LAnnotation> extends Omit<UnresolvedFileRenderProps<LAnnotation>, 'file'> {\n    file?: FileContents;\n    fileContainer: HTMLElement;\n    prerenderedHTML?: string;\n}\ninterface GetOrComputeDiffProps {\n    file: FileContents | undefined;\n    fileDiff: FileDiffMetadata | undefined;\n    actions: (MergeConflictDiffAction | undefined)[] | undefined;\n    markerRows: MergeConflictMarkerRow[] | undefined;\n}\ninterface ResolveConflictReturn {\n    file: FileContents;\n    fileDiff: FileDiffMetadata;\n    actions: (MergeConflictDiffAction | undefined)[];\n    markerRows: MergeConflictMarkerRow[];\n}\ntype UnresolvedFileDataCache = GetOrComputeDiffProps;\nexport declare class UnresolvedFile<LAnnotation = undefined> extends FileDiff<LAnnotation> {\n    options: UnresolvedFileOptions<LAnnotation>;\n    readonly __id: string;\n    protected computedCache: UnresolvedFileDataCache;\n    private conflictActions;\n    private markerRows;\n    private conflictActionCache;\n    constructor(options?: UnresolvedFileOptions<LAnnotation>, workerManager?: WorkerPoolManager | undefined, isContainerManaged?: boolean);\n    setOptions(options: UnresolvedFileOptions<LAnnotation> | undefined): void;\n    protected createHunksRenderer(options: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRenderer<LAnnotation>;\n    protected getHunksRendererOptions(options: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRendererOptions;\n    protected applyPreNodeAttributes(pre: HTMLPreElement, result: HunksRenderResult): void;\n    cleanUp(): void;\n    private getOrComputeDiff;\n    hydrate(props: UnresolvedFileHydrationProps<LAnnotation>): void;\n    rerender(): void;\n    render(props?: UnresolvedFileRenderProps<LAnnotation>): boolean;\n    resolveConflict(conflictIndex: number, resolution: MergeConflictResolution, fileDiff?: FileDiffMetadata | undefined): ResolveConflictReturn | undefined;\n    private resolveConflictAndRender;\n    private setActiveMergeConflictState;\n    private handleMergeConflictActionClick;\n    private renderMergeConflictActionSlots;\n    private renderMergeConflictAction;\n    private clearMergeConflictActionCache;\n}\nexport declare function getUnresolvedDiffHunksRendererOptions<LAnnotation>(options?: UnresolvedFileOptions<LAnnotation>, baseOptions?: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRendererOptions;\nexport {};\n//# sourceMappingURL=UnresolvedFile.d.ts.map"],"mappings":"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"}

package/dist/components/UnresolvedFile.js

@@ -1,8 +1,9 @@
-import { DEFAULT_THEMES } from "../constants.js";
+import { DEFAULT_THEMES, UNSAFE_CSS_ATTRIBUTE } from "../constants.js";
 import { pluckInteractionOptions } from "../managers/InteractionManager.js";
 import { splitFileContents } from "../utils/splitFileContents.js";
 import { areFilesEqual } from "../utils/areFilesEqual.js";
 import { createAnnotationWrapperNode } from "../utils/createAnnotationWrapperNode.js";
+import { prerenderHTMLIfNecessary } from "../utils/prerenderHTMLIfNecessary.js";
 import { FileDiff } from "./FileDiff.js";
 import { getMergeConflictActionSlotName } from "../utils/getMergeConflictActionSlotName.js";
 import { buildMergeConflictMarkerRows, getMergeConflictActionAnchor, parseMergeConflictDiffFromFile } from "../utils/parseMergeConflictDiffFromFile.js";
@@ -115,21 +116,59 @@ var UnresolvedFile = class extends FileDiff {
 		};
 	}
 	hydrate(props) {
-		const { file, fileDiff, actions, markerRows, lineAnnotations, preventEmit = false,...rest } = props;
+		const { file, fileDiff, actions, markerRows, lineAnnotations, fileContainer, prerenderedHTML, preventEmit = false } = props;
 		const source = this.getOrComputeDiff({
 			file,
 			fileDiff,
 			actions,
 			markerRows
 		});
+		const { overflow = "scroll" } = this.options;
 		if (source == null) return;
+		prerenderHTMLIfNecessary(fileContainer, prerenderedHTML);
+		for (const element of fileContainer.shadowRoot?.children ?? []) {
+			if (element instanceof SVGElement) {
+				this.spriteSVG = element;
+				continue;
+			}
+			if (!(element instanceof HTMLElement)) continue;
+			if (element instanceof HTMLPreElement) {
+				this.pre = element;
+				for (const code of element.children) {
+					if (!(code instanceof HTMLElement) || code.tagName.toLowerCase() !== "code") continue;
+					if ("deletions" in code.dataset) this.codeDeletions = code;
+					if ("additions" in code.dataset) this.codeAdditions = code;
+					if ("unified" in code.dataset) this.codeUnified = code;
+				}
+				continue;
+			}
+			if ("diffsHeader" in element.dataset) {
+				this.headerElement = element;
+				continue;
+			}
+			if (element instanceof HTMLStyleElement && element.hasAttribute(UNSAFE_CSS_ATTRIBUTE)) {
+				this.unsafeCSSStyle = element;
+				continue;
+			}
+		}
+		if (this.pre != null) this.syncCodeNodesFromPre(this.pre);
 		this.setActiveMergeConflictState(source.actions, source.markerRows);
-		super.hydrate({
-			...rest,
-			fileDiff: source.fileDiff,
-			lineAnnotations,
+		if (this.pre == null) this.render({
+			...props,
 			preventEmit: true
 		});
+		else {
+			this.fileContainer = fileContainer;
+			delete this.pre.dataset.dehydrated;
+			this.lineAnnotations = lineAnnotations ?? this.lineAnnotations;
+			this.fileDiff = source.fileDiff;
+			this.hunksRenderer.hydrate(this.fileDiff);
+			this.renderAnnotations();
+			this.renderGutterUtility();
+			this.injectUnsafeCSS();
+			this.interactionManager.setup(this.pre);
+			this.resizeManager.setup(this.pre, overflow === "wrap");
+		}
 		this.renderMergeConflictActionSlots();
 		if (!preventEmit) this.emitPostRender();
 	}

package/dist/components/UnresolvedFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFile.js","names":["options: UnresolvedFileOptions<LAnnotation>","resolveConflictDiff","payload: MergeConflictActionPayload"],"sources":["../../src/components/UnresolvedFile.ts"],"sourcesContent":["import { DEFAULT_THEMES } from '../constants';\nimport type { MergeConflictActionTarget } from '../managers/InteractionManager';\nimport { pluckInteractionOptions } from '../managers/InteractionManager';\nimport type { HunksRenderResult } from '../renderers/DiffHunksRenderer';\nimport {\n  UnresolvedFileHunksRenderer,\n  type UnresolvedFileHunksRendererOptions,\n} from '../renderers/UnresolvedFileHunksRenderer';\nimport type {\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n  MergeConflictMarkerRow,\n  MergeConflictRegion,\n  MergeConflictResolution,\n} from '../types';\nimport { areFilesEqual } from '../utils/areFilesEqual';\nimport { areMergeConflictActionsEqual } from '../utils/areMergeConflictActionsEqual';\nimport { createAnnotationWrapperNode } from '../utils/createAnnotationWrapperNode';\nimport { getMergeConflictActionSlotName } from '../utils/getMergeConflictActionSlotName';\nimport {\n  buildMergeConflictMarkerRows,\n  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../utils/parseMergeConflictDiffFromFile';\nimport { resolveConflict as resolveConflictDiff } from '../utils/resolveConflict';\nimport { splitFileContents } from '../utils/splitFileContents';\nimport type { WorkerPoolManager } from '../worker';\nimport {\n  FileDiff,\n  type FileDiffOptions,\n  type FileDiffRenderProps,\n} from './FileDiff';\n\nexport type RenderMergeConflictActions<LAnnotation> = (\n  action: MergeConflictDiffAction,\n  instance: UnresolvedFile<LAnnotation>\n) => HTMLElement | DocumentFragment | null | undefined;\n\nexport type MergeConflictActionsTypeOption<LAnnotation> =\n  | 'none'\n  | 'default'\n  | RenderMergeConflictActions<LAnnotation>;\n\nexport interface UnresolvedFileOptions<LAnnotation> extends Omit<\n  FileDiffOptions<LAnnotation>,\n  'diffStyle'\n> {\n  onPostRender?(\n    node: HTMLElement,\n    instance: UnresolvedFile<LAnnotation>\n  ): unknown;\n  mergeConflictActionsType?: MergeConflictActionsTypeOption<LAnnotation>;\n  onMergeConflictAction?(\n    payload: MergeConflictActionPayload,\n    instance: UnresolvedFile<LAnnotation>\n  ): void;\n  onMergeConflictResolve?(\n    file: FileContents,\n    payload: MergeConflictActionPayload\n  ): void;\n  maxContextLines?: number;\n}\n\nexport interface UnresolvedFileRenderProps<LAnnotation> extends Omit<\n  FileDiffRenderProps<LAnnotation>,\n  'oldFile' | 'newFile'\n> {\n  file?: FileContents;\n  actions?: (MergeConflictDiffAction | undefined)[];\n  markerRows?: MergeConflictMarkerRow[];\n}\n\nexport interface UnresolvedFileHydrationProps<LAnnotation> extends Omit<\n  UnresolvedFileRenderProps<LAnnotation>,\n  'file'\n> {\n  file?: FileContents;\n  fileContainer: HTMLElement;\n  prerenderedHTML?: string;\n}\n\ninterface MergeConflictActionElementCache {\n  element: HTMLElement;\n  action: MergeConflictDiffAction;\n}\n\ninterface GetOrComputeDiffProps {\n  file: FileContents | undefined;\n  fileDiff: FileDiffMetadata | undefined;\n  actions: (MergeConflictDiffAction | undefined)[] | undefined;\n  markerRows: MergeConflictMarkerRow[] | undefined;\n}\n\ninterface GetOrComputeDiffResult {\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n}\n\ninterface ResolveConflictReturn {\n  file: FileContents;\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n}\n\ntype UnresolvedFileDataCache = GetOrComputeDiffProps;\n\nlet instanceId = -1;\n\nexport class UnresolvedFile<\n  LAnnotation = undefined,\n> extends FileDiff<LAnnotation> {\n  override readonly __id: string = `unresolved-file:${++instanceId}`;\n  protected computedCache: UnresolvedFileDataCache = {\n    file: undefined,\n    fileDiff: undefined,\n    actions: undefined,\n    markerRows: undefined,\n  };\n  private conflictActions: (MergeConflictDiffAction | undefined)[] = [];\n  private markerRows: MergeConflictMarkerRow[] = [];\n  private conflictActionCache: Map<string, MergeConflictActionElementCache> =\n    new Map();\n\n  constructor(\n    public override options: UnresolvedFileOptions<LAnnotation> = {\n      theme: DEFAULT_THEMES,\n    },\n    workerManager?: WorkerPoolManager | undefined,\n    isContainerManaged = false\n  ) {\n    super(undefined, workerManager, isContainerManaged);\n    this.setOptions(options);\n  }\n\n  override setOptions(\n    options: UnresolvedFileOptions<LAnnotation> | undefined\n  ): void {\n    if (options == null) {\n      return;\n    }\n\n    if (\n      options.onMergeConflictAction != null &&\n      options.onMergeConflictResolve != null\n    ) {\n      throw new Error(\n        'UnresolvedFile: onMergeConflictAction and onMergeConflictResolve are mutually exclusive. Use only one callback.'\n      );\n    }\n\n    this.options = options;\n    this.hunksRenderer.setOptions(this.getHunksRendererOptions(options));\n\n    const hunkSeparators = this.options.hunkSeparators ?? 'line-info';\n    this.interactionManager.setOptions(\n      pluckInteractionOptions(\n        this.options,\n        typeof hunkSeparators === 'function' ||\n          hunkSeparators === 'line-info' ||\n          hunkSeparators === 'line-info-basic'\n          ? this.expandHunk\n          : undefined,\n        this.getLineIndex,\n        this.handleMergeConflictActionClick\n      )\n    );\n  }\n\n  protected override createHunksRenderer(\n    options: UnresolvedFileOptions<LAnnotation>\n  ): UnresolvedFileHunksRenderer<LAnnotation> {\n    const renderer = new UnresolvedFileHunksRenderer<LAnnotation>(\n      this.getHunksRendererOptions(options),\n      this.handleHighlightRender,\n      this.workerManager\n    );\n    return renderer;\n  }\n\n  protected override getHunksRendererOptions(\n    options: UnresolvedFileOptions<LAnnotation>\n  ): UnresolvedFileHunksRendererOptions {\n    return getUnresolvedDiffHunksRendererOptions(options, this.options);\n  }\n\n  protected override applyPreNodeAttributes(\n    pre: HTMLPreElement,\n    result: HunksRenderResult\n  ): void {\n    super.applyPreNodeAttributes(pre, result, {\n      'data-has-merge-conflict': '',\n    });\n  }\n\n  override cleanUp(): void {\n    this.clearMergeConflictActionCache();\n    this.computedCache = {\n      file: undefined,\n      fileDiff: undefined,\n      actions: undefined,\n      markerRows: undefined,\n    };\n    this.conflictActions = [];\n    super.cleanUp();\n  }\n\n  private getOrComputeDiff({\n    file,\n    fileDiff,\n    actions,\n    markerRows,\n  }: GetOrComputeDiffProps): GetOrComputeDiffResult | undefined {\n    const { maxContextLines, onMergeConflictAction } = this.options;\n    wrapper: {\n      // We are dealing with a controlled component\n      if (onMergeConflictAction != null) {\n        const hasFileDiff = fileDiff != null;\n        const hasActions = actions != null;\n        const hasMarkerRows = markerRows != null;\n        if (hasFileDiff !== hasActions || hasFileDiff !== hasMarkerRows) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: fileDiff, actions, and markerRows must be passed together'\n          );\n        }\n        // If we were provided a new fileDiff/actions/markerRows, we are a FULLY\n        // controlled component, which means we will not do any computation\n        if (fileDiff != null && actions != null && markerRows != null) {\n          this.computedCache = {\n            file: file ?? this.computedCache.file,\n            fileDiff,\n            actions,\n            markerRows,\n          };\n          break wrapper;\n        }\n        // If we were provided a new file, we should attempt to parse out a new\n        // diff/actions if we haven't computed it before. Once we initialize from\n        // a file, later updates must flow through fileDiff/actions instead of\n        // reparsing from a new file input.\n        else if (file != null || this.computedCache.file != null) {\n          if (\n            file != null &&\n            this.computedCache.file != null &&\n            !areFilesEqual(file, this.computedCache.file) &&\n            this.computedCache.fileDiff != null &&\n            this.computedCache.actions != null\n          ) {\n            throw new Error(\n              'UnresolvedFile.getOrComputeDiff: file can only be used to initialize unresolved state once. Pass fileDiff and actions for subsequent updates.'\n            );\n          }\n          file ??= this.computedCache.file;\n          if (file == null) {\n            throw new Error(\n              'UnresolvedFile.getOrComputeDiff: file is null, should be impossible'\n            );\n          }\n          if (\n            !areFilesEqual(file, this.computedCache.file) ||\n            this.computedCache.fileDiff == null ||\n            this.computedCache.actions == null\n          ) {\n            const computed = parseMergeConflictDiffFromFile(\n              file,\n              maxContextLines\n            );\n            this.computedCache = {\n              file,\n              fileDiff: computed.fileDiff,\n              actions: computed.actions,\n              markerRows: computed.markerRows,\n            };\n          }\n          fileDiff = this.computedCache.fileDiff;\n          actions = this.computedCache.actions;\n          markerRows = this.computedCache.markerRows;\n          break wrapper;\n        }\n        // Otherwise we should fall through and try to use the cache if it exists\n        else {\n          fileDiff = this.computedCache.fileDiff;\n          actions = this.computedCache.actions;\n          markerRows = this.computedCache.markerRows;\n          break wrapper;\n        }\n      }\n      // If we are uncontrolled we only rely on the file and only use the first\n      // version. After that, the cached diff/action pair is the source of\n      // truth and we should not accept a new file input.\n      else {\n        if (fileDiff != null || actions != null || markerRows != null) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: fileDiff, actions, and markerRows are only usable in controlled mode, you must pass in `onMergeConflictAction`'\n          );\n        }\n        if (\n          file != null &&\n          this.computedCache.file != null &&\n          !areFilesEqual(file, this.computedCache.file)\n        ) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: uncontrolled unresolved files parse the file only once. Later updates must come from the cached diff state.'\n          );\n        }\n        this.computedCache.file ??= file;\n        if (\n          this.computedCache.fileDiff == null &&\n          this.computedCache.file != null\n        ) {\n          const computed = parseMergeConflictDiffFromFile(\n            this.computedCache.file,\n            maxContextLines\n          );\n          this.computedCache.fileDiff = computed.fileDiff;\n          this.computedCache.actions = computed.actions;\n          this.computedCache.markerRows = computed.markerRows;\n        }\n        // Because we are uncontrolled, the source of truth is the\n        // computedCache\n        fileDiff = this.computedCache.fileDiff;\n        actions = this.computedCache.actions;\n        markerRows = this.computedCache.markerRows;\n        break wrapper;\n      }\n    }\n    if (fileDiff == null || actions == null || markerRows == null) {\n      return undefined;\n    }\n    return { fileDiff, actions, markerRows };\n  }\n\n  override hydrate(props: UnresolvedFileHydrationProps<LAnnotation>): void {\n    const {\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      preventEmit = false,\n      ...rest\n    } = props;\n    const source = this.getOrComputeDiff({\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n    });\n    if (source == null) {\n      return;\n    }\n    this.setActiveMergeConflictState(source.actions, source.markerRows);\n    super.hydrate({\n      ...rest,\n      fileDiff: source.fileDiff,\n      lineAnnotations,\n      preventEmit: true,\n    });\n    this.renderMergeConflictActionSlots();\n    if (!preventEmit) {\n      this.emitPostRender();\n    }\n  }\n\n  override rerender(): void {\n    if (!this.enabled || this.fileDiff == null) {\n      return;\n    }\n    this.render({ forceRender: true, renderRange: this.renderRange });\n  }\n\n  override render(props: UnresolvedFileRenderProps<LAnnotation> = {}): boolean {\n    let {\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      preventEmit = false,\n      ...rest\n    } = props;\n    const source = this.getOrComputeDiff({\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n    });\n    if (source == null) {\n      return false;\n    }\n    this.setActiveMergeConflictState(source.actions, source.markerRows);\n    const didRender = super.render({\n      ...rest,\n      fileDiff: source.fileDiff,\n      lineAnnotations,\n      preventEmit: true,\n    });\n    if (didRender) {\n      this.renderMergeConflictActionSlots();\n      if (!preventEmit) {\n        this.emitPostRender();\n      }\n    }\n    return didRender;\n  }\n\n  public resolveConflict(\n    conflictIndex: number,\n    resolution: MergeConflictResolution,\n    fileDiff: FileDiffMetadata | undefined = this.computedCache.fileDiff\n  ): ResolveConflictReturn | undefined {\n    const action = this.conflictActions[conflictIndex];\n    if (fileDiff == null || action == null) {\n      return undefined;\n    }\n\n    if (action.conflictIndex !== conflictIndex) {\n      console.error({ conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.resolveConflict: conflictIndex and conflictAction don't match\"\n      );\n    }\n\n    const newFileDiff = resolveConflictDiff(fileDiff, action, resolution);\n    const previousFile = this.computedCache.file;\n    const { file, actions, markerRows } = rebuildFileAndActions({\n      fileDiff: newFileDiff,\n      previousActions: this.conflictActions,\n      resolvedConflictIndex: conflictIndex,\n      previousFile,\n      resolution,\n    });\n\n    return {\n      file,\n      fileDiff: newFileDiff,\n      actions,\n      markerRows,\n    };\n  }\n\n  private resolveConflictAndRender(\n    conflictIndex: number,\n    resolution: MergeConflictResolution\n  ): void {\n    const action = this.conflictActions[conflictIndex];\n    if (action == null) {\n      return undefined;\n    }\n    if (action.conflictIndex !== conflictIndex) {\n      console.error({ conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.resolveConflictAndRender: conflictIndex and conflictAction don't match\"\n      );\n    }\n    const payload: MergeConflictActionPayload = {\n      resolution,\n      conflict: action.conflict,\n    };\n    const { file, fileDiff, actions, markerRows } =\n      this.resolveConflict(conflictIndex, resolution) ?? {};\n    if (\n      file == null ||\n      fileDiff == null ||\n      actions == null ||\n      markerRows == null\n    ) {\n      return undefined;\n    }\n\n    this.computedCache = { file, fileDiff, actions, markerRows };\n    this.setActiveMergeConflictState(actions, markerRows);\n    // NOTE(amadeus): This is a bit jank, but helps to ensure we don't see a\n    // bunch of jittery re-renders as things resolve out.  In a more perfect\n    // world we would have a more elegant way to kick off a render to the\n    // highlighter and then resolve actions in a cleaner way, but time is short\n    // right now.  Can't let perfect be the enemy of good\n    if (this.workerManager != null) {\n      // Because we are using a workerManager, if we fire off the renderDiff\n      // call, it will eventually get back to us in a callback which will\n      // trigger a re-render\n      this.hunksRenderer.renderDiff(fileDiff);\n    } else {\n      this.render({ forceRender: true });\n    }\n    this.options.onMergeConflictResolve?.(file, payload);\n  }\n\n  private setActiveMergeConflictState(\n    actions: (MergeConflictDiffAction | undefined)[] = this.conflictActions,\n    markerRows: MergeConflictMarkerRow[] = this.markerRows\n  ): void {\n    this.conflictActions = actions;\n    this.markerRows = markerRows;\n    if (\n      this.computedCache.fileDiff != null &&\n      this.hunksRenderer instanceof UnresolvedFileHunksRenderer\n    ) {\n      this.hunksRenderer.setConflictState(\n        this.options.mergeConflictActionsType === 'none' ? [] : actions,\n        markerRows,\n        this.computedCache.fileDiff\n      );\n    }\n  }\n\n  private handleMergeConflictActionClick = (\n    target: MergeConflictActionTarget\n  ): void => {\n    const action = this.conflictActions[target.conflictIndex];\n    if (action == null) {\n      return;\n    }\n    if (action.conflictIndex !== target.conflictIndex) {\n      console.error({ conflictIndex: target.conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.handleMergeConflictActionClick: conflictIndex and conflictAction don't match\"\n      );\n    }\n    const payload: MergeConflictActionPayload = {\n      resolution: target.resolution,\n      conflict: action.conflict,\n    };\n    if (this.options.onMergeConflictAction != null) {\n      this.options.onMergeConflictAction(payload, this);\n      return;\n    }\n    this.resolveConflictAndRender(target.conflictIndex, target.resolution);\n  };\n\n  private renderMergeConflictActionSlots(): void {\n    const { fileDiff } = this.computedCache;\n    if (\n      this.isContainerManaged ||\n      this.fileContainer == null ||\n      typeof this.options.mergeConflictActionsType !== 'function' ||\n      this.conflictActions.length === 0 ||\n      fileDiff == null\n    ) {\n      this.clearMergeConflictActionCache();\n      return;\n    }\n    const staleActions = new Map(this.conflictActionCache);\n    for (\n      let actionIndex = 0;\n      actionIndex < this.conflictActions.length;\n      actionIndex++\n    ) {\n      const action = this.conflictActions[actionIndex];\n      if (action == null) {\n        continue;\n      }\n      if (action.conflictIndex !== actionIndex) {\n        console.error({ conflictIndex: actionIndex, action });\n        throw new Error(\n          \"UnresolvedFile.renderMergeConflictActionSlots: conflictIndex and conflictAction don't match\"\n        );\n      }\n      const anchor = getMergeConflictActionAnchor(action, fileDiff);\n      if (anchor == null) {\n        continue;\n      }\n      const conflictIndex = action.conflictIndex;\n      const slotName = getMergeConflictActionSlotName({\n        hunkIndex: anchor.hunkIndex,\n        lineIndex: anchor.lineIndex,\n        conflictIndex,\n      });\n      const id = `${actionIndex}-${slotName}`;\n      let cache = this.conflictActionCache.get(id);\n      if (\n        cache == null ||\n        !areMergeConflictActionsEqual(cache.action, action)\n      ) {\n        cache?.element.remove();\n        const rendered = this.renderMergeConflictAction(action);\n        if (rendered == null) {\n          continue;\n        }\n        const element = createAnnotationWrapperNode(slotName);\n        element.appendChild(rendered);\n        this.fileContainer.appendChild(element);\n        cache = { element, action };\n        this.conflictActionCache.set(id, cache);\n      }\n      staleActions.delete(id);\n    }\n    for (const [id, { element }] of staleActions.entries()) {\n      this.conflictActionCache.delete(id);\n      element.remove();\n    }\n  }\n\n  private renderMergeConflictAction(\n    action: MergeConflictDiffAction\n  ): HTMLElement | undefined {\n    if (typeof this.options.mergeConflictActionsType !== 'function') {\n      return undefined;\n    }\n    const rendered = this.options.mergeConflictActionsType(action, this);\n    if (rendered == null) {\n      return undefined;\n    }\n    if (rendered instanceof HTMLElement) {\n      return rendered;\n    }\n    if (\n      typeof DocumentFragment !== 'undefined' &&\n      rendered instanceof DocumentFragment\n    ) {\n      const wrapper = document.createElement('div');\n      wrapper.style.display = 'contents';\n      wrapper.appendChild(rendered);\n      return wrapper;\n    }\n    return undefined;\n  }\n\n  private clearMergeConflictActionCache(): void {\n    for (const { element } of this.conflictActionCache.values()) {\n      element.remove();\n    }\n    this.conflictActionCache.clear();\n  }\n}\n\ninterface RebuildFileAndActionsProps {\n  fileDiff: FileDiffMetadata;\n  previousActions: (MergeConflictDiffAction | undefined)[];\n  resolvedConflictIndex: number;\n  // FIXME: Probably should remove this...\n  // additionOffset: number;\n  // deletionOffset: number;\n  previousFile: FileContents | undefined;\n  resolution: MergeConflictResolution;\n}\n\n// Rebuild the emitted unresolved file contents and remaining action anchors in\n// one pass over the post-resolution diff state.\nfunction rebuildFileAndActions({\n  fileDiff,\n  previousActions,\n  resolvedConflictIndex,\n  previousFile,\n  resolution,\n}: RebuildFileAndActionsProps): Pick<\n  ResolveConflictReturn,\n  'file' | 'actions' | 'markerRows'\n> {\n  const resolvedAction = previousActions[resolvedConflictIndex];\n  if (resolvedAction == null) {\n    throw new Error(\n      'rebuildFileAndActions: missing resolved action for unresolved file rebuild'\n    );\n  }\n\n  const actions = updateConflictActionsAfterResolution(\n    previousActions,\n    resolvedConflictIndex,\n    resolvedAction,\n    resolution\n  );\n  const markerRows = buildMergeConflictMarkerRows(fileDiff, actions);\n\n  const file = rebuildUnresolvedFile({\n    fileDiff,\n    resolvedAction,\n    resolvedConflictIndex,\n    previousFile,\n    resolution,\n  });\n\n  return {\n    file,\n    actions,\n    markerRows,\n  };\n}\n\ninterface RebuildUnresolvedFileProps {\n  fileDiff: FileDiffMetadata;\n  resolvedAction: MergeConflictDiffAction;\n  resolvedConflictIndex: number;\n  previousFile: FileContents | undefined;\n  resolution: MergeConflictResolution;\n}\n\n// Rebuild the unresolved file text from the previous unresolved source so we\n// preserve remaining marker blocks exactly while the diff state stays in-place.\nfunction rebuildUnresolvedFile({\n  resolvedAction,\n  resolvedConflictIndex,\n  previousFile,\n  fileDiff,\n  resolution,\n}: RebuildUnresolvedFileProps): FileContents {\n  const previousContents = previousFile?.contents ?? '';\n  const lines = splitFileContents(previousContents);\n  const { conflict } = resolvedAction;\n  const replacementLines = getResolvedConflictReplacementLines(\n    lines,\n    conflict,\n    resolution\n  );\n  const contents = [\n    ...lines.slice(0, conflict.startLineIndex),\n    ...replacementLines,\n    ...lines.slice(conflict.endLineIndex + 1),\n  ].join('');\n\n  return {\n    name: previousFile?.name ?? fileDiff.name,\n    contents,\n    cacheKey:\n      previousFile?.cacheKey != null\n        ? `${previousFile.cacheKey}:mc-${resolvedConflictIndex}-${resolution}`\n        : undefined,\n  };\n}\n\nfunction getResolvedConflictReplacementLines(\n  lines: string[],\n  conflict: MergeConflictDiffAction['conflict'],\n  resolution: MergeConflictResolution\n): string[] {\n  const currentLines = lines.slice(\n    conflict.startLineIndex + 1,\n    conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex\n  );\n  const incomingLines = lines.slice(\n    conflict.separatorLineIndex + 1,\n    conflict.endLineIndex\n  );\n\n  if (resolution === 'current') {\n    return currentLines;\n  }\n  if (resolution === 'incoming') {\n    return incomingLines;\n  }\n  return [...currentLines, ...incomingLines];\n}\n\n// The diff resolver keeps hunk/content group indexes stable, so the only\n// follow-up update we need here is shifting unresolved source-region line\n// numbers for later conflicts in the rebuilt file text.\nfunction updateConflictActionsAfterResolution(\n  previousActions: (MergeConflictDiffAction | undefined)[],\n  resolvedConflictIndex: number,\n  resolvedAction: MergeConflictDiffAction,\n  resolution: MergeConflictResolution\n): (MergeConflictDiffAction | undefined)[] {\n  const lineDelta = getResolvedConflictLineDelta(\n    resolvedAction.conflict,\n    resolution\n  );\n\n  return previousActions.map((action, index) => {\n    if (index === resolvedConflictIndex) {\n      return undefined;\n    }\n    if (action == null) {\n      return undefined;\n    }\n    if (action.conflict.startLineIndex > resolvedAction.conflict.endLineIndex) {\n      return {\n        ...action,\n        conflict: shiftMergeConflictRegion(action.conflict, lineDelta),\n      };\n    }\n    return action;\n  });\n}\n\nfunction getResolvedConflictLineDelta(\n  conflict: MergeConflictRegion,\n  resolution: MergeConflictResolution\n): number {\n  const currentLineCount =\n    (conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex) -\n    conflict.startLineIndex -\n    1;\n  const incomingLineCount =\n    conflict.endLineIndex - conflict.separatorLineIndex - 1;\n  const replacementLineCount =\n    resolution === 'current'\n      ? currentLineCount\n      : resolution === 'incoming'\n        ? incomingLineCount\n        : currentLineCount + incomingLineCount;\n  const conflictLineCount = conflict.endLineIndex - conflict.startLineIndex + 1;\n  return replacementLineCount - conflictLineCount;\n}\n\nfunction shiftMergeConflictRegion(\n  conflict: MergeConflictRegion,\n  lineDelta: number\n): MergeConflictRegion {\n  return {\n    ...conflict,\n    startLineIndex: conflict.startLineIndex + lineDelta,\n    startLineNumber: conflict.startLineNumber + lineDelta,\n    separatorLineIndex: conflict.separatorLineIndex + lineDelta,\n    separatorLineNumber: conflict.separatorLineNumber + lineDelta,\n    endLineIndex: conflict.endLineIndex + lineDelta,\n    endLineNumber: conflict.endLineNumber + lineDelta,\n    baseMarkerLineIndex:\n      conflict.baseMarkerLineIndex != null\n        ? conflict.baseMarkerLineIndex + lineDelta\n        : undefined,\n    baseMarkerLineNumber:\n      conflict.baseMarkerLineNumber != null\n        ? conflict.baseMarkerLineNumber + lineDelta\n        : undefined,\n  };\n}\n\n// NOTE(amadeus): Should probably pull this out into a util, and make variants\n// for all component types\nexport function getUnresolvedDiffHunksRendererOptions<LAnnotation>(\n  options?: UnresolvedFileOptions<LAnnotation>,\n  baseOptions?: UnresolvedFileOptions<LAnnotation>\n): UnresolvedFileHunksRendererOptions {\n  return {\n    ...baseOptions,\n    ...options,\n    hunkSeparators:\n      typeof options?.hunkSeparators === 'function'\n        ? 'custom'\n        : options?.hunkSeparators,\n    mergeConflictActionsType:\n      typeof options?.mergeConflictActionsType === 'function'\n        ? 'custom'\n        : options?.mergeConflictActionsType,\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"UnresolvedFile.js","names":["options: UnresolvedFileOptions<LAnnotation>","resolveConflictDiff","payload: MergeConflictActionPayload"],"sources":["../../src/components/UnresolvedFile.ts"],"sourcesContent":["import { DEFAULT_THEMES, UNSAFE_CSS_ATTRIBUTE } from '../constants';\nimport type { MergeConflictActionTarget } from '../managers/InteractionManager';\nimport { pluckInteractionOptions } from '../managers/InteractionManager';\nimport type { HunksRenderResult } from '../renderers/DiffHunksRenderer';\nimport {\n  UnresolvedFileHunksRenderer,\n  type UnresolvedFileHunksRendererOptions,\n} from '../renderers/UnresolvedFileHunksRenderer';\nimport type {\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n  MergeConflictMarkerRow,\n  MergeConflictRegion,\n  MergeConflictResolution,\n} from '../types';\nimport { areFilesEqual } from '../utils/areFilesEqual';\nimport { areMergeConflictActionsEqual } from '../utils/areMergeConflictActionsEqual';\nimport { createAnnotationWrapperNode } from '../utils/createAnnotationWrapperNode';\nimport { getMergeConflictActionSlotName } from '../utils/getMergeConflictActionSlotName';\nimport {\n  buildMergeConflictMarkerRows,\n  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../utils/parseMergeConflictDiffFromFile';\nimport { prerenderHTMLIfNecessary } from '../utils/prerenderHTMLIfNecessary';\nimport { resolveConflict as resolveConflictDiff } from '../utils/resolveConflict';\nimport { splitFileContents } from '../utils/splitFileContents';\nimport type { WorkerPoolManager } from '../worker';\nimport {\n  FileDiff,\n  type FileDiffOptions,\n  type FileDiffRenderProps,\n} from './FileDiff';\n\nexport type RenderMergeConflictActions<LAnnotation> = (\n  action: MergeConflictDiffAction,\n  instance: UnresolvedFile<LAnnotation>\n) => HTMLElement | DocumentFragment | null | undefined;\n\nexport type MergeConflictActionsTypeOption<LAnnotation> =\n  | 'none'\n  | 'default'\n  | RenderMergeConflictActions<LAnnotation>;\n\nexport interface UnresolvedFileOptions<LAnnotation> extends Omit<\n  FileDiffOptions<LAnnotation>,\n  'diffStyle'\n> {\n  onPostRender?(\n    node: HTMLElement,\n    instance: UnresolvedFile<LAnnotation>\n  ): unknown;\n  mergeConflictActionsType?: MergeConflictActionsTypeOption<LAnnotation>;\n  onMergeConflictAction?(\n    payload: MergeConflictActionPayload,\n    instance: UnresolvedFile<LAnnotation>\n  ): void;\n  onMergeConflictResolve?(\n    file: FileContents,\n    payload: MergeConflictActionPayload\n  ): void;\n  maxContextLines?: number;\n}\n\nexport interface UnresolvedFileRenderProps<LAnnotation> extends Omit<\n  FileDiffRenderProps<LAnnotation>,\n  'oldFile' | 'newFile'\n> {\n  file?: FileContents;\n  actions?: (MergeConflictDiffAction | undefined)[];\n  markerRows?: MergeConflictMarkerRow[];\n}\n\nexport interface UnresolvedFileHydrationProps<LAnnotation> extends Omit<\n  UnresolvedFileRenderProps<LAnnotation>,\n  'file'\n> {\n  file?: FileContents;\n  fileContainer: HTMLElement;\n  prerenderedHTML?: string;\n}\n\ninterface MergeConflictActionElementCache {\n  element: HTMLElement;\n  action: MergeConflictDiffAction;\n}\n\ninterface GetOrComputeDiffProps {\n  file: FileContents | undefined;\n  fileDiff: FileDiffMetadata | undefined;\n  actions: (MergeConflictDiffAction | undefined)[] | undefined;\n  markerRows: MergeConflictMarkerRow[] | undefined;\n}\n\ninterface GetOrComputeDiffResult {\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n}\n\ninterface ResolveConflictReturn {\n  file: FileContents;\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n}\n\ntype UnresolvedFileDataCache = GetOrComputeDiffProps;\n\nlet instanceId = -1;\n\nexport class UnresolvedFile<\n  LAnnotation = undefined,\n> extends FileDiff<LAnnotation> {\n  override readonly __id: string = `unresolved-file:${++instanceId}`;\n  protected computedCache: UnresolvedFileDataCache = {\n    file: undefined,\n    fileDiff: undefined,\n    actions: undefined,\n    markerRows: undefined,\n  };\n  private conflictActions: (MergeConflictDiffAction | undefined)[] = [];\n  private markerRows: MergeConflictMarkerRow[] = [];\n  private conflictActionCache: Map<string, MergeConflictActionElementCache> =\n    new Map();\n\n  constructor(\n    public override options: UnresolvedFileOptions<LAnnotation> = {\n      theme: DEFAULT_THEMES,\n    },\n    workerManager?: WorkerPoolManager | undefined,\n    isContainerManaged = false\n  ) {\n    super(undefined, workerManager, isContainerManaged);\n    this.setOptions(options);\n  }\n\n  override setOptions(\n    options: UnresolvedFileOptions<LAnnotation> | undefined\n  ): void {\n    if (options == null) {\n      return;\n    }\n\n    if (\n      options.onMergeConflictAction != null &&\n      options.onMergeConflictResolve != null\n    ) {\n      throw new Error(\n        'UnresolvedFile: onMergeConflictAction and onMergeConflictResolve are mutually exclusive. Use only one callback.'\n      );\n    }\n\n    this.options = options;\n    this.hunksRenderer.setOptions(this.getHunksRendererOptions(options));\n\n    const hunkSeparators = this.options.hunkSeparators ?? 'line-info';\n    this.interactionManager.setOptions(\n      pluckInteractionOptions(\n        this.options,\n        typeof hunkSeparators === 'function' ||\n          hunkSeparators === 'line-info' ||\n          hunkSeparators === 'line-info-basic'\n          ? this.expandHunk\n          : undefined,\n        this.getLineIndex,\n        this.handleMergeConflictActionClick\n      )\n    );\n  }\n\n  protected override createHunksRenderer(\n    options: UnresolvedFileOptions<LAnnotation>\n  ): UnresolvedFileHunksRenderer<LAnnotation> {\n    const renderer = new UnresolvedFileHunksRenderer<LAnnotation>(\n      this.getHunksRendererOptions(options),\n      this.handleHighlightRender,\n      this.workerManager\n    );\n    return renderer;\n  }\n\n  protected override getHunksRendererOptions(\n    options: UnresolvedFileOptions<LAnnotation>\n  ): UnresolvedFileHunksRendererOptions {\n    return getUnresolvedDiffHunksRendererOptions(options, this.options);\n  }\n\n  protected override applyPreNodeAttributes(\n    pre: HTMLPreElement,\n    result: HunksRenderResult\n  ): void {\n    super.applyPreNodeAttributes(pre, result, {\n      'data-has-merge-conflict': '',\n    });\n  }\n\n  override cleanUp(): void {\n    this.clearMergeConflictActionCache();\n    this.computedCache = {\n      file: undefined,\n      fileDiff: undefined,\n      actions: undefined,\n      markerRows: undefined,\n    };\n    this.conflictActions = [];\n    super.cleanUp();\n  }\n\n  private getOrComputeDiff({\n    file,\n    fileDiff,\n    actions,\n    markerRows,\n  }: GetOrComputeDiffProps): GetOrComputeDiffResult | undefined {\n    const { maxContextLines, onMergeConflictAction } = this.options;\n    wrapper: {\n      // We are dealing with a controlled component\n      if (onMergeConflictAction != null) {\n        const hasFileDiff = fileDiff != null;\n        const hasActions = actions != null;\n        const hasMarkerRows = markerRows != null;\n        if (hasFileDiff !== hasActions || hasFileDiff !== hasMarkerRows) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: fileDiff, actions, and markerRows must be passed together'\n          );\n        }\n        // If we were provided a new fileDiff/actions/markerRows, we are a FULLY\n        // controlled component, which means we will not do any computation\n        if (fileDiff != null && actions != null && markerRows != null) {\n          this.computedCache = {\n            file: file ?? this.computedCache.file,\n            fileDiff,\n            actions,\n            markerRows,\n          };\n          break wrapper;\n        }\n        // If we were provided a new file, we should attempt to parse out a new\n        // diff/actions if we haven't computed it before. Once we initialize from\n        // a file, later updates must flow through fileDiff/actions instead of\n        // reparsing from a new file input.\n        else if (file != null || this.computedCache.file != null) {\n          if (\n            file != null &&\n            this.computedCache.file != null &&\n            !areFilesEqual(file, this.computedCache.file) &&\n            this.computedCache.fileDiff != null &&\n            this.computedCache.actions != null\n          ) {\n            throw new Error(\n              'UnresolvedFile.getOrComputeDiff: file can only be used to initialize unresolved state once. Pass fileDiff and actions for subsequent updates.'\n            );\n          }\n          file ??= this.computedCache.file;\n          if (file == null) {\n            throw new Error(\n              'UnresolvedFile.getOrComputeDiff: file is null, should be impossible'\n            );\n          }\n          if (\n            !areFilesEqual(file, this.computedCache.file) ||\n            this.computedCache.fileDiff == null ||\n            this.computedCache.actions == null\n          ) {\n            const computed = parseMergeConflictDiffFromFile(\n              file,\n              maxContextLines\n            );\n            this.computedCache = {\n              file,\n              fileDiff: computed.fileDiff,\n              actions: computed.actions,\n              markerRows: computed.markerRows,\n            };\n          }\n          fileDiff = this.computedCache.fileDiff;\n          actions = this.computedCache.actions;\n          markerRows = this.computedCache.markerRows;\n          break wrapper;\n        }\n        // Otherwise we should fall through and try to use the cache if it exists\n        else {\n          fileDiff = this.computedCache.fileDiff;\n          actions = this.computedCache.actions;\n          markerRows = this.computedCache.markerRows;\n          break wrapper;\n        }\n      }\n      // If we are uncontrolled we only rely on the file and only use the first\n      // version. After that, the cached diff/action pair is the source of\n      // truth and we should not accept a new file input.\n      else {\n        if (fileDiff != null || actions != null || markerRows != null) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: fileDiff, actions, and markerRows are only usable in controlled mode, you must pass in `onMergeConflictAction`'\n          );\n        }\n        if (\n          file != null &&\n          this.computedCache.file != null &&\n          !areFilesEqual(file, this.computedCache.file)\n        ) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: uncontrolled unresolved files parse the file only once. Later updates must come from the cached diff state.'\n          );\n        }\n        this.computedCache.file ??= file;\n        if (\n          this.computedCache.fileDiff == null &&\n          this.computedCache.file != null\n        ) {\n          const computed = parseMergeConflictDiffFromFile(\n            this.computedCache.file,\n            maxContextLines\n          );\n          this.computedCache.fileDiff = computed.fileDiff;\n          this.computedCache.actions = computed.actions;\n          this.computedCache.markerRows = computed.markerRows;\n        }\n        // Because we are uncontrolled, the source of truth is the\n        // computedCache\n        fileDiff = this.computedCache.fileDiff;\n        actions = this.computedCache.actions;\n        markerRows = this.computedCache.markerRows;\n        break wrapper;\n      }\n    }\n    if (fileDiff == null || actions == null || markerRows == null) {\n      return undefined;\n    }\n    return { fileDiff, actions, markerRows };\n  }\n\n  override hydrate(props: UnresolvedFileHydrationProps<LAnnotation>): void {\n    const {\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      fileContainer,\n      prerenderedHTML,\n      preventEmit = false,\n    } = props;\n    const source = this.getOrComputeDiff({\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n    });\n    const { overflow = 'scroll' } = this.options;\n    if (source == null) {\n      return;\n    }\n    prerenderHTMLIfNecessary(fileContainer, prerenderedHTML);\n    for (const element of fileContainer.shadowRoot?.children ?? []) {\n      if (element instanceof SVGElement) {\n        this.spriteSVG = element;\n        continue;\n      }\n      if (!(element instanceof HTMLElement)) {\n        continue;\n      }\n      if (element instanceof HTMLPreElement) {\n        this.pre = element;\n        for (const code of element.children) {\n          if (\n            !(code instanceof HTMLElement) ||\n            code.tagName.toLowerCase() !== 'code'\n          ) {\n            continue;\n          }\n          if ('deletions' in code.dataset) {\n            this.codeDeletions = code;\n          }\n          if ('additions' in code.dataset) {\n            this.codeAdditions = code;\n          }\n          if ('unified' in code.dataset) {\n            this.codeUnified = code;\n          }\n        }\n        continue;\n      }\n      if ('diffsHeader' in element.dataset) {\n        this.headerElement = element;\n        continue;\n      }\n      if (\n        element instanceof HTMLStyleElement &&\n        element.hasAttribute(UNSAFE_CSS_ATTRIBUTE)\n      ) {\n        this.unsafeCSSStyle = element;\n        continue;\n      }\n    }\n    if (this.pre != null) {\n      this.syncCodeNodesFromPre(this.pre);\n    }\n    this.setActiveMergeConflictState(source.actions, source.markerRows);\n    // If we have no pre tag, then we should render\n    if (this.pre == null) {\n      this.render({ ...props, preventEmit: true });\n    }\n    // Otherwise orchestrate our setup\n    else {\n      this.fileContainer = fileContainer;\n      delete this.pre.dataset.dehydrated;\n\n      this.lineAnnotations = lineAnnotations ?? this.lineAnnotations;\n      this.fileDiff = source.fileDiff;\n\n      this.hunksRenderer.hydrate(this.fileDiff);\n      this.renderAnnotations();\n      this.renderGutterUtility();\n      this.injectUnsafeCSS();\n      this.interactionManager.setup(this.pre);\n      this.resizeManager.setup(this.pre, overflow === 'wrap');\n    }\n\n    this.renderMergeConflictActionSlots();\n    if (!preventEmit) {\n      this.emitPostRender();\n    }\n  }\n\n  override rerender(): void {\n    if (!this.enabled || this.fileDiff == null) {\n      return;\n    }\n    this.render({ forceRender: true, renderRange: this.renderRange });\n  }\n\n  override render(props: UnresolvedFileRenderProps<LAnnotation> = {}): boolean {\n    let {\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      preventEmit = false,\n      ...rest\n    } = props;\n    const source = this.getOrComputeDiff({\n      file,\n      fileDiff,\n      actions,\n      markerRows,\n    });\n    if (source == null) {\n      return false;\n    }\n    this.setActiveMergeConflictState(source.actions, source.markerRows);\n    const didRender = super.render({\n      ...rest,\n      fileDiff: source.fileDiff,\n      lineAnnotations,\n      preventEmit: true,\n    });\n    if (didRender) {\n      this.renderMergeConflictActionSlots();\n      if (!preventEmit) {\n        this.emitPostRender();\n      }\n    }\n    return didRender;\n  }\n\n  public resolveConflict(\n    conflictIndex: number,\n    resolution: MergeConflictResolution,\n    fileDiff: FileDiffMetadata | undefined = this.computedCache.fileDiff\n  ): ResolveConflictReturn | undefined {\n    const action = this.conflictActions[conflictIndex];\n    if (fileDiff == null || action == null) {\n      return undefined;\n    }\n\n    if (action.conflictIndex !== conflictIndex) {\n      console.error({ conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.resolveConflict: conflictIndex and conflictAction don't match\"\n      );\n    }\n\n    const newFileDiff = resolveConflictDiff(fileDiff, action, resolution);\n    const previousFile = this.computedCache.file;\n    const { file, actions, markerRows } = rebuildFileAndActions({\n      fileDiff: newFileDiff,\n      previousActions: this.conflictActions,\n      resolvedConflictIndex: conflictIndex,\n      previousFile,\n      resolution,\n    });\n\n    return {\n      file,\n      fileDiff: newFileDiff,\n      actions,\n      markerRows,\n    };\n  }\n\n  private resolveConflictAndRender(\n    conflictIndex: number,\n    resolution: MergeConflictResolution\n  ): void {\n    const action = this.conflictActions[conflictIndex];\n    if (action == null) {\n      return undefined;\n    }\n    if (action.conflictIndex !== conflictIndex) {\n      console.error({ conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.resolveConflictAndRender: conflictIndex and conflictAction don't match\"\n      );\n    }\n    const payload: MergeConflictActionPayload = {\n      resolution,\n      conflict: action.conflict,\n    };\n    const { file, fileDiff, actions, markerRows } =\n      this.resolveConflict(conflictIndex, resolution) ?? {};\n    if (\n      file == null ||\n      fileDiff == null ||\n      actions == null ||\n      markerRows == null\n    ) {\n      return undefined;\n    }\n\n    this.computedCache = { file, fileDiff, actions, markerRows };\n    this.setActiveMergeConflictState(actions, markerRows);\n    // NOTE(amadeus): This is a bit jank, but helps to ensure we don't see a\n    // bunch of jittery re-renders as things resolve out.  In a more perfect\n    // world we would have a more elegant way to kick off a render to the\n    // highlighter and then resolve actions in a cleaner way, but time is short\n    // right now.  Can't let perfect be the enemy of good\n    if (this.workerManager != null) {\n      // Because we are using a workerManager, if we fire off the renderDiff\n      // call, it will eventually get back to us in a callback which will\n      // trigger a re-render\n      this.hunksRenderer.renderDiff(fileDiff);\n    } else {\n      this.render({ forceRender: true });\n    }\n    this.options.onMergeConflictResolve?.(file, payload);\n  }\n\n  private setActiveMergeConflictState(\n    actions: (MergeConflictDiffAction | undefined)[] = this.conflictActions,\n    markerRows: MergeConflictMarkerRow[] = this.markerRows\n  ): void {\n    this.conflictActions = actions;\n    this.markerRows = markerRows;\n    if (\n      this.computedCache.fileDiff != null &&\n      this.hunksRenderer instanceof UnresolvedFileHunksRenderer\n    ) {\n      this.hunksRenderer.setConflictState(\n        this.options.mergeConflictActionsType === 'none' ? [] : actions,\n        markerRows,\n        this.computedCache.fileDiff\n      );\n    }\n  }\n\n  private handleMergeConflictActionClick = (\n    target: MergeConflictActionTarget\n  ): void => {\n    const action = this.conflictActions[target.conflictIndex];\n    if (action == null) {\n      return;\n    }\n    if (action.conflictIndex !== target.conflictIndex) {\n      console.error({ conflictIndex: target.conflictIndex, action });\n      throw new Error(\n        \"UnresolvedFile.handleMergeConflictActionClick: conflictIndex and conflictAction don't match\"\n      );\n    }\n    const payload: MergeConflictActionPayload = {\n      resolution: target.resolution,\n      conflict: action.conflict,\n    };\n    if (this.options.onMergeConflictAction != null) {\n      this.options.onMergeConflictAction(payload, this);\n      return;\n    }\n    this.resolveConflictAndRender(target.conflictIndex, target.resolution);\n  };\n\n  private renderMergeConflictActionSlots(): void {\n    const { fileDiff } = this.computedCache;\n    if (\n      this.isContainerManaged ||\n      this.fileContainer == null ||\n      typeof this.options.mergeConflictActionsType !== 'function' ||\n      this.conflictActions.length === 0 ||\n      fileDiff == null\n    ) {\n      this.clearMergeConflictActionCache();\n      return;\n    }\n    const staleActions = new Map(this.conflictActionCache);\n    for (\n      let actionIndex = 0;\n      actionIndex < this.conflictActions.length;\n      actionIndex++\n    ) {\n      const action = this.conflictActions[actionIndex];\n      if (action == null) {\n        continue;\n      }\n      if (action.conflictIndex !== actionIndex) {\n        console.error({ conflictIndex: actionIndex, action });\n        throw new Error(\n          \"UnresolvedFile.renderMergeConflictActionSlots: conflictIndex and conflictAction don't match\"\n        );\n      }\n      const anchor = getMergeConflictActionAnchor(action, fileDiff);\n      if (anchor == null) {\n        continue;\n      }\n      const conflictIndex = action.conflictIndex;\n      const slotName = getMergeConflictActionSlotName({\n        hunkIndex: anchor.hunkIndex,\n        lineIndex: anchor.lineIndex,\n        conflictIndex,\n      });\n      const id = `${actionIndex}-${slotName}`;\n      let cache = this.conflictActionCache.get(id);\n      if (\n        cache == null ||\n        !areMergeConflictActionsEqual(cache.action, action)\n      ) {\n        cache?.element.remove();\n        const rendered = this.renderMergeConflictAction(action);\n        if (rendered == null) {\n          continue;\n        }\n        const element = createAnnotationWrapperNode(slotName);\n        element.appendChild(rendered);\n        this.fileContainer.appendChild(element);\n        cache = { element, action };\n        this.conflictActionCache.set(id, cache);\n      }\n      staleActions.delete(id);\n    }\n    for (const [id, { element }] of staleActions.entries()) {\n      this.conflictActionCache.delete(id);\n      element.remove();\n    }\n  }\n\n  private renderMergeConflictAction(\n    action: MergeConflictDiffAction\n  ): HTMLElement | undefined {\n    if (typeof this.options.mergeConflictActionsType !== 'function') {\n      return undefined;\n    }\n    const rendered = this.options.mergeConflictActionsType(action, this);\n    if (rendered == null) {\n      return undefined;\n    }\n    if (rendered instanceof HTMLElement) {\n      return rendered;\n    }\n    if (\n      typeof DocumentFragment !== 'undefined' &&\n      rendered instanceof DocumentFragment\n    ) {\n      const wrapper = document.createElement('div');\n      wrapper.style.display = 'contents';\n      wrapper.appendChild(rendered);\n      return wrapper;\n    }\n    return undefined;\n  }\n\n  private clearMergeConflictActionCache(): void {\n    for (const { element } of this.conflictActionCache.values()) {\n      element.remove();\n    }\n    this.conflictActionCache.clear();\n  }\n}\n\ninterface RebuildFileAndActionsProps {\n  fileDiff: FileDiffMetadata;\n  previousActions: (MergeConflictDiffAction | undefined)[];\n  resolvedConflictIndex: number;\n  // FIXME: Probably should remove this...\n  // additionOffset: number;\n  // deletionOffset: number;\n  previousFile: FileContents | undefined;\n  resolution: MergeConflictResolution;\n}\n\n// Rebuild the emitted unresolved file contents and remaining action anchors in\n// one pass over the post-resolution diff state.\nfunction rebuildFileAndActions({\n  fileDiff,\n  previousActions,\n  resolvedConflictIndex,\n  previousFile,\n  resolution,\n}: RebuildFileAndActionsProps): Pick<\n  ResolveConflictReturn,\n  'file' | 'actions' | 'markerRows'\n> {\n  const resolvedAction = previousActions[resolvedConflictIndex];\n  if (resolvedAction == null) {\n    throw new Error(\n      'rebuildFileAndActions: missing resolved action for unresolved file rebuild'\n    );\n  }\n\n  const actions = updateConflictActionsAfterResolution(\n    previousActions,\n    resolvedConflictIndex,\n    resolvedAction,\n    resolution\n  );\n  const markerRows = buildMergeConflictMarkerRows(fileDiff, actions);\n\n  const file = rebuildUnresolvedFile({\n    fileDiff,\n    resolvedAction,\n    resolvedConflictIndex,\n    previousFile,\n    resolution,\n  });\n\n  return {\n    file,\n    actions,\n    markerRows,\n  };\n}\n\ninterface RebuildUnresolvedFileProps {\n  fileDiff: FileDiffMetadata;\n  resolvedAction: MergeConflictDiffAction;\n  resolvedConflictIndex: number;\n  previousFile: FileContents | undefined;\n  resolution: MergeConflictResolution;\n}\n\n// Rebuild the unresolved file text from the previous unresolved source so we\n// preserve remaining marker blocks exactly while the diff state stays in-place.\nfunction rebuildUnresolvedFile({\n  resolvedAction,\n  resolvedConflictIndex,\n  previousFile,\n  fileDiff,\n  resolution,\n}: RebuildUnresolvedFileProps): FileContents {\n  const previousContents = previousFile?.contents ?? '';\n  const lines = splitFileContents(previousContents);\n  const { conflict } = resolvedAction;\n  const replacementLines = getResolvedConflictReplacementLines(\n    lines,\n    conflict,\n    resolution\n  );\n  const contents = [\n    ...lines.slice(0, conflict.startLineIndex),\n    ...replacementLines,\n    ...lines.slice(conflict.endLineIndex + 1),\n  ].join('');\n\n  return {\n    name: previousFile?.name ?? fileDiff.name,\n    contents,\n    cacheKey:\n      previousFile?.cacheKey != null\n        ? `${previousFile.cacheKey}:mc-${resolvedConflictIndex}-${resolution}`\n        : undefined,\n  };\n}\n\nfunction getResolvedConflictReplacementLines(\n  lines: string[],\n  conflict: MergeConflictDiffAction['conflict'],\n  resolution: MergeConflictResolution\n): string[] {\n  const currentLines = lines.slice(\n    conflict.startLineIndex + 1,\n    conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex\n  );\n  const incomingLines = lines.slice(\n    conflict.separatorLineIndex + 1,\n    conflict.endLineIndex\n  );\n\n  if (resolution === 'current') {\n    return currentLines;\n  }\n  if (resolution === 'incoming') {\n    return incomingLines;\n  }\n  return [...currentLines, ...incomingLines];\n}\n\n// The diff resolver keeps hunk/content group indexes stable, so the only\n// follow-up update we need here is shifting unresolved source-region line\n// numbers for later conflicts in the rebuilt file text.\nfunction updateConflictActionsAfterResolution(\n  previousActions: (MergeConflictDiffAction | undefined)[],\n  resolvedConflictIndex: number,\n  resolvedAction: MergeConflictDiffAction,\n  resolution: MergeConflictResolution\n): (MergeConflictDiffAction | undefined)[] {\n  const lineDelta = getResolvedConflictLineDelta(\n    resolvedAction.conflict,\n    resolution\n  );\n\n  return previousActions.map((action, index) => {\n    if (index === resolvedConflictIndex) {\n      return undefined;\n    }\n    if (action == null) {\n      return undefined;\n    }\n    if (action.conflict.startLineIndex > resolvedAction.conflict.endLineIndex) {\n      return {\n        ...action,\n        conflict: shiftMergeConflictRegion(action.conflict, lineDelta),\n      };\n    }\n    return action;\n  });\n}\n\nfunction getResolvedConflictLineDelta(\n  conflict: MergeConflictRegion,\n  resolution: MergeConflictResolution\n): number {\n  const currentLineCount =\n    (conflict.baseMarkerLineIndex ?? conflict.separatorLineIndex) -\n    conflict.startLineIndex -\n    1;\n  const incomingLineCount =\n    conflict.endLineIndex - conflict.separatorLineIndex - 1;\n  const replacementLineCount =\n    resolution === 'current'\n      ? currentLineCount\n      : resolution === 'incoming'\n        ? incomingLineCount\n        : currentLineCount + incomingLineCount;\n  const conflictLineCount = conflict.endLineIndex - conflict.startLineIndex + 1;\n  return replacementLineCount - conflictLineCount;\n}\n\nfunction shiftMergeConflictRegion(\n  conflict: MergeConflictRegion,\n  lineDelta: number\n): MergeConflictRegion {\n  return {\n    ...conflict,\n    startLineIndex: conflict.startLineIndex + lineDelta,\n    startLineNumber: conflict.startLineNumber + lineDelta,\n    separatorLineIndex: conflict.separatorLineIndex + lineDelta,\n    separatorLineNumber: conflict.separatorLineNumber + lineDelta,\n    endLineIndex: conflict.endLineIndex + lineDelta,\n    endLineNumber: conflict.endLineNumber + lineDelta,\n    baseMarkerLineIndex:\n      conflict.baseMarkerLineIndex != null\n        ? conflict.baseMarkerLineIndex + lineDelta\n        : undefined,\n    baseMarkerLineNumber:\n      conflict.baseMarkerLineNumber != null\n        ? conflict.baseMarkerLineNumber + lineDelta\n        : undefined,\n  };\n}\n\n// NOTE(amadeus): Should probably pull this out into a util, and make variants\n// for all component types\nexport function getUnresolvedDiffHunksRendererOptions<LAnnotation>(\n  options?: UnresolvedFileOptions<LAnnotation>,\n  baseOptions?: UnresolvedFileOptions<LAnnotation>\n): UnresolvedFileHunksRendererOptions {\n  return {\n    ...baseOptions,\n    ...options,\n    hunkSeparators:\n      typeof options?.hunkSeparators === 'function'\n        ? 'custom'\n        : options?.hunkSeparators,\n    mergeConflictActionsType:\n      typeof options?.mergeConflictActionsType === 'function'\n        ? 'custom'\n        : options?.mergeConflictActionsType,\n  };\n}\n"],"mappings":"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"}

package/dist/components/VirtulizerDevelopment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VirtulizerDevelopment.d.ts","names":["AdvancedVirtualizer","Virtualizer","_1","sideEffect"],"sources":["../../src/components/VirtulizerDevelopment.d.ts"],"sourcesContent":["import type { AdvancedVirtualizer } from './AdvancedVirtualizer';\nimport type { Virtualizer } from './Virtualizer';\n\n// FIXME(amadeus): REMOVE ME AFTER RELEASING VIRTUALIZATION\ndeclare global {\n  interface Window {\n    // oxlint-disable-next-line typescript/no-explicit-any\n    __INSTANCE?: AdvancedVirtualizer<any> | Virtualizer;\n    __TOGGLE?: () => void;\n    __LOG?: boolean;\n  }\n}\n"],"mappings":";;;;;AACiD,QAAAE,MAAA,CAAA;EAAA,UAAA,MAAA,CAAA;;IAMMC,UAAAD,CAAA,EAAtCF,mBAAsC,CAAA,GAAA,CAAA,GAAXC,WAAW;IAAA,QAAA,CAAA,EAAA,GAAA,GAAA,IAAA"}
+{"version":3,"file":"VirtulizerDevelopment.d.ts","names":["AdvancedVirtualizer","Virtualizer","_0","sideEffect"],"sources":["../../src/components/VirtulizerDevelopment.d.ts"],"sourcesContent":["import type { AdvancedVirtualizer } from './AdvancedVirtualizer';\nimport type { Virtualizer } from './Virtualizer';\n\n// FIXME(amadeus): REMOVE ME AFTER RELEASING VIRTUALIZATION\ndeclare global {\n  interface Window {\n    // oxlint-disable-next-line typescript/no-explicit-any\n    __INSTANCE?: AdvancedVirtualizer<any> | Virtualizer;\n    __TOGGLE?: () => void;\n    __LOG?: boolean;\n  }\n}\n"],"mappings":";;;;;AACiD,QAAAE,MAAA,CAAA;EAAA,UAAA,MAAA,CAAA;;IAMMC,UAAAD,CAAA,EAAtCF,mBAAsC,CAAA,GAAA,CAAA,GAAXC,WAAW;IAAA,QAAA,CAAA,EAAA,GAAA,GAAA,IAAA"}

package/dist/react/jsx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsx.d.ts","names":["DIFFS_TAG_NAME","_0","HTMLElement","React","HTMLAttributes","DetailedHTMLProps","sideEffect"],"sources":["../../src/react/jsx.d.ts"],"sourcesContent":["import 'react';\nimport type { DIFFS_TAG_NAME } from '../constants';\n\ndeclare module 'react' {\n  namespace JSX {\n    interface IntrinsicElements {\n      [DIFFS_TAG_NAME]: React.DetailedHTMLProps<\n        React.HTMLAttributes<HTMLElement>,\n        HTMLElement\n      >;\n    }\n  }\n}\n"],"mappings":";;;;;EACmD,UAAA,GAAA,CAAA;IAAA,UAAA,iBAAA,CAAA;OAK5CA,cAAAA,CAL4C,EAK3BG,KAAAA,CAAME,iBALqB,CAM3CF,KAAAA,CAAMC,cAAeF,CAAAA,WAAAA,CAAAA,EACrBA,WADME,CACNF;IAFgBC;EAAjBH"}
+{"version":3,"file":"jsx.d.ts","names":["DIFFS_TAG_NAME","_1","HTMLElement","React","HTMLAttributes","DetailedHTMLProps","sideEffect"],"sources":["../../src/react/jsx.d.ts"],"sourcesContent":["import 'react';\nimport type { DIFFS_TAG_NAME } from '../constants';\n\ndeclare module 'react' {\n  namespace JSX {\n    interface IntrinsicElements {\n      [DIFFS_TAG_NAME]: React.DetailedHTMLProps<\n        React.HTMLAttributes<HTMLElement>,\n        HTMLElement\n      >;\n    }\n  }\n}\n"],"mappings":";;;;;EACmD,UAAA,GAAA,CAAA;IAAA,UAAA,iBAAA,CAAA;OAK5CA,cAAAA,CAL4C,EAK3BG,KAAAA,CAAME,iBALqB,CAM3CF,KAAAA,CAAMC,cAAeF,CAAAA,WAAAA,CAAAA,EACrBA,WADME,CACNF;IAFgBC;EAAjBH"}

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

@@ -1,13 +1,13 @@
 import { DiffLineAnnotation, FileContents, FileDiffMetadata, MergeConflictMarkerRow } 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";
+import { UnresolvedFileReactOptions } from "../UnresolvedFile.js";
 
 //#region src/react/utils/useUnresolvedFileInstance.d.ts
 interface UseUnresolvedFileInstanceProps<LAnnotation> {
   file: FileContents;
-  options?: Omit<UnresolvedFileHunksRendererOptions, 'onMergeConflictAction'>;
+  options?: UnresolvedFileReactOptions<LAnnotation>;
   lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;
   selectedLines: SelectedLineRange | null | undefined;
   prerenderedHTML: string | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"useUnresolvedFileInstance.d.ts","names":["UnresolvedFile","GetHoveredLineResult","SelectedLineRange","UnresolvedFileHunksRendererOptions","DiffLineAnnotation","FileContents","FileDiffMetadata","MergeConflictMarkerRow","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, MergeConflictMarkerRow } 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 | undefined)[];\n    markerRows: MergeConflictMarkerRow[];\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":";;;;;;;UAKUS;QACAJ;EADAI,OAAAA,CAAAA,EAEIE,IAFJF,CAESN,kCAFqBO,EAAAA,uBAAA,CAAA;EAC9BL,eAAAA,EAEWD,kBAFXC,CAE8BK,WAF9BL,CAAAA,EAAAA,GAAAA,SAAAA;EACSF,aAAAA,EAEAD,iBAFAC,GAAAA,IAAAA,GAAAA,SAAAA;EAALQ,eAAAA,EAAAA,MAAAA,GAAAA,SAAAA;EAC0BD,kBAAAA,EAAAA,OAAAA;EAAnBN,sBAAAA,EAAAA,OAAAA;;UAMXQ,+BAL0B,CAAA,WAAA,CAAA,CAAA;EAK1BA,QAAAA,EACIN,gBADJM;EACIN,OAAAA,EAAAA,CACAE,uBADAF,GAAAA,SAAAA,CAAAA,EAAAA;EACAE,UAAAA,EACED,sBADFC,EAAAA;EACED,GAAAA,CAAAA,IAAAA,EACFM,WADEN,GAAAA,IAAAA,CAAAA,EAAAA,IAAAA;EACFM,cAAAA,EAAAA,EACQZ,oBADRY,CAAAA,MAAAA,CAAAA,GAAAA,SAAAA;EACQZ,WAAAA,EAAAA,EACHD,cADGC,CACYS,WADZT,CAAAA,GAAAA,SAAAA;;AACHD,iBAEKc,yBAFLd,CAAAA,WAAAA,CAAAA,CAAAA;EAAAA,IAAAA;EAAAA,OAAAA;EAAAA,eAAAA;EAAAA,aAAAA;EAAAA,eAAAA;EAAAA,kBAAAA;EAAAA;AAAAA,CAAAA,EAE4JS,8BAF5JT,CAE2LU,WAF3LV,CAAAA,CAAAA,EAE0MY,+BAF1MZ,CAE0OU,WAF1OV,CAAAA"}
+{"version":3,"file":"useUnresolvedFileInstance.d.ts","names":["UnresolvedFile","GetHoveredLineResult","SelectedLineRange","DiffLineAnnotation","FileContents","FileDiffMetadata","MergeConflictMarkerRow","MergeConflictDiffAction","UnresolvedFileReactOptions","UseUnresolvedFileInstanceProps","LAnnotation","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 { DiffLineAnnotation, FileContents, FileDiffMetadata, MergeConflictMarkerRow } from '../../types';\nimport { type MergeConflictDiffAction } from '../../utils/parseMergeConflictDiffFromFile';\nimport type { UnresolvedFileReactOptions } from '../UnresolvedFile';\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}\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}\nexport declare function useUnresolvedFileInstance<LAnnotation>({ file, options, lineAnnotations, selectedLines, prerenderedHTML, hasConflictUtility, hasGutterRenderUtility }: UseUnresolvedFileInstanceProps<LAnnotation>): UseUnresolvedFileInstanceReturn<LAnnotation>;\nexport {};\n//# sourceMappingURL=useUnresolvedFileInstance.d.ts.map"],"mappings":";;;;;;;UAKUS;QACAL;EADAK,OAAAA,CAAAA,EAEID,0BAF0B,CAECE,WAFDA,CAAAA;EAC9BN,eAAAA,EAEWD,kBAFXC,CAE8BM,WAF9BN,CAAAA,EAAAA,GAAAA,SAAAA;EAC+BM,aAAAA,EAEtBR,iBAFsBQ,GAAAA,IAAAA,GAAAA,SAAAA;EAA3BF,eAAAA,EAAAA,MAAAA,GAAAA,SAAAA;EAC0BE,kBAAAA,EAAAA,OAAAA;EAAnBP,sBAAAA,EAAAA,OAAAA;;UAMXQ,+BAL0B,CAAA,WAAA,CAAA,CAAA;EAK1BA,QAAAA,EACIN,gBADJM;EACIN,OAAAA,EAAAA,CACAE,uBADAF,GAAAA,SAAAA,CAAAA,EAAAA;EACAE,UAAAA,EACED,sBADFC,EAAAA;EACED,GAAAA,CAAAA,IAAAA,EACFM,WADEN,GAAAA,IAAAA,CAAAA,EAAAA,IAAAA;EACFM,cAAAA,EAAAA,EACQX,oBADRW,CAAAA,MAAAA,CAAAA,GAAAA,SAAAA;EACQX,WAAAA,EAAAA,EACHD,cADGC,CACYS,WADZT,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,EAE4JS,8BAF5JT,CAE2LU,WAF3LV,CAAAA,CAAAA,EAE0MW,+BAF1MX,CAE0OU,WAF1OV,CAAAA"}

package/dist/react/utils/useUnresolvedFileInstance.js

@@ -10,7 +10,7 @@ import { useCallback, useContext, useEffect, useLayoutEffect, useRef, useState }
 const useIsometricEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
 function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLines, prerenderedHTML, hasConflictUtility, hasGutterRenderUtility }) {
 	const [{ fileDiff, actions, markerRows }, setState] = useState(() => {
-		const { fileDiff: fileDiff$1, actions: actions$1, markerRows: markerRows$1 } = parseMergeConflictDiffFromFile(file);
+		const { fileDiff: fileDiff$1, actions: actions$1, markerRows: markerRows$1 } = parseMergeConflictDiffFromFile(file, options?.maxContextLines);
 		return {
 			fileDiff: fileDiff$1,
 			actions: actions$1,

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 { UnresolvedFileHunksRendererOptions } from '../../renderers/UnresolvedFileHunksRenderer';\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 { 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 | 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 } =\n      parseMergeConflictDiffFromFile(file);\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: 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":";;;;;;;;;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,6BACzB,+BAA+B,KAAK;AACtC,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}\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"}

package/dist/utils/resolveRegion.js

@@ -29,14 +29,9 @@ function resolveRegion(diff, target) {
 		unifiedLineCount: 0
 	};
 	const updatesEOFState = hunkIndex === hunks.length - 1 && endContentIndex === currentHunk.hunkContent.length - 1;
+	const shouldProcessCollapsedContext = !diff.isPartial;
 	for (const [index, hunk] of hunks.entries()) {
-		pushCollapsedContextLines(resolvedDiff, deletionLines, additionLines, hunk.deletionLineIndex - hunk.collapsedBefore, hunk.additionLineIndex - hunk.collapsedBefore, hunk.collapsedBefore);
-		cursor.nextAdditionLineIndex += hunk.collapsedBefore;
-		cursor.nextDeletionLineIndex += hunk.collapsedBefore;
-		cursor.nextAdditionStart += hunk.collapsedBefore;
-		cursor.nextDeletionStart += hunk.collapsedBefore;
-		cursor.splitLineCount += hunk.collapsedBefore;
-		cursor.unifiedLineCount += hunk.collapsedBefore;
+		processCollapsedContext(diff, resolvedDiff, cursor, hunk.deletionLineIndex - hunk.collapsedBefore, hunk.additionLineIndex - hunk.collapsedBefore, hunk.collapsedBefore, shouldProcessCollapsedContext);
 		const newHunk = {
 			...hunk,
 			hunkContent: [],
@@ -110,6 +105,18 @@ function pushCollapsedContextLines(diff, deletionLines, additionLines, deletionL
 		diff.additionLines.push(additionLine);
 	}
 }
+function processCollapsedContext(sourceDiff, resolvedDiff, cursor, deletionLineIndex, additionLineIndex, lineCount, shouldProcessContent) {
+	if (lineCount <= 0) return;
+	if (shouldProcessContent) {
+		pushCollapsedContextLines(resolvedDiff, sourceDiff.deletionLines, sourceDiff.additionLines, deletionLineIndex, additionLineIndex, lineCount);
+		cursor.nextAdditionLineIndex += lineCount;
+		cursor.nextDeletionLineIndex += lineCount;
+	}
+	cursor.nextAdditionStart += lineCount;
+	cursor.nextDeletionStart += lineCount;
+	cursor.splitLineCount += lineCount;
+	cursor.unifiedLineCount += lineCount;
+}
 function pushContentLinesToDiff(content, diff, deletionLines, additionLines) {
 	if (content.type === "context") for (let i = 0; i < content.lines; i++) {
 		const line = additionLines[content.additionLineIndex + i];

package/dist/utils/resolveRegion.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveRegion.js","names":["resolvedDiff: FileDiffMetadata","cursor: CursorState","newHunk: Hunk","newContent: ContextContent"],"sources":["../../src/utils/resolveRegion.ts"],"sourcesContent":["import type {\n  ChangeContent,\n  ContextContent,\n  FileDiffMetadata,\n  Hunk,\n} from '../types';\n\ninterface RegionResolutionTarget {\n  hunkIndex: number;\n  startContentIndex: number;\n  endContentIndex: number;\n  resolution: 'deletions' | 'additions' | 'both';\n  indexesToDelete?: Set<number>;\n}\n\ninterface CursorState {\n  nextAdditionLineIndex: number;\n  nextDeletionLineIndex: number;\n  nextAdditionStart: number;\n  nextDeletionStart: number;\n  splitLineCount: number;\n  unifiedLineCount: number;\n}\n\nexport function resolveRegion(\n  diff: FileDiffMetadata,\n  target: RegionResolutionTarget\n): FileDiffMetadata {\n  const {\n    resolution,\n    hunkIndex,\n    startContentIndex,\n    endContentIndex,\n    indexesToDelete = new Set(),\n  } = target;\n  const currentHunk = diff.hunks[hunkIndex];\n  if (currentHunk == null) {\n    console.error({ diff, hunkIndex });\n    throw new Error(`resolveRegion: Invalid hunk index: ${hunkIndex}`);\n  }\n\n  if (\n    startContentIndex < 0 ||\n    endContentIndex >= currentHunk.hunkContent.length ||\n    startContentIndex > endContentIndex\n  ) {\n    throw new Error(\n      `resolveRegion: Invalid content range, ${startContentIndex}, ${endContentIndex}`\n    );\n  }\n\n  const { hunks, additionLines, deletionLines } = diff;\n  const resolvedDiff: FileDiffMetadata = {\n    ...diff,\n    hunks: [],\n    deletionLines: [],\n    additionLines: [],\n    splitLineCount: 0,\n    unifiedLineCount: 0,\n    cacheKey:\n      diff.cacheKey != null\n        ? `${diff.cacheKey}:${resolution[0]}-${hunkIndex}:${startContentIndex}-${endContentIndex}`\n        : undefined,\n  };\n\n  const cursor: CursorState = {\n    nextAdditionLineIndex: 0,\n    nextDeletionLineIndex: 0,\n    nextAdditionStart: 1,\n    nextDeletionStart: 1,\n    splitLineCount: 0,\n    unifiedLineCount: 0,\n  };\n  const updatesEOFState =\n    hunkIndex === hunks.length - 1 &&\n    endContentIndex === currentHunk.hunkContent.length - 1;\n\n  for (const [index, hunk] of hunks.entries()) {\n    pushCollapsedContextLines(\n      resolvedDiff,\n      deletionLines,\n      additionLines,\n      hunk.deletionLineIndex - hunk.collapsedBefore,\n      hunk.additionLineIndex - hunk.collapsedBefore,\n      hunk.collapsedBefore\n    );\n    cursor.nextAdditionLineIndex += hunk.collapsedBefore;\n    cursor.nextDeletionLineIndex += hunk.collapsedBefore;\n    cursor.nextAdditionStart += hunk.collapsedBefore;\n    cursor.nextDeletionStart += hunk.collapsedBefore;\n    cursor.splitLineCount += hunk.collapsedBefore;\n    cursor.unifiedLineCount += hunk.collapsedBefore;\n\n    const newHunk: Hunk = {\n      ...hunk,\n      hunkContent: [],\n      additionStart: cursor.nextAdditionStart,\n      deletionStart: cursor.nextDeletionStart,\n      additionLineIndex: cursor.nextAdditionLineIndex,\n      deletionLineIndex: cursor.nextDeletionLineIndex,\n      additionCount: 0,\n      deletionCount: 0,\n      deletionLines: 0,\n      additionLines: 0,\n      splitLineStart: cursor.splitLineCount,\n      unifiedLineStart: cursor.unifiedLineCount,\n      splitLineCount: 0,\n      unifiedLineCount: 0,\n    };\n\n    for (const [contentIndex, content] of hunk.hunkContent.entries()) {\n      // If we are outside of the targeted hunk or content region\n      if (\n        index !== hunkIndex ||\n        contentIndex < startContentIndex ||\n        contentIndex > endContentIndex\n      ) {\n        pushContentLinesToDiff(\n          content,\n          resolvedDiff,\n          deletionLines,\n          additionLines\n        );\n        const newContent = {\n          ...content,\n          additionLineIndex: cursor.nextAdditionLineIndex,\n          deletionLineIndex: cursor.nextDeletionLineIndex,\n        };\n        newHunk.hunkContent.push(newContent);\n        advanceCursor(newContent, cursor, newHunk);\n      }\n      // If we are at an index to delete, replace with an empty context node\n      else if (indexesToDelete.has(contentIndex)) {\n        newHunk.hunkContent.push({\n          type: 'context',\n          lines: 0,\n          deletionLineIndex: cursor.nextDeletionLineIndex,\n          additionLineIndex: cursor.nextAdditionLineIndex,\n        });\n      }\n      // There's nothing to `resolve` with context nodes, so just push them as\n      // they are\n      else if (content.type === 'context') {\n        pushContentLinesToDiff(\n          content,\n          resolvedDiff,\n          deletionLines,\n          additionLines\n        );\n        const newContent: ContextContent = {\n          ...content,\n          deletionLineIndex: cursor.nextDeletionLineIndex,\n          additionLineIndex: cursor.nextAdditionLineIndex,\n        };\n        newHunk.hunkContent.push(newContent);\n        advanceCursor(newContent, cursor, newHunk);\n      }\n      // Looks like we have a change to resolve and push\n      else {\n        pushResolveLinesToDiff(\n          resolution,\n          content,\n          resolvedDiff,\n          deletionLines,\n          additionLines\n        );\n        const newContent: ContextContent = {\n          type: 'context',\n          lines:\n            resolution === 'deletions'\n              ? content.deletions\n              : resolution === 'additions'\n                ? content.additions\n                : content.deletions + content.additions,\n          deletionLineIndex: cursor.nextDeletionLineIndex,\n          additionLineIndex: cursor.nextAdditionLineIndex,\n        };\n        newHunk.hunkContent.push(newContent);\n        advanceCursor(newContent, cursor, newHunk);\n      }\n    }\n\n    if (index === hunkIndex && updatesEOFState) {\n      const noEOFCR =\n        resolution === 'deletions'\n          ? hunk.noEOFCRDeletions\n          : hunk.noEOFCRAdditions;\n      newHunk.noEOFCRAdditions = noEOFCR;\n      newHunk.noEOFCRDeletions = noEOFCR;\n    }\n\n    resolvedDiff.hunks.push(newHunk);\n  }\n\n  const finalHunk = hunks.at(-1);\n  if (finalHunk != null && !diff.isPartial) {\n    pushCollapsedContextLines(\n      resolvedDiff,\n      deletionLines,\n      additionLines,\n      finalHunk.deletionLineIndex + finalHunk.deletionCount,\n      finalHunk.additionLineIndex + finalHunk.additionCount,\n      Math.min(\n        deletionLines.length -\n          (finalHunk.deletionLineIndex + finalHunk.deletionCount),\n        additionLines.length -\n          (finalHunk.additionLineIndex + finalHunk.additionCount)\n      )\n    );\n  }\n\n  resolvedDiff.splitLineCount = cursor.splitLineCount;\n  resolvedDiff.unifiedLineCount = cursor.unifiedLineCount;\n\n  return resolvedDiff;\n}\n\nfunction pushCollapsedContextLines(\n  diff: FileDiffMetadata,\n  deletionLines: string[],\n  additionLines: string[],\n  deletionLineIndex: number,\n  additionLineIndex: number,\n  lineCount: number\n) {\n  for (let index = 0; index < lineCount; index++) {\n    const deletionLine = deletionLines[deletionLineIndex + index];\n    const additionLine = additionLines[additionLineIndex + index];\n    if (deletionLine == null || additionLine == null) {\n      throw new Error(\n        'pushCollapsedContextLines: missing collapsed context line'\n      );\n    }\n    diff.deletionLines.push(deletionLine);\n    diff.additionLines.push(additionLine);\n  }\n}\n\nfunction pushContentLinesToDiff(\n  content: ContextContent | ChangeContent,\n  diff: FileDiffMetadata,\n  deletionLines: string[],\n  additionLines: string[]\n) {\n  if (content.type === 'context') {\n    for (let i = 0; i < content.lines; i++) {\n      const line = additionLines[content.additionLineIndex + i];\n      if (line == null) {\n        console.error({ additionLines, content, i });\n        throw new Error('pushContentLinesToDiff: Context line does not exist');\n      }\n      diff.deletionLines.push(line);\n      diff.additionLines.push(line);\n    }\n  } else {\n    const len = Math.max(content.deletions, content.additions);\n    for (let i = 0; i < len; i++) {\n      if (i < content.deletions) {\n        const line = deletionLines[content.deletionLineIndex + i];\n        if (line == null) {\n          console.error({ deletionLines, content, i });\n          throw new Error(\n            'pushContentLinesToDiff: Deletion line does not exist'\n          );\n        }\n        diff.deletionLines.push(line);\n      }\n      if (i < content.additions) {\n        const line = additionLines[content.additionLineIndex + i];\n        if (line == null) {\n          console.error({ additionLines, content, i });\n          throw new Error(\n            'pushContentLinesToDiff: Addition line does not exist'\n          );\n        }\n        diff.additionLines.push(line);\n      }\n    }\n  }\n}\n\nfunction pushResolveLinesToDiff(\n  resolution: 'deletions' | 'additions' | 'both',\n  content: ChangeContent,\n  diff: FileDiffMetadata,\n  deletionLines: string[],\n  additionLines: string[]\n) {\n  if (resolution === 'deletions' || resolution === 'both') {\n    for (let i = 0; i < content.deletions; i++) {\n      const line = deletionLines[content.deletionLineIndex + i];\n      if (line == null) {\n        console.error({ deletionLines, content, i });\n        throw new Error('pushResolveLinesToDiff: Deletion line does not exist');\n      }\n      diff.deletionLines.push(line);\n      diff.additionLines.push(line);\n    }\n  }\n  if (resolution === 'additions' || resolution === 'both') {\n    for (let i = 0; i < content.additions; i++) {\n      const line = additionLines[content.additionLineIndex + i];\n      if (line == null) {\n        console.error({ additionLines, content, i });\n        throw new Error('pushResolveLinesToDiff: Addition line does not exist');\n      }\n      diff.deletionLines.push(line);\n      diff.additionLines.push(line);\n    }\n  }\n}\n\nfunction advanceCursor(\n  content: ChangeContent | ContextContent,\n  cursor: CursorState,\n  hunk: Hunk\n) {\n  if (content.type === 'context') {\n    cursor.nextAdditionLineIndex += content.lines;\n    cursor.nextDeletionLineIndex += content.lines;\n    cursor.nextAdditionStart += content.lines;\n    cursor.nextDeletionStart += content.lines;\n    cursor.splitLineCount += content.lines;\n    cursor.unifiedLineCount += content.lines;\n\n    hunk.additionCount += content.lines;\n    hunk.deletionCount += content.lines;\n    hunk.splitLineCount += content.lines;\n    hunk.unifiedLineCount += content.lines;\n  } else {\n    cursor.nextAdditionLineIndex += content.additions;\n    cursor.nextDeletionLineIndex += content.deletions;\n    cursor.nextAdditionStart += content.additions;\n    cursor.nextDeletionStart += content.deletions;\n    cursor.splitLineCount += Math.max(content.deletions, content.additions);\n    cursor.unifiedLineCount += content.deletions + content.additions;\n\n    hunk.deletionCount += content.deletions;\n    hunk.deletionLines += content.deletions;\n    hunk.additionCount += content.additions;\n    hunk.additionLines += content.additions;\n    hunk.splitLineCount += Math.max(content.deletions, content.additions);\n    hunk.unifiedLineCount += content.deletions + content.additions;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"resolveRegion.js","names":["resolvedDiff: FileDiffMetadata","cursor: CursorState","newHunk: Hunk","newContent: ContextContent"],"sources":["../../src/utils/resolveRegion.ts"],"sourcesContent":["import type {\n  ChangeContent,\n  ContextContent,\n  FileDiffMetadata,\n  Hunk,\n} from '../types';\n\ninterface RegionResolutionTarget {\n  hunkIndex: number;\n  startContentIndex: number;\n  endContentIndex: number;\n  resolution: 'deletions' | 'additions' | 'both';\n  indexesToDelete?: Set<number>;\n}\n\ninterface CursorState {\n  nextAdditionLineIndex: number;\n  nextDeletionLineIndex: number;\n  nextAdditionStart: number;\n  nextDeletionStart: number;\n  splitLineCount: number;\n  unifiedLineCount: number;\n}\n\nexport function resolveRegion(\n  diff: FileDiffMetadata,\n  target: RegionResolutionTarget\n): FileDiffMetadata {\n  const {\n    resolution,\n    hunkIndex,\n    startContentIndex,\n    endContentIndex,\n    indexesToDelete = new Set(),\n  } = target;\n  const currentHunk = diff.hunks[hunkIndex];\n  if (currentHunk == null) {\n    console.error({ diff, hunkIndex });\n    throw new Error(`resolveRegion: Invalid hunk index: ${hunkIndex}`);\n  }\n\n  if (\n    startContentIndex < 0 ||\n    endContentIndex >= currentHunk.hunkContent.length ||\n    startContentIndex > endContentIndex\n  ) {\n    throw new Error(\n      `resolveRegion: Invalid content range, ${startContentIndex}, ${endContentIndex}`\n    );\n  }\n\n  const { hunks, additionLines, deletionLines } = diff;\n  const resolvedDiff: FileDiffMetadata = {\n    ...diff,\n    hunks: [],\n    deletionLines: [],\n    additionLines: [],\n    splitLineCount: 0,\n    unifiedLineCount: 0,\n    cacheKey:\n      diff.cacheKey != null\n        ? `${diff.cacheKey}:${resolution[0]}-${hunkIndex}:${startContentIndex}-${endContentIndex}`\n        : undefined,\n  };\n\n  const cursor: CursorState = {\n    nextAdditionLineIndex: 0,\n    nextDeletionLineIndex: 0,\n    nextAdditionStart: 1,\n    nextDeletionStart: 1,\n    splitLineCount: 0,\n    unifiedLineCount: 0,\n  };\n  const updatesEOFState =\n    hunkIndex === hunks.length - 1 &&\n    endContentIndex === currentHunk.hunkContent.length - 1;\n  const shouldProcessCollapsedContext = !diff.isPartial;\n\n  for (const [index, hunk] of hunks.entries()) {\n    processCollapsedContext(\n      diff,\n      resolvedDiff,\n      cursor,\n      hunk.deletionLineIndex - hunk.collapsedBefore,\n      hunk.additionLineIndex - hunk.collapsedBefore,\n      hunk.collapsedBefore,\n      shouldProcessCollapsedContext\n    );\n\n    const newHunk: Hunk = {\n      ...hunk,\n      hunkContent: [],\n      additionStart: cursor.nextAdditionStart,\n      deletionStart: cursor.nextDeletionStart,\n      additionLineIndex: cursor.nextAdditionLineIndex,\n      deletionLineIndex: cursor.nextDeletionLineIndex,\n      additionCount: 0,\n      deletionCount: 0,\n      deletionLines: 0,\n      additionLines: 0,\n      splitLineStart: cursor.splitLineCount,\n      unifiedLineStart: cursor.unifiedLineCount,\n      splitLineCount: 0,\n      unifiedLineCount: 0,\n    };\n\n    for (const [contentIndex, content] of hunk.hunkContent.entries()) {\n      // If we are outside of the targeted hunk or content region\n      if (\n        index !== hunkIndex ||\n        contentIndex < startContentIndex ||\n        contentIndex > endContentIndex\n      ) {\n        pushContentLinesToDiff(\n          content,\n          resolvedDiff,\n          deletionLines,\n          additionLines\n        );\n        const newContent = {\n          ...content,\n          additionLineIndex: cursor.nextAdditionLineIndex,\n          deletionLineIndex: cursor.nextDeletionLineIndex,\n        };\n        newHunk.hunkContent.push(newContent);\n        advanceCursor(newContent, cursor, newHunk);\n      }\n      // If we are at an index to delete, replace with an empty context node\n      else if (indexesToDelete.has(contentIndex)) {\n        newHunk.hunkContent.push({\n          type: 'context',\n          lines: 0,\n          deletionLineIndex: cursor.nextDeletionLineIndex,\n          additionLineIndex: cursor.nextAdditionLineIndex,\n        });\n      }\n      // There's nothing to `resolve` with context nodes, so just push them as\n      // they are\n      else if (content.type === 'context') {\n        pushContentLinesToDiff(\n          content,\n          resolvedDiff,\n          deletionLines,\n          additionLines\n        );\n        const newContent: ContextContent = {\n          ...content,\n          deletionLineIndex: cursor.nextDeletionLineIndex,\n          additionLineIndex: cursor.nextAdditionLineIndex,\n        };\n        newHunk.hunkContent.push(newContent);\n        advanceCursor(newContent, cursor, newHunk);\n      }\n      // Looks like we have a change to resolve and push\n      else {\n        pushResolveLinesToDiff(\n          resolution,\n          content,\n          resolvedDiff,\n          deletionLines,\n          additionLines\n        );\n        const newContent: ContextContent = {\n          type: 'context',\n          lines:\n            resolution === 'deletions'\n              ? content.deletions\n              : resolution === 'additions'\n                ? content.additions\n                : content.deletions + content.additions,\n          deletionLineIndex: cursor.nextDeletionLineIndex,\n          additionLineIndex: cursor.nextAdditionLineIndex,\n        };\n        newHunk.hunkContent.push(newContent);\n        advanceCursor(newContent, cursor, newHunk);\n      }\n    }\n\n    if (index === hunkIndex && updatesEOFState) {\n      const noEOFCR =\n        resolution === 'deletions'\n          ? hunk.noEOFCRDeletions\n          : hunk.noEOFCRAdditions;\n      newHunk.noEOFCRAdditions = noEOFCR;\n      newHunk.noEOFCRDeletions = noEOFCR;\n    }\n\n    resolvedDiff.hunks.push(newHunk);\n  }\n\n  const finalHunk = hunks.at(-1);\n  if (finalHunk != null && !diff.isPartial) {\n    pushCollapsedContextLines(\n      resolvedDiff,\n      deletionLines,\n      additionLines,\n      finalHunk.deletionLineIndex + finalHunk.deletionCount,\n      finalHunk.additionLineIndex + finalHunk.additionCount,\n      Math.min(\n        deletionLines.length -\n          (finalHunk.deletionLineIndex + finalHunk.deletionCount),\n        additionLines.length -\n          (finalHunk.additionLineIndex + finalHunk.additionCount)\n      )\n    );\n  }\n\n  resolvedDiff.splitLineCount = cursor.splitLineCount;\n  resolvedDiff.unifiedLineCount = cursor.unifiedLineCount;\n\n  return resolvedDiff;\n}\n\nfunction pushCollapsedContextLines(\n  diff: FileDiffMetadata,\n  deletionLines: string[],\n  additionLines: string[],\n  deletionLineIndex: number,\n  additionLineIndex: number,\n  lineCount: number\n) {\n  for (let index = 0; index < lineCount; index++) {\n    const deletionLine = deletionLines[deletionLineIndex + index];\n    const additionLine = additionLines[additionLineIndex + index];\n    if (deletionLine == null || additionLine == null) {\n      throw new Error(\n        'pushCollapsedContextLines: missing collapsed context line'\n      );\n    }\n    diff.deletionLines.push(deletionLine);\n    diff.additionLines.push(additionLine);\n  }\n}\n\n// Partial patches track omitted context in `collapsedBefore`, but those lines do\n// not exist in the diff's line arrays. Keep the virtual row counts and file\n// positions in sync without inventing hidden lines.\nfunction processCollapsedContext(\n  sourceDiff: FileDiffMetadata,\n  resolvedDiff: FileDiffMetadata,\n  cursor: CursorState,\n  deletionLineIndex: number,\n  additionLineIndex: number,\n  lineCount: number,\n  shouldProcessContent: boolean\n) {\n  if (lineCount <= 0) {\n    return;\n  }\n\n  if (shouldProcessContent) {\n    pushCollapsedContextLines(\n      resolvedDiff,\n      sourceDiff.deletionLines,\n      sourceDiff.additionLines,\n      deletionLineIndex,\n      additionLineIndex,\n      lineCount\n    );\n    cursor.nextAdditionLineIndex += lineCount;\n    cursor.nextDeletionLineIndex += lineCount;\n  }\n\n  cursor.nextAdditionStart += lineCount;\n  cursor.nextDeletionStart += lineCount;\n  cursor.splitLineCount += lineCount;\n  cursor.unifiedLineCount += lineCount;\n}\n\nfunction pushContentLinesToDiff(\n  content: ContextContent | ChangeContent,\n  diff: FileDiffMetadata,\n  deletionLines: string[],\n  additionLines: string[]\n) {\n  if (content.type === 'context') {\n    for (let i = 0; i < content.lines; i++) {\n      const line = additionLines[content.additionLineIndex + i];\n      if (line == null) {\n        console.error({ additionLines, content, i });\n        throw new Error('pushContentLinesToDiff: Context line does not exist');\n      }\n      diff.deletionLines.push(line);\n      diff.additionLines.push(line);\n    }\n  } else {\n    const len = Math.max(content.deletions, content.additions);\n    for (let i = 0; i < len; i++) {\n      if (i < content.deletions) {\n        const line = deletionLines[content.deletionLineIndex + i];\n        if (line == null) {\n          console.error({ deletionLines, content, i });\n          throw new Error(\n            'pushContentLinesToDiff: Deletion line does not exist'\n          );\n        }\n        diff.deletionLines.push(line);\n      }\n      if (i < content.additions) {\n        const line = additionLines[content.additionLineIndex + i];\n        if (line == null) {\n          console.error({ additionLines, content, i });\n          throw new Error(\n            'pushContentLinesToDiff: Addition line does not exist'\n          );\n        }\n        diff.additionLines.push(line);\n      }\n    }\n  }\n}\n\nfunction pushResolveLinesToDiff(\n  resolution: 'deletions' | 'additions' | 'both',\n  content: ChangeContent,\n  diff: FileDiffMetadata,\n  deletionLines: string[],\n  additionLines: string[]\n) {\n  if (resolution === 'deletions' || resolution === 'both') {\n    for (let i = 0; i < content.deletions; i++) {\n      const line = deletionLines[content.deletionLineIndex + i];\n      if (line == null) {\n        console.error({ deletionLines, content, i });\n        throw new Error('pushResolveLinesToDiff: Deletion line does not exist');\n      }\n      diff.deletionLines.push(line);\n      diff.additionLines.push(line);\n    }\n  }\n  if (resolution === 'additions' || resolution === 'both') {\n    for (let i = 0; i < content.additions; i++) {\n      const line = additionLines[content.additionLineIndex + i];\n      if (line == null) {\n        console.error({ additionLines, content, i });\n        throw new Error('pushResolveLinesToDiff: Addition line does not exist');\n      }\n      diff.deletionLines.push(line);\n      diff.additionLines.push(line);\n    }\n  }\n}\n\nfunction advanceCursor(\n  content: ChangeContent | ContextContent,\n  cursor: CursorState,\n  hunk: Hunk\n) {\n  if (content.type === 'context') {\n    cursor.nextAdditionLineIndex += content.lines;\n    cursor.nextDeletionLineIndex += content.lines;\n    cursor.nextAdditionStart += content.lines;\n    cursor.nextDeletionStart += content.lines;\n    cursor.splitLineCount += content.lines;\n    cursor.unifiedLineCount += content.lines;\n\n    hunk.additionCount += content.lines;\n    hunk.deletionCount += content.lines;\n    hunk.splitLineCount += content.lines;\n    hunk.unifiedLineCount += content.lines;\n  } else {\n    cursor.nextAdditionLineIndex += content.additions;\n    cursor.nextDeletionLineIndex += content.deletions;\n    cursor.nextAdditionStart += content.additions;\n    cursor.nextDeletionStart += content.deletions;\n    cursor.splitLineCount += Math.max(content.deletions, content.additions);\n    cursor.unifiedLineCount += content.deletions + content.additions;\n\n    hunk.deletionCount += content.deletions;\n    hunk.deletionLines += content.deletions;\n    hunk.additionCount += content.additions;\n    hunk.additionLines += content.additions;\n    hunk.splitLineCount += Math.max(content.deletions, content.additions);\n    hunk.unifiedLineCount += content.deletions + content.additions;\n  }\n}\n"],"mappings":"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"}