@shikijs/rehype 2.1.0 → 2.3.0

package/dist/core.d.mts

@@ -1,8 +1,8 @@
 import { HighlighterGeneric } from '@shikijs/types';
 import { Root } from 'hast';
 import { Transformer } from 'unified';
-import { R as RehypeShikiCoreOptions } from './shared/rehype.C-9yBNNX.mjs';
-export { M as MapLike, a as RehypeShikiExtraOptions } from './shared/rehype.C-9yBNNX.mjs';
+import { R as RehypeShikiCoreOptions } from './shared/rehype.DcMmi29I.mjs';
+export { M as MapLike, a as RehypeShikiExtraOptions } from './shared/rehype.DcMmi29I.mjs';
 import 'shiki';
 
 declare function rehypeShikiFromHighlighter(highlighter: HighlighterGeneric<any, any>, options: RehypeShikiCoreOptions): Transformer<Root, Root>;

package/dist/core.d.ts

@@ -1,8 +1,8 @@
 import { HighlighterGeneric } from '@shikijs/types';
 import { Root } from 'hast';
 import { Transformer } from 'unified';
-import { R as RehypeShikiCoreOptions } from './shared/rehype.C-9yBNNX.js';
-export { M as MapLike, a as RehypeShikiExtraOptions } from './shared/rehype.C-9yBNNX.js';
+import { R as RehypeShikiCoreOptions } from './shared/rehype.DcMmi29I.js';
+export { M as MapLike, a as RehypeShikiExtraOptions } from './shared/rehype.DcMmi29I.js';
 import 'shiki';
 
 declare function rehypeShikiFromHighlighter(highlighter: HighlighterGeneric<any, any>, options: RehypeShikiCoreOptions): Transformer<Root, Root>;

package/dist/core.mjs

@@ -95,35 +95,34 @@ function rehypeShikiFromHighlighter(highlighter, options) {
         return;
       if (node.tagName === "pre") {
         handler = PreHandler;
-      }
-      if (node.tagName === "code" && inline) {
+      } else if (node.tagName === "code" && inline) {
         handler = InlineCodeHandlers[inline];
-      }
-      if (!handler)
+      } else {
         return;
-      const res = handler(tree, node);
-      if (!res)
+      }
+      const parsed = handler(tree, node);
+      if (!parsed)
         return;
       let lang;
       let lazyLoad = false;
-      if (!res.lang) {
+      if (!parsed.lang) {
         lang = defaultLanguage;
-      } else if (highlighter.getLoadedLanguages().includes(res.lang) || isSpecialLang(res.lang)) {
-        lang = res.lang;
+      } else if (highlighter.getLoadedLanguages().includes(parsed.lang) || isSpecialLang(parsed.lang)) {
+        lang = parsed.lang;
       } else if (lazy) {
         lazyLoad = true;
-        lang = res.lang;
+        lang = parsed.lang;
       } else if (fallbackLanguage) {
         lang = fallbackLanguage;
       }
       if (!lang)
         return;
-      const processNode = () => {
-        const meta = res.meta ? parseMetaString?.(res.meta, node, tree) : undefined;
-        const fragment = highlight(lang, res.code, res.meta, meta ?? {});
+      const meta = parsed.meta ? parseMetaString?.(parsed.meta, node, tree) : undefined;
+      const processNode = (targetLang) => {
+        const fragment = highlight(targetLang, parsed.code, parsed.meta, meta ?? {});
         if (!fragment)
           return;
-        if (res.type === "inline") {
+        if (parsed.type === "inline") {
           const head = fragment.children[0];
           if (head.type === "element" && head.tagName === "pre") {
             head.tagName = "span";
@@ -132,9 +131,17 @@ function rehypeShikiFromHighlighter(highlighter, options) {
         parent.children[index] = fragment;
       };
       if (lazyLoad) {
-        queue.push(highlighter.loadLanguage(lang).then(() => processNode()));
+        try {
+          queue.push(highlighter.loadLanguage(lang).then(() => processNode(lang)));
+        } catch (error) {
+          if (fallbackLanguage)
+            return processNode(fallbackLanguage);
+          else if (onError)
+            onError(error);
+          else throw error;
+        }
       } else {
-        processNode();
+        processNode(lang);
       }
       return "skip";
     });

package/dist/index.d.mts

@@ -2,7 +2,7 @@ import { LanguageInput } from '@shikijs/types';
 import { Root } from 'hast';
 import { BuiltinLanguage } from 'shiki';
 import { Plugin } from 'unified';
-import { R as RehypeShikiCoreOptions } from './shared/rehype.C-9yBNNX.mjs';
+import { R as RehypeShikiCoreOptions } from './shared/rehype.DcMmi29I.mjs';
 
 type RehypeShikiOptions = RehypeShikiCoreOptions & {
     /**

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { LanguageInput } from '@shikijs/types';
 import { Root } from 'hast';
 import { BuiltinLanguage } from 'shiki';
 import { Plugin } from 'unified';
-import { R as RehypeShikiCoreOptions } from './shared/rehype.C-9yBNNX.js';
+import { R as RehypeShikiCoreOptions } from './shared/rehype.DcMmi29I.js';
 
 type RehypeShikiOptions = RehypeShikiCoreOptions & {
     /**

package/dist/shared/{rehype.C-9yBNNX.d.mts → rehype.DcMmi29I.d.mts}

@@ -17,9 +17,7 @@ interface RehypeShikiExtraOptions {
      */
     defaultLanguage?: string;
     /**
-     * The fallback language to use when specified language is not loaded
-     *
-     * Ignored if `lazy` is enabled
+     * The fallback language to use when specified language is not loaded, or not included in the bundle
      */
     fallbackLanguage?: string;
     /**

package/dist/shared/{rehype.C-9yBNNX.d.ts → rehype.DcMmi29I.d.ts}

@@ -17,9 +17,7 @@ interface RehypeShikiExtraOptions {
      */
     defaultLanguage?: string;
     /**
-     * The fallback language to use when specified language is not loaded
-     *
-     * Ignored if `lazy` is enabled
+     * The fallback language to use when specified language is not loaded, or not included in the bundle
      */
     fallbackLanguage?: string;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/rehype",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "rehype integration for shiki",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -49,15 +49,15 @@
     "hast-util-to-string": "^3.0.1",
     "unified": "^11.0.5",
     "unist-util-visit": "^5.0.0",
-    "@shikijs/types": "2.1.0",
-    "shiki": "2.1.0"
+    "@shikijs/types": "2.3.0",
+    "shiki": "2.3.0"
   },
   "devDependencies": {
     "rehype-raw": "^7.0.0",
     "rehype-stringify": "^10.0.1",
     "remark-parse": "^11.0.0",
     "remark-rehype": "^11.1.1",
-    "@shikijs/transformers": "2.1.0"
+    "@shikijs/transformers": "2.3.0"
   },
   "scripts": {
     "build": "unbuild",