@pierre/diffs 1.3.0-beta.3 → 1.3.0-beta.5

package/dist/highlighter/themes/getResolvedThemes.js

@@ -1,14 +1,8 @@
-import { ResolvedThemes } from "./constants.js";
+import { themeResolver } from "./themeResolver.js";
 
 //#region src/highlighter/themes/getResolvedThemes.ts
 function getResolvedThemes(themeNames) {
-	const resolvedThemes = [];
-	for (const themeName of themeNames) {
-		const theme = ResolvedThemes.get(themeName);
-		if (theme == null) throw new Error(`getAllResolvedThemes: ${themeName} is unresolved, you must resolve all necessary themes before calling this function`);
-		resolvedThemes.push(theme);
-	}
-	return resolvedThemes;
+	return themeResolver.getResolvedThemes(themeNames);
 }
 
 //#endregion

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

@@ -1 +1 @@
-{"version":3,"file":"getResolvedThemes.js","names":["resolvedThemes: ThemeRegistrationResolved[]"],"sources":["../../../src/highlighter/themes/getResolvedThemes.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nimport { ResolvedThemes } from './constants';\n\n// This method should only be called if you know all themes are resolved,\n// otherwise it will fail. The main intention is a helper to avoid an async\n// tick if we don't actually need it\nexport function getResolvedThemes(\n  themeNames: DiffsThemeNames[]\n): ThemeRegistrationResolved[] {\n  const resolvedThemes: ThemeRegistrationResolved[] = [];\n  for (const themeName of themeNames) {\n    const theme = ResolvedThemes.get(themeName);\n    if (theme == null) {\n      throw new Error(\n        `getAllResolvedThemes: ${themeName} is unresolved, you must resolve all necessary themes before calling this function`\n      );\n    }\n    resolvedThemes.push(theme);\n  }\n  return resolvedThemes;\n}\n"],"mappings":";;;AAMA,SAAgB,kBACd,YAC6B;CAC7B,MAAMA,iBAA8C,EAAE;AACtD,MAAK,MAAM,aAAa,YAAY;EAClC,MAAM,QAAQ,eAAe,IAAI,UAAU;AAC3C,MAAI,SAAS,KACX,OAAM,IAAI,MACR,yBAAyB,UAAU,oFACpC;AAEH,iBAAe,KAAK,MAAM;;AAE5B,QAAO"}
+{"version":3,"file":"getResolvedThemes.js","names":[],"sources":["../../../src/highlighter/themes/getResolvedThemes.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nimport { themeResolver } from './themeResolver';\n\n// This method should only be called if you know all themes are resolved,\n// otherwise it will fail. The main intention is a helper to avoid an async\n// tick if we don't actually need it\nexport function getResolvedThemes(\n  themeNames: DiffsThemeNames[]\n): ThemeRegistrationResolved[] {\n  return themeResolver.getResolvedThemes(themeNames);\n}\n"],"mappings":";;;AAMA,SAAgB,kBACd,YAC6B;AAC7B,QAAO,cAAc,kBAAkB,WAAW"}

package/dist/highlighter/themes/hasResolvedThemes.js

@@ -1,9 +1,8 @@
-import { ResolvedThemes } from "./constants.js";
+import { themeResolver } from "./themeResolver.js";
 
 //#region src/highlighter/themes/hasResolvedThemes.ts
 function hasResolvedThemes(themeNames) {
-	for (const themeName of themeNames) if (!ResolvedThemes.has(themeName)) return false;
-	return true;
+	return themeResolver.hasResolvedThemes(themeNames);
 }
 
 //#endregion

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

@@ -1 +1 @@
-{"version":3,"file":"hasResolvedThemes.js","names":[],"sources":["../../../src/highlighter/themes/hasResolvedThemes.ts"],"sourcesContent":["import type { DiffsThemeNames } from '../../types';\nimport { ResolvedThemes } from './constants';\n\nexport function hasResolvedThemes(themeNames: DiffsThemeNames[]): boolean {\n  for (const themeName of themeNames) {\n    if (!ResolvedThemes.has(themeName)) {\n      return false;\n    }\n  }\n  return true;\n}\n"],"mappings":";;;AAGA,SAAgB,kBAAkB,YAAwC;AACxE,MAAK,MAAM,aAAa,WACtB,KAAI,CAAC,eAAe,IAAI,UAAU,CAChC,QAAO;AAGX,QAAO"}
+{"version":3,"file":"hasResolvedThemes.js","names":[],"sources":["../../../src/highlighter/themes/hasResolvedThemes.ts"],"sourcesContent":["import type { DiffsThemeNames } from '../../types';\nimport { themeResolver } from './themeResolver';\n\nexport function hasResolvedThemes(themeNames: DiffsThemeNames[]): boolean {\n  return themeResolver.hasResolvedThemes(themeNames);\n}\n"],"mappings":";;;AAGA,SAAgB,kBAAkB,YAAwC;AACxE,QAAO,cAAc,kBAAkB,WAAW"}

package/dist/highlighter/themes/registerCustomCSSVariableTheme.js

@@ -1,5 +1,5 @@
-import { registerCustomTheme } from "./registerCustomTheme.js";
 import { formatCSSVariablePrefix } from "../../utils/formatCSSVariablePrefix.js";
+import { registerCustomTheme } from "./registerCustomTheme.js";
 import { createCssVariablesTheme } from "shiki";
 
 //#region src/highlighter/themes/registerCustomCSSVariableTheme.ts

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

@@ -1,7 +1,9 @@
-import { ThemeRegistration, ThemeRegistrationResolved } from "shiki";
+import { ThemeRegistration, ThemeRegistrationResolved } from "../../types.js";
+import { ThemeLoader } from "@pierre/theming";
 
 //#region src/highlighter/themes/registerCustomTheme.d.ts
-declare function registerCustomTheme(themeName: string, loader: () => Promise<ThemeRegistrationResolved | ThemeRegistration>): void;
+type CustomThemeLoader = ThemeLoader<ThemeRegistration | ThemeRegistrationResolved>;
+declare function registerCustomTheme(themeName: string, loader: CustomThemeLoader): void;
 //#endregion
