@shikijs/core 3.15.0 → 3.17.0

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.
@@ -272,5 +276,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

@@ -1386,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") {
@@ -1395,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)
@@ -1769,8 +1810,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));
     }
   }
@@ -1991,7 +2033,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;
@@ -2117,6 +2159,7 @@ function createSingletonShorthands(createHighlighter, config) {
     }
   };
 }
+const createdBundledHighlighter = createBundledHighlighter;
 
 function createCssVariablesTheme(options = {}) {
   const {
@@ -2353,4 +2396,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.15.0",
+  "version": "3.17.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.15.0"
+    "@shikijs/types": "3.17.0"
   },
   "scripts": {
     "build": "unbuild",