shiki 3.2.2 → 3.4.0

package/dist/bundle-full.d.mts

@@ -1,4 +1,4 @@
-import { R as Root } from './types/index.d.mjs';
+import * as hast from 'hast';
 import * as _shikijs_types from '@shikijs/types';
 import { HighlighterGeneric } from '@shikijs/types';
 import { BundledLanguage } from './langs.mjs';
@@ -20,12 +20,12 @@ type Highlighter = HighlighterGeneric<BundledLanguage, BundledTheme>;
  */
 declare const createHighlighter: _shikijs_types.CreateHighlighterFactory<BundledLanguage, BundledTheme>;
 declare const codeToHtml: (code: string, options: _shikijs_types.CodeToHastOptions<BundledLanguage, BundledTheme>) => Promise<string>;
-declare const codeToHast: (code: string, options: _shikijs_types.CodeToHastOptions<BundledLanguage, BundledTheme>) => Promise<Root>;
+declare const codeToHast: (code: string, options: _shikijs_types.CodeToHastOptions<BundledLanguage, BundledTheme>) => Promise<hast.Root>;
 declare const codeToTokens: (code: string, options: _shikijs_types.CodeToTokensOptions<BundledLanguage, BundledTheme>) => Promise<_shikijs_types.TokensResult>;
 declare const codeToTokensBase: (code: string, options: _shikijs_types.RequireKeys<_shikijs_types.CodeToTokensBaseOptions<BundledLanguage, BundledTheme>, "theme" | "lang">) => Promise<_shikijs_types.ThemedToken[][]>;
 declare const codeToTokensWithThemes: (code: string, options: _shikijs_types.RequireKeys<_shikijs_types.CodeToTokensWithThemesOptions<BundledLanguage, BundledTheme>, "lang" | "themes">) => Promise<_shikijs_types.ThemedTokenWithVariants[][]>;
 declare const getSingletonHighlighter: (options?: Partial<_shikijs_types.BundledHighlighterOptions<BundledLanguage, BundledTheme>> | undefined) => Promise<HighlighterGeneric<BundledLanguage, BundledTheme>>;
-declare const getLastGrammarState: ((element: _shikijs_types.ThemedToken[][] | Root) => _shikijs_types.GrammarState) | ((code: string, options: _shikijs_types.CodeToTokensBaseOptions<BundledLanguage, BundledTheme>) => Promise<_shikijs_types.GrammarState>);
+declare const getLastGrammarState: ((element: _shikijs_types.ThemedToken[][] | hast.Root) => _shikijs_types.GrammarState) | ((code: string, options: _shikijs_types.CodeToTokensBaseOptions<BundledLanguage, BundledTheme>) => Promise<_shikijs_types.GrammarState>);
 
 export { BundledLanguage, BundledTheme, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getLastGrammarState, getSingletonHighlighter };
 export type { Highlighter };

package/dist/bundle-web.d.mts

@@ -1,4 +1,4 @@
-import { R as Root } from './types/index.d.mjs';
+import * as hast from 'hast';
 import * as _shikijs_types from '@shikijs/types';
 import { BundledLanguageInfo, DynamicImportLanguageRegistration, HighlighterGeneric } from '@shikijs/types';
 import { BundledTheme } from './themes.mjs';
@@ -28,12 +28,12 @@ type Highlighter = HighlighterGeneric<BundledLanguage, BundledTheme>;
  */
 declare const createHighlighter: _shikijs_types.CreateHighlighterFactory<BundledLanguage, BundledTheme>;
 declare const codeToHtml: (code: string, options: _shikijs_types.CodeToHastOptions<BundledLanguage, BundledTheme>) => Promise<string>;
-declare const codeToHast: (code: string, options: _shikijs_types.CodeToHastOptions<BundledLanguage, BundledTheme>) => Promise<Root>;
+declare const codeToHast: (code: string, options: _shikijs_types.CodeToHastOptions<BundledLanguage, BundledTheme>) => Promise<hast.Root>;
 declare const codeToTokensBase: (code: string, options: _shikijs_types.RequireKeys<_shikijs_types.CodeToTokensBaseOptions<BundledLanguage, BundledTheme>, "theme" | "lang">) => Promise<_shikijs_types.ThemedToken[][]>;
 declare const codeToTokens: (code: string, options: _shikijs_types.CodeToTokensOptions<BundledLanguage, BundledTheme>) => Promise<_shikijs_types.TokensResult>;
 declare const codeToTokensWithThemes: (code: string, options: _shikijs_types.RequireKeys<_shikijs_types.CodeToTokensWithThemesOptions<BundledLanguage, BundledTheme>, "lang" | "themes">) => Promise<_shikijs_types.ThemedTokenWithVariants[][]>;
 declare const getSingletonHighlighter: (options?: Partial<_shikijs_types.BundledHighlighterOptions<BundledLanguage, BundledTheme>> | undefined) => Promise<HighlighterGeneric<BundledLanguage, BundledTheme>>;