-export { registerCustomTheme };
+export { CustomThemeLoader, registerCustomTheme };
 //# sourceMappingURL=registerCustomTheme.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"registerCustomTheme.d.ts","names":["ThemeRegistration","ThemeRegistrationResolved","registerCustomTheme","Promise"],"sources":["../../../src/highlighter/themes/registerCustomTheme.d.ts"],"sourcesContent":["import type { ThemeRegistration, ThemeRegistrationResolved } from 'shiki';\nexport declare function registerCustomTheme(themeName: string, loader: () => Promise<ThemeRegistrationResolved | ThemeRegistration>): void;\n//# sourceMappingURL=registerCustomTheme.d.ts.map"],"mappings":";;;iBACwBE,mBAAAA,kCAAqDC,QAAQF,4BAA4BD"}
+{"version":3,"file":"registerCustomTheme.d.ts","names":["ThemeLoader","ThemeRegistration","ThemeRegistrationResolved","CustomThemeLoader","registerCustomTheme"],"sources":["../../../src/highlighter/themes/registerCustomTheme.d.ts"],"sourcesContent":["import { type ThemeLoader } from '@pierre/theming';\nimport type { ThemeRegistration, ThemeRegistrationResolved } from '../../types';\nexport type CustomThemeLoader = ThemeLoader<ThemeRegistration | ThemeRegistrationResolved>;\nexport declare function registerCustomTheme(themeName: string, loader: CustomThemeLoader): void;\n//# sourceMappingURL=registerCustomTheme.d.ts.map"],"mappings":";;;;KAEYG,iBAAAA,GAAoBH,YAAYC,oBAAoBC;iBACxCE,mBAAAA,4BAA+CD"}

package/dist/highlighter/themes/registerCustomTheme.js

@@ -1,12 +1,22 @@
-import { RegisteredCustomThemes } from "./constants.js";
+import { themeResolver } from "./themeResolver.js";
+import { createTheme } from "@pierre/theming/themes";
+import { DuplicateThemeError } from "@pierre/theming";
 
 //#region src/highlighter/themes/registerCustomTheme.ts
 function registerCustomTheme(themeName, loader) {
-	if (RegisteredCustomThemes.has(themeName)) {
-		console.error("SharedHighlight.registerCustomTheme: theme name already registered", themeName);
-		return;
+	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;
 	}
-	RegisteredCustomThemes.set(themeName, loader);
 }
 
 //#endregion

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

@@ -1 +1 @@
-{"version":3,"file":"registerCustomTheme.js","names":[],"sources":["../../../src/highlighter/themes/registerCustomTheme.ts"],"sourcesContent":["import type { ThemeRegistration, ThemeRegistrationResolved } from 'shiki';\n\nimport { RegisteredCustomThemes } from './constants';\n\nexport function registerCustomTheme(\n  themeName: string,\n  loader: () => Promise<ThemeRegistrationResolved | ThemeRegistration>\n): void {\n  if (RegisteredCustomThemes.has(themeName)) {\n    console.error(\n      'SharedHighlight.registerCustomTheme: theme name already registered',\n      themeName\n    );\n    return;\n  }\n  RegisteredCustomThemes.set(themeName, loader);\n}\n"],"mappings":";;;AAIA,SAAgB,oBACd,WACA,QACM;AACN,KAAI,uBAAuB,IAAI,UAAU,EAAE;AACzC,UAAQ,MACN,sEACA,UACD;AACD;;AAEF,wBAAuB,IAAI,WAAW,OAAO"}
+{"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;AACN,KAAI;EACF,MAAM,aAAa,YAAuC;GACxD,MAAM;GACN,MAAM;GACP,CAAC;AACF,gBAAc,cAAc,WAAW,MAAM,WAAW,KAAK;UACtD,OAAO;AACd,MAAI,iBAAiB,qBAAqB;AACxC,WAAQ,MACN,sEACA,UACD;AACD;;AAEF,QAAM"}

package/dist/highlighter/themes/resolveTheme.js

@@ -1,33 +1,12 @@
-import { isWorkerContext } from "../../utils/isWorkerContext.js";
-import { RegisteredCustomThemes, ResolvedThemes, ResolvingThemes } from "./constants.js";
-import { bundledThemes, normalizeTheme } from "shiki";
+import { themeResolver } from "./themeResolver.js";
+import { prepareThemeResolution, validateResolvedThemeName } from "./themeResolution.js";
 
 //#region src/highlighter/themes/resolveTheme.ts
 async function resolveTheme(themeName) {
-	if (isWorkerContext()) throw new Error(`resolveTheme("${themeName}") cannot be called from a worker context. Themes must be pre-resolved on the main thread and passed to the worker via the resolvedLanguages parameter.`);
-	const resolver = ResolvingThemes.get(themeName);
-	if (resolver != null) return resolver;
-	try {
-		const loader = RegisteredCustomThemes.get(themeName) ?? bundledThemes[themeName];
-		if (loader == null) throw new Error(`resolveTheme: No valid loader for ${themeName}`);
-		const resolver$1 = loader().then((result) => {
-			return normalizeAndCacheResolvedTheme(themeName, "default" in result ? result.default : result);
-		});
-		ResolvingThemes.set(themeName, resolver$1);
-		const theme = await resolver$1;
-		if (theme.name !== themeName) throw new Error(`resolvedTheme: themeName: ${themeName} does not match theme.name: ${theme.name}`);
-		ResolvedThemes.set(theme.name, theme);
-		return theme;
-	} finally {
-		ResolvingThemes.delete(themeName);
-	}
-}
-function normalizeAndCacheResolvedTheme(themeName, themeData) {
-	const resolvedTheme = ResolvedThemes.get(themeName);
-	if (resolvedTheme != null) return resolvedTheme;
-	themeData = normalizeTheme(themeData);
-	ResolvedThemes.set(themeName, themeData);
-	return themeData;
+	prepareThemeResolution(themeName);
+	const theme = await themeResolver.resolveTheme(themeName);
+	validateResolvedThemeName(themeName, theme);
+	return theme;
 }
 
 //#endregion

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

