@shikijs/core 3.16.0 → 3.17.1

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { CreatedBundledHighlighterOptions, CreateHighlighterFactory, CodeToHastOptions, CodeToTokensOptions, TokensResult, RequireKeys, CodeToTokensBaseOptions, ThemedToken, CodeToTokensWithThemesOptions, ThemedTokenWithVariants, BundledHighlighterOptions, HighlighterGeneric, GrammarState, Awaitable, HighlighterCoreOptions, HighlighterCore, ShikiInternal, ShikiTransformerContextCommon, CodeToHastRenderOptions, ShikiTransformerContextSource, ThemeRegistrationResolved, TokenizeWithThemeOptions, Grammar, ThemeRegistrationAny, ThemeRegistration, ShikiTransformer, MaybeArray, MaybeGetter, PlainTextLanguage, SpecialLanguage, ThemeInput, SpecialTheme, Position, CodeOptionsMultipleThemes, TokenStyles } from '@shikijs/types';
+import { CreateBundledHighlighterOptions, CreateHighlighterFactory, CodeToHastOptions, CodeToTokensOptions, TokensResult, RequireKeys, CodeToTokensBaseOptions, ThemedToken, CodeToTokensWithThemesOptions, ThemedTokenWithVariants, BundledHighlighterOptions, HighlighterGeneric, GrammarState, Awaitable, HighlighterCoreOptions, HighlighterCore, ShikiInternal, ShikiTransformerContextCommon, CodeToHastRenderOptions, ShikiTransformerContextSource, ThemeRegistrationResolved, TokenizeWithThemeOptions, Grammar, ThemeRegistrationAny, ThemeRegistration, ShikiTransformer, MaybeArray, MaybeGetter, PlainTextLanguage, SpecialLanguage, ThemeInput, SpecialTheme, Position, CodeOptionsMultipleThemes, TokenStyles } from '@shikijs/types';
 export * from '@shikijs/types';
 import { Root, Element } from 'hast';
 import { toHtml } from 'hast-util-to-html';
@@ -8,7 +8,7 @@ import { toHtml } from 'hast-util-to-html';
  *
  * @example
  * ```ts
- * const createHighlighter = createdBundledHighlighter({
+ * const createHighlighter = createBundledHighlighter({
  *   langs: {
  *     typescript: () => import('@shikijs/langs/typescript'),
  *     // ...
@@ -23,7 +23,7 @@ import { toHtml } from 'hast-util-to-html';
  *
  * @param options
  */
-declare function createdBundledHighlighter<BundledLangs extends string, BundledThemes extends string>(options: CreatedBundledHighlighterOptions<BundledLangs, BundledThemes>): CreateHighlighterFactory<BundledLangs, BundledThemes>;
+declare function createBundledHighlighter<BundledLangs extends string, BundledThemes extends string>(options: CreateBundledHighlighterOptions<BundledLangs, BundledThemes>): CreateHighlighterFactory<BundledLangs, BundledThemes>;
 interface ShorthandsBundle<L extends string, T extends string> {
     /**
      * Shorthand for `codeToHtml` with auto-loaded theme and language.
@@ -78,6 +78,10 @@ interface CreateSingletonShorthandsOptions<L extends string, T extends string> {
     guessEmbeddedLanguages?: (code: string, lang: string | undefined, highlighter: HighlighterGeneric<L, T>) => Awaitable<string[] | undefined>;
 }
 declare function createSingletonShorthands<L extends string, T extends string>(createHighlighter: CreateHighlighterFactory<L, T>, config?: CreateSingletonShorthandsOptions<L, T>): ShorthandsBundle<L, T>;
+/**
+ * @deprecated Use `createBundledHighlighter` instead.
+ */
+declare const createdBundledHighlighter: typeof createBundledHighlighter;
 
 /**
  * Create a Shiki core highlighter instance, with no languages or themes bundled.
@@ -225,6 +229,19 @@ declare function addClassToHast(node: Element, className: string | string[]): El
 
 /**
  * Split a string into lines, each line preserves the line ending.
+ *
+ * @param code - The code string to split into lines
+ * @param preserveEnding - Whether to preserve line endings in the result
+ * @returns Array of tuples containing [line content, offset index]
+ *
+ * @example
+ * ```ts
+ * splitLines('hello\nworld', false)
+ * // => [['hello', 0], ['world', 6]]
+ *
+ * splitLines('hello\nworld', true)
+ * // => [['hello\n', 0], ['world', 6]]
+ * ```
  */
 declare function splitLines(code: string, preserveEnding?: boolean): [string, number][];
 /**
@@ -241,6 +258,20 @@ declare function createPositionConverter(code: string): {
  * Guess embedded languages from given code and highlighter.
  *
  * When highlighter is provided, only bundled languages will be included.
+ *
+ * @param code - The code string to analyze
+ * @param _lang - The primary language of the code (currently unused)
+ * @param highlighter - Optional highlighter instance to validate languages
+ * @returns Array of detected language identifiers
+ *
+ * @example
+ * ```ts
+ * // Detects 'javascript' from Vue SFC
+ * guessEmbeddedLanguages('<script lang="javascript">')
+ *
+ * // Detects 'python' from markdown code block
+ * guessEmbeddedLanguages('```python\nprint("hi")\n```')
+ * ```
  */
 declare function guessEmbeddedLanguages(code: string, _lang: string | undefined, highlighter?: HighlighterGeneric<any, any>): string[];
 
@@ -272,5 +303,5 @@ declare function enableDeprecationWarnings(emitDeprecation?: DeprecationTarget |
  */
 declare function warnDeprecated(message: string, version?: DeprecationTarget): void;
 
-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 { addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createBundledHighlighter, 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

@@ -57,6 +57,9 @@ function addClassToHast(node, className) {
 }
 
 function splitLines(code, preserveEnding = false) {
+  if (code.length === 0) {
+    return [["", 0]];
+  }
   const parts = code.split(/(\r?\n)/g);
   let index = 0;
   const lines = [];
@@ -102,14 +105,26 @@ function createPositionConverter(code) {
 }
 function guessEmbeddedLanguages(code, _lang, highlighter) {
   const langs = /* @__PURE__ */ new Set();
-  for (const match of code.matchAll(/lang=["']([\w-]+)["']/g)) {
-    langs.add(match[1]);
+  for (const match of code.matchAll(/:?lang=["']([^"']+)["']/g)) {
+    const lang = match[1].toLowerCase().trim();
+    if (lang)
+      langs.add(lang);
   }
   for (const match of code.matchAll(/(?:```|~~~)([\w-]+)/g)) {
-    langs.add(match[1]);
+    const lang = match[1].toLowerCase().trim();
+    if (lang)
+      langs.add(lang);
   }
   for (const match of code.matchAll(/\\begin\{([\w-]+)\}/g)) {
-    langs.add(match[1]);
+    const lang = match[1].toLowerCase().trim();
+    if (lang)
+      langs.add(lang);
+  }
+  for (const match of code.matchAll(/<script\s+(?:type|lang)=["']([^"']+)["']/gi)) {
+    const fullType = match[1].toLowerCase().trim();
+    const lang = fullType.includes("/") ? fullType.split("/").pop() : fullType;
+    if (lang)
+      langs.add(lang);
   }
   if (!highlighter)
     return Array.from(langs);
