@prosekit/extensions 0.7.14 → 0.7.15

package/dist/_tsup-dts-rollup.d.ts

@@ -2,6 +2,7 @@ import { Attrs } from '@prosekit/pm/model';
 import { Attrs as Attrs_2 } from 'prosemirror-model';
 import type { Awareness } from 'y-protocols/awareness';
 import { BaseCommandsExtension } from '@prosekit/core';
+import type { BundledHighlighterOptions } from 'shiki';
 import { BundledLanguage } from 'shiki';
 import { BundledLanguageInfo } from 'shiki';
 import { bundledLanguagesInfo } from 'shiki';
@@ -22,7 +23,6 @@ import { ExtractMarkActions } from '@prosekit/core';
 import { ExtractNodeActions } from '@prosekit/core';
 import { FindParentNodeResult } from '@prosekit/core';
 import { GapCursor } from 'prosemirror-gapcursor';
-import { getSingletonHighlighter } from 'shiki/bundle/full';
 import type { Highlighter } from 'shiki';
 import { HistoryExtension } from '@prosekit/core';
 import { IndentListOptions } from 'prosemirror-flat-list';
@@ -199,28 +199,28 @@ export { CodeBlockHighlightOptions }
 export { CodeBlockHighlightOptions as CodeBlockHighlightOptions_alias_1 }
 
 /**
+ * The options to configure the Shiki highlighter.
+ *
  * @public
  */
