@shikijs/core 2.4.1 → 2.5.0

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { CreatedBundledHighlighterOptions, CreateHighlighterFactory, LanguageInput, ThemeInput, HighlighterCoreOptions, CodeToHastOptions, CodeToTokensOptions, TokensResult, RequireKeys, CodeToTokensBaseOptions, ThemedToken, CodeToTokensWithThemesOptions, ThemedTokenWithVariants, BundledHighlighterOptions, HighlighterGeneric, GrammarState, Awaitable, HighlighterCore, ShikiInternal, RegexEngine, LoadWasmOptions, ShikiTransformerContextCommon, CodeToHastRenderOptions, ShikiTransformerContextSource, ThemeRegistrationResolved, TokenizeWithThemeOptions, Grammar, ThemeRegistrationAny, ThemeRegistration, ShikiTransformer, MaybeArray, PlainTextLanguage, SpecialLanguage, SpecialTheme, MaybeGetter, TokenStyles, Position } from '@shikijs/types';
+import { CreatedBundledHighlighterOptions, CreateHighlighterFactory, LanguageInput, ThemeInput, HighlighterCoreOptions, CodeToHastOptions, CodeToTokensOptions, TokensResult, RequireKeys, CodeToTokensBaseOptions, ThemedToken, CodeToTokensWithThemesOptions, ThemedTokenWithVariants, BundledHighlighterOptions, HighlighterGeneric, GrammarState, Awaitable, HighlighterCore, ShikiInternal, RegexEngine, LoadWasmOptions, ShikiTransformerContextCommon, CodeToHastRenderOptions, ShikiTransformerContextSource, ThemeRegistrationResolved, TokenizeWithThemeOptions, Grammar, ThemeRegistrationAny, ThemeRegistration, ShikiTransformer, MaybeArray, MaybeGetter, PlainTextLanguage, SpecialLanguage, SpecialTheme, Position, TokenStyles } from '@shikijs/types';
 export * from '@shikijs/types';
 import { Root, Element } from 'hast';
 import { JavaScriptRegexEngineOptions } from '@shikijs/engine-javascript';
@@ -219,11 +219,15 @@ declare function createCssVariablesTheme(options?: CssVariablesThemeOptions): Th
  */
 declare function transformerDecorations(): ShikiTransformer;
 
+declare function resolveColorReplacements(theme: ThemeRegistrationAny | string, options?: TokenizeWithThemeOptions): Record<string, string | undefined>;
+declare function applyColorReplacements(color: string, replacements?: Record<string, string | undefined>): string;
+declare function applyColorReplacements(color?: string | undefined, replacements?: Record<string, string | undefined>): string | undefined;
+
 declare function toArray<T>(x: MaybeArray<T>): T[];
 /**
- * Split a string into lines, each line preserves the line ending.
+ * Normalize a getter to a promise.
  */
-declare function splitLines(code: string, preserveEnding?: boolean): [string, number][];
+declare function normalizeGetter<T>(p: MaybeGetter<T>): Promise<T>;
 /**
  * Check if the language is plaintext that is ignored by Shiki.
  *
@@ -248,31 +252,18 @@ declare function isNoneTheme(theme: string | ThemeInput | null | undefined): the
  * Hard-coded themes: `none`.
  */
 declare function isSpecialTheme(theme: string | ThemeInput | null | undefined): theme is SpecialTheme;
+
 /**
  * Utility to append class to a hast node
  *
  * If the `property.class` is a string, it will be splitted by space and converted to an array.
  */
 declare function addClassToHast(node: Element, className: string | string[]): Element;
+
 /**
- * Split a token into multiple tokens by given offsets.
- *
- * The offsets are relative to the token, and should be sorted.
- */
-declare function splitToken<T extends Pick<ThemedToken, 'content' | 'offset'>>(token: T, offsets: number[]): T[];
-/**
- * Split 2D tokens array by given breakpoints.
- */
-declare function splitTokens<T extends Pick<ThemedToken, 'content' | 'offset'>>(tokens: T[][], breakpoints: number[] | Set<number>): T[][];
-/**
- * Normalize a getter to a promise.
+ * Split a string into lines, each line preserves the line ending.
  */
