@shikijs/core 3.17.1 → 3.19.0

package/dist/index.mjs

@@ -889,15 +889,15 @@ function dimColor(color) {
 
 function codeToTokensBase(internal, code, options = {}) {
   const {
-    lang = "text",
     theme: themeName = internal.getLoadedThemes()[0]
   } = options;
+  const lang = internal.resolveLangAlias(options.lang || "text");
   if (isPlainLang(lang) || isNoneTheme(themeName))
     return splitLines(code).map((line) => [{ content: line[0], offset: line[1] }]);
   const { theme, colorMap } = internal.setTheme(themeName);
   if (lang === "ansi")
     return tokenizeAnsiWithTheme(theme, code, options);
-  const _grammar = internal.getLanguage(lang);
+  const _grammar = internal.getLanguage(options.lang || "text");
   if (options.grammarState) {
     if (options.grammarState.lang !== _grammar.name) {
       throw new ShikiError$1(`Grammar state language "${options.grammarState.lang}" does not match highlight language "${_grammar.name}"`);
@@ -1306,7 +1306,7 @@ function codeToHast(internal, code, options, transformerContext = {
       fg,
       bg,
       themeName,
-      rootStyle
+      rootStyle: options.rootStyle === false ? false : options.rootStyle ?? rootStyle
     },
     contextSource,
     grammarState
@@ -1323,21 +1323,25 @@ function tokensToHast(tokens, options, transformerContext, grammarState = getLas
     structure = "classic",
     tabindex = "0"
   } = options;
+  const properties = {
+    class: `shiki ${options.themeName || ""}`
+  };
+  if (options.rootStyle !== false) {
+    if (options.rootStyle != null)
+      properties.style = options.rootStyle;
+    else
+      properties.style = `background-color:${options.bg};color:${options.fg}`;
+  }
+  if (tabindex !== false && tabindex != null)
+    properties.tabindex = tabindex.toString();
+  for (const [key, value] of Object.entries(options.meta || {})) {
+    if (!key.startsWith("_"))
+      properties[key] = value;
+  }
   let preNode = {
     type: "element",
     tagName: "pre",
-    properties: {
-      class: `shiki ${options.themeName || ""}`,
-      style: options.rootStyle || `background-color:${options.bg};color:${options.fg}`,
-      ...tabindex !== false && tabindex != null ? {
-        tabindex: tabindex.toString()
-      } : {},
-      ...Object.fromEntries(
-        Array.from(
-          Object.entries(options.meta || {})
-        ).filter(([key]) => !key.startsWith("_"))
-      )
-    },
+    properties,
     children: []
   };
   let codeNode = {
@@ -1474,12 +1478,12 @@ function mergeWhitespaceTokens(tokens) {
   return tokens.map((line) => {
     const newLine = [];
     let carryOnContent = "";
-    let firstOffset = 0;
+    let firstOffset;
     line.forEach((token, idx) => {
       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)
+        if (firstOffset === void 0)
           firstOffset = token.offset;
         carryOnContent += token.content;
       } else {
@@ -1499,7 +1503,7 @@ function mergeWhitespaceTokens(tokens) {
               token
             );
           }
-          firstOffset = 0;
+          firstOffset = void 0;
           carryOnContent = "";
         } else {
           newLine.push(token);
@@ -1711,6 +1715,21 @@ class ShikiError extends Error {
   }
 }
 
+function resolveLangAlias(name, alias) {
+  if (!alias)
+    return name;
+  if (alias[name]) {
+    const resolved = /* @__PURE__ */ new Set([name]);
+    while (alias[name]) {
+      name = alias[name];
+      if (resolved.has(name))
+        throw new ShikiError(`Circular alias \`${Array.from(resolved).join(" -> ")} -> ${name}\``);
+      resolved.add(name);
+    }
+  }
+  return name;
+}
+
 class Registry extends Registry$1 {
   constructor(_resolver, _themes, _langs, _alias = {}) {
     super(_resolver);
@@ -1761,15 +1780,7 @@ class Registry extends Registry$1 {
     this._syncRegistry.setTheme(textmateTheme);
   }
   getGrammar(name) {
-    if (this._alias[name]) {
-      const resolved = /* @__PURE__ */ new Set([name]);
-      while (this._alias[name]) {
-        name = this._alias[name];
-        if (resolved.has(name))
-          throw new ShikiError(`Circular alias \`${Array.from(resolved).join(" -> ")} -> ${name}\``);
-        resolved.add(name);
-      }
-    }
+    name = resolveLangAlias(name, this._alias);
     return this._resolvedGrammars.get(name);
   }
   loadLanguage(lang) {
@@ -1817,7 +1828,12 @@ class Registry extends Registry$1 {
     const langsGraphArray = Array.from(this._langGraph.entries());
     const missingLangs = langsGraphArray.filter(([_, lang]) => !lang);
     if (missingLangs.length) {
-      const dependents = langsGraphArray.filter(([_, lang]) => lang && lang.embeddedLangs?.some((l) => missingLangs.map(([name]) => name).includes(l))).filter((lang) => !missingLangs.includes(lang));
+      const dependents = langsGraphArray.filter(([_, lang]) => {
+        if (!lang)
+          return false;
+        const embedded = lang.embeddedLanguages || lang.embeddedLangs;
+        return embedded?.some((l) => missingLangs.map(([name]) => name).includes(l));
+      }).filter((lang) => !missingLangs.includes(lang));
       throw new ShikiError(`Missing languages ${missingLangs.map(([name]) => `\`${name}\``).join(", ")}, required by ${dependents.map(([name]) => `\`${name}\``).join(", ")}`);
     }
     for (const [_, lang] of langsGraphArray)
@@ -1905,6 +1921,9 @@ function createShikiInternalSync(options) {
   const resolver = new Resolver(options.engine, langs);
   const _registry = new Registry(resolver, themes, langs, options.langAlias);
   let _lastTheme;
+  function resolveLangAlias$1(name) {
+    return resolveLangAlias(name, options.langAlias);
+  }
   function getLanguage(name) {
     ensureNotDisposed();
     const _lang = _registry.getGrammar(typeof name === "string" ? name : name.name);
@@ -1976,6 +1995,7 @@ function createShikiInternalSync(options) {
     getLanguage,
     getLoadedThemes,
     getLoadedLanguages,
+    resolveLangAlias: resolveLangAlias$1,
     loadLanguage,
     loadLanguageSync,
     loadTheme,
@@ -2066,9 +2086,9 @@ function createBundledHighlighter(options) {
   async function createHighlighter(options2) {
     function resolveLang(lang) {
       if (typeof lang === "string") {
+        lang = options2.langAlias?.[lang] || lang;
         if (isSpecialLang(lang))
           return [];
-        lang = options2.langAlias?.[lang] || lang;
         const bundle = bundledLanguages[lang];
         if (!bundle)
           throw new ShikiError$1(`Language \`${lang}\` is not included in this bundle. You may want to load it from external source.`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/core",
   "type": "module",
-  "version": "3.17.1",
+  "version": "3.19.0",
   "description": "Core of Shiki",
   "author": "Pine Wu <octref@gmail.com>; Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -32,6 +32,13 @@
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.mts",
+  "typesVersions": {
+    "*": {
+      "types": [
+        "./dist/types.d.mts"
+      ]
+    }
+  },
   "files": [
     "dist"
   ],
@@ -39,7 +46,7 @@
     "@shikijs/vscode-textmate": "^10.0.2",
     "@types/hast": "^3.0.4",
     "hast-util-to-html": "^9.0.5",
-    "@shikijs/types": "3.17.1"
+    "@shikijs/types": "3.19.0"
   },
   "scripts": {
     "build": "unbuild",