-export declare interface CodeBlockShikiOptions {
+export declare interface CodeBlockShikiOptions extends Omit<ShikiHighlighterOptions, 'themes' | 'langs' | 'engine'> {
     /**
-     * A list of shiki themes to pre-load. The first theme in the list will be
+     * A list of Shiki themes to pre-load. The first theme in the list will be
      * used to render the code block.
      *
      * @default ['one-dark-pro']
      */
     themes?: BundledTheme[];
     /**
-     * A list of shiki languages to pre-load.
+     * A list of Shiki languages to pre-load.
      *
      * @default ['text']
      */
     langs?: (BundledLanguage | SpecialLanguage)[];
     /**
-     * Alias of languages
-     *
-     * @example { 'my-lang': 'javascript' }
+     * The RegExp engine to use. By default, the JavaScript engine is used.
      */
-    langAlias?: Record<string, BundledLanguage>;
+    engine?: ShikiHighlighterOptions['engine'];
 }
 
 /**
@@ -309,6 +309,10 @@ export declare function createLazyParser(highlighterOptions: HighlighterOptions)
  */
 export declare function createMarkInputRule({ regex, type, attrs, }: MarkInputRuleOptions): InputRule;
 
+export declare function createOrGetHighlighter(options: HighlighterOptions): HighlighterResult;
+
+export declare function createOrGetHighlighter_alias_1(options: HighlighterOptions): HighlighterResult;
+
 export { DedentListOptions }
 
 export declare const default_alias: Options | Options[] | ((overrideOptions: Options) => Options | Options[] | Promise<Options | Options[]>);
@@ -426,13 +430,13 @@ export { defineCodeBlockInputRule as defineCodeBlockInputRule_alias_1 }
 export declare function defineCodeBlockKeymap(): PlainExtension;
 
 /**
- * Adds syntax highlighting to code blocks using the [shiki](https://github.com/shikijs/shiki) package.
+ * Adds syntax highlighting to code blocks using the [Shiki](https://github.com/shikijs/shiki) package.
  *
- * @param options
+ * @param options - The options to configure the Shiki highlighter.
  *
  * @public
  */
-declare function defineCodeBlockShiki({ themes, langs, langAlias, }?: CodeBlockShikiOptions): Extension;
+declare function defineCodeBlockShiki({ themes, langs, ...rest }?: CodeBlockShikiOptions): Extension;
 export { defineCodeBlockShiki }
 export { defineCodeBlockShiki as defineCodeBlockShiki_alias_1 }
 
@@ -1124,8 +1128,6 @@ export declare function getCheckRanges(transactions: readonly Transaction[], old
 
 export declare function getPluginState(state: EditorState): PredictionPluginState | undefined;
 
-export { getSingletonHighlighter }
-
 export declare function getTrMeta(tr: Transaction): PredictionPluginState;
 
 declare interface HeadingAttrs {
@@ -1166,13 +1168,14 @@ declare type HeadingSpecExtension = Extension<{
 export { HeadingSpecExtension }
 export { HeadingSpecExtension as HeadingSpecExtension_alias_1 }
 
-export declare type HighlighterOptions = {
+declare interface HighlighterOptions extends Omit<ShikiHighlighterOptions, 'themes' | 'langs'> {
     themes: BundledTheme[];
     langs: (BundledLanguage | SpecialLanguage)[];
-    langAlias?: Record<string, BundledLanguage>;
-};
+}
+export { HighlighterOptions }
+export { HighlighterOptions as HighlighterOptions_alias_1 }
 
-declare type HighlighterResult = {
+export declare type HighlighterResult = {
     highlighter: Highlighter;
     promise?: undefined;
 } | {
@@ -1532,8 +1535,6 @@ export declare interface PredictionPluginState {
     } | null;
 }
 
-export declare function prepareHighlighter(options: HighlighterOptions): HighlighterResult;
-
 /**
  * @example
  *
@@ -1790,6 +1791,9 @@ export declare function setupTestFromExtension<E extends Extension>(extension: E
     m: ExtractMarkActions<E>;
 };
 
+export declare interface ShikiHighlighterOptions extends BundledHighlighterOptions<BundledLanguage, BundledTheme> {
+}
+
 /**
  * @internal
  */

package/dist/prosekit-extensions-code-block.js

@@ -142,59 +142,32 @@ function defineCodeBlockHighlight({
 import { createParser } from "prosemirror-highlight/shiki";
 
 // src/code-block/shiki-highlighter.ts
-var highlighter;
-var loadedLangs = /* @__PURE__ */ new Set();
-var loadedThemes = /* @__PURE__ */ new Set();
-async function createHighlighter(options) {
-  const { getSingletonHighlighter } = await import("./shiki-import-UFUFVKJ2.js");
-  if (!highlighter) {
-    highlighter = await getSingletonHighlighter(options);
-  }
-}
-async function loadLanguages(langs) {
-  for (const lang of langs) {
-    if (!highlighter) break;
-    await highlighter.loadLanguage(lang);
-    loadedLangs.add(lang);
-  }
+var loaded;
+async function load() {
+  const { createOrGetHighlighter: createOrGetHighlighter2 } = await import("./shiki-highlighter-chunk-C5VVQ2TD.js");
+  loaded = createOrGetHighlighter2;
 }
-async function loadThemes(themes) {
-  for (const theme of themes) {
-    if (!highlighter) break;
-    await highlighter.loadTheme(theme);
-    loadedThemes.add(theme);
-  }
-}
-function prepareHighlighter(options) {
-  if (!highlighter) {
-    return { promise: createHighlighter(options) };
-  }
-  const langs = options.langs.filter((lang) => !loadedLangs.has(lang));
-  if (langs.length > 0) {
-    return { promise: loadLanguages(langs) };
-  }
-  const themes = options.themes.filter((theme) => !loadedThemes.has(theme));
-  if (themes.length > 0) {
-    return { promise: loadThemes(themes) };
+function createOrGetHighlighter(options) {
+  if (!loaded) {
+    return { promise: load() };
   }
-  return { highlighter };
+  return loaded(options);
 }
 
 // src/code-block/shiki-parser.ts
 function createLazyParser(highlighterOptions) {
   let parser;
-  prepareHighlighter(highlighterOptions);
   return function lazyParser(options) {
     const language = options.language || "";
-    const { highlighter: highlighter2, promise } = prepareHighlighter({
-      langs: [language],
-      themes: highlighterOptions.themes
+    const { highlighter, promise } = createOrGetHighlighter({
+      ...highlighterOptions,
+      langs: [language]
     });
-    if (!highlighter2) {
+    if (!highlighter) {
       return promise;
     }
     if (!parser) {
-      parser = createParser(highlighter2, {
+      parser = createParser(highlighter, {
         theme: highlighterOptions.themes[0]
       });
     }
@@ -206,9 +179,9 @@ function createLazyParser(highlighterOptions) {
 function defineCodeBlockShiki({
   themes = ["one-dark-pro"],
   langs = ["text"],
-  langAlias = {}
+  ...rest
 } = {}) {
-  const parser = createLazyParser({ themes, langs, langAlias });
+  const parser = createLazyParser({ themes, langs, ...rest });
   return defineCodeBlockHighlight({ parser });
 }
 

package/dist/shiki-highlighter-chunk-C5VVQ2TD.js

@@ -0,0 +1,50 @@
+// src/code-block/shiki-highlighter-chunk.ts
+import {
+  createHighlighter,
+  createJavaScriptRegexEngine
+} from "shiki/bundle/full";
+var highlighter;
+var loadedLangs = /* @__PURE__ */ new Set();
+var loadedThemes = /* @__PURE__ */ new Set();
+async function createAndCacheHighlighter({
+  ...options
+}) {
+  if (!highlighter) {
+    if (!options.engine) {
+      const engine = createJavaScriptRegexEngine();
+      options.engine = engine;
+    }
+    highlighter = await createHighlighter(options);
+  }
+}
+async function loadLanguages(langs) {
+  for (const lang of langs) {
+    if (!highlighter) break;
+    await highlighter.loadLanguage(lang);
+    loadedLangs.add(lang);
+  }
+}
+async function loadThemes(themes) {
+  for (const theme of themes) {
+    if (!highlighter) break;
+    await highlighter.loadTheme(theme);
+    loadedThemes.add(theme);
+  }
+}
+function createOrGetHighlighter(options) {
+  if (!highlighter) {
+    return { promise: createAndCacheHighlighter(options) };
+  }
+  const langs = options.langs.filter((lang) => !loadedLangs.has(lang));
+  if (langs.length > 0) {
+    return { promise: loadLanguages(langs) };
+  }
+  const themes = options.themes.filter((theme) => !loadedThemes.has(theme));
+  if (themes.length > 0) {
+    return { promise: loadThemes(themes) };
+  }
+  return { highlighter };
+}
+export {
+  createOrGetHighlighter
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@prosekit/extensions",
   "type": "module",
-  "version": "0.7.14",
+  "version": "0.7.15",
   "private": false,
   "author": {
     "name": "ocavue",
@@ -209,7 +209,7 @@
     "prosemirror-highlight": "^0.8.0",
     "prosemirror-search": "^1.0.0",
     "prosemirror-tables": "^1.5.0",
-    "shiki": "^1.14.1",
+    "shiki": "^1.15.2",
     "@prosekit/core": "^0.7.10",
     "@prosekit/pm": "^0.1.8"
   },

package/dist/shiki-import-UFUFVKJ2.js

@@ -1,5 +0,0 @@
-// src/code-block/shiki-import.ts
-import { getSingletonHighlighter } from "shiki/bundle/full";
-export {
-  getSingletonHighlighter
-};