@void/md 0.26.1 → 0.28.0

package/dist/{compile-BwShiv84.mjs → compile-BN4Az3Z3.mjs}

@@ -33,29 +33,26 @@ function createContainer(md, klass, defaultTitle) {
 * Custom container blocks: :::tip, :::info, :::warning, :::danger, :::details
 * Ported from VitePress.
 */
-function containerPlugin(md, options) {
-	md.use(...createContainer(md, "tip", options?.tipLabel ?? "TIP")).use(...createContainer(md, "info", options?.infoLabel ?? "INFO")).use(...createContainer(md, "warning", options?.warningLabel ?? "WARNING")).use(...createContainer(md, "danger", options?.dangerLabel ?? "DANGER")).use(...createContainer(md, "details", options?.detailsLabel ?? "Details"));
+function containerPlugin(md) {
+	md.use(...createContainer(md, "tip", "TIP")).use(...createContainer(md, "info", "INFO")).use(...createContainer(md, "warning", "WARNING")).use(...createContainer(md, "danger", "DANGER")).use(...createContainer(md, "details", "Details"));
 }
 //#endregion
 //#region src/plugins/github-alerts.ts
 const markerRE = /^\[!(TIP|NOTE|INFO|IMPORTANT|WARNING|CAUTION|DANGER)\]([^\n\r]*)/i;
-function capitalize(str) {
-	return str.charAt(0).toUpperCase() + str.slice(1);
-}
+const titleMark = {
+	tip: "TIP",
+	note: "NOTE",
+	info: "INFO",
+	important: "IMPORTANT",
+	warning: "WARNING",
+	caution: "CAUTION",
+	danger: "DANGER"
+};
 /**
 * GitHub-flavored alerts: > [!NOTE], > [!TIP], > [!WARNING], etc.
 * Ported from VitePress.
 */
-function gitHubAlertsPlugin(md, options) {
-	const titleMark = {
-		tip: options?.tipLabel ?? "TIP",
-		note: options?.noteLabel ?? "NOTE",
-		info: options?.infoLabel ?? "INFO",
-		important: options?.importantLabel ?? "IMPORTANT",
-		warning: options?.warningLabel ?? "WARNING",
-		caution: options?.cautionLabel ?? "CAUTION",
-		danger: options?.dangerLabel ?? "DANGER"
-	};
+function gitHubAlertsPlugin(md) {
 	const rule = (state) => {
 		const tokens = state.tokens;
 		for (let tokenIndex = 0; tokenIndex < tokens.length; tokenIndex++) if (tokens[tokenIndex].type === "blockquote_open") {
@@ -70,7 +67,7 @@ function gitHubAlertsPlugin(md, options) {
 			const match = firstContent.content.match(markerRE);
 			if (!match) continue;
 			const type = match[1].toLowerCase();
-			const title = match[2].trim() || titleMark[type] || capitalize(type);
+			const title = match[2].trim() || titleMark[type];
 			firstContent.content = firstContent.content.slice(match[0].length).trimStart();
 			open.type = "github_alert_open";
 			open.tag = "div";
@@ -111,17 +108,17 @@ function imagePlugin(md, options) {
 //#endregion
 //#region src/plugins/line-numbers.ts
 /**
-* Adds line number gutter to code blocks.
-* Supports `:line-numbers` / `:no-line-numbers` per-block control and `{=N}` start line.
+* Adds a line number gutter to code blocks that opt in with `:line-numbers`.
+* `{=N}` sets the start line.
 * Ported from VitePress.
 */
-function lineNumberPlugin(md, enable = false) {
+function lineNumberPlugin(md) {
 	const fence = md.renderer.rules.fence;
 	md.renderer.rules.fence = async (...args) => {
 		const rawCode = await fence(...args);
 		const [tokens, idx] = args;
 		const info = tokens[idx].info;
-		if (!enable && !/:line-numbers\b/.test(info) || enable && /:no-line-numbers\b/.test(info)) return rawCode;
+		if (!/:line-numbers\b/.test(info)) return rawCode;
 		let startLineNumber = 1;
 		const matchStart = info.match(/=(\d+)/);
 		if (matchStart?.[1]) startLineNumber = parseInt(matchStart[1]);
@@ -133,23 +130,23 @@ function lineNumberPlugin(md, enable = false) {
 //#endregion
 //#region src/plugins/link.ts
 const EXTERNAL_URL_RE = /^[a-z]+:/i;
+const EXTERNAL_ATTRS = {
+	target: "_blank",
+	rel: "noreferrer"
+};
 /**
 * Adds target="_blank" and rel="noreferrer" to external links.
 * Normalizes internal .md links to route paths.
 * Ported from VitePress.
 */
-function linkPlugin(md, options) {
-	const externalAttrs = options?.externalAttrs ?? {
-		target: "_blank",
-		rel: "noreferrer"
-	};
+function linkPlugin(md) {
 	md.renderer.rules.link_open = (tokens, idx, mdOptions, _env, self) => {
 		const token = tokens[idx];
 		const hrefIndex = token.attrIndex("href");
 		if (hrefIndex < 0) return self.renderToken(tokens, idx, mdOptions);
 		const url = token.attrs?.[hrefIndex]?.[1] ?? "";
 		if (url.startsWith("#") || token.attrGet("class") === "header-anchor") return self.renderToken(tokens, idx, mdOptions);
-		if (EXTERNAL_URL_RE.test(url)) for (const [key, val] of Object.entries(externalAttrs)) token.attrSet(key, val);
+		if (EXTERNAL_URL_RE.test(url)) for (const [key, val] of Object.entries(EXTERNAL_ATTRS)) token.attrSet(key, val);
 		else {
 			let normalized = url;
 			if (normalized.endsWith(".md")) normalized = normalized.slice(0, -3);
@@ -168,8 +165,7 @@ function extractLang(info) {
 * Wraps fenced code blocks with a language label and copy button.
 * Ported from VitePress.
 */
-function preWrapperPlugin(md, options) {
-	const title = options?.codeCopyButtonTitle ?? "Copy Code";
+function preWrapperPlugin(md) {
 	const fence = md.renderer.rules.fence;
 	md.renderer.rules.fence = async (...args) => {
 		const [tokens, idx] = args;
@@ -179,41 +175,38 @@ function preWrapperPlugin(md, options) {
 		token.info = token.info.replace(/ active$/, "").replace(/ active /, " ");
 		const lang = extractLang(token.info);
 		const highlighted = await fence(...args);
-		return `<div class="language-${lang}${active}"><button title="${title}" class="copy"></button><span class="lang">${lang}</span>` + highlighted + `</div>`;
+		return `<div class="language-${lang}${active}"><button title="Copy Code" class="copy"></button><span class="lang">${lang}</span>` + highlighted + `</div>`;
 	};
 }
 //#endregion
 //#region src/plugins/toc.ts
-function renderHeaders(headers, listTag) {
+const TOC_RE = /^\[\[toc\]\]$/i;
+const TOC_LEVELS = [2, 3];
+function renderHeaders(headers) {
 	if (headers.length === 0) return "";
-	let result = `<${listTag}>`;
+	let result = "<ul>";
 	for (const h of headers) result += `<li><a href="#${h.slug}">${h.text}</a></li>`;
-	result += `</${listTag}>`;
+	result += "</ul>";
 	return result;
 }
 /**
 * [[toc]] directive — renders inline table of contents.
 * Ported from VitePress.
 */
-function tocPlugin(md, options) {
-	const pattern = options?.pattern ?? /^\[\[toc\]\]$/i;
-	const containerTag = options?.containerTag ?? "nav";
-	const containerClass = options?.containerClass ?? "table-of-contents";
-	const listTag = options?.listTag ?? "ul";
-	const level = options?.level ?? [2, 3];
+function tocPlugin(md) {
 	md.block.ruler.before("heading", "toc", ((state, startLine, _endLine, silent) => {
 		const pos = state.bMarks[startLine] + state.tShift[startLine];
 		const max = state.eMarks[startLine];
 		const content = state.src.slice(pos, max).trim();
-		if (!pattern.test(content)) return false;
+		if (!TOC_RE.test(content)) return false;
 		if (silent) return true;
 		state.line = startLine + 1;
-		const openToken = state.push("toc_open", containerTag, 1);
+		const openToken = state.push("toc_open", "nav", 1);
 		openToken.markup = content;
-		openToken.attrSet("class", containerClass);
+		openToken.attrSet("class", "table-of-contents");
 		const bodyToken = state.push("toc_body", "", 0);
 		bodyToken.markup = content;
-		const closeToken = state.push("toc_close", containerTag, -1);
+		const closeToken = state.push("toc_close", "nav", -1);
 		closeToken.markup = content;
 		return true;
 	}), { alt: [
@@ -222,7 +215,7 @@ function tocPlugin(md, options) {
 		"blockquote"
 	] });
 	md.renderer.rules.toc_body = (tokens) => {
-		return renderHeaders(extractHeadings(tokens).filter((heading) => level.includes(heading.depth)), listTag);
+		return renderHeaders(extractHeadings(tokens).filter((heading) => TOC_LEVELS.includes(heading.depth)));
 	};
 }
 //#endregion
@@ -275,7 +268,7 @@ async function createCompiler(options) {
 	markdown.use(containerPlugin);
 	markdown.use(imagePlugin, { lazyLoading: true });
 	markdown.use(linkPlugin);
-	markdown.use(lineNumberPlugin, false);
+	markdown.use(lineNumberPlugin);
 	markdown.use(gitHubAlertsPlugin);
 	const stashFenceInfo = (state) => {
 		for (const token of state.tokens) if (token.type === "fence") token.meta = {
@@ -294,10 +287,11 @@ async function createCompiler(options) {
 async function compile(source, options) {
 	const { data: frontmatter, content } = matter(source);
 	const compiler = await getCompiler(options);
-	const tokens = compiler.parse(content, {});
+	const env = {};
+	const tokens = compiler.parse(content, env);
 	const headings = extractHeadings(tokens);
 	return {
-		html: await compiler.renderAsync(content, {}),
+		html: await compiler.renderer.renderAsync(tokens, compiler.options, env),
 		frontmatter,
 		headings,
 		title: frontmatter.title ?? headings.find((heading) => heading.depth === 1)?.text ?? ""

package/dist/plugin.mjs

@@ -1,35 +1,11 @@
 import { n as extractMetadata } from "./metadata-TdHmXD-i.mjs";
 import { createHash } from "node:crypto";
-import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { dirname, join, relative, resolve } from "pathslash";
 import { glob } from "tinyglobby";
 import { normalizePath } from "vite";
 import { resolvePagesDir } from "void/pages";
 import { editIslandSource, findIslandImports } from "void/pages-islands-plugin";
-//#region src/codegen/md-types.ts
-/**
-* Generate .void/md.d.ts content.
-*
-* Declares the `@void/md/pages` virtual module so TypeScript can resolve it
-* from anywhere in the project (pages/, routes/, etc.) without @ts-ignore.
-*/
-function generateMdTypes() {
-	return [
-		"// Auto-generated by @void/md — do not edit",
-		"",
-		"export type VoidMdPage = Readonly<{",
-		"  path: string;",
-		"  title: string;",
-		"  frontmatter: Record<string, unknown>;",
-		"  headings: ReadonlyArray<{ depth: number; slug: string; text: string }>;",
-		"}>;",
-		"",
-		"declare const pages: ReadonlyArray<VoidMdPage>;",
-		"export default pages;",
-		""
-	].join("\n");
-}
-//#endregion
 //#region src/emit-shared.ts
 const ISLAND_TAG_RE = /<([A-Z]\w*)\s*((?:[^>/"']|"[^"]*"|'[^']*')*)\/\s*>|<([A-Z]\w*)\s*((?:[^>/"']|"[^"]*"|'[^']*')*)>([\s\S]*?)<\/\3\s*>/g;
 function findIslandTags(html, names) {
@@ -54,10 +30,11 @@ function parseAttrs(attrStr) {
 	while ((match = attrRe.exec(attrStr)) !== null) result[match[1]] = match[2] ?? match[3] ?? match[4] ?? "";
 	return result;
 }
-function toIslandId(imp) {
-	return imp.islandId ?? imp.specifier.replace(/\.[^.]+$/, "");
-}
 function buildRenderChunks(html, islandImports) {
+	if (islandImports.length === 0) return [{
+		type: "html",
+		html
+	}];
 	const islandByName = new Map(islandImports.map((item) => [item.name, item]));
 	const tags = findIslandTags(html, new Set(islandByName.keys()));
 	const chunks = [];
@@ -89,28 +66,7 @@ function buildRenderChunks(html, islandImports) {
 }
 //#endregion
 //#region src/emit-react.ts
-function emitReactComponent(result) {
-	return `
-import React from "react";
-import { FrontmatterContext } from "@void/md";
-
-const __frontmatter = ${JSON.stringify(result.frontmatter)};
-const __headings = ${JSON.stringify(result.headings)};
-const __html = ${JSON.stringify(result.html)};
-
-export const frontmatter = __frontmatter;
-export const headings = __headings;
-
-export default function MarkdownPage() {
-  return React.createElement(
-    FrontmatterContext.Provider,
-    { value: __frontmatter },
-    React.createElement("div", { dangerouslySetInnerHTML: { __html: __html } })
-  );
-}
-`;
-}
-function emitReactComponentWithIslands(result, islandImports) {
+function emitReactComponent(result, islandImports) {
 	const chunks = buildRenderChunks(result.html, islandImports);
 	let code = `import React from "react";\n`;
 	code += `import { FrontmatterContext } from "@void/md";\n`;
@@ -124,7 +80,7 @@ function emitReactComponentWithIslands(result, islandImports) {
   return React.createElement(
     "div",
     {
-      "data-island": ${JSON.stringify(toIslandId(islandImport))},
+      "data-island": ${JSON.stringify(islandImport.islandId)},
       "data-props": JSON.stringify(props),
       "data-hydrate": ${JSON.stringify(islandImport.strategy)}
     },
@@ -162,27 +118,7 @@ export default function MarkdownPage() {
 }
 //#endregion
 //#region src/emit-solid.ts
-function emitSolidComponent(result) {
-	return `
-import { FrontmatterContext } from "@void/md";
-
-const __frontmatter = ${JSON.stringify(result.frontmatter)};
-const __headings = ${JSON.stringify(result.headings)};
-const __html = ${JSON.stringify(result.html)};
-
-export const frontmatter = __frontmatter;
-export const headings = __headings;
-
-export default function MarkdownPage() {
-  return (
-    <FrontmatterContext.Provider value={__frontmatter}>
-      <div innerHTML={__html} />
-    </FrontmatterContext.Provider>
-  );
-}
-`;
-}
-function emitSolidComponentWithIslands(result, islandImports) {
+function emitSolidComponent(result, islandImports) {
 	const chunks = buildRenderChunks(result.html, islandImports);
 	const importAliasByName = /* @__PURE__ */ new Map();
 	let code = `import { FrontmatterContext } from "@void/md";\n`;
@@ -212,7 +148,7 @@ export const headings = __headings;
 		const importAlias = importAliasByName.get(chunk.islandImport.name) ?? chunk.islandImport.name;
 		const propsLiteral = Object.keys(chunk.props).length > 0 ? JSON.stringify(chunk.props) : "{}";
 		code += `\nconst ${propsName} = ${propsLiteral};`;
-		bodyLines.push(`<div data-island=${JSON.stringify(toIslandId(chunk.islandImport))} data-props={JSON.stringify(${propsName})} data-hydrate=${JSON.stringify(chunk.islandImport.strategy)}><${importAlias} {...${propsName}} /></div>`);
+		bodyLines.push(`<div data-island=${JSON.stringify(chunk.islandImport.islandId)} data-props={JSON.stringify(${propsName})} data-hydrate=${JSON.stringify(chunk.islandImport.strategy)}><${importAlias} {...${propsName}} /></div>`);
 	}
 	if (bodyLines.length === 0) bodyLines.push("<></>");
 	code += `
@@ -234,24 +170,7 @@ export default function MarkdownPage() {
 function toSvelteLiteral(value) {
 	return JSON.stringify(value).replace(/<\//g, "<\\/");
 }
-function emitSvelteComponent(result) {
-	const frontmatter = toSvelteLiteral(result.frontmatter);
-	return `<script context="module">
-export const frontmatter = ${frontmatter};
-export const headings = ${toSvelteLiteral(result.headings)};
-<\/script>
-
-<script>
-import { setFrontmatter } from "@void/md";
-
-const __frontmatter = ${frontmatter};
-setFrontmatter(__frontmatter);
-<\/script>
-
-{@html ${toSvelteLiteral(result.html)}}
-`;
-}
-function emitSvelteComponentWithIslands(result, islandImports) {
+function emitSvelteComponent(result, islandImports) {
 	const chunks = buildRenderChunks(result.html, islandImports);
 	const importAliasByName = /* @__PURE__ */ new Map();
 	const frontmatter = toSvelteLiteral(result.frontmatter);
@@ -286,7 +205,7 @@ setFrontmatter(__frontmatter);
 		const propsLiteral = Object.keys(chunk.props).length > 0 ? toSvelteLiteral(chunk.props) : "{}";
 		source += `const ${propsName} = ${propsLiteral};
 `;
-		body.push(`<div data-island="${toIslandId(chunk.islandImport)}" data-props={JSON.stringify(${propsName})} data-hydrate="${chunk.islandImport.strategy}"><${alias} {...${propsName}} /></div>`);
+		body.push(`<div data-island="${chunk.islandImport.islandId}" data-props={JSON.stringify(${propsName})} data-hydrate="${chunk.islandImport.strategy}"><${alias} {...${propsName}} /></div>`);
 	}
 	source += `<\/script>
 
@@ -296,26 +215,7 @@ ${body.join("\n")}
 }
 //#endregion
 //#region src/emit-vue.ts
-function emitVueComponent(result) {
-	return `
-import { defineComponent, createStaticVNode, provide } from "vue";
-
-const __frontmatter = ${JSON.stringify(result.frontmatter)};
-const __headings = ${JSON.stringify(result.headings)};
-const __html = ${JSON.stringify(result.html)};
-
-export const frontmatter = __frontmatter;
-export const headings = __headings;
-
-export default defineComponent({
-  setup() {
-    provide("__void_frontmatter", __frontmatter);
-    return () => createStaticVNode(__html, 1);
-  }
-});
-`;
-}
-function emitVueComponentWithIslands(result, islandImports) {
+function emitVueComponent(result, islandImports) {
 	const chunks = buildRenderChunks(result.html, islandImports);
 	let code = `import { defineComponent, h, createStaticVNode, provide } from "vue";\n`;
 	for (let islandIndex = 0; islandIndex < islandImports.length; islandIndex++) {
@@ -327,7 +227,7 @@ function emitVueComponentWithIslands(result, islandImports) {
 		code += `const ${islandImport.name} = { inheritAttrs: false, render() {
   const props = this.$attrs;
   return h("div", {
-    "data-island": ${JSON.stringify(toIslandId(islandImport))},
+    "data-island": ${JSON.stringify(islandImport.islandId)},
     "data-props": JSON.stringify(props),
     "data-hydrate": ${JSON.stringify(islandImport.strategy)}
   }, h(_raw_island_${islandIndex}, props));
@@ -339,6 +239,7 @@ function emitVueComponentWithIslands(result, islandImports) {
 		const propsStr = Object.keys(chunk.props).length > 0 ? JSON.stringify(chunk.props) : "null";
 		vnodes.push(`h(${chunk.islandImport.name}, ${propsStr})`);
 	}
+	const root = islandImports.length > 0 ? `[\n      ${vnodes.join(",\n      ")}\n    ]` : vnodes[0];
 	code += `
 const __frontmatter = ${JSON.stringify(result.frontmatter)};
 const __headings = ${JSON.stringify(result.headings)};
@@ -349,9 +250,7 @@ export const headings = __headings;
 export default defineComponent({
   setup() {
     provide("__void_frontmatter", __frontmatter);
-    return () => [
-      ${vnodes.join(",\n      ")}
-    ];
+    return () => ${root};
   }
 });
 `;
@@ -450,11 +349,6 @@ function voidMarkdown(options) {
 			};
 		}))).sort((leftPage, rightPage) => leftPage.path.localeCompare(rightPage.path));
 	}
-	function writeMdTypes() {
-		const outDir = join(root, ".void");
-		mkdirSync(outDir, { recursive: true });
-		writeFileSync(join(outDir, "md.d.ts"), generateMdTypes());
-	}
 	return [{
 		name: "void-md",
 		enforce: "pre",
@@ -488,7 +382,6 @@ function voidMarkdown(options) {
 			solidModules.clear();
 			clientScripts.clear();
 			mdPages = await scanMdPages();
-			writeMdTypes();
 		},
 		configureServer(server) {
 			const normalizedPagesDir = normalizePath(pagesDir);
@@ -574,35 +467,27 @@ export function useFrontmatter() { return useContext(FrontmatterContext) ?? {};
 					const componentId = stripPageSuffix(_id.slice(pagesPrefix.length)) || "index";
 					clientScripts.set(componentId, clientCode);
 				}
-				for (const imp of islandImports) {
+				const islands = islandImports.map((imp) => {
 					const absPath = resolve(dirname(_id), imp.specifier);
-					imp.islandId = normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "");
-				}
-				const { compile } = await import("./compile-BwShiv84.mjs");
-				const result = await compile(body, { shiki: options?.shiki });
-				if (adapter === "vue") {
-					if (islandImports.length > 0) return {
-						code: emitVueComponentWithIslands(result, islandImports),
-						map: null
-					};
+					const islandId = normalizePath(relative(root, absPath)).replace(/\.[^.]+$/, "");
 					return {
-						code: emitVueComponent(result),
-						map: null
+						...imp,
+						islandId
 					};
-				}
-				if (adapter === "react") {
-					if (islandImports.length > 0) return {
-						code: emitReactComponentWithIslands(result, islandImports),
-						map: null
-					};
-					return {
-						code: emitReactComponent(result),
-						map: null
-					};
-				}
+				});
+				const { compile } = await import("./compile-BN4Az3Z3.mjs");
+				const result = await compile(body, { shiki: options?.shiki });
+				if (adapter === "vue") return {
+					code: emitVueComponent(result, islands),
+					map: null
+				};
+				if (adapter === "react") return {
+					code: emitReactComponent(result, islands),
+					map: null
+				};
 				if (adapter === "svelte") {
 					const virtualId = createVirtualModuleId(SVELTE_VIRTUAL_PREFIX, _id, code, "svelte");
-					svelteModules.set(virtualId, islandImports.length > 0 ? emitSvelteComponentWithIslands(result, islandImports) : emitSvelteComponent(result));
+					svelteModules.set(virtualId, emitSvelteComponent(result, islands));
 					return {
 						code: `export { default, frontmatter, headings } from ${JSON.stringify(virtualId)};`,
 						map: null
@@ -610,7 +495,7 @@ export function useFrontmatter() { return useContext(FrontmatterContext) ?? {};
 				}
 				if (adapter === "solid") {
 					const virtualId = createVirtualModuleId(SOLID_VIRTUAL_PREFIX, _id, code, "tsx");
-					solidModules.set(virtualId, islandImports.length > 0 ? emitSolidComponentWithIslands(result, islandImports) : emitSolidComponent(result));
+					solidModules.set(virtualId, emitSolidComponent(result, islands));
 					return {
 						code: `export { default, frontmatter, headings } from ${JSON.stringify(virtualId)};`,
 						map: null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/md",
-  "version": "0.26.1",
+  "version": "0.28.0",
   "description": "Markdown pages with layouts and interactive islands for Void.",
   "homepage": "https://void.cloud",
   "bugs": {
@@ -53,12 +53,11 @@
     "@types/node": "^26.6.4",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.1.0",
     "vite-plus": "1.1.0",
-    "void": "0.26.1",
-    "vue": "^3.5.43"
+    "void": "0.28.0"
   },
   "peerDependencies": {
     "vite": "^8.0.0",
-    "void": "0.26.1"
+    "void": "0.28.0"
   },
   "scripts": {
     "build": "vp pack",