@shikijs/core 1.0.0-beta.0 → 1.0.0-beta.1

package/dist/chunk-types.d.mts

@@ -1157,6 +1157,10 @@ interface TokenStyles {
      * 6 or 8 digit hex code representation of the token's color
      */
     color?: string;
+    /**
+     * 6 or 8 digit hex code representation of the token's background color
+     */
+    bgColor?: string;
     /**
      * Font style of token. Can be None/Italic/Bold/Underline
      */
@@ -1223,4 +1227,4 @@ interface ShikijiTransformerContext extends ShikiTransformerContext {
 interface ShikijiTransformerContextCommon extends ShikiTransformerContextCommon {
 }
 
-export { type BundledLanguageInfo as $, type AnsiLanguage as A, type BundledHighlighterOptions as B, type CodeToHastOptions as C, type ThemeRegistrationRaw as D, type Element as E, FontStyle as F, type ThemeRegistration as G, type HighlighterGeneric as H, type IGrammar as I, type ShikiTransformerContextMeta as J, type ShikiTransformerContext as K, type LanguageInput as L, type MaybeArray as M, type Nodes as N, type ShikiTransformer as O, type PlainTextLanguage as P, type HtmlRendererOptionsCommon as Q, type Root as R, type SpecialTheme as S, type ThemeInput as T, type HtmlRendererOptions as U, type ThemedTokenScopeExplanation as V, type ThemedTokenExplanation as W, type TokenBase as X, type TokenStyles as Y, type DynamicImportLanguageRegistration as Z, type DynamicImportThemeRegistration as _, type HighlighterCoreOptions as a, type BundledThemeInfo as a0, type ShikijiTransformer as a1, type ShikijiTransformerContext as a2, type ShikijiTransformerContextCommon as a3, Registry as a4, INITIAL as a5, type StateStack as a6, type IRawTheme as a7, type IGrammarConfiguration as a8, type IOnigLib as a9, type RegistryOptions as aa, type IRawThemeSetting as ab, type RequireKeys as b, type CodeToThemedTokensOptions as c, type ThemedToken as d, type CodeToTokensWithThemesOptions as e, type ThemedTokenWithVariants as f, type ShikiInternal as g, type ThemeRegistrationResolved as h, type TokenizeWithThemeOptions as i, type ShikiTransformerContextCommon as j, type RootContent as k, type ThemeRegistrationAny as l, type IRawGrammar as m, type SpecialLanguage as n, type Awaitable as o, type MaybeGetter as p, type MaybeModule as q, type StringLiteralUnion as r, type ResolveBundleKey as s, type LanguageRegistration as t, type CodeToHastOptionsCommon as u, type CodeOptionsSingleTheme as v, type CodeOptionsMultipleThemes as w, type CodeOptionsThemes as x, type CodeOptionsMeta as y, type TransformerOptions as z };
+export { type BundledLanguageInfo as $, type AnsiLanguage as A, type BundledHighlighterOptions as B, type CodeToHastOptions as C, type TransformerOptions as D, type Element as E, FontStyle as F, type ThemeRegistrationRaw as G, type HighlighterGeneric as H, type IGrammar as I, type ThemeRegistration as J, type ShikiTransformerContextMeta as K, type LanguageInput as L, type MaybeArray as M, type Nodes as N, type ShikiTransformerContext as O, type PlainTextLanguage as P, type ShikiTransformer as Q, type Root as R, type SpecialTheme as S, type ThemeInput as T, type HtmlRendererOptionsCommon as U, type ThemedTokenScopeExplanation as V, type ThemedTokenExplanation as W, type TokenBase as X, type TokenStyles as Y, type DynamicImportLanguageRegistration as Z, type DynamicImportThemeRegistration as _, type HighlighterCoreOptions as a, type BundledThemeInfo as a0, type ShikijiTransformer as a1, type ShikijiTransformerContext as a2, type ShikijiTransformerContextCommon as a3, Registry as a4, INITIAL as a5, type StateStack as a6, type IRawTheme as a7, type IGrammarConfiguration as a8, type IOnigLib as a9, type RegistryOptions as aa, type IRawThemeSetting as ab, type RequireKeys as b, type CodeToThemedTokensOptions as c, type ThemedToken as d, type CodeToTokensWithThemesOptions as e, type ThemedTokenWithVariants as f, type ShikiInternal as g, type ThemeRegistrationResolved as h, type TokenizeWithThemeOptions as i, type ShikiTransformerContextCommon as j, type HtmlRendererOptions as k, type RootContent as l, type ThemeRegistrationAny as m, type IRawGrammar as n, type SpecialLanguage as o, type Awaitable as p, type MaybeGetter as q, type MaybeModule as r, type StringLiteralUnion as s, type ResolveBundleKey as t, type LanguageRegistration as u, type CodeToHastOptionsCommon as v, type CodeOptionsSingleTheme as w, type CodeOptionsMultipleThemes as x, type CodeOptionsThemes as y, type CodeOptionsMeta as z };

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { H as HighlighterGeneric, a as HighlighterCoreOptions, B as BundledHighlighterOptions, L as LanguageInput, T as ThemeInput, C as CodeToHastOptions, R as Root, b as RequireKeys, c as CodeToThemedTokensOptions, d as ThemedToken, e as CodeToTokensWithThemesOptions, f as ThemedTokenWithVariants, M as MaybeArray, S as SpecialTheme, E as Element, g as ShikiInternal, I as IGrammar, h as ThemeRegistrationResolved, i as TokenizeWithThemeOptions, j as ShikiTransformerContextCommon, N as Nodes$1, k as RootContent$1, l as ThemeRegistrationAny } from './chunk-types.mjs';
-export { A as AnsiLanguage, o as Awaitable, $ as BundledLanguageInfo, a0 as BundledThemeInfo, y as CodeOptionsMeta, w as CodeOptionsMultipleThemes, v as CodeOptionsSingleTheme, x as CodeOptionsThemes, u as CodeToHastOptionsCommon, Z as DynamicImportLanguageRegistration, _ as DynamicImportThemeRegistration, F as FontStyle, U as HtmlRendererOptions, Q as HtmlRendererOptionsCommon, m as IRawGrammar, t as LanguageRegistration, p as MaybeGetter, q as MaybeModule, P as PlainTextLanguage, m as RawGrammar, s as ResolveBundleKey, O as ShikiTransformer, K as ShikiTransformerContext, J as ShikiTransformerContextMeta, a1 as ShikijiTransformer, a2 as ShikijiTransformerContext, a3 as ShikijiTransformerContextCommon, n as SpecialLanguage, r as StringLiteralUnion, G as ThemeRegistration, D as ThemeRegistrationRaw, W as ThemedTokenExplanation, V as ThemedTokenScopeExplanation, X as TokenBase, Y as TokenStyles, z as TransformerOptions } from './chunk-types.mjs';
+import { H as HighlighterGeneric, a as HighlighterCoreOptions, B as BundledHighlighterOptions, L as LanguageInput, T as ThemeInput, C as CodeToHastOptions, R as Root, b as RequireKeys, c as CodeToThemedTokensOptions, d as ThemedToken, e as CodeToTokensWithThemesOptions, f as ThemedTokenWithVariants, M as MaybeArray, S as SpecialTheme, E as Element, g as ShikiInternal, I as IGrammar, h as ThemeRegistrationResolved, i as TokenizeWithThemeOptions, j as ShikiTransformerContextCommon, k as HtmlRendererOptions, N as Nodes$1, l as RootContent$1, m as ThemeRegistrationAny } from './chunk-types.mjs';
+export { A as AnsiLanguage, p as Awaitable, $ as BundledLanguageInfo, a0 as BundledThemeInfo, z as CodeOptionsMeta, x as CodeOptionsMultipleThemes, w as CodeOptionsSingleTheme, y as CodeOptionsThemes, v as CodeToHastOptionsCommon, Z as DynamicImportLanguageRegistration, _ as DynamicImportThemeRegistration, F as FontStyle, U as HtmlRendererOptionsCommon, n as IRawGrammar, u as LanguageRegistration, q as MaybeGetter, r as MaybeModule, P as PlainTextLanguage, n as RawGrammar, t as ResolveBundleKey, Q as ShikiTransformer, O as ShikiTransformerContext, K as ShikiTransformerContextMeta, a1 as ShikijiTransformer, a2 as ShikijiTransformerContext, a3 as ShikijiTransformerContextCommon, o as SpecialLanguage, s as StringLiteralUnion, J as ThemeRegistration, G as ThemeRegistrationRaw, W as ThemedTokenExplanation, V as ThemedTokenScopeExplanation, X as TokenBase, Y as TokenStyles, D as TransformerOptions } from './chunk-types.mjs';
 import { L as LoadWasmOptions } from './chunk-index.mjs';
 export { l as loadWasm } from './chunk-index.mjs';
 
@@ -122,6 +122,7 @@ declare function tokenizeWithTheme(code: string, grammar: IGrammar, theme: Theme
 declare function tokenizeAnsiWithTheme(theme: ThemeRegistrationResolved, fileContents: string, options?: TokenizeWithThemeOptions): ThemedToken[][];
 
 declare function codeToHast(internal: ShikiInternal, code: string, options: CodeToHastOptions, transformerContext?: ShikiTransformerContextCommon): Root;
+declare function tokensToHast(tokens: ThemedToken[][], options: HtmlRendererOptions, transformerContext: ShikiTransformerContextCommon): Root;
 
 type FormatSmartOptions = {
   /**
@@ -360,4 +361,4 @@ declare function codeToTokensWithThemes(internal: ShikiInternal, code: string, o
  */
 declare function normalizeTheme(rawTheme: ThemeRegistrationAny): ThemeRegistrationResolved;
 
-export { BundledHighlighterOptions, CodeToHastOptions, CodeToThemedTokensOptions, CodeToTokensWithThemesOptions, type GetHighlighterFactory, IGrammar as Grammar, type HighlighterCore, HighlighterCoreOptions, HighlighterGeneric, IGrammar, LanguageInput, MaybeArray, RequireKeys, ShikiInternal, ShikiTransformerContextCommon, type ShorthandsBundle, SpecialTheme, ThemeInput, ThemeRegistrationAny, ThemeRegistrationResolved, ThemedToken, ThemedTokenWithVariants, TokenizeWithThemeOptions, addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToThemedTokens, codeToTokensWithThemes, createSingletonShorthands, createdBundledHighlighter, getHighlighterCore, getShikiInternal, toHtml as hastToHtml, isNoneTheme, isPlainLang, isPlaintext, isSpecialLang, isSpecialTheme, normalizeTheme, setDefaultWasmLoader, splitLines, splitToken, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme };
+export { BundledHighlighterOptions, CodeToHastOptions, CodeToThemedTokensOptions, CodeToTokensWithThemesOptions, type GetHighlighterFactory, IGrammar as Grammar, type HighlighterCore, HighlighterCoreOptions, HighlighterGeneric, HtmlRendererOptions, IGrammar, LanguageInput, MaybeArray, RequireKeys, ShikiInternal, ShikiTransformerContextCommon, type ShorthandsBundle, SpecialTheme, ThemeInput, ThemeRegistrationAny, ThemeRegistrationResolved, ThemedToken, ThemedTokenWithVariants, TokenizeWithThemeOptions, addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToThemedTokens, codeToTokensWithThemes, createSingletonShorthands, createdBundledHighlighter, getHighlighterCore, getShikiInternal, toHtml as hastToHtml, isNoneTheme, isPlainLang, isPlaintext, isSpecialLang, isSpecialTheme, normalizeTheme, setDefaultWasmLoader, splitLines, splitToken, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme, tokensToHast };

package/dist/index.mjs

@@ -372,10 +372,15 @@ function tokenizeAnsiWithTheme(theme, fileContents, options) {
     const parser = createAnsiSequenceParser();
     return lines.map(line => parser.parse(line[0]).map((token) => {
         let color;
-        if (token.decorations.has('reverse'))
+        let bgColor;
+        if (token.decorations.has('reverse')) {
             color = token.background ? colorPalette.value(token.background) : theme.bg;
-        else
+            bgColor = token.foreground ? colorPalette.value(token.foreground) : theme.fg;
+        }
+        else {
             color = token.foreground ? colorPalette.value(token.foreground) : theme.fg;
+            bgColor = token.background ? colorPalette.value(token.background) : undefined;
+        }
         color = applyColorReplacements(color, colorReplacements);
         if (token.decorations.has('dim'))
             color = dimColor(color);
@@ -390,6 +395,7 @@ function tokenizeAnsiWithTheme(theme, fileContents, options) {
             content: token.value,
             offset: line[1], // TODO: more accurate offset? might need to fork ansi-sequence-parser
             color,
+            bgColor,
             fontStyle,
         };
     }));
@@ -567,7 +573,6 @@ function codeToTokensWithThemes(internal, code, options) {
     const tokens = syncThemesTokenization(...themes.map(t => codeToThemedTokens(internal, code, {
         ...options,
         theme: t.theme,
-        includeExplanation: false,
     })));
     const mergedTokens = tokens[0]
         .map((line, lineIdx) => line
@@ -667,10 +672,7 @@ function codeToHast(internal, code, options, transformerContext = {
         rootStyle = defaultColor ? undefined : [fg, bg].join(';');
     }
     else if ('theme' in options) {
-        tokens = codeToThemedTokens(internal, input, {
-            ...options,
-            includeExplanation: false,
-        });
+        tokens = codeToThemedTokens(internal, input, options);
         const _theme = internal.getTheme(options.theme);
         bg = _theme.bg;
         fg = _theme.fg;
@@ -710,7 +712,8 @@ function mergeToken(merged, variantsOrder, cssVariablePrefix, defaultColor) {
                 acc[key] = value;
             }
             else {
-                const varKey = cssVariablePrefix + variantsOrder[idx] + (key === 'color' ? '' : `-${key}`);
+                const keyName = key === 'color' ? '' : key === 'background-color' ? '-bg' : `-${key}`;
+                const varKey = cssVariablePrefix + variantsOrder[idx] + (key === 'color' ? '' : keyName);
                 if (acc[key])
                     acc[key] += `;${varKey}:${value}`;
                 else
@@ -816,6 +819,8 @@ function getTokenStyleObject(token) {
     const styles = {};
     if (token.color)
         styles.color = token.color;
+    if (token.bgColor)
+        styles['background-color'] = token.bgColor;
     if (token.fontStyle) {
         if (token.fontStyle & FontStyle.Italic)
             styles['font-style'] = 'italic';
@@ -5184,4 +5189,4 @@ function createSingletonShorthands(getHighlighter) {
     };
 }
 
-export { FontStyle, addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToThemedTokens, codeToTokensWithThemes, createSingletonShorthands, createdBundledHighlighter, getHighlighterCore, getShikiInternal, toHtml as hastToHtml, isNoneTheme, isPlainLang, isPlaintext, isSpecialLang, isSpecialTheme, loadWasm, normalizeTheme, setDefaultWasmLoader, splitLines, splitToken, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme };
+export { FontStyle, addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToThemedTokens, codeToTokensWithThemes, createSingletonShorthands, createdBundledHighlighter, getHighlighterCore, getShikiInternal, toHtml as hastToHtml, isNoneTheme, isPlainLang, isPlaintext, isSpecialLang, isSpecialTheme, loadWasm, normalizeTheme, setDefaultWasmLoader, splitLines, splitToken, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme, tokensToHast };

package/dist/textmate.d.mts

@@ -1,5 +1,5 @@
 import { F as FontStyle } from './chunk-types.mjs';
-export { I as IGrammar, a8 as IGrammarConfiguration, a5 as INITIAL, a9 as IOnigLib, m as IRawGrammar, a7 as IRawTheme, ab as IRawThemeSetting, a4 as Registry, aa as RegistryOptions, a6 as StateStack } from './chunk-types.mjs';
+export { I as IGrammar, a8 as IGrammarConfiguration, a5 as INITIAL, a9 as IOnigLib, n as IRawGrammar, a7 as IRawTheme, ab as IRawThemeSetting, a4 as Registry, aa as RegistryOptions, a6 as StateStack } from './chunk-types.mjs';
 import './chunk-index.mjs';
 
 declare const enum TemporaryStandardTokenType {

package/dist/types.d.mts

@@ -1,2 +1,2 @@
-export { A as AnsiLanguage, o as Awaitable, B as BundledHighlighterOptions, $ as BundledLanguageInfo, a0 as BundledThemeInfo, y as CodeOptionsMeta, w as CodeOptionsMultipleThemes, v as CodeOptionsSingleTheme, x as CodeOptionsThemes, C as CodeToHastOptions, u as CodeToHastOptionsCommon, c as CodeToThemedTokensOptions, e as CodeToTokensWithThemesOptions, Z as DynamicImportLanguageRegistration, _ as DynamicImportThemeRegistration, F as FontStyle, I as Grammar, a as HighlighterCoreOptions, H as HighlighterGeneric, U as HtmlRendererOptions, Q as HtmlRendererOptionsCommon, I as IGrammar, m as IRawGrammar, L as LanguageInput, t as LanguageRegistration, M as MaybeArray, p as MaybeGetter, q as MaybeModule, P as PlainTextLanguage, m as RawGrammar, b as RequireKeys, s as ResolveBundleKey, g as ShikiInternal, O as ShikiTransformer, K as ShikiTransformerContext, j as ShikiTransformerContextCommon, J as ShikiTransformerContextMeta, a1 as ShikijiTransformer, a2 as ShikijiTransformerContext, a3 as ShikijiTransformerContextCommon, n as SpecialLanguage, S as SpecialTheme, r as StringLiteralUnion, T as ThemeInput, G as ThemeRegistration, l as ThemeRegistrationAny, D as ThemeRegistrationRaw, h as ThemeRegistrationResolved, d as ThemedToken, W as ThemedTokenExplanation, V as ThemedTokenScopeExplanation, f as ThemedTokenWithVariants, X as TokenBase, Y as TokenStyles, i as TokenizeWithThemeOptions, z as TransformerOptions } from './chunk-types.mjs';
+export { A as AnsiLanguage, p as Awaitable, B as BundledHighlighterOptions, $ as BundledLanguageInfo, a0 as BundledThemeInfo, z as CodeOptionsMeta, x as CodeOptionsMultipleThemes, w as CodeOptionsSingleTheme, y as CodeOptionsThemes, C as CodeToHastOptions, v as CodeToHastOptionsCommon, c as CodeToThemedTokensOptions, e as CodeToTokensWithThemesOptions, Z as DynamicImportLanguageRegistration, _ as DynamicImportThemeRegistration, F as FontStyle, I as Grammar, a as HighlighterCoreOptions, H as HighlighterGeneric, k as HtmlRendererOptions, U as HtmlRendererOptionsCommon, I as IGrammar, n as IRawGrammar, L as LanguageInput, u as LanguageRegistration, M as MaybeArray, q as MaybeGetter, r as MaybeModule, P as PlainTextLanguage, n as RawGrammar, b as RequireKeys, t as ResolveBundleKey, g as ShikiInternal, Q as ShikiTransformer, O as ShikiTransformerContext, j as ShikiTransformerContextCommon, K as ShikiTransformerContextMeta, a1 as ShikijiTransformer, a2 as ShikijiTransformerContext, a3 as ShikijiTransformerContextCommon, o as SpecialLanguage, S as SpecialTheme, s as StringLiteralUnion, T as ThemeInput, J as ThemeRegistration, m as ThemeRegistrationAny, G as ThemeRegistrationRaw, h as ThemeRegistrationResolved, d as ThemedToken, W as ThemedTokenExplanation, V as ThemedTokenScopeExplanation, f as ThemedTokenWithVariants, X as TokenBase, Y as TokenStyles, i as TokenizeWithThemeOptions, D as TransformerOptions } from './chunk-types.mjs';
 import './chunk-index.mjs';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/core",
   "type": "module",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.1",
   "description": "Core of Shiki",
   "author": "Pine Wu <octref@gmail.com>; Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -40,8 +40,8 @@
   "types": "./dist/index.d.mts",
   "typesVersions": {
     "*": {
-      "wasm": [
-        "./dist/wasm.d.mts"
+      "wasm-inlined": [
+        "./dist/wasm-inlined.d.mts"
       ],
       "types": [
         "./dist/types.d.mts"