@@ -1 +1 @@
-{"version":3,"file":"resolveTheme.js","names":["resolver"],"sources":["../../../src/highlighter/themes/resolveTheme.ts"],"sourcesContent":["import { bundledThemes, normalizeTheme } from 'shiki';\n\nimport type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nimport { isWorkerContext } from '../../utils/isWorkerContext';\nimport {\n  RegisteredCustomThemes,\n  ResolvedThemes,\n  ResolvingThemes,\n} from './constants';\n\nexport async function resolveTheme(\n  themeName: DiffsThemeNames\n): Promise<ThemeRegistrationResolved> {\n  if (isWorkerContext()) {\n    throw new Error(\n      `resolveTheme(\"${themeName}\") cannot be called from a worker context. ` +\n        'Themes must be pre-resolved on the main thread and passed to the worker via the resolvedLanguages parameter.'\n    );\n  }\n\n  const resolver = ResolvingThemes.get(themeName);\n  if (resolver != null) {\n    return resolver;\n  }\n\n  try {\n    const loader =\n      RegisteredCustomThemes.get(themeName) ??\n      bundledThemes[themeName as keyof typeof bundledThemes];\n\n    if (loader == null) {\n      throw new Error(`resolveTheme: No valid loader for ${themeName}`);\n    }\n\n    const resolver = loader().then((result) => {\n      return normalizeAndCacheResolvedTheme(\n        themeName,\n        ('default' in result\n          ? result.default\n          : result) as ThemeRegistrationResolved\n      );\n    });\n\n    ResolvingThemes.set(themeName, resolver);\n    const theme = await resolver;\n    if (theme.name !== themeName) {\n      throw new Error(\n        `resolvedTheme: themeName: ${themeName} does not match theme.name: ${theme.name}`\n      );\n    }\n    ResolvedThemes.set(theme.name, theme);\n    return theme;\n  } finally {\n    ResolvingThemes.delete(themeName);\n  }\n}\n\nfunction normalizeAndCacheResolvedTheme(\n  themeName: string,\n  themeData: ThemeRegistrationResolved\n): ThemeRegistrationResolved {\n  const resolvedTheme = ResolvedThemes.get(themeName);\n  if (resolvedTheme != null) {\n    return resolvedTheme;\n  }\n  themeData = normalizeTheme(themeData);\n  ResolvedThemes.set(themeName, themeData);\n  return themeData;\n}\n"],"mappings":";;;;;AAUA,eAAsB,aACpB,WACoC;AACpC,KAAI,iBAAiB,CACnB,OAAM,IAAI,MACR,iBAAiB,UAAU,yJAE5B;CAGH,MAAM,WAAW,gBAAgB,IAAI,UAAU;AAC/C,KAAI,YAAY,KACd,QAAO;AAGT,KAAI;EACF,MAAM,SACJ,uBAAuB,IAAI,UAAU,IACrC,cAAc;AAEhB,MAAI,UAAU,KACZ,OAAM,IAAI,MAAM,qCAAqC,YAAY;EAGnE,MAAMA,aAAW,QAAQ,CAAC,MAAM,WAAW;AACzC,UAAO,+BACL,WACC,aAAa,SACV,OAAO,UACP,OACL;IACD;AAEF,kBAAgB,IAAI,WAAWA,WAAS;EACxC,MAAM,QAAQ,MAAMA;AACpB,MAAI,MAAM,SAAS,UACjB,OAAM,IAAI,MACR,6BAA6B,UAAU,8BAA8B,MAAM,OAC5E;AAEH,iBAAe,IAAI,MAAM,MAAM,MAAM;AACrC,SAAO;WACC;AACR,kBAAgB,OAAO,UAAU;;;AAIrC,SAAS,+BACP,WACA,WAC2B;CAC3B,MAAM,gBAAgB,eAAe,IAAI,UAAU;AACnD,KAAI,iBAAiB,KACnB,QAAO;AAET,aAAY,eAAe,UAAU;AACrC,gBAAe,IAAI,WAAW,UAAU;AACxC,QAAO"}
+{"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;AACpC,wBAAuB,UAAU;CAEjC,MAAM,QAAQ,MAAM,cAAc,aAAa,UAAU;AAEzD,2BAA0B,WAAW,MAAM;AAE3C,QAAO"}

package/dist/highlighter/themes/resolveThemes.js

@@ -1,18 +1,11 @@
-import { resolveTheme } from "./resolveTheme.js";
-import { getResolvedOrResolveTheme } from "./getResolvedOrResolveTheme.js";
+import { themeResolver } from "./themeResolver.js";
+import { prepareThemeResolution, validateResolvedThemeName } from "./themeResolution.js";
 
 //#region src/highlighter/themes/resolveThemes.ts
 async function resolveThemes(themes) {
-	const resolvedThemes = [];
-	const themesToResolve = [];
-	for (const themeName of themes) {
-		const themeData = getResolvedOrResolveTheme(themeName) ?? resolveTheme(themeName);
-		if ("then" in themeData) themesToResolve.push(themeData);
-		else resolvedThemes.push(themeData);
-	}
-	if (themesToResolve.length > 0) await Promise.all(themesToResolve).then((resolved) => {
-		for (const theme of resolved) if (theme != null) resolvedThemes.push(theme);
-	});
+	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;
 }
 

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

