@shikijs/rehype 4.0.1 → 4.1.0

package/dist/core-BUhjvszS.mjs

@@ -0,0 +1,116 @@
+import { isSpecialLang } from "shiki/core";
+import { visit } from "unist-util-visit";
+import { toString } from "hast-util-to-string";
+//#region src/handlers.ts
+const RE_TAILING_CURLY_COLON = /(.+)\{:([\w-]+)\}$/;
+const InlineCodeHandlers = { "tailing-curly-colon": (_tree, node) => {
+	const raw = toString(node);
+	const match = raw.match(RE_TAILING_CURLY_COLON);
+	if (!match) return;
+	return {
+		type: "inline",
+		code: match[1] ?? raw,
+		lang: match.at(2)
+	};
+} };
+const languagePrefix$1 = "language-";
+const PreHandler = (_tree, node) => {
+	const head = node.children[0];
+	if (!head || head.type !== "element" || head.tagName !== "code" || !head.properties) return;
+	const classes = head.properties.className;
+	const languageClass = Array.isArray(classes) ? classes.find((d) => typeof d === "string" && d.startsWith(languagePrefix$1)) : void 0;
+	return {
+		type: "pre",
+		lang: typeof languageClass === "string" ? languageClass.slice(9) : void 0,
+		code: toString(head),
+		meta: head.data?.meta ?? head.properties.metastring?.toString() ?? ""
+	};
+};
+//#endregion
+//#region src/core.ts
+const languagePrefix = "language-";
+function rehypeShikiFromHighlighter(highlighter, options) {
+	const { addLanguageClass = false, parseMetaString, cache, defaultLanguage, fallbackLanguage, onError, stripEndNewline = true, inline = false, lazy = false, ...rest } = options;
+	function highlight(lang, code, metaString = "", meta = {}) {
+		const cacheKey = `${lang}:${metaString}:${code}`;
+		const cachedValue = cache?.get(cacheKey);
+		if (cachedValue) return cachedValue;
+		const codeOptions = {
+			...rest,
+			lang,
+			meta: {
+				...rest.meta,
+				...meta,
+				__raw: metaString
+			}
+		};
+		if (addLanguageClass) codeOptions.transformers = [...codeOptions.transformers ?? [], {
+			name: "rehype-shiki:code-language-class",
+			code(node) {
+				this.addClassToHast(node, `${languagePrefix}${lang}`);
+				return node;
+			}
+		}];
+		if (stripEndNewline && code.endsWith("\n")) code = code.slice(0, -1);
+		try {
+			const fragment = highlighter.codeToHast(code, codeOptions);
+			cache?.set(cacheKey, fragment);
+			return fragment;
+		} catch (error) {
+			if (onError) onError(error);
+			else throw error;
+		}
+	}
+	return (tree) => {
+		const queue = [];
+		visit(tree, "element", (node, index, parent) => {
+			let handler;
+			if (!parent || index == null) return;
+			if (node.tagName === "pre") handler = PreHandler;
+			else if (node.tagName === "code" && inline) handler = InlineCodeHandlers[inline];
+			else return;
+			const parsed = handler(tree, node);
+			if (!parsed) return;
+			let lang;
+			let lazyLoad = false;
+			if (!parsed.lang) lang = defaultLanguage;
+			else if (highlighter.getLoadedLanguages().includes(parsed.lang) || isSpecialLang(parsed.lang)) lang = parsed.lang;
+			else if (lazy) {
+				lazyLoad = true;
+				lang = parsed.lang;
+			} else if (fallbackLanguage) lang = fallbackLanguage;
+			if (!lang) return;
+			const meta = parsed.meta ? parseMetaString?.(parsed.meta, node, tree) : void 0;
+			const processNode = (targetLang) => {
+				const fragment = highlight(targetLang, parsed.code, parsed.meta, meta ?? {});
+				if (!fragment) return;
+				if (parsed.type === "inline") {
+					const head = fragment.children[0];
+					if (head.type === "element" && head.tagName === "pre") head.tagName = "span";
+				}
+				parent.children[index] = fragment;
+			};
+			if (lazyLoad) try {
+				queue.push(highlighter.loadLanguage(lang).then(() => processNode(lang)).catch((error) => {
+					if (fallbackLanguage) processNode(fallbackLanguage);
+					else if (onError) onError(error);
+					else throw error;
+				}));
+			} catch (error) {
+				if (fallbackLanguage) return processNode(fallbackLanguage);
+				else if (onError) onError(error);
+				else throw error;
+			}
+			else processNode(lang);
+			return "skip";
+		});
+		if (queue.length > 0) {
+			async function run() {
+				await Promise.all(queue);
+			}
+			return run();
+		}
+	};
+}
+//#endregion
+export { rehypeShikiFromHighlighter as t };

package/dist/core.d.mts

@@ -1,4 +1,4 @@
-import { n as RehypeShikiCoreOptions, r as RehypeShikiExtraOptions, t as MapLike } from "./types-Wi2EaRpk.mjs";
+import { n as RehypeShikiCoreOptions, r as RehypeShikiExtraOptions, t as MapLike } from "./types-BfH8cGz-.mjs";
 import { HighlighterGeneric } from "@shikijs/types";
 import { Root } from "hast";
 import { Transformer } from "unified";

package/dist/core.mjs

