@pierre/diffs 1.3.0-beta.1 → 1.3.0-beta.11

package/dist/highlighter/shared_highlighter.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared_highlighter.js","names":["highlighter: CachedOrLoadingHighlighterType","languageLoaders: Promise<ResolvedLanguage>[]","themeLoaders: Promise<ThemeRegistrationResolved>[]","themes"],"sources":["../../src/highlighter/shared_highlighter.ts"],"sourcesContent":["import {\n  createHighlighter,\n  createJavaScriptRegexEngine,\n  createOnigurumaEngine,\n} from 'shiki';\n\nimport type {\n  DiffsHighlighter,\n  DiffsThemeNames,\n  HighlighterTypes,\n  SupportedLanguages,\n  ThemeRegistrationResolved,\n} from '../types';\nimport type { ResolvedLanguage } from '../worker/types';\nimport { attachResolvedLanguages } from './languages/attachResolvedLanguages';\nimport { cleanUpResolvedLanguages } from './languages/cleanUpResolvedLanguages';\nimport { getResolvedOrResolveLanguage } from './languages/getResolvedOrResolveLanguage';\nimport { attachResolvedThemes } from './themes/attachResolvedThemes';\nimport { cleanUpResolvedThemes } from './themes/cleanUpResolvedThemes';\nimport { getResolvedOrResolveTheme } from './themes/getResolvedOrResolveTheme';\nimport { registerCustomTheme } from './themes/registerCustomTheme';\n\ntype CachedOrLoadingHighlighterType =\n  | Promise<DiffsHighlighter>\n  | DiffsHighlighter\n  | undefined;\n\nlet highlighter: CachedOrLoadingHighlighterType;\n\ninterface HighlighterOptions {\n  themes: DiffsThemeNames[];\n  langs: SupportedLanguages[];\n  preferredHighlighter?: HighlighterTypes;\n}\n\nexport async function getSharedHighlighter({\n  themes,\n  langs,\n  preferredHighlighter = 'shiki-js',\n}: HighlighterOptions): Promise<DiffsHighlighter> {\n  highlighter ??= createHighlighter({\n    themes: [],\n    langs: ['text'],\n    engine:\n      preferredHighlighter === 'shiki-wasm'\n        ? createOnigurumaEngine(import('shiki/wasm'))\n        : createJavaScriptRegexEngine(),\n  }) as Promise<DiffsHighlighter>;\n\n  const instance = isHighlighterLoading(highlighter)\n    ? await highlighter\n    : highlighter;\n  highlighter = instance;\n\n  const languageLoaders: Promise<ResolvedLanguage>[] = [];\n  for (const language of langs) {\n    if (language === 'text' || language === 'ansi') continue;\n    const maybeResolvedLanguage = getResolvedOrResolveLanguage(language);\n    if ('then' in maybeResolvedLanguage) {\n      languageLoaders.push(maybeResolvedLanguage);\n    } else {\n      attachResolvedLanguages(maybeResolvedLanguage, instance);\n    }\n  }\n\n  const themeLoaders: Promise<ThemeRegistrationResolved>[] = [];\n  for (const themeName of themes) {\n    const maybeResolvedTheme = getResolvedOrResolveTheme(themeName);\n    if ('then' in maybeResolvedTheme) {\n      themeLoaders.push(maybeResolvedTheme);\n    } else {\n      attachResolvedThemes(maybeResolvedTheme, highlighter);\n    }\n  }\n\n  // If we need to load any languages or themes, lets do that now\n  if (languageLoaders.length > 0 || themeLoaders.length > 0) {\n    await Promise.all([\n      Promise.all(languageLoaders).then((languages) => {\n        attachResolvedLanguages(languages, instance);\n      }),\n      Promise.all(themeLoaders).then((themes) => {\n        attachResolvedThemes(themes, instance);\n      }),\n    ]);\n  }\n\n  return instance;\n}\n\nexport function isHighlighterLoaded(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is DiffsHighlighter {\n  return h != null && !('then' in h);\n}\n\nexport function getHighlighterIfLoaded(): DiffsHighlighter | undefined {\n  if (highlighter != null && !('then' in highlighter)) {\n    return highlighter;\n  }\n  return undefined;\n}\n\nexport function isHighlighterLoading(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is Promise<DiffsHighlighter> {\n  return h != null && 'then' in h;\n}\n\nexport function isHighlighterNull(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is undefined {\n  return h == null;\n}\n\nexport async function preloadHighlighter(\n  options: HighlighterOptions\n): Promise<void> {\n  return void (await getSharedHighlighter(options));\n}\n\nexport async function disposeHighlighter(): Promise<void> {\n  if (highlighter == null) return;\n  (await highlighter).dispose();\n  cleanUpResolvedLanguages();\n  cleanUpResolvedThemes();\n  highlighter = undefined;\n}\n\nregisterCustomTheme('pierre-dark', async () => {\n  const { default: theme } = await import('@pierre/theme/pierre-dark');\n  return { ...theme, name: 'pierre-dark' } as ThemeRegistrationResolved;\n});\n\nregisterCustomTheme('pierre-dark-soft', async () => {\n  const { default: theme } = await import('@pierre/theme/pierre-dark-soft');\n  return { ...theme, name: 'pierre-dark-soft' } as ThemeRegistrationResolved;\n});\n\nregisterCustomTheme('pierre-light', async () => {\n  const { default: theme } = await import('@pierre/theme/pierre-light');\n  return { ...theme, name: 'pierre-light' } as ThemeRegistrationResolved;\n});\n\nregisterCustomTheme('pierre-light-soft', async () => {\n  const { default: theme } = await import('@pierre/theme/pierre-light-soft');\n  return { ...theme, name: 'pierre-light-soft' } as ThemeRegistrationResolved;\n});\n"],"mappings":";;;;;;;;;;AA2BA,IAAIA;AAQJ,eAAsB,qBAAqB,EACzC,QACA,OACA,uBAAuB,cACyB;AAChD,iBAAgB,kBAAkB;EAChC,QAAQ,EAAE;EACV,OAAO,CAAC,OAAO;EACf,QACE,yBAAyB,eACrB,sBAAsB,OAAO,cAAc,GAC3C,6BAA6B;EACpC,CAAC;CAEF,MAAM,WAAW,qBAAqB,YAAY,GAC9C,MAAM,cACN;AACJ,eAAc;CAEd,MAAMC,kBAA+C,EAAE;AACvD,MAAK,MAAM,YAAY,OAAO;AAC5B,MAAI,aAAa,UAAU,aAAa,OAAQ;EAChD,MAAM,wBAAwB,6BAA6B,SAAS;AACpE,MAAI,UAAU,sBACZ,iBAAgB,KAAK,sBAAsB;MAE3C,yBAAwB,uBAAuB,SAAS;;CAI5D,MAAMC,eAAqD,EAAE;AAC7D,MAAK,MAAM,aAAa,QAAQ;EAC9B,MAAM,qBAAqB,0BAA0B,UAAU;AAC/D,MAAI,UAAU,mBACZ,cAAa,KAAK,mBAAmB;MAErC,sBAAqB,oBAAoB,YAAY;;AAKzD,KAAI,gBAAgB,SAAS,KAAK,aAAa,SAAS,EACtD,OAAM,QAAQ,IAAI,CAChB,QAAQ,IAAI,gBAAgB,CAAC,MAAM,cAAc;AAC/C,0BAAwB,WAAW,SAAS;GAC5C,EACF,QAAQ,IAAI,aAAa,CAAC,MAAM,aAAW;AACzC,uBAAqBC,UAAQ,SAAS;GACtC,CACH,CAAC;AAGJ,QAAO;;AAGT,SAAgB,oBACd,IAAoC,aACb;AACvB,QAAO,KAAK,QAAQ,EAAE,UAAU;;AAGlC,SAAgB,yBAAuD;AACrE,KAAI,eAAe,QAAQ,EAAE,UAAU,aACrC,QAAO;;AAKX,SAAgB,qBACd,IAAoC,aACJ;AAChC,QAAO,KAAK,QAAQ,UAAU;;AAGhC,SAAgB,kBACd,IAAoC,aACpB;AAChB,QAAO,KAAK;;AAGd,eAAsB,mBACpB,SACe;AACR,CAAM,MAAM,qBAAqB,QAAQ;;AAGlD,eAAsB,qBAAoC;AACxD,KAAI,eAAe,KAAM;AACzB,EAAC,MAAM,aAAa,SAAS;AAC7B,2BAA0B;AAC1B,wBAAuB;AACvB,eAAc;;AAGhB,oBAAoB,eAAe,YAAY;CAC7C,MAAM,EAAE,SAAS,UAAU,MAAM,OAAO;AACxC,QAAO;EAAE,GAAG;EAAO,MAAM;EAAe;EACxC;AAEF,oBAAoB,oBAAoB,YAAY;CAClD,MAAM,EAAE,SAAS,UAAU,MAAM,OAAO;AACxC,QAAO;EAAE,GAAG;EAAO,MAAM;EAAoB;EAC7C;AAEF,oBAAoB,gBAAgB,YAAY;CAC9C,MAAM,EAAE,SAAS,UAAU,MAAM,OAAO;AACxC,QAAO;EAAE,GAAG;EAAO,MAAM;EAAgB;EACzC;AAEF,oBAAoB,qBAAqB,YAAY;CACnD,MAAM,EAAE,SAAS,UAAU,MAAM,OAAO;AACxC,QAAO;EAAE,GAAG;EAAO,MAAM;EAAqB;EAC9C"}
+{"version":3,"file":"shared_highlighter.js","names":[],"sources":["../../src/highlighter/shared_highlighter.ts"],"sourcesContent":["import type { ThemeLoader } from '@pierre/theming';\nimport { pierreThemes } from '@pierre/theming/themes';\nimport {\n  createHighlighter,\n  createJavaScriptRegexEngine,\n  createOnigurumaEngine,\n} from 'shiki';\n\nimport type {\n  DiffsHighlighter,\n  DiffsThemeNames,\n  HighlighterTypes,\n  SupportedLanguages,\n  ThemeRegistrationResolved,\n} from '../types';\nimport type { ResolvedLanguage } from '../worker/types';\nimport { attachResolvedLanguages } from './languages/attachResolvedLanguages';\nimport { cleanUpResolvedLanguages } from './languages/cleanUpResolvedLanguages';\nimport { getResolvedOrResolveLanguage } from './languages/getResolvedOrResolveLanguage';\nimport { attachResolvedThemes } from './themes/attachResolvedThemes';\nimport { cleanUpResolvedThemes } from './themes/cleanUpResolvedThemes';\nimport { getResolvedOrResolveTheme } from './themes/getResolvedOrResolveTheme';\nimport { themeResolver } from './themes/themeResolver';\n\ntype CachedOrLoadingHighlighterType =\n  | Promise<DiffsHighlighter>\n  | DiffsHighlighter\n  | undefined;\n\nlet highlighter: CachedOrLoadingHighlighterType;\n\ninterface HighlighterOptions {\n  themes: DiffsThemeNames[];\n  langs: SupportedLanguages[];\n  preferredHighlighter?: HighlighterTypes;\n}\n\nexport async function getSharedHighlighter({\n  themes,\n  langs,\n  preferredHighlighter = 'shiki-js',\n}: HighlighterOptions): Promise<DiffsHighlighter> {\n  highlighter ??= createHighlighter({\n    themes: [],\n    langs: ['text'],\n    engine:\n      preferredHighlighter === 'shiki-wasm'\n        ? createOnigurumaEngine(import('shiki/wasm'))\n        : createJavaScriptRegexEngine(),\n  }) as Promise<DiffsHighlighter>;\n\n  const instance = isHighlighterLoading(highlighter)\n    ? await highlighter\n    : highlighter;\n  highlighter = instance;\n\n  const languageLoaders: Promise<ResolvedLanguage>[] = [];\n  for (const language of langs) {\n    if (language === 'text' || language === 'ansi') continue;\n    const maybeResolvedLanguage = getResolvedOrResolveLanguage(language);\n    if ('then' in maybeResolvedLanguage) {\n      languageLoaders.push(maybeResolvedLanguage);\n    } else {\n      attachResolvedLanguages(maybeResolvedLanguage, instance);\n    }\n  }\n\n  const themeLoaders: Promise<ThemeRegistrationResolved>[] = [];\n  for (const themeName of themes) {\n    const maybeResolvedTheme = getResolvedOrResolveTheme(themeName);\n    if ('then' in maybeResolvedTheme) {\n      themeLoaders.push(maybeResolvedTheme);\n    } else {\n      attachResolvedThemes(maybeResolvedTheme, highlighter);\n    }\n  }\n\n  // If we need to load any languages or themes, lets do that now\n  if (languageLoaders.length > 0 || themeLoaders.length > 0) {\n    await Promise.all([\n      Promise.all(languageLoaders).then((languages) => {\n        attachResolvedLanguages(languages, instance);\n      }),\n      Promise.all(themeLoaders).then((themes) => {\n        attachResolvedThemes(themes, instance);\n      }),\n    ]);\n  }\n\n  return instance;\n}\n\nexport function isHighlighterLoaded(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is DiffsHighlighter {\n  return h != null && !('then' in h);\n}\n\nexport function getHighlighterIfLoaded(): DiffsHighlighter | undefined {\n  if (highlighter != null && !('then' in highlighter)) {\n    return highlighter;\n  }\n  return undefined;\n}\n\nexport function isHighlighterLoading(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is Promise<DiffsHighlighter> {\n  return h != null && 'then' in h;\n}\n\nexport function isHighlighterNull(\n  h: CachedOrLoadingHighlighterType = highlighter\n): h is undefined {\n  return h == null;\n}\n\nexport async function preloadHighlighter(\n  options: HighlighterOptions\n): Promise<void> {\n  return void (await getSharedHighlighter(options));\n}\n\nexport async function disposeHighlighter(): Promise<void> {\n  if (highlighter == null) return;\n  (await highlighter).dispose();\n  cleanUpResolvedLanguages();\n  cleanUpResolvedThemes();\n  highlighter = undefined;\n}\n\nfor (const descriptor of pierreThemes.getThemes()) {\n  themeResolver.registerThemeIfAbsent(\n    descriptor.name,\n    descriptor.load as ThemeLoader<ThemeRegistrationResolved>\n  );\n}\n"],"mappings":";;;;;;;;;;AA6BA,IAAI;AAQJ,eAAsB,qBAAqB,EACzC,QACA,OACA,uBAAuB,cACyB;CAChD,gBAAgB,kBAAkB;EAChC,QAAQ,CAAC;EACT,OAAO,CAAC,MAAM;EACd,QACE,yBAAyB,eACrB,sBAAsB,OAAO,aAAa,IAC1C,4BAA4B;CACpC,CAAC;CAED,MAAM,WAAW,qBAAqB,WAAW,IAC7C,MAAM,cACN;CACJ,cAAc;CAEd,MAAM,kBAA+C,CAAC;CACtD,KAAK,MAAM,YAAY,OAAO;EAC5B,IAAI,aAAa,UAAU,aAAa,QAAQ;EAChD,MAAM,wBAAwB,6BAA6B,QAAQ;EACnE,IAAI,UAAU,uBACZ,gBAAgB,KAAK,qBAAqB;OAE1C,wBAAwB,uBAAuB,QAAQ;CAE3D;CAEA,MAAM,eAAqD,CAAC;CAC5D,KAAK,MAAM,aAAa,QAAQ;EAC9B,MAAM,qBAAqB,0BAA0B,SAAS;EAC9D,IAAI,UAAU,oBACZ,aAAa,KAAK,kBAAkB;OAEpC,qBAAqB,oBAAoB,WAAW;CAExD;CAGA,IAAI,gBAAgB,SAAS,KAAK,aAAa,SAAS,GACtD,MAAM,QAAQ,IAAI,CAChB,QAAQ,IAAI,eAAe,CAAC,CAAC,MAAM,cAAc;EAC/C,wBAAwB,WAAW,QAAQ;CAC7C,CAAC,GACD,QAAQ,IAAI,YAAY,CAAC,CAAC,MAAM,WAAW;EACzC,qBAAqB,QAAQ,QAAQ;CACvC,CAAC,CACH,CAAC;CAGH,OAAO;AACT;AAEA,SAAgB,oBACd,IAAoC,aACb;CACvB,OAAO,KAAK,QAAQ,EAAE,UAAU;AAClC;AAEA,SAAgB,yBAAuD;CACrE,IAAI,eAAe,QAAQ,EAAE,UAAU,cACrC,OAAO;AAGX;AAEA,SAAgB,qBACd,IAAoC,aACJ;CAChC,OAAO,KAAK,QAAQ,UAAU;AAChC;AAEA,SAAgB,kBACd,IAAoC,aACpB;CAChB,OAAO,KAAK;AACd;AAEA,eAAsB,mBACpB,SACe;CACR,MAAY,qBAAqB,OAAO;AACjD;AAEA,eAAsB,qBAAoC;CACxD,IAAI,eAAe,MAAM;CACzB,CAAC,MAAM,YAAA,CAAa,QAAQ;CAC5B,yBAAyB;CACzB,sBAAsB;CACtB,cAAc,KAAA;AAChB;AAEA,KAAK,MAAM,cAAc,aAAa,UAAU,GAC9C,cAAc,sBACZ,WAAW,MACX,WAAW,IACb"}

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

@@ -1 +1 @@
-{"version":3,"file":"areThemesAttached.d.ts","names":["DiffsThemeNames","ThemesType","areThemesAttached"],"sources":["../../../src/highlighter/themes/areThemesAttached.d.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemesType } from '../../types';\nexport declare function areThemesAttached(themes: DiffsThemeNames | ThemesType): boolean;\n//# sourceMappingURL=areThemesAttached.d.ts.map"],"mappings":";;;iBACwBE,iBAAAA,SAA0BF,kBAAkBC"}
+{"version":3,"file":"areThemesAttached.d.ts","names":[],"sources":["../../../src/highlighter/themes/areThemesAttached.ts"],"mappings":";;;iBAIgB,iBAAA,CACd,MAAA,EAAQ,eAAA,GAAkB,UAAU"}

package/dist/highlighter/themes/areThemesAttached.js

@@ -1,12 +1,11 @@
 import { AttachedThemes } from "./constants.js";
 import { getThemes } from "../../utils/getThemes.js";
-
 //#region src/highlighter/themes/areThemesAttached.ts
 function areThemesAttached(themes) {
 	for (const theme of getThemes(themes)) if (!AttachedThemes.has(theme)) return false;
 	return true;
 }
-
 //#endregion
 export { areThemesAttached };
+
 //# sourceMappingURL=areThemesAttached.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"areThemesAttached.js","names":[],"sources":["../../../src/highlighter/themes/areThemesAttached.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemesType } from '../../types';\nimport { getThemes } from '../../utils/getThemes';\nimport { AttachedThemes } from './constants';\n\nexport function areThemesAttached(\n  themes: DiffsThemeNames | ThemesType\n): boolean {\n  for (const theme of getThemes(themes)) {\n    if (!AttachedThemes.has(theme)) {\n      return false;\n    }\n  }\n  return true;\n}\n"],"mappings":";;;;AAIA,SAAgB,kBACd,QACS;AACT,MAAK,MAAM,SAAS,UAAU,OAAO,CACnC,KAAI,CAAC,eAAe,IAAI,MAAM,CAC5B,QAAO;AAGX,QAAO"}
+{"version":3,"file":"areThemesAttached.js","names":[],"sources":["../../../src/highlighter/themes/areThemesAttached.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemesType } from '../../types';\nimport { getThemes } from '../../utils/getThemes';\nimport { AttachedThemes } from './constants';\n\nexport function areThemesAttached(\n  themes: DiffsThemeNames | ThemesType\n): boolean {\n  for (const theme of getThemes(themes)) {\n    if (!AttachedThemes.has(theme)) {\n      return false;\n    }\n  }\n  return true;\n}\n"],"mappings":";;;AAIA,SAAgB,kBACd,QACS;CACT,KAAK,MAAM,SAAS,UAAU,MAAM,GAClC,IAAI,CAAC,eAAe,IAAI,KAAK,GAC3B,OAAO;CAGX,OAAO;AACT"}

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

@@ -1 +1 @@
-{"version":3,"file":"attachResolvedThemes.d.ts","names":["DiffsHighlighter","DiffsThemeNames","ThemeRegistrationResolved","attachResolvedThemes"],"sources":["../../../src/highlighter/themes/attachResolvedThemes.d.ts"],"sourcesContent":["import type { DiffsHighlighter, DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nexport declare function attachResolvedThemes(themes: DiffsThemeNames | ThemeRegistrationResolved | (DiffsThemeNames | ThemeRegistrationResolved)[], highlighter: DiffsHighlighter): void;\n//# sourceMappingURL=attachResolvedThemes.d.ts.map"],"mappings":";;;iBACwBG,oBAAAA,SAA6BF,kBAAkBC,6BAA6BD,kBAAkBC,2CAA2CF"}
+{"version":3,"file":"attachResolvedThemes.d.ts","names":[],"sources":["../../../src/highlighter/themes/attachResolvedThemes.ts"],"mappings":";;;iBAegB,oBAAA,CACd,MAAA,EACI,eAAA,GACA,yBAAA,IACC,eAAA,GAAkB,yBAAA,KACvB,WAAA,EAAa,gBAAA"}

package/dist/highlighter/themes/attachResolvedThemes.js

@@ -1,24 +1,24 @@
-import { AttachedThemes, ResolvedThemes } from "./constants.js";
-
+import { AttachedThemes } from "./constants.js";
+import { themeResolver } from "./themeResolver.js";
 //#region src/highlighter/themes/attachResolvedThemes.ts
 function attachResolvedThemes(themes, highlighter) {
 	themes = Array.isArray(themes) ? themes : [themes];
 	for (let themeRef of themes) {
 		let resolvedTheme;
 		if (typeof themeRef === "string") {
-			resolvedTheme = ResolvedThemes.get(themeRef);
+			resolvedTheme = themeResolver.getResolvedTheme(themeRef);
 			if (resolvedTheme == null) throw new Error(`loadResolvedThemes: ${themeRef} is not resolved, you must resolve it before calling loadResolvedThemes`);
 		} else {
 			resolvedTheme = themeRef;
 			themeRef = themeRef.name;
-			if (!ResolvedThemes.has(themeRef)) ResolvedThemes.set(themeRef, resolvedTheme);
+			if (themeResolver.getResolvedTheme(themeRef) == null) themeResolver.seedResolvedTheme(themeRef, resolvedTheme);
 		}
 		if (AttachedThemes.has(themeRef)) continue;
 		AttachedThemes.add(themeRef);
 		highlighter.loadThemeSync(resolvedTheme);
 	}
 }
-
 //#endregion
 export { attachResolvedThemes };
+
 //# sourceMappingURL=attachResolvedThemes.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"attachResolvedThemes.js","names":["resolvedTheme: ThemeRegistrationResolved | undefined"],"sources":["../../../src/highlighter/themes/attachResolvedThemes.ts"],"sourcesContent":["import type {\n  DiffsHighlighter,\n  DiffsThemeNames,\n  ThemeRegistrationResolved,\n} from '../../types';\nimport { AttachedThemes, ResolvedThemes } from './constants';\n\nexport function attachResolvedThemes(\n  themes:\n    | DiffsThemeNames\n    | ThemeRegistrationResolved\n    | (DiffsThemeNames | ThemeRegistrationResolved)[],\n  highlighter: DiffsHighlighter\n): void {\n  themes = Array.isArray(themes) ? themes : [themes];\n  for (let themeRef of themes) {\n    let resolvedTheme: ThemeRegistrationResolved | undefined;\n    if (typeof themeRef === 'string') {\n      resolvedTheme = ResolvedThemes.get(themeRef);\n      if (resolvedTheme == null) {\n        throw new Error(\n          `loadResolvedThemes: ${themeRef} is not resolved, you must resolve it before calling loadResolvedThemes`\n        );\n      }\n    } else {\n      resolvedTheme = themeRef;\n      themeRef = themeRef.name;\n      if (!ResolvedThemes.has(themeRef)) {\n        ResolvedThemes.set(themeRef, resolvedTheme);\n      }\n    }\n    if (AttachedThemes.has(themeRef)) continue;\n    AttachedThemes.add(themeRef);\n    highlighter.loadThemeSync(resolvedTheme);\n  }\n}\n"],"mappings":";;;AAOA,SAAgB,qBACd,QAIA,aACM;AACN,UAAS,MAAM,QAAQ,OAAO,GAAG,SAAS,CAAC,OAAO;AAClD,MAAK,IAAI,YAAY,QAAQ;EAC3B,IAAIA;AACJ,MAAI,OAAO,aAAa,UAAU;AAChC,mBAAgB,eAAe,IAAI,SAAS;AAC5C,OAAI,iBAAiB,KACnB,OAAM,IAAI,MACR,uBAAuB,SAAS,yEACjC;SAEE;AACL,mBAAgB;AAChB,cAAW,SAAS;AACpB,OAAI,CAAC,eAAe,IAAI,SAAS,CAC/B,gBAAe,IAAI,UAAU,cAAc;;AAG/C,MAAI,eAAe,IAAI,SAAS,CAAE;AAClC,iBAAe,IAAI,SAAS;AAC5B,cAAY,cAAc,cAAc"}
+{"version":3,"file":"attachResolvedThemes.js","names":[],"sources":["../../../src/highlighter/themes/attachResolvedThemes.ts"],"sourcesContent":["import type {\n  DiffsHighlighter,\n  DiffsThemeNames,\n  ThemeRegistrationResolved,\n} from '../../types';\nimport { AttachedThemes } from './constants';\nimport { themeResolver } from './themeResolver';\n\n// Loads resolved themes into the highlighter (loadThemeSync) and records them\n// in AttachedThemes so each theme is attached at most once. Accepts either a\n// name (which must already be resolved/cached) or a fully-resolved theme\n// object. Theme objects are seeded into the resolver when not already present —\n// this is the path workers use: they receive pre-resolved themes from the main\n// thread (they cannot call resolveTheme themselves) and need them available so\n// getResolvedThemes works synchronously.\nexport function attachResolvedThemes(\n  themes:\n    | DiffsThemeNames\n    | ThemeRegistrationResolved\n    | (DiffsThemeNames | ThemeRegistrationResolved)[],\n  highlighter: DiffsHighlighter\n): void {\n  themes = Array.isArray(themes) ? themes : [themes];\n  for (let themeRef of themes) {\n    let resolvedTheme: ThemeRegistrationResolved | undefined;\n    if (typeof themeRef === 'string') {\n      resolvedTheme = themeResolver.getResolvedTheme(themeRef);\n      if (resolvedTheme == null) {\n        throw new Error(\n          `loadResolvedThemes: ${themeRef} is not resolved, you must resolve it before calling loadResolvedThemes`\n        );\n      }\n    } else {\n      resolvedTheme = themeRef;\n      themeRef = themeRef.name;\n      if (themeResolver.getResolvedTheme(themeRef) == null) {\n        themeResolver.seedResolvedTheme(themeRef, resolvedTheme);\n      }\n    }\n    if (AttachedThemes.has(themeRef)) continue;\n    AttachedThemes.add(themeRef);\n    highlighter.loadThemeSync(resolvedTheme);\n  }\n}\n"],"mappings":";;;AAeA,SAAgB,qBACd,QAIA,aACM;CACN,SAAS,MAAM,QAAQ,MAAM,IAAI,SAAS,CAAC,MAAM;CACjD,KAAK,IAAI,YAAY,QAAQ;EAC3B,IAAI;EACJ,IAAI,OAAO,aAAa,UAAU;GAChC,gBAAgB,cAAc,iBAAiB,QAAQ;GACvD,IAAI,iBAAiB,MACnB,MAAM,IAAI,MACR,uBAAuB,SAAS,wEAClC;EAEJ,OAAO;GACL,gBAAgB;GAChB,WAAW,SAAS;GACpB,IAAI,cAAc,iBAAiB,QAAQ,KAAK,MAC9C,cAAc,kBAAkB,UAAU,aAAa;EAE3D;EACA,IAAI,eAAe,IAAI,QAAQ,GAAG;EAClC,eAAe,IAAI,QAAQ;EAC3B,YAAY,cAAc,aAAa;CACzC;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"cleanUpResolvedThemes.d.ts","names":["cleanUpResolvedThemes"],"sources":["../../../src/highlighter/themes/cleanUpResolvedThemes.d.ts"],"sourcesContent":["export declare function cleanUpResolvedThemes(): void;\n//# sourceMappingURL=cleanUpResolvedThemes.d.ts.map"],"mappings":";iBAAwBA,qBAAAA,CAAAA"}
+{"version":3,"file":"cleanUpResolvedThemes.d.ts","names":[],"sources":["../../../src/highlighter/themes/cleanUpResolvedThemes.ts"],"mappings":";iBAOgB,qBAAA"}

package/dist/highlighter/themes/cleanUpResolvedThemes.js

@@ -1,11 +1,11 @@
-import { AttachedThemes, ResolvedThemes } from "./constants.js";
-
+import { AttachedThemes } from "./constants.js";
+import { themeResolver } from "./themeResolver.js";
 //#region src/highlighter/themes/cleanUpResolvedThemes.ts
 function cleanUpResolvedThemes() {
-	ResolvedThemes.clear();
+	themeResolver.clearResolvedThemes();
 	AttachedThemes.clear();
 }
-
 //#endregion
 export { cleanUpResolvedThemes };
+
 //# sourceMappingURL=cleanUpResolvedThemes.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"cleanUpResolvedThemes.js","names":[],"sources":["../../../src/highlighter/themes/cleanUpResolvedThemes.ts"],"sourcesContent":["import { AttachedThemes, ResolvedThemes } from './constants';\n\nexport function cleanUpResolvedThemes(): void {\n  ResolvedThemes.clear();\n  AttachedThemes.clear();\n}\n"],"mappings":";;;AAEA,SAAgB,wBAA8B;AAC5C,gBAAe,OAAO;AACtB,gBAAe,OAAO"}
+{"version":3,"file":"cleanUpResolvedThemes.js","names":[],"sources":["../../../src/highlighter/themes/cleanUpResolvedThemes.ts"],"sourcesContent":["import { AttachedThemes } from './constants';\nimport { themeResolver } from './themeResolver';\n\n// Clears the resolved-theme cache (and any in-flight loads) plus the set of\n// themes attached to the highlighter. Registered loaders are intentionally\n// preserved, so previously registered custom/pierre/bundled themes can be\n// resolved again without re-registering.\nexport function cleanUpResolvedThemes(): void {\n  themeResolver.clearResolvedThemes();\n  AttachedThemes.clear();\n}\n"],"mappings":";;;AAOA,SAAgB,wBAA8B;CAC5C,cAAc,oBAAoB;CAClC,eAAe,MAAM;AACvB"}

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

@@ -1,11 +1,5 @@
-import { DiffsThemeNames } from "../../types.js";
-import { ThemeRegistration, ThemeRegistrationResolved } from "shiki";
-
 //#region src/highlighter/themes/constants.d.ts
-declare const ResolvedThemes: Map<DiffsThemeNames, ThemeRegistrationResolved>;
-declare const ResolvingThemes: Map<DiffsThemeNames, Promise<ThemeRegistrationResolved>>;
-declare const RegisteredCustomThemes: Map<string, () => Promise<ThemeRegistrationResolved | ThemeRegistration>>;
 declare const AttachedThemes: Set<string>;
 //#endregion
-export { AttachedThemes, RegisteredCustomThemes, ResolvedThemes, ResolvingThemes };
+export { AttachedThemes };
 //# sourceMappingURL=constants.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","names":["ThemeRegistration","ThemeRegistrationResolved","DiffsThemeNames","ResolvedThemes","Map","ResolvingThemes","Promise","RegisteredCustomThemes","AttachedThemes","Set"],"sources":["../../../src/highlighter/themes/constants.d.ts"],"sourcesContent":["import type { ThemeRegistration, ThemeRegistrationResolved } from 'shiki';\nimport type { DiffsThemeNames } from '../../types';\nexport declare const ResolvedThemes: Map<DiffsThemeNames, ThemeRegistrationResolved>;\nexport declare const ResolvingThemes: Map<DiffsThemeNames, Promise<ThemeRegistrationResolved>>;\nexport declare const RegisteredCustomThemes: Map<string, () => Promise<ThemeRegistrationResolved | ThemeRegistration>>;\nexport declare const AttachedThemes: Set<string>;\n//# sourceMappingURL=constants.d.ts.map"],"mappings":";;;;cAEqBG,gBAAgBC,IAAIF,iBAAiBD;cACrCI,iBAAiBD,IAAIF,iBAAiBI,QAAQL;AAD9CE,cAEAI,sBAF+D,EAEvCH,GAFuC,CAAA,MAAA,EAAA,GAAA,GAErBE,OAFqB,CAEbL,yBAFa,GAEeD,iBAFf,CAAA,CAAA;AAA3CE,cAGpBM,cAHoBN,EAGJO,GAHIP,CAAAA,MAAAA,CAAAA"}
+{"version":3,"file":"constants.d.ts","names":[],"sources":["../../../src/highlighter/themes/constants.ts"],"mappings":";cAIa,cAAA,EAAgB,GAAG"}

package/dist/highlighter/themes/constants.js

@@ -1,9 +1,6 @@
 //#region src/highlighter/themes/constants.ts
-const ResolvedThemes = /* @__PURE__ */ new Map();
-const ResolvingThemes = /* @__PURE__ */ new Map();
-const RegisteredCustomThemes = /* @__PURE__ */ new Map();
 const AttachedThemes = /* @__PURE__ */ new Set();
-
 //#endregion
-export { AttachedThemes, RegisteredCustomThemes, ResolvedThemes, ResolvingThemes };
+export { AttachedThemes };
+
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","names":["ResolvedThemes: Map<DiffsThemeNames, ThemeRegistrationResolved>","ResolvingThemes: Map<\n  DiffsThemeNames,\n  Promise<ThemeRegistrationResolved>\n>","RegisteredCustomThemes: Map<\n  string,\n  () => Promise<ThemeRegistrationResolved | ThemeRegistration>\n>","AttachedThemes: Set<string>"],"sources":["../../../src/highlighter/themes/constants.ts"],"sourcesContent":["import type { ThemeRegistration, ThemeRegistrationResolved } from 'shiki';\n\nimport type { DiffsThemeNames } from '../../types';\n\nexport const ResolvedThemes: Map<DiffsThemeNames, ThemeRegistrationResolved> =\n  new Map();\n\nexport const ResolvingThemes: Map<\n  DiffsThemeNames,\n  Promise<ThemeRegistrationResolved>\n> = new Map();\n\nexport const RegisteredCustomThemes: Map<\n  string,\n  () => Promise<ThemeRegistrationResolved | ThemeRegistration>\n> = new Map();\n\nexport const AttachedThemes: Set<string> = new Set();\n"],"mappings":";AAIA,MAAaA,iCACX,IAAI,KAAK;AAEX,MAAaC,kCAGT,IAAI,KAAK;AAEb,MAAaC,yCAGT,IAAI,KAAK;AAEb,MAAaC,iCAA8B,IAAI,KAAK"}
+{"version":3,"file":"constants.js","names":[],"sources":["../../../src/highlighter/themes/constants.ts"],"sourcesContent":["// Names of themes that have been loaded into the active highlighter via\n// loadThemeSync. This is the highlighter-attachment concern, kept separate from\n// the resolved-theme cache in the diffs theme resolver. Cleared by\n// cleanUpResolvedThemes when the highlighter is disposed.\nexport const AttachedThemes: Set<string> = new Set();\n"],"mappings":";AAIA,MAAa,iCAA8B,IAAI,IAAI"}

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

@@ -1 +1 @@
-{"version":3,"file":"getResolvedOrResolveTheme.d.ts","names":["DiffsThemeNames","ThemeRegistrationResolved","getResolvedOrResolveTheme","Promise"],"sources":["../../../src/highlighter/themes/getResolvedOrResolveTheme.d.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nexport declare function getResolvedOrResolveTheme(themeName: DiffsThemeNames): ThemeRegistrationResolved | Promise<ThemeRegistrationResolved>;\n//# sourceMappingURL=getResolvedOrResolveTheme.d.ts.map"],"mappings":";;;iBACwBE,yBAAAA,YAAqCF,kBAAkBC,4BAA4BE,QAAQF"}
+{"version":3,"file":"getResolvedOrResolveTheme.d.ts","names":[],"sources":["../../../src/highlighter/themes/getResolvedOrResolveTheme.ts"],"mappings":";;;iBAQgB,yBAAA,CACd,SAAA,EAAW,eAAA,GACV,yBAAA,GAA4B,OAAA,CAAQ,yBAAA"}

package/dist/highlighter/themes/getResolvedOrResolveTheme.js

@@ -1,11 +1,10 @@
-import { ResolvedThemes } from "./constants.js";
+import { themeResolver } from "./themeResolver.js";
 import { resolveTheme } from "./resolveTheme.js";
-
 //#region src/highlighter/themes/getResolvedOrResolveTheme.ts
 function getResolvedOrResolveTheme(themeName) {
-	return ResolvedThemes.get(themeName) ?? resolveTheme(themeName);
+	return themeResolver.getResolvedTheme(themeName) ?? resolveTheme(themeName);
 }
-
 //#endregion
 export { getResolvedOrResolveTheme };
+
 //# sourceMappingURL=getResolvedOrResolveTheme.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"getResolvedOrResolveTheme.js","names":[],"sources":["../../../src/highlighter/themes/getResolvedOrResolveTheme.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nimport { ResolvedThemes } from './constants';\nimport { resolveTheme } from './resolveTheme';\n\nexport function getResolvedOrResolveTheme(\n  themeName: DiffsThemeNames\n): ThemeRegistrationResolved | Promise<ThemeRegistrationResolved> {\n  return ResolvedThemes.get(themeName) ?? resolveTheme(themeName);\n}\n"],"mappings":";;;;AAIA,SAAgB,0BACd,WACgE;AAChE,QAAO,eAAe,IAAI,UAAU,IAAI,aAAa,UAAU"}
+{"version":3,"file":"getResolvedOrResolveTheme.js","names":[],"sources":["../../../src/highlighter/themes/getResolvedOrResolveTheme.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nimport { resolveTheme } from './resolveTheme';\nimport { themeResolver } from './themeResolver';\n\n// Returns the resolved theme synchronously when it is already cached, otherwise\n// kicks off (and returns the Promise for) a full resolveTheme. Uses the diffs\n// resolveTheme wrapper for the cold path so the worker guard, bundled fallback,\n// and name validation still apply.\nexport function getResolvedOrResolveTheme(\n  themeName: DiffsThemeNames\n): ThemeRegistrationResolved | Promise<ThemeRegistrationResolved> {\n  return themeResolver.getResolvedTheme(themeName) ?? resolveTheme(themeName);\n}\n"],"mappings":";;;AAQA,SAAgB,0BACd,WACgE;CAChE,OAAO,cAAc,iBAAiB,SAAS,KAAK,aAAa,SAAS;AAC5E"}

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

@@ -1 +1 @@
-{"version":3,"file":"getResolvedThemes.d.ts","names":["DiffsThemeNames","ThemeRegistrationResolved","getResolvedThemes"],"sources":["../../../src/highlighter/themes/getResolvedThemes.d.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nexport declare function getResolvedThemes(themeNames: DiffsThemeNames[]): ThemeRegistrationResolved[];\n//# sourceMappingURL=getResolvedThemes.d.ts.map"],"mappings":";;;iBACwBE,iBAAAA,aAA8BF,oBAAoBC"}
+{"version":3,"file":"getResolvedThemes.d.ts","names":[],"sources":["../../../src/highlighter/themes/getResolvedThemes.ts"],"mappings":";;;iBAMgB,iBAAA,CACd,UAAA,EAAY,eAAA,KACX,yBAAyB"}

package/dist/highlighter/themes/getResolvedThemes.js

@@ -1,16 +1,9 @@
-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
 export { getResolvedThemes };
+
 //# sourceMappingURL=getResolvedThemes.js.map

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;CAC7B,OAAO,cAAc,kBAAkB,UAAU;AACnD"}

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

@@ -1 +1 @@
-{"version":3,"file":"hasResolvedThemes.d.ts","names":["DiffsThemeNames","hasResolvedThemes"],"sources":["../../../src/highlighter/themes/hasResolvedThemes.d.ts"],"sourcesContent":["import type { DiffsThemeNames } from '../../types';\nexport declare function hasResolvedThemes(themeNames: DiffsThemeNames[]): boolean;\n//# sourceMappingURL=hasResolvedThemes.d.ts.map"],"mappings":";;;iBACwBC,iBAAAA,aAA8BD"}
+{"version":3,"file":"hasResolvedThemes.d.ts","names":[],"sources":["../../../src/highlighter/themes/hasResolvedThemes.ts"],"mappings":";;;iBAGgB,iBAAA,CAAkB,UAA6B,EAAjB,eAAe"}

package/dist/highlighter/themes/hasResolvedThemes.js

@@ -1,11 +1,9 @@
-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
 export { hasResolvedThemes };
+
 //# sourceMappingURL=hasResolvedThemes.js.map

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;CACxE,OAAO,cAAc,kBAAkB,UAAU;AACnD"}

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

@@ -1 +1 @@
-{"version":3,"file":"registerCustomCSSVariableTheme.d.ts","names":["registerCustomCSSVariableTheme","Record"],"sources":["../../../src/highlighter/themes/registerCustomCSSVariableTheme.d.ts"],"sourcesContent":["export declare function registerCustomCSSVariableTheme(name: string, variableDefaults: Record<string, string>, fontStyle?: boolean): void;\n//# sourceMappingURL=registerCustomCSSVariableTheme.d.ts.map"],"mappings":";iBAAwBA,8BAAAA,iCAA+DC"}
+{"version":3,"file":"registerCustomCSSVariableTheme.d.ts","names":[],"sources":["../../../src/highlighter/themes/registerCustomCSSVariableTheme.ts"],"mappings":";iBAKgB,8BAAA,CACd,IAAA,UACA,gBAAA,EAAkB,MAAM,kBACxB,SAAA"}

package/dist/highlighter/themes/registerCustomCSSVariableTheme.js

@@ -1,7 +1,6 @@
-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
 function registerCustomCSSVariableTheme(name, variableDefaults, fontStyle = false) {
 	const theme = createCssVariablesTheme({
@@ -12,7 +11,7 @@ function registerCustomCSSVariableTheme(name, variableDefaults, fontStyle = fals
 	});
 	registerCustomTheme(name, () => Promise.resolve(theme));
 }
-
 //#endregion
 export { registerCustomCSSVariableTheme };
+
 //# sourceMappingURL=registerCustomCSSVariableTheme.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"registerCustomCSSVariableTheme.js","names":["createCSSVariablesTheme"],"sources":["../../../src/highlighter/themes/registerCustomCSSVariableTheme.ts"],"sourcesContent":["import { createCssVariablesTheme as createCSSVariablesTheme } from 'shiki';\n\nimport { formatCSSVariablePrefix } from '../../utils/formatCSSVariablePrefix';\nimport { registerCustomTheme } from './registerCustomTheme';\n\nexport function registerCustomCSSVariableTheme(\n  name: string,\n  variableDefaults: Record<string, string>,\n  fontStyle: boolean = false\n): void {\n  const theme = createCSSVariablesTheme({\n    name,\n    variablePrefix: formatCSSVariablePrefix('global'),\n    variableDefaults,\n    fontStyle,\n  });\n  registerCustomTheme(name, () => Promise.resolve(theme));\n}\n"],"mappings":";;;;;AAKA,SAAgB,+BACd,MACA,kBACA,YAAqB,OACf;CACN,MAAM,QAAQA,wBAAwB;EACpC;EACA,gBAAgB,wBAAwB,SAAS;EACjD;EACA;EACD,CAAC;AACF,qBAAoB,YAAY,QAAQ,QAAQ,MAAM,CAAC"}
+{"version":3,"file":"registerCustomCSSVariableTheme.js","names":["createCSSVariablesTheme"],"sources":["../../../src/highlighter/themes/registerCustomCSSVariableTheme.ts"],"sourcesContent":["import { createCssVariablesTheme as createCSSVariablesTheme } from 'shiki';\n\nimport { formatCSSVariablePrefix } from '../../utils/formatCSSVariablePrefix';\nimport { registerCustomTheme } from './registerCustomTheme';\n\nexport function registerCustomCSSVariableTheme(\n  name: string,\n  variableDefaults: Record<string, string>,\n  fontStyle: boolean = false\n): void {\n  const theme = createCSSVariablesTheme({\n    name,\n    variablePrefix: formatCSSVariablePrefix('global'),\n    variableDefaults,\n    fontStyle,\n  });\n  registerCustomTheme(name, () => Promise.resolve(theme));\n}\n"],"mappings":";;;;AAKA,SAAgB,+BACd,MACA,kBACA,YAAqB,OACf;CACN,MAAM,QAAQA,wBAAwB;EACpC;EACA,gBAAgB,wBAAwB,QAAQ;EAChD;EACA;CACF,CAAC;CACD,oBAAoB,YAAY,QAAQ,QAAQ,KAAK,CAAC;AACxD"}

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":[],"sources":["../../../src/highlighter/themes/registerCustomTheme.ts"],"mappings":";;;;KAMY,iBAAA,GAAoB,WAAA,CAC9B,iBAAA,GAAoB,yBAAA;AAAA,iBAUN,mBAAA,CACd,SAAA,UACA,MAAA,EAAQ,iBAAiB"}

package/dist/highlighter/themes/registerCustomTheme.js

@@ -1,14 +1,23 @@
-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
 export { registerCustomTheme };
+
 //# sourceMappingURL=registerCustomTheme.js.map

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;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"}

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

@@ -1 +1 @@
-{"version":3,"file":"resolveTheme.d.ts","names":["DiffsThemeNames","ThemeRegistrationResolved","resolveTheme","Promise"],"sources":["../../../src/highlighter/themes/resolveTheme.d.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nexport declare function resolveTheme(themeName: DiffsThemeNames): Promise<ThemeRegistrationResolved>;\n//# sourceMappingURL=resolveTheme.d.ts.map"],"mappings":";;;iBACwBE,YAAAA,YAAwBF,kBAAkBG,QAAQF"}
+{"version":3,"file":"resolveTheme.d.ts","names":[],"sources":["../../../src/highlighter/themes/resolveTheme.ts"],"mappings":";;;iBAiBsB,YAAA,CACpB,SAAA,EAAW,eAAA,GACV,OAAA,CAAQ,yBAAA"}

package/dist/highlighter/themes/resolveTheme.js

@@ -1,35 +1,13 @@
-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
 export { resolveTheme };
+
 //# sourceMappingURL=resolveTheme.js.map

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;CACpC,uBAAuB,SAAS;CAEhC,MAAM,QAAQ,MAAM,cAAc,aAAa,SAAS;CAExD,0BAA0B,WAAW,KAAK;CAE1C,OAAO;AACT"}

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

@@ -1 +1 @@
-{"version":3,"file":"resolveThemes.d.ts","names":["DiffsThemeNames","ThemeRegistrationResolved","resolveThemes","Promise"],"sources":["../../../src/highlighter/themes/resolveThemes.d.ts"],"sourcesContent":["import type { DiffsThemeNames, ThemeRegistrationResolved } from '../../types';\nexport declare function resolveThemes(themes: DiffsThemeNames[]): Promise<ThemeRegistrationResolved[]>;\n//# sourceMappingURL=resolveThemes.d.ts.map"],"mappings":";;;iBACwBE,aAAAA,SAAsBF,oBAAoBG,QAAQF"}
+{"version":3,"file":"resolveThemes.d.ts","names":[],"sources":["../../../src/highlighter/themes/resolveThemes.ts"],"mappings":";;;iBAOsB,aAAA,CACpB,MAAA,EAAQ,eAAA,KACP,OAAA,CAAQ,yBAAA"}

package/dist/highlighter/themes/resolveThemes.js

@@ -1,21 +1,13 @@
-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;
 }
-
 //#endregion
 export { resolveThemes };
+
 //# sourceMappingURL=resolveThemes.js.map

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;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"}

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":[],"sources":["../../../src/highlighter/themes/themeResolution.ts"],"mappings":";;;iBAWgB,sBAAA,CAAuB,SAA0B,EAAf,eAAe;AAAA,iBAsBjD,yBAAA,CACd,SAAA,EAAW,eAAA,EACX,KAAA,EAAO,yBAAyB"}

package/dist/highlighter/themes/themeResolution.js

@@ -0,0 +1,21 @@
+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;CACvE,IAAI,gBAAgB,GAClB,MAAM,IAAI,MACR,UAAU,UAAU,yJAEtB;CAGF,IAAI,cAAc,mBAAmB,SAAS,GAC5C;CAEF,MAAM,aAAa,YAAY,SAAS,SAAS;CACjD,IAAI,cAAc,MAAM;EACtB,cAAc,sBACZ,WAAW,MACX,WAAW,IACb;EACA;CACF;CACA,MAAM,IAAI,MAAM,yCAAyC,UAAU,EAAE;AACvE;AAEA,SAAgB,0BACd,WACA,OACM;CACN,IAAI,MAAM,SAAS,WACjB,MAAM,IAAI,MACR,6BAA6B,UAAU,8BAA8B,MAAM,MAC7E;AAEJ"}

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

@@ -0,0 +1,8 @@
+import { ThemeRegistrationResolved } from "../../types.js";
+import { ThemeResolver } from "@pierre/theming";
+
+//#region src/highlighter/themes/themeResolver.d.ts
+declare const themeResolver: 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":[],"sources":["../../../src/highlighter/themes/themeResolver.ts"],"mappings":";;;;cAgBa,aAAA,EAAe,aAAa,CAAC,yBAAA"}

package/dist/highlighter/themes/themeResolver.js

@@ -0,0 +1,7 @@
+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, 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"}