-declare function normalizeGetter<T>(p: MaybeGetter<T>): Promise<T>;
-declare function resolveColorReplacements(theme: ThemeRegistrationAny | string, options?: TokenizeWithThemeOptions): Record<string, string | undefined>;
-declare function applyColorReplacements(color: string, replacements?: Record<string, string | undefined>): string;
-declare function applyColorReplacements(color?: string | undefined, replacements?: Record<string, string | undefined>): string | undefined;
-declare function getTokenStyleObject(token: TokenStyles): Record<string, string>;
-declare function stringifyTokenStyle(token: string | Record<string, string>): string;
+declare function splitLines(code: string, preserveEnding?: boolean): [string, number][];
 /**
  * Creates a converter between index and position in a code block.
  *
@@ -290,6 +281,20 @@ declare function createPositionConverter(code: string): {
  */
 declare function guessEmbeddedLanguages(code: string, _lang: string | undefined, highlighter?: HighlighterGeneric<any, any>): string[];
 
+/**
+ * Split a token into multiple tokens by given offsets.
+ *
+ * The offsets are relative to the token, and should be sorted.
+ */
+declare function splitToken<T extends Pick<ThemedToken, 'content' | 'offset'>>(token: T, offsets: number[]): T[];
+/**
+ * Split 2D tokens array by given breakpoints.
+ */
+declare function splitTokens<T extends Pick<ThemedToken, 'content' | 'offset'>>(tokens: T[][], breakpoints: number[] | Set<number>): T[][];
+declare function flatTokenVariants(merged: ThemedTokenWithVariants, variantsOrder: string[], cssVariablePrefix: string, defaultColor: string | boolean): ThemedToken;
+declare function getTokenStyleObject(token: TokenStyles): Record<string, string>;
+declare function stringifyTokenStyle(token: string | Record<string, string>): string;
+
 type DeprecationTarget = 3;
 /**
  * Enable runtime warning for deprecated APIs, for the future versions of Shiki.
@@ -304,4 +309,4 @@ declare function enableDeprecationWarnings(emitDeprecation?: DeprecationTarget |
  */
 declare function warnDeprecated(message: string, version?: DeprecationTarget): void;
 