-declare const getLastGrammarState: ((element: _shikijs_types.ThemedToken[][] | Root) => _shikijs_types.GrammarState) | ((code: string, options: _shikijs_types.CodeToTokensBaseOptions<BundledLanguage, BundledTheme>) => Promise<_shikijs_types.GrammarState>);
+declare const getLastGrammarState: ((element: _shikijs_types.ThemedToken[][] | hast.Root) => _shikijs_types.GrammarState) | ((code: string, options: _shikijs_types.CodeToTokensBaseOptions<BundledLanguage, BundledTheme>) => Promise<_shikijs_types.GrammarState>);
 
 export { BundledTheme, bundledLanguages, bundledLanguagesAlias, bundledLanguagesBase, bundledLanguagesInfo, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getLastGrammarState, getSingletonHighlighter };
 export type { BundledLanguage, Highlighter };

package/dist/core-unwasm.d.mts

@@ -1,493 +1 @@
-import { ShikiInternal, CodeToHastOptions, ShikiTransformerContextCommon, CodeToTokensOptions, TokensResult, CodeToTokensBaseOptions, ThemedToken, CodeToTokensWithThemesOptions, ThemedTokenWithVariants, ThemeRegistration, HighlighterCoreOptions, HighlighterCore, Position, CreateHighlighterFactory, HighlighterGeneric, Awaitable, RequireKeys, BundledHighlighterOptions, GrammarState, CreatedBundledHighlighterOptions, TokenStyles, ThemeInput, PlainTextLanguage, SpecialLanguage, SpecialTheme, MaybeGetter, ThemeRegistrationAny, ThemeRegistrationResolved, TokenizeWithThemeOptions, MaybeArray, Grammar, CodeToHastRenderOptions, ShikiTransformerContextSource, ShikiTransformer } from '@shikijs/types';
-export * from '@shikijs/types';
-import { a as RootContent, N as Nodes, E as Element, R as Root } from './types/index.d.mjs';
-
-type FormatSmartOptions = {
-    /**
-     * Prefer named character references (`&`) where possible.
-     */
-    useNamedReferences?: boolean;
-    /**
-     * Prefer the shortest possible reference, if that results in less bytes.
-     * **Note**: `useNamedReferences` can be omitted when using `useShortestReferences`.
-     */
-    useShortestReferences?: boolean;
-    /**
-     * Whether to omit semicolons when possible.
-     * **Note**: This creates what HTML calls “parse errors” but is otherwise still valid HTML — don’t use this except when building a minifier.
-     * Omitting semicolons is possible for certain named and numeric references in some cases.
-     */
-    omitOptionalSemicolons?: boolean;
-    /**
-     * Create character references which don’t fail in attributes.
-     * **Note**: `attribute` only applies when operating dangerously with
-     * `omitOptionalSemicolons: true`.
-     */
-    attribute?: boolean;
-};
-
-type CoreOptions = {
-    /**
-     * Whether to only escape the given subset of characters.
-     */
-    subset?: ReadonlyArray<string>;
-    /**
-     * Whether to only escape possibly dangerous characters.
-     * Those characters are `"`, `&`, `'`, `<`, `>`, and `` ` ``.
-     */
-    escapeOnly?: boolean;
-};
-
-type Options$2 = CoreOptions & FormatSmartOptions;
-
-type Options$1 = Options$2;
-
-/**
- * Serialize hast as HTML.
- *
- * @param {Array<RootContent> | Nodes} tree
- *   Tree to serialize.
- * @param {Options | null | undefined} [options]
- *   Configuration (optional).
- * @returns {string}
- *   Serialized HTML.
- */
-declare function toHtml(tree: Array<RootContent> | Nodes, options?: Options | null | undefined): string;
-type CharacterReferences = Omit<Options$1, "attribute" | "escapeOnly" | "subset">;
-/**
- * Configuration.
- */
-type Options = {
-    /**
-     * Do not encode some characters which cause XSS vulnerabilities in older
-     * browsers (default: `false`).
-     *
-     * > ⚠️ **Danger**: only set this if you completely trust the content.
-     */
-    allowDangerousCharacters?: boolean | null | undefined;
-    /**
-     * Allow `raw` nodes and insert them as raw HTML (default: `false`).
-     *
-     * When `false`, `Raw` nodes are encoded.
-     *
-     * > ⚠️ **Danger**: only set this if you completely trust the content.
-     */
-    allowDangerousHtml?: boolean | null | undefined;
-    /**
-     * Do not encode characters which cause parse errors (even though they work),
-     * to save bytes (default: `false`).
-     *
-     * Not used in the SVG space.
-     *
-     * > 👉 **Note**: intentionally creates parse errors in markup (how parse
-     * > errors are handled is well defined, so this works but isn’t pretty).
-     */
-    allowParseErrors?: boolean | null | undefined;
-    /**
-     * Use “bogus comments” instead of comments to save byes: `<?charlie>`
-     * instead of `<!--charlie-->` (default: `false`).
-     *
-     * > 👉 **Note**: intentionally creates parse errors in markup (how parse
-     * > errors are handled is well defined, so this works but isn’t pretty).
-     */
-    bogusComments?: boolean | null | undefined;
-    /**
-     * Configure how to serialize character references (optional).
-     */
-    characterReferences?: CharacterReferences | null | undefined;
-    /**
-     * Close SVG elements without any content with slash (`/`) on the opening tag
-     * instead of an end tag: `<circle />` instead of `<circle></circle>`
-     * (default: `false`).
-     *
-     * See `tightSelfClosing` to control whether a space is used before the
-     * slash.
-     *
-     * Not used in the HTML space.
-     */
-    closeEmptyElements?: boolean | null | undefined;
-    /**
-     * Close self-closing nodes with an extra slash (`/`): `<img />` instead of
-     * `<img>` (default: `false`).
-     *
-     * See `tightSelfClosing` to control whether a space is used before the
-     * slash.
-     *
-     * Not used in the SVG space.
-     */
-    closeSelfClosing?: boolean | null | undefined;
-    /**
-     * Collapse empty attributes: get `class` instead of `class=""` (default:
-     * `false`).
-     *
-     * Not used in the SVG space.
-     *
-     * > 👉 **Note**: boolean attributes (such as `hidden`) are always collapsed.
-     */
-    collapseEmptyAttributes?: boolean | null | undefined;
-    /**
-     * Omit optional opening and closing tags (default: `false`).
-     *
-     * For example, in `<ol><li>one</li><li>two</li></ol>`, both `</li>` closing
-     * tags can be omitted.
-     * The first because it’s followed by another `li`, the last because it’s
-     * followed by nothing.
-     *
-     * Not used in the SVG space.
-     */
-    omitOptionalTags?: boolean | null | undefined;
-    /**
-     * Leave attributes unquoted if that results in less bytes (default: `false`).
-     *
-     * Not used in the SVG space.
-     */
-    preferUnquoted?: boolean | null | undefined;
-    /**
-     * Use the other quote if that results in less bytes (default: `false`).
-     */
-    quoteSmart?: boolean | null | undefined;
-    /**
-     * Preferred quote to use (default: `'"'`).
-     */
-    quote?: Quote | null | undefined;
-    /**
-     * When an `<svg>` element is found in the HTML space, this package already
-     * automatically switches to and from the SVG space when entering and exiting
-     * it (default: `'html'`).
-     *
-     * > 👉 **Note**: hast is not XML.
-     * > It supports SVG as embedded in HTML.
-     * > It does not support the features available in XML.
-     * > Passing SVG might break but fragments of modern SVG should be fine.
-     * > Use [`xast`][xast] if you need to support SVG as XML.
-     */
-    space?: Space | null | undefined;
-    /**
-     * Join attributes together, without whitespace, if possible: get
-     * `class="a b"title="c d"` instead of `class="a b" title="c d"` to save
-     * bytes (default: `false`).
-     *
-     * Not used in the SVG space.
-     *
-     * > 👉 **Note**: intentionally creates parse errors in markup (how parse
-     * > errors are handled is well defined, so this works but isn’t pretty).
-     */
-    tightAttributes?: boolean | null | undefined;
-    /**
-     * Join known comma-separated attribute values with just a comma (`,`),
-     * instead of padding them on the right as well (`,␠`, where `␠` represents a
-     * space) (default: `false`).
-     */
-    tightCommaSeparatedLists?: boolean | null | undefined;
-    /**
-     * Drop unneeded spaces in doctypes: `<!doctypehtml>` instead of
-     * `<!doctype html>` to save bytes (default: `false`).
-     *
-     * > 👉 **Note**: intentionally creates parse errors in markup (how parse
-     * > errors are handled is well defined, so this works but isn’t pretty).
-     */
-    tightDoctype?: boolean | null | undefined;
-    /**
-     * Do not use an extra space when closing self-closing elements: `<img/>`
-     * instead of `<img />` (default: `false`).
-     *
-     * > 👉 **Note**: only used if `closeSelfClosing: true` or
-     * > `closeEmptyElements: true`.
-     */
-    tightSelfClosing?: boolean | null | undefined;
-    /**
-     * Use a `<!DOCTYPE…` instead of `<!doctype…` (default: `false`).
-     *
-     * Useless except for XHTML.
-     */
-    upperDoctype?: boolean | null | undefined;
-    /**
-     * Tag names of elements to serialize without closing tag (default: `html-void-elements`).
-     *
-     * Not used in the SVG space.
-     *
-     * > 👉 **Note**: It’s highly unlikely that you want to pass this, because
-     * > hast is not for XML, and HTML will not add more void elements.
-     */
-    voids?: ReadonlyArray<string> | null | undefined;
-};
-/**
- * HTML quotes for attribute values.
- */
-type Quote = "\"" | "'";
-/**
- * Namespace.
- */
-type Space = "html" | "svg";
-
-/**
- * Create a `createHighlighter` function with bundled themes, languages, and engine.
- *
- * @example
- * ```ts
- * const createHighlighter = createdBundledHighlighter({
- *   langs: {
- *     typescript: () => import('@shikijs/langs/typescript'),
- *     // ...
- *   },
- *   themes: {
- *     nord: () => import('@shikijs/themes/nord'),
- *     // ...
- *   },
- *   engine: () => createOnigurumaEngine(), // or createJavaScriptRegexEngine()
- * })
- * ```
- *
- * @param options
- */
-declare function createdBundledHighlighter<BundledLangs extends string, BundledThemes extends string>(options: CreatedBundledHighlighterOptions<BundledLangs, BundledThemes>): CreateHighlighterFactory<BundledLangs, BundledThemes>;
-interface ShorthandsBundle<L extends string, T extends string> {
-    /**
-     * Shorthand for `codeToHtml` with auto-loaded theme and language.
-     * A singleton highlighter it maintained internally.
-     *
-     * Differences from `highlighter.codeToHtml()`, this function is async.
-     */
-    codeToHtml: (code: string, options: CodeToHastOptions<L, T>) => Promise<string>;
-    /**
-     * Shorthand for `codeToHtml` with auto-loaded theme and language.
-     * A singleton highlighter it maintained internally.
-     *
-     * Differences from `highlighter.codeToHtml()`, this function is async.
-     */
-    codeToHast: (code: string, options: CodeToHastOptions<L, T>) => Promise<Root>;
-    /**
-     * Shorthand for `codeToTokens` with auto-loaded theme and language.
-     * A singleton highlighter it maintained internally.
-     *
-     * Differences from `highlighter.codeToTokens()`, this function is async.
-     */
-    codeToTokens: (code: string, options: CodeToTokensOptions<L, T>) => Promise<TokensResult>;
-    /**
-     * Shorthand for `codeToTokensBase` with auto-loaded theme and language.
-     * A singleton highlighter it maintained internally.
-     *
-     * Differences from `highlighter.codeToTokensBase()`, this function is async.
-     */
-    codeToTokensBase: (code: string, options: RequireKeys<CodeToTokensBaseOptions<L, T>, 'theme' | 'lang'>) => Promise<ThemedToken[][]>;
-    /**
-     * Shorthand for `codeToTokensWithThemes` with auto-loaded theme and language.
-     * A singleton highlighter it maintained internally.
-     *
-     * Differences from `highlighter.codeToTokensWithThemes()`, this function is async.
-     */
-    codeToTokensWithThemes: (code: string, options: RequireKeys<CodeToTokensWithThemesOptions<L, T>, 'themes' | 'lang'>) => Promise<ThemedTokenWithVariants[][]>;
-    /**
-     * Get the singleton highlighter.
-     */
-    getSingletonHighlighter: (options?: Partial<BundledHighlighterOptions<L, T>>) => Promise<HighlighterGeneric<L, T>>;
-    /**
-     * Shorthand for `getLastGrammarState` with auto-loaded theme and language.
-     * A singleton highlighter it maintained internally.
-     */
-    getLastGrammarState: ((element: ThemedToken[][] | Root) => GrammarState) | ((code: string, options: CodeToTokensBaseOptions<L, T>) => Promise<GrammarState>);
-}
-declare function makeSingletonHighlighter<L extends string, T extends string>(createHighlighter: CreateHighlighterFactory<L, T>): (options?: Partial<BundledHighlighterOptions<L, T>>) => Promise<HighlighterGeneric<L, T>>;
-interface CreateSingletonShorthandsOptions<L extends string, T extends string> {
-    /**
-     * A custom function to guess embedded languages to be loaded.
-     */
-    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>;
-
-/**
- * Create a Shiki core highlighter instance, with no languages or themes bundled.
- * Wasm and each language and theme must be loaded manually.
- *
- * @see http://shiki.style/guide/bundles#fine-grained-bundle
- */
-declare function createHighlighterCore(options: HighlighterCoreOptions<false>): Promise<HighlighterCore>;
-/**
- * Create a Shiki core highlighter instance, with no languages or themes bundled.
- * Wasm and each language and theme must be loaded manually.
- *
- * Synchronous version of `createHighlighterCore`, which requires to provide the engine and all themes and languages upfront.
- *
- * @see http://shiki.style/guide/bundles#fine-grained-bundle
- */
-declare function createHighlighterCoreSync(options: HighlighterCoreOptions<true>): HighlighterCore;
-declare function makeSingletonHighlighterCore(createHighlighter: typeof createHighlighterCore): (options: HighlighterCoreOptions) => Promise<HighlighterCore>;
-declare const getSingletonHighlighterCore: (options: HighlighterCoreOptions) => Promise<HighlighterCore>;
-
-/**
- * Get the minimal shiki context for rendering.
- */
-declare function createShikiInternal(options: HighlighterCoreOptions): Promise<ShikiInternal>;
-
-/**
- * Get the minimal shiki context for rendering.
- *
- * Synchronous version of `createShikiInternal`, which requires to provide the engine and all themes and languages upfront.
- */
-declare function createShikiInternalSync(options: HighlighterCoreOptions<true>): ShikiInternal;
-
-declare function codeToHast(internal: ShikiInternal, code: string, options: CodeToHastOptions, transformerContext?: ShikiTransformerContextCommon): Root;
-declare function tokensToHast(tokens: ThemedToken[][], options: CodeToHastRenderOptions, transformerContext: ShikiTransformerContextSource, grammarState?: GrammarState | undefined): Root;
-
-declare const hastToHtml: typeof toHtml;
-/**
- * Get highlighted code in HTML.
- */
-declare function codeToHtml(internal: ShikiInternal, code: string, options: CodeToHastOptions): string;
-
-/**
- * High-level code-to-tokens API.
- *
- * It will use `codeToTokensWithThemes` or `codeToTokensBase` based on the options.
- */
-declare function codeToTokens(internal: ShikiInternal, code: string, options: CodeToTokensOptions): TokensResult;
-
-declare function tokenizeAnsiWithTheme(theme: ThemeRegistrationResolved, fileContents: string, options?: TokenizeWithThemeOptions): ThemedToken[][];
-
-/**
- * Code to tokens, with a simple theme.
- */
-declare function codeToTokensBase(internal: ShikiInternal, code: string, options?: CodeToTokensBaseOptions): ThemedToken[][];
-declare function tokenizeWithTheme(code: string, grammar: Grammar, theme: ThemeRegistrationResolved, colorMap: string[], options: TokenizeWithThemeOptions): ThemedToken[][];
-
-/**
- * Get tokens with multiple themes
- */
-declare function codeToTokensWithThemes(internal: ShikiInternal, code: string, options: CodeToTokensWithThemesOptions): ThemedTokenWithVariants[][];
-
-/**
- * Normalize a textmate theme to shiki theme
- */
-declare function normalizeTheme(rawTheme: ThemeRegistrationAny): ThemeRegistrationResolved;
-
-interface CssVariablesThemeOptions {
-    /**
-     * Theme name. Need to unique if multiple css variables themes are created
-     *
-     * @default 'css-variables'
-     */
-    name?: string;
-    /**
-     * Prefix for css variables
-     *
-     * @default '--shiki-'
-     */
-    variablePrefix?: string;
-    /**
-     * Default value for css variables, the key is without the prefix
-     *
-     * @example `{ 'token-comment': '#888' }` will generate `var(--shiki-token-comment, #888)` for comments
-     */
-    variableDefaults?: Record<string, string>;
-    /**
-     * Enable font style
-     *
-     * @default true
-     */
-    fontStyle?: boolean;
-}
-/**
- * A factory function to create a css-variable-based theme
- *
- * @see https://shiki.style/guide/theme-colors#css-variables-theme
- */
-declare function createCssVariablesTheme(options?: CssVariablesThemeOptions): ThemeRegistration;
-
-/**
- * A built-in transformer to add decorations to the highlighted code.
- */
-declare function transformerDecorations(): ShikiTransformer;
-
-declare function resolveColorReplacements(theme: ThemeRegistrationAny | string, options?: TokenizeWithThemeOptions): Record<string, string | undefined>;
-declare function applyColorReplacements(color: string, replacements?: Record<string, string | undefined>): string;
-declare function applyColorReplacements(color?: string | undefined, replacements?: Record<string, string | undefined>): string | undefined;
-
-declare function toArray<T>(x: MaybeArray<T>): T[];
-/**
- * Normalize a getter to a promise.
- */
-declare function normalizeGetter<T>(p: MaybeGetter<T>): Promise<T>;
-/**
- * Check if the language is plaintext that is ignored by Shiki.
- *
- * Hard-coded plain text languages: `plaintext`, `txt`, `text`, `plain`.
- */
-declare function isPlainLang(lang: string | null | undefined): lang is PlainTextLanguage;
-/**
- * Check if the language is specially handled or bypassed by Shiki.
- *
- * Hard-coded languages: `ansi` and plaintexts like `plaintext`, `txt`, `text`, `plain`.
- */
-declare function isSpecialLang(lang: any): lang is SpecialLanguage;
-/**
- * Check if the theme is specially handled or bypassed by Shiki.
- *
- * Hard-coded themes: `none`.
- */
-declare function isNoneTheme(theme: string | ThemeInput | null | undefined): theme is 'none';
-/**
- * Check if the theme is specially handled or bypassed by Shiki.
- *
- * Hard-coded themes: `none`.
- */
-declare function isSpecialTheme(theme: string | ThemeInput | null | undefined): theme is SpecialTheme;
-
-/**
- * Utility to append class to a hast node
- *
- * If the `property.class` is a string, it will be splitted by space and converted to an array.
- */
-declare function addClassToHast(node: Element, className: string | string[]): Element;
-
-/**
- * Split a string into lines, each line preserves the line ending.
- */
-declare function splitLines(code: string, preserveEnding?: boolean): [string, number][];
-/**
- * Creates a converter between index and position in a code block.
- *
- * Overflow/underflow are unchecked.
- */
-declare function createPositionConverter(code: string): {
-    lines: string[];
-    indexToPos: (index: number) => Position;
-    posToIndex: (line: number, character: number) => number;
-};
-/**
- * Guess embedded languages from given code and highlighter.
- *
- * When highlighter is provided, only bundled languages will be included.
- */
-declare function guessEmbeddedLanguages(code: string, _lang: string | undefined, highlighter?: HighlighterGeneric<any, any>): string[];
-
-/**
- * Split a token into multiple tokens by given offsets.
- *
- * The offsets are relative to the token, and should be sorted.
- */
-declare function splitToken<T extends Pick<ThemedToken, 'content' | 'offset'>>(token: T, offsets: number[]): T[];
-/**
- * Split 2D tokens array by given breakpoints.
- */
-declare function splitTokens<T extends Pick<ThemedToken, 'content' | 'offset'>>(tokens: T[][], breakpoints: number[] | Set<number>): T[][];
-declare function flatTokenVariants(merged: ThemedTokenWithVariants, variantsOrder: string[], cssVariablePrefix: string, defaultColor: string | boolean): ThemedToken;
-declare function getTokenStyleObject(token: TokenStyles): Record<string, string>;
-declare function stringifyTokenStyle(token: string | Record<string, string>): string;
-
-type DeprecationTarget = 3;
-/**
- * Enable runtime warning for deprecated APIs, for the future versions of Shiki.
- *
- * You can pass a major version to only warn for deprecations that will be removed in that version.
- *
- * By default, deprecation warning is set to 3 since Shiki v2.0.0
- */
-declare function enableDeprecationWarnings(emitDeprecation?: DeprecationTarget | boolean, emitError?: boolean): void;
-/**
- * @internal
- */
-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 type { CreateSingletonShorthandsOptions, CssVariablesThemeOptions, ShorthandsBundle };
+export * from '@shikijs/core';

package/dist/core.d.mts

@@ -1,4 +1,5 @@
 export * from '@shikijs/core';
 import '@shikijs/engine-oniguruma/wasm-inlined';
 import '@shikijs/engine-javascript';
+import '@shikijs/engine-oniguruma';
 import '@shikijs/vscode-textmate';

package/dist/engine-oniguruma.d.mts

@@ -1,83 +1 @@
-interface IOnigCaptureIndex {
-    start: number;
-    end: number;
-    length: number;
-}
-interface IOnigMatch {
-    index: number;
-    captureIndices: IOnigCaptureIndex[];
-}
-declare const enum FindOption {
-    None = 0,
-    /**
-     * equivalent of ONIG_OPTION_NOT_BEGIN_STRING: (str) isn't considered as begin of string (* fail \A)
-     */
-    NotBeginString = 1,
-    /**
-     * equivalent of ONIG_OPTION_NOT_END_STRING: (end) isn't considered as end of string (* fail \z, \Z)
-     */
-    NotEndString = 2,
-    /**
-     * equivalent of ONIG_OPTION_NOT_BEGIN_POSITION: (start) isn't considered as start position of search (* fail \G)
-     */
-    NotBeginPosition = 4,
-    /**
-     * used for debugging purposes.
-     */
-    DebugCall = 8
-}
-interface OnigScanner {
-    findNextMatchSync(string: string | OnigString, startPosition: number, options: OrMask<FindOption>): IOnigMatch | null;
-    dispose?(): void;
-}
-interface OnigString {
-    readonly content: string;
-    dispose?(): void;
-}
-
-/**
- * A union of given const enum values.
-*/
-type OrMask<T extends number> = number;
-
-type Awaitable<T> = T | Promise<T>;
-
-interface PatternScanner extends OnigScanner {
-}
-interface RegexEngineString extends OnigString {
-}
-/**
- * Engine for RegExp matching and scanning.
- */
-interface RegexEngine {
-    createScanner: (patterns: (string | RegExp)[]) => PatternScanner;
-    createString: (s: string) => RegexEngineString;
-}
-interface WebAssemblyInstantiator {
-    (importObject: Record<string, Record<string, WebAssembly.ImportValue>> | undefined): Promise<WebAssemblyInstance>;
-}
-type WebAssemblyInstance = WebAssembly.WebAssemblyInstantiatedSource | WebAssembly.Instance | WebAssembly.Instance['exports'];
-type OnigurumaLoadOptions = {
-    instantiator: WebAssemblyInstantiator;
-} | {
-    default: WebAssemblyInstantiator;
-} | {
-    data: ArrayBufferView | ArrayBuffer | Response;
-};
-type LoadWasmOptionsPlain = OnigurumaLoadOptions | WebAssemblyInstantiator | ArrayBufferView | ArrayBuffer | Response;
-type LoadWasmOptions = Awaitable<LoadWasmOptionsPlain> | (() => Awaitable<LoadWasmOptionsPlain>);
-
-declare function loadWasm(options: LoadWasmOptions): Promise<void>;
-
-/**
- * Set the default wasm loader for `loadWasm`.
- * @internal
- */
-declare function setDefaultWasmLoader(_loader: LoadWasmOptions): void;
-/**
- * @internal
- */
-declare function getDefaultWasmLoader(): LoadWasmOptions | undefined;
-declare function createOnigurumaEngine(options?: LoadWasmOptions | null): Promise<RegexEngine>;
-
-export { createOnigurumaEngine, getDefaultWasmLoader, loadWasm, setDefaultWasmLoader };
+export * from '@shikijs/engine-oniguruma';

package/dist/index.d.mts

@@ -1,10 +1,10 @@
 export { Highlighter, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getLastGrammarState, getSingletonHighlighter } from './bundle-full.mjs';
 export { BuiltinLanguage, BuiltinTheme } from './types.mjs';
 export { createJavaScriptRegexEngine, defaultJavaScriptRegexConstructor } from '@shikijs/engine-javascript';
-export { createOnigurumaEngine, loadWasm } from './engine-oniguruma.mjs';
+export { createOnigurumaEngine, loadWasm } from '@shikijs/engine-oniguruma';
 export * from '@shikijs/core';
 export { BundledLanguage, bundledLanguages, bundledLanguagesAlias, bundledLanguagesBase, bundledLanguagesInfo } from './langs.mjs';
 export { BundledTheme, bundledThemes, bundledThemesInfo } from './themes.mjs';
-import './types/index.d.mjs';
+import 'hast';
 import '@shikijs/types';
 import '@shikijs/core/types';

package/dist/types.d.mts

@@ -1,8 +1,8 @@
-import { BundledLanguage } from './langs.mjs';
 import { BundledTheme } from './themes.mjs';
 export * from '@shikijs/core/types';
-import '@shikijs/types';
+import { BundledLanguage } from './langs.mjs';
 import '@shikijs/core';
+import '@shikijs/types';
 
 type BuiltinLanguage = BundledLanguage;
 type BuiltinTheme = BundledTheme;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shiki",
   "type": "module",
-  "version": "3.2.2",
+  "version": "3.4.0",
   "description": "A beautiful Syntax Highlighter.",
   "author": "Pine Wu <octref@gmail.com>; Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -48,22 +48,22 @@
   "dependencies": {
     "@shikijs/vscode-textmate": "^10.0.2",
     "@types/hast": "^3.0.4",
-    "@shikijs/core": "3.2.2",
-    "@shikijs/engine-javascript": "3.2.2",
-    "@shikijs/themes": "3.2.2",
-    "@shikijs/engine-oniguruma": "3.2.2",
-    "@shikijs/types": "3.2.2",
-    "@shikijs/langs": "3.2.2"
+    "@shikijs/engine-oniguruma": "3.4.0",
+    "@shikijs/themes": "3.4.0",
+    "@shikijs/types": "3.4.0",
+    "@shikijs/engine-javascript": "3.4.0",
+    "@shikijs/core": "3.4.0",
+    "@shikijs/langs": "3.4.0"
   },
   "devDependencies": {
     "rollup-plugin-copy": "^3.5.0",
-    "tm-grammars": "^1.23.10",
-    "tm-themes": "^1.10.3",
+    "tm-grammars": "^1.23.17",
+    "tm-themes": "^1.10.6",
     "vscode-oniguruma": "1.7.0"
   },
   "scripts": {
-    "build": "rimraf dist && NODE_OPTIONS=--max-old-space-size=4096 rollup -c",
-    "dev": "rollup -cw",
+    "build": "unbuild",
+    "dev": "unbuild --stub",
     "test": "vitest",
     "test:cf": "wrangler dev test/cf.ts --port 60001"
   }

package/dist/types/index.d.d.mts

@@ -1,344 +0,0 @@
-// ## Interfaces
-
-/**
- * Info associated with nodes by the ecosystem.
- *
- * This space is guaranteed to never be specified by unist or specifications
- * implementing unist.
- * But you can use it in utilities and plugins to store data.
- *
- * This type can be augmented to register custom data.
- * For example:
- *
- * ```ts
- * declare module 'unist' {
- *   interface Data {
- *     // `someNode.data.myId` is typed as `number | undefined`
- *     myId?: number | undefined
- *   }
- * }
- * ```
- */
-interface Data$1 {}
-
-/**
- * One place in a source file.
- */
-interface Point {
-    /**
-     * Line in a source file (1-indexed integer).
-     */
-    line: number;
-
-    /**
-     * Column in a source file (1-indexed integer).
-     */
-    column: number;
-    /**
-     * Character in a source file (0-indexed integer).
-     */
-    offset?: number | undefined;
-}
-
-/**
- * Position of a node in a source document.
- *
- * A position is a range between two points.
- */
-interface Position {
-    /**
-     * Place of the first character of the parsed source region.
-     */
-    start: Point;
-
-    /**
-     * Place of the first character after the parsed source region.
-     */
-    end: Point;
-}
-
-/**
- * Abstract unist node.
- *
- * The syntactic unit in unist syntax trees are called nodes.
- *
- * This interface is supposed to be extended.
- * If you can use {@link Literal} or {@link Parent}, you should.
- * But for example in markdown, a `thematicBreak` (`***`), is neither literal
- * nor parent, but still a node.
- */
-interface Node$1 {
-    /**
-     * Node type.
-     */
-    type: string;
-
-    /**
-     * Info from the ecosystem.
-     */
-    data?: Data$1 | undefined;
-
-    /**
-     * Position of a node in a source document.
-     *
-     * Nodes that are generated (not in the original source document) must not
-     * have a position.
-     */
-    position?: Position | undefined;
-}
-
-// ## Interfaces
-
-/**
- * Info associated with hast nodes by the ecosystem.
- *
- * This space is guaranteed to never be specified by unist or hast.
- * But you can use it in utilities and plugins to store data.
- *
- * This type can be augmented to register custom data.
- * For example:
- *
- * ```ts
- * declare module 'hast' {
- *   interface Data {
- *     // `someNode.data.myId` is typed as `number | undefined`
- *     myId?: number | undefined
- *   }
- * }
- * ```
- */
-interface Data extends Data$1 {}
-
-/**
- * Info associated with an element.
- */
-interface Properties {
-    [PropertyName: string]: boolean | number | string | null | undefined | Array<string | number>;
-}
-
-// ## Content maps
-
-/**
- * Union of registered hast nodes that can occur in {@link Element}.
- *
- * To register mote custom hast nodes, add them to {@link ElementContentMap}.
- * They will be automatically added here.
- */
-type ElementContent = ElementContentMap[keyof ElementContentMap];
-
-/**
- * Registry of all hast nodes that can occur as children of {@link Element}.
- *
- * For a union of all {@link Element} children, see {@link ElementContent}.
- */
-interface ElementContentMap {
-    comment: Comment;
-    element: Element;
-    text: Text;
-}
-
-/**
- * Union of registered hast nodes that can occur in {@link Root}.
- *
- * To register custom hast nodes, add them to {@link RootContentMap}.
- * They will be automatically added here.
- */
-type RootContent = RootContentMap[keyof RootContentMap];
-
-/**
- * Registry of all hast nodes that can occur as children of {@link Root}.
- *
- * > 👉 **Note**: {@link Root} does not need to be an entire document.
- * > it can also be a fragment.
- *
- * For a union of all {@link Root} children, see {@link RootContent}.
- */
-interface RootContentMap {
-    comment: Comment;
-    doctype: Doctype;
-    element: Element;
-    text: Text;
-}
-
-/**
- * Union of registered hast nodes.
- *
- * To register custom hast nodes, add them to {@link RootContentMap} and other
- * places where relevant.
- * They will be automatically added here.
- */
-type Nodes = Root | RootContent;
-
-// ## Abstract nodes
-
-/**
- * Abstract hast node.
- *
- * This interface is supposed to be extended.
- * If you can use {@link Literal} or {@link Parent}, you should.
- * But for example in HTML, a `Doctype` is neither literal nor parent, but
- * still a node.
- *
- * To register custom hast nodes, add them to {@link RootContentMap} and other
- * places where relevant (such as {@link ElementContentMap}).
- *
- * For a union of all registered hast nodes, see {@link Nodes}.
- */
-interface Node extends Node$1 {
-    /**
-     * Info from the ecosystem.
-     */
-    data?: Data | undefined;
-}
-
-/**
- * Abstract hast node that contains the smallest possible value.
- *
- * This interface is supposed to be extended if you make custom hast nodes.
- *
- * For a union of all registered hast literals, see {@link Literals}.
- */
-interface Literal extends Node {
-    /**
-     * Plain-text value.
-     */
-    value: string;
-}
-
-/**
- * Abstract hast node that contains other hast nodes (*children*).
- *
- * This interface is supposed to be extended if you make custom hast nodes.
- *
- * For a union of all registered hast parents, see {@link Parents}.
- */
-interface Parent extends Node {
-    /**
-     * List of children.
-     */
-    children: RootContent[];
-}
-
-// ## Concrete nodes
-
-/**
- * HTML comment.
- */
-interface Comment extends Literal {
-    /**
-     * Node type of HTML comments in hast.
-     */
-    type: "comment";
-    /**
-     * Data associated with the comment.
-     */
-    data?: CommentData | undefined;
-}
-
-/**
- * Info associated with hast comments by the ecosystem.
- */
-interface CommentData extends Data {}
-
-/**
- * HTML document type.
- */
-interface Doctype extends Node$1 {
-    /**
-     * Node type of HTML document types in hast.
-     */
-    type: "doctype";
-    /**
-     * Data associated with the doctype.
-     */
-    data?: DoctypeData | undefined;
-}
-
-/**
- * Info associated with hast doctypes by the ecosystem.
- */
-interface DoctypeData extends Data {}
-
-/**
- * HTML element.
- */
-interface Element extends Parent {
-    /**
-     * Node type of elements.
-     */
-    type: "element";
-    /**
-     * Tag name (such as `'body'`) of the element.
-     */
-    tagName: string;
-    /**
-     * Info associated with the element.
-     */
-    properties: Properties;
-    /**
-     * Children of element.
-     */
-    children: ElementContent[];
-    /**
-     * When the `tagName` field is `'template'`, a `content` field can be
-     * present.
-     */
-    content?: Root | undefined;
-    /**
-     * Data associated with the element.
-     */
-    data?: ElementData | undefined;
-}
-
-/**
- * Info associated with hast elements by the ecosystem.
- */
-interface ElementData extends Data {}
-
-/**
- * Document fragment or a whole document.
- *
- * Should be used as the root of a tree and must not be used as a child.
- *
- * Can also be used as the value for the content field on a `'template'` element.
- */
-interface Root extends Parent {
-    /**
-     * Node type of hast root.
-     */
-    type: "root";
-    /**
-     * Children of root.
-     */
-    children: RootContent[];
-    /**
-     * Data associated with the hast root.
-     */
-    data?: RootData | undefined;
-}
-
-/**
- * Info associated with hast root nodes by the ecosystem.
- */
-interface RootData extends Data {}
-
-/**
- * HTML character data (plain text).
- */
-interface Text extends Literal {
-    /**
-     * Node type of HTML character data (plain text) in hast.
-     */
-    type: "text";
-    /**
-     * Data associated with the text.
-     */
-    data?: TextData | undefined;
-}
-
-/**
- * Info associated with hast texts by the ecosystem.
- */
-interface TextData extends Data {}
-
-export type { Element as E, Nodes as N, Root as R, RootContent as a };