@pierre/diffs 1.1.5 → 1.1.7

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

@@ -1 +1 @@
-{"version":3,"file":"FileRenderer.d.ts","names":["ElementContent","Element","HASTElement","BaseCodeOptions","DiffsHighlighter","FileContents","LineAnnotation","RenderFileOptions","RenderRange","ThemedFileResult","ThemeTypes","WorkerPoolManager","FileRenderResult","FileRendererOptions","FileRenderer","LAnnotation","Promise"],"sources":["../../src/renderers/FileRenderer.d.ts"],"sourcesContent":["import type { ElementContent, Element as HASTElement } from 'hast';\nimport type { BaseCodeOptions, DiffsHighlighter, FileContents, LineAnnotation, RenderFileOptions, RenderRange, ThemedFileResult, ThemeTypes } from '../types';\nimport type { WorkerPoolManager } from '../worker';\nexport interface FileRenderResult {\n    gutterAST: ElementContent[];\n    contentAST: ElementContent[];\n    preAST: HASTElement;\n    headerAST: HASTElement | undefined;\n    css: string;\n    totalLines: number;\n    themeStyles: string;\n    baseThemeType: 'light' | 'dark' | undefined;\n    rowCount: number;\n    bufferBefore: number;\n    bufferAfter: number;\n}\nexport interface FileRendererOptions extends BaseCodeOptions {\n}\nexport declare class FileRenderer<LAnnotation = undefined> {\n    options: FileRendererOptions;\n    private onRenderUpdate?;\n    private workerManager?;\n    readonly __id: string;\n    private highlighter;\n    private renderCache;\n    private computedLang;\n    private lineAnnotations;\n    private lineCache;\n    constructor(options?: FileRendererOptions, onRenderUpdate?: (() => unknown) | undefined, workerManager?: WorkerPoolManager | undefined);\n    setOptions(options: FileRendererOptions): void;\n    private mergeOptions;\n    setThemeType(themeType: ThemeTypes): void;\n    setLineAnnotations(lineAnnotations: LineAnnotation<LAnnotation>[]): void;\n    cleanUp(): void;\n    hydrate(file: FileContents): void;\n    private getRenderOptions;\n    getOrCreateLineCache(file: FileContents): string[];\n    renderFile(file?: FileContents | undefined, renderRange?: RenderRange): FileRenderResult | undefined;\n    asyncRender(file: FileContents, renderRange?: RenderRange): Promise<FileRenderResult>;\n    private asyncHighlight;\n    private renderFileWithHighlighter;\n    private processFileResult;\n    private renderHeader;\n    renderFullHTML(result: FileRenderResult): string;\n    renderFullAST(result: FileRenderResult, children?: ElementContent[]): HASTElement;\n    renderCodeAST(result: FileRenderResult): ElementContent[];\n    renderPartialHTML(children: ElementContent[], includeCodeNode?: boolean): string;\n    initializeHighlighter(): Promise<DiffsHighlighter>;\n    onHighlightSuccess(file: FileContents, result: ThemedFileResult, options: RenderFileOptions): void;\n    onHighlightError(error: unknown): void;\n    private createPreElement;\n}\n//# sourceMappingURL=FileRenderer.d.ts.map"],"mappings":";;;;;;UAGiBY,gBAAAA;aACFZ;cACCA;EAFCY,MAAAA,EAGLV,OAHqB;EAClBF,SAAAA,EAGAE,OAHAF,GAAAA,SAAAA;EACCA,GAAAA,EAAAA,MAAAA;EACJE,UAAAA,EAAAA,MAAAA;EACGA,WAAAA,EAAAA,MAAAA;EAAW,aAAA,EAAA,OAAA,GAAA,MAAA,GAAA,SAAA;EASTW,QAAAA,EAAAA,MAAAA;EAEIC,YAAAA,EAAAA,MAAY;EACpBD,WAAAA,EAAAA,MAAAA;;AASgGF,UAZ5FE,mBAAAA,SAA4BV,eAYgEQ,CAAAA;AAGjFD,cAbPI,YAaOJ,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAC2BK,OAAAA,EAb1CF,mBAa0CE;EAAfT,QAAAA,cAAAA;EAEtBD,QAAAA,aAAAA;EAEaA,SAAAA,IAAAA,EAAAA,MAAAA;EACTA,QAAAA,WAAAA;EAAwCG,QAAAA,WAAAA;EAAcI,QAAAA,YAAAA;EACtDP,QAAAA,eAAAA;EAA4BG,QAAAA,SAAAA;EAAsBI,WAAAA,CAAAA,OAAAA,CAAAA,EAV9CC,mBAU8CD,EAAAA,cAAAA,CAAAA,EAAAA,CAAAA,GAAAA,GAAAA,OAAAA,CAAAA,GAAAA,SAAAA,EAAAA,aAAAA,CAAAA,EAVqCD,iBAUrCC,GAAAA,SAAAA;EAARI,UAAAA,CAAAA,OAAAA,EATxCH,mBASwCG,CAAAA,EAAAA,IAAAA;EAKrCJ,QAAAA,YAAAA;EACDA,YAAAA,CAAAA,SAAAA,EAbEF,UAaFE,CAAAA,EAAAA,IAAAA;EAA6BZ,kBAAAA,CAAAA,eAAAA,EAZfM,cAYeN,CAZAe,WAYAf,CAAAA,EAAAA,CAAAA,EAAAA,IAAAA;EAAmBE,OAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAChDU,OAAAA,CAAAA,IAAAA,EAXRP,YAWQO,CAAAA,EAAAA,IAAAA;EAAmBZ,QAAAA,gBAAAA;EACbA,oBAAAA,CAAAA,IAAAA,EAVDK,YAUCL,CAAAA,EAAAA,MAAAA,EAAAA;EACKI,UAAAA,CAAAA,IAAAA,CAAAA,EAVfC,YAUeD,GAAAA,SAAAA,EAAAA,WAAAA,CAAAA,EAVyBI,WAUzBJ,CAAAA,EAVuCQ,gBAUvCR,GAAAA,SAAAA;EAARY,WAAAA,CAAAA,IAAAA,EATPX,YASOW,EAAAA,WAAAA,CAAAA,EATqBR,WASrBQ,CAAAA,EATmCA,OASnCA,CAT2CJ,gBAS3CI,CAAAA;EACAX,QAAAA,cAAAA;EAAsBI,QAAAA,yBAAAA;EAA2BF,QAAAA,iBAAAA;EAAiB,QAAA,YAAA;yBALpEK;wBACDA,6BAA6BZ,mBAAmBE;wBAChDU,mBAAmBZ;8BACbA;2BACHgB,QAAQZ;2BACRC,sBAAsBI,2BAA2BF"}
+{"version":3,"file":"FileRenderer.d.ts","names":["ElementContent","Element","HASTElement","BaseCodeOptions","DiffsHighlighter","FileContents","FileHeaderRenderMode","LineAnnotation","RenderFileOptions","RenderRange","ThemedFileResult","WorkerPoolManager","FileRenderResult","FileRendererOptions","FileRenderer","LAnnotation","Partial","Promise"],"sources":["../../src/renderers/FileRenderer.d.ts"],"sourcesContent":["import type { ElementContent, Element as HASTElement } from 'hast';\nimport type { BaseCodeOptions, DiffsHighlighter, FileContents, FileHeaderRenderMode, LineAnnotation, RenderFileOptions, RenderRange, ThemedFileResult } from '../types';\nimport type { WorkerPoolManager } from '../worker';\nexport interface FileRenderResult {\n    gutterAST: ElementContent[];\n    contentAST: ElementContent[];\n    preAST: HASTElement;\n    headerAST: HASTElement | undefined;\n    css: string;\n    totalLines: number;\n    themeStyles: string;\n    baseThemeType: 'light' | 'dark' | undefined;\n    rowCount: number;\n    bufferBefore: number;\n    bufferAfter: number;\n}\nexport interface FileRendererOptions extends BaseCodeOptions {\n    headerRenderMode?: FileHeaderRenderMode;\n}\nexport declare class FileRenderer<LAnnotation = undefined> {\n    options: FileRendererOptions;\n    private onRenderUpdate?;\n    private workerManager?;\n    readonly __id: string;\n    private highlighter;\n    private renderCache;\n    private computedLang;\n    private lineAnnotations;\n    private lineCache;\n    constructor(options?: FileRendererOptions, onRenderUpdate?: (() => unknown) | undefined, workerManager?: WorkerPoolManager | undefined);\n    setOptions(options: FileRendererOptions): void;\n    mergeOptions(options: Partial<FileRendererOptions>): void;\n    setLineAnnotations(lineAnnotations: LineAnnotation<LAnnotation>[]): void;\n    cleanUp(): void;\n    hydrate(file: FileContents): void;\n    private getRenderOptions;\n    getOrCreateLineCache(file: FileContents): string[];\n    renderFile(file?: FileContents | undefined, renderRange?: RenderRange): FileRenderResult | undefined;\n    asyncRender(file: FileContents, renderRange?: RenderRange): Promise<FileRenderResult>;\n    private asyncHighlight;\n    private renderFileWithHighlighter;\n    private processFileResult;\n    private renderHeader;\n    renderFullHTML(result: FileRenderResult): string;\n    renderFullAST(result: FileRenderResult, children?: ElementContent[]): HASTElement;\n    renderCodeAST(result: FileRenderResult): ElementContent[];\n    renderPartialHTML(children: ElementContent[], includeCodeNode?: boolean): string;\n    initializeHighlighter(): Promise<DiffsHighlighter>;\n    onHighlightSuccess(file: FileContents, result: ThemedFileResult, options: RenderFileOptions): void;\n    onHighlightError(error: unknown): void;\n    private createPreElement;\n}\n//# sourceMappingURL=FileRenderer.d.ts.map"],"mappings":";;;;;;UAGiBY,gBAAAA;aACFZ;cACCA;EAFCY,MAAAA,EAGLV,OAHqB;EAClBF,SAAAA,EAGAE,OAHAF,GAAAA,SAAAA;EACCA,GAAAA,EAAAA,MAAAA;EACJE,UAAAA,EAAAA,MAAAA;EACGA,WAAAA,EAAAA,MAAAA;EAAW,aAAA,EAAA,OAAA,GAAA,MAAA,GAAA,SAAA;EASTW,QAAAA,EAAAA,MAAAA;EAGIC,YAAAA,EAAAA,MAAY;EACpBD,WAAAA,EAAAA,MAAAA;;AASgGF,UAb5FE,mBAAAA,SAA4BV,eAagEQ,CAAAA;EACrFE,gBAAAA,CAAAA,EAbDP,oBAaCO;;AACEG,cAZLF,YAYKE,CAAAA,cAAAA,SAAAA,CAAAA,CAAAA;EAC6BD,OAAAA,EAZ1CF,mBAY0CE;EAAfR,QAAAA,cAAAA;EAEtBF,QAAAA,aAAAA;EAEaA,SAAAA,IAAAA,EAAAA,MAAAA;EACTA,QAAAA,WAAAA;EAAwCI,QAAAA,WAAAA;EAAcG,QAAAA,YAAAA;EACtDP,QAAAA,eAAAA;EAA4BI,QAAAA,SAAAA;EAAsBG,WAAAA,CAAAA,OAAAA,CAAAA,EAT9CC,mBAS8CD,EAAAA,cAAAA,CAAAA,EAAAA,CAAAA,GAAAA,GAAAA,OAAAA,CAAAA,GAAAA,SAAAA,EAAAA,aAAAA,CAAAA,EATqCD,iBASrCC,GAAAA,SAAAA;EAARK,UAAAA,CAAAA,OAAAA,EARxCJ,mBAQwCI,CAAAA,EAAAA,IAAAA;EAKrCL,YAAAA,CAAAA,OAAAA,EAZDI,OAYCJ,CAZOC,mBAYPD,CAAAA,CAAAA,EAAAA,IAAAA;EACDA,kBAAAA,CAAAA,eAAAA,EAZcL,cAYdK,CAZ6BG,WAY7BH,CAAAA,EAAAA,CAAAA,EAAAA,IAAAA;EAA6BZ,OAAAA,CAAAA,CAAAA,EAAAA,IAAAA;EAAmBE,OAAAA,CAAAA,IAAAA,EAVxDG,YAUwDH,CAAAA,EAAAA,IAAAA;EAChDU,QAAAA,gBAAAA;EAAmBZ,oBAAAA,CAAAA,IAAAA,EATdK,YAScL,CAAAA,EAAAA,MAAAA,EAAAA;EACbA,UAAAA,CAAAA,IAAAA,CAAAA,EATVK,YASUL,GAAAA,SAAAA,EAAAA,WAAAA,CAAAA,EAT8BS,WAS9BT,CAAAA,EAT4CY,gBAS5CZ,GAAAA,SAAAA;EACKI,WAAAA,CAAAA,IAAAA,EATfC,YASeD,EAAAA,WAAAA,CAAAA,EATaK,WASbL,CAAAA,EAT2Ba,OAS3Bb,CATmCQ,gBASnCR,CAAAA;EAARa,QAAAA,cAAAA;EACAZ,QAAAA,yBAAAA;EAAsBK,QAAAA,iBAAAA;EAA2BF,QAAAA,YAAAA;EAAiB,cAAA,CAAA,MAAA,EALpEI,gBAKoE,CAAA,EAAA,MAAA;wBAJrEA,6BAA6BZ,mBAAmBE;wBAChDU,mBAAmBZ;8BACbA;2BACHiB,QAAQb;2BACRC,sBAAsBK,2BAA2BF"}

package/dist/renderers/FileRenderer.js

@@ -14,6 +14,7 @@ import { createPreElement } from "../utils/createPreElement.js";
 import { getFiletypeFromFileName } from "../utils/getFiletypeFromFileName.js";
 import { getHighlighterOptions } from "../utils/getHighlighterOptions.js";
 import { getLineAnnotationName } from "../utils/getLineAnnotationName.js";
+import { isFilePlainText } from "../utils/isFilePlainText.js";
 import { iterateOverFile } from "../utils/iterateOverFile.js";
 import { splitFileContents } from "../utils/splitFileContents.js";
 import { renderFileWithHighlighter } from "../utils/renderFileWithHighlighter.js";
@@ -43,10 +44,6 @@ var FileRenderer = class {
 			...options
 		};
 	}
