@shikijs/core 3.2.1 → 3.3.0

package/dist/index.d.mts

@@ -272,4 +272,5 @@ 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, createPositionConverter, createShikiInternal, createShikiInternalSync, createSingletonShorthands, createdBundledHighlighter, enableDeprecationWarnings, flatTokenVariants, getSingletonHighlighterCore, getTokenStyleObject, guessEmbeddedLanguages, hastToHtml, isNoneTheme, isPlainLang, isSpecialLang, isSpecialTheme, 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, createPositionConverter, createShikiInternal, createShikiInternalSync, createSingletonShorthands, createdBundledHighlighter, enableDeprecationWarnings, flatTokenVariants, getSingletonHighlighterCore, getTokenStyleObject, guessEmbeddedLanguages, hastToHtml, isNoneTheme, isPlainLang, isSpecialLang, isSpecialTheme, makeSingletonHighlighter, makeSingletonHighlighterCore, normalizeGetter, normalizeTheme, resolveColorReplacements, splitLines, splitToken, splitTokens, stringifyTokenStyle, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme, tokensToHast, transformerDecorations, warnDeprecated };
+export type { CreateSingletonShorthandsOptions, CssVariablesThemeOptions, ShorthandsBundle };

package/dist/index.mjs

@@ -187,8 +187,13 @@ function getTokenStyleObject(token) {
       styles["font-style"] = "italic";
     if (token.fontStyle & FontStyle.Bold)
       styles["font-weight"] = "bold";
+    const decorations = [];
     if (token.fontStyle & FontStyle.Underline)
-      styles["text-decoration"] = "underline";
+      decorations.push("underline");
+    if (token.fontStyle & FontStyle.Strikethrough)
+      decorations.push("line-through");
+    if (decorations.length)
+      styles["text-decoration"] = decorations.join(" ");
   }
   return styles;
 }
@@ -760,6 +765,8 @@ function tokenizeAnsiWithTheme(theme, fileContents, options) {
         fontStyle |= FontStyle.Italic;
       if (token.decorations.has("underline"))
         fontStyle |= FontStyle.Underline;
+      if (token.decorations.has("strikethrough"))
+        fontStyle |= FontStyle.Strikethrough;
       return {
         content: token.value,
         offset: line[1],
@@ -1160,12 +1167,16 @@ function codeToHast(internal, code, options, transformerContext = {
     grammarState
   } = codeToTokens(internal, input, options);
   const {
-    mergeWhitespaces = true
+    mergeWhitespaces = true,
+    mergeSameStyleTokens = false
   } = options;
   if (mergeWhitespaces === true)
     tokens = mergeWhitespaceTokens(tokens);
   else if (mergeWhitespaces === "never")
     tokens = splitWhitespaceTokens(tokens);
+  if (mergeSameStyleTokens) {
+    tokens = mergeAdjacentStyledTokens(tokens);
+  }
   const contextSource = {
     ...transformerContext,
     get source() {
@@ -1310,8 +1321,8 @@ function mergeWhitespaceTokens(tokens) {
     let carryOnContent = "";
     let firstOffset = 0;
     line.forEach((token, idx) => {
-      const isUnderline = token.fontStyle && token.fontStyle & FontStyle.Underline;
-      const couldMerge = !isUnderline;
+      const isDecorated = token.fontStyle && (token.fontStyle & FontStyle.Underline || token.fontStyle & FontStyle.Strikethrough);
+      const couldMerge = !isDecorated;
       if (couldMerge && token.content.match(/^\s+$/) && line[idx + 1]) {
         if (!firstOffset)
           firstOffset = token.offset;
@@ -1375,6 +1386,28 @@ function splitWhitespaceTokens(tokens) {
     });
   });
 }
+function mergeAdjacentStyledTokens(tokens) {
+  return tokens.map((line) => {
+    const newLine = [];
+    for (const token of line) {
+      if (newLine.length === 0) {
+        newLine.push({ ...token });
+        continue;
+      }
+      const prevToken = newLine[newLine.length - 1];
+      const prevStyle = prevToken.htmlStyle || stringifyTokenStyle(getTokenStyleObject(prevToken));
+      const currentStyle = token.htmlStyle || stringifyTokenStyle(getTokenStyleObject(token));
+      const isPrevDecorated = prevToken.fontStyle && (prevToken.fontStyle & FontStyle.Underline || prevToken.fontStyle & FontStyle.Strikethrough);
+      const isDecorated = token.fontStyle && (token.fontStyle & FontStyle.Underline || token.fontStyle & FontStyle.Strikethrough);
+      if (!isPrevDecorated && !isDecorated && prevStyle === currentStyle) {
+        prevToken.content += token.content;
+      } else {
+        newLine.push({ ...token });
+      }
+    }
+    return newLine;
+  });
+}
 
 const hastToHtml = toHtml;
 function codeToHtml(internal, code, options) {

package/package.json

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