@clarify-labs/cli 0.10.1 → 0.10.2

package/output/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_engine = require("./engine-5bdNX2Oo.cjs");
+const require_engine = require("./engine-qafLfnXQ.cjs");
 let node_path = require("node:path");
 let node_fs_promises = require("node:fs/promises");
 let node_fs = require("node:fs");

package/output/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as cliPackageVersion, i as createClarifyTempDir, n as createClarifyEngine, o as cliPackageVersionWithCaret, r as createClarifyRuntimeAliases, s as createViteAdapter } from "./engine-Ca_2MCj9.js";
+import { a as cliPackageVersion, i as createClarifyTempDir, n as createClarifyEngine, o as cliPackageVersionWithCaret, r as createClarifyRuntimeAliases, s as createViteAdapter } from "./engine-CSSL_gGd.js";
 import { dirname, extname, isAbsolute, join, normalize, relative, resolve } from "node:path";
 import { lstat, readFile, stat, writeFile } from "node:fs/promises";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";

package/output/{engine-Ca_2MCj9.js → engine-CSSL_gGd.js}

@@ -2,13 +2,16 @@ import { dirname, extname, isAbsolute, join, relative, resolve } from "node:path
 import mdxPlugin from "@mdx-js/rollup";
 import tailwindcss from "@tailwindcss/vite";
 import react from "@vitejs/plugin-react";
+import rehypeRaw from "rehype-raw";
 import { compile } from "@mdx-js/mdx";
-import GithubSlugger, { slug } from "github-slugger";
-import { toString } from "mdast-util-to-string";
-import { bundledLanguages, createCssVariablesTheme, createHighlighter } from "shiki";
+import rehypeShiki from "@shikijs/rehype";
+import rehypeSlug from "rehype-slug";
+import { createCssVariablesTheme } from "shiki";
 import { visit } from "unist-util-visit";
-import { markdownRemarkPlugins, themeBootstrapScript, themePresets } from "@clarify-labs/renderer";
+import { markdownRemarkPlugins, parseCodeMeta, themeBootstrapScript, themePresets } from "@clarify-labs/renderer";
 import { readFile, readdir, stat } from "node:fs/promises";