-	setThemeType(themeType) {
-		if ((this.options.themeType ?? "system") === themeType) return;
-		this.mergeOptions({ themeType });
-	}
 	setLineAnnotations(lineAnnotations) {
 		this.lineAnnotations = {};
 		for (const annotation of lineAnnotations) {
@@ -69,14 +66,11 @@ var FileRenderer = class {
 		this.renderCache ??= {
 			file,
 			options,
-			highlighted: true,
+			highlighted: !isFilePlainText(file),
 			result: cache?.result,
 			renderRange: void 0
 		};
 		if (this.workerManager?.isWorkingPool() === true && this.renderCache.result == null) this.workerManager.highlightFileAST(this, file);
-		else this.asyncHighlight(file).then(({ result, options: options$1 }) => {
-			this.onHighlightSuccess(file, result, options$1);
-		});
 	}
 	getRenderOptions(file) {
 		const options = (() => {
@@ -132,7 +126,8 @@ var FileRenderer = class {
 			renderRange: void 0
 		};
 		if (this.workerManager?.isWorkingPool() === true) {
-			if (this.renderCache.result == null || !this.renderCache.highlighted && !areRenderRangesEqual(this.renderCache.renderRange, renderRange)) {
+			if (this.renderCache.result == null || !this.renderCache.highlighted && (file !== this.renderCache.file || !areRenderRangesEqual(this.renderCache.renderRange, renderRange))) {
+				this.renderCache.file = file;
 				this.renderCache.result = this.workerManager.getPlainFileAST(file, renderRange.startingLine, renderRange.totalLines, this.getOrCreateLineCache(file));
 				this.renderCache.renderRange = renderRange;
 			}
@@ -219,8 +214,8 @@ var FileRenderer = class {
 		return {
 			gutterAST: gutter.children ?? [],
 			contentAST: contentArray,
-			preAST: this.createPreElement(lines.length, themeStyles, baseThemeType),
-			headerAST: !disableFileHeader ? this.renderHeader(file, themeStyles, baseThemeType) : void 0,
+			preAST: this.createPreElement(lines.length),
+			headerAST: !disableFileHeader ? this.renderHeader(file) : void 0,
 			totalLines: lines.length,
 			rowCount,
 			themeStyles,
@@ -230,12 +225,11 @@ var FileRenderer = class {
 			css: ""
 		};
 	}
-	renderHeader(file, themeStyles, baseThemeType) {
-		const { themeType = "system" } = this.options;
+	renderHeader(file) {
+		const { headerRenderMode = "default" } = this.options;
 		return createFileHeaderElement({
 			fileOrDiff: file,
-			themeStyles,
-			themeType: baseThemeType ?? themeType
+			mode: headerRenderMode
 		});
 	}
 	renderFullHTML(result) {
@@ -285,16 +279,14 @@ var FileRenderer = class {
 	onHighlightError(error) {
 		console.error(error);
 	}
-	createPreElement(totalLines, themeStyles, baseThemeType) {
-		const { disableLineNumbers = false, overflow = "scroll", themeType = "system" } = this.options;
+	createPreElement(totalLines) {
+		const { disableLineNumbers = false, overflow = "scroll" } = this.options;
 		return createPreElement({
 			type: "file",
 			diffIndicators: "none",
 			disableBackground: true,
 			disableLineNumbers,
 			overflow,
-			themeStyles,
-			themeType: baseThemeType ?? themeType,
 			split: false,
 			totalLines
 		});

package/dist/renderers/FileRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileRenderer.js","names":["options: FileRendererOptions","onRenderUpdate?: () => unknown","workerManager?: WorkerPoolManager | undefined","options","options: RenderFileOptions","contentArray: ElementContent[]"],"sources":["../../src/renderers/FileRenderer.ts"],"sourcesContent":["import type { ElementContent, Element as HASTElement } from 'hast';\nimport { toHtml } from 'hast-util-to-html';\n\nimport { DEFAULT_RENDER_RANGE, DEFAULT_THEMES } from '../constants';\nimport { areLanguagesAttached } from '../highlighter/languages/areLanguagesAttached';\nimport {\n  getHighlighterIfLoaded,\n  getSharedHighlighter,\n} from '../highlighter/shared_highlighter';\nimport { areThemesAttached } from '../highlighter/themes/areThemesAttached';\nimport { hasResolvedThemes } from '../highlighter/themes/hasResolvedThemes';\nimport type {\n  BaseCodeOptions,\n  DiffsHighlighter,\n  FileContents,\n  LineAnnotation,\n  RenderedFileASTCache,\n  RenderFileOptions,\n  RenderFileResult,\n  RenderRange,\n  SupportedLanguages,\n  ThemedFileResult,\n  ThemeTypes,\n} from '../types';\nimport { areRenderRangesEqual } from '../utils/areRenderRangesEqual';\nimport { areThemesEqual } from '../utils/areThemesEqual';\nimport { createAnnotationElement } from '../utils/createAnnotationElement';\nimport { createContentColumn } from '../utils/createContentColumn';\nimport { createFileHeaderElement } from '../utils/createFileHeaderElement';\nimport { createPreElement } from '../utils/createPreElement';\nimport { getFiletypeFromFileName } from '../utils/getFiletypeFromFileName';\nimport { getHighlighterOptions } from '../utils/getHighlighterOptions';\nimport { getLineAnnotationName } from '../utils/getLineAnnotationName';\nimport { getThemes } from '../utils/getThemes';\nimport {\n  createGutterGap,\n  createGutterItem,\n  createGutterWrapper,\n  createHastElement,\n} from '../utils/hast_utils';\nimport { iterateOverFile } from '../utils/iterateOverFile';\nimport { renderFileWithHighlighter } from '../utils/renderFileWithHighlighter';\nimport { splitFileContents } from '../utils/splitFileContents';\nimport type { WorkerPoolManager } from '../worker';\n\ntype AnnotationLineMap<LAnnotation> = Record<\n  number,\n  LineAnnotation<LAnnotation>[] | undefined\n>;\n\ninterface GetRenderOptionsReturn {\n  options: RenderFileOptions;\n  forceRender: boolean;\n}\n\nexport interface FileRenderResult {\n  gutterAST: ElementContent[];\n  contentAST: ElementContent[];\n  preAST: HASTElement;\n  headerAST: HASTElement | undefined;\n  css: string;\n  totalLines: number;\n  themeStyles: string;\n  baseThemeType: 'light' | 'dark' | undefined;\n  rowCount: number;\n  bufferBefore: number;\n  bufferAfter: number;\n}\n\ninterface LineCache {\n  cacheKey: string | undefined;\n  lines: string[];\n}\n\n// oxlint-disable-next-line typescript/no-empty-object-type\nexport interface FileRendererOptions extends BaseCodeOptions {}\n\nlet instanceId = -1;\n\nexport class FileRenderer<LAnnotation = undefined> {\n  readonly __id: string = `file-renderer:${++instanceId}`;\n\n  private highlighter: DiffsHighlighter | undefined;\n  private renderCache: RenderedFileASTCache | undefined;\n  private computedLang: SupportedLanguages = 'text';\n  private lineAnnotations: AnnotationLineMap<LAnnotation> = {};\n  private lineCache: LineCache | undefined;\n\n  constructor(\n    public options: FileRendererOptions = { theme: DEFAULT_THEMES },\n    private onRenderUpdate?: () => unknown,\n    private workerManager?: WorkerPoolManager | undefined\n  ) {\n    if (workerManager?.isWorkingPool() !== true) {\n      this.highlighter = areThemesAttached(options.theme ?? DEFAULT_THEMES)\n        ? getHighlighterIfLoaded()\n        : undefined;\n    }\n  }\n\n  public setOptions(options: FileRendererOptions): void {\n    this.options = options;\n  }\n\n  private mergeOptions(options: Partial<FileRendererOptions>): void {\n    this.options = { ...this.options, ...options };\n  }\n\n  public setThemeType(themeType: ThemeTypes): void {\n    const currentThemeType = this.options.themeType ?? 'system';\n    if (currentThemeType === themeType) {\n      return;\n    }\n    this.mergeOptions({ themeType });\n  }\n\n  public setLineAnnotations(\n    lineAnnotations: LineAnnotation<LAnnotation>[]\n  ): void {\n    this.lineAnnotations = {};\n    for (const annotation of lineAnnotations) {\n      const arr = this.lineAnnotations[annotation.lineNumber] ?? [];\n      this.lineAnnotations[annotation.lineNumber] = arr;\n      arr.push(annotation);\n    }\n  }\n\n  public cleanUp(): void {\n    this.renderCache = undefined;\n    this.highlighter = undefined;\n    this.workerManager = undefined;\n    this.onRenderUpdate = undefined;\n    this.lineCache = undefined;\n  }\n\n  public hydrate(file: FileContents): void {\n    const { options } = this.getRenderOptions(file);\n    let cache = this.workerManager?.getFileResultCache(file);\n    if (cache != null && !areRenderOptionsEqual(options, cache.options)) {\n      cache = undefined;\n    }\n    this.renderCache ??= {\n      file,\n      options,\n      // NOTE(amadeus): If we're hydrating, we can assume there was\n      // pre-rendered HTML, otherwise one should not be hydrating\n      highlighted: true,\n      result: cache?.result,\n      // FIXME(amadeus): Add support for renderRanges\n      renderRange: undefined,\n    };\n    if (\n      this.workerManager?.isWorkingPool() === true &&\n      this.renderCache.result == null\n    ) {\n      this.workerManager.highlightFileAST(this, file);\n    } else {\n      void this.asyncHighlight(file).then(({ result, options }) => {\n        this.onHighlightSuccess(file, result, options);\n      });\n    }\n  }\n\n  private getRenderOptions(file: FileContents): GetRenderOptionsReturn {\n    const options: RenderFileOptions = (() => {\n      if (this.workerManager?.isWorkingPool() === true) {\n        return this.workerManager.getFileRenderOptions();\n      }\n      const { theme = DEFAULT_THEMES, tokenizeMaxLineLength = 1000 } =\n        this.options;\n      return { theme, tokenizeMaxLineLength };\n    })();\n    const { renderCache } = this;\n    if (renderCache?.result == null) {\n      return { options, forceRender: true };\n    }\n    if (\n      file !== renderCache.file ||\n      !areRenderOptionsEqual(options, renderCache.options)\n    ) {\n      return { options, forceRender: true };\n    }\n    return { options, forceRender: false };\n  }\n\n  public getOrCreateLineCache(file: FileContents): string[] {\n    // Uncached files will get split every time, not the greatest experience\n    // tbh... but something people should try to optimize away\n    if (file.cacheKey == null) {\n      this.lineCache = undefined;\n      return splitFileContents(file.contents);\n    }\n\n    let { lineCache } = this;\n    if (lineCache == null || lineCache.cacheKey !== file.cacheKey) {\n      lineCache = {\n        cacheKey: file.cacheKey,\n        lines: splitFileContents(file.contents),\n      };\n    }\n    this.lineCache = lineCache;\n    return lineCache.lines;\n  }\n\n  public renderFile(\n    file: FileContents | undefined = this.renderCache?.file,\n    renderRange: RenderRange = DEFAULT_RENDER_RANGE\n  ): FileRenderResult | undefined {\n    if (file == null) {\n      return undefined;\n    }\n    const cache = this.workerManager?.getFileResultCache(file);\n    if (cache != null && this.renderCache == null) {\n      this.renderCache = {\n        file,\n        highlighted: true,\n        renderRange: undefined,\n        ...cache,\n      };\n    }\n    const { options, forceRender } = this.getRenderOptions(file);\n    this.renderCache ??= {\n      file,\n      highlighted: false,\n      options,\n      result: undefined,\n      renderRange: undefined,\n    };\n    if (this.workerManager?.isWorkingPool() === true) {\n      // Cache invalidation based on renderRange comparison\n      if (\n        this.renderCache.result == null ||\n        (!this.renderCache.highlighted &&\n          !areRenderRangesEqual(this.renderCache.renderRange, renderRange))\n      ) {\n        this.renderCache.result = this.workerManager.getPlainFileAST(\n          file,\n          renderRange.startingLine,\n          renderRange.totalLines,\n          this.getOrCreateLineCache(file)\n        );\n        this.renderCache.renderRange = renderRange;\n      }\n\n      if (\n        // We should only attempt to kick off the worker highlighter if there\n        // are lines to render\n        renderRange.totalLines > 0 &&\n        (!this.renderCache.highlighted || forceRender)\n      ) {\n        this.workerManager.highlightFileAST(this, file);\n      }\n    } else {\n      this.computedLang = file.lang ?? getFiletypeFromFileName(file.name);\n      const hasThemes =\n        this.highlighter != null && areThemesAttached(options.theme);\n      const hasLangs =\n        this.highlighter != null && areLanguagesAttached(this.computedLang);\n\n      // If we have any semblance of a highlighter with the correct theme(s)\n      // attached, we can kick off some form of rendering.  If we don't have\n      // the correct language, then we can render plain text and after kick off\n      // an async job to get the highlighted AST\n      if (\n        this.highlighter != null &&\n        hasThemes &&\n        (forceRender ||\n          (!this.renderCache.highlighted && hasLangs) ||\n          this.renderCache.result == null)\n      ) {\n        const { result, options } = this.renderFileWithHighlighter(\n          file,\n          this.highlighter,\n          !hasLangs\n        );\n        this.renderCache = {\n          file,\n          options,\n          highlighted: hasLangs,\n          result,\n          renderRange: undefined,\n        };\n      }\n\n      // If we get in here it means we'll have to kick off an async highlight\n      // process which will involve initializing the highlighter with new themes\n      // and languages\n      if (!hasThemes || !hasLangs) {\n        void this.asyncHighlight(file).then(({ result, options }) => {\n          this.onHighlightSuccess(file, result, options);\n        });\n      }\n    }\n\n    return this.renderCache.result != null\n      ? this.processFileResult(\n          this.renderCache.file,\n          renderRange,\n          this.renderCache.result\n        )\n      : undefined;\n  }\n\n  async asyncRender(\n    file: FileContents,\n    renderRange: RenderRange = DEFAULT_RENDER_RANGE\n  ): Promise<FileRenderResult> {\n    const { result } = await this.asyncHighlight(file);\n    return this.processFileResult(file, renderRange, result);\n  }\n\n  private async asyncHighlight(file: FileContents): Promise<RenderFileResult> {\n    this.computedLang = file.lang ?? getFiletypeFromFileName(file.name);\n    const hasThemes =\n      this.highlighter != null &&\n      hasResolvedThemes(getThemes(this.options.theme));\n    const hasLangs =\n      this.highlighter != null && areLanguagesAttached(this.computedLang);\n    // If we don't have the required langs or themes, then we need to\n    // initialize the highlighter to load the appropriate languages and themes\n    if (this.highlighter == null || !hasThemes || !hasLangs) {\n      this.highlighter = await this.initializeHighlighter();\n    }\n    return this.renderFileWithHighlighter(file, this.highlighter);\n  }\n\n  private renderFileWithHighlighter(\n    file: FileContents,\n    highlighter: DiffsHighlighter,\n    forcePlainText = false\n  ): RenderFileResult {\n    const { options } = this.getRenderOptions(file);\n    const result = renderFileWithHighlighter(file, highlighter, options, {\n      forcePlainText,\n    });\n    return { result, options };\n  }\n\n  private processFileResult(\n    file: FileContents,\n    renderRange: RenderRange,\n    { code, themeStyles, baseThemeType }: ThemedFileResult\n  ): FileRenderResult {\n    const { disableFileHeader = false } = this.options;\n    const contentArray: ElementContent[] = [];\n    const gutter = createGutterWrapper();\n    const lines = this.getOrCreateLineCache(file);\n    let rowCount = 0;\n\n    iterateOverFile({\n      lines,\n      startingLine: renderRange.startingLine,\n      totalLines: renderRange.totalLines,\n      callback: ({ lineIndex, lineNumber }) => {\n        // Sparse array - directly indexed by lineIndex\n        const line = code[lineIndex];\n        if (line == null) {\n          const message = 'FileRenderer.processFileResult: Line doesnt exist';\n          console.error(message, {\n            name: file.name,\n            lineIndex,\n            lineNumber,\n            lines,\n          });\n          throw new Error(message);\n        }\n\n        if (line != null) {\n          // Add gutter line number\n          gutter.children.push(\n            createGutterItem('context', lineNumber, `${lineIndex}`)\n          );\n          contentArray.push(line);\n          rowCount++;\n\n          // Check annotations using ACTUAL line number from file\n          const annotations = this.lineAnnotations[lineNumber];\n          if (annotations != null) {\n            gutter.children.push(createGutterGap('context', 'annotation', 1));\n            contentArray.push(\n              createAnnotationElement({\n                type: 'annotation',\n                hunkIndex: 0,\n                lineIndex: lineNumber,\n                annotations: annotations.map((annotation) =>\n                  getLineAnnotationName(annotation)\n                ),\n              })\n            );\n            rowCount++;\n          }\n        }\n      },\n    });\n\n    // Finalize: wrap gutter and content\n    gutter.properties.style = `grid-row: span ${rowCount}`;\n    return {\n      gutterAST: gutter.children ?? [],\n      contentAST: contentArray,\n      preAST: this.createPreElement(lines.length, themeStyles, baseThemeType),\n      headerAST: !disableFileHeader\n        ? this.renderHeader(file, themeStyles, baseThemeType)\n        : undefined,\n      totalLines: lines.length,\n      rowCount,\n      themeStyles: themeStyles,\n      baseThemeType: baseThemeType,\n      bufferBefore: renderRange.bufferBefore,\n      bufferAfter: renderRange.bufferAfter,\n      css: '',\n    };\n  }\n\n  private renderHeader(\n    file: FileContents,\n    themeStyles: string,\n    baseThemeType: 'light' | 'dark' | undefined\n  ) {\n    const { themeType = 'system' } = this.options;\n    return createFileHeaderElement({\n      fileOrDiff: file,\n      themeStyles,\n      themeType: baseThemeType ?? themeType,\n    });\n  }\n\n  public renderFullHTML(result: FileRenderResult): string {\n    return toHtml(this.renderFullAST(result));\n  }\n\n  public renderFullAST(\n    result: FileRenderResult,\n    children: ElementContent[] = []\n  ): HASTElement {\n    children.push(\n      createHastElement({\n        tagName: 'code',\n        children: this.renderCodeAST(result),\n        properties: { 'data-code': '' },\n      })\n    );\n    return { ...result.preAST, children };\n  }\n\n  public renderCodeAST(result: FileRenderResult): ElementContent[] {\n    const gutter = createGutterWrapper();\n    gutter.children = result.gutterAST;\n    gutter.properties.style = `grid-row: span ${result.rowCount}`;\n    const contentColumn = createContentColumn(\n      result.contentAST,\n      result.rowCount\n    );\n    return [gutter, contentColumn];\n  }\n\n  public renderPartialHTML(\n    children: ElementContent[],\n    includeCodeNode: boolean = false\n  ): string {\n    if (!includeCodeNode) {\n      return toHtml(children);\n    }\n    return toHtml(\n      createHastElement({\n        tagName: 'code',\n        children,\n        properties: { 'data-code': '' },\n      })\n    );\n  }\n\n  public async initializeHighlighter(): Promise<DiffsHighlighter> {\n    this.highlighter = await getSharedHighlighter(\n      getHighlighterOptions(this.computedLang, this.options)\n    );\n    return this.highlighter;\n  }\n\n  public onHighlightSuccess(\n    file: FileContents,\n    result: ThemedFileResult,\n    options: RenderFileOptions\n  ): void {\n    if (this.renderCache == null) {\n      return;\n    }\n    const triggerRenderUpdate =\n      this.renderCache.file !== file ||\n      !this.renderCache.highlighted ||\n      !areRenderOptionsEqual(options, this.renderCache.options);\n\n    this.renderCache = {\n      file,\n      options,\n      highlighted: true,\n      result,\n      renderRange: undefined,\n    };\n\n    if (triggerRenderUpdate) {\n      this.onRenderUpdate?.();\n    }\n  }\n\n  public onHighlightError(error: unknown): void {\n    console.error(error);\n  }\n\n  private createPreElement(\n    totalLines: number,\n    themeStyles: string,\n    baseThemeType: 'light' | 'dark' | undefined\n  ): HASTElement {\n    const {\n      disableLineNumbers = false,\n      overflow = 'scroll',\n      themeType = 'system',\n    } = this.options;\n    return createPreElement({\n      type: 'file',\n      diffIndicators: 'none',\n      disableBackground: true,\n      disableLineNumbers,\n      overflow,\n      themeStyles,\n      themeType: baseThemeType ?? themeType,\n      split: false,\n      totalLines,\n    });\n  }\n}\n\nfunction areRenderOptionsEqual(\n  optionsA: RenderFileOptions,\n  optionsB: RenderFileOptions\n): boolean {\n  return (\n    areThemesEqual(optionsA.theme, optionsB.theme) &&\n    optionsA.tokenizeMaxLineLength === optionsB.tokenizeMaxLineLength\n  );\n}\n"],"mappings":"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"}
+{"version":3,"file":"FileRenderer.js","names":["options: FileRendererOptions","onRenderUpdate?: () => unknown","workerManager?: WorkerPoolManager | undefined","options: RenderFileOptions","options","contentArray: ElementContent[]"],"sources":["../../src/renderers/FileRenderer.ts"],"sourcesContent":["import type { ElementContent, Element as HASTElement } from 'hast';\nimport { toHtml } from 'hast-util-to-html';\n\nimport { DEFAULT_RENDER_RANGE, DEFAULT_THEMES } from '../constants';\nimport { areLanguagesAttached } from '../highlighter/languages/areLanguagesAttached';\nimport {\n  getHighlighterIfLoaded,\n  getSharedHighlighter,\n} from '../highlighter/shared_highlighter';\nimport { areThemesAttached } from '../highlighter/themes/areThemesAttached';\nimport { hasResolvedThemes } from '../highlighter/themes/hasResolvedThemes';\nimport type {\n  BaseCodeOptions,\n  DiffsHighlighter,\n  FileContents,\n  FileHeaderRenderMode,\n  LineAnnotation,\n  RenderedFileASTCache,\n  RenderFileOptions,\n  RenderFileResult,\n  RenderRange,\n  SupportedLanguages,\n  ThemedFileResult,\n} from '../types';\nimport { areRenderRangesEqual } from '../utils/areRenderRangesEqual';\nimport { areThemesEqual } from '../utils/areThemesEqual';\nimport { createAnnotationElement } from '../utils/createAnnotationElement';\nimport { createContentColumn } from '../utils/createContentColumn';\nimport { createFileHeaderElement } from '../utils/createFileHeaderElement';\nimport { createPreElement } from '../utils/createPreElement';\nimport { getFiletypeFromFileName } from '../utils/getFiletypeFromFileName';\nimport { getHighlighterOptions } from '../utils/getHighlighterOptions';\nimport { getLineAnnotationName } from '../utils/getLineAnnotationName';\nimport { getThemes } from '../utils/getThemes';\nimport {\n  createGutterGap,\n  createGutterItem,\n  createGutterWrapper,\n  createHastElement,\n} from '../utils/hast_utils';\nimport { isFilePlainText } from '../utils/isFilePlainText';\nimport { iterateOverFile } from '../utils/iterateOverFile';\nimport { renderFileWithHighlighter } from '../utils/renderFileWithHighlighter';\nimport { splitFileContents } from '../utils/splitFileContents';\nimport type { WorkerPoolManager } from '../worker';\n\ntype AnnotationLineMap<LAnnotation> = Record<\n  number,\n  LineAnnotation<LAnnotation>[] | undefined\n>;\n\ninterface GetRenderOptionsReturn {\n  options: RenderFileOptions;\n  forceRender: boolean;\n}\n\nexport interface FileRenderResult {\n  gutterAST: ElementContent[];\n  contentAST: ElementContent[];\n  preAST: HASTElement;\n  headerAST: HASTElement | undefined;\n  css: string;\n  totalLines: number;\n  themeStyles: string;\n  baseThemeType: 'light' | 'dark' | undefined;\n  rowCount: number;\n  bufferBefore: number;\n  bufferAfter: number;\n}\n\ninterface LineCache {\n  cacheKey: string | undefined;\n  lines: string[];\n}\n\nexport interface FileRendererOptions extends BaseCodeOptions {\n  headerRenderMode?: FileHeaderRenderMode;\n}\n\nlet instanceId = -1;\n\nexport class FileRenderer<LAnnotation = undefined> {\n  readonly __id: string = `file-renderer:${++instanceId}`;\n\n  private highlighter: DiffsHighlighter | undefined;\n  private renderCache: RenderedFileASTCache | undefined;\n  private computedLang: SupportedLanguages = 'text';\n  private lineAnnotations: AnnotationLineMap<LAnnotation> = {};\n  private lineCache: LineCache | undefined;\n\n  constructor(\n    public options: FileRendererOptions = { theme: DEFAULT_THEMES },\n    private onRenderUpdate?: () => unknown,\n    private workerManager?: WorkerPoolManager | undefined\n  ) {\n    if (workerManager?.isWorkingPool() !== true) {\n      this.highlighter = areThemesAttached(options.theme ?? DEFAULT_THEMES)\n        ? getHighlighterIfLoaded()\n        : undefined;\n    }\n  }\n\n  public setOptions(options: FileRendererOptions): void {\n    this.options = options;\n  }\n\n  public mergeOptions(options: Partial<FileRendererOptions>): void {\n    this.options = { ...this.options, ...options };\n  }\n\n  public setLineAnnotations(\n    lineAnnotations: LineAnnotation<LAnnotation>[]\n  ): void {\n    this.lineAnnotations = {};\n    for (const annotation of lineAnnotations) {\n      const arr = this.lineAnnotations[annotation.lineNumber] ?? [];\n      this.lineAnnotations[annotation.lineNumber] = arr;\n      arr.push(annotation);\n    }\n  }\n\n  public cleanUp(): void {\n    this.renderCache = undefined;\n    this.highlighter = undefined;\n    this.workerManager = undefined;\n    this.onRenderUpdate = undefined;\n    this.lineCache = undefined;\n  }\n\n  public hydrate(file: FileContents): void {\n    const { options } = this.getRenderOptions(file);\n    let cache = this.workerManager?.getFileResultCache(file);\n    if (cache != null && !areRenderOptionsEqual(options, cache.options)) {\n      cache = undefined;\n    }\n    this.renderCache ??= {\n      file,\n      options,\n      highlighted: !isFilePlainText(file),\n      result: cache?.result,\n      // FIXME(amadeus): Add support for renderRanges\n      renderRange: undefined,\n    };\n    if (\n      this.workerManager?.isWorkingPool() === true &&\n      this.renderCache.result == null\n    ) {\n      // We should only kick off a preload of the AST if we have a WorkerPool\n      this.workerManager.highlightFileAST(this, file);\n    }\n  }\n\n  private getRenderOptions(file: FileContents): GetRenderOptionsReturn {\n    const options: RenderFileOptions = (() => {\n      if (this.workerManager?.isWorkingPool() === true) {\n        return this.workerManager.getFileRenderOptions();\n      }\n      const { theme = DEFAULT_THEMES, tokenizeMaxLineLength = 1000 } =\n        this.options;\n      return { theme, tokenizeMaxLineLength };\n    })();\n    const { renderCache } = this;\n    if (renderCache?.result == null) {\n      return { options, forceRender: true };\n    }\n    if (\n      file !== renderCache.file ||\n      !areRenderOptionsEqual(options, renderCache.options)\n    ) {\n      return { options, forceRender: true };\n    }\n    return { options, forceRender: false };\n  }\n\n  public getOrCreateLineCache(file: FileContents): string[] {\n    // Uncached files will get split every time, not the greatest experience\n    // tbh... but something people should try to optimize away\n    if (file.cacheKey == null) {\n      this.lineCache = undefined;\n      return splitFileContents(file.contents);\n    }\n\n    let { lineCache } = this;\n    if (lineCache == null || lineCache.cacheKey !== file.cacheKey) {\n      lineCache = {\n        cacheKey: file.cacheKey,\n        lines: splitFileContents(file.contents),\n      };\n    }\n    this.lineCache = lineCache;\n    return lineCache.lines;\n  }\n\n  public renderFile(\n    file: FileContents | undefined = this.renderCache?.file,\n    renderRange: RenderRange = DEFAULT_RENDER_RANGE\n  ): FileRenderResult | undefined {\n    if (file == null) {\n      return undefined;\n    }\n    const cache = this.workerManager?.getFileResultCache(file);\n    if (cache != null && this.renderCache == null) {\n      this.renderCache = {\n        file,\n        highlighted: true,\n        renderRange: undefined,\n        ...cache,\n      };\n    }\n    const { options, forceRender } = this.getRenderOptions(file);\n    this.renderCache ??= {\n      file,\n      highlighted: false,\n      options,\n      result: undefined,\n      renderRange: undefined,\n    };\n    if (this.workerManager?.isWorkingPool() === true) {\n      // Cache invalidation based on renderRange comparison\n      if (\n        this.renderCache.result == null ||\n        (!this.renderCache.highlighted &&\n          (file !== this.renderCache.file ||\n            !areRenderRangesEqual(this.renderCache.renderRange, renderRange)))\n      ) {\n        this.renderCache.file = file;\n        this.renderCache.result = this.workerManager.getPlainFileAST(\n          file,\n          renderRange.startingLine,\n          renderRange.totalLines,\n          this.getOrCreateLineCache(file)\n        );\n        this.renderCache.renderRange = renderRange;\n      }\n\n      if (\n        // We should only attempt to kick off the worker highlighter if there\n        // are lines to render\n        renderRange.totalLines > 0 &&\n        (!this.renderCache.highlighted || forceRender)\n      ) {\n        this.workerManager.highlightFileAST(this, file);\n      }\n    } else {\n      this.computedLang = file.lang ?? getFiletypeFromFileName(file.name);\n      const hasThemes =\n        this.highlighter != null && areThemesAttached(options.theme);\n      const hasLangs =\n        this.highlighter != null && areLanguagesAttached(this.computedLang);\n\n      // If we have any semblance of a highlighter with the correct theme(s)\n      // attached, we can kick off some form of rendering.  If we don't have\n      // the correct language, then we can render plain text and after kick off\n      // an async job to get the highlighted AST\n      if (\n        this.highlighter != null &&\n        hasThemes &&\n        (forceRender ||\n          (!this.renderCache.highlighted && hasLangs) ||\n          this.renderCache.result == null)\n      ) {\n        const { result, options } = this.renderFileWithHighlighter(\n          file,\n          this.highlighter,\n          !hasLangs\n        );\n        this.renderCache = {\n          file,\n          options,\n          highlighted: hasLangs,\n          result,\n          renderRange: undefined,\n        };\n      }\n\n      // If we get in here it means we'll have to kick off an async highlight\n      // process which will involve initializing the highlighter with new themes\n      // and languages\n      if (!hasThemes || !hasLangs) {\n        void this.asyncHighlight(file).then(({ result, options }) => {\n          this.onHighlightSuccess(file, result, options);\n        });\n      }\n    }\n\n    return this.renderCache.result != null\n      ? this.processFileResult(\n          this.renderCache.file,\n          renderRange,\n          this.renderCache.result\n        )\n      : undefined;\n  }\n\n  async asyncRender(\n    file: FileContents,\n    renderRange: RenderRange = DEFAULT_RENDER_RANGE\n  ): Promise<FileRenderResult> {\n    const { result } = await this.asyncHighlight(file);\n    return this.processFileResult(file, renderRange, result);\n  }\n\n  private async asyncHighlight(file: FileContents): Promise<RenderFileResult> {\n    this.computedLang = file.lang ?? getFiletypeFromFileName(file.name);\n    const hasThemes =\n      this.highlighter != null &&\n      hasResolvedThemes(getThemes(this.options.theme));\n    const hasLangs =\n      this.highlighter != null && areLanguagesAttached(this.computedLang);\n    // If we don't have the required langs or themes, then we need to\n    // initialize the highlighter to load the appropriate languages and themes\n    if (this.highlighter == null || !hasThemes || !hasLangs) {\n      this.highlighter = await this.initializeHighlighter();\n    }\n    return this.renderFileWithHighlighter(file, this.highlighter);\n  }\n\n  private renderFileWithHighlighter(\n    file: FileContents,\n    highlighter: DiffsHighlighter,\n    forcePlainText = false\n  ): RenderFileResult {\n    const { options } = this.getRenderOptions(file);\n    const result = renderFileWithHighlighter(file, highlighter, options, {\n      forcePlainText,\n    });\n    return { result, options };\n  }\n\n  private processFileResult(\n    file: FileContents,\n    renderRange: RenderRange,\n    { code, themeStyles, baseThemeType }: ThemedFileResult\n  ): FileRenderResult {\n    const { disableFileHeader = false } = this.options;\n    const contentArray: ElementContent[] = [];\n    const gutter = createGutterWrapper();\n    const lines = this.getOrCreateLineCache(file);\n    let rowCount = 0;\n\n    iterateOverFile({\n      lines,\n      startingLine: renderRange.startingLine,\n      totalLines: renderRange.totalLines,\n      callback: ({ lineIndex, lineNumber }) => {\n        // Sparse array - directly indexed by lineIndex\n        const line = code[lineIndex];\n        if (line == null) {\n          const message = 'FileRenderer.processFileResult: Line doesnt exist';\n          console.error(message, {\n            name: file.name,\n            lineIndex,\n            lineNumber,\n            lines,\n          });\n          throw new Error(message);\n        }\n\n        if (line != null) {\n          // Add gutter line number\n          gutter.children.push(\n            createGutterItem('context', lineNumber, `${lineIndex}`)\n          );\n          contentArray.push(line);\n          rowCount++;\n\n          // Check annotations using ACTUAL line number from file\n          const annotations = this.lineAnnotations[lineNumber];\n          if (annotations != null) {\n            gutter.children.push(createGutterGap('context', 'annotation', 1));\n            contentArray.push(\n              createAnnotationElement({\n                type: 'annotation',\n                hunkIndex: 0,\n                lineIndex: lineNumber,\n                annotations: annotations.map((annotation) =>\n                  getLineAnnotationName(annotation)\n                ),\n              })\n            );\n            rowCount++;\n          }\n        }\n      },\n    });\n\n    // Finalize: wrap gutter and content\n    gutter.properties.style = `grid-row: span ${rowCount}`;\n    return {\n      gutterAST: gutter.children ?? [],\n      contentAST: contentArray,\n      preAST: this.createPreElement(lines.length),\n      headerAST: !disableFileHeader ? this.renderHeader(file) : undefined,\n      totalLines: lines.length,\n      rowCount,\n      themeStyles: themeStyles,\n      baseThemeType,\n      bufferBefore: renderRange.bufferBefore,\n      bufferAfter: renderRange.bufferAfter,\n      css: '',\n    };\n  }\n\n  private renderHeader(file: FileContents) {\n    const { headerRenderMode = 'default' } = this.options;\n    return createFileHeaderElement({\n      fileOrDiff: file,\n      mode: headerRenderMode,\n    });\n  }\n\n  public renderFullHTML(result: FileRenderResult): string {\n    return toHtml(this.renderFullAST(result));\n  }\n\n  public renderFullAST(\n    result: FileRenderResult,\n    children: ElementContent[] = []\n  ): HASTElement {\n    children.push(\n      createHastElement({\n        tagName: 'code',\n        children: this.renderCodeAST(result),\n        properties: { 'data-code': '' },\n      })\n    );\n    return { ...result.preAST, children };\n  }\n\n  public renderCodeAST(result: FileRenderResult): ElementContent[] {\n    const gutter = createGutterWrapper();\n    gutter.children = result.gutterAST;\n    gutter.properties.style = `grid-row: span ${result.rowCount}`;\n    const contentColumn = createContentColumn(\n      result.contentAST,\n      result.rowCount\n    );\n    return [gutter, contentColumn];\n  }\n\n  public renderPartialHTML(\n    children: ElementContent[],\n    includeCodeNode: boolean = false\n  ): string {\n    if (!includeCodeNode) {\n      return toHtml(children);\n    }\n    return toHtml(\n      createHastElement({\n        tagName: 'code',\n        children,\n        properties: { 'data-code': '' },\n      })\n    );\n  }\n\n  public async initializeHighlighter(): Promise<DiffsHighlighter> {\n    this.highlighter = await getSharedHighlighter(\n      getHighlighterOptions(this.computedLang, this.options)\n    );\n    return this.highlighter;\n  }\n\n  public onHighlightSuccess(\n    file: FileContents,\n    result: ThemedFileResult,\n    options: RenderFileOptions\n  ): void {\n    if (this.renderCache == null) {\n      return;\n    }\n    const triggerRenderUpdate =\n      this.renderCache.file !== file ||\n      !this.renderCache.highlighted ||\n      !areRenderOptionsEqual(options, this.renderCache.options);\n\n    this.renderCache = {\n      file,\n      options,\n      highlighted: true,\n      result,\n      renderRange: undefined,\n    };\n\n    if (triggerRenderUpdate) {\n      this.onRenderUpdate?.();\n    }\n  }\n\n  public onHighlightError(error: unknown): void {\n    console.error(error);\n  }\n\n  private createPreElement(totalLines: number): HASTElement {\n    const { disableLineNumbers = false, overflow = 'scroll' } = this.options;\n    return createPreElement({\n      type: 'file',\n      diffIndicators: 'none',\n      disableBackground: true,\n      disableLineNumbers,\n      overflow,\n      split: false,\n      totalLines,\n    });\n  }\n}\n\nfunction areRenderOptionsEqual(\n  optionsA: RenderFileOptions,\n  optionsB: RenderFileOptions\n): boolean {\n  return (\n    areThemesEqual(optionsA.theme, optionsB.theme) &&\n    optionsA.tokenizeMaxLineLength === optionsB.tokenizeMaxLineLength\n  );\n}\n"],"mappings":"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"}

package/dist/renderers/UnresolvedFileHunksRenderer.d.ts

@@ -1,16 +1,16 @@
-import { BaseDiffOptions, BaseDiffOptionsWithDefaults, FileDiffMetadata, MergeConflictMarkerRow, RenderRange } from "../types.js";
+import { FileDiffMetadata, MergeConflictMarkerRow, RenderRange } from "../types.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
 import "../worker/index.js";
-import { DiffHunksRenderer, HunksRenderResult, LineDecoration, RenderedLineContext, SplitLineDecorationProps, UnifiedInjectedRowPlacement, UnifiedLineDecorationProps } from "./DiffHunksRenderer.js";
+import { DiffHunksRenderer, DiffHunksRendererOptions, DiffHunksRendererOptionsWithDefaults, HunksRenderResult, LineDecoration, RenderedLineContext, SplitLineDecorationProps, UnifiedInjectedRowPlacement, UnifiedLineDecorationProps } from "./DiffHunksRenderer.js";
 import { MergeConflictDiffAction } from "../utils/parseMergeConflictDiffFromFile.js";
 import { Element } from "hast";
 
 //#region src/renderers/UnresolvedFileHunksRenderer.d.ts
-interface BaseUnresolvedOptionsWithDefaults extends BaseDiffOptionsWithDefaults {
+interface BaseUnresolvedOptionsWithDefaults extends DiffHunksRendererOptionsWithDefaults {
   mergeConflictActionsType: MergeConflictActionsType;
 }
 type MergeConflictActionsType = 'none' | 'default' | 'custom';
-interface UnresolvedFileHunksRendererOptions extends BaseDiffOptions {
+interface UnresolvedFileHunksRendererOptions extends DiffHunksRendererOptions {
   mergeConflictActionsType?: MergeConflictActionsType;
 }
 declare class UnresolvedFileHunksRenderer<LAnnotation = undefined> extends DiffHunksRenderer<LAnnotation> {
@@ -24,7 +24,7 @@ declare class UnresolvedFileHunksRenderer<LAnnotation = undefined> extends DiffH
   private addInjectedRow;
   renderDiff(diff?: FileDiffMetadata | undefined, renderRange?: RenderRange): HunksRenderResult | undefined;
   asyncRender(diff: FileDiffMetadata, renderRange?: RenderRange): Promise<HunksRenderResult>;
-  protected createPreElement(split: boolean, totalLines: number, themeStyles: string, baseThemeType: 'light' | 'dark' | undefined): Element;
+  protected createPreElement(split: boolean, totalLines: number): Element;
   protected getUnifiedLineDecoration({
     type,
     lineType

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

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFileHunksRenderer.d.ts","names":["Element","HASTElement","BaseDiffOptions","BaseDiffOptionsWithDefaults","FileDiffMetadata","MergeConflictMarkerRow","RenderRange","MergeConflictDiffAction","WorkerPoolManager","DiffHunksRenderer","HunksRenderResult","LineDecoration","RenderedLineContext","SplitLineDecorationProps","UnifiedInjectedRowPlacement","UnifiedLineDecorationProps","BaseUnresolvedOptionsWithDefaults","MergeConflictActionsType","UnresolvedFileHunksRendererOptions","UnresolvedFileHunksRenderer","LAnnotation","Promise","type","lineType","side"],"sources":["../../src/renderers/UnresolvedFileHunksRenderer.d.ts"],"sourcesContent":["import type { Element as HASTElement } from 'hast';\nimport type { BaseDiffOptions, BaseDiffOptionsWithDefaults, FileDiffMetadata, MergeConflictMarkerRow, RenderRange } from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport { DiffHunksRenderer, type HunksRenderResult, type LineDecoration, type RenderedLineContext, type SplitLineDecorationProps, type UnifiedInjectedRowPlacement, type UnifiedLineDecorationProps } from './DiffHunksRenderer';\ninterface BaseUnresolvedOptionsWithDefaults extends BaseDiffOptionsWithDefaults {\n    mergeConflictActionsType: MergeConflictActionsType;\n}\ntype MergeConflictActionsType = 'none' | 'default' | 'custom';\nexport interface UnresolvedFileHunksRendererOptions extends BaseDiffOptions {\n    mergeConflictActionsType?: MergeConflictActionsType;\n}\nexport declare class UnresolvedFileHunksRenderer<LAnnotation = undefined> extends DiffHunksRenderer<LAnnotation> {\n    private pendingConflictActions;\n    private pendingMarkerRows;\n    private injectedRows;\n    options: UnresolvedFileHunksRendererOptions;\n    constructor(options?: UnresolvedFileHunksRendererOptions, onRenderUpdate?: () => unknown, workerManager?: WorkerPoolManager | undefined);\n    setConflictState(conflictActions: (MergeConflictDiffAction | undefined)[], markerRows: MergeConflictMarkerRow[], diff: FileDiffMetadata): void;\n    private syncInjectedRows;\n    private addInjectedRow;\n    renderDiff(diff?: FileDiffMetadata | undefined, renderRange?: RenderRange): HunksRenderResult | undefined;\n    asyncRender(diff: FileDiffMetadata, renderRange?: RenderRange): Promise<HunksRenderResult>;\n    protected createPreElement(split: boolean, totalLines: number, themeStyles: string, baseThemeType: 'light' | 'dark' | undefined): HASTElement;\n    protected getUnifiedLineDecoration({ type, lineType }: UnifiedLineDecorationProps): LineDecoration;\n    protected getSplitLineDecoration({ side, type }: SplitLineDecorationProps): LineDecoration;\n    protected getUnifiedInjectedRowsForLine: (ctx: RenderedLineContext) => UnifiedInjectedRowPlacement | undefined;\n    protected getOptionsWithDefaults(): BaseUnresolvedOptionsWithDefaults;\n}\nexport {};\n//# sourceMappingURL=UnresolvedFileHunksRenderer.d.ts.map"],"mappings":";;;;;;;;UAKUgB,iCAAAA,SAA0Cb;4BACtBc;;AAFmM,KAI5NA,wBAAAA,GAHKD,MAAAA,GAAiC,SAAA,GACbC,QAAAA;AAEzBA,UACYC,kCAAAA,SAA2ChB,eAD/B,CAAA;EACZgB,wBAAAA,CAAAA,EACcD,wBAAAA;AAE/B;AAAoGG,cAA/ED,2BAA+EC,CAAAA,cAAAA,SAAAA,CAAAA,SAAlBX,iBAAkBW,CAAAA,WAAAA,CAAAA,CAAAA;EAIvFF,QAAAA,sBAAAA;EACaA,QAAAA,iBAAAA;EAAoFV,QAAAA,YAAAA;EACvED,OAAAA,EAF1BW,kCAE0BX;EAAoDF,WAAAA,CAAAA,OAAAA,CAAAA,EADjEa,kCACiEb,EAAAA,cAAAA,CAAAA,EAAAA,GAAAA,GAAAA,OAAAA,EAAAA,aAAAA,CAAAA,EADmBG,iBACnBH,GAAAA,SAAAA;EAAgCD,gBAAAA,CAAAA,eAAAA,EAAAA,CAApFG,uBAAoFH,GAAAA,SAAAA,CAAAA,EAAAA,EAAAA,UAAAA,EAAhCC,sBAAgCD,EAAAA,EAAAA,IAAAA,EAAAA,gBAAAA,CAAAA,EAAAA,IAAAA;EAGrGA,QAAAA,gBAAAA;EAA4CE,QAAAA,cAAAA;EAAcI,UAAAA,CAAAA,IAAAA,CAAAA,EAA1DN,gBAA0DM,GAAAA,SAAAA,EAAAA,WAAAA,CAAAA,EAAdJ,WAAcI,CAAAA,EAAAA,iBAAAA,GAAAA,SAAAA;EAC1DN,WAAAA,CAAAA,IAAAA,EAAAA,gBAAAA,EAAAA,WAAAA,CAAAA,EAAgCE,WAAhCF,CAAAA,EAA8CiB,OAA9CjB,CAAsDM,iBAAtDN,CAAAA;EAAgCE,UAAAA,gBAAAA,CAAAA,KAAAA,EAAAA,OAAAA,EAAAA,UAAAA,EAAAA,MAAAA,EAAAA,WAAAA,EAAAA,MAAAA,EAAAA,aAAAA,EAAAA,OAAAA,GAAAA,MAAAA,GAAAA,SAAAA,CAAAA,EACgFL,OADhFK;EAAsBI,UAAAA,wBAAAA,CAAAA;IAAAA,IAAAA;IAAAA;EAAAA,CAAAA,EAEjBK,0BAFiBL,CAAAA,EAEYC,cAFZD;EAARW,UAAAA,sBAAAA,CAAAA;IAAAA,IAAAA;IAAAA;EAAAA,CAAAA,EAGfR,wBAHeQ,CAAAA,EAGYV,cAHZU;EACkEpB,UAAAA,6BAAAA,EAAAA,CAAAA,GAAAA,EAGnFW,mBAHmFX,EAAAA,GAG3Da,2BAH2Db,GAAAA,SAAAA;EAC7FqB,UAAAA,sBAAAA,CAAAA,CAAAA,EAGDN,iCAHCM"}
+{"version":3,"file":"UnresolvedFileHunksRenderer.d.ts","names":["Element","HASTElement","FileDiffMetadata","MergeConflictMarkerRow","RenderRange","MergeConflictDiffAction","WorkerPoolManager","DiffHunksRenderer","DiffHunksRendererOptions","DiffHunksRendererOptionsWithDefaults","HunksRenderResult","LineDecoration","RenderedLineContext","SplitLineDecorationProps","UnifiedInjectedRowPlacement","UnifiedLineDecorationProps","BaseUnresolvedOptionsWithDefaults","MergeConflictActionsType","UnresolvedFileHunksRendererOptions","UnresolvedFileHunksRenderer","LAnnotation","Promise","type","lineType","side"],"sources":["../../src/renderers/UnresolvedFileHunksRenderer.d.ts"],"sourcesContent":["import type { Element as HASTElement } from 'hast';\nimport type { FileDiffMetadata, MergeConflictMarkerRow, RenderRange } from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport { DiffHunksRenderer, type DiffHunksRendererOptions, type DiffHunksRendererOptionsWithDefaults, type HunksRenderResult, type LineDecoration, type RenderedLineContext, type SplitLineDecorationProps, type UnifiedInjectedRowPlacement, type UnifiedLineDecorationProps } from './DiffHunksRenderer';\ninterface BaseUnresolvedOptionsWithDefaults extends DiffHunksRendererOptionsWithDefaults {\n    mergeConflictActionsType: MergeConflictActionsType;\n}\ntype MergeConflictActionsType = 'none' | 'default' | 'custom';\nexport interface UnresolvedFileHunksRendererOptions extends DiffHunksRendererOptions {\n    mergeConflictActionsType?: MergeConflictActionsType;\n}\nexport declare class UnresolvedFileHunksRenderer<LAnnotation = undefined> extends DiffHunksRenderer<LAnnotation> {\n    private pendingConflictActions;\n    private pendingMarkerRows;\n    private injectedRows;\n    options: UnresolvedFileHunksRendererOptions;\n    constructor(options?: UnresolvedFileHunksRendererOptions, onRenderUpdate?: () => unknown, workerManager?: WorkerPoolManager | undefined);\n    setConflictState(conflictActions: (MergeConflictDiffAction | undefined)[], markerRows: MergeConflictMarkerRow[], diff: FileDiffMetadata): void;\n    private syncInjectedRows;\n    private addInjectedRow;\n    renderDiff(diff?: FileDiffMetadata | undefined, renderRange?: RenderRange): HunksRenderResult | undefined;\n    asyncRender(diff: FileDiffMetadata, renderRange?: RenderRange): Promise<HunksRenderResult>;\n    protected createPreElement(split: boolean, totalLines: number): HASTElement;\n    protected getUnifiedLineDecoration({ type, lineType }: UnifiedLineDecorationProps): LineDecoration;\n    protected getSplitLineDecoration({ side, type }: SplitLineDecorationProps): LineDecoration;\n    protected getUnifiedInjectedRowsForLine: (ctx: RenderedLineContext) => UnifiedInjectedRowPlacement | undefined;\n    protected getOptionsWithDefaults(): BaseUnresolvedOptionsWithDefaults;\n}\nexport {};\n//# sourceMappingURL=UnresolvedFileHunksRenderer.d.ts.map"],"mappings":";;;;;;;;UAKUgB,iCAAAA,SAA0CP;4BACtBQ;;AAF6Q,KAItSA,wBAAAA,GAHKD,MAAAA,GAAiC,SAAA,GACbC,QAAAA;AAEzBA,UACYC,kCAAAA,SAA2CV,wBAD/B,CAAA;EACZU,wBAAAA,CAAAA,EACcD,wBAAAA;AAE/B;AAAoGG,cAA/ED,2BAA+EC,CAAAA,cAAAA,SAAAA,CAAAA,SAAlBb,iBAAkBa,CAAAA,WAAAA,CAAAA,CAAAA;EAIvFF,QAAAA,sBAAAA;EACaA,QAAAA,iBAAAA;EAAoFZ,QAAAA,YAAAA;EACvED,OAAAA,EAF1Ba,kCAE0Bb;EAAoDF,WAAAA,CAAAA,OAAAA,CAAAA,EADjEe,kCACiEf,EAAAA,cAAAA,CAAAA,EAAAA,GAAAA,GAAAA,OAAAA,EAAAA,aAAAA,CAAAA,EADmBG,iBACnBH,GAAAA,SAAAA;EAAgCD,gBAAAA,CAAAA,eAAAA,EAAAA,CAApFG,uBAAoFH,GAAAA,SAAAA,CAAAA,EAAAA,EAAAA,UAAAA,EAAhCC,sBAAgCD,EAAAA,EAAAA,IAAAA,EAAAA,gBAAAA,CAAAA,EAAAA,IAAAA;EAGrGA,QAAAA,gBAAAA;EAA4CE,QAAAA,cAAAA;EAAcM,UAAAA,CAAAA,IAAAA,CAAAA,EAA1DR,gBAA0DQ,GAAAA,SAAAA,EAAAA,WAAAA,CAAAA,EAAdN,WAAcM,CAAAA,EAAAA,iBAAAA,GAAAA,SAAAA;EAC1DR,WAAAA,CAAAA,IAAAA,EAAAA,gBAAAA,EAAAA,WAAAA,CAAAA,EAAgCE,WAAhCF,CAAAA,EAA8CmB,OAA9CnB,CAAsDQ,iBAAtDR,CAAAA;EAAgCE,UAAAA,gBAAAA,CAAAA,KAAAA,EAAAA,OAAAA,EAAAA,UAAAA,EAAAA,MAAAA,CAAAA,EACcH,OADdG;EAAsBM,UAAAA,wBAAAA,CAAAA;IAAAA,IAAAA;IAAAA;EAAAA,CAAAA,EAEjBK,0BAFiBL,CAAAA,EAEYC,cAFZD;EAARW,UAAAA,sBAAAA,CAAAA;IAAAA,IAAAA;IAAAA;EAAAA,CAAAA,EAGfR,wBAHeQ,CAAAA,EAGYV,cAHZU;EACApB,UAAAA,6BAAAA,EAAAA,CAAAA,GAAAA,EAGjBW,mBAHiBX,EAAAA,GAGOa,2BAHPb,GAAAA,SAAAA;EAC3BqB,UAAAA,sBAAAA,CAAAA,CAAAA,EAGDN,iCAHCM"}

package/dist/renderers/UnresolvedFileHunksRenderer.js

@@ -48,8 +48,8 @@ var UnresolvedFileHunksRenderer = class extends DiffHunksRenderer {
 		this.syncInjectedRows(this.pendingConflictActions, this.pendingMarkerRows, diff);
 		return super.asyncRender(diff, renderRange);
 	}
-	createPreElement(split, totalLines, themeStyles, baseThemeType) {
-		return super.createPreElement(split, totalLines, themeStyles, baseThemeType, { "data-has-merge-conflict": "" });
+	createPreElement(split, totalLines) {
+		return super.createPreElement(split, totalLines, { "data-has-merge-conflict": "" });
 	}
 	getUnifiedLineDecoration({ type, lineType }) {
 		const mergeConflictType = type === "change" ? lineType === "change-deletion" ? "current" : "incoming" : void 0;

package/dist/renderers/UnresolvedFileHunksRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnresolvedFileHunksRenderer.js","names":["row: MergeConflictInjectedRowData","before: InjectedRow[]","after: InjectedRow[]","contentChildren: HASTElement[]"],"sources":["../../src/renderers/UnresolvedFileHunksRenderer.ts"],"sourcesContent":["import type { Element as HASTElement, Properties } from 'hast';\n\nimport { DEFAULT_RENDER_RANGE, DEFAULT_THEMES } from '../constants';\nimport type {\n  BaseDiffOptions,\n  BaseDiffOptionsWithDefaults,\n  FileDiffMetadata,\n  MergeConflictMarkerRow,\n  MergeConflictResolution,\n  RenderRange,\n} from '../types';\nimport { getMergeConflictActionSlotName } from '../utils/getMergeConflictActionSlotName';\nimport {\n  createGutterGap,\n  createHastElement,\n  createTextNodeElement,\n} from '../utils/hast_utils';\nimport {\n  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n} from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport {\n  DiffHunksRenderer,\n  type HunksRenderResult,\n  type InjectedRow,\n  type LineDecoration,\n  type RenderedLineContext,\n  type SplitLineDecorationProps,\n  type UnifiedInjectedRowPlacement,\n  type UnifiedLineDecorationProps,\n} from './DiffHunksRenderer';\n\ntype MergeConflictMarkerType =\n  | 'marker-start'\n  | 'marker-base'\n  | 'marker-separator'\n  | 'marker-end'\n  | 'current'\n  | 'incoming';\n\ninterface MergeConflictActionRowData {\n  hunkIndex: number;\n  lineIndex: number;\n  conflictIndex: number;\n}\n\ninterface MergeConflictMarkerInjectedRow extends MergeConflictMarkerRow {\n  type: Extract<\n    MergeConflictMarkerRow['type'],\n    'marker-start' | 'marker-base' | 'marker-separator' | 'marker-end'\n  >;\n  lineText: string;\n  lineIndex: number;\n}\n\n// NOTE(amadeus): Don't love this, should probably rework into an\n// interface/extender\ntype MergeConflictInjectedRowData =\n  | ({ type: 'actions' } & MergeConflictActionRowData)\n  | MergeConflictMarkerInjectedRow;\n\ninterface BaseUnresolvedOptionsWithDefaults extends BaseDiffOptionsWithDefaults {\n  mergeConflictActionsType: MergeConflictActionsType;\n}\n\ntype MergeConflictActionsType = 'none' | 'default' | 'custom';\n\nexport interface UnresolvedFileHunksRendererOptions extends BaseDiffOptions {\n  mergeConflictActionsType?: MergeConflictActionsType;\n}\n\nexport class UnresolvedFileHunksRenderer<\n  LAnnotation = undefined,\n> extends DiffHunksRenderer<LAnnotation> {\n  private pendingConflictActions: (MergeConflictDiffAction | undefined)[] = [];\n  private pendingMarkerRows: MergeConflictMarkerRow[] = [];\n  private injectedRows = new Map<string, MergeConflictInjectedRowData[]>();\n  public override options: UnresolvedFileHunksRendererOptions;\n\n  constructor(\n    options: UnresolvedFileHunksRendererOptions = {\n      theme: DEFAULT_THEMES,\n    },\n    onRenderUpdate?: () => unknown,\n    workerManager?: WorkerPoolManager | undefined\n  ) {\n    super(undefined, onRenderUpdate, workerManager);\n    this.options = options;\n  }\n\n  // SELF_REVIEW: I don't love how this is hooked up with `renderDiff` right\n  // now, so we definitely need to figure out what the fuck we are gonna do\n  // about it...\n  // I think at the very least we should keep it like annotations, and just\n  // sorta assume there's a disconnect there\n  public setConflictState(\n    conflictActions: (MergeConflictDiffAction | undefined)[],\n    markerRows: MergeConflictMarkerRow[],\n    diff: FileDiffMetadata\n  ): void {\n    this.pendingConflictActions = conflictActions;\n    this.pendingMarkerRows = markerRows;\n    this.syncInjectedRows(conflictActions, markerRows, diff);\n  }\n\n  private syncInjectedRows(\n    conflictActions: (MergeConflictDiffAction | undefined)[],\n    markerRows: MergeConflictMarkerRow[],\n    diff: FileDiffMetadata\n  ): void {\n    this.injectedRows.clear();\n    for (const action of conflictActions) {\n      const anchor =\n        action != null ? getMergeConflictActionAnchor(action, diff) : undefined;\n      if (action == null || anchor == null) {\n        continue;\n      }\n      const row: MergeConflictInjectedRowData = {\n        type: 'actions',\n        hunkIndex: anchor.hunkIndex,\n        lineIndex: anchor.lineIndex,\n        conflictIndex: action.conflictIndex,\n      };\n      this.addInjectedRow(row);\n    }\n\n    for (const row of markerRows) {\n      this.addInjectedRow(row);\n    }\n  }\n\n  private addInjectedRow(row: MergeConflictInjectedRowData): void {\n    const key = `${row.hunkIndex}:${row.lineIndex}`;\n    const rows = this.injectedRows.get(key);\n    if (rows == null) {\n      this.injectedRows.set(key, [row]);\n    } else {\n      rows.push(row);\n    }\n  }\n\n  public override renderDiff(\n    diff?: FileDiffMetadata | undefined,\n    renderRange: RenderRange = DEFAULT_RENDER_RANGE\n  ): HunksRenderResult | undefined {\n    if (diff != null) {\n      this.syncInjectedRows(\n        this.pendingConflictActions,\n        this.pendingMarkerRows,\n        diff\n      );\n    }\n    return super.renderDiff(diff, renderRange);\n  }\n\n  public override async asyncRender(\n    diff: FileDiffMetadata,\n    renderRange: RenderRange = DEFAULT_RENDER_RANGE\n  ): Promise<HunksRenderResult> {\n    this.syncInjectedRows(\n      this.pendingConflictActions,\n      this.pendingMarkerRows,\n      diff\n    );\n    return super.asyncRender(diff, renderRange);\n  }\n\n  protected override createPreElement(\n    split: boolean,\n    totalLines: number,\n    themeStyles: string,\n    baseThemeType: 'light' | 'dark' | undefined\n  ): HASTElement {\n    return super.createPreElement(\n      split,\n      totalLines,\n      themeStyles,\n      baseThemeType,\n      { 'data-has-merge-conflict': '' }\n    );\n  }\n\n  protected override getUnifiedLineDecoration({\n    type,\n    lineType,\n  }: UnifiedLineDecorationProps): LineDecoration {\n    const mergeConflictType =\n      type === 'change'\n        ? lineType === 'change-deletion'\n          ? 'current'\n          : 'incoming'\n        : undefined;\n    return {\n      gutterLineType: type === 'change' ? 'context' : lineType,\n      gutterProperties: getMergeConflictGutterProperties(mergeConflictType),\n      contentProperties: getMergeConflictContentProperties(\n        type,\n        mergeConflictType\n      ),\n    };\n  }\n\n  protected override getSplitLineDecoration({\n    side,\n    type,\n  }: SplitLineDecorationProps): LineDecoration {\n    const mergeConflictType =\n      type === 'change'\n        ? side === 'deletions'\n          ? 'current'\n          : 'incoming'\n        : undefined;\n    return {\n      gutterLineType: type === 'change' ? 'context' : type,\n      gutterProperties: getMergeConflictGutterProperties(mergeConflictType),\n      contentProperties: getMergeConflictContentProperties(\n        type,\n        mergeConflictType\n      ),\n    };\n  }\n\n  protected override getUnifiedInjectedRowsForLine = (\n    ctx: RenderedLineContext\n  ): UnifiedInjectedRowPlacement | undefined => {\n    const rows = this.injectedRows.get(`${ctx.hunkIndex}:${ctx.lineIndex}`);\n    if (rows == null || rows.length === 0) {\n      return undefined;\n    }\n    const { mergeConflictActionsType } = this.getOptionsWithDefaults();\n    const before: InjectedRow[] = [];\n    const after: InjectedRow[] = [];\n    for (const row of rows) {\n      if (row.type === 'actions') {\n        before.push({\n          content: createMergeConflictActionsRowElement({\n            row,\n            includeDefaultActions: mergeConflictActionsType === 'default',\n            includeSlot: true,\n          }),\n          gutter: createMergeConflictGutterGap('action'),\n        });\n        continue;\n      }\n      const target = row.type === 'marker-end' ? after : before;\n      target.push({\n        content: createMergeConflictMarkerRowElement(row),\n        gutter: createMergeConflictGutterGap('marker', row.type),\n      });\n    }\n    return {\n      before: before.length > 0 ? before : undefined,\n      after: after.length > 0 ? after : undefined,\n    };\n  };\n\n  protected override getOptionsWithDefaults(): BaseUnresolvedOptionsWithDefaults {\n    const options = super.getOptionsWithDefaults();\n    options.diffStyle = 'unified';\n    options.lineDiffType = 'none';\n    // NOTE(amadeus): Aint nobody got time for a spread\n    (options as BaseUnresolvedOptionsWithDefaults).mergeConflictActionsType =\n      this.options.mergeConflictActionsType ?? 'default';\n    return options as BaseUnresolvedOptionsWithDefaults;\n  }\n}\n\nfunction getMergeConflictGutterProperties(\n  mergeConflictType: MergeConflictMarkerType | undefined\n): Properties | undefined {\n  return mergeConflictType != null\n    ? { 'data-merge-conflict': mergeConflictType }\n    : undefined;\n}\n\nfunction getMergeConflictContentProperties(\n  type: 'change' | 'context' | 'context-expanded',\n  mergeConflictType: MergeConflictMarkerType | undefined\n): Properties | undefined {\n  if (mergeConflictType == null) {\n    return undefined;\n  }\n  if (type === 'change') {\n    if (mergeConflictType === 'current' || mergeConflictType === 'incoming') {\n      return {\n        'data-line-type': 'context',\n        'data-merge-conflict': mergeConflictType,\n      };\n    }\n    return undefined;\n  }\n  if (\n    mergeConflictType === 'marker-start' ||\n    mergeConflictType === 'marker-base' ||\n    mergeConflictType === 'marker-separator' ||\n    mergeConflictType === 'marker-end'\n  ) {\n    return { 'data-merge-conflict': mergeConflictType };\n  }\n  return undefined;\n}\n\nfunction createMergeConflictGutterGap(\n  type: 'action' | 'marker',\n  markerType?: MergeConflictMarkerInjectedRow['type']\n): HASTElement {\n  const gap = createGutterGap(undefined, 'annotation', 1);\n  gap.properties['data-gutter-buffer'] =\n    type === 'action'\n      ? 'merge-conflict-action'\n      : `merge-conflict-${markerType ?? 'marker'}`;\n  return gap;\n}\n\ninterface CreateMergeConflictActionsRowElementProps {\n  row: MergeConflictActionRowData;\n  includeDefaultActions: boolean;\n  includeSlot: boolean;\n}\n\nfunction createMergeConflictActionsRowElement({\n  row,\n  includeDefaultActions,\n  includeSlot,\n}: CreateMergeConflictActionsRowElementProps): HASTElement {\n  const contentChildren: HASTElement[] = includeDefaultActions\n    ? createMergeConflictActionsContent(row.conflictIndex)\n    : [];\n  if (includeSlot) {\n    contentChildren.push(\n      createHastElement({\n        tagName: 'slot',\n        properties: {\n          name: getMergeConflictActionSlotName({\n            hunkIndex: row.hunkIndex,\n            lineIndex: row.lineIndex,\n            conflictIndex: row.conflictIndex,\n          }),\n          'data-merge-conflict-action-slot': '',\n        },\n      })\n    );\n  }\n  return createHastElement({\n    tagName: 'div',\n    properties: {\n      'data-merge-conflict-actions': '',\n    },\n    children: [\n      createHastElement({\n        tagName: 'div',\n        properties: { 'data-merge-conflict-actions-content': '' },\n        children: contentChildren,\n      }),\n    ],\n  });\n}\n\nfunction createMergeConflictMarkerRowElement(\n  row: MergeConflictMarkerInjectedRow\n): HASTElement {\n  return createHastElement({\n    tagName: 'div',\n    properties: {\n      'data-merge-conflict': row.type,\n      'data-merge-conflict-marker-row': '',\n    },\n    children: [\n      createTextNodeElement(row.lineText.replace(/(?:\\r\\n|\\n|\\r)$/, '')),\n    ],\n  });\n}\n\nfunction createMergeConflictActionsContent(\n  conflictIndex: number\n): HASTElement[] {\n  return [\n    createMergeConflictActionButton({\n      resolution: 'current',\n      label: 'Accept current change',\n      conflictIndex,\n    }),\n    createMergeConflictActionSeparator(),\n    createMergeConflictActionButton({\n      resolution: 'incoming',\n      label: 'Accept incoming change',\n      conflictIndex,\n    }),\n    createMergeConflictActionSeparator(),\n    createMergeConflictActionButton({\n      resolution: 'both',\n      label: 'Accept both',\n      conflictIndex,\n    }),\n  ];\n}\n\ninterface CreateMergeConflictActionButtonProps {\n  resolution: MergeConflictResolution;\n  label: string;\n  conflictIndex: number;\n}\n\nfunction createMergeConflictActionButton({\n  resolution,\n  label,\n  conflictIndex,\n}: CreateMergeConflictActionButtonProps): HASTElement {\n  return createHastElement({\n    tagName: 'button',\n    properties: {\n      type: 'button',\n      'data-merge-conflict-action': resolution,\n      'data-merge-conflict-conflict-index': `${conflictIndex}`,\n    },\n    children: [createTextNodeElement(label)],\n  });\n}\n\nfunction createMergeConflictActionSeparator(): HASTElement {\n  return createHastElement({\n    tagName: 'span',\n    properties: { 'data-merge-conflict-action-separator': '' },\n    children: [createTextNodeElement('|')],\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"UnresolvedFileHunksRenderer.js","names":["row: MergeConflictInjectedRowData","before: InjectedRow[]","after: InjectedRow[]","contentChildren: HASTElement[]"],"sources":["../../src/renderers/UnresolvedFileHunksRenderer.ts"],"sourcesContent":["import type { Element as HASTElement, Properties } from 'hast';\n\nimport { DEFAULT_RENDER_RANGE, DEFAULT_THEMES } from '../constants';\nimport type {\n  FileDiffMetadata,\n  MergeConflictMarkerRow,\n  MergeConflictResolution,\n  RenderRange,\n} from '../types';\nimport { getMergeConflictActionSlotName } from '../utils/getMergeConflictActionSlotName';\nimport {\n  createGutterGap,\n  createHastElement,\n  createTextNodeElement,\n} from '../utils/hast_utils';\nimport {\n  getMergeConflictActionAnchor,\n  type MergeConflictDiffAction,\n} from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport {\n  DiffHunksRenderer,\n  type DiffHunksRendererOptions,\n  type DiffHunksRendererOptionsWithDefaults,\n  type HunksRenderResult,\n  type InjectedRow,\n  type LineDecoration,\n  type RenderedLineContext,\n  type SplitLineDecorationProps,\n  type UnifiedInjectedRowPlacement,\n  type UnifiedLineDecorationProps,\n} from './DiffHunksRenderer';\n\ntype MergeConflictMarkerType =\n  | 'marker-start'\n  | 'marker-base'\n  | 'marker-separator'\n  | 'marker-end'\n  | 'current'\n  | 'incoming';\n\ninterface MergeConflictActionRowData {\n  hunkIndex: number;\n  lineIndex: number;\n  conflictIndex: number;\n}\n\ninterface MergeConflictMarkerInjectedRow extends MergeConflictMarkerRow {\n  type: Extract<\n    MergeConflictMarkerRow['type'],\n    'marker-start' | 'marker-base' | 'marker-separator' | 'marker-end'\n  >;\n  lineText: string;\n  lineIndex: number;\n}\n\n// NOTE(amadeus): Don't love this, should probably rework into an\n// interface/extender\ntype MergeConflictInjectedRowData =\n  | ({ type: 'actions' } & MergeConflictActionRowData)\n  | MergeConflictMarkerInjectedRow;\n\ninterface BaseUnresolvedOptionsWithDefaults extends DiffHunksRendererOptionsWithDefaults {\n  mergeConflictActionsType: MergeConflictActionsType;\n}\n\ntype MergeConflictActionsType = 'none' | 'default' | 'custom';\n\nexport interface UnresolvedFileHunksRendererOptions extends DiffHunksRendererOptions {\n  mergeConflictActionsType?: MergeConflictActionsType;\n}\n\nexport class UnresolvedFileHunksRenderer<\n  LAnnotation = undefined,\n> extends DiffHunksRenderer<LAnnotation> {\n  private pendingConflictActions: (MergeConflictDiffAction | undefined)[] = [];\n  private pendingMarkerRows: MergeConflictMarkerRow[] = [];\n  private injectedRows = new Map<string, MergeConflictInjectedRowData[]>();\n  public override options: UnresolvedFileHunksRendererOptions;\n\n  constructor(\n    options: UnresolvedFileHunksRendererOptions = {\n      theme: DEFAULT_THEMES,\n    },\n    onRenderUpdate?: () => unknown,\n    workerManager?: WorkerPoolManager | undefined\n  ) {\n    super(undefined, onRenderUpdate, workerManager);\n    this.options = options;\n  }\n\n  // SELF_REVIEW: I don't love how this is hooked up with `renderDiff` right\n  // now, so we definitely need to figure out what the fuck we are gonna do\n  // about it...\n  // I think at the very least we should keep it like annotations, and just\n  // sorta assume there's a disconnect there\n  public setConflictState(\n    conflictActions: (MergeConflictDiffAction | undefined)[],\n    markerRows: MergeConflictMarkerRow[],\n    diff: FileDiffMetadata\n  ): void {\n    this.pendingConflictActions = conflictActions;\n    this.pendingMarkerRows = markerRows;\n    this.syncInjectedRows(conflictActions, markerRows, diff);\n  }\n\n  private syncInjectedRows(\n    conflictActions: (MergeConflictDiffAction | undefined)[],\n    markerRows: MergeConflictMarkerRow[],\n    diff: FileDiffMetadata\n  ): void {\n    this.injectedRows.clear();\n    for (const action of conflictActions) {\n      const anchor =\n        action != null ? getMergeConflictActionAnchor(action, diff) : undefined;\n      if (action == null || anchor == null) {\n        continue;\n      }\n      const row: MergeConflictInjectedRowData = {\n        type: 'actions',\n        hunkIndex: anchor.hunkIndex,\n        lineIndex: anchor.lineIndex,\n        conflictIndex: action.conflictIndex,\n      };\n      this.addInjectedRow(row);\n    }\n\n    for (const row of markerRows) {\n      this.addInjectedRow(row);\n    }\n  }\n\n  private addInjectedRow(row: MergeConflictInjectedRowData): void {\n    const key = `${row.hunkIndex}:${row.lineIndex}`;\n    const rows = this.injectedRows.get(key);\n    if (rows == null) {\n      this.injectedRows.set(key, [row]);\n    } else {\n      rows.push(row);\n    }\n  }\n\n  public override renderDiff(\n    diff?: FileDiffMetadata | undefined,\n    renderRange: RenderRange = DEFAULT_RENDER_RANGE\n  ): HunksRenderResult | undefined {\n    if (diff != null) {\n      this.syncInjectedRows(\n        this.pendingConflictActions,\n        this.pendingMarkerRows,\n        diff\n      );\n    }\n    return super.renderDiff(diff, renderRange);\n  }\n\n  public override async asyncRender(\n    diff: FileDiffMetadata,\n    renderRange: RenderRange = DEFAULT_RENDER_RANGE\n  ): Promise<HunksRenderResult> {\n    this.syncInjectedRows(\n      this.pendingConflictActions,\n      this.pendingMarkerRows,\n      diff\n    );\n    return super.asyncRender(diff, renderRange);\n  }\n\n  protected override createPreElement(\n    split: boolean,\n    totalLines: number\n  ): HASTElement {\n    return super.createPreElement(split, totalLines, {\n      'data-has-merge-conflict': '',\n    });\n  }\n\n  protected override getUnifiedLineDecoration({\n    type,\n    lineType,\n  }: UnifiedLineDecorationProps): LineDecoration {\n    const mergeConflictType =\n      type === 'change'\n        ? lineType === 'change-deletion'\n          ? 'current'\n          : 'incoming'\n        : undefined;\n    return {\n      gutterLineType: type === 'change' ? 'context' : lineType,\n      gutterProperties: getMergeConflictGutterProperties(mergeConflictType),\n      contentProperties: getMergeConflictContentProperties(\n        type,\n        mergeConflictType\n      ),\n    };\n  }\n\n  protected override getSplitLineDecoration({\n    side,\n    type,\n  }: SplitLineDecorationProps): LineDecoration {\n    const mergeConflictType =\n      type === 'change'\n        ? side === 'deletions'\n          ? 'current'\n          : 'incoming'\n        : undefined;\n    return {\n      gutterLineType: type === 'change' ? 'context' : type,\n      gutterProperties: getMergeConflictGutterProperties(mergeConflictType),\n      contentProperties: getMergeConflictContentProperties(\n        type,\n        mergeConflictType\n      ),\n    };\n  }\n\n  protected override getUnifiedInjectedRowsForLine = (\n    ctx: RenderedLineContext\n  ): UnifiedInjectedRowPlacement | undefined => {\n    const rows = this.injectedRows.get(`${ctx.hunkIndex}:${ctx.lineIndex}`);\n    if (rows == null || rows.length === 0) {\n      return undefined;\n    }\n    const { mergeConflictActionsType } = this.getOptionsWithDefaults();\n    const before: InjectedRow[] = [];\n    const after: InjectedRow[] = [];\n    for (const row of rows) {\n      if (row.type === 'actions') {\n        before.push({\n          content: createMergeConflictActionsRowElement({\n            row,\n            includeDefaultActions: mergeConflictActionsType === 'default',\n            includeSlot: true,\n          }),\n          gutter: createMergeConflictGutterGap('action'),\n        });\n        continue;\n      }\n      const target = row.type === 'marker-end' ? after : before;\n      target.push({\n        content: createMergeConflictMarkerRowElement(row),\n        gutter: createMergeConflictGutterGap('marker', row.type),\n      });\n    }\n    return {\n      before: before.length > 0 ? before : undefined,\n      after: after.length > 0 ? after : undefined,\n    };\n  };\n\n  protected override getOptionsWithDefaults(): BaseUnresolvedOptionsWithDefaults {\n    const options = super.getOptionsWithDefaults();\n    options.diffStyle = 'unified';\n    options.lineDiffType = 'none';\n    // NOTE(amadeus): Aint nobody got time for a spread\n    (options as BaseUnresolvedOptionsWithDefaults).mergeConflictActionsType =\n      this.options.mergeConflictActionsType ?? 'default';\n    return options as BaseUnresolvedOptionsWithDefaults;\n  }\n}\n\nfunction getMergeConflictGutterProperties(\n  mergeConflictType: MergeConflictMarkerType | undefined\n): Properties | undefined {\n  return mergeConflictType != null\n    ? { 'data-merge-conflict': mergeConflictType }\n    : undefined;\n}\n\nfunction getMergeConflictContentProperties(\n  type: 'change' | 'context' | 'context-expanded',\n  mergeConflictType: MergeConflictMarkerType | undefined\n): Properties | undefined {\n  if (mergeConflictType == null) {\n    return undefined;\n  }\n  if (type === 'change') {\n    if (mergeConflictType === 'current' || mergeConflictType === 'incoming') {\n      return {\n        'data-line-type': 'context',\n        'data-merge-conflict': mergeConflictType,\n      };\n    }\n    return undefined;\n  }\n  if (\n    mergeConflictType === 'marker-start' ||\n    mergeConflictType === 'marker-base' ||\n    mergeConflictType === 'marker-separator' ||\n    mergeConflictType === 'marker-end'\n  ) {\n    return { 'data-merge-conflict': mergeConflictType };\n  }\n  return undefined;\n}\n\nfunction createMergeConflictGutterGap(\n  type: 'action' | 'marker',\n  markerType?: MergeConflictMarkerInjectedRow['type']\n): HASTElement {\n  const gap = createGutterGap(undefined, 'annotation', 1);\n  gap.properties['data-gutter-buffer'] =\n    type === 'action'\n      ? 'merge-conflict-action'\n      : `merge-conflict-${markerType ?? 'marker'}`;\n  return gap;\n}\n\ninterface CreateMergeConflictActionsRowElementProps {\n  row: MergeConflictActionRowData;\n  includeDefaultActions: boolean;\n  includeSlot: boolean;\n}\n\nfunction createMergeConflictActionsRowElement({\n  row,\n  includeDefaultActions,\n  includeSlot,\n}: CreateMergeConflictActionsRowElementProps): HASTElement {\n  const contentChildren: HASTElement[] = includeDefaultActions\n    ? createMergeConflictActionsContent(row.conflictIndex)\n    : [];\n  if (includeSlot) {\n    contentChildren.push(\n      createHastElement({\n        tagName: 'slot',\n        properties: {\n          name: getMergeConflictActionSlotName({\n            hunkIndex: row.hunkIndex,\n            lineIndex: row.lineIndex,\n            conflictIndex: row.conflictIndex,\n          }),\n          'data-merge-conflict-action-slot': '',\n        },\n      })\n    );\n  }\n  return createHastElement({\n    tagName: 'div',\n    properties: {\n      'data-merge-conflict-actions': '',\n    },\n    children: [\n      createHastElement({\n        tagName: 'div',\n        properties: { 'data-merge-conflict-actions-content': '' },\n        children: contentChildren,\n      }),\n    ],\n  });\n}\n\nfunction createMergeConflictMarkerRowElement(\n  row: MergeConflictMarkerInjectedRow\n): HASTElement {\n  return createHastElement({\n    tagName: 'div',\n    properties: {\n      'data-merge-conflict': row.type,\n      'data-merge-conflict-marker-row': '',\n    },\n    children: [\n      createTextNodeElement(row.lineText.replace(/(?:\\r\\n|\\n|\\r)$/, '')),\n    ],\n  });\n}\n\nfunction createMergeConflictActionsContent(\n  conflictIndex: number\n): HASTElement[] {\n  return [\n    createMergeConflictActionButton({\n      resolution: 'current',\n      label: 'Accept current change',\n      conflictIndex,\n    }),\n    createMergeConflictActionSeparator(),\n    createMergeConflictActionButton({\n      resolution: 'incoming',\n      label: 'Accept incoming change',\n      conflictIndex,\n    }),\n    createMergeConflictActionSeparator(),\n    createMergeConflictActionButton({\n      resolution: 'both',\n      label: 'Accept both',\n      conflictIndex,\n    }),\n  ];\n}\n\ninterface CreateMergeConflictActionButtonProps {\n  resolution: MergeConflictResolution;\n  label: string;\n  conflictIndex: number;\n}\n\nfunction createMergeConflictActionButton({\n  resolution,\n  label,\n  conflictIndex,\n}: CreateMergeConflictActionButtonProps): HASTElement {\n  return createHastElement({\n    tagName: 'button',\n    properties: {\n      type: 'button',\n      'data-merge-conflict-action': resolution,\n      'data-merge-conflict-conflict-index': `${conflictIndex}`,\n    },\n    children: [createTextNodeElement(label)],\n  });\n}\n\nfunction createMergeConflictActionSeparator(): HASTElement {\n  return createHastElement({\n    tagName: 'span',\n    properties: { 'data-merge-conflict-action-separator': '' },\n    children: [createTextNodeElement('|')],\n  });\n}\n"],"mappings":"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"}

package/dist/ssr/index.d.ts

@@ -1,6 +1,6 @@
-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 { AnnotationLineMap, AnnotationSide, AnnotationSpan, AppliedThemeStyleCache, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, ConflictResolverTypes, ContextContent, CustomPreProperties, DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffMetadata, FileHeaderRenderMode, 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, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, VirtualFileMetrics, VirtualWindowSpecs } from "../types.js";
 import { PreloadDiffOptions, PreloadFileDiffOptions, PreloadFileDiffResult, PreloadMultiFileDiffOptions, PreloadMultiFileDiffResult, PreloadPatchDiffOptions, PreloadPatchDiffResult, PreloadUnresolvedFileOptions, PreloadUnresolvedFileResult, preloadDiffHTML, preloadFileDiff, preloadMultiFileDiff, preloadPatchDiff, preloadUnresolvedFile, preloadUnresolvedFileHTML } from "./preloadDiffs.js";
 import { PreloadFileOptions, PreloadedFileResult, preloadFile } from "./preloadFile.js";
 import { PreloadPatchFileOptions, preloadPatchFile } from "./preloadPatchFile.js";
 import { renderHTML } from "./renderHTML.js";
-export { 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, PreloadDiffOptions, PreloadFileDiffOptions, PreloadFileDiffResult, PreloadFileOptions, PreloadMultiFileDiffOptions, PreloadMultiFileDiffResult, PreloadPatchDiffOptions, PreloadPatchDiffResult, PreloadPatchFileOptions, PreloadUnresolvedFileOptions, PreloadUnresolvedFileResult, PreloadedFileResult, 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, preloadDiffHTML, preloadFile, preloadFileDiff, preloadMultiFileDiff, preloadPatchDiff, preloadPatchFile, preloadUnresolvedFile, preloadUnresolvedFileHTML, renderHTML };
+export { AnnotationLineMap, AnnotationSide, AnnotationSpan, AppliedThemeStyleCache, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, ConflictResolverTypes, ContextContent, CustomPreProperties, DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffLineAnnotation, DiffLineEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffMetadata, FileHeaderRenderMode, 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, PreloadDiffOptions, PreloadFileDiffOptions, PreloadFileDiffResult, PreloadFileOptions, PreloadMultiFileDiffOptions, PreloadMultiFileDiffResult, PreloadPatchDiffOptions, PreloadPatchDiffResult, PreloadPatchFileOptions, PreloadUnresolvedFileOptions, PreloadUnresolvedFileResult, PreloadedFileResult, ProcessFileConflictData, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, VirtualFileMetrics, VirtualWindowSpecs, preloadDiffHTML, preloadFile, preloadFileDiff, preloadMultiFileDiff, preloadPatchDiff, preloadPatchFile, preloadUnresolvedFile, preloadUnresolvedFileHTML, renderHTML };

package/dist/ssr/preloadDiffs.js

@@ -1,9 +1,10 @@
+import { wrapThemeCSS } from "../utils/cssWrappers.js";
 import { DiffHunksRenderer } from "../renderers/DiffHunksRenderer.js";
 import { parseDiffFromFile } from "../utils/parseDiffFromFile.js";
 import { parseMergeConflictDiffFromFile } from "../utils/parseMergeConflictDiffFromFile.js";
 import { UnresolvedFileHunksRenderer } from "../renderers/UnresolvedFileHunksRenderer.js";
 import { getUnresolvedDiffHunksRendererOptions } from "../components/UnresolvedFile.js";
-import { createStyleElement } from "../utils/createStyleElement.js";
+import { createStyleElement, createThemeStyleElement } from "../utils/createStyleElement.js";
 import { getSingularPatch } from "../utils/getSingularPatch.js";
 import { renderHTML } from "./renderHTML.js";
 
@@ -13,14 +14,14 @@ async function preloadDiffHTML({ fileDiff, oldFile, newFile, options, annotation
 	if (fileDiff == null) throw new Error("preloadFileDiff: You must pass at least a fileDiff prop or oldFile/newFile props");
 	const renderer = new DiffHunksRenderer(getHunksRendererOptions(options));
 	if (annotations != null && annotations.length > 0) renderer.setLineAnnotations(annotations);
-	return renderHTML(processHunkResult(await renderer.asyncRender(fileDiff), renderer, options?.unsafeCSS));
+	return renderHTML(processHunkResult(await renderer.asyncRender(fileDiff), renderer, options?.unsafeCSS, options?.themeType ?? "system"));
 }
 async function preloadUnresolvedFileHTML({ file, options, annotations }) {
 	const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(file, options?.maxContextLines);
 	const renderer = new UnresolvedFileHunksRenderer(getUnresolvedDiffHunksRendererOptions(options));
 	if (annotations != null && annotations.length > 0) renderer.setLineAnnotations(annotations);
 	renderer.setConflictState(actions, markerRows, fileDiff);
-	return renderHTML(processHunkResult(await renderer.asyncRender(fileDiff), renderer, options?.unsafeCSS));
+	return renderHTML(processHunkResult(await renderer.asyncRender(fileDiff), renderer, options?.unsafeCSS, options?.themeType ?? "system"));
 }
 async function preloadMultiFileDiff({ oldFile, newFile, options, annotations }) {
 	return {
@@ -72,8 +73,9 @@ async function preloadPatchDiff({ patch, options, annotations }) {
 		})
 	};
 }
-function processHunkResult(hunkResult, renderer, unsafeCSS) {
+function processHunkResult(hunkResult, renderer, unsafeCSS, themeType) {
 	const children = [createStyleElement(hunkResult.css, true)];
+	children.push(createThemeStyleElement(wrapThemeCSS(hunkResult.themeStyles, hunkResult.baseThemeType ?? themeType)));
 	if (unsafeCSS != null) children.push(createStyleElement(unsafeCSS));
 	if (hunkResult.headerElement != null) children.push(hunkResult.headerElement);
 	const code = renderer.renderFullAST(hunkResult);
@@ -84,6 +86,7 @@ function processHunkResult(hunkResult, renderer, unsafeCSS) {
 function getHunksRendererOptions(options) {
 	return {
 		...options,
+		headerRenderMode: options?.renderCustomHeader != null ? "custom" : "default",
 		hunkSeparators: typeof options?.hunkSeparators === "function" ? "custom" : options?.hunkSeparators
 	};
 }

package/dist/ssr/preloadDiffs.js.map

@@ -1 +1 @@
-{"version":3,"file":"preloadDiffs.js","names":[],"sources":["../../src/ssr/preloadDiffs.ts"],"sourcesContent":["import type { FileDiffOptions } from '../components/FileDiff';\nimport {\n  getUnresolvedDiffHunksRendererOptions,\n  type UnresolvedFileOptions,\n} from '../components/UnresolvedFile';\nimport {\n  DiffHunksRenderer,\n  type HunksRenderResult,\n} from '../renderers/DiffHunksRenderer';\nimport { UnresolvedFileHunksRenderer } from '../renderers/UnresolvedFileHunksRenderer';\nimport type {\n  BaseDiffOptions,\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n} from '../types';\nimport { createStyleElement } from '../utils/createStyleElement';\nimport { getSingularPatch } from '../utils/getSingularPatch';\nimport { parseDiffFromFile } from '../utils/parseDiffFromFile';\nimport { parseMergeConflictDiffFromFile } from '../utils/parseMergeConflictDiffFromFile';\nimport { renderHTML } from './renderHTML';\n\nexport interface PreloadDiffOptions<LAnnotation> {\n  fileDiff?: FileDiffMetadata;\n  oldFile?: FileContents;\n  newFile?: FileContents;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport async function preloadDiffHTML<LAnnotation = undefined>({\n  fileDiff,\n  oldFile,\n  newFile,\n  options,\n  annotations,\n}: PreloadDiffOptions<LAnnotation>): Promise<string> {\n  if (fileDiff == null && oldFile != null && newFile != null) {\n    fileDiff = parseDiffFromFile(oldFile, newFile);\n  }\n  if (fileDiff == null) {\n    throw new Error(\n      'preloadFileDiff: You must pass at least a fileDiff prop or oldFile/newFile props'\n    );\n  }\n  const renderer = new DiffHunksRenderer<LAnnotation>(\n    getHunksRendererOptions(options)\n  );\n  if (annotations != null && annotations.length > 0) {\n    renderer.setLineAnnotations(annotations);\n  }\n  return renderHTML(\n    processHunkResult(\n      await renderer.asyncRender(fileDiff),\n      renderer,\n      options?.unsafeCSS\n    )\n  );\n}\n\nexport async function preloadUnresolvedFileHTML<LAnnotation = undefined>({\n  file,\n  options,\n  annotations,\n}: PreloadUnresolvedFileOptions<LAnnotation>): Promise<string> {\n  const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(\n    file,\n    options?.maxContextLines\n  );\n  const renderer = new UnresolvedFileHunksRenderer<LAnnotation>(\n    getUnresolvedDiffHunksRendererOptions(options)\n  );\n  if (annotations != null && annotations.length > 0) {\n    renderer.setLineAnnotations(annotations);\n  }\n  renderer.setConflictState(actions, markerRows, fileDiff);\n  return renderHTML(\n    processHunkResult(\n      await renderer.asyncRender(fileDiff),\n      renderer,\n      options?.unsafeCSS\n    )\n  );\n}\n\nexport interface PreloadMultiFileDiffOptions<LAnnotation> {\n  oldFile: FileContents;\n  newFile: FileContents;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadMultiFileDiffResult<\n  LAnnotation,\n> extends PreloadMultiFileDiffOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadMultiFileDiff<LAnnotation = undefined>({\n  oldFile,\n  newFile,\n  options,\n  annotations,\n}: PreloadMultiFileDiffOptions<LAnnotation>): Promise<\n  PreloadMultiFileDiffResult<LAnnotation>\n> {\n  return {\n    newFile,\n    oldFile,\n    options,\n    annotations,\n    prerenderedHTML: await preloadDiffHTML({\n      oldFile,\n      newFile,\n      options,\n      annotations,\n    }),\n  };\n}\n\nexport interface PreloadFileDiffOptions<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadFileDiffResult<\n  LAnnotation,\n> extends PreloadFileDiffOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadFileDiff<LAnnotation = undefined>({\n  fileDiff,\n  options,\n  annotations,\n}: PreloadFileDiffOptions<LAnnotation>): Promise<\n  PreloadFileDiffResult<LAnnotation>\n> {\n  return {\n    fileDiff,\n    options,\n    annotations,\n    prerenderedHTML: await preloadDiffHTML({\n      fileDiff,\n      options,\n      annotations,\n    }),\n  };\n}\n\nexport interface PreloadUnresolvedFileOptions<LAnnotation> {\n  file: FileContents;\n  options?: Omit<\n    UnresolvedFileOptions<LAnnotation>,\n    'onMergeConflictAction' | 'onMergeConflictResolve' | 'onPostRender'\n  >;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadUnresolvedFileResult<\n  LAnnotation,\n> extends PreloadUnresolvedFileOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadUnresolvedFile<LAnnotation = undefined>({\n  file,\n  options,\n  annotations,\n}: PreloadUnresolvedFileOptions<LAnnotation>): Promise<\n  PreloadUnresolvedFileResult<LAnnotation>\n> {\n  return {\n    file,\n    options,\n    annotations,\n    prerenderedHTML: await preloadUnresolvedFileHTML({\n      file,\n      options,\n      annotations,\n    }),\n  };\n}\n\nexport interface PreloadPatchDiffOptions<LAnnotation> {\n  patch: string;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadPatchDiffResult<\n  LAnnotation,\n> extends PreloadPatchDiffOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadPatchDiff<LAnnotation = undefined>({\n  patch,\n  options,\n  annotations,\n}: PreloadPatchDiffOptions<LAnnotation>): Promise<\n  PreloadPatchDiffResult<LAnnotation>\n> {\n  const fileDiff = getSingularPatch(patch);\n  return {\n    patch,\n    options,\n    annotations,\n    prerenderedHTML: await preloadDiffHTML({\n      fileDiff,\n      options,\n      annotations,\n    }),\n  };\n}\n\nfunction processHunkResult<LAnnotation>(\n  hunkResult: HunksRenderResult,\n  renderer:\n    | DiffHunksRenderer<LAnnotation>\n    | UnresolvedFileHunksRenderer<LAnnotation>,\n  unsafeCSS: string | undefined\n) {\n  const children = [createStyleElement(hunkResult.css, true)];\n  if (unsafeCSS != null) {\n    children.push(createStyleElement(unsafeCSS));\n  }\n  if (hunkResult.headerElement != null) {\n    children.push(hunkResult.headerElement);\n  }\n  const code = renderer.renderFullAST(hunkResult);\n  code.properties['data-dehydrated'] = '';\n  children.push(code);\n  return children;\n}\n\nfunction getHunksRendererOptions<LAnnotation>(\n  options: FileDiffOptions<LAnnotation> | undefined\n): BaseDiffOptions {\n  return {\n    ...options,\n    hunkSeparators:\n      typeof options?.hunkSeparators === 'function'\n        ? 'custom'\n        : options?.hunkSeparators,\n  };\n}\n"],"mappings":";;;;;;;;;;AA8BA,eAAsB,gBAAyC,EAC7D,UACA,SACA,SACA,SACA,eACmD;AACnD,KAAI,YAAY,QAAQ,WAAW,QAAQ,WAAW,KACpD,YAAW,kBAAkB,SAAS,QAAQ;AAEhD,KAAI,YAAY,KACd,OAAM,IAAI,MACR,mFACD;CAEH,MAAM,WAAW,IAAI,kBACnB,wBAAwB,QAAQ,CACjC;AACD,KAAI,eAAe,QAAQ,YAAY,SAAS,EAC9C,UAAS,mBAAmB,YAAY;AAE1C,QAAO,WACL,kBACE,MAAM,SAAS,YAAY,SAAS,EACpC,UACA,SAAS,UACV,CACF;;AAGH,eAAsB,0BAAmD,EACvE,MACA,SACA,eAC6D;CAC7D,MAAM,EAAE,UAAU,SAAS,eAAe,+BACxC,MACA,SAAS,gBACV;CACD,MAAM,WAAW,IAAI,4BACnB,sCAAsC,QAAQ,CAC/C;AACD,KAAI,eAAe,QAAQ,YAAY,SAAS,EAC9C,UAAS,mBAAmB,YAAY;AAE1C,UAAS,iBAAiB,SAAS,YAAY,SAAS;AACxD,QAAO,WACL,kBACE,MAAM,SAAS,YAAY,SAAS,EACpC,UACA,SAAS,UACV,CACF;;AAgBH,eAAsB,qBAA8C,EAClE,SACA,SACA,SACA,eAGA;AACA,QAAO;EACL;EACA;EACA;EACA;EACA,iBAAiB,MAAM,gBAAgB;GACrC;GACA;GACA;GACA;GACD,CAAC;EACH;;AAeH,eAAsB,gBAAyC,EAC7D,UACA,SACA,eAGA;AACA,QAAO;EACL;EACA;EACA;EACA,iBAAiB,MAAM,gBAAgB;GACrC;GACA;GACA;GACD,CAAC;EACH;;AAkBH,eAAsB,sBAA+C,EACnE,MACA,SACA,eAGA;AACA,QAAO;EACL;EACA;EACA;EACA,iBAAiB,MAAM,0BAA0B;GAC/C;GACA;GACA;GACD,CAAC;EACH;;AAeH,eAAsB,iBAA0C,EAC9D,OACA,SACA,eAGA;AAEA,QAAO;EACL;EACA;EACA;EACA,iBAAiB,MAAM,gBAAgB;GACrC,UANa,iBAAiB,MAAM;GAOpC;GACA;GACD,CAAC;EACH;;AAGH,SAAS,kBACP,YACA,UAGA,WACA;CACA,MAAM,WAAW,CAAC,mBAAmB,WAAW,KAAK,KAAK,CAAC;AAC3D,KAAI,aAAa,KACf,UAAS,KAAK,mBAAmB,UAAU,CAAC;AAE9C,KAAI,WAAW,iBAAiB,KAC9B,UAAS,KAAK,WAAW,cAAc;CAEzC,MAAM,OAAO,SAAS,cAAc,WAAW;AAC/C,MAAK,WAAW,qBAAqB;AACrC,UAAS,KAAK,KAAK;AACnB,QAAO;;AAGT,SAAS,wBACP,SACiB;AACjB,QAAO;EACL,GAAG;EACH,gBACE,OAAO,SAAS,mBAAmB,aAC/B,WACA,SAAS;EAChB"}
+{"version":3,"file":"preloadDiffs.js","names":[],"sources":["../../src/ssr/preloadDiffs.ts"],"sourcesContent":["import type { FileDiffOptions } from '../components/FileDiff';\nimport {\n  getUnresolvedDiffHunksRendererOptions,\n  type UnresolvedFileOptions,\n} from '../components/UnresolvedFile';\nimport {\n  DiffHunksRenderer,\n  type DiffHunksRendererOptions,\n  type HunksRenderResult,\n} from '../renderers/DiffHunksRenderer';\nimport { UnresolvedFileHunksRenderer } from '../renderers/UnresolvedFileHunksRenderer';\nimport type {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n} from '../types';\nimport {\n  createStyleElement,\n  createThemeStyleElement,\n} from '../utils/createStyleElement';\nimport { wrapThemeCSS } from '../utils/cssWrappers';\nimport { getSingularPatch } from '../utils/getSingularPatch';\nimport { parseDiffFromFile } from '../utils/parseDiffFromFile';\nimport { parseMergeConflictDiffFromFile } from '../utils/parseMergeConflictDiffFromFile';\nimport { renderHTML } from './renderHTML';\n\nexport interface PreloadDiffOptions<LAnnotation> {\n  fileDiff?: FileDiffMetadata;\n  oldFile?: FileContents;\n  newFile?: FileContents;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport async function preloadDiffHTML<LAnnotation = undefined>({\n  fileDiff,\n  oldFile,\n  newFile,\n  options,\n  annotations,\n}: PreloadDiffOptions<LAnnotation>): Promise<string> {\n  if (fileDiff == null && oldFile != null && newFile != null) {\n    fileDiff = parseDiffFromFile(oldFile, newFile);\n  }\n  if (fileDiff == null) {\n    throw new Error(\n      'preloadFileDiff: You must pass at least a fileDiff prop or oldFile/newFile props'\n    );\n  }\n  const renderer = new DiffHunksRenderer<LAnnotation>(\n    getHunksRendererOptions(options)\n  );\n  if (annotations != null && annotations.length > 0) {\n    renderer.setLineAnnotations(annotations);\n  }\n  return renderHTML(\n    processHunkResult(\n      await renderer.asyncRender(fileDiff),\n      renderer,\n      options?.unsafeCSS,\n      options?.themeType ?? 'system'\n    )\n  );\n}\n\nexport async function preloadUnresolvedFileHTML<LAnnotation = undefined>({\n  file,\n  options,\n  annotations,\n}: PreloadUnresolvedFileOptions<LAnnotation>): Promise<string> {\n  const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(\n    file,\n    options?.maxContextLines\n  );\n  const renderer = new UnresolvedFileHunksRenderer<LAnnotation>(\n    getUnresolvedDiffHunksRendererOptions(options)\n  );\n  if (annotations != null && annotations.length > 0) {\n    renderer.setLineAnnotations(annotations);\n  }\n  renderer.setConflictState(actions, markerRows, fileDiff);\n  return renderHTML(\n    processHunkResult(\n      await renderer.asyncRender(fileDiff),\n      renderer,\n      options?.unsafeCSS,\n      options?.themeType ?? 'system'\n    )\n  );\n}\n\nexport interface PreloadMultiFileDiffOptions<LAnnotation> {\n  oldFile: FileContents;\n  newFile: FileContents;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadMultiFileDiffResult<\n  LAnnotation,\n> extends PreloadMultiFileDiffOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadMultiFileDiff<LAnnotation = undefined>({\n  oldFile,\n  newFile,\n  options,\n  annotations,\n}: PreloadMultiFileDiffOptions<LAnnotation>): Promise<\n  PreloadMultiFileDiffResult<LAnnotation>\n> {\n  return {\n    newFile,\n    oldFile,\n    options,\n    annotations,\n    prerenderedHTML: await preloadDiffHTML({\n      oldFile,\n      newFile,\n      options,\n      annotations,\n    }),\n  };\n}\n\nexport interface PreloadFileDiffOptions<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadFileDiffResult<\n  LAnnotation,\n> extends PreloadFileDiffOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadFileDiff<LAnnotation = undefined>({\n  fileDiff,\n  options,\n  annotations,\n}: PreloadFileDiffOptions<LAnnotation>): Promise<\n  PreloadFileDiffResult<LAnnotation>\n> {\n  return {\n    fileDiff,\n    options,\n    annotations,\n    prerenderedHTML: await preloadDiffHTML({\n      fileDiff,\n      options,\n      annotations,\n    }),\n  };\n}\n\nexport interface PreloadUnresolvedFileOptions<LAnnotation> {\n  file: FileContents;\n  options?: Omit<\n    UnresolvedFileOptions<LAnnotation>,\n    'onMergeConflictAction' | 'onMergeConflictResolve' | 'onPostRender'\n  >;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadUnresolvedFileResult<\n  LAnnotation,\n> extends PreloadUnresolvedFileOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadUnresolvedFile<LAnnotation = undefined>({\n  file,\n  options,\n  annotations,\n}: PreloadUnresolvedFileOptions<LAnnotation>): Promise<\n  PreloadUnresolvedFileResult<LAnnotation>\n> {\n  return {\n    file,\n    options,\n    annotations,\n    prerenderedHTML: await preloadUnresolvedFileHTML({\n      file,\n      options,\n      annotations,\n    }),\n  };\n}\n\nexport interface PreloadPatchDiffOptions<LAnnotation> {\n  patch: string;\n  options?: FileDiffOptions<LAnnotation>;\n  annotations?: DiffLineAnnotation<LAnnotation>[];\n}\n\nexport interface PreloadPatchDiffResult<\n  LAnnotation,\n> extends PreloadPatchDiffOptions<LAnnotation> {\n  prerenderedHTML: string;\n}\n\nexport async function preloadPatchDiff<LAnnotation = undefined>({\n  patch,\n  options,\n  annotations,\n}: PreloadPatchDiffOptions<LAnnotation>): Promise<\n  PreloadPatchDiffResult<LAnnotation>\n> {\n  const fileDiff = getSingularPatch(patch);\n  return {\n    patch,\n    options,\n    annotations,\n    prerenderedHTML: await preloadDiffHTML({\n      fileDiff,\n      options,\n      annotations,\n    }),\n  };\n}\n\nfunction processHunkResult<LAnnotation>(\n  hunkResult: HunksRenderResult,\n  renderer:\n    | DiffHunksRenderer<LAnnotation>\n    | UnresolvedFileHunksRenderer<LAnnotation>,\n  unsafeCSS: string | undefined,\n  themeType: 'system' | 'light' | 'dark'\n) {\n  const children = [createStyleElement(hunkResult.css, true)];\n  children.push(\n    createThemeStyleElement(\n      wrapThemeCSS(\n        hunkResult.themeStyles,\n        hunkResult.baseThemeType ?? themeType\n      )\n    )\n  );\n  if (unsafeCSS != null) {\n    children.push(createStyleElement(unsafeCSS));\n  }\n  if (hunkResult.headerElement != null) {\n    children.push(hunkResult.headerElement);\n  }\n  const code = renderer.renderFullAST(hunkResult);\n  code.properties['data-dehydrated'] = '';\n  children.push(code);\n  return children;\n}\n\nfunction getHunksRendererOptions<LAnnotation>(\n  options: FileDiffOptions<LAnnotation> | undefined\n): DiffHunksRendererOptions {\n  return {\n    ...options,\n    headerRenderMode:\n      options?.renderCustomHeader != null ? 'custom' : 'default',\n    hunkSeparators:\n      typeof options?.hunkSeparators === 'function'\n        ? 'custom'\n        : options?.hunkSeparators,\n  };\n}\n"],"mappings":";;;;;;;;;;;AAkCA,eAAsB,gBAAyC,EAC7D,UACA,SACA,SACA,SACA,eACmD;AACnD,KAAI,YAAY,QAAQ,WAAW,QAAQ,WAAW,KACpD,YAAW,kBAAkB,SAAS,QAAQ;AAEhD,KAAI,YAAY,KACd,OAAM,IAAI,MACR,mFACD;CAEH,MAAM,WAAW,IAAI,kBACnB,wBAAwB,QAAQ,CACjC;AACD,KAAI,eAAe,QAAQ,YAAY,SAAS,EAC9C,UAAS,mBAAmB,YAAY;AAE1C,QAAO,WACL,kBACE,MAAM,SAAS,YAAY,SAAS,EACpC,UACA,SAAS,WACT,SAAS,aAAa,SACvB,CACF;;AAGH,eAAsB,0BAAmD,EACvE,MACA,SACA,eAC6D;CAC7D,MAAM,EAAE,UAAU,SAAS,eAAe,+BACxC,MACA,SAAS,gBACV;CACD,MAAM,WAAW,IAAI,4BACnB,sCAAsC,QAAQ,CAC/C;AACD,KAAI,eAAe,QAAQ,YAAY,SAAS,EAC9C,UAAS,mBAAmB,YAAY;AAE1C,UAAS,iBAAiB,SAAS,YAAY,SAAS;AACxD,QAAO,WACL,kBACE,MAAM,SAAS,YAAY,SAAS,EACpC,UACA,SAAS,WACT,SAAS,aAAa,SACvB,CACF;;AAgBH,eAAsB,qBAA8C,EAClE,SACA,SACA,SACA,eAGA;AACA,QAAO;EACL;EACA;EACA;EACA;EACA,iBAAiB,MAAM,gBAAgB;GACrC;GACA;GACA;GACA;GACD,CAAC;EACH;;AAeH,eAAsB,gBAAyC,EAC7D,UACA,SACA,eAGA;AACA,QAAO;EACL;EACA;EACA;EACA,iBAAiB,MAAM,gBAAgB;GACrC;GACA;GACA;GACD,CAAC;EACH;;AAkBH,eAAsB,sBAA+C,EACnE,MACA,SACA,eAGA;AACA,QAAO;EACL;EACA;EACA;EACA,iBAAiB,MAAM,0BAA0B;GAC/C;GACA;GACA;GACD,CAAC;EACH;;AAeH,eAAsB,iBAA0C,EAC9D,OACA,SACA,eAGA;AAEA,QAAO;EACL;EACA;EACA;EACA,iBAAiB,MAAM,gBAAgB;GACrC,UANa,iBAAiB,MAAM;GAOpC;GACA;GACD,CAAC;EACH;;AAGH,SAAS,kBACP,YACA,UAGA,WACA,WACA;CACA,MAAM,WAAW,CAAC,mBAAmB,WAAW,KAAK,KAAK,CAAC;AAC3D,UAAS,KACP,wBACE,aACE,WAAW,aACX,WAAW,iBAAiB,UAC7B,CACF,CACF;AACD,KAAI,aAAa,KACf,UAAS,KAAK,mBAAmB,UAAU,CAAC;AAE9C,KAAI,WAAW,iBAAiB,KAC9B,UAAS,KAAK,WAAW,cAAc;CAEzC,MAAM,OAAO,SAAS,cAAc,WAAW;AAC/C,MAAK,WAAW,qBAAqB;AACrC,UAAS,KAAK,KAAK;AACnB,QAAO;;AAGT,SAAS,wBACP,SAC0B;AAC1B,QAAO;EACL,GAAG;EACH,kBACE,SAAS,sBAAsB,OAAO,WAAW;EACnD,gBACE,OAAO,SAAS,mBAAmB,aAC/B,WACA,SAAS;EAChB"}

package/dist/ssr/preloadFile.js

@@ -1,13 +1,18 @@
 import { FileRenderer } from "../renderers/FileRenderer.js";
-import { createStyleElement } from "../utils/createStyleElement.js";
+import { wrapThemeCSS } from "../utils/cssWrappers.js";
+import { createStyleElement, createThemeStyleElement } from "../utils/createStyleElement.js";
 import { renderHTML } from "./renderHTML.js";
 
 //#region src/ssr/preloadFile.ts
 async function preloadFile({ file, options, annotations }) {
-	const fileRenderer = new FileRenderer(options);
+	const fileRenderer = new FileRenderer({
+		...options,
+		headerRenderMode: options?.renderCustomHeader != null ? "custom" : "default"
+	});
 	if (annotations !== void 0 && annotations.length > 0) fileRenderer.setLineAnnotations(annotations);
 	const fileResult = await fileRenderer.asyncRender(file);
 	const children = [createStyleElement(fileResult.css, true)];
+	children.push(createThemeStyleElement(wrapThemeCSS(fileResult.themeStyles, fileResult.baseThemeType ?? options?.themeType ?? "system")));
 	if (options?.unsafeCSS != null) children.push(createStyleElement(options.unsafeCSS));
 	if (fileResult.headerAST != null) children.push(fileResult.headerAST);
 	const code = fileRenderer.renderFullAST(fileResult);

package/dist/ssr/preloadFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"preloadFile.js","names":[],"sources":["../../src/ssr/preloadFile.ts"],"sourcesContent":["import type { FileOptions } from '../components/File';\nimport { FileRenderer } from '../renderers/FileRenderer';\nimport type { FileContents, LineAnnotation } from '../types';\nimport { createStyleElement } from '../utils/createStyleElement';\nimport { renderHTML } from './renderHTML';\n\nexport type PreloadFileOptions<LAnnotation> = {\n  file: FileContents;\n  options?: FileOptions<LAnnotation>;\n  annotations?: LineAnnotation<LAnnotation>[];\n};\n\nexport interface PreloadedFileResult<LAnnotation> {\n  file: FileContents;\n  options?: FileOptions<LAnnotation>;\n  annotations?: LineAnnotation<LAnnotation>[];\n  prerenderedHTML: string;\n}\n\nexport async function preloadFile<LAnnotation = undefined>({\n  file,\n  options,\n  annotations,\n}: PreloadFileOptions<LAnnotation>): Promise<PreloadedFileResult<LAnnotation>> {\n  const fileRenderer = new FileRenderer<LAnnotation>(options);\n\n  // Set line annotations if provided\n  if (annotations !== undefined && annotations.length > 0) {\n    fileRenderer.setLineAnnotations(annotations);\n  }\n\n  const fileResult = await fileRenderer.asyncRender(file);\n\n  const children = [createStyleElement(fileResult.css, true)];\n\n  if (options?.unsafeCSS != null) {\n    children.push(createStyleElement(options.unsafeCSS));\n  }\n\n  if (fileResult.headerAST != null) {\n    children.push(fileResult.headerAST);\n  }\n  const code = fileRenderer.renderFullAST(fileResult);\n  code.properties['data-dehydrated'] = '';\n  children.push(code);\n\n  return {\n    file,\n    options,\n    annotations,\n    prerenderedHTML: renderHTML(children),\n  };\n}\n"],"mappings":";;;;;AAmBA,eAAsB,YAAqC,EACzD,MACA,SACA,eAC6E;CAC7E,MAAM,eAAe,IAAI,aAA0B,QAAQ;AAG3D,KAAI,gBAAgB,UAAa,YAAY,SAAS,EACpD,cAAa,mBAAmB,YAAY;CAG9C,MAAM,aAAa,MAAM,aAAa,YAAY,KAAK;CAEvD,MAAM,WAAW,CAAC,mBAAmB,WAAW,KAAK,KAAK,CAAC;AAE3D,KAAI,SAAS,aAAa,KACxB,UAAS,KAAK,mBAAmB,QAAQ,UAAU,CAAC;AAGtD,KAAI,WAAW,aAAa,KAC1B,UAAS,KAAK,WAAW,UAAU;CAErC,MAAM,OAAO,aAAa,cAAc,WAAW;AACnD,MAAK,WAAW,qBAAqB;AACrC,UAAS,KAAK,KAAK;AAEnB,QAAO;EACL;EACA;EACA;EACA,iBAAiB,WAAW,SAAS;EACtC"}
+{"version":3,"file":"preloadFile.js","names":[],"sources":["../../src/ssr/preloadFile.ts"],"sourcesContent":["import type { FileOptions } from '../components/File';\nimport { FileRenderer } from '../renderers/FileRenderer';\nimport type { FileContents, LineAnnotation } from '../types';\nimport {\n  createStyleElement,\n  createThemeStyleElement,\n} from '../utils/createStyleElement';\nimport { wrapThemeCSS } from '../utils/cssWrappers';\nimport { renderHTML } from './renderHTML';\n\nexport type PreloadFileOptions<LAnnotation> = {\n  file: FileContents;\n  options?: FileOptions<LAnnotation>;\n  annotations?: LineAnnotation<LAnnotation>[];\n};\n\nexport interface PreloadedFileResult<LAnnotation> {\n  file: FileContents;\n  options?: FileOptions<LAnnotation>;\n  annotations?: LineAnnotation<LAnnotation>[];\n  prerenderedHTML: string;\n}\n\nexport async function preloadFile<LAnnotation = undefined>({\n  file,\n  options,\n  annotations,\n}: PreloadFileOptions<LAnnotation>): Promise<PreloadedFileResult<LAnnotation>> {\n  const fileRenderer = new FileRenderer<LAnnotation>({\n    ...options,\n    headerRenderMode:\n      options?.renderCustomHeader != null ? 'custom' : 'default',\n  });\n\n  // Set line annotations if provided\n  if (annotations !== undefined && annotations.length > 0) {\n    fileRenderer.setLineAnnotations(annotations);\n  }\n\n  const fileResult = await fileRenderer.asyncRender(file);\n  const children = [createStyleElement(fileResult.css, true)];\n\n  children.push(\n    createThemeStyleElement(\n      wrapThemeCSS(\n        fileResult.themeStyles,\n        fileResult.baseThemeType ?? options?.themeType ?? 'system'\n      )\n    )\n  );\n\n  if (options?.unsafeCSS != null) {\n    children.push(createStyleElement(options.unsafeCSS));\n  }\n\n  if (fileResult.headerAST != null) {\n    children.push(fileResult.headerAST);\n  }\n  const code = fileRenderer.renderFullAST(fileResult);\n  code.properties['data-dehydrated'] = '';\n  children.push(code);\n\n  return {\n    file,\n    options,\n    annotations,\n    prerenderedHTML: renderHTML(children),\n  };\n}\n"],"mappings":";;;;;;AAuBA,eAAsB,YAAqC,EACzD,MACA,SACA,eAC6E;CAC7E,MAAM,eAAe,IAAI,aAA0B;EACjD,GAAG;EACH,kBACE,SAAS,sBAAsB,OAAO,WAAW;EACpD,CAAC;AAGF,KAAI,gBAAgB,UAAa,YAAY,SAAS,EACpD,cAAa,mBAAmB,YAAY;CAG9C,MAAM,aAAa,MAAM,aAAa,YAAY,KAAK;CACvD,MAAM,WAAW,CAAC,mBAAmB,WAAW,KAAK,KAAK,CAAC;AAE3D,UAAS,KACP,wBACE,aACE,WAAW,aACX,WAAW,iBAAiB,SAAS,aAAa,SACnD,CACF,CACF;AAED,KAAI,SAAS,aAAa,KACxB,UAAS,KAAK,mBAAmB,QAAQ,UAAU,CAAC;AAGtD,KAAI,WAAW,aAAa,KAC1B,UAAS,KAAK,WAAW,UAAU;CAErC,MAAM,OAAO,aAAa,cAAc,WAAW;AACnD,MAAK,WAAW,qBAAqB;AACrC,UAAS,KAAK,KAAK;AAEnB,QAAO;EACL;EACA;EACA;EACA,iBAAiB,WAAW,SAAS;EACtC"}