shiki 2.5.0 → 3.1.0

package/dist/bundle-full.d.mts

@@ -1,13 +1,11 @@
 import { R as Root } from './types/index.d.mjs';
 import * as _shikijs_types from '@shikijs/types';
-import { HighlighterGeneric, CreateHighlighterFactory } from '@shikijs/types';
+import { HighlighterGeneric } from '@shikijs/types';
 import { BundledLanguage } from './langs.mjs';
 export { bundledLanguages, bundledLanguagesAlias, bundledLanguagesBase, bundledLanguagesInfo } from './langs.mjs';
 import { BundledTheme } from './themes.mjs';
 export { bundledThemes, bundledThemesInfo } from './themes.mjs';
 export * from '@shikijs/core';
-export { g as getWasmInlined } from './types/wasm-dynamic.mjs';
-import '@shikijs/core/types';
 
 type Highlighter = HighlighterGeneric<BundledLanguage, BundledTheme>;
 /**
@@ -20,7 +18,7 @@ type Highlighter = HighlighterGeneric<BundledLanguage, BundledTheme>;
  * For granular control over the bundle, check:
  * @see https://shiki.style/guide/bundles#fine-grained-bundle
  */
-declare const createHighlighter: CreateHighlighterFactory<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 codeToTokens: (code: string, options: _shikijs_types.CodeToTokensOptions<BundledLanguage, BundledTheme>) => Promise<_shikijs_types.TokensResult>;
@@ -28,9 +26,5 @@ declare const codeToTokensBase: (code: string, options: _shikijs_types.RequireKe
 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>);
-/**
- * @deprecated Use `createHighlighter` or `getSingletonHighlighter` instead.
- */
-declare const getHighlighter: CreateHighlighterFactory<BundledLanguage, BundledTheme>;
 
-export { BundledLanguage, BundledTheme, type Highlighter, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getHighlighter, getLastGrammarState, getSingletonHighlighter };
+export { BundledLanguage, BundledTheme, type Highlighter, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getLastGrammarState, getSingletonHighlighter };

package/dist/bundle-full.mjs

@@ -1,10 +1,9 @@
-import { createSingletonShorthands, createdBundledHighlighter, guessEmbeddedLanguages, warnDeprecated } from '@shikijs/core';
+import { createSingletonShorthands, createdBundledHighlighter, guessEmbeddedLanguages } from '@shikijs/core';
 export * from '@shikijs/core';
 import { bundledLanguages } from './langs.mjs';
 export { bundledLanguagesAlias, bundledLanguagesBase, bundledLanguagesInfo } from './langs.mjs';
 import { bundledThemes } from './themes.mjs';
 export { bundledThemesInfo } from './themes.mjs';