-export { type CreateSingletonShorthandsOptions, type CssVariablesThemeOptions, type ShorthandsBundle, addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createCssVariablesTheme, createHighlighterCore, createHighlighterCoreSync, createJavaScriptRegexEngine, createOnigurumaEngine, createPositionConverter, createShikiInternal, createShikiInternalSync, createSingletonShorthands, createWasmOnigEngine, createdBundledHighlighter, defaultJavaScriptRegexConstructor, enableDeprecationWarnings, getHighlighterCore, getShikiInternal, getSingletonHighlighterCore, getTokenStyleObject, guessEmbeddedLanguages, isNoneTheme, isPlainLang, isSpecialLang, isSpecialTheme, loadWasm, makeSingletonHighlighter, makeSingletonHighlighterCore, normalizeGetter, normalizeTheme, resolveColorReplacements, splitLines, splitToken, splitTokens, stringifyTokenStyle, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme, tokensToHast, transformerDecorations, warnDeprecated };
+export { type CreateSingletonShorthandsOptions, type CssVariablesThemeOptions, type ShorthandsBundle, addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createCssVariablesTheme, createHighlighterCore, createHighlighterCoreSync, createJavaScriptRegexEngine, createOnigurumaEngine, createPositionConverter, createShikiInternal, createShikiInternalSync, createSingletonShorthands, createWasmOnigEngine, createdBundledHighlighter, defaultJavaScriptRegexConstructor, enableDeprecationWarnings, flatTokenVariants, getHighlighterCore, getShikiInternal, getSingletonHighlighterCore, getTokenStyleObject, guessEmbeddedLanguages, isNoneTheme, isPlainLang, isSpecialLang, isSpecialTheme, loadWasm, makeSingletonHighlighter, makeSingletonHighlighterCore, normalizeGetter, normalizeTheme, resolveColorReplacements, splitLines, splitToken, splitTokens, stringifyTokenStyle, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme, tokensToHast, transformerDecorations, warnDeprecated };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { CreatedBundledHighlighterOptions, CreateHighlighterFactory, LanguageInput, ThemeInput, HighlighterCoreOptions, CodeToHastOptions, CodeToTokensOptions, TokensResult, RequireKeys, CodeToTokensBaseOptions, ThemedToken, CodeToTokensWithThemesOptions, ThemedTokenWithVariants, BundledHighlighterOptions, HighlighterGeneric, GrammarState, Awaitable, HighlighterCore, ShikiInternal, RegexEngine, LoadWasmOptions, ShikiTransformerContextCommon, CodeToHastRenderOptions, ShikiTransformerContextSource, ThemeRegistrationResolved, TokenizeWithThemeOptions, Grammar, ThemeRegistrationAny, ThemeRegistration, ShikiTransformer, MaybeArray, PlainTextLanguage, SpecialLanguage, SpecialTheme, MaybeGetter, TokenStyles, Position } from '@shikijs/types';
+import { CreatedBundledHighlighterOptions, CreateHighlighterFactory, LanguageInput, ThemeInput, HighlighterCoreOptions, CodeToHastOptions, CodeToTokensOptions, TokensResult, RequireKeys, CodeToTokensBaseOptions, ThemedToken, CodeToTokensWithThemesOptions, ThemedTokenWithVariants, BundledHighlighterOptions, HighlighterGeneric, GrammarState, Awaitable, HighlighterCore, ShikiInternal, RegexEngine, LoadWasmOptions, ShikiTransformerContextCommon, CodeToHastRenderOptions, ShikiTransformerContextSource, ThemeRegistrationResolved, TokenizeWithThemeOptions, Grammar, ThemeRegistrationAny, ThemeRegistration, ShikiTransformer, MaybeArray, MaybeGetter, PlainTextLanguage, SpecialLanguage, SpecialTheme, Position, TokenStyles } from '@shikijs/types';
 export * from '@shikijs/types';
 import { Root, Element } from 'hast';
 import { JavaScriptRegexEngineOptions } from '@shikijs/engine-javascript';
@@ -219,11 +219,15 @@ declare function createCssVariablesTheme(options?: CssVariablesThemeOptions): Th
  */
 declare function transformerDecorations(): ShikiTransformer;
 
+declare function resolveColorReplacements(theme: ThemeRegistrationAny | string, options?: TokenizeWithThemeOptions): Record<string, string | undefined>;
+declare function applyColorReplacements(color: string, replacements?: Record<string, string | undefined>): string;
+declare function applyColorReplacements(color?: string | undefined, replacements?: Record<string, string | undefined>): string | undefined;
+
 declare function toArray<T>(x: MaybeArray<T>): T[];
 /**
- * Split a string into lines, each line preserves the line ending.
+ * Normalize a getter to a promise.
  */
-declare function splitLines(code: string, preserveEnding?: boolean): [string, number][];
+declare function normalizeGetter<T>(p: MaybeGetter<T>): Promise<T>;
 /**
  * Check if the language is plaintext that is ignored by Shiki.
  *
@@ -248,31 +252,18 @@ declare function isNoneTheme(theme: string | ThemeInput | null | undefined): the
  * Hard-coded themes: `none`.
  */
 declare function isSpecialTheme(theme: string | ThemeInput | null | undefined): theme is SpecialTheme;
+
 /**
  * Utility to append class to a hast node
  *
  * If the `property.class` is a string, it will be splitted by space and converted to an array.
  */
 declare function addClassToHast(node: Element, className: string | string[]): Element;
+
 /**
- * Split a token into multiple tokens by given offsets.
- *
- * The offsets are relative to the token, and should be sorted.
- */
-declare function splitToken<T extends Pick<ThemedToken, 'content' | 'offset'>>(token: T, offsets: number[]): T[];
-/**
- * Split 2D tokens array by given breakpoints.
- */
-declare function splitTokens<T extends Pick<ThemedToken, 'content' | 'offset'>>(tokens: T[][], breakpoints: number[] | Set<number>): T[][];
-/**
- * Normalize a getter to a promise.
+ * Split a string into lines, each line preserves the line ending.
  */
