@pierre/diffs 1.1.0-beta.9 → 1.1.0

package/dist/highlighter/shared_highlighter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared_highlighter.d.ts","names":["DiffsHighlighter","DiffsThemeNames","SupportedLanguages","CachedOrLoadingHighlighterType","Promise","HighlighterOptions","getSharedHighlighter","themes","langs","isHighlighterLoaded","getHighlighterIfLoaded","isHighlighterLoading","isHighlighterNull","preloadHighlighter","disposeHighlighter"],"sources":["../../src/highlighter/shared_highlighter.d.ts"],"sourcesContent":["import type { DiffsHighlighter, DiffsThemeNames, SupportedLanguages } from '../types';\ntype CachedOrLoadingHighlighterType = Promise<DiffsHighlighter> | DiffsHighlighter | undefined;\ninterface HighlighterOptions {\n    themes: DiffsThemeNames[];\n    langs: SupportedLanguages[];\n}\nexport declare function getSharedHighlighter({ themes, langs }: HighlighterOptions): Promise<DiffsHighlighter>;\nexport declare function isHighlighterLoaded(h?: CachedOrLoadingHighlighterType): h is DiffsHighlighter;\nexport declare function getHighlighterIfLoaded(): DiffsHighlighter | undefined;\nexport declare function isHighlighterLoading(h?: CachedOrLoadingHighlighterType): h is Promise<DiffsHighlighter>;\nexport declare function isHighlighterNull(h?: CachedOrLoadingHighlighterType): h is undefined;\nexport declare function preloadHighlighter(options: HighlighterOptions): Promise<void>;\nexport declare function disposeHighlighter(): Promise<void>;\nexport {};\n//# sourceMappingURL=shared_highlighter.d.ts.map"],"mappings":";;;KACKG,8BAAAA,GAAiCC,QAAQJ,oBAAoBA;UACxDK,kBAAAA;EADLF,MAAAA,EAEOF,eAFPE,EAAAA;EAAyCH,KAAAA,EAGnCE,kBAHmCF,EAAAA;;AAAoBA,iBAK1CM,oBAAAA,CAL0CN;EAAAA,MAAAA;EAAAA;AAAAA,CAAAA,EAKFK,kBALEL,CAAAA,EAKmBI,OALnBJ,CAK2BA,gBAL3BA,CAAAA;AAAgB,iBAM1DS,mBAAAA,CAN0D,CAAA,CAAA,EAMlCN,8BANkC,CAAA,EAAA,CAAA,IAMIH,gBANJ;AACxEK,iBAMcK,sBAAAA,CAAAA,CALZT,EAKsCD,gBAJvCE,GAAAA,SAAkB;AAELI,iBAGAK,oBAAAA,CAHoB,CAAA,CAAA,EAGKR,8BAHL,CAAA,EAAA,CAAA,IAG2CC,OAH3C,CAGmDJ,gBAHnD,CAAA;AAAGO,iBAIvBK,iBAAAA,CAJuBL,CAAAA,CAAAA,EAIDJ,8BAJCI,CAAAA,EAAAA,CAAAA,IAAAA,SAAAA;AAAQC,iBAK/BK,kBAAAA,CAL+BL,OAAAA,EAKHH,kBALGG,CAAAA,EAKkBJ,OALlBI,CAAAA,IAAAA,CAAAA;AAASH,iBAMxCS,kBAAAA,CAAAA,CANwCT,EAMlBD,OANkBC,CAAAA,IAAAA,CAAAA"}
+{"version":3,"file":"shared_highlighter.d.ts","names":["DiffsHighlighter","DiffsThemeNames","HighlighterTypes","SupportedLanguages","CachedOrLoadingHighlighterType","Promise","HighlighterOptions","getSharedHighlighter","themes","langs","preferredHighlighter","isHighlighterLoaded","getHighlighterIfLoaded","isHighlighterLoading","isHighlighterNull","preloadHighlighter","disposeHighlighter"],"sources":["../../src/highlighter/shared_highlighter.d.ts"],"sourcesContent":["import type { DiffsHighlighter, DiffsThemeNames, HighlighterTypes, SupportedLanguages } from '../types';\ntype CachedOrLoadingHighlighterType = Promise<DiffsHighlighter> | DiffsHighlighter | undefined;\ninterface HighlighterOptions {\n    themes: DiffsThemeNames[];\n    langs: SupportedLanguages[];\n    preferredHighlighter?: HighlighterTypes;\n}\nexport declare function getSharedHighlighter({ themes, langs, preferredHighlighter }: HighlighterOptions): Promise<DiffsHighlighter>;\nexport declare function isHighlighterLoaded(h?: CachedOrLoadingHighlighterType): h is DiffsHighlighter;\nexport declare function getHighlighterIfLoaded(): DiffsHighlighter | undefined;\nexport declare function isHighlighterLoading(h?: CachedOrLoadingHighlighterType): h is Promise<DiffsHighlighter>;\nexport declare function isHighlighterNull(h?: CachedOrLoadingHighlighterType): h is undefined;\nexport declare function preloadHighlighter(options: HighlighterOptions): Promise<void>;\nexport declare function disposeHighlighter(): Promise<void>;\nexport {};\n//# sourceMappingURL=shared_highlighter.d.ts.map"],"mappings":";;;KACKI,8BAAAA,GAAiCC,QAAQL,oBAAoBA;UACxDM,kBAAAA;EADLF,MAAAA,EAEOH,eAFPG,EAAAA;EAAyCJ,KAAAA,EAGnCG,kBAHmCH,EAAAA;EAARK,oBAAAA,CAAAA,EAIXH,gBAJWG;;AAA4C,iBAM1DE,oBAAAA,CAN0D;EAAA,MAAA;EAAA,KAAA;EAAA;AAAA,CAAA,EAMID,kBANJ,CAAA,EAMyBD,OANzB,CAMiCL,gBANjC,CAAA;AACxEM,iBAMcK,mBAAAA,CANI,CAAA,CAAA,EAMoBP,8BANpB,CAAA,EAAA,CAAA,IAM0DJ,gBAN1D;AAChBC,iBAMYW,sBAAAA,CAAAA,CANZX,EAMsCD,gBANtCC,GAAAA,SAAAA;AACDE,iBAMaU,oBAAAA,CANbV,CAAAA,CAAAA,EAMsCC,8BANtCD,CAAAA,EAAAA,CAAAA,IAM4EE,OAN5EF,CAMoFH,gBANpFG,CAAAA;AACgBD,iBAMHY,iBAAAA,CANGZ,CAAAA,CAAAA,EAMmBE,8BANnBF,CAAAA,EAAAA,CAAAA,IAAAA,SAAAA;AAAgB,iBAOnBa,kBAAAA,CAPmB,OAAA,EAOST,kBAPT,CAAA,EAO8BD,OAP9B,CAAA,IAAA,CAAA;AAEnBE,iBAMAS,kBAAAA,CAAAA,CANoB,EAMEX,OANF,CAAA,IAAA,CAAA"}