@@ -1 +1 @@
-{"version":3,"file":"resolveThemes.js","names":["resolvedThemes: ThemeRegistrationResolved[]","themesToResolve: Promise<ThemeRegistrationResolved | undefined>[]"],"sources":["../../../src/highlighter/themes/resolveThemes.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nimport { getResolvedOrResolveTheme } from './getResolvedOrResolveTheme';\nimport { resolveTheme } from './resolveTheme';\n\nexport async function resolveThemes(\n  themes: DiffsThemeNames[]\n): Promise<ThemeRegistrationResolved[]> {\n  const resolvedThemes: ThemeRegistrationResolved[] = [];\n  const themesToResolve: Promise<ThemeRegistrationResolved | undefined>[] = [];\n  for (const themeName of themes) {\n    const themeData =\n      getResolvedOrResolveTheme(themeName) ?? resolveTheme(themeName);\n    if ('then' in themeData) {\n      themesToResolve.push(themeData);\n    } else {\n      resolvedThemes.push(themeData);\n    }\n  }\n\n  if (themesToResolve.length > 0) {\n    await Promise.all(themesToResolve).then((resolved) => {\n      for (const theme of resolved) {\n        if (theme != null) {\n          resolvedThemes.push(theme);\n        }\n      }\n    });\n  }\n\n  return resolvedThemes;\n}\n"],"mappings":";;;;AAIA,eAAsB,cACpB,QACsC;CACtC,MAAMA,iBAA8C,EAAE;CACtD,MAAMC,kBAAoE,EAAE;AAC5E,MAAK,MAAM,aAAa,QAAQ;EAC9B,MAAM,YACJ,0BAA0B,UAAU,IAAI,aAAa,UAAU;AACjE,MAAI,UAAU,UACZ,iBAAgB,KAAK,UAAU;MAE/B,gBAAe,KAAK,UAAU;;AAIlC,KAAI,gBAAgB,SAAS,EAC3B,OAAM,QAAQ,IAAI,gBAAgB,CAAC,MAAM,aAAa;AACpD,OAAK,MAAM,SAAS,SAClB,KAAI,SAAS,KACX,gBAAe,KAAK,MAAM;GAG9B;AAGJ,QAAO"}
+{"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;AACtC,MAAK,MAAM,aAAa,OACtB,wBAAuB,UAAU;CAGnC,MAAM,iBAAiB,MAAM,cAAc,cAAc,OAAO;AAChE,MAAK,IAAI,IAAI,GAAG,IAAI,OAAO,QAAQ,IACjC,2BAA0B,OAAO,IAAI,eAAe,GAAG;AAGzD,QAAO"}

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

@@ -0,0 +1,8 @@
+import { DiffsThemeNames, ThemeRegistrationResolved } from "../../types.js";
+
+//#region src/highlighter/themes/themeResolution.d.ts
+declare function prepareThemeResolution(themeName: DiffsThemeNames): void;
+declare function validateResolvedThemeName(themeName: DiffsThemeNames, theme: ThemeRegistrationResolved): void;
+//#endregion
+export { prepareThemeResolution, validateResolvedThemeName };
+//# sourceMappingURL=themeResolution.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"themeResolution.d.ts","names":["DiffsThemeNames","ThemeRegistrationResolved","prepareThemeResolution","validateResolvedThemeName"],"sources":["../../../src/highlighter/themes/themeResolution.d.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nexport declare function prepareThemeResolution(themeName: DiffsThemeNames): void;\nexport declare function validateResolvedThemeName(themeName: DiffsThemeNames, theme: ThemeRegistrationResolved): void;\n//# sourceMappingURL=themeResolution.d.ts.map"],"mappings":";;;iBACwBE,sBAAAA,YAAkCF;iBAClCG,yBAAAA,YAAqCH,wBAAwBC"}

package/dist/highlighter/themes/themeResolution.js

@@ -0,0 +1,22 @@
+import { isWorkerContext } from "../../utils/isWorkerContext.js";
+import { themeResolver } from "./themeResolver.js";
+import { shikiThemes } from "@pierre/theming/themes";
+
+//#region src/highlighter/themes/themeResolution.ts
+function prepareThemeResolution(themeName) {
+	if (isWorkerContext()) throw new Error(`Theme "${themeName}" cannot be resolved from a worker context. Themes must be pre-resolved on the main thread and passed to the worker via the resolvedLanguages parameter.`);
+	if (themeResolver.hasRegisteredTheme(themeName)) return;
+	const descriptor = shikiThemes.getTheme(themeName);
+	if (descriptor != null) {
+		themeResolver.registerThemeIfAbsent(descriptor.name, descriptor.load);
+		return;
+	}
+	throw new Error(`No valid theme loader registered for "${themeName}"`);
+}
+function validateResolvedThemeName(themeName, theme) {
+	if (theme.name !== themeName) throw new Error(`resolvedTheme: themeName: ${themeName} does not match theme.name: ${theme.name}`);
+}
+
+//#endregion
+export { prepareThemeResolution, validateResolvedThemeName };
+//# sourceMappingURL=themeResolution.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"themeResolution.js","names":[],"sources":["../../../src/highlighter/themes/themeResolution.ts"],"sourcesContent":["import type { ThemeLoader } from '@pierre/theming';\nimport { shikiThemes } from '@pierre/theming/themes';\n\nimport type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nimport { isWorkerContext } from '../../utils/isWorkerContext';\nimport { themeResolver } from './themeResolver';\n\n// Shared diffs-specific checks for resolving themes. The generic theming\n// resolver owns cache/registry mechanics; diffs still owns worker restrictions,\n// Shiki fallback registration, and validating theme.name against the requested\n// registry key.\nexport function prepareThemeResolution(themeName: DiffsThemeNames): void {\n  if (isWorkerContext()) {\n    throw new Error(\n      `Theme \"${themeName}\" cannot be resolved from a worker context. ` +\n        'Themes must be pre-resolved on the main thread and passed to the worker via the resolvedLanguages parameter.'\n    );\n  }\n\n  if (themeResolver.hasRegisteredTheme(themeName)) {\n    return;\n  }\n  const descriptor = shikiThemes.getTheme(themeName);\n  if (descriptor != null) {\n    themeResolver.registerThemeIfAbsent(\n      descriptor.name,\n      descriptor.load as ThemeLoader<ThemeRegistrationResolved>\n    );\n    return;\n  }\n  throw new Error(`No valid theme loader registered for \"${themeName}\"`);\n}\n\nexport function validateResolvedThemeName(\n  themeName: DiffsThemeNames,\n  theme: ThemeRegistrationResolved\n): void {\n  if (theme.name !== themeName) {\n    throw new Error(\n      `resolvedTheme: themeName: ${themeName} does not match theme.name: ${theme.name}`\n    );\n  }\n}\n"],"mappings":";;;;;AAWA,SAAgB,uBAAuB,WAAkC;AACvE,KAAI,iBAAiB,CACnB,OAAM,IAAI,MACR,UAAU,UAAU,0JAErB;AAGH,KAAI,cAAc,mBAAmB,UAAU,CAC7C;CAEF,MAAM,aAAa,YAAY,SAAS,UAAU;AAClD,KAAI,cAAc,MAAM;AACtB,gBAAc,sBACZ,WAAW,MACX,WAAW,KACZ;AACD;;AAEF,OAAM,IAAI,MAAM,yCAAyC,UAAU,GAAG;;AAGxE,SAAgB,0BACd,WACA,OACM;AACN,KAAI,MAAM,SAAS,UACjB,OAAM,IAAI,MACR,6BAA6B,UAAU,8BAA8B,MAAM,OAC5E"}

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