-declare function normalizeGetter<T>(p: MaybeGetter<T>): Promise<T>;
-declare function resolveColorReplacements(theme: ThemeRegistrationAny | string, options?: TokenizeWithThemeOptions): Record<string, string | undefined>;
-declare function applyColorReplacements(color: string, replacements?: Record<string, string | undefined>): string;
-declare function applyColorReplacements(color?: string | undefined, replacements?: Record<string, string | undefined>): string | undefined;
-declare function getTokenStyleObject(token: TokenStyles): Record<string, string>;
-declare function stringifyTokenStyle(token: string | Record<string, string>): string;
+declare function splitLines(code: string, preserveEnding?: boolean): [string, number][];
 /**
  * Creates a converter between index and position in a code block.
  *
@@ -290,6 +281,20 @@ declare function createPositionConverter(code: string): {
  */
 declare function guessEmbeddedLanguages(code: string, _lang: string | undefined, highlighter?: HighlighterGeneric<any, any>): string[];
 
+/**
+ * Split a token into multiple tokens by given offsets.
+ *
+ * The offsets are relative to the token, and should be sorted.
+ */
+declare function splitToken<T extends Pick<ThemedToken, 'content' | 'offset'>>(token: T, offsets: number[]): T[];
+/**
+ * Split 2D tokens array by given breakpoints.
+ */
+declare function splitTokens<T extends Pick<ThemedToken, 'content' | 'offset'>>(tokens: T[][], breakpoints: number[] | Set<number>): T[][];
+declare function flatTokenVariants(merged: ThemedTokenWithVariants, variantsOrder: string[], cssVariablePrefix: string, defaultColor: string | boolean): ThemedToken;
+declare function getTokenStyleObject(token: TokenStyles): Record<string, string>;
+declare function stringifyTokenStyle(token: string | Record<string, string>): string;
+
 type DeprecationTarget = 3;
 /**
  * Enable runtime warning for deprecated APIs, for the future versions of Shiki.
@@ -304,4 +309,4 @@ declare function enableDeprecationWarnings(emitDeprecation?: DeprecationTarget |
  */
 declare function warnDeprecated(message: string, version?: DeprecationTarget): void;
 
-export { type CreateSingletonShorthandsOptions, type CssVariablesThemeOptions, type ShorthandsBundle, addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createCssVariablesTheme, createHighlighterCore, createHighlighterCoreSync, createJavaScriptRegexEngine, createOnigurumaEngine, createPositionConverter, createShikiInternal, createShikiInternalSync, createSingletonShorthands, createWasmOnigEngine, createdBundledHighlighter, defaultJavaScriptRegexConstructor, enableDeprecationWarnings, getHighlighterCore, getShikiInternal, getSingletonHighlighterCore, getTokenStyleObject, guessEmbeddedLanguages, isNoneTheme, isPlainLang, isSpecialLang, isSpecialTheme, loadWasm, makeSingletonHighlighter, makeSingletonHighlighterCore, normalizeGetter, normalizeTheme, resolveColorReplacements, splitLines, splitToken, splitTokens, stringifyTokenStyle, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme, tokensToHast, transformerDecorations, warnDeprecated };
+export { type CreateSingletonShorthandsOptions, type CssVariablesThemeOptions, type ShorthandsBundle, addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createCssVariablesTheme, createHighlighterCore, createHighlighterCoreSync, createJavaScriptRegexEngine, createOnigurumaEngine, createPositionConverter, createShikiInternal, createShikiInternalSync, createSingletonShorthands, createWasmOnigEngine, createdBundledHighlighter, defaultJavaScriptRegexConstructor, enableDeprecationWarnings, flatTokenVariants, getHighlighterCore, getShikiInternal, getSingletonHighlighterCore, getTokenStyleObject, guessEmbeddedLanguages, isNoneTheme, isPlainLang, isSpecialLang, isSpecialTheme, loadWasm, makeSingletonHighlighter, makeSingletonHighlighterCore, normalizeGetter, normalizeTheme, resolveColorReplacements, splitLines, splitToken, splitTokens, stringifyTokenStyle, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme, tokensToHast, transformerDecorations, warnDeprecated };

package/dist/index.mjs