@@ -1,92 +1,2 @@
-import { n as PreHandler, t as InlineCodeHandlers } from "./handlers-DyniaZhL.mjs";
-import { isSpecialLang } from "shiki/core";
-import { visit } from "unist-util-visit";
-
-//#region src/core.ts
-const languagePrefix = "language-";
-function rehypeShikiFromHighlighter(highlighter, options) {
-	const { addLanguageClass = false, parseMetaString, cache, defaultLanguage, fallbackLanguage, onError, stripEndNewline = true, inline = false, lazy = false, ...rest } = options;
-	function highlight(lang, code, metaString = "", meta = {}) {
-		const cacheKey = `${lang}:${metaString}:${code}`;
-		const cachedValue = cache?.get(cacheKey);
-		if (cachedValue) return cachedValue;
-		const codeOptions = {
-			...rest,
-			lang,
-			meta: {
-				...rest.meta,
-				...meta,
-				__raw: metaString
-			}
-		};
-		if (addLanguageClass) codeOptions.transformers = [...codeOptions.transformers ?? [], {
-			name: "rehype-shiki:code-language-class",
-			code(node) {
-				this.addClassToHast(node, `${languagePrefix}${lang}`);
-				return node;
-			}
-		}];
-		if (stripEndNewline && code.endsWith("\n")) code = code.slice(0, -1);
-		try {
-			const fragment = highlighter.codeToHast(code, codeOptions);
-			cache?.set(cacheKey, fragment);
-			return fragment;
-		} catch (error) {
-			if (onError) onError(error);
-			else throw error;
-		}
-	}
-	return (tree) => {
-		const queue = [];
-		visit(tree, "element", (node, index, parent) => {
-			let handler;
-			if (!parent || index == null) return;
-			if (node.tagName === "pre") handler = PreHandler;
-			else if (node.tagName === "code" && inline) handler = InlineCodeHandlers[inline];
-			else return;
-			const parsed = handler(tree, node);
-			if (!parsed) return;
-			let lang;
-			let lazyLoad = false;
-			if (!parsed.lang) lang = defaultLanguage;
-			else if (highlighter.getLoadedLanguages().includes(parsed.lang) || isSpecialLang(parsed.lang)) lang = parsed.lang;
-			else if (lazy) {
-				lazyLoad = true;
-				lang = parsed.lang;
-			} else if (fallbackLanguage) lang = fallbackLanguage;
-			if (!lang) return;
-			const meta = parsed.meta ? parseMetaString?.(parsed.meta, node, tree) : void 0;
-			const processNode = (targetLang) => {
-				const fragment = highlight(targetLang, parsed.code, parsed.meta, meta ?? {});
-				if (!fragment) return;
-				if (parsed.type === "inline") {
-					const head = fragment.children[0];
-					if (head.type === "element" && head.tagName === "pre") head.tagName = "span";
-				}
-				parent.children[index] = fragment;
-			};
-			if (lazyLoad) try {
-				queue.push(highlighter.loadLanguage(lang).then(() => processNode(lang)).catch((error) => {
-					if (fallbackLanguage) processNode(fallbackLanguage);
-					else if (onError) onError(error);
-					else throw error;
-				}));
-			} catch (error) {
-				if (fallbackLanguage) return processNode(fallbackLanguage);
-				else if (onError) onError(error);
-				else throw error;
-			}
-			else processNode(lang);
-			return "skip";
-		});
-		if (queue.length > 0) {
-			async function run() {
-				await Promise.all(queue);
-			}
-			return run();
-		}
-	};
-}
-
-//#endregion
-export { rehypeShikiFromHighlighter as default };
+import { t as rehypeShikiFromHighlighter } from "./core-BUhjvszS.mjs";
+export { rehypeShikiFromHighlighter as default };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { n as RehypeShikiCoreOptions } from "./types-Wi2EaRpk.mjs";
+import { n as RehypeShikiCoreOptions } from "./types-BfH8cGz-.mjs";
 import { BuiltinLanguage } from "shiki";
 import { LanguageInput } from "@shikijs/types";
 import { Root } from "hast";

package/dist/index.mjs

@@ -1,6 +1,5 @@
-import rehypeShikiFromHighlighter from "./core.mjs";
+import { t as rehypeShikiFromHighlighter } from "./core-BUhjvszS.mjs";
 import { bundledLanguages, getSingletonHighlighter } from "shiki";
-
 //#region src/index.ts
 const rehypeShiki = function(options = {}) {
 	const themeNames = ("themes" in options ? Object.values(options.themes) : [options.theme]).filter(Boolean);
@@ -16,6 +15,5 @@ const rehypeShiki = function(options = {}) {
 		return (await getHandler)(tree);
 	};
 };
-
 //#endregion
-export { rehypeShiki as default };
+export { rehypeShiki as default };

package/package.json

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

package/dist/handlers-DyniaZhL.mjs

@@ -1,29 +0,0 @@
-import { toString } from "hast-util-to-string";
-
-//#region src/handlers.ts
-const InlineCodeHandlers = { "tailing-curly-colon": (_tree, node) => {
-	const raw = toString(node);
-	const match = raw.match(/(.+)\{:([\w-]+)\}$/);
-	if (!match) return;
-	return {
-		type: "inline",
-		code: match[1] ?? raw,
-		lang: match.at(2)
-	};
-} };
-const languagePrefix = "language-";
-const PreHandler = (_tree, node) => {
-	const head = node.children[0];
-	if (!head || head.type !== "element" || head.tagName !== "code" || !head.properties) return;
-	const classes = head.properties.className;
-	const languageClass = Array.isArray(classes) ? classes.find((d) => typeof d === "string" && d.startsWith(languagePrefix)) : void 0;
-	return {
-		type: "pre",
-		lang: typeof languageClass === "string" ? languageClass.slice(9) : void 0,
-		code: toString(head),
-		meta: head.data?.meta ?? head.properties.metastring?.toString() ?? ""
-	};
-};
-
-//#endregion
-export { PreHandler as n, InlineCodeHandlers as t };