+import GithubSlugger, { slug } from "github-slugger";
+import { toString } from "mdast-util-to-string";
 import { remark } from "remark";
 import matter from "gray-matter";
 import { createReadStream, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
@@ -19,38 +22,11 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import SwaggerParser from "@apidevtools/swagger-parser";
 import { tmpdir } from "node:os";
 import { createRequire } from "node:module";
-//#region source/parsers/markdown/utils.ts
-function escapeHtml(text) {
-	return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
-}
-//#endregion
 //#region source/parsers/markdown/mdx.ts
 function getLanguage(className) {
 	return (Array.isArray(className) ? className : typeof className === "string" ? className.split(/\s+/) : []).find((item) => typeof item === "string" && item.startsWith("language-"))?.replace(/^language-/, "") || "txt";
 }
-function getTextContent(node) {
-	if (!node) return "";
-	if (typeof node.value === "string") return node.value;
-	return node.children?.map(getTextContent).join("") ?? "";
-}
-function renderPlainCode(code) {
-	return code.split("\n").map((line) => `<span>${escapeHtml(line)}</span>`).join("\n");
-}
-function isBundledLanguage(language) {
-	return language in bundledLanguages;
-}
-var highlighterPromise;
 var cssVariablesTheme = createCssVariablesTheme();
-async function getHighlighter() {
-	highlighterPromise = highlighterPromise ?? createHighlighter({
-		themes: [cssVariablesTheme],
-		langs: []
-	});
-	return highlighterPromise;
-}
-function renderHighlightedCode(html) {
-	return (/<code[^>]*>([\s\S]*?)<\/code>/.exec(html)?.[1] ?? html).split("\n").map((line) => line.trimStart().startsWith("<span") ? line : `<span>${line}</span>`).join("\n");
-}
 function rehypeParseCodeBlocks() {
 	return (tree) => {
 		visit(tree, "element", (node, _nodeIndex, parentNode) => {
@@ -68,61 +44,18 @@ function rehypeParseCodeBlocks() {
 		});
 	};
 }
-function rehypeShiki() {
-	return async (tree) => {
-		const shikiHighlighter = await getHighlighter();
-		const languages = /* @__PURE__ */ new Set();
-		visit(tree, "element", (node) => {
-			if (node.tagName !== "pre") return;
-			const codeNode = node.children?.[0];
-			if (codeNode?.tagName !== "code") return;
-			const language = typeof node.properties?.language === "string" ? node.properties.language : getLanguage(codeNode.properties?.className);
-			if (language && language !== "txt" && isBundledLanguage(language)) languages.add(language);
-		});
-		if (languages.size > 0) await shikiHighlighter.loadLanguage(...languages);
-		visit(tree, "element", (node) => {
-			if (node.tagName !== "pre") return;
-			const codeNode = node.children?.[0];
-			if (codeNode?.tagName !== "code") return;
-			node.properties = node.properties ?? {};
-			codeNode.properties = codeNode.properties ?? {};
-			const code = getTextContent(codeNode);
-			const language = typeof node.properties.language === "string" ? node.properties.language : getLanguage(codeNode.properties.className);
-			node.properties.code = code;
-			codeNode.properties.code = code;
-			codeNode.properties.language = language;
-			let highlighted = renderPlainCode(code);
-			if (language && language !== "txt") try {
-				highlighted = renderHighlightedCode(shikiHighlighter.codeToHtml(code, {
-					lang: language,
-					theme: cssVariablesTheme
-				}));
-			} catch {
-				highlighted = renderPlainCode(code);
-			}
-			codeNode.children = [{
-				type: "text",
-				value: highlighted
-			}];
-		});
-	};
-}
-function rehypeSlugSections() {
-	return (tree) => {
-		const slugger = new GithubSlugger();
-		visit(tree, "element", (node) => {
-			if (node.tagName !== "h2" && node.tagName !== "h3") return;
-			node.properties = node.properties ?? {};
-			if (node.properties.id) return;
-			node.properties.id = slugger.slug(toString(node));
-		});
-	};
-}
 var remarkPlugins = markdownRemarkPlugins;
 var rehypePlugins = [
-	rehypeSlugSections,
+	rehypeSlug,
 	rehypeParseCodeBlocks,
-	rehypeShiki
+	[rehypeShiki, {
+		theme: cssVariablesTheme,
+		langs: [],
+		lazy: true,
+		addLanguageClass: true,
+		fallbackLanguage: "text",
+		parseMetaString: parseCodeMeta
+	}]
 ];
 function formatMdxDiagnostic(error) {
 	if (error instanceof Error) return error.message;
@@ -134,7 +67,8 @@ function formatMdxDiagnostic(error) {
 *
 * `rehypePlugins` includes `rehypeShiki`, which loads grammar/WASM assets and
 * is expensive. The real highlighting happens at Vite build time via the
-* `@mdx-js/rollup` plugin (see `createMdxPlugin` in `core/adapters.ts`), which
+* `@mdx-js/rollup` plugins (see `createMarkdownPlugin` and `createMdxPlugin`
+* in `core/adapters.ts`), which
 * runs the full remark + rehype pipeline. Re-running it here, during route
 * discovery (Phase 3), would compile every `.mdx` file twice and invoke Shiki
 * once per file per `engine.refresh()` — see ARCHITECTURE.md §2.2 which states
@@ -283,6 +217,11 @@ function kebabToTitle(str) {
 function parseMdxTree(content) {
 	return remark.parse(content);
 }
+async function compileRouteDiagnostic(content, filePath, baseDir) {
+	if (extname(filePath).toLowerCase() !== ".mdx") return void 0;
+	const result = await compileMdxContent(content, filePath, baseDir);
+	return result.ok ? void 0 : result.diagnostic;
+}
 /** 从内容中提取第一个 H1 标题 */
 function extractH1(content) {
 	const tree = parseMdxTree(content);
@@ -377,7 +316,7 @@ async function findContentRoutes(dir, base = dir, options = {}) {
 				frontmatter,
 				content
 			};
-			const mdxResult = await compileMdxContent(page.content, fullPath, base);
+			const diagnostic = await compileRouteDiagnostic(page.content, fullPath, base);
 			let title = typeof page.frontmatter.title === "string" ? page.frontmatter.title : "";
 			if (!title) {
 				const lastPart = pathParts[pathParts.length - 1] ?? "";
@@ -399,7 +338,7 @@ async function findContentRoutes(dir, base = dir, options = {}) {
 					frontmatter: page.frontmatter,
 					content: page.content
 				},
-				diagnostic: mdxResult.ok ? void 0 : mdxResult.diagnostic
+				diagnostic
 			});
 		}
 	}
@@ -1330,9 +1269,9 @@ async function refreshDevServer(engine, server) {
 	invalidateVirtualModules(engine, server);
 	return hasDevStructureChanged(before, createDevStructureSnapshot(engine.routes, engine.navigation));
 }
-function createNormalizedMdxContentPlugin(engine) {
+function createNormalizedContentPlugin(engine) {
 	return {
-		name: "clarify:normalized-mdx-content",
+		name: "clarify:normalized-content",
 		enforce: "pre",
 		transform(_code, id) {
 			if (!/\.mdx?(?:\?|$)/.test(id)) return null;
@@ -1348,14 +1287,26 @@ function createNormalizedMdxContentPlugin(engine) {
 }
 function createMdxPlugin() {
 	return mdxPlugin({
-		include: ["**/*.{md,mdx}"],
+		include: ["**/*.mdx"],
+		format: "mdx",
 		jsxImportSource: "react",
 		providerImportSource: "@clarify-labs/renderer",
 		remarkPlugins,
 		rehypePlugins
 	});
 }
-function createClarifyViteCorePlugin(engine, normalizedMdxContentPlugin, mdx) {
+function createMarkdownPlugin() {
+	return mdxPlugin({
+		include: ["**/*.md"],
+		format: "md",
+		jsxImportSource: "react",
+		providerImportSource: "@clarify-labs/renderer",
+		remarkPlugins,
+		remarkRehypeOptions: { allowDangerousHtml: true },
+		rehypePlugins: [rehypeRaw, ...rehypePlugins]
+	});
+}
+function createClarifyViteCorePlugin(engine, normalizedContentPlugin, markdown, mdx) {
 	let viteConfig;
 	return {
 		name: "clarify:core",
@@ -1457,7 +1408,8 @@ function createClarifyViteCorePlugin(engine, normalizedMdxContentPlugin, mdx) {
 				outputDirectory: viteConfig.build.outDir,
 				ssrPlugins: [
 					engine.createSSGVirtualPlugin(),
-					normalizedMdxContentPlugin,
+					normalizedContentPlugin,
+					markdown,
 					mdx
 				]
 			});
@@ -1474,20 +1426,22 @@ function createClarifyViteCorePlugin(engine, normalizedMdxContentPlugin, mdx) {
 * site itself - it only bridges Vite lifecycle hooks to the engine.
 */
 function createViteAdapter(engine) {
-	const normalizedMdxContentPlugin = createNormalizedMdxContentPlugin(engine);
+	const normalizedContentPlugin = createNormalizedContentPlugin(engine);
+	const markdown = createMarkdownPlugin();
 	const mdx = createMdxPlugin();
 	const tailwind = tailwindcss();
 	return [
 		...react(),
 		...Array.isArray(tailwind) ? tailwind : [tailwind],
-		normalizedMdxContentPlugin,
-		createClarifyViteCorePlugin(engine, normalizedMdxContentPlugin, mdx),
+		normalizedContentPlugin,
+		createClarifyViteCorePlugin(engine, normalizedContentPlugin, markdown, mdx),
+		markdown,
 		mdx
 	];
 }
 var cliPackageVersion = {
 	name: "@clarify-labs/cli",
-	version: "0.10.1",
+	version: "0.10.2",
 	license: "AGPL-3.0-only",
 	type: "module",
 	repository: {
@@ -1528,6 +1482,7 @@ var cliPackageVersion = {
 		"@clarify-labs/templates": "workspace:*",
 		"@mdx-js/mdx": "^3.1.1",
 		"@mdx-js/rollup": "^3.1.1",
+		"@shikijs/rehype": "^4.3.0",
 		"@tailwindcss/vite": "^4.3.2",
 		"@vitejs/plugin-react": "^6.0.3",
 		"cac": "^7.0.0",
@@ -1542,6 +1497,8 @@ var cliPackageVersion = {
 		"react-router": "^7.0.0",
 		"react-router-dom": "^7.0.0",
 		"react-zoom-pan-pinch": "^4.0.3",
+		"rehype-raw": "^7.0.0",
+		"rehype-slug": "^6.0.0",
 		"remark": "^15.0.1",
 		"remark-gfm": "^4.0.1",
 		"shiki": "4.3.0",
@@ -2686,6 +2643,11 @@ function writeClarifyEnvDts(projectRoot, plugins) {
 	writeFileSync(filePath, next, "utf-8");
 }
 //#endregion
+//#region source/parsers/markdown/utils.ts
+function escapeHtml(text) {
+	return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+}
+//#endregion
 //#region source/core/runtime/html-template.ts
 /**
 * HTML template manipulation helpers used during SSG.
@@ -3342,4 +3304,4 @@ function createClarifyEngine(options = {}) {
 //#endregion
 export { cliPackageVersion as a, defineConfig as c, createClarifyTempDir as i, createClarifyEngine as n, cliPackageVersionWithCaret as o, createClarifyRuntimeAliases as r, createViteAdapter as s, ClarifyEngine as t };
 
-//# sourceMappingURL=engine-Ca_2MCj9.js.map
+//# sourceMappingURL=engine-CSSL_gGd.js.map