package/dist/highlighter/shared_highlighter.js

@@ -5,15 +5,15 @@ import { attachResolvedThemes } from "./themes/attachResolvedThemes.js";
 import { cleanUpResolvedThemes } from "./themes/cleanUpResolvedThemes.js";
 import { getResolvedOrResolveTheme } from "./themes/getResolvedOrResolveTheme.js";
 import { registerCustomTheme } from "./themes/registerCustomTheme.js";
-import { createHighlighter, createJavaScriptRegexEngine } from "shiki";
+import { createHighlighter, createJavaScriptRegexEngine, createOnigurumaEngine } from "shiki";
 
 //#region src/highlighter/shared_highlighter.ts
 let highlighter;
-async function getSharedHighlighter({ themes, langs }) {
+async function getSharedHighlighter({ themes, langs, preferredHighlighter = "shiki-js" }) {
 	highlighter ??= createHighlighter({
 		themes: [],
 		langs: ["text"],
-		engine: createJavaScriptRegexEngine()
+		engine: preferredHighlighter === "shiki-wasm" ? createOnigurumaEngine(import("shiki/wasm")) : createJavaScriptRegexEngine()
 	});
 	const instance = isHighlighterLoading(highlighter) ? await highlighter : highlighter;
 	highlighter = instance;
@@ -59,11 +59,19 @@ async function disposeHighlighter() {
 	cleanUpResolvedThemes();
 	highlighter = void 0;
 }
-registerCustomTheme("pierre-dark", () => {
-	return import("../themes/pierre-dark.js");
+registerCustomTheme("pierre-dark", async () => {
+	const m = await import("@pierre/theme/themes/pierre-dark.json");
+	return {
+		...m.default ?? m,
+		name: "pierre-dark"
+	};
 });
-registerCustomTheme("pierre-light", () => {
-	return import("../themes/pierre-light.js");
+registerCustomTheme("pierre-light", async () => {
+	const m = await import("@pierre/theme/themes/pierre-light.json");
+	return {
+		...m.default ?? m,
+		name: "pierre-light"
+	};
 });
 
 //#endregion

package/dist/highlighter/shared_highlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared_highlighter.js","names":["highlighter: CachedOrLoadingHighlighterType","languageLoaders: Promise<ResolvedLanguage>[]","themeLoaders: Promise<ThemeRegistrationResolved>[]","themes"],"sources":["../../src/highlighter/shared_highlighter.ts"],"sourcesContent":["import { createHighlighter, createJavaScriptRegexEngine } from 'shiki';\n\nimport type {\n  DiffsHighlighter,\n  DiffsThemeNames,\n  SupportedLanguages,\n  ThemeRegistrationResolved,\n} from '../types';\nimport type { ResolvedLanguage } from '../worker/types';\nimport { attachResolvedLanguages } from './languages/attachResolvedLanguages';\nimport { cleanUpResolvedLanguages } from './languages/cleanUpResolvedLanguages';\nimport { getResolvedOrResolveLanguage } from './languages/getResolvedOrResolveLanguage';\nimport { attachResolvedThemes } from './themes/attachResolvedThemes';\nimport { cleanUpResolvedThemes } from './themes/cleanUpResolvedThemes';\nimport { getResolvedOrResolveTheme } from './themes/getResolvedOrResolveTheme';\nimport { registerCustomTheme } from './themes/registerCustomTheme';\n\ntype CachedOrLoadingHighlighterType =\n  | Promise<DiffsHighlighter>\n  | DiffsHighlighter\n  | undefined;\n\nlet highlighter: CachedOrLoadingHighlighterType;\n\ninterface HighlighterOptions {\n  themes: DiffsThemeNames[];\n  langs: SupportedLanguages[];\n}\n\nexport async function getSharedHighlighter({\n  themes,\n  langs,\n}: HighlighterOptions): Promise<DiffsHighlighter> {\n  highlighter ??= createHighlighter({\n    themes: [],\n    langs: ['text'],\n    engine: createJavaScriptRegexEngine(),\n  }) as Promise<DiffsHighlighter>;\n\n  const instance = isHighlighterLoading(highlighter)\n    ? await highlighter\n    : highlighter;\n  highlighter = instance;\n\n  const languageLoaders: Promise<ResolvedLanguage>[] = [];\n  for (const language of langs) {\n    if (language === 'text' || language === 'ansi') continue;\n    const maybeResolvedLanguage = getResolvedOrResolveLanguage(language);\n    if ('then' in maybeResolvedLanguage) {\n      languageLoaders.push(maybeResolvedLanguage);\n    } else {\n      attachResolvedLanguages(maybeResolvedLanguage, instance);\n    }\n  }\n\n  const themeLoaders: Promise<ThemeRegistrationResolved>[] = [];\n  for (const themeName of themes) {\n    const maybeResolvedTheme = getResolvedOrResolveTheme(themeName);\n    if ('then' in maybeResolvedTheme) {\n      themeLoaders.push(maybeResolvedTheme);\n    } else {\n      attachResolvedThemes(maybeResolvedTheme, highlighter);\n    }\n  }\n\n  // If we need to load any languages or themes, lets do that now\n  if (languageLoaders.length > 0 || themeLoaders.length > 0) {\n    await Promise.all([\n      Promise.all(languageLoaders).then((languages) => {\n        attachResolvedLanguages(languages, instance);\n      }),\n      Promise.all(themeLoaders).then((themes) => {\n        attachResolvedThemes(themes, instance);\n      }),\n    ]);\n  }\n\n  return instance;\n}\n\nexport function isHighlighterLoaded(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is DiffsHighlighter {\n  return h != null && !('then' in h);\n}\n\nexport function getHighlighterIfLoaded(): DiffsHighlighter | undefined {\n  if (highlighter != null && !('then' in highlighter)) {\n    return highlighter;\n  }\n  return undefined;\n}\n\nexport function isHighlighterLoading(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is Promise<DiffsHighlighter> {\n  return h != null && 'then' in h;\n}\n\nexport function isHighlighterNull(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is undefined {\n  return h == null;\n}\n\nexport async function preloadHighlighter(\n  options: HighlighterOptions\n): Promise<void> {\n  return void (await getSharedHighlighter(options));\n}\n\nexport async function disposeHighlighter(): Promise<void> {\n  if (highlighter == null) return;\n  (await highlighter).dispose();\n  cleanUpResolvedLanguages();\n  cleanUpResolvedThemes();\n  highlighter = undefined;\n}\n\nregisterCustomTheme('pierre-dark', () => {\n  return import('../themes/pierre-dark.json') as unknown as Promise<ThemeRegistrationResolved>;\n});\n\nregisterCustomTheme('pierre-light', () => {\n  return import('../themes/pierre-light.json') as unknown as Promise<ThemeRegistrationResolved>;\n});\n"],"mappings":";;;;;;;;;;AAsBA,IAAIA;AAOJ,eAAsB,qBAAqB,EACzC,QACA,SACgD;AAChD,iBAAgB,kBAAkB;EAChC,QAAQ,EAAE;EACV,OAAO,CAAC,OAAO;EACf,QAAQ,6BAA6B;EACtC,CAAC;CAEF,MAAM,WAAW,qBAAqB,YAAY,GAC9C,MAAM,cACN;AACJ,eAAc;CAEd,MAAMC,kBAA+C,EAAE;AACvD,MAAK,MAAM,YAAY,OAAO;AAC5B,MAAI,aAAa,UAAU,aAAa,OAAQ;EAChD,MAAM,wBAAwB,6BAA6B,SAAS;AACpE,MAAI,UAAU,sBACZ,iBAAgB,KAAK,sBAAsB;MAE3C,yBAAwB,uBAAuB,SAAS;;CAI5D,MAAMC,eAAqD,EAAE;AAC7D,MAAK,MAAM,aAAa,QAAQ;EAC9B,MAAM,qBAAqB,0BAA0B,UAAU;AAC/D,MAAI,UAAU,mBACZ,cAAa,KAAK,mBAAmB;MAErC,sBAAqB,oBAAoB,YAAY;;AAKzD,KAAI,gBAAgB,SAAS,KAAK,aAAa,SAAS,EACtD,OAAM,QAAQ,IAAI,CAChB,QAAQ,IAAI,gBAAgB,CAAC,MAAM,cAAc;AAC/C,0BAAwB,WAAW,SAAS;GAC5C,EACF,QAAQ,IAAI,aAAa,CAAC,MAAM,aAAW;AACzC,uBAAqBC,UAAQ,SAAS;GACtC,CACH,CAAC;AAGJ,QAAO;;AAGT,SAAgB,oBACd,IAAoC,aACb;AACvB,QAAO,KAAK,QAAQ,EAAE,UAAU;;AAGlC,SAAgB,yBAAuD;AACrE,KAAI,eAAe,QAAQ,EAAE,UAAU,aACrC,QAAO;;AAKX,SAAgB,qBACd,IAAoC,aACJ;AAChC,QAAO,KAAK,QAAQ,UAAU;;AAGhC,SAAgB,kBACd,IAAoC,aACpB;AAChB,QAAO,KAAK;;AAGd,eAAsB,mBACpB,SACe;AACR,CAAM,MAAM,qBAAqB,QAAQ;;AAGlD,eAAsB,qBAAoC;AACxD,KAAI,eAAe,KAAM;AACzB,EAAC,MAAM,aAAa,SAAS;AAC7B,2BAA0B;AAC1B,wBAAuB;AACvB,eAAc;;AAGhB,oBAAoB,qBAAqB;AACvC,QAAO,OAAO;EACd;AAEF,oBAAoB,sBAAsB;AACxC,QAAO,OAAO;EACd"}
+{"version":3,"file":"shared_highlighter.js","names":["highlighter: CachedOrLoadingHighlighterType","languageLoaders: Promise<ResolvedLanguage>[]","themeLoaders: Promise<ThemeRegistrationResolved>[]","themes"],"sources":["../../src/highlighter/shared_highlighter.ts"],"sourcesContent":["import {\n  createHighlighter,\n  createJavaScriptRegexEngine,\n  createOnigurumaEngine,\n} from 'shiki';\n\nimport type {\n  DiffsHighlighter,\n  DiffsThemeNames,\n  HighlighterTypes,\n  SupportedLanguages,\n  ThemeRegistrationResolved,\n} from '../types';\nimport type { ResolvedLanguage } from '../worker/types';\nimport { attachResolvedLanguages } from './languages/attachResolvedLanguages';\nimport { cleanUpResolvedLanguages } from './languages/cleanUpResolvedLanguages';\nimport { getResolvedOrResolveLanguage } from './languages/getResolvedOrResolveLanguage';\nimport { attachResolvedThemes } from './themes/attachResolvedThemes';\nimport { cleanUpResolvedThemes } from './themes/cleanUpResolvedThemes';\nimport { getResolvedOrResolveTheme } from './themes/getResolvedOrResolveTheme';\nimport { registerCustomTheme } from './themes/registerCustomTheme';\n\ntype CachedOrLoadingHighlighterType =\n  | Promise<DiffsHighlighter>\n  | DiffsHighlighter\n  | undefined;\n\nlet highlighter: CachedOrLoadingHighlighterType;\n\ninterface HighlighterOptions {\n  themes: DiffsThemeNames[];\n  langs: SupportedLanguages[];\n  preferredHighlighter?: HighlighterTypes;\n}\n\nexport async function getSharedHighlighter({\n  themes,\n  langs,\n  preferredHighlighter = 'shiki-js',\n}: HighlighterOptions): Promise<DiffsHighlighter> {\n  highlighter ??= createHighlighter({\n    themes: [],\n    langs: ['text'],\n    engine:\n      preferredHighlighter === 'shiki-wasm'\n        ? createOnigurumaEngine(import('shiki/wasm'))\n        : createJavaScriptRegexEngine(),\n  }) as Promise<DiffsHighlighter>;\n\n  const instance = isHighlighterLoading(highlighter)\n    ? await highlighter\n    : highlighter;\n  highlighter = instance;\n\n  const languageLoaders: Promise<ResolvedLanguage>[] = [];\n  for (const language of langs) {\n    if (language === 'text' || language === 'ansi') continue;\n    const maybeResolvedLanguage = getResolvedOrResolveLanguage(language);\n    if ('then' in maybeResolvedLanguage) {\n      languageLoaders.push(maybeResolvedLanguage);\n    } else {\n      attachResolvedLanguages(maybeResolvedLanguage, instance);\n    }\n  }\n\n  const themeLoaders: Promise<ThemeRegistrationResolved>[] = [];\n  for (const themeName of themes) {\n    const maybeResolvedTheme = getResolvedOrResolveTheme(themeName);\n    if ('then' in maybeResolvedTheme) {\n      themeLoaders.push(maybeResolvedTheme);\n    } else {\n      attachResolvedThemes(maybeResolvedTheme, highlighter);\n    }\n  }\n\n  // If we need to load any languages or themes, lets do that now\n  if (languageLoaders.length > 0 || themeLoaders.length > 0) {\n    await Promise.all([\n      Promise.all(languageLoaders).then((languages) => {\n        attachResolvedLanguages(languages, instance);\n      }),\n      Promise.all(themeLoaders).then((themes) => {\n        attachResolvedThemes(themes, instance);\n      }),\n    ]);\n  }\n\n  return instance;\n}\n\nexport function isHighlighterLoaded(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is DiffsHighlighter {\n  return h != null && !('then' in h);\n}\n\nexport function getHighlighterIfLoaded(): DiffsHighlighter | undefined {\n  if (highlighter != null && !('then' in highlighter)) {\n    return highlighter;\n  }\n  return undefined;\n}\n\nexport function isHighlighterLoading(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is Promise<DiffsHighlighter> {\n  return h != null && 'then' in h;\n}\n\nexport function isHighlighterNull(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is undefined {\n  return h == null;\n}\n\nexport async function preloadHighlighter(\n  options: HighlighterOptions\n): Promise<void> {\n  return void (await getSharedHighlighter(options));\n}\n\nexport async function disposeHighlighter(): Promise<void> {\n  if (highlighter == null) return;\n  (await highlighter).dispose();\n  cleanUpResolvedLanguages();\n  cleanUpResolvedThemes();\n  highlighter = undefined;\n}\n\nregisterCustomTheme('pierre-dark', async () => {\n  const m = await import('@pierre/theme/themes/pierre-dark.json');\n  const theme = (m.default ?? m) as unknown as ThemeRegistrationResolved;\n  return { ...theme, name: 'pierre-dark' } as ThemeRegistrationResolved;\n});\n\nregisterCustomTheme('pierre-light', async () => {\n  const m = await import('@pierre/theme/themes/pierre-light.json');\n  const theme = (m.default ?? m) as unknown as ThemeRegistrationResolved;\n  return { ...theme, name: 'pierre-light' } as ThemeRegistrationResolved;\n});\n"],"mappings":";;;;;;;;;;AA2BA,IAAIA;AAQJ,eAAsB,qBAAqB,EACzC,QACA,OACA,uBAAuB,cACyB;AAChD,iBAAgB,kBAAkB;EAChC,QAAQ,EAAE;EACV,OAAO,CAAC,OAAO;EACf,QACE,yBAAyB,eACrB,sBAAsB,OAAO,cAAc,GAC3C,6BAA6B;EACpC,CAAC;CAEF,MAAM,WAAW,qBAAqB,YAAY,GAC9C,MAAM,cACN;AACJ,eAAc;CAEd,MAAMC,kBAA+C,EAAE;AACvD,MAAK,MAAM,YAAY,OAAO;AAC5B,MAAI,aAAa,UAAU,aAAa,OAAQ;EAChD,MAAM,wBAAwB,6BAA6B,SAAS;AACpE,MAAI,UAAU,sBACZ,iBAAgB,KAAK,sBAAsB;MAE3C,yBAAwB,uBAAuB,SAAS;;CAI5D,MAAMC,eAAqD,EAAE;AAC7D,MAAK,MAAM,aAAa,QAAQ;EAC9B,MAAM,qBAAqB,0BAA0B,UAAU;AAC/D,MAAI,UAAU,mBACZ,cAAa,KAAK,mBAAmB;MAErC,sBAAqB,oBAAoB,YAAY;;AAKzD,KAAI,gBAAgB,SAAS,KAAK,aAAa,SAAS,EACtD,OAAM,QAAQ,IAAI,CAChB,QAAQ,IAAI,gBAAgB,CAAC,MAAM,cAAc;AAC/C,0BAAwB,WAAW,SAAS;GAC5C,EACF,QAAQ,IAAI,aAAa,CAAC,MAAM,aAAW;AACzC,uBAAqBC,UAAQ,SAAS;GACtC,CACH,CAAC;AAGJ,QAAO;;AAGT,SAAgB,oBACd,IAAoC,aACb;AACvB,QAAO,KAAK,QAAQ,EAAE,UAAU;;AAGlC,SAAgB,yBAAuD;AACrE,KAAI,eAAe,QAAQ,EAAE,UAAU,aACrC,QAAO;;AAKX,SAAgB,qBACd,IAAoC,aACJ;AAChC,QAAO,KAAK,QAAQ,UAAU;;AAGhC,SAAgB,kBACd,IAAoC,aACpB;AAChB,QAAO,KAAK;;AAGd,eAAsB,mBACpB,SACe;AACR,CAAM,MAAM,qBAAqB,QAAQ;;AAGlD,eAAsB,qBAAoC;AACxD,KAAI,eAAe,KAAM;AACzB,EAAC,MAAM,aAAa,SAAS;AAC7B,2BAA0B;AAC1B,wBAAuB;AACvB,eAAc;;AAGhB,oBAAoB,eAAe,YAAY;CAC7C,MAAM,IAAI,MAAM,OAAO;AAEvB,QAAO;EAAE,GADM,EAAE,WAAW;EACT,MAAM;EAAe;EACxC;AAEF,oBAAoB,gBAAgB,YAAY;CAC9C,MAAM,IAAI,MAAM,OAAO;AAEvB,QAAO;EAAE,GADM,EAAE,WAAW;EACT,MAAM;EAAgB;EACzC"}

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/managers/InteractionManager.d.ts

@@ -0,0 +1,146 @@
+import { AnnotationSide, DiffLineEventBaseProps, ExpansionDirections, LineEventBaseProps, MergeConflictResolution, SelectionSide } from "../types.js";
+
+//#region src/managers/InteractionManager.d.ts
+type LogTypes = 'click' | 'move' | 'both' | 'none';
+type InteractionManagerMode = 'file' | 'diff';
+interface OnLineClickProps extends LineEventBaseProps {
+  event: PointerEvent;
+}
+interface OnLineEnterLeaveProps extends LineEventBaseProps {
+  event: PointerEvent;
+}
+interface OnDiffLineClickProps extends DiffLineEventBaseProps {
+  event: PointerEvent;
+}
+interface OnDiffLineEnterLeaveProps extends DiffLineEventBaseProps {
+  event: PointerEvent;
+}
+interface SelectedLineRange {
+  start: number;
+  side?: SelectionSide;
+  end: number;
+  endSide?: SelectionSide;
+}
+type GetLineIndexUtility = (lineNumber: number, side?: SelectionSide) => [number, number] | undefined;
+type EventClickProps<TMode extends InteractionManagerMode> = TMode extends 'file' ? OnLineClickProps : OnDiffLineClickProps;
+type PointerEventEnterLeaveProps<TMode extends InteractionManagerMode> = TMode extends 'file' ? OnLineEnterLeaveProps : OnDiffLineEnterLeaveProps;
+type GetHoveredLineResult<TMode extends InteractionManagerMode> = TMode extends 'file' ? {
+  lineNumber: number;
+} : {
+  lineNumber: number;
+  side: AnnotationSide;
+};
+interface MergeConflictActionTarget {
+  kind: 'merge-conflict-action';
+  resolution: MergeConflictResolution;
+  conflictIndex: number;
+}
+interface InteractionManagerBaseOptions<TMode extends InteractionManagerMode> {
+  lineHoverHighlight?: 'disabled' | 'both' | 'number' | 'line';
+  enableGutterUtility?: boolean;
+  onGutterUtilityClick?(range: SelectedLineRange): unknown;
+  onLineClick?(props: EventClickProps<TMode>): unknown;
+  onLineNumberClick?(props: EventClickProps<TMode>): unknown;
+  onLineEnter?(props: PointerEventEnterLeaveProps<TMode>): unknown;
+  onLineLeave?(props: PointerEventEnterLeaveProps<TMode>): unknown;
+  __debugPointerEvents?: LogTypes;
+  enableLineSelection?: boolean;
+  onLineSelected?: (range: SelectedLineRange | null) => void;
+  onLineSelectionStart?: (range: SelectedLineRange | null) => void;
+  onLineSelectionChange?: (range: SelectedLineRange | null) => void;
+  onLineSelectionEnd?: (range: SelectedLineRange | null) => void;
+  getLineIndex?: GetLineIndexUtility;
+}
+interface InteractionManagerOptions<TMode extends InteractionManagerMode> extends InteractionManagerBaseOptions<TMode> {
+  usesCustomGutterUtility?: boolean;
+  onHunkExpand?(hunkIndex: number, direction: ExpansionDirections, expansionLineCountOverride?: number): unknown;
+  onMergeConflictActionClick?(target: MergeConflictActionTarget): void;
+}
+declare class InteractionManager<TMode extends InteractionManagerMode> {
+  private mode;
+  private options;
+  private hoveredLine;
+  private pre;
+  private gutterUtilityContainer;
+  private gutterUtilityButton;
+  private gutterUtilitySlot;
+  private interactiveLinesAttr;
+  private interactiveLineNumbersAttr;
+  private hasPointerListeners;
+  private hasDocumentPointerListeners;
+  private selectedRange;
+  private renderedSelectionRange;
+  private selectionAnchor;
+  private queuedSelectionRender;
+  private pointerSession;
+  constructor(mode: TMode, options: InteractionManagerOptions<TMode>);
+  setOptions(options: InteractionManagerOptions<TMode>): void;
+  cleanUp(): void;
+  setup(pre: HTMLPreElement): void;
+  setSelectionDirty(): void;
+  isSelectionDirty(): boolean;
+  setSelection(range: SelectedLineRange | null): void;
+  getSelection(): SelectedLineRange | null;
+  getHoveredLine: () => GetHoveredLineResult<TMode> | undefined;
+  handlePointerClick: (event: MouseEvent) => void;
+  handlePointerMove: (event: PointerEvent) => void;
+  handlePointerLeave: (event: PointerEvent) => void;
+  private handlePointerEvent;
+  private syncPointerListeners;
+  private updateInteractiveLineAttributes;
+  private handlePointerDown;
+  private startLineSelectionFromPointerDown;
+  private startGutterSelectionFromPointerDown;
+  private handleDocumentPointerMove;
+  private handleDocumentPointerUp;
+  private handleDocumentPointerCancel;
+  private clearHoveredLine;
+  private setHoveredLine;
+  private ensureGutterUtilityNode;
+  private attachDocumentPointerListeners;
+  private detachDocumentPointerListeners;
+  private clearPointerSession;
+  private clearPendingSingleLineState;
+  private getSelectionPointerInfo;
+  private getSelectionPointFromPath;
+  private getLineIndex;
+  private updateSelection;
+  private getIndexesFromSelection;
+  private renderSelection;
+  private notifySelectionCommitted;
+  private notifySelectionChangeDelta;
+  private notifySelectionStart;
+  private notifySelectionEnd;
+  private toEventBaseProps;
+  private buildSelectedLineRange;
+  private buildSelectionRange;
+  private resolvePointerTarget;
+  private isSplitDiff;
+  private parseLineIndex;
+}
+type InteractionPluckOptions<TMode extends InteractionManagerMode> = InteractionManagerBaseOptions<TMode> & {
+  enableHoverUtility?: boolean;
+  renderGutterUtility?(getHoveredRow: () => GetHoveredLineResult<TMode> | undefined): HTMLElement | null;
+  renderHoverUtility?(getHoveredRow: () => GetHoveredLineResult<TMode> | undefined): HTMLElement | null;
+};
+declare function pluckInteractionOptions<TMode extends InteractionManagerMode>({
+  enableGutterUtility,
+  enableHoverUtility,
+  lineHoverHighlight,
+  onGutterUtilityClick,
+  onLineClick,
+  onLineEnter,
+  onLineLeave,
+  onLineNumberClick,
+  renderGutterUtility,
+  renderHoverUtility,
+  __debugPointerEvents,
+  enableLineSelection,
+  onLineSelected,
+  onLineSelectionStart,
+  onLineSelectionChange,
+  onLineSelectionEnd
+}: InteractionPluckOptions<TMode>, onHunkExpand?: (hunkIndex: number, direction: ExpansionDirections, expansionLineCount?: number) => unknown, getLineIndex?: GetLineIndexUtility, onMergeConflictActionClick?: (target: MergeConflictActionTarget) => void): InteractionManagerOptions<TMode>;
+//#endregion
+export { GetHoveredLineResult, GetLineIndexUtility, InteractionManager, InteractionManagerBaseOptions, InteractionManagerMode, InteractionManagerOptions, LogTypes, MergeConflictActionTarget, OnDiffLineClickProps, OnDiffLineEnterLeaveProps, OnLineClickProps, OnLineEnterLeaveProps, SelectedLineRange, pluckInteractionOptions };
+//# sourceMappingURL=InteractionManager.d.ts.map

package/dist/managers/InteractionManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"InteractionManager.d.ts","names":["AnnotationSide","DiffLineEventBaseProps","ExpansionDirections","LineEventBaseProps","MergeConflictResolution","SelectionSide","LogTypes","InteractionManagerMode","OnLineClickProps","PointerEvent","OnLineEnterLeaveProps","OnDiffLineClickProps","OnDiffLineEnterLeaveProps","SelectedLineRange","GetLineIndexUtility","EventClickProps","TMode","PointerEventEnterLeaveProps","GetHoveredLineResult","MergeConflictActionTarget","InteractionManagerBaseOptions","InteractionManagerOptions","InteractionManager","HTMLPreElement","MouseEvent","InteractionPluckOptions","HTMLElement","pluckInteractionOptions","enableGutterUtility","enableHoverUtility","lineHoverHighlight","onGutterUtilityClick","onLineClick","onLineEnter","onLineLeave","onLineNumberClick","renderGutterUtility","renderHoverUtility","__debugPointerEvents","enableLineSelection","onLineSelected","onLineSelectionStart","onLineSelectionChange","onLineSelectionEnd"],"sources":["../../src/managers/InteractionManager.d.ts"],"sourcesContent":["import type { AnnotationSide, DiffLineEventBaseProps, ExpansionDirections, LineEventBaseProps, MergeConflictResolution, SelectionSide } from '../types';\nexport type LogTypes = 'click' | 'move' | 'both' | 'none';\nexport type InteractionManagerMode = 'file' | 'diff';\nexport interface OnLineClickProps extends LineEventBaseProps {\n    event: PointerEvent;\n}\nexport interface OnLineEnterLeaveProps extends LineEventBaseProps {\n    event: PointerEvent;\n}\nexport interface OnDiffLineClickProps extends DiffLineEventBaseProps {\n    event: PointerEvent;\n}\nexport interface OnDiffLineEnterLeaveProps extends DiffLineEventBaseProps {\n    event: PointerEvent;\n}\nexport interface SelectedLineRange {\n    start: number;\n    side?: SelectionSide;\n    end: number;\n    endSide?: SelectionSide;\n}\nexport type GetLineIndexUtility = (lineNumber: number, side?: SelectionSide) => [number, number] | undefined;\ntype EventClickProps<TMode extends InteractionManagerMode> = TMode extends 'file' ? OnLineClickProps : OnDiffLineClickProps;\ntype PointerEventEnterLeaveProps<TMode extends InteractionManagerMode> = TMode extends 'file' ? OnLineEnterLeaveProps : OnDiffLineEnterLeaveProps;\nexport type GetHoveredLineResult<TMode extends InteractionManagerMode> = TMode extends 'file' ? {\n    lineNumber: number;\n} : {\n    lineNumber: number;\n    side: AnnotationSide;\n};\nexport interface MergeConflictActionTarget {\n    kind: 'merge-conflict-action';\n    resolution: MergeConflictResolution;\n    conflictIndex: number;\n}\nexport interface InteractionManagerBaseOptions<TMode extends InteractionManagerMode> {\n    lineHoverHighlight?: 'disabled' | 'both' | 'number' | 'line';\n    enableGutterUtility?: boolean;\n    onGutterUtilityClick?(range: SelectedLineRange): unknown;\n    onLineClick?(props: EventClickProps<TMode>): unknown;\n    onLineNumberClick?(props: EventClickProps<TMode>): unknown;\n    onLineEnter?(props: PointerEventEnterLeaveProps<TMode>): unknown;\n    onLineLeave?(props: PointerEventEnterLeaveProps<TMode>): unknown;\n    __debugPointerEvents?: LogTypes;\n    enableLineSelection?: boolean;\n    onLineSelected?: (range: SelectedLineRange | null) => void;\n    onLineSelectionStart?: (range: SelectedLineRange | null) => void;\n    onLineSelectionChange?: (range: SelectedLineRange | null) => void;\n    onLineSelectionEnd?: (range: SelectedLineRange | null) => void;\n    getLineIndex?: GetLineIndexUtility;\n}\nexport interface InteractionManagerOptions<TMode extends InteractionManagerMode> extends InteractionManagerBaseOptions<TMode> {\n    usesCustomGutterUtility?: boolean;\n    onHunkExpand?(hunkIndex: number, direction: ExpansionDirections, expansionLineCountOverride?: number): unknown;\n    onMergeConflictActionClick?(target: MergeConflictActionTarget): void;\n}\nexport declare class InteractionManager<TMode extends InteractionManagerMode> {\n    private mode;\n    private options;\n    private hoveredLine;\n    private pre;\n    private gutterUtilityContainer;\n    private gutterUtilityButton;\n    private gutterUtilitySlot;\n    private interactiveLinesAttr;\n    private interactiveLineNumbersAttr;\n    private hasPointerListeners;\n    private hasDocumentPointerListeners;\n    private selectedRange;\n    private renderedSelectionRange;\n    private selectionAnchor;\n    private queuedSelectionRender;\n    private pointerSession;\n    constructor(mode: TMode, options: InteractionManagerOptions<TMode>);\n    setOptions(options: InteractionManagerOptions<TMode>): void;\n    cleanUp(): void;\n    setup(pre: HTMLPreElement): void;\n    setSelectionDirty(): void;\n    isSelectionDirty(): boolean;\n    setSelection(range: SelectedLineRange | null): void;\n    getSelection(): SelectedLineRange | null;\n    getHoveredLine: () => GetHoveredLineResult<TMode> | undefined;\n    handlePointerClick: (event: MouseEvent) => void;\n    handlePointerMove: (event: PointerEvent) => void;\n    handlePointerLeave: (event: PointerEvent) => void;\n    private handlePointerEvent;\n    private syncPointerListeners;\n    private updateInteractiveLineAttributes;\n    private handlePointerDown;\n    private startLineSelectionFromPointerDown;\n    private startGutterSelectionFromPointerDown;\n    private handleDocumentPointerMove;\n    private handleDocumentPointerUp;\n    private handleDocumentPointerCancel;\n    private clearHoveredLine;\n    private setHoveredLine;\n    private ensureGutterUtilityNode;\n    private attachDocumentPointerListeners;\n    private detachDocumentPointerListeners;\n    private clearPointerSession;\n    private clearPendingSingleLineState;\n    private getSelectionPointerInfo;\n    private getSelectionPointFromPath;\n    private getLineIndex;\n    private updateSelection;\n    private getIndexesFromSelection;\n    private renderSelection;\n    private notifySelectionCommitted;\n    private notifySelectionChangeDelta;\n    private notifySelectionStart;\n    private notifySelectionEnd;\n    private toEventBaseProps;\n    private buildSelectedLineRange;\n    private buildSelectionRange;\n    private resolvePointerTarget;\n    private isSplitDiff;\n    private parseLineIndex;\n}\ntype InteractionPluckOptions<TMode extends InteractionManagerMode> = InteractionManagerBaseOptions<TMode> & {\n    enableHoverUtility?: boolean;\n    renderGutterUtility?(getHoveredRow: () => GetHoveredLineResult<TMode> | undefined): HTMLElement | null;\n    renderHoverUtility?(getHoveredRow: () => GetHoveredLineResult<TMode> | undefined): HTMLElement | null;\n};\nexport declare function pluckInteractionOptions<TMode extends InteractionManagerMode>({ enableGutterUtility, enableHoverUtility, lineHoverHighlight, onGutterUtilityClick, onLineClick, onLineEnter, onLineLeave, onLineNumberClick, renderGutterUtility, renderHoverUtility, __debugPointerEvents, enableLineSelection, onLineSelected, onLineSelectionStart, onLineSelectionChange, onLineSelectionEnd }: InteractionPluckOptions<TMode>, onHunkExpand?: (hunkIndex: number, direction: ExpansionDirections, expansionLineCount?: number) => unknown, getLineIndex?: GetLineIndexUtility, onMergeConflictActionClick?: (target: MergeConflictActionTarget) => void): InteractionManagerOptions<TMode>;\nexport {};\n//# sourceMappingURL=InteractionManager.d.ts.map"],"mappings":"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"}