@@ -22,20 +22,28 @@ function loadWasm(options) {
   return loadWasm$1(options);
 }
 
+function resolveColorReplacements(theme, options) {
+  const replacements = typeof theme === "string" ? {} : { ...theme.colorReplacements };
+  const themeName = typeof theme === "string" ? theme : theme.name;
+  for (const [key, value] of Object.entries(options?.colorReplacements || {})) {
+    if (typeof value === "string")
+      replacements[key] = value;
+    else if (key === themeName)
+      Object.assign(replacements, value);
+  }
+  return replacements;
+}
+function applyColorReplacements(color, replacements) {
+  if (!color)
+    return color;
+  return replacements?.[color?.toLowerCase()] || color;
+}
+
 function toArray(x) {
   return Array.isArray(x) ? x : [x];
 }
-function splitLines(code, preserveEnding = false) {
-  const parts = code.split(/(\r?\n)/g);
-  let index = 0;
-  const lines = [];
-  for (let i = 0; i < parts.length; i += 2) {
-    const line = preserveEnding ? parts[i] + (parts[i + 1] || "") : parts[i];
-    lines.push([line, index]);
-    index += parts[i].length;
-    index += parts[i + 1]?.length || 0;
-  }
-  return lines;
+async function normalizeGetter(p) {
+  return Promise.resolve(typeof p === "function" ? p() : p).then((r) => r.default || r);
 }
 function isPlainLang(lang) {
   return !lang || ["plaintext", "txt", "text", "plain"].includes(lang);
@@ -49,6 +57,7 @@ function isNoneTheme(theme) {
 function isSpecialTheme(theme) {
   return isNoneTheme(theme);
 }
+
 function addClassToHast(node, className) {
   if (!className)
     return node;
@@ -65,6 +74,68 @@ function addClassToHast(node, className) {
   }
   return node;
 }
+
+function splitLines(code, preserveEnding = false) {
+  const parts = code.split(/(\r?\n)/g);
+  let index = 0;
+  const lines = [];
+  for (let i = 0; i < parts.length; i += 2) {
+    const line = preserveEnding ? parts[i] + (parts[i + 1] || "") : parts[i];
+    lines.push([line, index]);
+    index += parts[i].length;
+    index += parts[i + 1]?.length || 0;
+  }
+  return lines;
+}
+function createPositionConverter(code) {
+  const lines = splitLines(code, true).map(([line]) => line);
+  function indexToPos(index) {
+    if (index === code.length) {
+      return {
+        line: lines.length - 1,
+        character: lines[lines.length - 1].length
+      };
+    }
+    let character = index;
+    let line = 0;
+    for (const lineText of lines) {
+      if (character < lineText.length)
+        break;
+      character -= lineText.length;
+      line++;
+    }
+    return { line, character };
+  }
+  function posToIndex(line, character) {
+    let index = 0;
+    for (let i = 0; i < line; i++)
+      index += lines[i].length;
+    index += character;
+    return index;
+  }
+  return {
+    lines,
+    indexToPos,
+    posToIndex
+  };
+}
+function guessEmbeddedLanguages(code, _lang, highlighter) {
+  const langs = /* @__PURE__ */ new Set();
+  for (const match of code.matchAll(/lang=["']([\w-]+)["']/g)) {
+    langs.add(match[1]);
+  }
+  for (const match of code.matchAll(/(?:```|~~~)([\w-]+)/g)) {
+    langs.add(match[1]);
+  }
+  for (const match of code.matchAll(/\\begin\{([\w-]+)\}/g)) {
+    langs.add(match[1]);
+  }
+  if (!highlighter)
+    return Array.from(langs);
+  const bundle = highlighter.getBundledLanguages();
+  return Array.from(langs).filter((l) => l && bundle[l]);
+}
+
 function splitToken(token, offsets) {
   let lastOffset = 0;
   const tokens = [];
@@ -100,24 +171,29 @@ function splitTokens(tokens, breakpoints) {
     });
   });
 }
-async function normalizeGetter(p) {
-  return Promise.resolve(typeof p === "function" ? p() : p).then((r) => r.default || r);
-}
-function resolveColorReplacements(theme, options) {
-  const replacements = typeof theme === "string" ? {} : { ...theme.colorReplacements };
-  const themeName = typeof theme === "string" ? theme : theme.name;
-  for (const [key, value] of Object.entries(options?.colorReplacements || {})) {
-    if (typeof value === "string")
-      replacements[key] = value;
-    else if (key === themeName)
-      Object.assign(replacements, value);
-  }
-  return replacements;
-}
-function applyColorReplacements(color, replacements) {
-  if (!color)
-    return color;
-  return replacements?.[color?.toLowerCase()] || color;
+function flatTokenVariants(merged, variantsOrder, cssVariablePrefix, defaultColor) {
+  const token = {
+    content: merged.content,
+    explanation: merged.explanation,
+    offset: merged.offset
+  };
+  const styles = variantsOrder.map((t) => getTokenStyleObject(merged.variants[t]));
+  const styleKeys = new Set(styles.flatMap((t) => Object.keys(t)));
+  const mergedStyles = {};
+  styles.forEach((cur, idx) => {
+    for (const key of styleKeys) {
+      const value = cur[key] || "inherit";
+      if (idx === 0 && defaultColor) {
+        mergedStyles[key] = value;
+      } else {
+        const keyName = key === "color" ? "" : key === "background-color" ? "-bg" : `-${key}`;
+        const varKey = cssVariablePrefix + variantsOrder[idx] + (key === "color" ? "" : keyName);
+        mergedStyles[varKey] = value;
+      }
+    }
+  });
+  token.htmlStyle = mergedStyles;
+  return token;
 }
 function getTokenStyleObject(token) {
   const styles = {};
@@ -140,61 +216,6 @@ function stringifyTokenStyle(token) {
     return token;
   return Object.entries(token).map(([key, value]) => `${key}:${value}`).join(";");
 }
-function createPositionConverter(code) {
-  const lines = splitLines(code, true).map(([line]) => line);
-  function indexToPos(index) {
-    if (index === code.length) {
-      return {
-        line: lines.length - 1,
-        character: lines[lines.length - 1].length
-      };
-    }
-    let character = index;
-    let line = 0;
-    for (const lineText of lines) {
-      if (character < lineText.length)
-        break;
-      character -= lineText.length;
-      line++;
-    }
-    return { line, character };
-  }
-  function posToIndex(line, character) {
-    let index = 0;
-    for (let i = 0; i < line; i++)
-      index += lines[i].length;
-    index += character;
-    return index;
-  }
-  return {
-    lines,
-    indexToPos,
-    posToIndex
-  };
-}
-function guessEmbeddedLanguages(code, _lang, highlighter) {
-  const langs = /* @__PURE__ */ new Set();
-  for (const match of code.matchAll(/lang=["']([\w-]+)["']/g)) {
-    langs.add(match[1]);
-  }
-  for (const match of code.matchAll(/(?:```|~~~)([\w-]+)/g)) {
-    langs.add(match[1]);
-  }
-  for (const match of code.matchAll(/\\begin\{([\w-]+)\}/g)) {
-    langs.add(match[1]);
-  }
-  if (!highlighter)
-    return Array.from(langs);
-  const bundle = highlighter.getBundledLanguages();
-  return Array.from(langs).filter((l) => l && bundle[l]);
-}
-
-class ShikiError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "ShikiError";
-  }
-}
 
 const _grammarStateMap = /* @__PURE__ */ new WeakMap();
 function setLastGrammarStateToMap(keys, state) {
@@ -282,7 +303,7 @@ function getScopes(stack) {
 }
 function getGrammarStack(state, theme) {
   if (!(state instanceof GrammarState))
-    throw new ShikiError("Invalid grammar state");
+    throw new ShikiError$1("Invalid grammar state");
   return state.getInternalStack(theme);
 }
 
@@ -293,7 +314,7 @@ function transformerDecorations() {
       let normalizePosition = function(p) {
         if (typeof p === "number") {
           if (p < 0 || p > shiki.source.length)
-            throw new ShikiError(`Invalid decoration offset: ${p}. Code length: ${shiki.source.length}`);
+            throw new ShikiError$1(`Invalid decoration offset: ${p}. Code length: ${shiki.source.length}`);
           return {
             ...converter.indexToPos(p),
             offset: p
@@ -301,9 +322,9 @@ function transformerDecorations() {
         } else {
           const line = converter.lines[p.line];
           if (line === void 0)
-            throw new ShikiError(`Invalid decoration position ${JSON.stringify(p)}. Lines length: ${converter.lines.length}`);
+            throw new ShikiError$1(`Invalid decoration position ${JSON.stringify(p)}. Lines length: ${converter.lines.length}`);
           if (p.character < 0 || p.character > line.length)
-            throw new ShikiError(`Invalid decoration position ${JSON.stringify(p)}. Line ${p.line} length: ${line.length}`);
+            throw new ShikiError$1(`Invalid decoration position ${JSON.stringify(p)}. Line ${p.line} length: ${line.length}`);
           return {
             ...p,
             offset: converter.posToIndex(p.line, p.character)
@@ -341,7 +362,7 @@ function transformerDecorations() {
       const ctx = getContext(this);
       const lines = Array.from(codeEl.children).filter((i) => i.type === "element" && i.tagName === "span");
       if (lines.length !== ctx.converter.lines.length)
-        throw new ShikiError(`Number of lines in code element (${lines.length}) does not match the number of lines in the source (${ctx.converter.lines.length}). Failed to apply decorations.`);
+        throw new ShikiError$1(`Number of lines in code element (${lines.length}) does not match the number of lines in the source (${ctx.converter.lines.length}). Failed to apply decorations.`);
       function applyLineSection(line, start, end, decoration) {
         const lineEl = lines[line];
         let text = "";
@@ -363,9 +384,9 @@ function transformerDecorations() {
           }
         }
         if (startIndex === -1)
-          throw new ShikiError(`Failed to find start index for decoration ${JSON.stringify(decoration.start)}`);
+          throw new ShikiError$1(`Failed to find start index for decoration ${JSON.stringify(decoration.start)}`);
         if (endIndex === -1)
-          throw new ShikiError(`Failed to find end index for decoration ${JSON.stringify(decoration.end)}`);
+          throw new ShikiError$1(`Failed to find end index for decoration ${JSON.stringify(decoration.end)}`);
         const children = lineEl.children.slice(startIndex, endIndex);
         if (!decoration.alwaysWrap && children.length === lineEl.children.length) {
           applyDecoration(lineEl, decoration, "line");
@@ -420,7 +441,7 @@ function verifyIntersections(items) {
   for (let i = 0; i < items.length; i++) {
     const foo = items[i];
     if (foo.start.offset > foo.end.offset)
-      throw new ShikiError(`Invalid decoration range: ${JSON.stringify(foo.start)} - ${JSON.stringify(foo.end)}`);
+      throw new ShikiError$1(`Invalid decoration range: ${JSON.stringify(foo.start)} - ${JSON.stringify(foo.end)}`);
     for (let j = i + 1; j < items.length; j++) {
       const bar = items[j];
       const isFooHasBarStart = foo.start.offset <= bar.start.offset && bar.start.offset < foo.end.offset;
@@ -432,7 +453,7 @@ function verifyIntersections(items) {
           continue;
         if (isBarHasFooStart && isBarHasFooEnd)
           continue;
-        throw new ShikiError(`Decorations ${JSON.stringify(foo.start)} and ${JSON.stringify(bar.start)} intersect.`);
+        throw new ShikiError$1(`Decorations ${JSON.stringify(foo.start)} and ${JSON.stringify(bar.start)} intersect.`);
       }
     }
   }
@@ -1114,7 +1135,7 @@ function codeToTokens(internal, code, options) {
       throw new ShikiError$1(`\`themes\` option must contain the defaultColor key \`${defaultColor}\``);
     const themeRegs = themes.map((t) => internal.getTheme(t.theme));
     const themesOrder = themes.map((t) => t.color);
-    tokens = themeTokens.map((line) => line.map((token) => mergeToken(token, themesOrder, cssVariablePrefix, defaultColor)));
+    tokens = themeTokens.map((line) => line.map((token) => flatTokenVariants(token, themesOrder, cssVariablePrefix, defaultColor)));
     if (grammarState)
       setLastGrammarStateToMap(tokens, grammarState);
     const themeColorReplacements = themes.map((t) => resolveColorReplacements(t.theme, options));
@@ -1146,30 +1167,6 @@ function codeToTokens(internal, code, options) {
     grammarState
   };
 }
-function mergeToken(merged, variantsOrder, cssVariablePrefix, defaultColor) {
-  const token = {
-    content: merged.content,
-    explanation: merged.explanation,
-    offset: merged.offset
-  };
-  const styles = variantsOrder.map((t) => getTokenStyleObject(merged.variants[t]));
-  const styleKeys = new Set(styles.flatMap((t) => Object.keys(t)));
-  const mergedStyles = {};
-  styles.forEach((cur, idx) => {
-    for (const key of styleKeys) {
-      const value = cur[key] || "inherit";
-      if (idx === 0 && defaultColor) {
-        mergedStyles[key] = value;
-      } else {
-        const keyName = key === "color" ? "" : key === "background-color" ? "-bg" : `-${key}`;
-        const varKey = cssVariablePrefix + variantsOrder[idx] + (key === "color" ? "" : keyName);
-        mergedStyles[varKey] = value;
-      }
-    }
-  });
-  token.htmlStyle = mergedStyles;
-  return token;
-}
 
 function codeToHast(internal, code, options, transformerContext = {
   meta: {},
@@ -1528,6 +1525,13 @@ async function resolveThemes(themes) {
   return resolved.filter((i) => !!i);
 }
 
+class ShikiError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "ShikiError";
+  }
+}
+
 class Registry extends Registry$1 {
   constructor(_resolver, _themes, _langs, _alias = {}) {
     super(_resolver);
@@ -2262,4 +2266,4 @@ function createCssVariablesTheme(options = {}) {
   return theme;
 }
 
-export { addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createCssVariablesTheme, createHighlighterCore, createHighlighterCoreSync, createJavaScriptRegexEngine, createOnigurumaEngine, createPositionConverter, createShikiInternal, createShikiInternalSync, createSingletonShorthands, createWasmOnigEngine, createdBundledHighlighter, defaultJavaScriptRegexConstructor, getHighlighterCore, getShikiInternal, getSingletonHighlighterCore, getTokenStyleObject, guessEmbeddedLanguages, isNoneTheme, isPlainLang, isSpecialLang, isSpecialTheme, loadWasm, makeSingletonHighlighter, makeSingletonHighlighterCore, normalizeGetter, normalizeTheme, resolveColorReplacements, splitLines, splitToken, splitTokens, stringifyTokenStyle, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme, tokensToHast, transformerDecorations, warnDeprecated };
+export { addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createCssVariablesTheme, createHighlighterCore, createHighlighterCoreSync, createJavaScriptRegexEngine, createOnigurumaEngine, createPositionConverter, createShikiInternal, createShikiInternalSync, createSingletonShorthands, createWasmOnigEngine, createdBundledHighlighter, defaultJavaScriptRegexConstructor, flatTokenVariants, getHighlighterCore, getShikiInternal, getSingletonHighlighterCore, getTokenStyleObject, guessEmbeddedLanguages, isNoneTheme, isPlainLang, isSpecialLang, isSpecialTheme, loadWasm, makeSingletonHighlighter, makeSingletonHighlighterCore, normalizeGetter, normalizeTheme, resolveColorReplacements, splitLines, splitToken, splitTokens, stringifyTokenStyle, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme, tokensToHast, transformerDecorations, warnDeprecated };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/core",
   "type": "module",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "description": "Core of Shiki",
   "author": "Pine Wu <octref@gmail.com>; Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -63,9 +63,9 @@
     "@shikijs/vscode-textmate": "^10.0.2",
     "@types/hast": "^3.0.4",
     "hast-util-to-html": "^9.0.4",
-    "@shikijs/engine-javascript": "2.4.1",
-    "@shikijs/engine-oniguruma": "2.4.1",
-    "@shikijs/types": "2.4.1"
+    "@shikijs/engine-oniguruma": "2.5.0",
+    "@shikijs/types": "2.5.0",
+    "@shikijs/engine-javascript": "2.5.0"
   },
   "scripts": {
     "build": "unbuild",