@shikijs/core 3.18.0 → 3.19.0

package/dist/index.mjs

@@ -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 = {
@@ -1824,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)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/core",
   "type": "module",
-  "version": "3.18.0",
+  "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.18.0"
+    "@shikijs/types": "3.19.0"
   },
   "scripts": {
     "build": "unbuild",