@shikijs/core 1.2.2 → 1.2.3

package/dist/index.d.mts

@@ -112,6 +112,7 @@ declare function splitToken<T extends Pick<ThemedToken, 'content' | 'offset'>>(t
  */
 declare function splitTokens<T extends Pick<ThemedToken, 'content' | 'offset'>>(tokens: T[][], breakpoints: number[] | Set<number>): T[][];
 declare function applyColorReplacements(color: string, replacements?: Record<string, string>): string;
+declare function applyColorReplacements(color?: string | undefined, replacements?: Record<string, string>): string | undefined;
 declare function getTokenStyleObject(token: TokenStyles): Record<string, string>;
 declare function stringifyTokenStyle(token: Record<string, string>): string;
 /**

package/dist/index.mjs

@@ -122,6 +122,8 @@ function splitTokens(tokens, breakpoints) {
     });
 }
 function applyColorReplacements(color, replacements) {
+    if (!color)
+        return color;
     return replacements?.[color?.toLowerCase()] || color;
 }
 function getTokenStyleObject(token) {
@@ -458,6 +460,7 @@ function tokenizeAnsiWithTheme(theme, fileContents, options) {
             bgColor = token.background ? colorPalette.value(token.background) : undefined;
         }
         color = applyColorReplacements(color, colorReplacements);
+        bgColor = applyColorReplacements(bgColor, colorReplacements);
         if (token.decorations.has('dim'))
             color = dimColor(color);
         let fontStyle = FontStyle.None;
@@ -563,13 +566,12 @@ function tokenizeWithTheme(code, grammar, theme, colorMap, options) {
             if (startIndex === nextStartIndex)
                 continue;
             const metadata = result.tokens[2 * j + 1];
-            const foreground = StackElementMetadata.getForeground(metadata);
-            const foregroundColor = applyColorReplacements(colorMap[foreground], colorReplacements);
+            const color = applyColorReplacements(colorMap[StackElementMetadata.getForeground(metadata)], colorReplacements);
             const fontStyle = StackElementMetadata.getFontStyle(metadata);
             const token = {
                 content: line.substring(startIndex, nextStartIndex),
                 offset: lineOffset + startIndex,
-                color: foregroundColor,
+                color,
                 fontStyle,
             };
             if (options.includeExplanation) {
@@ -748,7 +750,7 @@ function codeToTokens(internal, code, options) {
     let themeName;
     let rootStyle;
     if ('themes' in options) {
-        const { defaultColor = 'light', cssVariablePrefix = '--shiki-', } = options;
+        const { defaultColor = 'light', cssVariablePrefix = '--shiki-', colorReplacements, } = options;
         const themes = Object.entries(options.themes)
             .filter(i => i[1])
             .map(i => ({ color: i[0], theme: i[1] }))
@@ -762,16 +764,21 @@ function codeToTokens(internal, code, options) {
         const themesOrder = themes.map(t => t.color);
         tokens = themeTokens
             .map(line => line.map(token => mergeToken(token, themesOrder, cssVariablePrefix, defaultColor)));
-        fg = themes.map((t, idx) => (idx === 0 && defaultColor ? '' : `${cssVariablePrefix + t.color}:`) + (themeRegs[idx].fg || 'inherit')).join(';');
-        bg = themes.map((t, idx) => (idx === 0 && defaultColor ? '' : `${cssVariablePrefix + t.color}-bg:`) + (themeRegs[idx].bg || 'inherit')).join(';');
+        fg = themes.map((t, idx) => (idx === 0 && defaultColor
+            ? ''
+            : `${cssVariablePrefix + t.color}:`) + (applyColorReplacements(themeRegs[idx].fg, colorReplacements) || 'inherit')).join(';');
+        bg = themes.map((t, idx) => (idx === 0 && defaultColor
+            ? ''
+            : `${cssVariablePrefix + t.color}-bg:`) + (applyColorReplacements(themeRegs[idx].bg, colorReplacements) || 'inherit')).join(';');
         themeName = `shiki-themes ${themeRegs.map(t => t.name).join(' ')}`;
         rootStyle = defaultColor ? undefined : [fg, bg].join(';');
     }
     else if ('theme' in options) {
+        const { colorReplacements, } = options;
         tokens = codeToTokensBase(internal, code, options);
         const _theme = internal.getTheme(options.theme);
-        bg = _theme.bg;
-        fg = _theme.fg;
+        bg = applyColorReplacements(_theme.bg, colorReplacements);
+        fg = applyColorReplacements(_theme.fg, colorReplacements);
         themeName = _theme.name;
     }
     else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/core",
   "type": "module",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Core of Shiki",
   "author": "Pine Wu <octref@gmail.com>; Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",