@@ -0,0 +1,8 @@
+import { ThemeRegistrationResolved } from "../../types.js";
+import * as _pierre_theming0 from "@pierre/theming";
+
+//#region src/highlighter/themes/themeResolver.d.ts
+declare const themeResolver: _pierre_theming0.ThemeResolver<ThemeRegistrationResolved>;
+//#endregion
+export { themeResolver };
+//# sourceMappingURL=themeResolver.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"themeResolver.d.ts","names":["ThemeRegistrationResolved","themeResolver","_pierre_theming0","ThemeResolver"],"sources":["../../../src/highlighter/themes/themeResolver.d.ts"],"sourcesContent":["import type { ThemeRegistrationResolved } from '../../types';\nexport declare const themeResolver: import(\"@pierre/theming\").ThemeResolver<ThemeRegistrationResolved>;\n//# sourceMappingURL=themeResolver.d.ts.map"],"mappings":";;;;cACqBC,eAAgFC,gBAAAA,CAAvCC,cAAcH"}

package/dist/highlighter/themes/themeResolver.js

@@ -0,0 +1,8 @@
+import { createThemeResolver } from "@pierre/theming";
+
+//#region src/highlighter/themes/themeResolver.ts
+const themeResolver = createThemeResolver();
+
+//#endregion
+export { themeResolver };
+//# sourceMappingURL=themeResolver.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"themeResolver.js","names":[],"sources":["../../../src/highlighter/themes/themeResolver.ts"],"sourcesContent":["import { createThemeResolver } 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 = createThemeResolver<ThemeRegistrationResolved>();\n"],"mappings":";;;AAgBA,MAAa,gBAAgB,qBAAgD"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-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, DiffIndicators, DiffLineAnnotation, DiffLineEventBaseProps, DiffTokenEventBaseProps, DiffsBaseComponent, DiffsComponentOptions, DiffsEditableComponent, DiffsEditor, DiffsEditorSelection, DiffsHighlighter, DiffsTextDocument, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffMetadata, FileHeaderRenderMode, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlightedToken, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, NumericScrollLineAnchor, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PendingCodeViewLayoutReset, PostRenderPhase, PrePropertiesConfig, ProcessFileConflictData, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderPrefixCallback, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, SelectedLineRange, SelectionPoint, SelectionSide, SharedRenderState, ShikiTransformer, SmoothScrollSettings, StickySpecs, SupportedLanguages, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, TokenEventBase, VirtualFileMetrics, VirtualWindowSpecs } from "./types.js";
+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, DiffIndicators, DiffLineAnnotation, DiffLineEventBaseProps, DiffTokenEventBaseProps, DiffsBaseComponent, DiffsComponentOptions, DiffsEditableComponent, DiffsEditor, DiffsEditorSelection, DiffsHighlighter, DiffsTextDocument, DiffsThemeNames, ExpansionDirections, ExtensionFormatMap, FileContents, FileDiffMetadata, FileHeaderRenderMode, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GapSpan, HighlightedToken, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, LanguageRegistration, LineAnnotation, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, NumericScrollLineAnchor, ObservedAnnotationNodes, ObservedGridNodes, ParsedPatch, PendingCodeViewLayoutReset, PostRenderPhase, PrePropertiesConfig, ProcessFileConflictData, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, 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 { GetHoveredLineResult, GetLineIndexUtility, InteractionManager, InteractionManagerBaseOptions, InteractionManagerMode, InteractionManagerOptions, LogTypes, MergeConflictActionTarget, OnDiffLineClickProps, OnDiffLineEnterLeaveProps, OnLineClickProps, OnLineEnterLeaveProps, OnTokenEventProps, SelectionWriteOptions, pluckInteractionOptions } from "./managers/InteractionManager.js";
 import { ResizeManager } from "./managers/ResizeManager.js";
 import { FileRenderResult, FileRenderer, FileRendererOptions } from "./renderers/FileRenderer.js";