@@ -844,15 +859,26 @@ function tokenizeAnsiWithTheme(theme, fileContents, options) {
   );
 }
 function dimColor(color) {
-  const hexMatch = color.match(/#([0-9a-f]{3})([0-9a-f]{3})?([0-9a-f]{2})?/i);
+  const hexMatch = color.match(/#([0-9a-f]{3,8})/i);
   if (hexMatch) {
-    if (hexMatch[3]) {
-      const alpha = Math.round(Number.parseInt(hexMatch[3], 16) / 2).toString(16).padStart(2, "0");
-      return `#${hexMatch[1]}${hexMatch[2]}${alpha}`;
-    } else if (hexMatch[2]) {
-      return `#${hexMatch[1]}${hexMatch[2]}80`;
-    } else {
-      return `#${Array.from(hexMatch[1]).map((x) => `${x}${x}`).join("")}80`;
+    const hex = hexMatch[1];
+    if (hex.length === 8) {
+      const alpha = Math.round(Number.parseInt(hex.slice(6, 8), 16) / 2).toString(16).padStart(2, "0");
+      return `#${hex.slice(0, 6)}${alpha}`;
+    } else if (hex.length === 6) {
+      return `#${hex}80`;
+    } else if (hex.length === 4) {
+      const r = hex[0];
+      const g = hex[1];
+      const b = hex[2];
+      const a = hex[3];
+      const alpha = Math.round(Number.parseInt(`${a}${a}`, 16) / 2).toString(16).padStart(2, "0");
+      return `#${r}${r}${g}${g}${b}${b}${alpha}`;
+    } else if (hex.length === 3) {
+      const r = hex[0];
+      const g = hex[1];
+      const b = hex[2];
+      return `#${r}${r}${g}${g}${b}${b}80`;
     }
   }
   const cssVarMatch = color.match(/var\((--[\w-]+-ansi-[\w-]+)\)/);
@@ -1810,8 +1836,9 @@ class Registry extends Registry$1 {
   resolveEmbeddedLanguages(lang) {
     this._langMap.set(lang.name, lang);
     this._langGraph.set(lang.name, lang);
-    if (lang.embeddedLangs) {
-      for (const embeddedLang of lang.embeddedLangs)
+    const embedded = lang.embeddedLanguages ?? lang.embeddedLangs;
+    if (embedded) {
+      for (const embeddedLang of embedded)
         this._langGraph.set(embeddedLang, this._langMap.get(embeddedLang));
     }
   }
@@ -2032,7 +2059,7 @@ function makeSingletonHighlighterCore(createHighlighter) {
 }
 const getSingletonHighlighterCore = /* @__PURE__ */ makeSingletonHighlighterCore(createHighlighterCore);
 
-function createdBundledHighlighter(options) {
+function createBundledHighlighter(options) {
   const bundledLanguages = options.langs;
   const bundledThemes = options.themes;
   const engine = options.engine;
@@ -2158,6 +2185,7 @@ function createSingletonShorthands(createHighlighter, config) {
     }
   };
 }
+const createdBundledHighlighter = createBundledHighlighter;
 
 function createCssVariablesTheme(options = {}) {
   const {
@@ -2394,4 +2422,4 @@ function createCssVariablesTheme(options = {}) {
   return theme;
 }
 
-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 { addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createBundledHighlighter, 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 };

package/package.json

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