@pierre/diffs 1.1.2 → 1.1.3

package/dist/components/UnresolvedFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFile.js","names":["options: UnresolvedFileOptions<LAnnotation>","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  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  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../utils/parseMergeConflictDiffFromFile';\nimport { resolveMergeConflict } from '../utils/resolveMergeConflict';\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<\n  LAnnotation,\n> extends FileDiffOptions<LAnnotation> {\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}\n\nexport interface UnresolvedFileRenderProps<LAnnotation> extends Omit<\n  FileDiffRenderProps<LAnnotation>,\n  'oldFile' | 'newFile'\n> {\n  file?: FileContents;\n  actions?: MergeConflictDiffAction[];\n}\n\nexport interface UnresolvedFileHydrationProps<LAnnotation> extends Omit<\n  UnresolvedFileRenderProps<LAnnotation>,\n  'file'\n> {\n  file?: FileContents;\n  fileDiff?: FileDiffMetadata;\n  actions?: MergeConflictDiffAction[];\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;\n}\n\ninterface GetOrComputeDiffResult {\n  fileDiff: FileDiffMetadata;\n  actions: MergeConflictDiffAction[];\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  };\n  private conflictActions: MergeConflictDiffAction[] = [];\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 {\n      ...this.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\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    };\n    this.conflictActions = [];\n    super.cleanUp();\n  }\n\n  private getOrComputeDiff({\n    file,\n    fileDiff,\n    actions,\n  }: GetOrComputeDiffProps): GetOrComputeDiffResult | undefined {\n    wrapper: {\n      // We are dealing with a controlled component\n      if (this.options.onMergeConflictAction != null) {\n        const hasFileDiff = fileDiff != null;\n        const hasActions = actions != null;\n        if (hasFileDiff !== hasActions) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: fileDiff and actions must be passed together'\n          );\n        }\n        // If we were provided a new fileDiff and actions, we are a FULLY\n        // controlled component, which means we will not do any computation\n        if (fileDiff != null && actions != null) {\n          this.computedCache = {\n            file: file ?? this.computedCache.file,\n            fileDiff,\n            actions,\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\n        else if (file != null || this.computedCache.file != null) {\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(file);\n            this.computedCache = {\n              file,\n              fileDiff: computed.fileDiff,\n              actions: computed.actions,\n            };\n          }\n          fileDiff = this.computedCache.fileDiff;\n          actions = this.computedCache.actions;\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          break wrapper;\n        }\n      }\n      // If we are uncontrolled we only rely on the file and only use the first\n      // version, otherwise utilize the cached version\n      else {\n        if (fileDiff != null || actions != null) {\n          throw new Error(\n            'UnresolvedFile.getOrComputeDiff: fileDiff and actions are only usable in controlled mode, you must pass in `onMergeConflictAction`'\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          );\n          this.computedCache.fileDiff = computed.fileDiff;\n          this.computedCache.actions = computed.actions;\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        break wrapper;\n      }\n    }\n    if (fileDiff == null || actions == null) {\n      return undefined;\n    }\n    return { fileDiff, actions };\n  }\n\n  override hydrate(props: UnresolvedFileHydrationProps<LAnnotation>): void {\n    const {\n      file,\n      fileDiff,\n      actions,\n      lineAnnotations,\n      preventEmit = false,\n      ...rest\n    } = props;\n    const source = this.getOrComputeDiff({ file, fileDiff, actions });\n    if (source == null) {\n      return;\n    }\n    this.setActiveMergeConflictActions(source.actions);\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      lineAnnotations,\n      preventEmit = false,\n      ...rest\n    } = props;\n    const source = this.getOrComputeDiff({ file, fileDiff, actions });\n    if (source == null) {\n      return false;\n    }\n    this.setActiveMergeConflictActions(source.actions);\n    const didRender = super.render({\n      ...rest,\n      fileDiff: source.fileDiff,\n      lineAnnotations,\n      preventEmit: true,\n    });\n    this.renderMergeConflictActionSlots();\n    if (didRender && !preventEmit) {\n      this.emitPostRender();\n    }\n    return didRender;\n  }\n\n  public resolveConflict(\n    conflictIndex: number,\n    resolution: MergeConflictResolution,\n    file: FileContents | undefined = this.computedCache.file\n  ): FileContents | undefined {\n    const action = this.conflictActions[conflictIndex];\n    if (file == 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 contents = resolveMergeConflict(file.contents, {\n      resolution,\n      conflict: action.conflict,\n    });\n    if (contents === file.contents) {\n      return undefined;\n    }\n\n    return {\n      ...file,\n      contents,\n      cacheKey:\n        file.cacheKey != null\n          ? `${file.cacheKey}:mc-${conflictIndex}-${resolution}`\n          : undefined,\n    };\n  }\n\n  private resolveConflictAndRender(\n    conflictIndex: number,\n    resolution: MergeConflictResolution\n  ): FileContents | undefined {\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 nextFile = this.resolveConflict(conflictIndex, resolution);\n    if (nextFile == null) {\n      return undefined;\n    }\n\n    this.computedCache.file = nextFile;\n    // Clear out the diff cache to force a new compute next render\n    this.computedCache.fileDiff = undefined;\n    this.computedCache.actions = undefined;\n    this.render();\n    this.options.onMergeConflictResolve?.(nextFile, payload);\n    return nextFile;\n  }\n\n  private setActiveMergeConflictActions(\n    actions: MergeConflictDiffAction[]\n  ): void {\n    this.conflictActions = actions;\n    if (this.hunksRenderer instanceof UnresolvedFileHunksRenderer) {\n      this.hunksRenderer.setConflictActions(\n        this.options.mergeConflictActionsType === 'none' ? [] : actions\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    if (\n      this.isContainerManaged ||\n      this.fileContainer == null ||\n      typeof this.options.mergeConflictActionsType !== 'function' ||\n      this.conflictActions.length === 0\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);\n      if (anchor == null) {\n        continue;\n      }\n      const conflictIndex = action.conflictIndex;\n      const slotName = getMergeConflictActionSlotName({\n        side: anchor.side,\n        lineNumber: anchor.lineNumber,\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"],"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 } 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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"}

package/dist/constants.d.ts

@@ -12,6 +12,10 @@ declare const FILENAME_HEADER_REGEX: RegExp;
 declare const FILENAME_HEADER_REGEX_GIT: RegExp;
 declare const ALTERNATE_FILE_NAMES_GIT: RegExp;
 declare const INDEX_LINE_METADATA: RegExp;
+declare const MERGE_CONFLICT_START_MARKER_REGEX: RegExp;
+declare const MERGE_CONFLICT_BASE_MARKER_REGEX: RegExp;
+declare const MERGE_CONFLICT_SEPARATOR_MARKER_REGEX: RegExp;
+declare const MERGE_CONFLICT_END_MARKER_REGEX: RegExp;
 declare const HEADER_PREFIX_SLOT_ID = "header-prefix";
 declare const HEADER_METADATA_SLOT_ID = "header-metadata";
 declare const DEFAULT_THEMES: ThemesType;
@@ -23,5 +27,5 @@ declare const DEFAULT_EXPANDED_REGION: HunkExpansionRegion;
 declare const DEFAULT_RENDER_RANGE: RenderRange;
 declare const EMPTY_RENDER_RANGE: RenderRange;
 //#endregion
-export { ALTERNATE_FILE_NAMES_GIT, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, SPLIT_WITH_NEWLINES, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE };
+export { ALTERNATE_FILE_NAMES_GIT, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, SPLIT_WITH_NEWLINES, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE };
 //# sourceMappingURL=constants.d.ts.map

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","names":["HunkExpansionRegion","RenderRange","ThemesType","VirtualFileMetrics","DIFFS_TAG_NAME","COMMIT_METADATA_SPLIT","RegExp","GIT_DIFF_FILE_BREAK_REGEX","UNIFIED_DIFF_FILE_BREAK_REGEX","FILE_CONTEXT_BLOB","HUNK_HEADER","SPLIT_WITH_NEWLINES","FILENAME_HEADER_REGEX","FILENAME_HEADER_REGEX_GIT","ALTERNATE_FILE_NAMES_GIT","INDEX_LINE_METADATA","HEADER_PREFIX_SLOT_ID","HEADER_METADATA_SLOT_ID","DEFAULT_THEMES","UNSAFE_CSS_ATTRIBUTE","CORE_CSS_ATTRIBUTE","DEFAULT_COLLAPSED_CONTEXT_THRESHOLD","DEFAULT_VIRTUAL_FILE_METRICS","DEFAULT_EXPANDED_REGION","DEFAULT_RENDER_RANGE","EMPTY_RENDER_RANGE"],"sources":["../src/constants.d.ts"],"sourcesContent":["import type { HunkExpansionRegion, RenderRange, ThemesType, VirtualFileMetrics } from './types';\nexport declare const DIFFS_TAG_NAME: \"diffs-container\";\nexport declare const COMMIT_METADATA_SPLIT: RegExp;\nexport declare const GIT_DIFF_FILE_BREAK_REGEX: RegExp;\nexport declare const UNIFIED_DIFF_FILE_BREAK_REGEX: RegExp;\nexport declare const FILE_CONTEXT_BLOB: RegExp;\nexport declare const HUNK_HEADER: RegExp;\nexport declare const SPLIT_WITH_NEWLINES: RegExp;\nexport declare const FILENAME_HEADER_REGEX: RegExp;\nexport declare const FILENAME_HEADER_REGEX_GIT: RegExp;\nexport declare const ALTERNATE_FILE_NAMES_GIT: RegExp;\nexport declare const INDEX_LINE_METADATA: RegExp;\nexport declare const HEADER_PREFIX_SLOT_ID = \"header-prefix\";\nexport declare const HEADER_METADATA_SLOT_ID = \"header-metadata\";\nexport declare const DEFAULT_THEMES: ThemesType;\nexport declare const UNSAFE_CSS_ATTRIBUTE = \"data-unsafe-css\";\nexport declare const CORE_CSS_ATTRIBUTE = \"data-core-css\";\nexport declare const DEFAULT_COLLAPSED_CONTEXT_THRESHOLD = 1;\nexport declare const DEFAULT_VIRTUAL_FILE_METRICS: VirtualFileMetrics;\nexport declare const DEFAULT_EXPANDED_REGION: HunkExpansionRegion;\nexport declare const DEFAULT_RENDER_RANGE: RenderRange;\nexport declare const EMPTY_RENDER_RANGE: RenderRange;\n//# sourceMappingURL=constants.d.ts.map"],"mappings":";;;cACqBI;cACAC,uBAAuBC;AADvBF,cAEAG,yBAFiC,EAEND,MAFM;AACjCD,cAEAG,6BAF6B,EAEEF,MAFF;AAC7BC,cAEAE,iBAFiC,EAEdH,MAFQA;AAC3BE,cAEAE,WAFAF,EAEaF,MAFwB;AACrCG,cAEAE,mBAFmBL,EAEEA,MAFI;AACzBI,cAEAE,qBAFmB,EAEIN,MAFJ;AACnBK,cAEAE,yBAF2B,EAEAP,MAFA;AAC3BM,cAEAE,wBAFuBR,EAEGA,MAFG;AAC7BO,cAEAE,mBAFiC,EAEZT,MAFMA;AAC3BQ,cAEAE,qBAAAA,GAF0BV,eAAM;AAChCS,cAEAE,uBAAAA,GAF2B,iBAAA;AAC3BD,cAEAE,cAFqB,EAELhB,UAFK;AACrBe,cAEAE,oBAAAA,GAFuB,iBAAA;AACvBD,cAEAE,kBAAAA,GAFgBlB,eAAU;AAC1BiB,cAEAE,mCAAAA,GAFoB,CAAA;AACpBD,cAEAE,4BAFkB,EAEYnB,kBAFZ;AAClBkB,cAEAE,uBAFmC,EAEVvB,mBAFU;AACnCsB,cAEAE,oBAFgD,EAE1BvB,WAFQE;AAC9BoB,cAEAE,kBAF4C,EAExBxB,WAFKD"}
+{"version":3,"file":"constants.d.ts","names":["HunkExpansionRegion","RenderRange","ThemesType","VirtualFileMetrics","DIFFS_TAG_NAME","COMMIT_METADATA_SPLIT","RegExp","GIT_DIFF_FILE_BREAK_REGEX","UNIFIED_DIFF_FILE_BREAK_REGEX","FILE_CONTEXT_BLOB","HUNK_HEADER","SPLIT_WITH_NEWLINES","FILENAME_HEADER_REGEX","FILENAME_HEADER_REGEX_GIT","ALTERNATE_FILE_NAMES_GIT","INDEX_LINE_METADATA","MERGE_CONFLICT_START_MARKER_REGEX","MERGE_CONFLICT_BASE_MARKER_REGEX","MERGE_CONFLICT_SEPARATOR_MARKER_REGEX","MERGE_CONFLICT_END_MARKER_REGEX","HEADER_PREFIX_SLOT_ID","HEADER_METADATA_SLOT_ID","DEFAULT_THEMES","UNSAFE_CSS_ATTRIBUTE","CORE_CSS_ATTRIBUTE","DEFAULT_COLLAPSED_CONTEXT_THRESHOLD","DEFAULT_VIRTUAL_FILE_METRICS","DEFAULT_EXPANDED_REGION","DEFAULT_RENDER_RANGE","EMPTY_RENDER_RANGE"],"sources":["../src/constants.d.ts"],"sourcesContent":["import type { HunkExpansionRegion, RenderRange, ThemesType, VirtualFileMetrics } from './types';\nexport declare const DIFFS_TAG_NAME: \"diffs-container\";\nexport declare const COMMIT_METADATA_SPLIT: RegExp;\nexport declare const GIT_DIFF_FILE_BREAK_REGEX: RegExp;\nexport declare const UNIFIED_DIFF_FILE_BREAK_REGEX: RegExp;\nexport declare const FILE_CONTEXT_BLOB: RegExp;\nexport declare const HUNK_HEADER: RegExp;\nexport declare const SPLIT_WITH_NEWLINES: RegExp;\nexport declare const FILENAME_HEADER_REGEX: RegExp;\nexport declare const FILENAME_HEADER_REGEX_GIT: RegExp;\nexport declare const ALTERNATE_FILE_NAMES_GIT: RegExp;\nexport declare const INDEX_LINE_METADATA: RegExp;\nexport declare const MERGE_CONFLICT_START_MARKER_REGEX: RegExp;\nexport declare const MERGE_CONFLICT_BASE_MARKER_REGEX: RegExp;\nexport declare const MERGE_CONFLICT_SEPARATOR_MARKER_REGEX: RegExp;\nexport declare const MERGE_CONFLICT_END_MARKER_REGEX: RegExp;\nexport declare const HEADER_PREFIX_SLOT_ID = \"header-prefix\";\nexport declare const HEADER_METADATA_SLOT_ID = \"header-metadata\";\nexport declare const DEFAULT_THEMES: ThemesType;\nexport declare const UNSAFE_CSS_ATTRIBUTE = \"data-unsafe-css\";\nexport declare const CORE_CSS_ATTRIBUTE = \"data-core-css\";\nexport declare const DEFAULT_COLLAPSED_CONTEXT_THRESHOLD = 1;\nexport declare const DEFAULT_VIRTUAL_FILE_METRICS: VirtualFileMetrics;\nexport declare const DEFAULT_EXPANDED_REGION: HunkExpansionRegion;\nexport declare const DEFAULT_RENDER_RANGE: RenderRange;\nexport declare const EMPTY_RENDER_RANGE: RenderRange;\n//# sourceMappingURL=constants.d.ts.map"],"mappings":";;;cACqBI;cACAC,uBAAuBC;AADvBF,cAEAG,yBAFiC,EAEND,MAFM;AACjCD,cAEAG,6BAF6B,EAEEF,MAFF;AAC7BC,cAEAE,iBAFiC,EAEdH,MAFQA;AAC3BE,cAEAE,WAFAF,EAEaF,MAFwB;AACrCG,cAEAE,mBAFmBL,EAEEA,MAFI;AACzBI,cAEAE,qBAFmB,EAEIN,MAFJ;AACnBK,cAEAE,yBAF2B,EAEAP,MAFA;AAC3BM,cAEAE,wBAFuBR,EAEGA,MAFG;AAC7BO,cAEAE,mBAFiC,EAEZT,MAFMA;AAC3BQ,cAEAE,iCAFgC,EAEGV,MAFH;AAChCS,cAEAE,gCAF2B,EAEOX,MAFP;AAC3BU,cAEAE,qCAFmCZ,EAEIA,MAFE;AACzCW,cAEAE,+BAFkCb,EAEDA,MAFO;AACxCY,cAEAE,qBAAAA,GAF6C,eAANd;AACvCa,cAEAE,uBAAAA,GAFuC,iBAAA;AACvCD,cAEAE,cAFqB,EAELpB,UAFK;AACrBmB,cAEAE,oBAAAA,GAFuB,iBAAA;AACvBD,cAEAE,kBAAAA,GAFgBtB,eAAU;AAC1BqB,cAEAE,mCAAAA,GAFoB,CAAA;AACpBD,cAEAE,4BAFkB,EAEYvB,kBAFZ;AAClBsB,cAEAE,uBAFmC,EAEV3B,mBAFU;AACnC0B,cAEAE,oBAFgD,EAE1B3B,WAFQE;AAC9BwB,cAEAE,kBAF4C,EAExB5B,WAFKD"}