@@ -27,12 +27,12 @@ import { disposeHighlighter, getHighlighterIfLoaded, getSharedHighlighter, isHig
 import { areThemesAttached } from "./highlighter/themes/areThemesAttached.js";
 import { attachResolvedThemes } from "./highlighter/themes/attachResolvedThemes.js";
 import { cleanUpResolvedThemes } from "./highlighter/themes/cleanUpResolvedThemes.js";
-import { AttachedThemes, RegisteredCustomThemes, ResolvedThemes, ResolvingThemes } from "./highlighter/themes/constants.js";
+import { AttachedThemes } from "./highlighter/themes/constants.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 { registerCustomTheme } from "./highlighter/themes/registerCustomTheme.js";
+import { CustomThemeLoader, registerCustomTheme } from "./highlighter/themes/registerCustomTheme.js";
 import { resolveTheme } from "./highlighter/themes/resolveTheme.js";
 import { resolveThemes } from "./highlighter/themes/resolveThemes.js";
 import { ScrollSyncManager } from "./managers/ScrollSyncManager.js";
@@ -105,4 +105,4 @@ import { trimPatchContext } from "./utils/trimPatchContext.js";
 import { FileDiff, FileDiffHydrationProps, FileDiffOptions, FileDiffRenderProps, FileDiffType } from "./components/FileDiff.js";
 import { CodeView, CodeViewCoordinator, CodeViewLineSelection, CodeViewOptions, CodeViewRenderedDiffItem, CodeViewRenderedFileItem, CodeViewRenderedItem, CodeViewScrollListener } from "./components/CodeView.js";
 import { codeToHtml, createCssVariablesTheme as createCSSVariablesTheme } from "shiki";
-export { ALTERNATE_FILE_NAMES_GIT, AnnotationLineMap, AnnotationSide, AnnotationSpan, AppliedThemeStyleCache, AttachedLanguages, AttachedThemes, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, CodeToTokenTransformStream, CodeToTokenTransformStreamOptions, CodeView, CodeViewCoordinator, CodeViewDiffItem, CodeViewFileItem, CodeViewItem, CodeViewItemScrollTarget, CodeViewLayout, CodeViewLineScrollTarget, CodeViewLineSelection, CodeViewOptions, CodeViewPositionScrollTarget, CodeViewRangeScrollTarget, CodeViewRenderedDiffItem, CodeViewRenderedFileItem, CodeViewRenderedItem, CodeViewScrollBehavior, CodeViewScrollListener, CodeViewScrollTarget, ConflictResolverTypes, ContextContent, CreateFileHeaderElementProps, CreatePatchOptionsNonabortable, CustomPreProperties, 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, DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffHunksRenderer, DiffHunksRendererOptions, DiffHunksRendererOptionsWithDefaults, DiffIndicators, DiffLineAnnotation, DiffLineEventBaseProps, DiffTokenEventBaseProps, DiffsBaseComponent, DiffsComponentOptions, DiffsEditableComponent, DiffsEditor, DiffsEditorSelection, DiffsHighlighter, DiffsTextDocument, 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, FileDiffType, FileHeaderRenderMode, FileHydrateProps, FileOptions, FileRenderProps, FileRenderResult, FileRenderer, FileRendererOptions, FileStream, FileStreamOptions, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GIT_DIFF_FILE_BREAK_REGEX, GapSpan, GetHoveredLineResult, GetLineIndexUtility, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, HighlightedToken, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, HunksRenderResult, INDEX_LINE_METADATA, InjectedRow, InteractionManager, InteractionManagerBaseOptions, InteractionManagerMode, InteractionManagerOptions, LanguageRegistration, LineAnnotation, LineDecoration, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, LogTypes, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, MergeConflictActionPayload, MergeConflictActionTarget, MergeConflictActionsTypeOption, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, NumericScrollLineAnchor, ObservedAnnotationNodes, ObservedGridNodes, OnDiffLineClickProps, OnDiffLineEnterLeaveProps, OnLineClickProps, OnLineEnterLeaveProps, OnTokenEventProps, ParsedLine, ParsedPatch, PendingCodeViewLayoutReset, PostRenderPhase, PrePropertiesConfig, ProcessFileConflictData, RecallToken, RegisteredCustomLanguages, RegisteredCustomThemes, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderPrefixCallback, RenderMergeConflictActions, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, RenderedLineContext, ResizeManager, ResolvedLanguages, ResolvedThemes, ResolvingLanguages, ResolvingThemes, SPLIT_WITH_NEWLINES, SVGSpriteNames, SVGSpriteSheet, ScrollSyncManager, SelectedLineRange, SelectionPoint, SelectionSide, SelectionWriteOptions, SharedRenderState, ShikiStreamTokenizer, ShikiStreamTokenizerEnqueueResult, ShikiStreamTokenizerOptions, ShikiTransformer, SmoothScrollSettings, SplitInjectedRow, SplitInjectedRowPlacement, SplitLineDecorationProps, StickySpecs, SupportedLanguages, THEME_CSS_ATTRIBUTE, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, TokenEventBase, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnifiedInjectedRowPlacement, UnifiedLineDecorationProps, UnresolvedFile, UnresolvedFileHydrationProps, UnresolvedFileOptions, UnresolvedFileRenderProps, VirtualFileMetrics, VirtualWindowSpecs, VirtualizedFile, VirtualizedFileDiff, Virtualizer, VirtualizerConfig, areDiffLineAnnotationsEqual, areDiffRenderOptionsEqual, areDiffTargetsEqual, areFileRenderOptionsEqual, 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, createThemeStyleElement, createTransformerWithState, createUnsafeCSSStyleNode, createWindowFromScrollPosition, dequeueRender, detachString, diffAcceptRejectHunk, disposeHighlighter, findCodeElement, formatCSSVariablePrefix, getCustomExtensionsMap, getCustomExtensionsVersion, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, getUnresolvedDiffHunksRendererOptions, hasResolvedLanguages, hasResolvedThemes, isDefaultRenderRange, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, patchScrollbarGutterSize, pluckInteractionOptions, prefersReducedMotion, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, releaseStringDetachBuffer, renderDiffWithHighlighter, renderFileWithHighlighter, replaceCustomExtensions, resolveConflict, resolveLanguage, resolveLanguages, resolveRegion, resolveTheme, resolveThemes, setCustomExtension, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapThemeCSS, wrapUnsafeCSS };
+export { ALTERNATE_FILE_NAMES_GIT, AnnotationLineMap, AnnotationSide, AnnotationSpan, AppliedThemeStyleCache, AttachedLanguages, AttachedThemes, BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, BundledLanguage, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, ChangeContent, ChangeTypes, CodeColumnType, CodeToHastOptions, CodeToTokenTransformStream, CodeToTokenTransformStreamOptions, CodeView, CodeViewCoordinator, CodeViewDiffItem, CodeViewFileItem, CodeViewItem, CodeViewItemScrollTarget, CodeViewLayout, CodeViewLineScrollTarget, CodeViewLineSelection, CodeViewOptions, CodeViewPositionScrollTarget, CodeViewRangeScrollTarget, CodeViewRenderedDiffItem, CodeViewRenderedFileItem, CodeViewRenderedItem, CodeViewScrollBehavior, CodeViewScrollListener, CodeViewScrollTarget, ConflictResolverTypes, ContextContent, CreateFileHeaderElementProps, CreatePatchOptionsNonabortable, 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, DecorationItem, DiffAcceptRejectHunkConfig, DiffAcceptRejectHunkType, DiffHunksRenderer, DiffHunksRendererOptions, DiffHunksRendererOptionsWithDefaults, DiffIndicators, DiffLineAnnotation, DiffLineEventBaseProps, DiffTokenEventBaseProps, DiffsBaseComponent, DiffsComponentOptions, DiffsEditableComponent, DiffsEditor, DiffsEditorSelection, DiffsHighlighter, DiffsTextDocument, 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, FileDiffType, FileHeaderRenderMode, FileHydrateProps, FileOptions, FileRenderProps, FileRenderResult, FileRenderer, FileRendererOptions, FileStream, FileStreamOptions, ForceDiffPlainTextOptions, ForceFilePlainTextOptions, GIT_DIFF_FILE_BREAK_REGEX, GapSpan, GetHoveredLineResult, GetLineIndexUtility, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, HighlightedToken, HighlighterTypes, Hunk, HunkData, HunkExpansionRegion, HunkLineType, HunkSeparators, HunksRenderResult, INDEX_LINE_METADATA, InjectedRow, InteractionManager, InteractionManagerBaseOptions, InteractionManagerMode, InteractionManagerOptions, LanguageRegistration, LineAnnotation, LineDecoration, LineDiffTypes, LineEventBaseProps, LineInfo, LineSpans, LineTypes, LogTypes, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, MergeConflictActionPayload, MergeConflictActionTarget, MergeConflictActionsTypeOption, MergeConflictMarkerRow, MergeConflictMarkerRowType, MergeConflictRegion, MergeConflictResolution, NumericScrollLineAnchor, ObservedAnnotationNodes, ObservedGridNodes, OnDiffLineClickProps, OnDiffLineEnterLeaveProps, OnLineClickProps, OnLineEnterLeaveProps, OnTokenEventProps, ParsedLine, ParsedPatch, PendingCodeViewLayoutReset, PostRenderPhase, PrePropertiesConfig, ProcessFileConflictData, RecallToken, RegisteredCustomLanguages, RenderDiffFilesResult, RenderDiffOptions, RenderDiffResult, RenderFileMetadata, RenderFileOptions, RenderFileResult, RenderHeaderMetadataCallback, RenderHeaderPrefixCallback, RenderMergeConflictActions, RenderRange, RenderWindow, RenderedDiffASTCache, RenderedFileASTCache, RenderedLineContext, ResizeManager, ResolvedLanguages, ResolvingLanguages, SPLIT_WITH_NEWLINES, SVGSpriteNames, SVGSpriteSheet, ScrollSyncManager, SelectedLineRange, SelectionPoint, SelectionSide, SelectionWriteOptions, SharedRenderState, ShikiStreamTokenizer, ShikiStreamTokenizerEnqueueResult, ShikiStreamTokenizerOptions, ShikiTransformer, SmoothScrollSettings, SplitInjectedRow, SplitInjectedRowPlacement, SplitLineDecorationProps, StickySpecs, SupportedLanguages, THEME_CSS_ATTRIBUTE, ThemeRegistration, ThemeRegistrationResolved, ThemeTypes, ThemedDiffResult, ThemedFileResult, ThemedToken, ThemesType, TokenEventBase, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnifiedInjectedRowPlacement, UnifiedLineDecorationProps, UnresolvedFile, UnresolvedFileHydrationProps, UnresolvedFileOptions, UnresolvedFileRenderProps, VirtualFileMetrics, VirtualWindowSpecs, VirtualizedFile, VirtualizedFileDiff, Virtualizer, VirtualizerConfig, areDiffLineAnnotationsEqual, areDiffRenderOptionsEqual, areDiffTargetsEqual, areFileRenderOptionsEqual, 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, createThemeStyleElement, createTransformerWithState, createUnsafeCSSStyleNode, createWindowFromScrollPosition, dequeueRender, detachString, diffAcceptRejectHunk, disposeHighlighter, findCodeElement, formatCSSVariablePrefix, getCustomExtensionsMap, getCustomExtensionsVersion, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, getUnresolvedDiffHunksRendererOptions, hasResolvedLanguages, hasResolvedThemes, isDefaultRenderRange, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, patchScrollbarGutterSize, pluckInteractionOptions, prefersReducedMotion, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, releaseStringDetachBuffer, renderDiffWithHighlighter, renderFileWithHighlighter, replaceCustomExtensions, resolveConflict, resolveLanguage, resolveLanguages, resolveRegion, resolveTheme, resolveThemes, setCustomExtension, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapThemeCSS, wrapUnsafeCSS };

package/dist/index.js

@@ -18,12 +18,11 @@ import { cleanUpResolvedLanguages } from "./highlighter/languages/cleanUpResolve
 import { isWorkerContext } from "./utils/isWorkerContext.js";
 import { resolveLanguage } from "./highlighter/languages/resolveLanguage.js";
 import { getResolvedOrResolveLanguage } from "./highlighter/languages/getResolvedOrResolveLanguage.js";
-import { AttachedThemes, RegisteredCustomThemes, ResolvedThemes, ResolvingThemes } from "./highlighter/themes/constants.js";
+import { AttachedThemes } from "./highlighter/themes/constants.js";
 import { attachResolvedThemes } from "./highlighter/themes/attachResolvedThemes.js";
 import { cleanUpResolvedThemes } from "./highlighter/themes/cleanUpResolvedThemes.js";
 import { resolveTheme } from "./highlighter/themes/resolveTheme.js";
 import { getResolvedOrResolveTheme } from "./highlighter/themes/getResolvedOrResolveTheme.js";
-import { registerCustomTheme } from "./highlighter/themes/registerCustomTheme.js";
 import { disposeHighlighter, getHighlighterIfLoaded, getSharedHighlighter, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, preloadHighlighter } from "./highlighter/shared_highlighter.js";
 import { getThemes } from "./utils/getThemes.js";
 import { areThemesAttached } from "./highlighter/themes/areThemesAttached.js";
@@ -91,6 +90,7 @@ import { hasResolvedLanguages } from "./highlighter/languages/hasResolvedLanguag
 import { registerCustomLanguage } from "./highlighter/languages/registerCustomLanguage.js";
 import { resolveLanguages } from "./highlighter/languages/resolveLanguages.js";
 import { getResolvedThemes } from "./highlighter/themes/getResolvedThemes.js";
+import { registerCustomTheme } from "./highlighter/themes/registerCustomTheme.js";
 import { registerCustomCSSVariableTheme } from "./highlighter/themes/registerCustomCSSVariableTheme.js";
 import { resolveThemes } from "./highlighter/themes/resolveThemes.js";
 import { areWorkerStatsEqual } from "./utils/areWorkerStatsEqual.js";
@@ -104,4 +104,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_HEADER_SLOT_ID, CodeToTokenTransformStream, CodeView, 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, DiffHunksRenderer, EMPTY_RENDER_RANGE, EXTENSION_TO_FILE_FORMAT, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, File, FileDiff, FileRenderer, FileStream, GIT_DIFF_FILE_BREAK_REGEX, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, InteractionManager, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, RegisteredCustomLanguages, RegisteredCustomThemes, ResizeManager, ResolvedLanguages, ResolvedThemes, ResolvingLanguages, ResolvingThemes, SPLIT_WITH_NEWLINES, SVGSpriteSheet, ScrollSyncManager, ShikiStreamTokenizer, THEME_CSS_ATTRIBUTE, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnresolvedFile, VirtualizedFile, VirtualizedFileDiff, Virtualizer, areDiffLineAnnotationsEqual, areDiffRenderOptionsEqual, areDiffTargetsEqual, areFileRenderOptionsEqual, 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, createThemeStyleElement, createTransformerWithState, createUnsafeCSSStyleNode, createWindowFromScrollPosition, dequeueRender, detachString, diffAcceptRejectHunk, disposeHighlighter, findCodeElement, formatCSSVariablePrefix, getCustomExtensionsMap, getCustomExtensionsVersion, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, getUnresolvedDiffHunksRendererOptions, hasResolvedLanguages, hasResolvedThemes, isDefaultRenderRange, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, patchScrollbarGutterSize, pluckInteractionOptions, prefersReducedMotion, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, releaseStringDetachBuffer, renderDiffWithHighlighter, renderFileWithHighlighter, replaceCustomExtensions, resolveConflict, resolveLanguage, resolveLanguages, resolveRegion, resolveTheme, resolveThemes, setCustomExtension, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapThemeCSS, wrapUnsafeCSS };
+export { ALTERNATE_FILE_NAMES_GIT, AttachedLanguages, AttachedThemes, COMMIT_METADATA_SPLIT, CORE_CSS_ATTRIBUTE, CUSTOM_HEADER_SLOT_ID, CodeToTokenTransformStream, CodeView, 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, DiffHunksRenderer, EMPTY_RENDER_RANGE, EXTENSION_TO_FILE_FORMAT, FILENAME_HEADER_REGEX, FILENAME_HEADER_REGEX_GIT, FILE_CONTEXT_BLOB, File, FileDiff, FileRenderer, FileStream, GIT_DIFF_FILE_BREAK_REGEX, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID, HUNK_HEADER, INDEX_LINE_METADATA, InteractionManager, MERGE_CONFLICT_BASE_MARKER_REGEX, MERGE_CONFLICT_END_MARKER_REGEX, MERGE_CONFLICT_SEPARATOR_MARKER_REGEX, MERGE_CONFLICT_START_MARKER_REGEX, RegisteredCustomLanguages, ResizeManager, ResolvedLanguages, ResolvingLanguages, SPLIT_WITH_NEWLINES, SVGSpriteSheet, ScrollSyncManager, ShikiStreamTokenizer, THEME_CSS_ATTRIBUTE, UNIFIED_DIFF_FILE_BREAK_REGEX, UNSAFE_CSS_ATTRIBUTE, UnresolvedFile, VirtualizedFile, VirtualizedFileDiff, Virtualizer, areDiffLineAnnotationsEqual, areDiffRenderOptionsEqual, areDiffTargetsEqual, areFileRenderOptionsEqual, 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, createThemeStyleElement, createTransformerWithState, createUnsafeCSSStyleNode, createWindowFromScrollPosition, dequeueRender, detachString, diffAcceptRejectHunk, disposeHighlighter, findCodeElement, formatCSSVariablePrefix, getCustomExtensionsMap, getCustomExtensionsVersion, getFiletypeFromFileName, getHighlighterIfLoaded, getHighlighterOptions, getHighlighterThemeStyles, getHunkSeparatorSlotName, getIconForType, getLineAnnotationName, getLineEndingType, getLineNodes, getOrCreateCodeNode, getResolvedLanguages, getResolvedOrResolveLanguage, getResolvedOrResolveTheme, getResolvedThemes, getSharedHighlighter, getSingularPatch, getThemes, getTotalLineCountFromHunks, getUnresolvedDiffHunksRendererOptions, hasResolvedLanguages, hasResolvedThemes, isDefaultRenderRange, isHighlighterLoaded, isHighlighterLoading, isHighlighterNull, isWorkerContext, parseDiffFromFile, parseLineType, parsePatchFiles, patchScrollbarGutterSize, pluckInteractionOptions, prefersReducedMotion, preloadHighlighter, prerenderHTMLIfNecessary, processFile, processLine, processPatch, pushOrJoinSpan, queueRender, registerCustomCSSVariableTheme, registerCustomLanguage, registerCustomTheme, releaseStringDetachBuffer, renderDiffWithHighlighter, renderFileWithHighlighter, replaceCustomExtensions, resolveConflict, resolveLanguage, resolveLanguages, resolveRegion, resolveTheme, resolveThemes, setCustomExtension, setLanguageOverride, setPreNodeProperties, trimPatchContext, wrapCoreCSS, wrapThemeCSS, wrapUnsafeCSS };

package/dist/managers/InteractionManager.js

@@ -1073,7 +1073,7 @@ function selectionPointFromAnnotationSlotName(slotName) {
 	const match = /^annotation-(?:(additions|deletions)-)?(\d+)$/.exec(slotName);
 	if (match == null) return;
 	const lineNumber = Number.parseInt(match[2], 10);
-	if (!Number.isFinite(lineNumber)) return;
+	if (!Number.isFinite(lineNumber) || lineNumber <= 0) return;
 	return {
 		lineNumber,
 		side: match[1]