@shikijs/core 3.14.0 → 3.16.0

package/dist/index.mjs

@@ -778,17 +778,35 @@ function createColorPalette(namedColorsMap = defaultNamedColorsMap) {
   };
 }
 
+const defaultAnsiColors = {
+  black: "#000000",
+  red: "#cd3131",
+  green: "#0DBC79",
+  yellow: "#E5E510",
+  blue: "#2472C8",
+  magenta: "#BC3FBC",
+  cyan: "#11A8CD",
+  white: "#E5E5E5",
+  brightBlack: "#666666",
+  brightRed: "#F14C4C",
+  brightGreen: "#23D18B",
+  brightYellow: "#F5F543",
+  brightBlue: "#3B8EEA",
+  brightMagenta: "#D670D6",
+  brightCyan: "#29B8DB",
+  brightWhite: "#FFFFFF"
+};
 function tokenizeAnsiWithTheme(theme, fileContents, options) {
   const colorReplacements = resolveColorReplacements(theme, options);
   const lines = splitLines(fileContents);
-  const colorPalette = createColorPalette(
-    Object.fromEntries(
-      namedColors.map((name) => [
-        name,
-        theme.colors?.[`terminal.ansi${name[0].toUpperCase()}${name.substring(1)}`]
-      ])
-    )
+  const ansiPalette = Object.fromEntries(
+    namedColors.map((name) => {
+      const key = `terminal.ansi${name[0].toUpperCase()}${name.substring(1)}`;
+      const themeColor = theme.colors?.[key];
+      return [name, themeColor || defaultAnsiColors[name]];
+    })
   );
+  const colorPalette = createColorPalette(ansiPalette);
   const parser = createAnsiSequenceParser();
   return lines.map(
     (line) => parser.parse(line[0]).map((token) => {
@@ -826,7 +844,7 @@ function tokenizeAnsiWithTheme(theme, fileContents, options) {
   );
 }
 function dimColor(color) {
-  const hexMatch = color.match(/#([0-9a-f]{3})([0-9a-f]{3})?([0-9a-f]{2})?/);
+  const hexMatch = color.match(/#([0-9a-f]{3})([0-9a-f]{3})?([0-9a-f]{2})?/i);
   if (hexMatch) {
     if (hexMatch[3]) {
       const alpha = Math.round(Number.parseInt(hexMatch[3], 16) / 2).toString(16).padStart(2, "0");
@@ -1368,6 +1386,8 @@ function tokensToHast(tokens, options, transformerContext, grammarState = getLas
         lineNode = transformer?.line?.call(context, lineNode, idx + 1) || lineNode;
       lineNodes.push(lineNode);
       lines.push(lineNode);
+    } else if (structure === "inline") {
+      lineNodes.push(lineNode);
     }
   });
   if (structure === "classic") {
@@ -1377,6 +1397,45 @@ function tokensToHast(tokens, options, transformerContext, grammarState = getLas
     for (const transformer of transformers)
       preNode = transformer?.pre?.call(context, preNode) || preNode;
     root.children.push(preNode);
+  } else if (structure === "inline") {
+    const syntheticLines = [];
+    let currentLine = {
+      type: "element",
+      tagName: "span",
+      properties: { class: "line" },
+      children: []
+    };
+    for (const child of root.children) {
+      if (child.type === "element" && child.tagName === "br") {
+        syntheticLines.push(currentLine);
+        currentLine = {
+          type: "element",
+          tagName: "span",
+          properties: { class: "line" },
+          children: []
+        };
+      } else if (child.type === "element" || child.type === "text") {
+        currentLine.children.push(child);
+      }
+    }
+    syntheticLines.push(currentLine);
+    const syntheticCode = {
+      type: "element",
+      tagName: "code",
+      properties: {},
+      children: syntheticLines
+    };
+    let transformedCode = syntheticCode;
+    for (const transformer of transformers)
+      transformedCode = transformer?.code?.call(context, transformedCode) || transformedCode;
+    root.children = [];
+    for (let i = 0; i < transformedCode.children.length; i++) {
+      if (i > 0)
+        root.children.push({ type: "element", tagName: "br", properties: {}, children: [] });
+      const line = transformedCode.children[i];
+      if (line.type === "element")
+        root.children.push(...line.children);
+    }
   }
   let result = root;
   for (const transformer of transformers)
@@ -2033,10 +2092,15 @@ function makeSingletonHighlighter(createHighlighter) {
     if (!_shiki) {
       _shiki = createHighlighter({
         ...options,
-        themes: options.themes || [],
-        langs: options.langs || []
+        themes: [],
+        langs: []
       });
-      return _shiki;
+      const s = await _shiki;
+      await Promise.all([
+        s.loadTheme(...options.themes || []),
+        s.loadLanguage(...options.langs || [])
+      ]);
+      return s;
     } else {
       const s = await _shiki;
       await Promise.all([

package/package.json

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