package/dist/constants.js

@@ -10,6 +10,10 @@ const FILENAME_HEADER_REGEX = /^(---|\+\+\+)\s+([^\t\r\n]+)/;
 const FILENAME_HEADER_REGEX_GIT = /^(---|\+\+\+)\s+[ab]\/([^\t\r\n]+)/;
 const ALTERNATE_FILE_NAMES_GIT = /^diff --git (?:"a\/(.+?)"|a\/(.+?)) (?:"b\/(.+?)"|b\/(.+?))$/;
 const INDEX_LINE_METADATA = /^index ([0-9a-f]+)\.\.([0-9a-f]+)(?: (\d+))?$/i;
+const MERGE_CONFLICT_START_MARKER_REGEX = /^<{7,}(?:\s.*)?$/;
+const MERGE_CONFLICT_BASE_MARKER_REGEX = /^\|{7,}(?:\s.*)?$/;
+const MERGE_CONFLICT_SEPARATOR_MARKER_REGEX = /^={7,}$/;
+const MERGE_CONFLICT_END_MARKER_REGEX = /^>{7,}(?:\s.*)?$/;
 const HEADER_PREFIX_SLOT_ID = "header-prefix";
 const HEADER_METADATA_SLOT_ID = "header-metadata";
 const DEFAULT_THEMES = {
@@ -44,5 +48,5 @@ const EMPTY_RENDER_RANGE = {
 };
 
 //#endregion
-export { ALTERNATE_FILE_NAMES_GIT, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, SPLIT_WITH_NEWLINES, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE };
+export { ALTERNATE_FILE_NAMES_GIT, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, SPLIT_WITH_NEWLINES, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE };
 //# sourceMappingURL=constants.js.map

package/dist/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","names":["COMMIT_METADATA_SPLIT: RegExp","GIT_DIFF_FILE_BREAK_REGEX: RegExp","UNIFIED_DIFF_FILE_BREAK_REGEX: RegExp","FILE_CONTEXT_BLOB: RegExp","HUNK_HEADER: RegExp","SPLIT_WITH_NEWLINES: RegExp","FILENAME_HEADER_REGEX: RegExp","FILENAME_HEADER_REGEX_GIT: RegExp","ALTERNATE_FILE_NAMES_GIT: RegExp","INDEX_LINE_METADATA: RegExp","DEFAULT_THEMES: ThemesType","DEFAULT_VIRTUAL_FILE_METRICS: VirtualFileMetrics","DEFAULT_EXPANDED_REGION: HunkExpansionRegion","DEFAULT_RENDER_RANGE: RenderRange","EMPTY_RENDER_RANGE: RenderRange"],"sources":["../src/constants.ts"],"sourcesContent":["import type {\n  HunkExpansionRegion,\n  RenderRange,\n  ThemesType,\n  VirtualFileMetrics,\n} from './types';\n\nexport const DIFFS_TAG_NAME = 'diffs-container' as const;\n\n// Misc patch/content parsing regexes\nexport const COMMIT_METADATA_SPLIT: RegExp = /(?=^From [a-f0-9]+ .+$)/m;\nexport const GIT_DIFF_FILE_BREAK_REGEX: RegExp = /(?=^diff --git)/gm;\nexport const UNIFIED_DIFF_FILE_BREAK_REGEX: RegExp = /(?=^---\\s+\\S)/gm;\nexport const FILE_CONTEXT_BLOB: RegExp = /(?=^@@ )/gm;\nexport const HUNK_HEADER: RegExp =\n  /^@@ -(\\d+)(?:,(\\d+))? \\+(\\d+)(?:,(\\d+))? @@(?: (.*))?/m;\nexport const SPLIT_WITH_NEWLINES: RegExp = /(?<=\\n)/;\nexport const FILENAME_HEADER_REGEX: RegExp = /^(---|\\+\\+\\+)\\s+([^\\t\\r\\n]+)/;\nexport const FILENAME_HEADER_REGEX_GIT: RegExp =\n  /^(---|\\+\\+\\+)\\s+[ab]\\/([^\\t\\r\\n]+)/;\nexport const ALTERNATE_FILE_NAMES_GIT: RegExp =\n  /^diff --git (?:\"a\\/(.+?)\"|a\\/(.+?)) (?:\"b\\/(.+?)\"|b\\/(.+?))$/;\nexport const INDEX_LINE_METADATA: RegExp =\n  /^index ([0-9a-f]+)\\.\\.([0-9a-f]+)(?: (\\d+))?$/i;\n\nexport const HEADER_PREFIX_SLOT_ID = 'header-prefix';\nexport const HEADER_METADATA_SLOT_ID = 'header-metadata';\n\nexport const DEFAULT_THEMES: ThemesType = {\n  dark: 'pierre-dark',\n  light: 'pierre-light',\n};\n\nexport const UNSAFE_CSS_ATTRIBUTE = 'data-unsafe-css';\nexport const CORE_CSS_ATTRIBUTE = 'data-core-css';\n\nexport const DEFAULT_COLLAPSED_CONTEXT_THRESHOLD = 1;\nexport const DEFAULT_VIRTUAL_FILE_METRICS: VirtualFileMetrics = {\n  hunkLineCount: 50,\n  lineHeight: 20,\n  diffHeaderHeight: 44,\n  hunkSeparatorHeight: 32,\n  fileGap: 8,\n};\n\nexport const DEFAULT_EXPANDED_REGION: HunkExpansionRegion = Object.freeze({\n  fromStart: 0,\n  fromEnd: 0,\n});\n\nexport const DEFAULT_RENDER_RANGE: RenderRange = {\n  startingLine: 0,\n  totalLines: Infinity,\n  bufferBefore: 0,\n  bufferAfter: 0,\n};\n\nexport const EMPTY_RENDER_RANGE: RenderRange = {\n  startingLine: 0,\n  totalLines: 0,\n  bufferBefore: 0,\n  bufferAfter: 0,\n};\n"],"mappings":";AAOA,MAAa,iBAAiB;AAG9B,MAAaA,wBAAgC;AAC7C,MAAaC,4BAAoC;AACjD,MAAaC,gCAAwC;AACrD,MAAaC,oBAA4B;AACzC,MAAaC,cACX;AACF,MAAaC,sBAA8B;AAC3C,MAAaC,wBAAgC;AAC7C,MAAaC,4BACX;AACF,MAAaC,2BACX;AACF,MAAaC,sBACX;AAEF,MAAa,wBAAwB;AACrC,MAAa,0BAA0B;AAEvC,MAAaC,iBAA6B;CACxC,MAAM;CACN,OAAO;CACR;AAED,MAAa,uBAAuB;AACpC,MAAa,qBAAqB;AAElC,MAAa,sCAAsC;AACnD,MAAaC,+BAAmD;CAC9D,eAAe;CACf,YAAY;CACZ,kBAAkB;CAClB,qBAAqB;CACrB,SAAS;CACV;AAED,MAAaC,0BAA+C,OAAO,OAAO;CACxE,WAAW;CACX,SAAS;CACV,CAAC;AAEF,MAAaC,uBAAoC;CAC/C,cAAc;CACd,YAAY;CACZ,cAAc;CACd,aAAa;CACd;AAED,MAAaC,qBAAkC;CAC7C,cAAc;CACd,YAAY;CACZ,cAAc;CACd,aAAa;CACd"}
+{"version":3,"file":"constants.js","names":["COMMIT_METADATA_SPLIT: RegExp","GIT_DIFF_FILE_BREAK_REGEX: RegExp","UNIFIED_DIFF_FILE_BREAK_REGEX: RegExp","FILE_CONTEXT_BLOB: RegExp","HUNK_HEADER: RegExp","SPLIT_WITH_NEWLINES: RegExp","FILENAME_HEADER_REGEX: RegExp","FILENAME_HEADER_REGEX_GIT: RegExp","ALTERNATE_FILE_NAMES_GIT: RegExp","INDEX_LINE_METADATA: RegExp","MERGE_CONFLICT_START_MARKER_REGEX: RegExp","MERGE_CONFLICT_BASE_MARKER_REGEX: RegExp","MERGE_CONFLICT_SEPARATOR_MARKER_REGEX: RegExp","MERGE_CONFLICT_END_MARKER_REGEX: RegExp","DEFAULT_THEMES: ThemesType","DEFAULT_VIRTUAL_FILE_METRICS: VirtualFileMetrics","DEFAULT_EXPANDED_REGION: HunkExpansionRegion","DEFAULT_RENDER_RANGE: RenderRange","EMPTY_RENDER_RANGE: RenderRange"],"sources":["../src/constants.ts"],"sourcesContent":["import type {\n  HunkExpansionRegion,\n  RenderRange,\n  ThemesType,\n  VirtualFileMetrics,\n} from './types';\n\nexport const DIFFS_TAG_NAME = 'diffs-container' as const;\n\n// Misc patch/content parsing regexes\nexport const COMMIT_METADATA_SPLIT: RegExp = /(?=^From [a-f0-9]+ .+$)/m;\nexport const GIT_DIFF_FILE_BREAK_REGEX: RegExp = /(?=^diff --git)/gm;\nexport const UNIFIED_DIFF_FILE_BREAK_REGEX: RegExp = /(?=^---\\s+\\S)/gm;\nexport const FILE_CONTEXT_BLOB: RegExp = /(?=^@@ )/gm;\nexport const HUNK_HEADER: RegExp =\n  /^@@ -(\\d+)(?:,(\\d+))? \\+(\\d+)(?:,(\\d+))? @@(?: (.*))?/m;\nexport const SPLIT_WITH_NEWLINES: RegExp = /(?<=\\n)/;\nexport const FILENAME_HEADER_REGEX: RegExp = /^(---|\\+\\+\\+)\\s+([^\\t\\r\\n]+)/;\nexport const FILENAME_HEADER_REGEX_GIT: RegExp =\n  /^(---|\\+\\+\\+)\\s+[ab]\\/([^\\t\\r\\n]+)/;\nexport const ALTERNATE_FILE_NAMES_GIT: RegExp =\n  /^diff --git (?:\"a\\/(.+?)\"|a\\/(.+?)) (?:\"b\\/(.+?)\"|b\\/(.+?))$/;\nexport const INDEX_LINE_METADATA: RegExp =\n  /^index ([0-9a-f]+)\\.\\.([0-9a-f]+)(?: (\\d+))?$/i;\n\nexport const MERGE_CONFLICT_START_MARKER_REGEX: RegExp = /^<{7,}(?:\\s.*)?$/;\nexport const MERGE_CONFLICT_BASE_MARKER_REGEX: RegExp = /^\\|{7,}(?:\\s.*)?$/;\nexport const MERGE_CONFLICT_SEPARATOR_MARKER_REGEX: RegExp = /^={7,}$/;\nexport const MERGE_CONFLICT_END_MARKER_REGEX: RegExp = /^>{7,}(?:\\s.*)?$/;\n\nexport const HEADER_PREFIX_SLOT_ID = 'header-prefix';\nexport const HEADER_METADATA_SLOT_ID = 'header-metadata';\n\nexport const DEFAULT_THEMES: ThemesType = {\n  dark: 'pierre-dark',\n  light: 'pierre-light',\n};\n\nexport const UNSAFE_CSS_ATTRIBUTE = 'data-unsafe-css';\nexport const CORE_CSS_ATTRIBUTE = 'data-core-css';\n\nexport const DEFAULT_COLLAPSED_CONTEXT_THRESHOLD = 1;\nexport const DEFAULT_VIRTUAL_FILE_METRICS: VirtualFileMetrics = {\n  hunkLineCount: 50,\n  lineHeight: 20,\n  diffHeaderHeight: 44,\n  hunkSeparatorHeight: 32,\n  fileGap: 8,\n};\n\nexport const DEFAULT_EXPANDED_REGION: HunkExpansionRegion = Object.freeze({\n  fromStart: 0,\n  fromEnd: 0,\n});\n\nexport const DEFAULT_RENDER_RANGE: RenderRange = {\n  startingLine: 0,\n  totalLines: Infinity,\n  bufferBefore: 0,\n  bufferAfter: 0,\n};\n\nexport const EMPTY_RENDER_RANGE: RenderRange = {\n  startingLine: 0,\n  totalLines: 0,\n  bufferBefore: 0,\n  bufferAfter: 0,\n};\n"],"mappings":";AAOA,MAAa,iBAAiB;AAG9B,MAAaA,wBAAgC;AAC7C,MAAaC,4BAAoC;AACjD,MAAaC,gCAAwC;AACrD,MAAaC,oBAA4B;AACzC,MAAaC,cACX;AACF,MAAaC,sBAA8B;AAC3C,MAAaC,wBAAgC;AAC7C,MAAaC,4BACX;AACF,MAAaC,2BACX;AACF,MAAaC,sBACX;AAEF,MAAaC,oCAA4C;AACzD,MAAaC,mCAA2C;AACxD,MAAaC,wCAAgD;AAC7D,MAAaC,kCAA0C;AAEvD,MAAa,wBAAwB;AACrC,MAAa,0BAA0B;AAEvC,MAAaC,iBAA6B;CACxC,MAAM;CACN,OAAO;CACR;AAED,MAAa,uBAAuB;AACpC,MAAa,qBAAqB;AAElC,MAAa,sCAAsC;AACnD,MAAaC,+BAAmD;CAC9D,eAAe;CACf,YAAY;CACZ,kBAAkB;CAClB,qBAAqB;CACrB,SAAS;CACV;AAED,MAAaC,0BAA+C,OAAO,OAAO;CACxE,WAAW;CACX,SAAS;CACV,CAAC;AAEF,MAAaC,uBAAoC;CAC/C,cAAc;CACd,YAAY;CACZ,cAAc;CACd,aAAa;CACd;AAED,MAAaC,qBAAkC;CAC7C,cAAc;CACd,YAAY;CACZ,cAAc;CACd,aAAa;CACd"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AnnotationLineMap, AnnotationSide, AnnotationSpan, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, ContextContent, CustomPreProperties, DecorationItem, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffMetadata, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MergeConflictActionPayload, MergeConflictRegion, MergeConflictResolution, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PrePropertiesConfig, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderMetadataProps, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, VirtualFileMetrics, VirtualWindowSpecs } from "./types.js";
+import { AnnotationLineMap, AnnotationSide, AnnotationSpan, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, ConflictResolverTypes, ContextContent, CustomPreProperties, DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffMetadata, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PrePropertiesConfig, ProcessFileConflictData, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderMetadataProps, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, VirtualFileMetrics, VirtualWindowSpecs } from "./types.js";
 import { GetHoveredLineResult, GetLineIndexUtility, InteractionManager, InteractionManagerBaseOptions, InteractionManagerMode, InteractionManagerOptions, LogTypes, MergeConflictActionTarget, OnDiffLineClickProps, OnDiffLineEnterLeaveProps, OnLineClickProps, OnLineEnterLeaveProps, SelectedLineRange, pluckInteractionOptions } from "./managers/InteractionManager.js";
 import { ResizeManager } from "./managers/ResizeManager.js";
 import { FileRenderResult, FileRenderer, FileRendererOptions } from "./renderers/FileRenderer.js";
@@ -7,12 +7,12 @@ import { CodeToTokenTransformStreamOptions, RecallToken, ShikiStreamTokenizerEnq
 import { ShikiStreamTokenizer } from "./shiki-stream/tokenizer.js";
 import { CodeToTokenTransformStream } from "./shiki-stream/stream.js";
 import { FileStream, FileStreamOptions } from "./components/FileStream.js";
-import { DiffHunksRenderer, HunksRenderResult, InlineRow, LineDecoration, RenderedLineContext, SplitInlineRow, SplitLineDecorationProps, UnifiedLineDecorationProps } from "./renderers/DiffHunksRenderer.js";
-import { MergeConflictActionsTypeOption, RenderMergeConflictActions, UnresolvedFile, UnresolvedFileHydrationProps, UnresolvedFileOptions, UnresolvedFileRenderProps } from "./components/UnresolvedFile.js";
+import { DiffHunksRenderer, HunksRenderResult, InjectedRow, LineDecoration, RenderedLineContext, SplitInjectedRow, SplitInjectedRowPlacement, SplitLineDecorationProps, UnifiedInjectedRowPlacement, UnifiedLineDecorationProps } from "./renderers/DiffHunksRenderer.js";
+import { MergeConflictActionsTypeOption, RenderMergeConflictActions, UnresolvedFile, UnresolvedFileHydrationProps, UnresolvedFileOptions, UnresolvedFileRenderProps, getUnresolvedDiffHunksRendererOptions } from "./components/UnresolvedFile.js";
 import { Virtualizer, VirtualizerConfig } from "./components/Virtualizer.js";
 import { VirtualizedFile } from "./components/VirtualizedFile.js";
 import { VirtualizedFileDiff } from "./components/VirtualizedFileDiff.js";
-import { ALTERNATE_FILE_NAMES_GIT, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, SPLIT_WITH_NEWLINES, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE } from "./constants.js";
+import { ALTERNATE_FILE_NAMES_GIT, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, SPLIT_WITH_NEWLINES, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE } from "./constants.js";
 import { areLanguagesAttached } from "./highlighter/languages/areLanguagesAttached.js";
 import { attachResolvedLanguages } from "./highlighter/languages/attachResolvedLanguages.js";
 import { cleanUpResolvedLanguages } from "./highlighter/languages/cleanUpResolvedLanguages.js";
@@ -92,10 +92,11 @@ import { prerenderHTMLIfNecessary } from "./utils/prerenderHTMLIfNecessary.js";
 import { processLine } from "./utils/processLine.js";
 import { renderDiffWithHighlighter } from "./utils/renderDiffWithHighlighter.js";
 import { renderFileWithHighlighter } from "./utils/renderFileWithHighlighter.js";
-import { resolveMergeConflict } from "./utils/resolveMergeConflict.js";
+import { resolveConflict } from "./utils/resolveConflict.js";
+import { resolveRegion } from "./utils/resolveRegion.js";
 import { setLanguageOverride } from "./utils/setLanguageOverride.js";
 import { setPreNodeProperties } from "./utils/setWrapperNodeProps.js";
 import { trimPatchContext } from "./utils/trimPatchContext.js";
 import { FileDiff, FileDiffHydrationProps, FileDiffOptions, FileDiffRenderProps } from "./components/FileDiff.js";
 import { codeToHtml, createCssVariablesTheme as createCSSVariablesTheme } from "shiki";
-export { ALTERNATE_FILE_NAMES_GIT, AnnotationLineMap, AnnotationSide, AnnotationSpan, AttachedLanguages, AttachedThemes, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_EXTENSION_TO_FILE_FORMAT, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, CodeToTokenTransformStream, CodeToTokenTransformStreamOptions, ContextContent, CreateFileHeaderElementProps, CustomPreProperties, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_TAG_NAME, DecorationItem, DiffHunksRenderer, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, EMPTY_RENDER_RANGE, EXTENSION_TO_FILE_FORMAT, ExpansionDirections, ExtensionFormatMap, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, File, FileContents, FileDiff, FileDiffHydrationProps, FileDiffMetadata, FileDiffOptions, FileDiffRenderProps, FileHydrateProps, FileOptions, FileRenderProps, FileRenderResult, FileRenderer, FileRendererOptions, FileStream, FileStreamOptions, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GIT_DIFF_FILE_BREAK_REGEX, GapSpan, GetHoveredLineResult, GetLineIndexUtility, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, HunksRenderResult, INDEX_LINE_METADATA, InlineRow, InteractionManager, InteractionManagerBaseOptions, InteractionManagerMode, InteractionManagerOptions, LanguageRegistration, LineAnnotation, LineDecoration, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, LogTypes, MergeConflictActionPayload, MergeConflictActionTarget, MergeConflictActionsTypeOption, MergeConflictRegion, MergeConflictResolution, ObservedAnnotationNodes, ObservedGridNodes, OnDiffLineClickProps, OnDiffLineEnterLeaveProps, OnLineClickProps, OnLineEnterLeaveProps, ParsedLine, ParsedPatch, PrePropertiesConfig, RecallToken, RegisteredCustomLanguages, RegisteredCustomThemes, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderMetadataProps, RenderHeaderPrefixCallback, RenderMergeConflictActions, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, RenderedLineContext, ResizeManager, ResolvedLanguages, ResolvedThemes, ResolvingLanguages, ResolvingThemes, SPLIT_WITH_NEWLINES, SVGSpriteNames, SVGSpriteSheet, ScrollSyncManager, SelectedLineRange, SelectionPoint, SelectionSide, SharedRenderState, ShikiStreamTokenizer, ShikiStreamTokenizerEnqueueResult, ShikiStreamTokenizerOptions, ShikiTransformer, SplitInlineRow, SplitLineDecorationProps, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnifiedLineDecorationProps, UnresolvedFile, UnresolvedFileHydrationProps, UnresolvedFileOptions, UnresolvedFileRenderProps, VirtualFileMetrics, VirtualWindowSpecs, VirtualizedFile, VirtualizedFileDiff, Virtualizer, VirtualizerConfig, areDiffLineAnnotationsEqual, areFilesEqual, areHunkDataEqual, areLanguagesAttached, areLineAnnotationsEqual, areObjectsEqual, areOptionsEqual, arePrePropertiesEqual, areRenderRangesEqual, areSelectionsEqual, areThemesAttached, areThemesEqual, areVirtualWindowSpecsEqual, areWorkerStatsEqual, attachResolvedLanguages, attachResolvedThemes, cleanLastNewline, cleanUpResolvedLanguages, cleanUpResolvedThemes, codeToHtml, createAnnotationElement, createAnnotationWrapperNode, createCSSVariablesTheme, createDiffSpanDecoration, createEmptyRowBuffer, createFileHeaderElement, createGutterGap, createGutterItem, createGutterUtilityContentNode, createGutterUtilityElement, createGutterWrapper, createHastElement, createIconElement, createNoNewlineElement, createPreElement, createPreWrapperProperties, createRowNodes, createSeparator, createSpanFromToken, createStyleElement, createTextNodeElement, createTransformerWithState, createUnsafeCSSStyleNode, createWindowFromScrollPosition, diffAcceptRejectHunk, disposeHighlighter, extendFileFormatMap, findCodeElement, formatCSSVariablePrefix, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, hasResolvedLanguages, hasResolvedThemes, isDefaultRenderRange, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, pluckInteractionOptions, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, renderDiffWithHighlighter, renderFileWithHighlighter, resolveLanguage, resolveLanguages, resolveMergeConflict, resolveTheme, resolveThemes, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapUnsafeCSS };
+export { ALTERNATE_FILE_NAMES_GIT, AnnotationLineMap, AnnotationSide, AnnotationSpan, AttachedLanguages, AttachedThemes, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_EXTENSION_TO_FILE_FORMAT, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, CodeToTokenTransformStream, CodeToTokenTransformStreamOptions, ConflictResolverTypes, ContextContent, CreateFileHeaderElementProps, CustomPreProperties, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_TAG_NAME, DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffHunksRenderer, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, EMPTY_RENDER_RANGE, EXTENSION_TO_FILE_FORMAT, ExpansionDirections, ExtensionFormatMap, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, File, FileContents, FileDiff, FileDiffHydrationProps, FileDiffMetadata, FileDiffOptions, FileDiffRenderProps, FileHydrateProps, FileOptions, FileRenderProps, FileRenderResult, FileRenderer, FileRendererOptions, FileStream, FileStreamOptions, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GIT_DIFF_FILE_BREAK_REGEX, GapSpan, GetHoveredLineResult, GetLineIndexUtility, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, HunksRenderResult, INDEX_LINE_METADATA, InjectedRow, InteractionManager, InteractionManagerBaseOptions, InteractionManagerMode, InteractionManagerOptions, LanguageRegistration, LineAnnotation, LineDecoration, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, LogTypes, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, MergeConflictActionPayload, MergeConflictActionTarget, MergeConflictActionsTypeOption, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, ObservedAnnotationNodes, ObservedGridNodes, OnDiffLineClickProps, OnDiffLineEnterLeaveProps, OnLineClickProps, OnLineEnterLeaveProps, ParsedLine, ParsedPatch, PrePropertiesConfig, ProcessFileConflictData, RecallToken, RegisteredCustomLanguages, RegisteredCustomThemes, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderMetadataProps, RenderHeaderPrefixCallback, RenderMergeConflictActions, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, RenderedLineContext, ResizeManager, ResolvedLanguages, ResolvedThemes, ResolvingLanguages, ResolvingThemes, SPLIT_WITH_NEWLINES, SVGSpriteNames, SVGSpriteSheet, ScrollSyncManager, SelectedLineRange, SelectionPoint, SelectionSide, SharedRenderState, ShikiStreamTokenizer, ShikiStreamTokenizerEnqueueResult, ShikiStreamTokenizerOptions, ShikiTransformer, SplitInjectedRow, SplitInjectedRowPlacement, SplitLineDecorationProps, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnifiedInjectedRowPlacement, UnifiedLineDecorationProps, UnresolvedFile, UnresolvedFileHydrationProps, UnresolvedFileOptions, UnresolvedFileRenderProps, VirtualFileMetrics, VirtualWindowSpecs, VirtualizedFile, VirtualizedFileDiff, Virtualizer, VirtualizerConfig, areDiffLineAnnotationsEqual, areFilesEqual, areHunkDataEqual, areLanguagesAttached, areLineAnnotationsEqual, areObjectsEqual, areOptionsEqual, arePrePropertiesEqual, areRenderRangesEqual, areSelectionsEqual, areThemesAttached, areThemesEqual, areVirtualWindowSpecsEqual, areWorkerStatsEqual, attachResolvedLanguages, attachResolvedThemes, cleanLastNewline, cleanUpResolvedLanguages, cleanUpResolvedThemes, codeToHtml, createAnnotationElement, createAnnotationWrapperNode, createCSSVariablesTheme, createDiffSpanDecoration, createEmptyRowBuffer, createFileHeaderElement, createGutterGap, createGutterItem, createGutterUtilityContentNode, createGutterUtilityElement, createGutterWrapper, createHastElement, createIconElement, createNoNewlineElement, createPreElement, createPreWrapperProperties, createRowNodes, createSeparator, createSpanFromToken, createStyleElement, createTextNodeElement, createTransformerWithState, createUnsafeCSSStyleNode, createWindowFromScrollPosition, diffAcceptRejectHunk, disposeHighlighter, extendFileFormatMap, findCodeElement, formatCSSVariablePrefix, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, getUnresolvedDiffHunksRendererOptions, hasResolvedLanguages, hasResolvedThemes, isDefaultRenderRange, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, pluckInteractionOptions, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, renderDiffWithHighlighter, renderFileWithHighlighter, resolveConflict, resolveLanguage, resolveLanguages, resolveRegion, resolveTheme, resolveThemes, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapUnsafeCSS };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { ALTERNATE_FILE_NAMES_GIT, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, SPLIT_WITH_NEWLINES, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE } from "./constants.js";
+import { ALTERNATE_FILE_NAMES_GIT, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, SPLIT_WITH_NEWLINES, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE } from "./constants.js";
 import { areSelectionsEqual } from "./utils/areSelectionsEqual.js";
 import { createGutterGap, createGutterItem, createGutterWrapper, createHastElement, createIconElement, createTextNodeElement, findCodeElement } from "./utils/hast_utils.js";
 import { createGutterUtilityElement } from "./utils/createGutterUtilityElement.js";
@@ -71,8 +71,9 @@ import { ShikiStreamTokenizer } from "./shiki-stream/tokenizer.js";
 import { CodeToTokenTransformStream } from "./shiki-stream/stream.js";
 import { createSpanFromToken } from "./utils/createSpanNodeFromToken.js";
 import { FileStream } from "./components/FileStream.js";
-import { resolveMergeConflict } from "./utils/resolveMergeConflict.js";
-import { UnresolvedFile } from "./components/UnresolvedFile.js";
+import { resolveRegion } from "./utils/resolveRegion.js";
+import { resolveConflict } from "./utils/resolveConflict.js";
+import { UnresolvedFile, getUnresolvedDiffHunksRendererOptions } from "./components/UnresolvedFile.js";
 import { VirtualizedFile } from "./components/VirtualizedFile.js";
 import { VirtualizedFileDiff } from "./components/VirtualizedFileDiff.js";
 import { areVirtualWindowSpecsEqual } from "./utils/areVirtualWindowSpecsEqual.js";
@@ -97,4 +98,4 @@ import { setLanguageOverride } from "./utils/setLanguageOverride.js";
 import { trimPatchContext } from "./utils/trimPatchContext.js";
 import { codeToHtml, createCssVariablesTheme as createCSSVariablesTheme } from "shiki";
 
-export { ALTERNATE_FILE_NAMES_GIT, AttachedLanguages, AttachedThemes, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_EXTENSION_TO_FILE_FORMAT, CodeToTokenTransformStream, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_TAG_NAME, DiffHunksRenderer, EMPTY_RENDER_RANGE, EXTENSION_TO_FILE_FORMAT, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, File, FileDiff, FileRenderer, FileStream, GIT_DIFF_FILE_BREAK_REGEX, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, InteractionManager, RegisteredCustomLanguages, RegisteredCustomThemes, ResizeManager, ResolvedLanguages, ResolvedThemes, ResolvingLanguages, ResolvingThemes, SPLIT_WITH_NEWLINES, SVGSpriteSheet, ScrollSyncManager, ShikiStreamTokenizer, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnresolvedFile, VirtualizedFile, VirtualizedFileDiff, Virtualizer, areDiffLineAnnotationsEqual, areFilesEqual, areHunkDataEqual, areLanguagesAttached, areLineAnnotationsEqual, areObjectsEqual, areOptionsEqual, arePrePropertiesEqual, areRenderRangesEqual, areSelectionsEqual, areThemesAttached, areThemesEqual, areVirtualWindowSpecsEqual, areWorkerStatsEqual, attachResolvedLanguages, attachResolvedThemes, cleanLastNewline, cleanUpResolvedLanguages, cleanUpResolvedThemes, codeToHtml, createAnnotationElement, createAnnotationWrapperNode, createCSSVariablesTheme, createDiffSpanDecoration, createEmptyRowBuffer, createFileHeaderElement, createGutterGap, createGutterItem, createGutterUtilityContentNode, createGutterUtilityElement, createGutterWrapper, createHastElement, createIconElement, createNoNewlineElement, createPreElement, createPreWrapperProperties, createRowNodes, createSeparator, createSpanFromToken, createStyleElement, createTextNodeElement, createTransformerWithState, createUnsafeCSSStyleNode, createWindowFromScrollPosition, diffAcceptRejectHunk, disposeHighlighter, extendFileFormatMap, findCodeElement, formatCSSVariablePrefix, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, hasResolvedLanguages, hasResolvedThemes, isDefaultRenderRange, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, pluckInteractionOptions, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, renderDiffWithHighlighter, renderFileWithHighlighter, resolveLanguage, resolveLanguages, resolveMergeConflict, resolveTheme, resolveThemes, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapUnsafeCSS };
+export { ALTERNATE_FILE_NAMES_GIT, AttachedLanguages, AttachedThemes, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_EXTENSION_TO_FILE_FORMAT, CodeToTokenTransformStream, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_THEMES, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_TAG_NAME, DiffHunksRenderer, EMPTY_RENDER_RANGE, EXTENSION_TO_FILE_FORMAT, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, File, FileDiff, FileRenderer, FileStream, GIT_DIFF_FILE_BREAK_REGEX, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, InteractionManager, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, RegisteredCustomLanguages, RegisteredCustomThemes, ResizeManager, ResolvedLanguages, ResolvedThemes, ResolvingLanguages, ResolvingThemes, SPLIT_WITH_NEWLINES, SVGSpriteSheet, ScrollSyncManager, ShikiStreamTokenizer, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnresolvedFile, VirtualizedFile, VirtualizedFileDiff, Virtualizer, areDiffLineAnnotationsEqual, areFilesEqual, areHunkDataEqual, areLanguagesAttached, areLineAnnotationsEqual, areObjectsEqual, areOptionsEqual, arePrePropertiesEqual, areRenderRangesEqual, areSelectionsEqual, areThemesAttached, areThemesEqual, areVirtualWindowSpecsEqual, areWorkerStatsEqual, attachResolvedLanguages, attachResolvedThemes, cleanLastNewline, cleanUpResolvedLanguages, cleanUpResolvedThemes, codeToHtml, createAnnotationElement, createAnnotationWrapperNode, createCSSVariablesTheme, createDiffSpanDecoration, createEmptyRowBuffer, createFileHeaderElement, createGutterGap, createGutterItem, createGutterUtilityContentNode, createGutterUtilityElement, createGutterWrapper, createHastElement, createIconElement, createNoNewlineElement, createPreElement, createPreWrapperProperties, createRowNodes, createSeparator, createSpanFromToken, createStyleElement, createTextNodeElement, createTransformerWithState, createUnsafeCSSStyleNode, createWindowFromScrollPosition, diffAcceptRejectHunk, disposeHighlighter, extendFileFormatMap, findCodeElement, formatCSSVariablePrefix, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, getUnresolvedDiffHunksRendererOptions, hasResolvedLanguages, hasResolvedThemes, isDefaultRenderRange, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, pluckInteractionOptions, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, renderDiffWithHighlighter, renderFileWithHighlighter, resolveConflict, resolveLanguage, resolveLanguages, resolveRegion, resolveTheme, resolveThemes, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapUnsafeCSS };

package/dist/react/UnresolvedFile.d.ts

@@ -1,4 +1,4 @@
-import { FileContents, MergeConflictResolution } from "../types.js";
+import { FileContents, HunkSeparators, MergeConflictResolution } from "../types.js";
 import { MergeConflictDiffAction } from "../utils/parseMergeConflictDiffFromFile.js";
 import { UnresolvedFileHunksRendererOptions } from "../renderers/UnresolvedFileHunksRenderer.js";
 import { UnresolvedFile as UnresolvedFile$1 } from "../components/UnresolvedFile.js";
@@ -13,7 +13,9 @@ interface RenderMergeConflictActionContext {
 type RenderMergeConflictActions = (action: MergeConflictDiffAction, context: RenderMergeConflictActionContext) => ReactNode;
 type MergeConflictActionsTypeOption = 'none' | 'default' | RenderMergeConflictActions;
 interface UnresolvedFileReactOptions<LAnnotation> extends Omit<FileDiffOptions<LAnnotation>, 'hunkSeparators' | 'diffStyle' | 'onMergeConflictAction' | 'onPostRender'>, UnresolvedFileHunksRendererOptions {
+  hunkSeparators?: HunkSeparators;
   onPostRender?(node: HTMLElement, instance: UnresolvedFile$1<LAnnotation>): unknown;
+  maxContextLines?: number;
 }
 interface UnresolvedFileProps<LAnnotation> extends Omit<FileDiffProps<LAnnotation>, 'fileDiff' | 'options'> {
   file: FileContents;

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

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFile.d.ts","names":["ReactNode","FileDiffOptions","UnresolvedFile","UnresolvedFileClass","UnresolvedFileHunksRendererOptions","FileContents","MergeConflictResolution","MergeConflictDiffAction","FileDiffProps","RenderMergeConflictActionContext","RenderMergeConflictActions","MergeConflictActionsTypeOption","UnresolvedFileReactOptions","LAnnotation","HTMLElement","Omit","UnresolvedFileProps","file","options","lineAnnotations","selectedLines","className","style","prerenderedHTML","renderAnnotation","renderHeaderPrefix","renderHeaderMetadata","renderGutterUtility","renderHoverUtility","renderMergeConflictUtility","React","JSX","Element"],"sources":["../../src/react/UnresolvedFile.d.ts"],"sourcesContent":["import type { ReactNode } from 'react';\nimport type { FileDiffOptions } from '../components/FileDiff';\nimport type { UnresolvedFile as UnresolvedFileClass } from '../components/UnresolvedFile';\nimport type { UnresolvedFileHunksRendererOptions } from '../renderers/UnresolvedFileHunksRenderer';\nimport type { FileContents, MergeConflictResolution } from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { FileDiffProps } from './FileDiff';\nexport interface RenderMergeConflictActionContext {\n    resolveConflict(resolution: MergeConflictResolution): void;\n}\nexport type RenderMergeConflictActions = (action: MergeConflictDiffAction, context: RenderMergeConflictActionContext) => ReactNode;\nexport type MergeConflictActionsTypeOption = 'none' | 'default' | RenderMergeConflictActions;\nexport interface UnresolvedFileReactOptions<LAnnotation> extends Omit<FileDiffOptions<LAnnotation>, 'hunkSeparators' | 'diffStyle' | 'onMergeConflictAction' | 'onPostRender'>, UnresolvedFileHunksRendererOptions {\n    onPostRender?(node: HTMLElement, instance: UnresolvedFileClass<LAnnotation>): unknown;\n}\nexport interface UnresolvedFileProps<LAnnotation> extends Omit<FileDiffProps<LAnnotation>, 'fileDiff' | 'options'> {\n    file: FileContents;\n    options?: UnresolvedFileReactOptions<LAnnotation>;\n    renderMergeConflictUtility?(action: MergeConflictDiffAction, getInstance: () => UnresolvedFileClass<LAnnotation> | undefined): ReactNode;\n}\nexport declare function UnresolvedFile<LAnnotation = undefined>({ file, options, lineAnnotations, selectedLines, className, style, prerenderedHTML, renderAnnotation, renderHeaderPrefix, renderHeaderMetadata, renderGutterUtility, renderHoverUtility, renderMergeConflictUtility }: UnresolvedFileProps<LAnnotation>): React.JSX.Element;\n//# sourceMappingURL=UnresolvedFile.d.ts.map"],"mappings":";;;;;;;;;UAOiBS,gCAAAA;8BACeH;AADhC;AAGYI,KAAAA,0BAAAA,GAA0B,CAAA,MAAA,EAAYH,uBAAZ,EAAA,OAAA,EAA8CE,gCAA9C,EAAA,GAAmFT,SAAnF;AAAYO,KACtCI,8BAAAA,GADsCJ,MAAAA,GAAAA,SAAAA,GACgBG,0BADhBH;AAAkCE,UAEnEG,0BAFmEH,CAAAA,WAAAA,CAAAA,SAEnBM,IAFmBN,CAEdR,eAFcQ,CAEEI,WAFFJ,CAAAA,EAAAA,gBAAAA,GAAAA,WAAAA,GAAAA,uBAAAA,GAAAA,cAAAA,CAAAA,EAE4FL,kCAF5FK,CAAAA;EAAqCT,YAAAA,EAAAA,IAAAA,EAGjGc,WAHiGd,EAAAA,QAAAA,EAG1EG,gBAH0EH,CAGtDa,WAHsDb,CAAAA,CAAAA,EAAAA,OAAAA;;AAC7GW,UAIKK,mBAJLL,CAA8B,WAAA,CAAA,SAIgBI,IAJQL,CAIHF,aAJGE,CAIWG,WAJe,CAAA,EAAA,UAAA,GAAA,SAAA,CAAA,CAAA;EAC3ED,IAAAA,EAIPP,YAJOO;EAAqEC,OAAAA,CAAAA,EAKxED,0BALwEC,CAK7CA,WAL6CA,CAAAA;EAAhBZ,0BAAAA,EAAAA,MAAAA,EAM9BM,uBAN8BN,EAAAA,WAAAA,EAAAA,GAAAA,GAMcE,gBANdF,CAMkCY,WANlCZ,CAAAA,GAAAA,SAAAA,CAAAA,EAM6DD,SAN7DC;;AACHY,iBAO3CX,cAP2CW,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAAAA,IAAAA;EAAAA,OAAAA;EAAAA,eAAAA;EAAAA,aAAAA;EAAAA,SAAAA;EAAAA,KAAAA;EAAAA,eAAAA;EAAAA,gBAAAA;EAAAA,kBAAAA;EAAAA,oBAAAA;EAAAA,mBAAAA;EAAAA,kBAAAA;EAAAA;AAAAA,CAAAA,EAOoNG,mBAPpNH,CAOwOA,WAPxOA,CAAAA,CAAAA,EAOuPiB,KAAAA,CAAMC,GAAAA,CAAIC,OAPjQnB"}
+{"version":3,"file":"UnresolvedFile.d.ts","names":["ReactNode","FileDiffOptions","UnresolvedFile","UnresolvedFileClass","UnresolvedFileHunksRendererOptions","FileContents","HunkSeparators","MergeConflictResolution","MergeConflictDiffAction","FileDiffProps","RenderMergeConflictActionContext","RenderMergeConflictActions","MergeConflictActionsTypeOption","UnresolvedFileReactOptions","LAnnotation","HTMLElement","Omit","UnresolvedFileProps","file","options","lineAnnotations","selectedLines","className","style","prerenderedHTML","renderAnnotation","renderHeaderPrefix","renderHeaderMetadata","renderGutterUtility","renderHoverUtility","renderMergeConflictUtility","React","JSX","Element"],"sources":["../../src/react/UnresolvedFile.d.ts"],"sourcesContent":["import type { ReactNode } from 'react';\nimport type { FileDiffOptions } from '../components/FileDiff';\nimport type { UnresolvedFile as UnresolvedFileClass } from '../components/UnresolvedFile';\nimport type { UnresolvedFileHunksRendererOptions } from '../renderers/UnresolvedFileHunksRenderer';\nimport type { FileContents, HunkSeparators, MergeConflictResolution } from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { FileDiffProps } from './FileDiff';\nexport interface RenderMergeConflictActionContext {\n    resolveConflict(resolution: MergeConflictResolution): void;\n}\nexport type RenderMergeConflictActions = (action: MergeConflictDiffAction, context: RenderMergeConflictActionContext) => ReactNode;\nexport type MergeConflictActionsTypeOption = 'none' | 'default' | RenderMergeConflictActions;\nexport interface UnresolvedFileReactOptions<LAnnotation> extends Omit<FileDiffOptions<LAnnotation>, 'hunkSeparators' | 'diffStyle' | 'onMergeConflictAction' | 'onPostRender'>, UnresolvedFileHunksRendererOptions {\n    hunkSeparators?: HunkSeparators;\n    onPostRender?(node: HTMLElement, instance: UnresolvedFileClass<LAnnotation>): unknown;\n    maxContextLines?: number;\n}\nexport interface UnresolvedFileProps<LAnnotation> extends Omit<FileDiffProps<LAnnotation>, 'fileDiff' | 'options'> {\n    file: FileContents;\n    options?: UnresolvedFileReactOptions<LAnnotation>;\n    renderMergeConflictUtility?(action: MergeConflictDiffAction, getInstance: () => UnresolvedFileClass<LAnnotation> | undefined): ReactNode;\n}\nexport declare function UnresolvedFile<LAnnotation = undefined>({ file, options, lineAnnotations, selectedLines, className, style, prerenderedHTML, renderAnnotation, renderHeaderPrefix, renderHeaderMetadata, renderGutterUtility, renderHoverUtility, renderMergeConflictUtility }: UnresolvedFileProps<LAnnotation>): React.JSX.Element;\n//# sourceMappingURL=UnresolvedFile.d.ts.map"],"mappings":";;;;;;;;;UAOiBU,gCAAAA;8BACeH;AADhC;AAGYI,KAAAA,0BAAAA,GAA0B,CAAA,MAAA,EAAYH,uBAAZ,EAAA,OAAA,EAA8CE,gCAA9C,EAAA,GAAmFV,SAAnF;AAAYQ,KACtCI,8BAAAA,GADsCJ,MAAAA,GAAAA,SAAAA,GACgBG,0BADhBH;AAAkCE,UAEnEG,0BAFmEH,CAAAA,WAAAA,CAAAA,SAEnBM,IAFmBN,CAEdT,eAFcS,CAEEI,WAFFJ,CAAAA,EAAAA,gBAAAA,GAAAA,WAAAA,GAAAA,uBAAAA,GAAAA,cAAAA,CAAAA,EAE4FN,kCAF5FM,CAAAA;EAAqCV,cAAAA,CAAAA,EAGpGM,cAHoGN;EAAS,YAAA,EAAA,IAAA,EAI1Ge,WAJ0G,EAAA,QAAA,EAInFZ,gBAJmF,CAI/DW,WAJ+D,CAAA,CAAA,EAAA,OAAA;EACtHF,eAAAA,CAAAA,EAAAA,MAAAA;AACZ;AAAsFE,UAKrEG,mBALqEH,CAAAA,WAAAA,CAAAA,SAK5BE,IAL4BF,CAKvBL,aALuBK,CAKTA,WALSA,CAAAA,EAAAA,UAAAA,GAAAA,SAAAA,CAAAA,CAAAA;EAAhBb,IAAAA,EAM5DI,YAN4DJ;EACjDK,OAAAA,CAAAA,EAMPO,0BANOP,CAMoBQ,WANpBR,CAAAA;EACGS,0BAAAA,EAAAA,MAAAA,EAMgBP,uBANhBO,EAAAA,WAAAA,EAAAA,GAAAA,GAM4DZ,gBAN5DY,CAMgFD,WANhFC,CAAAA,GAAAA,SAAAA,CAAAA,EAM2Gf,SAN3Ge;;AAAuBZ,iBAQvBD,cARuBC,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAAAA,IAAAA;EAAAA,OAAAA;EAAAA,eAAAA;EAAAA,aAAAA;EAAAA,SAAAA;EAAAA,KAAAA;EAAAA,eAAAA;EAAAA,gBAAAA;EAAAA,kBAAAA;EAAAA,oBAAAA;EAAAA,mBAAAA;EAAAA,kBAAAA;EAAAA;AAAAA,CAAAA,EAQwOc,mBARxOd,CAQ4PW,WAR5PX,CAAAA,CAAAA,EAQ2Q4B,KAAAA,CAAMC,GAAAA,CAAIC,OARrR9B"}

package/dist/react/UnresolvedFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFile.js","names":[],"sources":["../../src/react/UnresolvedFile.tsx"],"sourcesContent":["'use client';\n\nimport type { ReactNode } from 'react';\n\nimport type { FileDiffOptions } from '../components/FileDiff';\nimport type { UnresolvedFile as UnresolvedFileClass } from '../components/UnresolvedFile';\nimport { DIFFS_TAG_NAME } from '../constants';\nimport type { UnresolvedFileHunksRendererOptions } from '../renderers/UnresolvedFileHunksRenderer';\nimport type { FileContents, MergeConflictResolution } from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { FileDiffProps } from './FileDiff';\nimport { renderDiffChildren } from './utils/renderDiffChildren';\nimport { templateRender } from './utils/templateRender';\nimport { useUnresolvedFileInstance } from './utils/useUnresolvedFileInstance';\n\nexport interface RenderMergeConflictActionContext {\n  resolveConflict(resolution: MergeConflictResolution): void;\n}\n\nexport type RenderMergeConflictActions = (\n  action: MergeConflictDiffAction,\n  context: RenderMergeConflictActionContext\n) => ReactNode;\n\nexport type MergeConflictActionsTypeOption =\n  | 'none'\n  | 'default'\n  | RenderMergeConflictActions;\n\nexport interface UnresolvedFileReactOptions<LAnnotation>\n  extends\n    Omit<\n      FileDiffOptions<LAnnotation>,\n      'hunkSeparators' | 'diffStyle' | 'onMergeConflictAction' | 'onPostRender'\n    >,\n    UnresolvedFileHunksRendererOptions {\n  onPostRender?(\n    node: HTMLElement,\n    instance: UnresolvedFileClass<LAnnotation>\n  ): unknown;\n}\n\nexport interface UnresolvedFileProps<LAnnotation> extends Omit<\n  FileDiffProps<LAnnotation>,\n  'fileDiff' | 'options'\n> {\n  file: FileContents;\n  options?: UnresolvedFileReactOptions<LAnnotation>;\n  renderMergeConflictUtility?(\n    action: MergeConflictDiffAction,\n    getInstance: () => UnresolvedFileClass<LAnnotation> | undefined\n  ): ReactNode;\n}\n\nexport function UnresolvedFile<LAnnotation = undefined>({\n  file,\n  options,\n  lineAnnotations,\n  selectedLines,\n  className,\n  style,\n  prerenderedHTML,\n  renderAnnotation,\n  renderHeaderPrefix,\n  renderHeaderMetadata,\n  renderGutterUtility,\n  renderHoverUtility,\n  renderMergeConflictUtility,\n}: UnresolvedFileProps<LAnnotation>): React.JSX.Element {\n  const { ref, getHoveredLine, fileDiff, actions, getInstance } =\n    useUnresolvedFileInstance({\n      file,\n      options,\n      lineAnnotations,\n      selectedLines,\n      prerenderedHTML,\n      hasConflictUtility: renderMergeConflictUtility != null,\n      hasGutterRenderUtility:\n        renderGutterUtility != null || renderHoverUtility != null,\n    });\n  const children = renderDiffChildren({\n    fileDiff,\n    renderHeaderPrefix,\n    renderHeaderMetadata,\n    renderAnnotation,\n    renderGutterUtility,\n    renderHoverUtility,\n    lineAnnotations,\n    getHoveredLine,\n    actions,\n    renderMergeConflictUtility,\n    getInstance,\n  });\n  return (\n    <DIFFS_TAG_NAME ref={ref} className={className} style={style}>\n      {templateRender(children, prerenderedHTML)}\n    </DIFFS_TAG_NAME>\n  );\n}\n"],"mappings":";;;;;;;;;;AAsDA,SAAgB,eAAwC,EACtD,MACA,SACA,iBACA,eACA,WACA,OACA,iBACA,kBACA,oBACA,sBACA,qBACA,oBACA,8BACsD;CACtD,MAAM,EAAE,KAAK,gBAAgB,UAAU,SAAS,gBAC9C,0BAA0B;EACxB;EACA;EACA;EACA;EACA;EACA,oBAAoB,8BAA8B;EAClD,wBACE,uBAAuB,QAAQ,sBAAsB;EACxD,CAAC;AAcJ,QACE,oBAAC;EAAoB;EAAgB;EAAkB;YACpD,eAfY,mBAAmB;GAClC;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACD,CAAC,EAG4B,gBAAgB;GAC3B"}
+{"version":3,"file":"UnresolvedFile.js","names":[],"sources":["../../src/react/UnresolvedFile.tsx"],"sourcesContent":["'use client';\n\nimport type { ReactNode } from 'react';\n\nimport type { FileDiffOptions } from '../components/FileDiff';\nimport type { UnresolvedFile as UnresolvedFileClass } from '../components/UnresolvedFile';\nimport { DIFFS_TAG_NAME } from '../constants';\nimport type { UnresolvedFileHunksRendererOptions } from '../renderers/UnresolvedFileHunksRenderer';\nimport type {\n  FileContents,\n  HunkSeparators,\n  MergeConflictResolution,\n} from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { FileDiffProps } from './FileDiff';\nimport { renderDiffChildren } from './utils/renderDiffChildren';\nimport { templateRender } from './utils/templateRender';\nimport { useUnresolvedFileInstance } from './utils/useUnresolvedFileInstance';\n\nexport interface RenderMergeConflictActionContext {\n  resolveConflict(resolution: MergeConflictResolution): void;\n}\n\nexport type RenderMergeConflictActions = (\n  action: MergeConflictDiffAction,\n  context: RenderMergeConflictActionContext\n) => ReactNode;\n\nexport type MergeConflictActionsTypeOption =\n  | 'none'\n  | 'default'\n  | RenderMergeConflictActions;\n\nexport interface UnresolvedFileReactOptions<LAnnotation>\n  extends\n    Omit<\n      FileDiffOptions<LAnnotation>,\n      'hunkSeparators' | 'diffStyle' | 'onMergeConflictAction' | 'onPostRender'\n    >,\n    UnresolvedFileHunksRendererOptions {\n  hunkSeparators?: HunkSeparators;\n  onPostRender?(\n    node: HTMLElement,\n    instance: UnresolvedFileClass<LAnnotation>\n  ): unknown;\n  maxContextLines?: number;\n}\n\nexport interface UnresolvedFileProps<LAnnotation> extends Omit<\n  FileDiffProps<LAnnotation>,\n  'fileDiff' | 'options'\n> {\n  file: FileContents;\n  options?: UnresolvedFileReactOptions<LAnnotation>;\n  renderMergeConflictUtility?(\n    action: MergeConflictDiffAction,\n    getInstance: () => UnresolvedFileClass<LAnnotation> | undefined\n  ): ReactNode;\n}\n\nexport function UnresolvedFile<LAnnotation = undefined>({\n  file,\n  options,\n  lineAnnotations,\n  selectedLines,\n  className,\n  style,\n  prerenderedHTML,\n  renderAnnotation,\n  renderHeaderPrefix,\n  renderHeaderMetadata,\n  renderGutterUtility,\n  renderHoverUtility,\n  renderMergeConflictUtility,\n}: UnresolvedFileProps<LAnnotation>): React.JSX.Element {\n  const { ref, getHoveredLine, fileDiff, actions, getInstance } =\n    useUnresolvedFileInstance({\n      file,\n      options,\n      lineAnnotations,\n      selectedLines,\n      prerenderedHTML,\n      hasConflictUtility: renderMergeConflictUtility != null,\n      hasGutterRenderUtility:\n        renderGutterUtility != null || renderHoverUtility != null,\n    });\n  const children = renderDiffChildren({\n    fileDiff,\n    renderHeaderPrefix,\n    renderHeaderMetadata,\n    renderAnnotation,\n    renderGutterUtility,\n    renderHoverUtility,\n    lineAnnotations,\n    getHoveredLine,\n    actions,\n    renderMergeConflictUtility,\n    getInstance,\n  });\n  return (\n    <DIFFS_TAG_NAME ref={ref} className={className} style={style}>\n      {templateRender(children, prerenderedHTML)}\n    </DIFFS_TAG_NAME>\n  );\n}\n"],"mappings":";;;;;;;;;;AA4DA,SAAgB,eAAwC,EACtD,MACA,SACA,iBACA,eACA,WACA,OACA,iBACA,kBACA,oBACA,sBACA,qBACA,oBACA,8BACsD;CACtD,MAAM,EAAE,KAAK,gBAAgB,UAAU,SAAS,gBAC9C,0BAA0B;EACxB;EACA;EACA;EACA;EACA;EACA,oBAAoB,8BAA8B;EAClD,wBACE,uBAAuB,QAAQ,sBAAsB;EACxD,CAAC;AAcJ,QACE,oBAAC;EAAoB;EAAgB;EAAkB;YACpD,eAfY,mBAAmB;GAClC;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACA;GACD,CAAC,EAG4B,gBAAgB;GAC3B"}

package/dist/react/index.d.ts

@@ -1,4 +1,4 @@
-import { AnnotationLineMap, AnnotationSide, AnnotationSpan, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, ContextContent, CustomPreProperties, DecorationItem, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffMetadata, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MergeConflictActionPayload, MergeConflictRegion, MergeConflictResolution, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PrePropertiesConfig, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderMetadataProps, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, VirtualFileMetrics, VirtualWindowSpecs } from "../types.js";
+import { AnnotationLineMap, AnnotationSide, AnnotationSpan, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, ConflictResolverTypes, ContextContent, CustomPreProperties, DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffMetadata, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PrePropertiesConfig, ProcessFileConflictData, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderMetadataProps, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, VirtualFileMetrics, VirtualWindowSpecs } from "../types.js";
 import { WorkerInitializationRenderOptions, WorkerPoolOptions } from "../worker/types.js";
 import { FileOptions } from "../components/File.js";
 import { DiffBasePropsReact, FileProps } from "./types.js";
@@ -16,4 +16,4 @@ import { templateRender } from "./utils/templateRender.js";
 import { useFileDiffInstance } from "./utils/useFileDiffInstance.js";
 import { useFileInstance } from "./utils/useFileInstance.js";
 import { useStableCallback } from "./utils/useStableCallback.js";
-export { AnnotationLineMap, AnnotationSide, AnnotationSpan, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, ContextContent, CustomPreProperties, DecorationItem, DiffBasePropsReact, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, File, FileContents, FileDiff, FileDiffMetadata, FileDiffProps, FileOptions, FileProps, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, GutterUtilitySlotStyles, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MergeConflictActionPayload, MergeConflictActionsTypeOption, MergeConflictRegion, MergeConflictResolution, MergeConflictSlotStyles, MultiFileDiff, MultiFileDiffProps, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PatchDiff, PatchDiffProps, PrePropertiesConfig, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderMetadataProps, RenderHeaderPrefixCallback, RenderMergeConflictActionContext, RenderMergeConflictActions, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, UnresolvedFile, UnresolvedFileProps, UnresolvedFileReactOptions, VirtualFileMetrics, VirtualWindowSpecs, Virtualizer, VirtualizerContext, WorkerInitializationRenderOptions, WorkerPoolContext, WorkerPoolContextProvider, WorkerPoolOptions, noopRender, renderDiffChildren, renderFileChildren, templateRender, useFileDiffInstance, useFileInstance, useStableCallback, useVirtualizer, useWorkerPool };
+export { AnnotationLineMap, AnnotationSide, AnnotationSpan, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, ConflictResolverTypes, ContextContent, CustomPreProperties, DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffBasePropsReact, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, File, FileContents, FileDiff, FileDiffMetadata, FileDiffProps, FileOptions, FileProps, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, GutterUtilitySlotStyles, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MergeConflictActionPayload, MergeConflictActionsTypeOption, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, MergeConflictSlotStyles, MultiFileDiff, MultiFileDiffProps, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PatchDiff, PatchDiffProps, PrePropertiesConfig, ProcessFileConflictData, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderMetadataProps, RenderHeaderPrefixCallback, RenderMergeConflictActionContext, RenderMergeConflictActions, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, UnresolvedFile, UnresolvedFileProps, UnresolvedFileReactOptions, VirtualFileMetrics, VirtualWindowSpecs, Virtualizer, VirtualizerContext, WorkerInitializationRenderOptions, WorkerPoolContext, WorkerPoolContextProvider, WorkerPoolOptions, noopRender, renderDiffChildren, renderFileChildren, templateRender, useFileDiffInstance, useFileInstance, useStableCallback, useVirtualizer, useWorkerPool };

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

@@ -7,7 +7,7 @@ import { ReactNode } from "react";
 //#region src/react/utils/renderDiffChildren.d.ts
 interface RenderDiffChildrenProps<LAnnotation, T> {
   fileDiff?: FileDiffMetadata;
-  actions?: MergeConflictDiffAction[];
+  actions?: (MergeConflictDiffAction | undefined)[];
   deletionFile?: FileContents;
   additionFile?: FileContents;
   renderHeaderPrefix: DiffBasePropsReact<LAnnotation>['renderHeaderPrefix'];

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

@@ -1 +1 @@
-{"version":3,"file":"renderDiffChildren.d.ts","names":["ReactNode","GetHoveredLineResult","FileContents","FileDiffMetadata","MergeConflictDiffAction","DiffBasePropsReact","RenderDiffChildrenProps","LAnnotation","T","renderDiffChildren","fileDiff","actions","deletionFile","additionFile","renderHeaderPrefix","renderHeaderMetadata","renderAnnotation","renderGutterUtility","renderHoverUtility","renderMergeConflictUtility","lineAnnotations","getHoveredLine","getInstance"],"sources":["../../../src/react/utils/renderDiffChildren.d.ts"],"sourcesContent":["import type { ReactNode } from 'react';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type { FileContents, FileDiffMetadata } from '../../types';\nimport { type MergeConflictDiffAction } from '../../utils/parseMergeConflictDiffFromFile';\nimport type { DiffBasePropsReact } from '../types';\ninterface RenderDiffChildrenProps<LAnnotation, T> {\n    fileDiff?: FileDiffMetadata;\n    actions?: MergeConflictDiffAction[];\n    deletionFile?: FileContents;\n    additionFile?: FileContents;\n    renderHeaderPrefix: DiffBasePropsReact<LAnnotation>['renderHeaderPrefix'];\n    renderHeaderMetadata: DiffBasePropsReact<LAnnotation>['renderHeaderMetadata'];\n    renderAnnotation: DiffBasePropsReact<LAnnotation>['renderAnnotation'];\n    renderGutterUtility: DiffBasePropsReact<LAnnotation>['renderGutterUtility'];\n    renderHoverUtility: DiffBasePropsReact<LAnnotation>['renderHoverUtility'];\n    renderMergeConflictUtility?(action: MergeConflictDiffAction, getInstance: () => T | undefined): ReactNode;\n    lineAnnotations: DiffBasePropsReact<LAnnotation>['lineAnnotations'];\n    getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n    getInstance?(): T | undefined;\n}\nexport declare function renderDiffChildren<LAnnotation, T>({ fileDiff, actions, deletionFile, additionFile, renderHeaderPrefix, renderHeaderMetadata, renderAnnotation, renderGutterUtility, renderHoverUtility, renderMergeConflictUtility, lineAnnotations, getHoveredLine, getInstance }: RenderDiffChildrenProps<LAnnotation, T>): ReactNode;\nexport {};\n//# sourceMappingURL=renderDiffChildren.d.ts.map"],"mappings":";;;;;;;UAKUM;aACKH;EADLG,OAAAA,CAAAA,EAEIF,uBAFmBG,EAAAA;EAClBJ,YAAAA,CAAAA,EAEID,YAFJC;EACDC,YAAAA,CAAAA,EAEKF,YAFLE;EACKF,kBAAAA,EAEKG,kBAFLH,CAEwBK,WAFxBL,CAAAA,CAAAA,oBAAAA,CAAAA;EACAA,oBAAAA,EAEOG,kBAFPH,CAE0BK,WAF1BL,CAAAA,CAAAA,sBAAAA,CAAAA;EACwBK,gBAAAA,EAErBF,kBAFqBE,CAEFA,WAFEA,CAAAA,CAAAA,kBAAAA,CAAAA;EAAnBF,mBAAAA,EAGCA,kBAHDA,CAGoBE,WAHpBF,CAAAA,CAAAA,qBAAAA,CAAAA;EACqBE,kBAAAA,EAGrBF,kBAHqBE,CAGFA,WAHEA,CAAAA,CAAAA,oBAAAA,CAAAA;EAAnBF,0BAAAA,EAAAA,MAAAA,EAIcD,uBAJdC,EAAAA,WAAAA,EAAAA,GAAAA,GAI0DG,CAJ1DH,GAAAA,SAAAA,CAAAA,EAI0EL,SAJ1EK;EACeE,eAAAA,EAIpBF,kBAJoBE,CAIDA,WAJCA,CAAAA,CAAAA,iBAAAA,CAAAA;EAAnBF,cAAAA,EAAAA,EAKAJ,oBALAI,CAAAA,MAAAA,CAAAA,GAAAA,SAAAA;EACsBE,WAAAA,GAAAA,EAKxBC,CALwBD,GAAAA,SAAAA;;AACDA,iBAMnBE,kBANmBF,CAAAA,WAAAA,EAAAA,CAAAA,CAAAA,CAAAA;EAAAA,QAAAA;EAAAA,OAAAA;EAAAA,YAAAA;EAAAA,YAAAA;EAAAA,kBAAAA;EAAAA,oBAAAA;EAAAA,gBAAAA;EAAAA,mBAAAA;EAAAA,kBAAAA;EAAAA,0BAAAA;EAAAA,eAAAA;EAAAA,cAAAA;EAAAA;AAAAA,CAAAA,EAMkPD,uBANlPC,CAM0QA,WAN1QA,EAMuRC,CANvRD,CAAAA,CAAAA,EAM4RP,SAN5RO"}
+{"version":3,"file":"renderDiffChildren.d.ts","names":["ReactNode","GetHoveredLineResult","FileContents","FileDiffMetadata","MergeConflictDiffAction","DiffBasePropsReact","RenderDiffChildrenProps","LAnnotation","T","renderDiffChildren","fileDiff","actions","deletionFile","additionFile","renderHeaderPrefix","renderHeaderMetadata","renderAnnotation","renderGutterUtility","renderHoverUtility","renderMergeConflictUtility","lineAnnotations","getHoveredLine","getInstance"],"sources":["../../../src/react/utils/renderDiffChildren.d.ts"],"sourcesContent":["import type { ReactNode } from 'react';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type { FileContents, FileDiffMetadata } from '../../types';\nimport { type MergeConflictDiffAction } from '../../utils/parseMergeConflictDiffFromFile';\nimport type { DiffBasePropsReact } from '../types';\ninterface RenderDiffChildrenProps<LAnnotation, T> {\n    fileDiff?: FileDiffMetadata;\n    actions?: (MergeConflictDiffAction | undefined)[];\n    deletionFile?: FileContents;\n    additionFile?: FileContents;\n    renderHeaderPrefix: DiffBasePropsReact<LAnnotation>['renderHeaderPrefix'];\n    renderHeaderMetadata: DiffBasePropsReact<LAnnotation>['renderHeaderMetadata'];\n    renderAnnotation: DiffBasePropsReact<LAnnotation>['renderAnnotation'];\n    renderGutterUtility: DiffBasePropsReact<LAnnotation>['renderGutterUtility'];\n    renderHoverUtility: DiffBasePropsReact<LAnnotation>['renderHoverUtility'];\n    renderMergeConflictUtility?(action: MergeConflictDiffAction, getInstance: () => T | undefined): ReactNode;\n    lineAnnotations: DiffBasePropsReact<LAnnotation>['lineAnnotations'];\n    getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n    getInstance?(): T | undefined;\n}\nexport declare function renderDiffChildren<LAnnotation, T>({ fileDiff, actions, deletionFile, additionFile, renderHeaderPrefix, renderHeaderMetadata, renderAnnotation, renderGutterUtility, renderHoverUtility, renderMergeConflictUtility, lineAnnotations, getHoveredLine, getInstance }: RenderDiffChildrenProps<LAnnotation, T>): ReactNode;\nexport {};\n//# sourceMappingURL=renderDiffChildren.d.ts.map"],"mappings":";;;;;;;UAKUM;aACKH;EADLG,OAAAA,CAAAA,EAAAA,CAEKF,uBAFkBG,GAAAA,SAAAC,CAAAA,EAAAA;EAClBL,YAAAA,CAAAA,EAEID,YAFJC;EACAC,YAAAA,CAAAA,EAEIF,YAFJE;EACIF,kBAAAA,EAEKG,kBAFLH,CAEwBK,WAFxBL,CAAAA,CAAAA,oBAAAA,CAAAA;EACAA,oBAAAA,EAEOG,kBAFPH,CAE0BK,WAF1BL,CAAAA,CAAAA,sBAAAA,CAAAA;EACwBK,gBAAAA,EAErBF,kBAFqBE,CAEFA,WAFEA,CAAAA,CAAAA,kBAAAA,CAAAA;EAAnBF,mBAAAA,EAGCA,kBAHDA,CAGoBE,WAHpBF,CAAAA,CAAAA,qBAAAA,CAAAA;EACqBE,kBAAAA,EAGrBF,kBAHqBE,CAGFA,WAHEA,CAAAA,CAAAA,oBAAAA,CAAAA;EAAnBF,0BAAAA,EAAAA,MAAAA,EAIcD,uBAJdC,EAAAA,WAAAA,EAAAA,GAAAA,GAI0DG,CAJ1DH,GAAAA,SAAAA,CAAAA,EAI0EL,SAJ1EK;EACeE,eAAAA,EAIpBF,kBAJoBE,CAIDA,WAJCA,CAAAA,CAAAA,iBAAAA,CAAAA;EAAnBF,cAAAA,EAAAA,EAKAJ,oBALAI,CAAAA,MAAAA,CAAAA,GAAAA,SAAAA;EACsBE,WAAAA,GAAAA,EAKxBC,CALwBD,GAAAA,SAAAA;;AACDA,iBAMnBE,kBANmBF,CAAAA,WAAAA,EAAAA,CAAAA,CAAAA,CAAAA;EAAAA,QAAAA;EAAAA,OAAAA;EAAAA,YAAAA;EAAAA,YAAAA;EAAAA,kBAAAA;EAAAA,oBAAAA;EAAAA,gBAAAA;EAAAA,mBAAAA;EAAAA,kBAAAA;EAAAA,0BAAAA;EAAAA,eAAAA;EAAAA,cAAAA;EAAAA;AAAAA,CAAAA,EAMkPD,uBANlPC,CAM0QA,WAN1QA,EAMuRC,CANvRD,CAAAA,CAAAA,EAM4RP,SAN5RO"}

package/dist/react/utils/renderDiffChildren.js

@@ -32,7 +32,8 @@ function renderDiffChildren({ fileDiff, actions, deletionFile, additionFile, ren
 			children: renderAnnotation(annotation)
 		}, index)),
 		actions != null && renderMergeConflictUtility != null && getInstance != null && actions.map((action) => {
-			const slot = getSlotName(action);
+			if (action == null || fileDiff == null) return;
+			const slot = getSlotName(action, fileDiff);
 			return /* @__PURE__ */ jsx("div", {
 				slot,
 				style: MergeConflictSlotStyles,
@@ -46,10 +47,11 @@ function renderDiffChildren({ fileDiff, actions, deletionFile, additionFile, ren
 		})
 	] });
 }
-function getSlotName(action) {
-	const anchor = getMergeConflictActionAnchor(action);
+function getSlotName(action, fileDiff) {
+	const anchor = getMergeConflictActionAnchor(action, fileDiff);
 	return anchor != null ? getMergeConflictActionSlotName({
-		...anchor,
+		hunkIndex: anchor.hunkIndex,
+		lineIndex: anchor.lineIndex,
 		conflictIndex: action.conflictIndex
 	}) : void 0;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"renderDiffChildren.js","names":[],"sources":["../../../src/react/utils/renderDiffChildren.tsx"],"sourcesContent":["import type { ReactNode } from 'react';\n\nimport {\n  HEADER_METADATA_SLOT_ID,\n  HEADER_PREFIX_SLOT_ID,\n} from '../../constants';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type { FileContents, FileDiffMetadata } from '../../types';\nimport { getLineAnnotationName } from '../../utils/getLineAnnotationName';\nimport { getMergeConflictActionSlotName } from '../../utils/getMergeConflictActionSlotName';\nimport {\n  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n} from '../../utils/parseMergeConflictDiffFromFile';\nimport { GutterUtilitySlotStyles, MergeConflictSlotStyles } from '../constants';\nimport type { DiffBasePropsReact } from '../types';\n\ninterface RenderDiffChildrenProps<LAnnotation, T> {\n  fileDiff?: FileDiffMetadata;\n  actions?: MergeConflictDiffAction[];\n  deletionFile?: FileContents;\n  additionFile?: FileContents;\n  renderHeaderPrefix: DiffBasePropsReact<LAnnotation>['renderHeaderPrefix'];\n  renderHeaderMetadata: DiffBasePropsReact<LAnnotation>['renderHeaderMetadata'];\n  renderAnnotation: DiffBasePropsReact<LAnnotation>['renderAnnotation'];\n  renderGutterUtility: DiffBasePropsReact<LAnnotation>['renderGutterUtility'];\n  renderHoverUtility: DiffBasePropsReact<LAnnotation>['renderHoverUtility'];\n  renderMergeConflictUtility?(\n    action: MergeConflictDiffAction,\n    getInstance: () => T | undefined\n  ): ReactNode;\n  lineAnnotations: DiffBasePropsReact<LAnnotation>['lineAnnotations'];\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getInstance?(): T | undefined;\n}\n\nexport function renderDiffChildren<LAnnotation, T>({\n  fileDiff,\n  actions,\n  deletionFile,\n  additionFile,\n  renderHeaderPrefix,\n  renderHeaderMetadata,\n  renderAnnotation,\n  renderGutterUtility,\n  renderHoverUtility,\n  renderMergeConflictUtility,\n  lineAnnotations,\n  getHoveredLine,\n  getInstance,\n}: RenderDiffChildrenProps<LAnnotation, T>): ReactNode {\n  const gutterUtility = renderGutterUtility ?? renderHoverUtility;\n  const prefix = renderHeaderPrefix?.({\n    fileDiff,\n    deletionFile,\n    additionFile,\n  });\n  const metadata = renderHeaderMetadata?.({\n    fileDiff,\n    deletionFile,\n    additionFile,\n  });\n  return (\n    <>\n      {prefix != null && <div slot={HEADER_PREFIX_SLOT_ID}>{prefix}</div>}\n      {metadata != null && <div slot={HEADER_METADATA_SLOT_ID}>{metadata}</div>}\n      {renderAnnotation != null &&\n        lineAnnotations?.map((annotation, index) => (\n          <div key={index} slot={getLineAnnotationName(annotation)}>\n            {renderAnnotation(annotation)}\n          </div>\n        ))}\n      {actions != null &&\n        renderMergeConflictUtility != null &&\n        getInstance != null &&\n        actions.map((action) => {\n          const slot = getSlotName(action);\n          return (\n            <div key={slot} slot={slot} style={MergeConflictSlotStyles}>\n              {renderMergeConflictUtility(action, getInstance)}\n            </div>\n          );\n        })}\n      {gutterUtility != null && (\n        <div slot=\"gutter-utility-slot\" style={GutterUtilitySlotStyles}>\n          {gutterUtility(getHoveredLine)}\n        </div>\n      )}\n    </>\n  );\n}\n\nfunction getSlotName(action: MergeConflictDiffAction): string | undefined {\n  const anchor = getMergeConflictActionAnchor(action);\n  return anchor != null\n    ? getMergeConflictActionSlotName({\n        ...anchor,\n        conflictIndex: action.conflictIndex,\n      })\n    : undefined;\n}\n"],"mappings":";;;;;;;;AAoCA,SAAgB,mBAAmC,EACjD,UACA,SACA,cACA,cACA,oBACA,sBACA,kBACA,qBACA,oBACA,4BACA,iBACA,gBACA,eACqD;CACrD,MAAM,gBAAgB,uBAAuB;CAC7C,MAAM,SAAS,qBAAqB;EAClC;EACA;EACA;EACD,CAAC;CACF,MAAM,WAAW,uBAAuB;EACtC;EACA;EACA;EACD,CAAC;AACF,QACE;EACG,UAAU,QAAQ,oBAAC;GAAI,MAAM;aAAwB;IAAa;EAClE,YAAY,QAAQ,oBAAC;GAAI,MAAM;aAA0B;IAAe;EACxE,oBAAoB,QACnB,iBAAiB,KAAK,YAAY,UAChC,oBAAC;GAAgB,MAAM,sBAAsB,WAAW;aACrD,iBAAiB,WAAW;KADrB,MAEJ,CACN;EACH,WAAW,QACV,8BAA8B,QAC9B,eAAe,QACf,QAAQ,KAAK,WAAW;GACtB,MAAM,OAAO,YAAY,OAAO;AAChC,UACE,oBAAC;IAAqB;IAAM,OAAO;cAChC,2BAA2B,QAAQ,YAAY;MADxC,KAEJ;IAER;EACH,iBAAiB,QAChB,oBAAC;GAAI,MAAK;GAAsB,OAAO;aACpC,cAAc,eAAe;IAC1B;KAEP;;AAIP,SAAS,YAAY,QAAqD;CACxE,MAAM,SAAS,6BAA6B,OAAO;AACnD,QAAO,UAAU,OACb,+BAA+B;EAC7B,GAAG;EACH,eAAe,OAAO;EACvB,CAAC,GACF"}
+{"version":3,"file":"renderDiffChildren.js","names":[],"sources":["../../../src/react/utils/renderDiffChildren.tsx"],"sourcesContent":["import type { ReactNode } from 'react';\n\nimport {\n  HEADER_METADATA_SLOT_ID,\n  HEADER_PREFIX_SLOT_ID,\n} from '../../constants';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type { FileContents, FileDiffMetadata } from '../../types';\nimport { getLineAnnotationName } from '../../utils/getLineAnnotationName';\nimport { getMergeConflictActionSlotName } from '../../utils/getMergeConflictActionSlotName';\nimport {\n  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n} from '../../utils/parseMergeConflictDiffFromFile';\nimport { GutterUtilitySlotStyles, MergeConflictSlotStyles } from '../constants';\nimport type { DiffBasePropsReact } from '../types';\n\ninterface RenderDiffChildrenProps<LAnnotation, T> {\n  fileDiff?: FileDiffMetadata;\n  actions?: (MergeConflictDiffAction | undefined)[];\n  deletionFile?: FileContents;\n  additionFile?: FileContents;\n  renderHeaderPrefix: DiffBasePropsReact<LAnnotation>['renderHeaderPrefix'];\n  renderHeaderMetadata: DiffBasePropsReact<LAnnotation>['renderHeaderMetadata'];\n  renderAnnotation: DiffBasePropsReact<LAnnotation>['renderAnnotation'];\n  renderGutterUtility: DiffBasePropsReact<LAnnotation>['renderGutterUtility'];\n  renderHoverUtility: DiffBasePropsReact<LAnnotation>['renderHoverUtility'];\n  renderMergeConflictUtility?(\n    action: MergeConflictDiffAction,\n    getInstance: () => T | undefined\n  ): ReactNode;\n  lineAnnotations: DiffBasePropsReact<LAnnotation>['lineAnnotations'];\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getInstance?(): T | undefined;\n}\n\nexport function renderDiffChildren<LAnnotation, T>({\n  fileDiff,\n  actions,\n  deletionFile,\n  additionFile,\n  renderHeaderPrefix,\n  renderHeaderMetadata,\n  renderAnnotation,\n  renderGutterUtility,\n  renderHoverUtility,\n  renderMergeConflictUtility,\n  lineAnnotations,\n  getHoveredLine,\n  getInstance,\n}: RenderDiffChildrenProps<LAnnotation, T>): ReactNode {\n  const gutterUtility = renderGutterUtility ?? renderHoverUtility;\n  const prefix = renderHeaderPrefix?.({\n    fileDiff,\n    deletionFile,\n    additionFile,\n  });\n  const metadata = renderHeaderMetadata?.({\n    fileDiff,\n    deletionFile,\n    additionFile,\n  });\n  return (\n    <>\n      {prefix != null && <div slot={HEADER_PREFIX_SLOT_ID}>{prefix}</div>}\n      {metadata != null && <div slot={HEADER_METADATA_SLOT_ID}>{metadata}</div>}\n      {renderAnnotation != null &&\n        lineAnnotations?.map((annotation, index) => (\n          <div key={index} slot={getLineAnnotationName(annotation)}>\n            {renderAnnotation(annotation)}\n          </div>\n        ))}\n      {actions != null &&\n        renderMergeConflictUtility != null &&\n        getInstance != null &&\n        actions.map((action) => {\n          if (action == null || fileDiff == null) {\n            return undefined;\n          }\n          const slot = getSlotName(action, fileDiff);\n          return (\n            <div key={slot} slot={slot} style={MergeConflictSlotStyles}>\n              {renderMergeConflictUtility(action, getInstance)}\n            </div>\n          );\n        })}\n      {gutterUtility != null && (\n        <div slot=\"gutter-utility-slot\" style={GutterUtilitySlotStyles}>\n          {gutterUtility(getHoveredLine)}\n        </div>\n      )}\n    </>\n  );\n}\n\nfunction getSlotName(\n  action: MergeConflictDiffAction,\n  fileDiff: FileDiffMetadata\n): string | undefined {\n  const anchor = getMergeConflictActionAnchor(action, fileDiff);\n  return anchor != null\n    ? getMergeConflictActionSlotName({\n        hunkIndex: anchor.hunkIndex,\n        lineIndex: anchor.lineIndex,\n        conflictIndex: action.conflictIndex,\n      })\n    : undefined;\n}\n"],"mappings":";;;;;;;;AAoCA,SAAgB,mBAAmC,EACjD,UACA,SACA,cACA,cACA,oBACA,sBACA,kBACA,qBACA,oBACA,4BACA,iBACA,gBACA,eACqD;CACrD,MAAM,gBAAgB,uBAAuB;CAC7C,MAAM,SAAS,qBAAqB;EAClC;EACA;EACA;EACD,CAAC;CACF,MAAM,WAAW,uBAAuB;EACtC;EACA;EACA;EACD,CAAC;AACF,QACE;EACG,UAAU,QAAQ,oBAAC;GAAI,MAAM;aAAwB;IAAa;EAClE,YAAY,QAAQ,oBAAC;GAAI,MAAM;aAA0B;IAAe;EACxE,oBAAoB,QACnB,iBAAiB,KAAK,YAAY,UAChC,oBAAC;GAAgB,MAAM,sBAAsB,WAAW;aACrD,iBAAiB,WAAW;KADrB,MAEJ,CACN;EACH,WAAW,QACV,8BAA8B,QAC9B,eAAe,QACf,QAAQ,KAAK,WAAW;AACtB,OAAI,UAAU,QAAQ,YAAY,KAChC;GAEF,MAAM,OAAO,YAAY,QAAQ,SAAS;AAC1C,UACE,oBAAC;IAAqB;IAAM,OAAO;cAChC,2BAA2B,QAAQ,YAAY;MADxC,KAEJ;IAER;EACH,iBAAiB,QAChB,oBAAC;GAAI,MAAK;GAAsB,OAAO;aACpC,cAAc,eAAe;IAC1B;KAEP;;AAIP,SAAS,YACP,QACA,UACoB;CACpB,MAAM,SAAS,6BAA6B,QAAQ,SAAS;AAC7D,QAAO,UAAU,OACb,+BAA+B;EAC7B,WAAW,OAAO;EAClB,WAAW,OAAO;EAClB,eAAe,OAAO;EACvB,CAAC,GACF"}

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

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