@pierre/diffs 1.5.2 → 1.6.0-beta.1

package/dist/highlighter/themes/registerCustomTheme.js

@@ -1,21 +1,13 @@
-import { themeResolver } from "./themeResolver.js";
-import { createTheme } from "@pierre/theming/themes";
-import { DuplicateThemeError } from "@pierre/theming";
+import { customThemes } from "./themeResolver.js";
 //#region src/highlighter/themes/registerCustomTheme.ts
-function registerCustomTheme(themeName, loader) {
-	try {
-		const descriptor = createTheme({
-			name: themeName,
-			load: loader
-		});
-		themeResolver.registerTheme(descriptor.name, descriptor.load);
-	} catch (error) {
-		if (error instanceof DuplicateThemeError) {
-			console.error("SharedHighlight.registerCustomTheme: theme name already registered", themeName);
-			return;
-		}
-		throw error;
+function registerCustomTheme(themeName, loader, type = "textmate") {
+	const themes = customThemes.get(themeName) ?? {};
+	if (themes[type] != null) {
+		console.error("SharedHighlight.registerCustomTheme: theme name and type already registered", themeName, type);
+		return;
 	}
+	themes[type] = loader;
+	customThemes.set(themeName, themes);
 }
 //#endregion
 export { registerCustomTheme };

package/dist/highlighter/themes/registerCustomTheme.js.map

@@ -1 +1 @@
-{"version":3,"file":"registerCustomTheme.js","names":[],"sources":["../../../src/highlighter/themes/registerCustomTheme.ts"],"sourcesContent":["import { DuplicateThemeError, type ThemeLoader } from '@pierre/theming';\nimport { createTheme } from '@pierre/theming/themes';\n\nimport type { ThemeRegistration, ThemeRegistrationResolved } from '../../types';\nimport { themeResolver } from './themeResolver';\n\nexport type CustomThemeLoader = ThemeLoader<\n  ThemeRegistration | ThemeRegistrationResolved\n>;\n\n// Registers a named custom theme loader on the diffs resolver. The loader is\n// wrapped by createTheme so its result is run through Shiki's\n// normalizeTheme before caching — this preserves the legacy behavior where\n// every resolved theme (custom, Pierre, or Shiki-provided) was normalized, so\n// its fg/bg are derived from the colors map. Re-registering an existing name is\n// a no-op that logs, matching the previous contract (the generic resolver throws\n// DuplicateThemeError, which we translate back into the log-and-return shape).\nexport function registerCustomTheme(\n  themeName: string,\n  loader: CustomThemeLoader\n): void {\n  try {\n    const descriptor = createTheme<ThemeRegistrationResolved>({\n      name: themeName,\n      load: loader,\n    });\n    themeResolver.registerTheme(descriptor.name, descriptor.load);\n  } catch (error) {\n    if (error instanceof DuplicateThemeError) {\n      console.error(\n        'SharedHighlight.registerCustomTheme: theme name already registered',\n        themeName\n      );\n      return;\n    }\n    throw error;\n  }\n}\n"],"mappings":";;;;AAiBA,SAAgB,oBACd,WACA,QACM;CACN,IAAI;EACF,MAAM,aAAa,YAAuC;GACxD,MAAM;GACN,MAAM;EACR,CAAC;EACD,cAAc,cAAc,WAAW,MAAM,WAAW,IAAI;CAC9D,SAAS,OAAO;EACd,IAAI,iBAAiB,qBAAqB;GACxC,QAAQ,MACN,sEACA,SACF;GACA;EACF;EACA,MAAM;CACR;AACF"}
+{"version":3,"file":"registerCustomTheme.js","names":[],"sources":["../../../src/highlighter/themes/registerCustomTheme.ts"],"sourcesContent":["import type {\n  Theme as ZedTheme,\n  ThemeFamily as ZedThemeFamily,\n} from '@pierre/highlights';\nimport type { ThemeLoader } from '@pierre/theming';\nimport type { ThemeRegistration } from 'shiki';\n\nimport { type CustomThemeLoader, customThemes } from './themeResolver';\nimport type { DiffsTheme } from './types';\n\nexport type { CustomThemeLoader } from './themeResolver';\n\n/** Register a lazy TextMate, Zed, or shared Diffs theme loader. */\nexport function registerCustomTheme(\n  themeName: string,\n  loader: ThemeLoader<ThemeRegistration>,\n  type?: 'textmate'\n): void;\nexport function registerCustomTheme(\n  themeName: string,\n  loader: ThemeLoader<ZedTheme | ZedThemeFamily>,\n  type: 'zed'\n): void;\nexport function registerCustomTheme(\n  themeName: string,\n  loader: ThemeLoader<DiffsTheme>,\n  type: 'diffs'\n): void;\nexport function registerCustomTheme(\n  themeName: string,\n  loader: CustomThemeLoader,\n  type: 'textmate' | 'zed' | 'diffs' = 'textmate'\n): void {\n  const themes = customThemes.get(themeName) ?? {};\n  if (themes[type] != null) {\n    console.error(\n      'SharedHighlight.registerCustomTheme: theme name and type already registered',\n      themeName,\n      type\n    );\n    return;\n  }\n  themes[type] = loader;\n  customThemes.set(themeName, themes);\n}\n"],"mappings":";;AA4BA,SAAgB,oBACd,WACA,QACA,OAAqC,YAC/B;CACN,MAAM,SAAS,aAAa,IAAI,SAAS,KAAK,CAAC;CAC/C,IAAI,OAAO,SAAS,MAAM;EACxB,QAAQ,MACN,+EACA,WACA,IACF;EACA;CACF;CACA,OAAO,QAAQ;CACf,aAAa,IAAI,WAAW,MAAM;AACpC"}

package/dist/highlighter/themes/resolveTheme.d.ts

@@ -1,6 +1,7 @@
-import { DiffsThemeNames, ThemeRegistrationResolved } from "../../types.js";
+import { DiffsTheme } from "./types.js";
+import { DiffsThemeNames, HighlighterTypes } from "../../types.js";
 //#region src/highlighter/themes/resolveTheme.d.ts
-declare function resolveTheme(themeName: DiffsThemeNames): Promise<ThemeRegistrationResolved>;
+declare function resolveTheme(themeName: DiffsThemeNames, backend?: HighlighterTypes): Promise<DiffsTheme>;
 //#endregion
 export { resolveTheme };
 //# sourceMappingURL=resolveTheme.d.ts.map

package/dist/highlighter/themes/resolveTheme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveTheme.d.ts","names":[],"sources":["../../../src/highlighter/themes/resolveTheme.ts"],"mappings":";;iBAiBsB,aACpB,WAAW,kBACV,QAAQ"}
+{"version":3,"file":"resolveTheme.d.ts","names":[],"sources":["../../../src/highlighter/themes/resolveTheme.ts"],"mappings":";;;iBAKgB,aACd,WAAW,iBACX,UAAS,mBACR,QAAQ"}

package/dist/highlighter/themes/resolveTheme.js

@@ -1,11 +1,8 @@
-import { themeResolver } from "./themeResolver.js";
-import { prepareThemeResolution, validateResolvedThemeName } from "./themeResolution.js";
+import { resolveHighlighterType } from "../highlighterType.js";
+import { createDiffsThemeResolver } from "./themeResolver.js";
 //#region src/highlighter/themes/resolveTheme.ts
-async function resolveTheme(themeName) {
-	prepareThemeResolution(themeName);
-	const theme = await themeResolver.resolveTheme(themeName);
-	validateResolvedThemeName(themeName, theme);
-	return theme;
+function resolveTheme(themeName, backend = resolveHighlighterType()) {
+	return createDiffsThemeResolver(backend).resolveTheme(themeName);
 }
 //#endregion
 export { resolveTheme };

package/dist/highlighter/themes/resolveTheme.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveTheme.js","names":[],"sources":["../../../src/highlighter/themes/resolveTheme.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nimport {\n  prepareThemeResolution,\n  validateResolvedThemeName,\n} from './themeResolution';\nimport { themeResolver } from './themeResolver';\n\n// Resolves a theme by name to a normalized Shiki theme, delegating the cache,\n// concurrent-load dedupe, normalization, and registry to the shared\n// @pierre/theming resolver. The diffs-specific behavior layered on top:\n//   1. Worker-context guard — themes must be pre-resolved on the main thread\n//      and handed to the worker, which seeds them via attachResolvedThemes.\n//   2. Bundled-theme fallback — a name with no registered loader that matches a\n//      Shiki bundled theme is registered on demand (per-name dynamic import),\n//      so callers never have to pre-register the full Shiki theme set.\n//   3. theme.name validation — the resolved theme's own name must match the\n//      requested name, catching mismatched registrations early.\nexport async function resolveTheme(\n  themeName: DiffsThemeNames\n): Promise<ThemeRegistrationResolved> {\n  prepareThemeResolution(themeName);\n\n  const theme = await themeResolver.resolveTheme(themeName);\n\n  validateResolvedThemeName(themeName, theme);\n\n  return theme;\n}\n"],"mappings":";;;AAiBA,eAAsB,aACpB,WACoC;CACpC,uBAAuB,SAAS;CAEhC,MAAM,QAAQ,MAAM,cAAc,aAAa,SAAS;CAExD,0BAA0B,WAAW,KAAK;CAE1C,OAAO;AACT"}
+{"version":3,"file":"resolveTheme.js","names":[],"sources":["../../../src/highlighter/themes/resolveTheme.ts"],"sourcesContent":["import type { DiffsThemeNames, HighlighterTypes } from '../../types';\nimport { resolveHighlighterType } from '../highlighterType';\nimport { createDiffsThemeResolver } from './themeResolver';\nimport type { DiffsTheme } from './types';\n\nexport function resolveTheme(\n  themeName: DiffsThemeNames,\n  backend: HighlighterTypes = resolveHighlighterType()\n): Promise<DiffsTheme> {\n  return createDiffsThemeResolver(backend).resolveTheme(themeName);\n}\n"],"mappings":";;;AAKA,SAAgB,aACd,WACA,UAA4B,uBAAuB,GAC9B;CACrB,OAAO,yBAAyB,OAAO,CAAC,CAAC,aAAa,SAAS;AACjE"}

package/dist/highlighter/themes/resolveThemes.d.ts

@@ -1,6 +1,7 @@
-import { DiffsThemeNames, ThemeRegistrationResolved } from "../../types.js";
+import { DiffsTheme } from "./types.js";
+import { DiffsThemeNames, HighlighterTypes } from "../../types.js";
 //#region src/highlighter/themes/resolveThemes.d.ts
-declare function resolveThemes(themes: DiffsThemeNames[]): Promise<ThemeRegistrationResolved[]>;
+declare function resolveThemes(themes: DiffsThemeNames[], backend?: HighlighterTypes): Promise<DiffsTheme[]>;
 //#endregion
 export { resolveThemes };
 //# sourceMappingURL=resolveThemes.d.ts.map

package/dist/highlighter/themes/resolveThemes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveThemes.d.ts","names":[],"sources":["../../../src/highlighter/themes/resolveThemes.ts"],"mappings":";;iBAOsB,cACpB,QAAQ,oBACP,QAAQ"}
+{"version":3,"file":"resolveThemes.d.ts","names":[],"sources":["../../../src/highlighter/themes/resolveThemes.ts"],"mappings":";;;iBAKgB,cACd,QAAQ,mBACR,UAAS,mBACR,QAAQ"}

package/dist/highlighter/themes/resolveThemes.js

@@ -1,11 +1,8 @@
-import { themeResolver } from "./themeResolver.js";
-import { prepareThemeResolution, validateResolvedThemeName } from "./themeResolution.js";
+import { resolveHighlighterType } from "../highlighterType.js";
+import { createDiffsThemeResolver } from "./themeResolver.js";
 //#region src/highlighter/themes/resolveThemes.ts
-async function resolveThemes(themes) {
-	for (const themeName of themes) prepareThemeResolution(themeName);
-	const resolvedThemes = await themeResolver.resolveThemes(themes);
-	for (let i = 0; i < themes.length; i++) validateResolvedThemeName(themes[i], resolvedThemes[i]);
-	return resolvedThemes;
+function resolveThemes(themes, backend = resolveHighlighterType()) {
+	return createDiffsThemeResolver(backend).resolveThemes(themes);
 }
 //#endregion
 export { resolveThemes };

package/dist/highlighter/themes/resolveThemes.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveThemes.js","names":[],"sources":["../../../src/highlighter/themes/resolveThemes.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nimport {\n  prepareThemeResolution,\n  validateResolvedThemeName,\n} from './themeResolution';\nimport { themeResolver } from './themeResolver';\n\nexport async function resolveThemes(\n  themes: DiffsThemeNames[]\n): Promise<ThemeRegistrationResolved[]> {\n  for (const themeName of themes) {\n    prepareThemeResolution(themeName);\n  }\n\n  const resolvedThemes = await themeResolver.resolveThemes(themes);\n  for (let i = 0; i < themes.length; i++) {\n    validateResolvedThemeName(themes[i], resolvedThemes[i]);\n  }\n\n  return resolvedThemes;\n}\n"],"mappings":";;;AAOA,eAAsB,cACpB,QACsC;CACtC,KAAK,MAAM,aAAa,QACtB,uBAAuB,SAAS;CAGlC,MAAM,iBAAiB,MAAM,cAAc,cAAc,MAAM;CAC/D,KAAK,IAAI,IAAI,GAAG,IAAI,OAAO,QAAQ,KACjC,0BAA0B,OAAO,IAAI,eAAe,EAAE;CAGxD,OAAO;AACT"}
+{"version":3,"file":"resolveThemes.js","names":[],"sources":["../../../src/highlighter/themes/resolveThemes.ts"],"sourcesContent":["import type { DiffsThemeNames, HighlighterTypes } from '../../types';\nimport { resolveHighlighterType } from '../highlighterType';\nimport { createDiffsThemeResolver } from './themeResolver';\nimport type { DiffsTheme } from './types';\n\nexport function resolveThemes(\n  themes: DiffsThemeNames[],\n  backend: HighlighterTypes = resolveHighlighterType()\n): Promise<DiffsTheme[]> {\n  return createDiffsThemeResolver(backend).resolveThemes(themes);\n}\n"],"mappings":";;;AAKA,SAAgB,cACd,QACA,UAA4B,uBAAuB,GAC5B;CACvB,OAAO,yBAAyB,OAAO,CAAC,CAAC,cAAc,MAAM;AAC/D"}

package/dist/highlighter/themes/themeResolver.d.ts

@@ -1,7 +1,13 @@
-import { ThemeRegistrationResolved } from "../../types.js";
-import { ThemeResolver } from "@pierre/theming";
+import { DiffsTheme } from "./types.js";
+import { HighlighterTypes } from "../../types.js";
+import { ThemeLoader, ThemeResolver } from "@pierre/theming";
+import { ThemeRegistration } from "shiki";
+import { Theme, ThemeFamily } from "@pierre/highlights";
 //#region src/highlighter/themes/themeResolver.d.ts
-declare const themeResolver: ThemeResolver<ThemeRegistrationResolved>;
+type CustomThemeLoader = ThemeLoader<ThemeRegistration | DiffsTheme | Theme | ThemeFamily>;
+declare const customThemes: Map<string, Partial<Record<'textmate' | 'zed' | 'diffs', CustomThemeLoader>>>;
+/** Keep caches separate because the same name can have TextMate and Zed palettes. */
+declare function createDiffsThemeResolver(backend: HighlighterTypes): ThemeResolver<DiffsTheme>;
 //#endregion
-export { themeResolver };
+export { CustomThemeLoader, createDiffsThemeResolver, customThemes };
 //# sourceMappingURL=themeResolver.d.ts.map

package/dist/highlighter/themes/themeResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"themeResolver.d.ts","names":[],"sources":["../../../src/highlighter/themes/themeResolver.ts"],"mappings":";;;cAgBa,eAAe,cAAc"}
+{"version":3,"file":"themeResolver.d.ts","names":[],"sources":["../../../src/highlighter/themes/themeResolver.ts"],"mappings":";;;;;;KAkBY,oBAAoB,YAC9B,oBAAoB,aAAa,QAAW;cAEjC,cAAc,YAEzB,QAAQ,qCAAqC;;iBA6F/B,yBACd,SAAS,mBACR,cAAc"}

package/dist/highlighter/themes/themeResolver.js

@@ -1,7 +1,146 @@
+import { isWorkerContext } from "../../utils/isWorkerContext.js";
+import { createCachedLoader } from "./createCachedLoader.js";
 import { createThemeResolver } from "@pierre/theming";
 //#region src/highlighter/themes/themeResolver.ts
-const themeResolver = createThemeResolver();
+const customThemes = /* @__PURE__ */ new Map();
+const resolvers = /* @__PURE__ */ new Map();
+const loadHighlightsThemeCatalog = createCachedLoader(() => import("@pierre/highlights/themes/loader"));
+const loadPierreThemeCatalog = createCachedLoader(() => import("@pierre/theming/themes"));
+const loadShikiCore = createCachedLoader(() => import("shiki/core"));
+const ZED_COLOR_ALIASES = [
+	["editor.lineHighlightBackground", "editor.active_line.background"],
+	["editor.selectionBackground", "element.selected"],
+	["editor.findMatchBackground", "search.match_background"],
+	["editor.findMatchHighlightBackground", "search.match_background"],
+	["editorBracketMatch.background", "editor.document_highlight.bracket_background"],
+	["editorError.foreground", "error"],
+	["editorWarning.foreground", "warning"],
+	["editorInfo.foreground", "info"],
+	["editorHint.foreground", "hint"],
+	[
+		"gitDecoration.addedResourceForeground",
+		"created",
+		"terminal.ansi.green"
+	],
+	[
+		"gitDecoration.deletedResourceForeground",
+		"deleted",
+		"terminal.ansi.red"
+	],
+	[
+		"gitDecoration.modifiedResourceForeground",
+		"modified",
+		"terminal.ansi.blue"
+	]
+];
+function createHighlightsTheme(name, raw) {
+	const theme = "themes" in raw ? raw.themes[0] : raw;
+	if (theme == null) throw new Error(`Theme "${name}" is an empty Zed theme family.`);
+	const zed = {
+		...theme,
+		name
+	};
+	const colors = {};
+	for (const [key, value] of Object.entries(zed.style)) if (typeof value === "string") colors[key] = value;
+	const player = zed.style.players?.[0];
+	if (player?.cursor != null) colors["editorCursor.foreground"] ??= player.cursor;
+	if (player?.selection != null) colors["editor.selectionBackground"] ??= player.selection;
+	for (const [target, ...sources] of ZED_COLOR_ALIASES) {
+		if (colors[target] != null) continue;
+		const source = sources.find((key) => colors[key] != null);
+		if (source != null) colors[target] = colors[source];
+	}
+	if (zed.cssVariables === true) {
+		colors["editor.foreground"] = "var(--hls-foreground)";
+		colors["editor.background"] = "var(--hls-background)";
+	} else if (typeof zed.cssVariables === "object") {
+		colors["editor.foreground"] ??= colors.text ?? colors.foreground ?? "foreground";
+		colors["editor.background"] ??= colors.background ?? "background";
+		const { prefix = "--hls-", defaults } = zed.cssVariables;
+		for (const [key, value] of Object.entries(colors)) {
+			const fallback = defaults?.[value];
+			colors[key] = `var(${prefix}${value}${fallback ? `, ${fallback}` : ""})`;
+		}
+	}
+	const type = zed.appearance === "light" ? "light" : "dark";
+	return {
+		name,
+		type,
+		colors,
+		zed,
+		fg: colors["editor.foreground"] ?? colors.text ?? colors.foreground ?? (type === "light" ? "#333333" : "#bbbbbb"),
+		bg: colors["editor.background"] ?? colors.background ?? (type === "light" ? "#ffffff" : "#1e1e1e")
+	};
+}
+/** Keep caches separate because the same name can have TextMate and Zed palettes. */
+function createDiffsThemeResolver(backend) {
+	let resolver = resolvers.get(backend);
+	if (resolver != null) return resolver;
+	resolver = createThemeResolver({
+		fallbackLoader: async (name) => {
+			if (typeof __DIFFS_WORKER__ !== "undefined" ? __DIFFS_WORKER__ : isWorkerContext()) throw new Error(`Theme "${name}" cannot be resolved from a worker context. Themes must be pre-resolved on the main thread and passed to the worker via the resolvedThemes parameter.`);
+			const custom = customThemes.get(name);
+			if (backend === "highlights") {
+				const loader = custom?.zed ?? custom?.diffs;
+				if (loader != null) {
+					const loaded = await loader();
+					const theme = "default" in loaded ? loaded.default : loaded;
+					if ("zed" in theme && theme.zed != null) return theme;
+					if ("style" in theme || "themes" in theme) return createHighlightsTheme(name, theme);
+					throw new Error(`Theme "${name}" is a TextMate theme; register a Zed theme with registerCustomTheme(name, loader, 'zed') for Highlights.`);
+				}
+				const catalog = loadHighlightsThemeCatalog();
+				const { themes } = catalog instanceof Promise ? await catalog : catalog;
+				const bundledLoader = themes[name];
+				if (bundledLoader != null) return createHighlightsTheme(name, (await bundledLoader()).default);
+				if (custom?.textmate != null) throw new Error(`Theme "${name}" is only registered for TextMate; use registerCustomTheme(name, loader, 'zed') for Highlights.`);
+			} else {
+				const loader = custom?.textmate ?? custom?.diffs;
+				let loaded;
+				if (loader != null) {
+					const result = await loader();
+					loaded = "default" in result ? result.default : result;
+				} else {
+					const catalog = loadPierreThemeCatalog();
+					const { themes } = catalog instanceof Promise ? await catalog : catalog;
+					const descriptor = themes.getTheme(name);
+					if (descriptor == null && custom?.zed != null) throw new Error(`Theme "${name}" is only registered for Zed; use registerCustomTheme(name, loader, 'textmate') for Shiki.`);
+					if (descriptor == null) throw new Error(`No valid theme loader registered for "${name}"`);
+					const result = await descriptor.load();
+					loaded = "default" in result ? result.default : result;
+				}
+				if ("style" in loaded || "themes" in loaded) throw new Error(`Theme "${name}" is a Zed theme; use preferredHighlighter: 'highlights' or register a TextMate theme for Shiki.`);
+				const core = loadShikiCore();
+				const { normalizeTheme, createCssVariablesTheme } = core instanceof Promise ? await core : core;
+				if ("cssVariables" in loaded && loaded.cssVariables != null) return {
+					...loaded,
+					textmate: normalizeTheme(createCssVariablesTheme(loaded.cssVariables))
+				};
+				if ("textmate" in loaded && loaded.textmate != null) return {
+					...loaded,
+					textmate: normalizeTheme(loaded.textmate)
+				};
+				const textmate = normalizeTheme(loaded);
+				return {
+					name: textmate.name,
+					type: textmate.type,
+					fg: textmate.fg,
+					bg: textmate.bg,
+					colors: textmate.colors,
+					textmate
+				};
+			}
+			throw new Error(`No valid theme loader registered for "${name}"`);
+		},
+		normalizeTheme: (theme, name) => {
+			if (theme.name !== name) throw new Error(`resolvedTheme: themeName: ${name} does not match theme.name: ${theme.name}`);
+			return theme;
+		}
+	});
+	resolvers.set(backend, resolver);
+	return resolver;
+}
 //#endregion
-export { themeResolver };
+export { createDiffsThemeResolver, customThemes };
 
 //# sourceMappingURL=themeResolver.js.map

package/dist/highlighter/themes/themeResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"themeResolver.js","names":[],"sources":["../../../src/highlighter/themes/themeResolver.ts"],"sourcesContent":["import { createThemeResolver, type ThemeResolver } from '@pierre/theming';\n\nimport type { ThemeRegistrationResolved } from '../../types';\n\n// The single diffs-owned theme resolver. It replaces the former hand-rolled\n// ResolvedThemes (sync cache) + ResolvingThemes (in-flight dedupe) +\n// RegisteredCustomThemes (loader registry) trio with one shared\n// @pierre/theming resolver: the resolver owns the cache, the concurrent-load\n// dedupe, and the name→loader registry internally.\n//\n// This module is intentionally NOT re-exported from the package index — the\n// resolver and the registered-name set are diffs internals. Public callers go\n// through the wrapper functions (resolveTheme, getResolvedThemes, etc.) that\n// add the diffs-specific behavior the generic resolver knows nothing about:\n// the worker-context guard, Shiki normalization, the bundled-theme fallback,\n// and the theme.name validation.\nexport const themeResolver: ThemeResolver<ThemeRegistrationResolved> =\n  createThemeResolver<ThemeRegistrationResolved>();\n"],"mappings":";;AAgBA,MAAa,gBACX,oBAA+C"}
+{"version":3,"file":"themeResolver.js","names":[],"sources":["../../../src/highlighter/themes/themeResolver.ts"],"sourcesContent":["import type {\n  Theme as ZedTheme,\n  ThemeFamily as ZedThemeFamily,\n} from '@pierre/highlights';\nimport {\n  createThemeResolver,\n  type ThemeLoader,\n  type ThemeResolver,\n} from '@pierre/theming';\nimport type { ThemeRegistration } from 'shiki';\n\nimport type { HighlighterTypes } from '../../types';\nimport { isWorkerContext } from '../../utils/isWorkerContext';\nimport { createCachedLoader } from './createCachedLoader';\nimport type { DiffsTheme } from './types';\n\ndeclare const __DIFFS_WORKER__: boolean | undefined;\n\nexport type CustomThemeLoader = ThemeLoader<\n  ThemeRegistration | DiffsTheme | ZedTheme | ZedThemeFamily\n>;\nexport const customThemes: Map<\n  string,\n  Partial<Record<'textmate' | 'zed' | 'diffs', CustomThemeLoader>>\n> = new Map();\nconst resolvers = new Map<HighlighterTypes, ThemeResolver<DiffsTheme>>();\n\nconst loadHighlightsThemeCatalog = createCachedLoader(\n  () => import('@pierre/highlights/themes/loader')\n);\nconst loadPierreThemeCatalog = createCachedLoader(\n  () => import('@pierre/theming/themes')\n);\nconst loadShikiCore = createCachedLoader(() => import('shiki/core'));\n\n// Map Zed colors to the VS Code keys used by editor and diff overlays.\nconst ZED_COLOR_ALIASES: readonly (readonly [\n  target: string,\n  ...sources: string[],\n])[] = [\n  ['editor.lineHighlightBackground', 'editor.active_line.background'],\n  ['editor.selectionBackground', 'element.selected'],\n  ['editor.findMatchBackground', 'search.match_background'],\n  ['editor.findMatchHighlightBackground', 'search.match_background'],\n  [\n    'editorBracketMatch.background',\n    'editor.document_highlight.bracket_background',\n  ],\n  ['editorError.foreground', 'error'],\n  ['editorWarning.foreground', 'warning'],\n  ['editorInfo.foreground', 'info'],\n  ['editorHint.foreground', 'hint'],\n  ['gitDecoration.addedResourceForeground', 'created', 'terminal.ansi.green'],\n  ['gitDecoration.deletedResourceForeground', 'deleted', 'terminal.ansi.red'],\n  [\n    'gitDecoration.modifiedResourceForeground',\n    'modified',\n    'terminal.ansi.blue',\n  ],\n];\n\nfunction createHighlightsTheme(\n  name: string,\n  raw: ZedTheme | ZedThemeFamily\n): DiffsTheme {\n  const theme = 'themes' in raw ? raw.themes[0] : raw;\n  if (theme == null)\n    throw new Error(`Theme \"${name}\" is an empty Zed theme family.`);\n  const zed = { ...theme, name };\n  const colors: Record<string, string> = {};\n  for (const [key, value] of Object.entries(zed.style)) {\n    if (typeof value === 'string') colors[key] = value;\n  }\n  // Zed keeps the local user's caret and selection in the first player slot.\n  const player = zed.style.players?.[0];\n  if (player?.cursor != null)\n    colors['editorCursor.foreground'] ??= player.cursor;\n  if (player?.selection != null)\n    colors['editor.selectionBackground'] ??= player.selection;\n  for (const [target, ...sources] of ZED_COLOR_ALIASES) {\n    if (colors[target] != null) continue;\n    const source = sources.find((key) => colors[key] != null);\n    if (source != null) colors[target] = colors[source];\n  }\n  if (zed.cssVariables === true) {\n    colors['editor.foreground'] = 'var(--hls-foreground)';\n    colors['editor.background'] = 'var(--hls-background)';\n  } else if (typeof zed.cssVariables === 'object') {\n    colors['editor.foreground'] ??=\n      colors.text ?? colors.foreground ?? 'foreground';\n    colors['editor.background'] ??= colors.background ?? 'background';\n    const { prefix = '--hls-', defaults } = zed.cssVariables;\n    for (const [key, value] of Object.entries(colors)) {\n      const fallback = defaults?.[value];\n      colors[key] = `var(${prefix}${value}${fallback ? `, ${fallback}` : ''})`;\n    }\n  }\n  const type = zed.appearance === 'light' ? 'light' : 'dark';\n  return {\n    name,\n    type,\n    colors,\n    zed,\n    fg:\n      colors['editor.foreground'] ??\n      colors.text ??\n      colors.foreground ??\n      (type === 'light' ? '#333333' : '#bbbbbb'),\n    bg:\n      colors['editor.background'] ??\n      colors.background ??\n      (type === 'light' ? '#ffffff' : '#1e1e1e'),\n  };\n}\n\n/** Keep caches separate because the same name can have TextMate and Zed palettes. */\nexport function createDiffsThemeResolver(\n  backend: HighlighterTypes\n): ThemeResolver<DiffsTheme> {\n  let resolver = resolvers.get(backend);\n  if (resolver != null) return resolver;\n  resolver = createThemeResolver<DiffsTheme>({\n    fallbackLoader: async (name) => {\n      if (\n        typeof __DIFFS_WORKER__ !== 'undefined'\n          ? __DIFFS_WORKER__\n          : isWorkerContext()\n      ) {\n        throw new Error(\n          `Theme \"${name}\" cannot be resolved from a worker context. Themes must be pre-resolved on the main thread and passed to the worker via the resolvedThemes parameter.`\n        );\n      }\n      const custom = customThemes.get(name);\n      if (backend === 'highlights') {\n        const loader = custom?.zed ?? custom?.diffs;\n        if (loader != null) {\n          const loaded = await loader();\n          const theme = 'default' in loaded ? loaded.default : loaded;\n          if ('zed' in theme && theme.zed != null) return theme;\n          if ('style' in theme || 'themes' in theme)\n            return createHighlightsTheme(name, theme);\n          throw new Error(\n            `Theme \"${name}\" is a TextMate theme; register a Zed theme with registerCustomTheme(name, loader, 'zed') for Highlights.`\n          );\n        }\n        const catalog = loadHighlightsThemeCatalog();\n        const { themes } = catalog instanceof Promise ? await catalog : catalog;\n        const bundledLoader = themes[name];\n        if (bundledLoader != null) {\n          const loaded = await bundledLoader();\n          return createHighlightsTheme(name, loaded.default);\n        }\n        if (custom?.textmate != null) {\n          throw new Error(\n            `Theme \"${name}\" is only registered for TextMate; use registerCustomTheme(name, loader, 'zed') for Highlights.`\n          );\n        }\n      } else {\n        const loader = custom?.textmate ?? custom?.diffs;\n        let loaded: ThemeRegistration | DiffsTheme | ZedTheme | ZedThemeFamily;\n        if (loader != null) {\n          const result = await loader();\n          loaded = 'default' in result ? result.default : result;\n        } else {\n          const catalog = loadPierreThemeCatalog();\n          const { themes } =\n            catalog instanceof Promise ? await catalog : catalog;\n          const descriptor = themes.getTheme(name);\n          if (descriptor == null && custom?.zed != null) {\n            throw new Error(\n              `Theme \"${name}\" is only registered for Zed; use registerCustomTheme(name, loader, 'textmate') for Shiki.`\n            );\n          }\n          if (descriptor == null)\n            throw new Error(`No valid theme loader registered for \"${name}\"`);\n          const result = await descriptor.load();\n          loaded = 'default' in result ? result.default : result;\n        }\n        if ('style' in loaded || 'themes' in loaded) {\n          throw new Error(\n            `Theme \"${name}\" is a Zed theme; use preferredHighlighter: 'highlights' or register a TextMate theme for Shiki.`\n          );\n        }\n        const core = loadShikiCore();\n        const { normalizeTheme, createCssVariablesTheme } =\n          core instanceof Promise ? await core : core;\n        if ('cssVariables' in loaded && loaded.cssVariables != null) {\n          return {\n            ...loaded,\n            textmate: normalizeTheme(\n              createCssVariablesTheme(loaded.cssVariables)\n            ),\n          };\n        }\n        if ('textmate' in loaded && loaded.textmate != null) {\n          return { ...loaded, textmate: normalizeTheme(loaded.textmate) };\n        }\n        const textmate = normalizeTheme(loaded);\n        return {\n          name: textmate.name,\n          type: textmate.type,\n          fg: textmate.fg,\n          bg: textmate.bg,\n          colors: textmate.colors,\n          textmate,\n        };\n      }\n      throw new Error(`No valid theme loader registered for \"${name}\"`);\n    },\n    normalizeTheme: (theme, name) => {\n      if (theme.name !== name)\n        throw new Error(\n          `resolvedTheme: themeName: ${name} does not match theme.name: ${theme.name}`\n        );\n      return theme;\n    },\n  });\n  resolvers.set(backend, resolver);\n  return resolver;\n}\n"],"mappings":"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"}

package/dist/highlighter/themes/types.d.ts

@@ -0,0 +1,23 @@
+import { ThemeLike } from "@pierre/theming";
+import { ThemeRegistrationResolved } from "shiki";
+import { Theme } from "@pierre/highlights";
+//#region src/highlighter/themes/types.d.ts
+/** Shared editor colors with the syntax theme for each supported backend. */
+interface DiffsTheme extends ThemeLike {
+  name: string;
+  type: 'dark' | 'light';
+  fg: string;
+  bg: string;
+  textmate?: ThemeRegistrationResolved;
+  zed?: Theme;
+  cssVariables?: CSSVariablesThemeOptions;
+}
+interface CSSVariablesThemeOptions {
+  name?: string;
+  variablePrefix?: string;
+  variableDefaults?: Record<string, string>;
+  fontStyle?: boolean;
+}
+//#endregion
+export { CSSVariablesThemeOptions, DiffsTheme };
+//# sourceMappingURL=types.d.ts.map

package/dist/highlighter/themes/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","names":[],"sources":["../../../src/highlighter/themes/types.ts"],"mappings":";;;;;UAKiB,mBAAmB;EAClC;EACA;EACA;EACA;EACA,WAAW;EACX,MAAM;EACN,eAAe;;UAGA;EACf;EACA;EACA,mBAAmB;EACnB"}

package/dist/highlighter/tokenizer-types.d.ts

@@ -0,0 +1,35 @@
+import { ThemedToken } from "./types.js";
+import { HighlightedToken } from "../types.js";
+import { TextDocument } from "../editor/textDocument.js";
+//#region src/highlighter/tokenizer-types.d.ts
+/** Document and callbacks owned by an editor's incremental tokenizer. */
+interface DiffsEditorTokenizerOptions {
+  textDocument: Pick<TextDocument, 'getText' | 'getLineText' | 'lineCount' | 'languageId' | 'version'>;
+  theme: string;
+  tokenizeMaxLineLength?: number;
+  matchBrackets?: boolean;
+  onDeferTokenize: (lines: Map<number, HighlightedToken[]>) => void;
+  __debug?: boolean;
+}
+/** Previously emitted provisional tokens to remove before applying new tokens. */
+interface RecallToken {
+  recall: number;
+}
+interface DiffsStreamTokenizerEnqueueResult {
+  recall: number;
+  stable: ThemedToken[];
+  unstable: ThemedToken[];
+}
+/** Incremental source chunks with a replaceable final line. */
+interface DiffsStreamTokenizer {
+  enqueue(chunk: string): DiffsStreamTokenizerEnqueueResult | Promise<DiffsStreamTokenizerEnqueueResult>;
+  close(): {
+    stable: ThemedToken[];
+  };
+  clear(): void;
+  clone(): DiffsStreamTokenizer;
+  dispose(): void;
+}
+//#endregion
+export { DiffsEditorTokenizerOptions, DiffsStreamTokenizer, DiffsStreamTokenizerEnqueueResult, RecallToken };
+//# sourceMappingURL=tokenizer-types.d.ts.map

package/dist/highlighter/tokenizer-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokenizer-types.d.ts","names":[],"sources":["../../src/highlighter/tokenizer-types.ts"],"mappings":";;;;;UAKiB;EACf,cAAc,KACZ;EAGF;EACA;EACA;EACA,kBAAkB,OAAO,YAAY;EACrC;;;UAIe;EACf;;UAGe;EACf;EACA,QAAQ;EACR,UAAU;;;UAIK;EACf,QACE,gBAEE,oCACA,QAAQ;EACZ;IAAW,QAAQ;;EACnB;EACA,SAAS;EACT"}

package/dist/highlighter/types.d.ts

@@ -0,0 +1,55 @@
+import { Properties } from "../node_modules/.pnpm/@types_hast@3.0.4/node_modules/@types/hast/index.js";
+import { DiffsEditorTokenizer } from "./DiffsEditorTokenizer.js";
+import { DiffsEditorTokenizerOptions, DiffsStreamTokenizer } from "./tokenizer-types.js";
+import { DiffsHighlighter } from "./DiffsHighlighter.js";
+//#region src/highlighter/types.d.ts
+/** One styled run, with its absolute UTF-16 offset in the source. */
+interface ThemedToken {
+  content: string;
+  offset: number;
+  color?: string;
+  bgColor?: string;
+  fontStyle?: number;
+  htmlStyle?: Record<string, string>;
+  htmlAttrs?: Record<string, string>;
+  type?: number;
+}
+interface DecorationItem {
+  start: number | {
+    line: number;
+    character: number;
+  };
+  end: number | {
+    line: number;
+    character: number;
+  };
+  properties?: Properties;
+  alwaysWrap?: boolean;
+}
+type CodeToTokensOptions = {
+  lang: string;
+  defaultColor?: string | false;
+  cssVariablePrefix?: string;
+  tokenizeMaxLineLength?: number;
+  tokenizeTimeLimit?: number;
+  mergeWhitespaces?: 'never' | 'always';
+} & ({
+  theme: string;
+  themes?: undefined;
+} | {
+  theme?: undefined;
+  themes: Record<string, string>;
+});
+type CodeToHtmlOptions = CodeToTokensOptions & {
+  decorations?: DecorationItem[];
+};
+interface TokensResult {
+  tokens: ThemedToken[][];
+  fg?: string;
+  bg?: string;
+  themeName?: string;
+  rootStyle?: string | false;
+}
+//#endregion
+export { CodeToHtmlOptions, CodeToTokensOptions, DecorationItem, type DiffsEditorTokenizer, type DiffsEditorTokenizerOptions, type DiffsHighlighter, type DiffsStreamTokenizer, ThemedToken, TokensResult };
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","names":[],"sources":["../../src/highlighter/types.ts"],"mappings":";;;;;;UAUiB;EACf;EACA;EACA;EACA;EACA;EACA,YAAY;EACZ,YAAY;EACZ;;UAGe;EACf;IAAkB;IAAc;;EAChC;IAAgB;IAAc;;EAC9B,aAAa;EACb;;KAGU;EACV;EACA;EACA;EACA;EACA;EACA;;EAEI;EAAe;;EACf;EAAmB,QAAQ;;KAGrB,oBAAoB;EAC9B,cAAc;;UAGC;EACf,QAAQ;EACR;EACA;EACA;EACA"}

package/dist/index.d.ts

@@ -1,4 +1,9 @@
-import { AnnotationLineMap, AnnotationSide, AnnotationSpan, AppliedThemeStyleCache, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, CodeViewDiffItem, CodeViewFileItem, CodeViewItem, CodeViewItemScrollTarget, CodeViewLayout, CodeViewLineScrollTarget, CodeViewPositionScrollTarget, CodeViewRangeScrollTarget, CodeViewScrollBehavior, CodeViewScrollTarget, ConflictResolverTypes, ContextContent, CreatePatchOptionsNonabortable, CustomPreProperties, DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffFileInput, DiffIndicators, DiffLineAnnotation, DiffLineEventBaseProps, DiffTokenEventBaseProps, DiffsHighlighter, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffContentsLoader, FileDiffLoadedChangedFiles, FileDiffLoadedFiles, FileDiffLoadedPureRenamedFile, FileDiffMetadata, FileHeaderRenderMode, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlightedToken, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MaybeDiffFileInput, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, NumericScrollLineAnchor, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PendingCodeViewLayoutReset, PostRenderPhase, PrePropertiesConfig, ProcessFileConflictData, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderFilenameSuffixCallback, RenderHeaderMetadataCallback, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectedLineRange, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SmoothScrollSettings, StickySpecs, SupportedLanguages, ThemeRegistration, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, TokenEventBase, VirtualFileMetrics, VirtualWindowSpecs } from "./types.js";
+import { CSSVariablesThemeOptions, DiffsTheme } from "./highlighter/themes/types.js";
+import { DiffsEditorTokenizer } from "./highlighter/DiffsEditorTokenizer.js";
+import { DiffsEditorTokenizerOptions, DiffsStreamTokenizer, RecallToken } from "./highlighter/tokenizer-types.js";
+import { DiffsHighlighter } from "./highlighter/DiffsHighlighter.js";
+import { CodeToHtmlOptions, CodeToTokensOptions, DecorationItem, ThemedToken, TokensResult } from "./highlighter/types.js";
+import { AnnotationLineMap, AnnotationSide, AnnotationSpan, AppliedThemeStyleCache, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, ChangeContent, ChangeTypes, CodeColumnType, CodeViewDiffItem, CodeViewFileItem, CodeViewItem, CodeViewItemScrollTarget, CodeViewLayout, CodeViewLineScrollTarget, CodeViewPositionScrollTarget, CodeViewRangeScrollTarget, CodeViewScrollBehavior, CodeViewScrollTarget, ConflictResolverTypes, ContextContent, CreatePatchOptionsNonabortable, CustomPreProperties, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffFileInput, DiffIndicators, DiffLineAnnotation, DiffLineEventBaseProps, DiffTokenEventBaseProps, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffContentsLoader, FileDiffLoadedChangedFiles, FileDiffLoadedFiles, FileDiffLoadedPureRenamedFile, FileDiffMetadata, FileHeaderRenderMode, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlightedToken, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MaybeDiffFileInput, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, NumericScrollLineAnchor, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PendingCodeViewLayoutReset, PostRenderPhase, PrePropertiesConfig, ProcessFileConflictData, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderFilenameSuffixCallback, RenderHeaderMetadataCallback, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectedLineRange, SelectionPoint, SelectionSide, SharedRenderState, SmoothScrollSettings, StickySpecs, SupportedLanguages, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemesType, TokenEventBase, VirtualFileMetrics, VirtualWindowSpecs } from "./types.js";
 import { FileDiffEditCompleteEvent, FileEditCompleteEvent } from "./editor/types.js";
 import { GetHoveredLineResult, GetLineIndexUtility, InteractionManager, InteractionManagerBaseOptions, InteractionManagerMode, InteractionManagerOptions, LogTypes, MergeConflictActionTarget, OnDiffLineClickProps, OnDiffLineEnterLeaveProps, OnLineClickProps, OnLineEnterLeaveProps, OnTokenEventProps, SelectionWriteOptions, pluckInteractionOptions } from "./managers/InteractionManager.js";
 import { ResizeManager, ResizeManagerColumnVariableMode, ResizeManagerSetupOptions } from "./managers/ResizeManager.js";
@@ -11,14 +16,14 @@ import { Virtualizer, VirtualizerConfig, VirtualizerScrollOptions } from "./comp
 import { VirtualizedFile } from "./components/VirtualizedFile.js";
 import { VIRTUALIZED_FILE_DIFF_LAYOUT_CHECKPOINT_INTERVAL, VirtualizedFileDiff } from "./components/VirtualizedFileDiff.js";
 import { CODE_VIEW_DIFF_OPTION_KEYS, CODE_VIEW_FILE_OPTION_KEYS, CodeView, CodeViewCoordinator, CodeViewCreateEditorOptions, CodeViewItemEditCompleteEventMap, CodeViewItemEditCompleteHandler, CodeViewLineSelection, CodeViewMode, CodeViewModeItemMap, CodeViewOptions, CodeViewRenderedDiffItem, CodeViewRenderedFileItem, CodeViewRenderedItem, CodeViewScrollListener, CodeViewSlotSnapshot } from "./components/CodeView.js";
-import { CODE_VIEW_FOOTER_ATTRIBUTE, CODE_VIEW_HEADER_ATTRIBUTE, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_DEVELOPMENT_BUILD, DIFFS_SCROLLBAR_GUTTER_MEASURED_PROPERTY, DIFFS_SCROLLBAR_MEASURE_ATTRIBUTE, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, SPLIT_WITH_NEWLINES, THEME_CSS_ATTRIBUTE, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE } from "./constants.js";
-import { CodeToTokenTransformStreamOptions, RecallToken, ShikiStreamTokenizerEnqueueResult, ShikiStreamTokenizerOptions } from "./shiki-stream/types.js";
-import { ShikiStreamTokenizer } from "./shiki-stream/tokenizer.js";
+import { CODE_VIEW_FOOTER_ATTRIBUTE, CODE_VIEW_HEADER_ATTRIBUTE, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_HIGHLIGHTER, DEFAULT_RENDER_RANGE, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_DEVELOPMENT_BUILD, DIFFS_SCROLLBAR_GUTTER_MEASURED_PROPERTY, DIFFS_SCROLLBAR_MEASURE_ATTRIBUTE, DIFFS_TAG_NAME, EMPTY_RENDER_RANGE, FILENAME_HEADER_REGEX, FILE_CONTEXT_BLOB, GIT_DIFF_FILE_BREAK_REGEX, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, SPLIT_WITH_NEWLINES, THEME_CSS_ATTRIBUTE, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE } from "./constants.js";
+import { CodeToTokenTransformStreamOptions } from "./shiki-stream/types.js";
 import { CodeToTokenTransformStream } from "./shiki-stream/stream.js";
 import "./shiki-stream/index.js";
 import { FileStream, FileStreamOptions } from "./components/FileStream.js";
 import { MergeConflictActionsTypeOption, RenderMergeConflictActions, UnresolvedFile, UnresolvedFileHydrationProps, UnresolvedFileOptions, UnresolvedFileRenderProps, getUnresolvedDiffHunksRendererOptions } from "./components/UnresolvedFile.js";
 import { LineAnnotationPosition, getLineAnnotationSource, recordLineAnnotationSource } from "./utils/lineAnnotationIdentity.js";
+import { HighlighterDisposedError, getHighlighterType } from "./highlighter/highlighterType.js";
 import { areLanguagesAttached } from "./highlighter/languages/areLanguagesAttached.js";
 import { attachResolvedLanguages } from "./highlighter/languages/attachResolvedLanguages.js";
 import { cleanUpResolvedLanguages } from "./highlighter/languages/cleanUpResolvedLanguages.js";
@@ -29,16 +34,17 @@ import { hasResolvedLanguages } from "./highlighter/languages/hasResolvedLanguag
 import { registerCustomLanguage } from "./highlighter/languages/registerCustomLanguage.js";
 import { resolveLanguage } from "./highlighter/languages/resolveLanguage.js";
 import { resolveLanguages } from "./highlighter/languages/resolveLanguages.js";
-import { disposeHighlighter, getHighlighterIfLoaded, getSharedHighlighter, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, preloadHighlighter } from "./highlighter/shared_highlighter.js";
+import { HighlighterOptions, createHighlighter, disposeHighlighter, getHighlighterIfLoaded, getSharedHighlighter, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, preloadHighlighter } from "./highlighter/shared_highlighter.js";
 import { areThemesAttached } from "./highlighter/themes/areThemesAttached.js";
 import { attachResolvedThemes } from "./highlighter/themes/attachResolvedThemes.js";
 import { cleanUpResolvedThemes } from "./highlighter/themes/cleanUpResolvedThemes.js";
-import { AttachedThemes } from "./highlighter/themes/constants.js";
+import { createCSSVariablesTheme } from "./highlighter/themes/createCSSVariablesTheme.js";
 import { getResolvedOrResolveTheme } from "./highlighter/themes/getResolvedOrResolveTheme.js";
 import { getResolvedThemes } from "./highlighter/themes/getResolvedThemes.js";
 import { hasResolvedThemes } from "./highlighter/themes/hasResolvedThemes.js";
 import { registerCustomCSSVariableTheme } from "./highlighter/themes/registerCustomCSSVariableTheme.js";
-import { CustomThemeLoader, registerCustomTheme } from "./highlighter/themes/registerCustomTheme.js";
+import { CustomThemeLoader } from "./highlighter/themes/themeResolver.js";
+import { registerCustomTheme } from "./highlighter/themes/registerCustomTheme.js";
 import { resolveTheme } from "./highlighter/themes/resolveTheme.js";
 import { resolveThemes } from "./highlighter/themes/resolveThemes.js";
 import { clearRenderQueue, dequeueRender, queueRender } from "./managers/UniversalRenderingManager.js";
@@ -73,7 +79,6 @@ import { createRowNodes } from "./utils/createRowNodes.js";
 import { createSeparator } from "./utils/createSeparator.js";
 import { createSpanFromToken } from "./utils/createSpanNodeFromToken.js";
 import { createStyleElement, createThemeStyleElement } from "./utils/createStyleElement.js";
-import { createTransformerWithState } from "./utils/createTransformerWithState.js";
 import { createUnsafeCSSStyleNode } from "./utils/createUnsafeCSSStyleNode.js";
 import { createWindowFromScrollPosition } from "./utils/createWindowFromScrollPosition.js";
 import { patchScrollbarGutterSize, wrapCoreCSS, wrapThemeCSS, wrapUnsafeCSS } from "./utils/cssWrappers.js";
@@ -110,5 +115,4 @@ import { resolveRegion } from "./utils/resolveRegion.js";
 import { setLanguageOverride } from "./utils/setLanguageOverride.js";
 import { setPreNodeProperties } from "./utils/setWrapperNodeProps.js";
 import { trimPatchContext } from "./utils/trimPatchContext.js";
-import { codeToHtml, createCssVariablesTheme as createCSSVariablesTheme } from "shiki";
-export { type AnnotationLineMap, type AnnotationSide, type AnnotationSpan, type AppliedThemeStyleCache, AttachedLanguages, AttachedThemes, type BaseCodeOptions, type BaseDiffOptions, type BaseDiffOptionsWithDefaults, type BundledLanguage, CODE_VIEW_DIFF_OPTION_KEYS, CODE_VIEW_FILE_OPTION_KEYS, CODE_VIEW_FOOTER_ATTRIBUTE, CODE_VIEW_HEADER_ATTRIBUTE, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, type ChangeContent, type ChangeTypes, type CodeColumnType, type CodeToHastOptions, CodeToTokenTransformStream, CodeToTokenTransformStreamOptions, CodeView, CodeViewCoordinator, CodeViewCreateEditorOptions, type CodeViewDiffItem, type CodeViewFileItem, type CodeViewItem, CodeViewItemEditCompleteEventMap, CodeViewItemEditCompleteHandler, type CodeViewItemScrollTarget, type CodeViewLayout, type CodeViewLineScrollTarget, CodeViewLineSelection, CodeViewMode, CodeViewModeItemMap, CodeViewOptions, type CodeViewPositionScrollTarget, type CodeViewRangeScrollTarget, CodeViewRenderedDiffItem, CodeViewRenderedFileItem, CodeViewRenderedItem, type CodeViewScrollBehavior, CodeViewScrollListener, type CodeViewScrollTarget, CodeViewSlotSnapshot, type ConflictResolverTypes, type ContextContent, CreateFileHeaderElementProps, type CreatePatchOptionsNonabortable, type CustomPreProperties, CustomThemeLoader, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_RENDER_RANGE, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_DEVELOPMENT_BUILD, DIFFS_SCROLLBAR_GUTTER_MEASURED_PROPERTY, DIFFS_SCROLLBAR_MEASURE_ATTRIBUTE, DIFFS_TAG_NAME, type DecorationItem, type DiffAcceptRejectHunkConfig, type DiffAcceptRejectHunkType, type DiffFileInput, DiffHunksRenderer, DiffHunksRendererOptions, DiffHunksRendererOptionsWithDefaults, type DiffIndicators, type DiffLineAnnotation, type DiffLineEventBaseProps, type DiffTokenEventBaseProps, type DiffsHighlighter, type DiffsThemeNames, EMPTY_RENDER_RANGE, EXTENSION_TO_FILE_FORMAT, type ExpansionDirections, type ExtensionFormatMap, FILENAME_HEADER_REGEX, FILE_CONTEXT_BLOB, File, type FileContents, FileDiff, type FileDiffContentsLoader, FileDiffEditChangeHandler, type FileDiffEditCompleteEvent, FileDiffEditCompleteHandler, FileDiffHydrationProps, type FileDiffLoadedChangedFiles, type FileDiffLoadedFiles, type FileDiffLoadedPureRenamedFile, type FileDiffMetadata, FileDiffOptions, FileDiffRenderBaseProps, FileDiffRenderProps, FileDiffType, FileEditChangeHandler, type FileEditCompleteEvent, FileEditCompleteHandler, type FileHeaderRenderMode, FileHydrateProps, FileOptions, FileRenderProps, FileRenderResult, FileRenderer, FileRendererOptions, FileStream, FileStreamOptions, type ForceDiffPlainTextOptions, type ForceFilePlainTextOptions, GIT_DIFF_FILE_BREAK_REGEX, type GapSpan, GetHoveredLineResult, GetLineIndexUtility, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, type HighlightedToken, type HighlighterTypes, type Hunk, type HunkData, type HunkExpansionRegion, type HunkLineType, type HunkSeparators, HunksRenderResult, INDEX_LINE_METADATA, InjectedRow, InteractionManager, InteractionManagerBaseOptions, InteractionManagerMode, InteractionManagerOptions, type LanguageRegistration, type LineAnnotation, LineAnnotationPosition, LineDecoration, type LineDiffTypes, type LineEventBaseProps, type LineInfo, type LineSpans, type LineTypes, LogTypes, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, type MaybeDiffFileInput, type MergeConflictActionPayload, MergeConflictActionTarget, MergeConflictActionsTypeOption, type MergeConflictMarkerRow, type MergeConflictMarkerRowType, type MergeConflictRegion, type MergeConflictResolution, type NumericScrollLineAnchor, type ObservedAnnotationNodes, type ObservedGridNodes, OnDiffLineClickProps, OnDiffLineEnterLeaveProps, OnLineClickProps, OnLineEnterLeaveProps, OnTokenEventProps, ParsedLine, type ParsedPatch, type PendingCodeViewLayoutReset, type PostRenderPhase, type PrePropertiesConfig, type ProcessFileConflictData, RecallToken, RegisteredCustomLanguages, type RenderDiffFilesResult, type RenderDiffOptions, type RenderDiffResult, type RenderFileMetadata, type RenderFileOptions, type RenderFileResult, type RenderHeaderFilenameSuffixCallback, type RenderHeaderMetadataCallback, type RenderHeaderPrefixCallback, RenderMergeConflictActions, type RenderRange, type RenderWindow, type RenderedDiffASTCache, type RenderedFileASTCache, RenderedLineContext, ResizeManager, ResizeManagerColumnVariableMode, ResizeManagerSetupOptions, ResolvedLanguages, ResolvingLanguages, SPLIT_WITH_NEWLINES, SVGSpriteNames, SVGSpriteSheet, ScrollSyncManager, type SelectedLineRange, type SelectionPoint, type SelectionSide, SelectionWriteOptions, type SharedRenderState, ShikiStreamTokenizer, ShikiStreamTokenizerEnqueueResult, ShikiStreamTokenizerOptions, type ShikiTransformer, type SmoothScrollSettings, SplitInjectedRow, SplitInjectedRowPlacement, SplitLineDecorationProps, type StickySpecs, type SupportedLanguages, THEME_CSS_ATTRIBUTE, type ThemeRegistration, type ThemeRegistrationResolved, type ThemeTypes, type ThemedDiffResult, type ThemedFileResult, type ThemedToken, type ThemesType, type TokenEventBase, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnifiedInjectedRowPlacement, UnifiedLineDecorationProps, UnresolvedFile, UnresolvedFileHydrationProps, UnresolvedFileOptions, UnresolvedFileRenderProps, VIRTUALIZED_FILE_DIFF_LAYOUT_CHECKPOINT_INTERVAL, type VirtualFileMetrics, type VirtualWindowSpecs, VirtualizedFile, VirtualizedFileDiff, Virtualizer, VirtualizerConfig, VirtualizerScrollOptions, areDiffLineAnnotationsEqual, areDiffRenderOptionsEqual, areDiffTargetsEqual, areFileRenderOptionsEqual, areFilesEqual, areHunkDataEqual, areLanguagesAttached, areLineAnnotationsEqual, areObjectsEqual, areOptionsEqual, arePrePropertiesEqual, areRenderRangesEqual, areSelectionsEqual, areThemesAttached, areThemesEqual, areVirtualWindowSpecsEqual, areWorkerStatsEqual, attachResolvedLanguages, attachResolvedThemes, cleanLastNewline, cleanUpResolvedLanguages, cleanUpResolvedThemes, clearRenderQueue, cloneFileDiffMetadata, cloneHunks, codeToHtml, createAnnotationElement, createAnnotationWrapperNode, createCSSVariablesTheme, createDiffSpanDecoration, createEmptyRowBuffer, createFileHeaderElement, createGutterGap, createGutterItem, createGutterUtilityContentNode, createGutterUtilityElement, createGutterWrapper, createHastElement, createIconElement, createNoNewlineElement, createPreElement, createPreWrapperProperties, createRowNodes, createSeparator, createSpanFromToken, createStyleElement, createTextNodeElement, createThemeStyleElement, createTransformerWithState, createUnsafeCSSStyleNode, createWindowFromScrollPosition, dequeueRender, detachString, diffAcceptRejectHunk, disposeHighlighter, findCodeElement, formatCSSVariablePrefix, getCustomExtensionsMap, getCustomExtensionsVersion, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineAnnotationSource, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, getUnresolvedDiffHunksRendererOptions, hasResolvedLanguages, hasResolvedThemes, hydratePartialDiff, isDefaultRenderRange, isDiffAnnotation, isDiffAnnotationCollection, isFileAnnotation, isFileAnnotationCollection, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, patchScrollbarGutterSize, pluckInteractionOptions, prefersReducedMotion, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, recordLineAnnotationSource, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, releaseStringDetachBuffer, renderDiffWithHighlighter, renderFileWithHighlighter, replaceCustomExtensions, resolveConflict, resolveLanguage, resolveLanguages, resolveRegion, resolveTheme, resolveThemes, setCustomExtension, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapThemeCSS, wrapUnsafeCSS };
+export { type AnnotationLineMap, type AnnotationSide, type AnnotationSpan, type AppliedThemeStyleCache, AttachedLanguages, type BaseCodeOptions, type BaseDiffOptions, type BaseDiffOptionsWithDefaults, CODE_VIEW_DIFF_OPTION_KEYS, CODE_VIEW_FILE_OPTION_KEYS, CODE_VIEW_FOOTER_ATTRIBUTE, CODE_VIEW_HEADER_ATTRIBUTE, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, type CSSVariablesThemeOptions, CUSTOM_HEADER_SLOT_ID, type ChangeContent, type ChangeTypes, type CodeColumnType, type CodeToHtmlOptions, CodeToTokenTransformStream, CodeToTokenTransformStreamOptions, type CodeToTokensOptions, CodeView, CodeViewCoordinator, CodeViewCreateEditorOptions, type CodeViewDiffItem, type CodeViewFileItem, type CodeViewItem, CodeViewItemEditCompleteEventMap, CodeViewItemEditCompleteHandler, type CodeViewItemScrollTarget, type CodeViewLayout, type CodeViewLineScrollTarget, CodeViewLineSelection, CodeViewMode, CodeViewModeItemMap, CodeViewOptions, type CodeViewPositionScrollTarget, type CodeViewRangeScrollTarget, CodeViewRenderedDiffItem, CodeViewRenderedFileItem, CodeViewRenderedItem, type CodeViewScrollBehavior, CodeViewScrollListener, type CodeViewScrollTarget, CodeViewSlotSnapshot, type ConflictResolverTypes, type ContextContent, CreateFileHeaderElementProps, type CreatePatchOptionsNonabortable, type CustomPreProperties, type CustomThemeLoader, DEFAULT_CODE_VIEW_FILE_METRICS, DEFAULT_CODE_VIEW_LAYOUT, DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_EXPANDED_REGION, DEFAULT_HIGHLIGHTER, DEFAULT_RENDER_RANGE, DEFAULT_SMOOTH_SCROLL_SETTINGS, DEFAULT_THEMES, DEFAULT_TOKENIZE_MAX_LENGTH, DEFAULT_VIRTUAL_FILE_METRICS, DIFFS_DEVELOPMENT_BUILD, DIFFS_SCROLLBAR_GUTTER_MEASURED_PROPERTY, DIFFS_SCROLLBAR_MEASURE_ATTRIBUTE, DIFFS_TAG_NAME, type DecorationItem, type DiffAcceptRejectHunkConfig, type DiffAcceptRejectHunkType, type DiffFileInput, DiffHunksRenderer, DiffHunksRendererOptions, DiffHunksRendererOptionsWithDefaults, type DiffIndicators, type DiffLineAnnotation, type DiffLineEventBaseProps, type DiffTokenEventBaseProps, type DiffsEditorTokenizer, type DiffsEditorTokenizerOptions, type DiffsHighlighter, type DiffsStreamTokenizer, type DiffsTheme, type DiffsThemeNames, EMPTY_RENDER_RANGE, EXTENSION_TO_FILE_FORMAT, type ExpansionDirections, type ExtensionFormatMap, FILENAME_HEADER_REGEX, FILE_CONTEXT_BLOB, File, type FileContents, FileDiff, type FileDiffContentsLoader, FileDiffEditChangeHandler, type FileDiffEditCompleteEvent, FileDiffEditCompleteHandler, FileDiffHydrationProps, type FileDiffLoadedChangedFiles, type FileDiffLoadedFiles, type FileDiffLoadedPureRenamedFile, type FileDiffMetadata, FileDiffOptions, FileDiffRenderBaseProps, FileDiffRenderProps, FileDiffType, FileEditChangeHandler, type FileEditCompleteEvent, FileEditCompleteHandler, type FileHeaderRenderMode, FileHydrateProps, FileOptions, FileRenderProps, FileRenderResult, FileRenderer, FileRendererOptions, FileStream, FileStreamOptions, type ForceDiffPlainTextOptions, type ForceFilePlainTextOptions, GIT_DIFF_FILE_BREAK_REGEX, type GapSpan, GetHoveredLineResult, GetLineIndexUtility, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, type HighlightedToken, HighlighterDisposedError, HighlighterOptions, type HighlighterTypes, type Hunk, type HunkData, type HunkExpansionRegion, type HunkLineType, type HunkSeparators, HunksRenderResult, INDEX_LINE_METADATA, InjectedRow, InteractionManager, InteractionManagerBaseOptions, InteractionManagerMode, InteractionManagerOptions, type LineAnnotation, LineAnnotationPosition, LineDecoration, type LineDiffTypes, type LineEventBaseProps, type LineInfo, type LineSpans, type LineTypes, LogTypes, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, type MaybeDiffFileInput, type MergeConflictActionPayload, MergeConflictActionTarget, MergeConflictActionsTypeOption, type MergeConflictMarkerRow, type MergeConflictMarkerRowType, type MergeConflictRegion, type MergeConflictResolution, type NumericScrollLineAnchor, type ObservedAnnotationNodes, type ObservedGridNodes, OnDiffLineClickProps, OnDiffLineEnterLeaveProps, OnLineClickProps, OnLineEnterLeaveProps, OnTokenEventProps, ParsedLine, type ParsedPatch, type PendingCodeViewLayoutReset, type PostRenderPhase, type PrePropertiesConfig, type ProcessFileConflictData, type RecallToken, RegisteredCustomLanguages, type RenderDiffFilesResult, type RenderDiffOptions, type RenderDiffResult, type RenderFileMetadata, type RenderFileOptions, type RenderFileResult, type RenderHeaderFilenameSuffixCallback, type RenderHeaderMetadataCallback, type RenderHeaderPrefixCallback, RenderMergeConflictActions, type RenderRange, type RenderWindow, type RenderedDiffASTCache, type RenderedFileASTCache, RenderedLineContext, ResizeManager, ResizeManagerColumnVariableMode, ResizeManagerSetupOptions, ResolvedLanguages, ResolvingLanguages, SPLIT_WITH_NEWLINES, SVGSpriteNames, SVGSpriteSheet, ScrollSyncManager, type SelectedLineRange, type SelectionPoint, type SelectionSide, SelectionWriteOptions, type SharedRenderState, type SmoothScrollSettings, SplitInjectedRow, SplitInjectedRowPlacement, SplitLineDecorationProps, type StickySpecs, type SupportedLanguages, THEME_CSS_ATTRIBUTE, type ThemeTypes, type ThemedDiffResult, type ThemedFileResult, type ThemedToken, type ThemesType, type TokenEventBase, type TokensResult, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnifiedInjectedRowPlacement, UnifiedLineDecorationProps, UnresolvedFile, UnresolvedFileHydrationProps, UnresolvedFileOptions, UnresolvedFileRenderProps, VIRTUALIZED_FILE_DIFF_LAYOUT_CHECKPOINT_INTERVAL, type VirtualFileMetrics, type VirtualWindowSpecs, VirtualizedFile, VirtualizedFileDiff, Virtualizer, VirtualizerConfig, VirtualizerScrollOptions, areDiffLineAnnotationsEqual, areDiffRenderOptionsEqual, areDiffTargetsEqual, areFileRenderOptionsEqual, areFilesEqual, areHunkDataEqual, areLanguagesAttached, areLineAnnotationsEqual, areObjectsEqual, areOptionsEqual, arePrePropertiesEqual, areRenderRangesEqual, areSelectionsEqual, areThemesAttached, areThemesEqual, areVirtualWindowSpecsEqual, areWorkerStatsEqual, attachResolvedLanguages, attachResolvedThemes, cleanLastNewline, cleanUpResolvedLanguages, cleanUpResolvedThemes, clearRenderQueue, cloneFileDiffMetadata, cloneHunks, createAnnotationElement, createAnnotationWrapperNode, createCSSVariablesTheme, createDiffSpanDecoration, createEmptyRowBuffer, createFileHeaderElement, createGutterGap, createGutterItem, createGutterUtilityContentNode, createGutterUtilityElement, createGutterWrapper, createHastElement, createHighlighter, createIconElement, createNoNewlineElement, createPreElement, createPreWrapperProperties, createRowNodes, createSeparator, createSpanFromToken, createStyleElement, createTextNodeElement, createThemeStyleElement, createUnsafeCSSStyleNode, createWindowFromScrollPosition, dequeueRender, detachString, diffAcceptRejectHunk, disposeHighlighter, findCodeElement, formatCSSVariablePrefix, getCustomExtensionsMap, getCustomExtensionsVersion, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHighlighterType, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineAnnotationSource, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, getUnresolvedDiffHunksRendererOptions, hasResolvedLanguages, hasResolvedThemes, hydratePartialDiff, isDefaultRenderRange, isDiffAnnotation, isDiffAnnotationCollection, isFileAnnotation, isFileAnnotationCollection, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, patchScrollbarGutterSize, pluckInteractionOptions, prefersReducedMotion, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, recordLineAnnotationSource, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, releaseStringDetachBuffer, renderDiffWithHighlighter, renderFileWithHighlighter, replaceCustomExtensions, resolveConflict, resolveLanguage, resolveLanguages, resolveRegion, resolveTheme, resolveThemes, setCustomExtension, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapThemeCSS, wrapUnsafeCSS };