-export { g as getWasmInlined } from './wasm-dynamic-K7LwWlz7.js';
 import { createOnigurumaEngine } from '@shikijs/engine-oniguruma';
 
 const createHighlighter = /* @__PURE__ */ createdBundledHighlighter({
@@ -24,9 +23,5 @@ const {
   createHighlighter,
   { guessEmbeddedLanguages }
 );
-const getHighlighter = (options) => {
-  warnDeprecated("`getHighlighter` is deprecated. Use `createHighlighter` or `getSingletonHighlighter` instead.");
-  return createHighlighter(options);
-};
 
-export { bundledLanguages, bundledThemes, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getHighlighter, getLastGrammarState, getSingletonHighlighter };
+export { bundledLanguages, bundledThemes, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getLastGrammarState, getSingletonHighlighter };

package/dist/bundle-web.d.mts

@@ -1,11 +1,9 @@
 import { R as Root } from './types/index.d.mjs';
 import * as _shikijs_types from '@shikijs/types';
-import { BundledLanguageInfo, DynamicImportLanguageRegistration, HighlighterGeneric, CreateHighlighterFactory } from '@shikijs/types';
+import { BundledLanguageInfo, DynamicImportLanguageRegistration, HighlighterGeneric } from '@shikijs/types';
 import { BundledTheme } from './themes.mjs';
 export { bundledThemes, bundledThemesInfo } from './themes.mjs';
 export * from '@shikijs/core';
-export { g as getWasmInlined } from './types/wasm-dynamic.mjs';
-import '@shikijs/core/types';
 
 declare const bundledLanguagesInfo: BundledLanguageInfo[];
 declare const bundledLanguagesBase: {
@@ -28,7 +26,7 @@ type Highlighter = HighlighterGeneric<BundledLanguage, BundledTheme>;
  * For granular control over the bundle, check:
  * @see https://shiki.style/guide/bundles#fine-grained-bundle
  */
-declare const createHighlighter: CreateHighlighterFactory<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 codeToTokensBase: (code: string, options: _shikijs_types.RequireKeys<_shikijs_types.CodeToTokensBaseOptions<BundledLanguage, BundledTheme>, "lang" | "theme">) => Promise<_shikijs_types.ThemedToken[][]>;
@@ -36,9 +34,5 @@ declare const codeToTokens: (code: string, options: _shikijs_types.CodeToTokensO
 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>);
-/**
- * @deprecated Use `createHighlighter` or `getSingletonHighlighter` instead.
- */
-declare const getHighlighter: CreateHighlighterFactory<BundledLanguage, BundledTheme>;
 
-export { type BundledLanguage, BundledTheme, type Highlighter, bundledLanguages, bundledLanguagesAlias, bundledLanguagesBase, bundledLanguagesInfo, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getHighlighter, getLastGrammarState, getSingletonHighlighter };
+export { type BundledLanguage, BundledTheme, type Highlighter, bundledLanguages, bundledLanguagesAlias, bundledLanguagesBase, bundledLanguagesInfo, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getLastGrammarState, getSingletonHighlighter };

package/dist/bundle-web.mjs

@@ -1,8 +1,7 @@
-import { createSingletonShorthands, createdBundledHighlighter, guessEmbeddedLanguages, warnDeprecated } from '@shikijs/core';
+import { createSingletonShorthands, createdBundledHighlighter, guessEmbeddedLanguages } from '@shikijs/core';
 export * from '@shikijs/core';
 import { bundledThemes } from './themes.mjs';
 export { bundledThemesInfo } from './themes.mjs';
-export { g as getWasmInlined } from './wasm-dynamic-K7LwWlz7.js';
 import { createOnigurumaEngine } from '@shikijs/engine-oniguruma';
 
 const bundledLanguagesInfo = [
@@ -339,9 +338,5 @@ const {
   createHighlighter,
   { guessEmbeddedLanguages }
 );
-const getHighlighter = (options) => {
-  warnDeprecated("`getHighlighter` is deprecated. Use `createHighlighter` or `getSingletonHighlighter` instead.");
-  return createHighlighter(options);
-};
 
-export { bundledLanguages, bundledLanguagesAlias, bundledLanguagesBase, bundledLanguagesInfo, bundledThemes, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getHighlighter, getLastGrammarState, getSingletonHighlighter };
+export { bundledLanguages, bundledLanguagesAlias, bundledLanguagesBase, bundledLanguagesInfo, bundledThemes, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getLastGrammarState, getSingletonHighlighter };

package/dist/core-unwasm.d.mts

@@ -1,529 +1 @@
-import { HighlighterGeneric, Awaitable, CodeToHastOptions, CodeToTokensOptions, TokensResult, RequireKeys, CodeToTokensBaseOptions, ThemedToken, CodeToTokensWithThemesOptions, ThemedTokenWithVariants, BundledHighlighterOptions, GrammarState, ShikiInternal, ShikiTransformerContextCommon, ThemeRegistration, HighlighterCoreOptions, HighlighterCore, RegexEngine, LoadWasmOptions, Position, CreateHighlighterFactory, CreatedBundledHighlighterOptions, LanguageInput, ThemeInput, TokenStyles, 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, R as Root, E as Element } from './types/index.d.mjs';
-import { JavaScriptRegexEngineOptions } from '@shikijs/engine-javascript';
-export { FontStyle, EncodedTokenMetadata as StackElementMetadata } from './textmate.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>;
-/**
- * Create a `createHighlighter` function with bundled themes and languages.
- *
- * @deprecated Use `createdBundledHighlighter({ langs, themes, engine })` signature instead.
- */
-declare function createdBundledHighlighter<BundledLangs extends string, BundledThemes extends string>(bundledLanguages: Record<BundledLangs, LanguageInput>, bundledThemes: Record<BundledThemes, ThemeInput>, loadWasm: HighlighterCoreOptions['loadWasm']): 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>;
-/**
- * @deprecated Use `createHighlighterCore` or `getSingletonHighlighterCore` instead.
- */
-declare function getHighlighterCore(options: HighlighterCoreOptions): Promise<HighlighterCore>;
-
-/**
- * Get the minimal shiki context for rendering.
- */
-declare function createShikiInternal(options: HighlighterCoreOptions): Promise<ShikiInternal>;
-/**
- * @deprecated Use `createShikiInternal` instead.
- */
-declare function getShikiInternal(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;
-
-/**
- * @deprecated Import `createJavaScriptRegexEngine` from `@shikijs/engine-javascript` or `shiki/engine/javascript` instead.
- */
-declare function createJavaScriptRegexEngine(options?: JavaScriptRegexEngineOptions): RegexEngine;
-/**
- * @deprecated Import `defaultJavaScriptRegexConstructor` from `@shikijs/engine-javascript` or `shiki/engine/javascript` instead.
- */
-declare function defaultJavaScriptRegexConstructor(pattern: string): RegExp;
-
-/**
- * @deprecated Import `createOnigurumaEngine` from `@shikijs/engine-oniguruma` or `shiki/engine/oniguruma` instead.
- */
-declare function createOnigurumaEngine(options?: LoadWasmOptions | null): Promise<RegexEngine>;
-/**
- * @deprecated Import `createOnigurumaEngine` from `@shikijs/engine-oniguruma` or `shiki/engine/oniguruma` instead.
- */
-declare function createWasmOnigEngine(options?: LoadWasmOptions | null): Promise<RegexEngine>;
-/**
- * @deprecated Import `loadWasm` from `@shikijs/engine-oniguruma` or `shiki/engine/oniguruma` instead.
- */
-declare function loadWasm(options: LoadWasmOptions): Promise<void>;
-
-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;
-
-/**
- * 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 { type CreateSingletonShorthandsOptions, type CssVariablesThemeOptions, type ShorthandsBundle, addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createCssVariablesTheme, createHighlighterCore, createHighlighterCoreSync, createJavaScriptRegexEngine, createOnigurumaEngine, createPositionConverter, createShikiInternal, createShikiInternalSync, createSingletonShorthands, createWasmOnigEngine, createdBundledHighlighter, defaultJavaScriptRegexConstructor, enableDeprecationWarnings, flatTokenVariants, getHighlighterCore, getShikiInternal, getSingletonHighlighterCore, getTokenStyleObject, guessEmbeddedLanguages, toHtml as hastToHtml, isNoneTheme, isPlainLang, isSpecialLang, isSpecialTheme, loadWasm, makeSingletonHighlighter, makeSingletonHighlighterCore, normalizeGetter, normalizeTheme, resolveColorReplacements, splitLines, splitToken, splitTokens, stringifyTokenStyle, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme, tokensToHast, transformerDecorations, warnDeprecated };
+export * from '@shikijs/core';

package/dist/core-unwasm.mjs

@@ -1 +1,4 @@
+import { setDefaultWasmLoader } from '@shikijs/engine-oniguruma';
 export * from '@shikijs/core';
+
+setDefaultWasmLoader(() => import('shiki/wasm'));

package/dist/index.d.mts

@@ -1,7 +1,6 @@
-export { Highlighter, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getHighlighter, getLastGrammarState, getSingletonHighlighter } from './bundle-full.mjs';
+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 { g as getWasmInlined } from './types/wasm-dynamic.mjs';
 export * from '@shikijs/core';
 export { BundledLanguage, bundledLanguages, bundledLanguagesAlias, bundledLanguagesBase, bundledLanguagesInfo } from './langs.mjs';
 export { BundledTheme, bundledThemes, bundledThemesInfo } from './themes.mjs';

package/dist/index.mjs

@@ -1,7 +1,6 @@
-export { codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getHighlighter, getLastGrammarState, getSingletonHighlighter } from './bundle-full.mjs';
+export { codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createHighlighter, getLastGrammarState, getSingletonHighlighter } from './bundle-full.mjs';
 export { createJavaScriptRegexEngine, defaultJavaScriptRegexConstructor } from '@shikijs/engine-javascript';
 export { createOnigurumaEngine, loadWasm } from '@shikijs/engine-oniguruma';
-export { g as getWasmInlined } from './wasm-dynamic-K7LwWlz7.js';
 export * from '@shikijs/core';
 export { bundledLanguages, bundledLanguagesAlias, bundledLanguagesBase, bundledLanguagesInfo } from './langs.mjs';
 export { bundledThemes, bundledThemesInfo } from './themes.mjs';

package/dist/themes.d.mts

@@ -1,4 +1,4 @@
-import { BundledThemeInfo, DynamicImportThemeRegistration } from '@shikijs/core';
+import { BundledThemeInfo, DynamicImportThemeRegistration } from '@shikijs/types';
 
 declare const bundledThemesInfo: BundledThemeInfo[];
 type BundledTheme = 'andromeeda' | 'aurora-x' | 'ayu-dark' | 'catppuccin-frappe' | 'catppuccin-latte' | 'catppuccin-macchiato' | 'catppuccin-mocha' | 'dark-plus' | 'dracula' | 'dracula-soft' | 'everforest-dark' | 'everforest-light' | 'github-dark' | 'github-dark-default' | 'github-dark-dimmed' | 'github-dark-high-contrast' | 'github-light' | 'github-light-default' | 'github-light-high-contrast' | 'houston' | 'kanagawa-dragon' | 'kanagawa-lotus' | 'kanagawa-wave' | 'laserwave' | 'light-plus' | 'material-theme' | 'material-theme-darker' | 'material-theme-lighter' | 'material-theme-ocean' | 'material-theme-palenight' | 'min-dark' | 'min-light' | 'monokai' | 'night-owl' | 'nord' | 'one-dark-pro' | 'one-light' | 'plastic' | 'poimandres' | 'red' | 'rose-pine' | 'rose-pine-dawn' | 'rose-pine-moon' | 'slack-dark' | 'slack-ochin' | 'snazzy-light' | 'solarized-dark' | 'solarized-light' | 'synthwave-84' | 'tokyo-night' | 'vesper' | 'vitesse-black' | 'vitesse-dark' | 'vitesse-light';

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

@@ -160,15 +160,6 @@ interface RootContentMap {
     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
 
 /**
@@ -341,4 +332,4 @@ interface Text extends Literal {
  */
 interface TextData extends Data {}
 
-export type { Element as E, Nodes as N, Root as R, RootContent as a };
+export type { Root as R };

package/dist/types.d.mts

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shiki",
   "type": "module",
-  "version": "2.5.0",
+  "version": "3.1.0",
   "description": "A beautiful Syntax Highlighter.",
   "author": "Pine Wu <octref@gmail.com>; Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -17,56 +17,23 @@
   ],
   "sideEffects": false,
   "exports": {
-    ".": {
-      "types": "./dist/index.d.mts",
-      "default": "./dist/index.mjs"
-    },
+    ".": "./dist/index.mjs",
     "./core": {
-      "types": "./dist/core.d.mts",
       "unwasm": "./dist/core-unwasm.mjs",
       "default": "./dist/core.mjs"
     },
     "./wasm": {
       "unwasm": "./dist/onig.wasm",
-      "types": "./dist/wasm.d.mts",
       "default": "./dist/wasm.mjs"
     },
-    "./langs": {
-      "types": "./dist/langs.d.mts",
-      "default": "./dist/langs.mjs"
-    },
-    "./themes": {
-      "types": "./dist/themes.d.mts",
-      "default": "./dist/themes.mjs"
-    },
-    "./types": {
-      "types": "./dist/types.d.mts",
-      "default": "./dist/types.mjs"
-    },
-    "./theme-css-variables": {
-      "types": "./dist/theme-css-variables.d.mts",
-      "default": "./dist/theme-css-variables.mjs"
-    },
-    "./engine/javascript": {
-      "types": "./dist/engine-javascript.d.mts",
-      "default": "./dist/engine-javascript.mjs"
-    },
-    "./engine/oniguruma": {
-      "types": "./dist/engine-oniguruma.d.mts",
-      "default": "./dist/engine-oniguruma.mjs"
-    },
-    "./textmate": {
-      "types": "./dist/textmate.d.mts",
-      "default": "./dist/textmate.mjs"
-    },
-    "./bundle/full": {
-      "types": "./dist/bundle-full.d.mts",
-      "default": "./dist/bundle-full.mjs"
-    },
-    "./bundle/web": {
-      "types": "./dist/bundle-web.d.mts",
-      "default": "./dist/bundle-web.mjs"
-    },
+    "./langs": "./dist/langs.mjs",
+    "./themes": "./dist/themes.mjs",
+    "./types": "./dist/types.mjs",
+    "./engine/javascript": "./dist/engine-javascript.mjs",
+    "./engine/oniguruma": "./dist/engine-oniguruma.mjs",
+    "./textmate": "./dist/textmate.mjs",
+    "./bundle/full": "./dist/bundle-full.mjs",
+    "./bundle/web": "./dist/bundle-web.mjs",
     "./onig.wasm": "./dist/onig.wasm",
     "./dist/*": "./dist/*",
     "./package.json": "./package.json",
@@ -75,61 +42,23 @@
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.mts",
-  "typesVersions": {
-    "*": {
-      "core": [
-        "./dist/core.d.mts"
-      ],
-      "wasm": [
-        "./dist/wasm.d.mts"
-      ],
-      "langs": [
-        "./dist/langs.d.mts"
-      ],
-      "themes": [
-        "./dist/themes.d.mts"
-      ],
-      "bundle/full": [
-        "./dist/bundle-full.d.mts"
-      ],
-      "bundle/web": [
-        "./dist/bundle-web.d.mts"
-      ],
-      "engine/javascript": [
-        "./dist/engine-javascript.d.mts"
-      ],
-      "engine/oniguruma": [
-        "./dist/engine-oniguruma.d.mts"
-      ],
-      "textmate": [
-        "./dist/textmate.d.mts"
-      ],
-      "theme-css-variables": [
-        "./dist/theme-css-variables.d.mts"
-      ],
-      "*": [
-        "./dist/*",
-        "./*"
-      ]
-    }
-  },
   "files": [
     "dist"
   ],
   "dependencies": {
     "@shikijs/vscode-textmate": "^10.0.2",
     "@types/hast": "^3.0.4",
-    "@shikijs/core": "2.5.0",
-    "@shikijs/engine-oniguruma": "2.5.0",
-    "@shikijs/engine-javascript": "2.5.0",
-    "@shikijs/themes": "2.5.0",
-    "@shikijs/langs": "2.5.0",
-    "@shikijs/types": "2.5.0"
+    "@shikijs/engine-javascript": "3.1.0",
+    "@shikijs/core": "3.1.0",
+    "@shikijs/langs": "3.1.0",
+    "@shikijs/engine-oniguruma": "3.1.0",
+    "@shikijs/themes": "3.1.0",
+    "@shikijs/types": "3.1.0"
   },
   "devDependencies": {
     "rollup-plugin-copy": "^3.5.0",
-    "tm-grammars": "^1.22.14",
-    "tm-themes": "^1.9.12",
+    "tm-grammars": "^1.22.18",
+    "tm-themes": "^1.9.13",
     "vscode-oniguruma": "1.7.0"
   },
   "scripts": {

package/dist/theme-css-variables.d.mts

@@ -1 +0,0 @@
-export { CssVariablesThemeOptions, createCssVariablesTheme } from '@shikijs/core';

package/dist/theme-css-variables.mjs

@@ -1,4 +0,0 @@
-import { warnDeprecated } from '@shikijs/core';
-export { createCssVariablesTheme } from '@shikijs/core';
-
-warnDeprecated("`shiki/theme-css-variables` entry point is deprecated. Use `shiki/core` instead.");

package/dist/types/wasm-dynamic.d.mts

@@ -1,8 +0,0 @@
-import { WebAssemblyInstantiator } from '@shikijs/core/types';
-
-/**
- * @deprecated Use `import('shiki/wasm')` instead.
- */
-declare const getWasmInlined: WebAssemblyInstantiator;
-
-export { getWasmInlined as g };

package/dist/wasm-dynamic-K7LwWlz7.js

@@ -1,8 +0,0 @@
-import { warnDeprecated } from '@shikijs/core';
-
-const getWasmInlined = async (info) => {
-  warnDeprecated('`getWasmInlined` is deprecated. Use `import("shiki/wasm")` instead.');
-  return import('shiki/wasm').then((wasm) => wasm.default(info));
-};
-
-export { getWasmInlined as g };