shiki 2.4.2 → 3.0.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,46 +1,6 @@
-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';
+import { HighlighterGeneric, Awaitable, CodeToHastOptions, CodeToTokensOptions, TokensResult, RequireKeys, CodeToTokensBaseOptions, ThemedToken, CodeToTokensWithThemesOptions, ThemedTokenWithVariants, BundledHighlighterOptions, GrammarState, ShikiInternal, ShikiTransformerContextCommon, ThemeRegistration, HighlighterCoreOptions, HighlighterCore, Position, CreateHighlighterFactory, 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, R as Root, E as Element } from './types/index.d.mjs';
-import { JavaScriptRegexEngineOptions } from '@shikijs/engine-javascript';
-
-declare const enum FontStyle {
-    NotSet = -1,
-    None = 0,
-    Italic = 1,
-    Bold = 2,
-    Underline = 4,
-    Strikethrough = 8
-}
-
-type EncodedTokenAttributes = number;
-declare class EncodedTokenMetadata {
-    static toBinaryStr(encodedTokenAttributes: EncodedTokenAttributes): string;
-    static print(encodedTokenAttributes: EncodedTokenAttributes): void;
-    static getLanguageId(encodedTokenAttributes: EncodedTokenAttributes): number;
-    static getTokenType(encodedTokenAttributes: EncodedTokenAttributes): StandardTokenType;
-    static containsBalancedBrackets(encodedTokenAttributes: EncodedTokenAttributes): boolean;
-    static getFontStyle(encodedTokenAttributes: EncodedTokenAttributes): number;
-    static getForeground(encodedTokenAttributes: EncodedTokenAttributes): number;
-    static getBackground(encodedTokenAttributes: EncodedTokenAttributes): number;
-    /**
-     * Updates the fields in `metadata`.
-     * A value of `0`, `NotSet` or `null` indicates that the corresponding field should be left as is.
-     */
-    static set(encodedTokenAttributes: EncodedTokenAttributes, languageId: number | 0, tokenType: OptionalStandardTokenType | OptionalStandardTokenType.NotSet, containsBalancedBrackets: boolean | null, fontStyle: FontStyle | FontStyle.NotSet, foreground: number | 0, background: number | 0): number;
-}
-declare const enum StandardTokenType {
-    Other = 0,
-    Comment = 1,
-    String = 2,
-    RegEx = 3
-}
-declare const enum OptionalStandardTokenType {
-    Other = 0,
-    Comment = 1,
-    String = 2,
-    RegEx = 3,
-    NotSet = 8
-}
 
 type FormatSmartOptions = {
     /**
@@ -281,12 +241,6 @@ type Space = "html" | "svg";
  * @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.
@@ -360,19 +314,11 @@ declare function createHighlighterCore(options: HighlighterCoreOptions<false>):
 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.
@@ -381,31 +327,10 @@ declare function getShikiInternal(options: HighlighterCoreOptions): Promise<Shik
  */
 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;
 
+declare const hastToHtml: typeof toHtml;
 /**
  * Get highlighted code in HTML.
  */
@@ -564,4 +489,4 @@ declare function enableDeprecationWarnings(emitDeprecation?: DeprecationTarget |
  */
 declare function warnDeprecated(message: string, version?: DeprecationTarget): void;
 
-export { type CreateSingletonShorthandsOptions, type CssVariablesThemeOptions, FontStyle, type ShorthandsBundle, EncodedTokenMetadata as StackElementMetadata, 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 { type CreateSingletonShorthandsOptions, type CssVariablesThemeOptions, type ShorthandsBundle, 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 };

package/dist/core.d.mts

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

package/dist/engine-javascript.d.mts

@@ -1,88 +1 @@
-import { PatternScanner, RegexEngineString, RegexEngine } from '@shikijs/types';
-import { IOnigMatch } from '@shikijs/vscode-textmate';
-
-type ToRegExpOptions = {
-    accuracy?: "default" | "strict";
-    avoidSubclass?: boolean;
-    flags?: string;
-    global?: boolean;
-    hasIndices?: boolean;
-    lazyCompileLength?: number;
-    rules?: {
-        allowOrphanBackrefs?: boolean;
-        asciiWordBoundaries?: boolean;
-        captureGroup?: boolean;
-        recursionLimit?: number;
-        singleline?: boolean;
-    };
-    target?: "auto" | "ES2025" | "ES2024" | "ES2018";
-    verbose?: boolean;
-};
-
-interface JavaScriptRegexScannerOptions {
-    /**
-     * Whether to allow invalid regex patterns.
-     *
-     * @default false
-     */
-    forgiving?: boolean;
-    /**
-     * Cache for regex patterns.
-     */
-    cache?: Map<string, RegExp | Error> | null;
-    /**
-     * Custom pattern to RegExp constructor.
-     *
-     * By default `oniguruma-to-es` is used.
-     */
-    regexConstructor?: (pattern: string) => RegExp;
-}
-declare class JavaScriptScanner implements PatternScanner {
-    patterns: (string | RegExp)[];
-    options: JavaScriptRegexScannerOptions;
-    regexps: (RegExp | null)[];
-    constructor(patterns: (string | RegExp)[], options?: JavaScriptRegexScannerOptions);
-    findNextMatchSync(string: string | RegexEngineString, startPosition: number, _options: number): IOnigMatch | null;
-}
-
-interface JavaScriptRegexEngineOptions extends JavaScriptRegexScannerOptions {
-    /**
-     * The target ECMAScript version.
-     *
-     * Oniguruma-To-ES uses RegExp features from later versions of ECMAScript to add support for a
-     * few more grammars. If using target `ES2024` or later, the RegExp `v` flag is used which
-     * requires Node.js 20+ or Chrome 112+.
-     * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/unicodeSets
-     *
-     * For maximum compatibility, you can set it to `ES2018` which uses the RegExp `u` flag.
-     *
-     * Set to `auto` to automatically detect the latest version supported by the environment.
-     *
-     * @default 'auto'
-     */
-    target?: 'auto' | 'ES2025' | 'ES2024' | 'ES2018';
-}
-/**
- * The default regex constructor for the JavaScript RegExp engine.
- */
-declare function defaultJavaScriptRegexConstructor(pattern: string, options?: ToRegExpOptions): RegExp;
-/**
- * Use the modern JavaScript RegExp engine to implement the OnigScanner.
- *
- * As Oniguruma supports some features that can't be emulated using native JavaScript regexes, some
- * patterns are not supported. Errors will be thrown when parsing TextMate grammars with
- * unsupported patterns, and when the grammar includes patterns that use invalid Oniguruma syntax.
- * Set `forgiving` to `true` to ignore these errors and skip any unsupported or invalid patterns.
- */
-declare function createJavaScriptRegexEngine(options?: JavaScriptRegexEngineOptions): RegexEngine;
-
-/**
- * Raw JavaScript regex engine that only supports precompiled grammars.
- *
- * This further simplifies the engine by excluding the regex compilation step.
- *
- * Zero dependencies.
- */
-declare function createJavaScriptRawEngine(): RegexEngine;
-
-export { type JavaScriptRegexEngineOptions, type JavaScriptRegexScannerOptions, JavaScriptScanner, createJavaScriptRawEngine, createJavaScriptRegexEngine, defaultJavaScriptRegexConstructor };
+export * from '@shikijs/engine-javascript';

package/dist/engine-oniguruma.d.mts

@@ -1 +1,83 @@
-export * from '@shikijs/engine-oniguruma';
+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 };

package/dist/index.d.mts

@@ -1,84 +1,10 @@
-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 { createOnigurumaEngine, loadWasm } from './engine-oniguruma.mjs';
 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 '@shikijs/types';
 import '@shikijs/core/types';
-
-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>;
-declare function createOnigurumaEngine(options?: LoadWasmOptions | null): Promise<RegexEngine>;
-
-export { createOnigurumaEngine, loadWasm };

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shiki",
   "type": "module",
-  "version": "2.4.2",
+  "version": "3.0.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,56 +42,18 @@
   "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/engine-javascript": "2.4.2",
-    "@shikijs/core": "2.4.2",
-    "@shikijs/engine-oniguruma": "2.4.2",
-    "@shikijs/themes": "2.4.2",
-    "@shikijs/langs": "2.4.2",
-    "@shikijs/types": "2.4.2"
+    "@shikijs/core": "3.0.0",
+    "@shikijs/engine-javascript": "3.0.0",
+    "@shikijs/engine-oniguruma": "3.0.0",
+    "@shikijs/themes": "3.0.0",
+    "@shikijs/langs": "3.0.0",
+    "@shikijs/types": "3.0.0"
   },
   "devDependencies": {
     "rollup-plugin-copy": "^3.5.0",

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 };