@void/md 1.5.0 → 1.6.1

package/dist/{compile-BCD-iOV3.mjs → compile-5IQ1Trxe.mjs}

@@ -1,5 +1,4 @@
-import { t as extractHeadings } from "./metadata-BoVkSwbJ.mjs";
-import matter from "gray-matter";
+import { r as parseFrontmatter, t as extractHeadings } from "./metadata-DDtNQG1v.mjs";
 import MarkdownExit from "markdown-exit";
 import anchor from "markdown-it-anchor";
 import footnote from "markdown-it-footnote";
@@ -289,7 +288,7 @@ async function createCompiler(options) {
 	return markdown;
 }
 async function compile(source, options) {
-	const { data: frontmatter, content } = matter(source);
+	const { frontmatter, content } = parseFrontmatter(source);
 	const compiler = await getCompiler(options);
 	const env = {};
 	const tokens = compiler.parse(content, env);

package/dist/{metadata-BoVkSwbJ.mjs → metadata-DDtNQG1v.mjs}

@@ -32,8 +32,20 @@ function extractHeadings(tokens) {
 	}
 	return headings;
 }
+function parseFrontmatter(source) {
+	try {
+		const { data: frontmatter, content } = matter(source, {});
+		return {
+			frontmatter,
+			content
+		};
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		throw new Error(`Invalid frontmatter: ${message}`, { cause: error });
+	}
+}
 function extractMetadata(source) {
-	const { data: frontmatter, content } = matter(source);
+	const { frontmatter, content } = parseFrontmatter(source);
 	const headings = extractHeadings(getMetadataCompiler().parse(content, {}));
 	return {
 		frontmatter,
@@ -41,4 +53,4 @@ function extractMetadata(source) {
 		title: frontmatter.title ?? headings.find((heading) => heading.depth === 1)?.text ?? ""
 	};
 }
-export { extractMetadata as n, extractHeadings as t };
+export { extractMetadata as n, parseFrontmatter as r, extractHeadings as t };

package/dist/plugin.mjs

@@ -1,6 +1,6 @@
-import { n as extractMetadata } from "./metadata-BoVkSwbJ.mjs";
+import { n as extractMetadata } from "./metadata-DDtNQG1v.mjs";
 import { createHash } from "node:crypto";
-import { existsSync, readFileSync, readdirSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { dirname, join, relative, resolve } from "pathslash";
 import { glob } from "tinyglobby";
 import { normalizePath } from "vite";
@@ -299,26 +299,16 @@ function mdRouteName(file, env) {
 	if (name === "index") return "";
 	return name.endsWith("/index") ? name.slice(0, -6) : name;
 }
-function hasMdFilesWithScript(dir) {
-	try {
-		for (const entry of readdirSync(dir, {
-			withFileTypes: true,
-			recursive: true
-		})) if (entry.isFile() && entry.name.endsWith(".md")) {
-			const fullPath = join(entry.parentPath, entry.name);
-			const content = readFileSync(fullPath, "utf-8");
-			if (/^<script\b/m.test(content)) return true;
-		}
-	} catch {}
-	return false;
+/** The Markdown files that `environment` keeps, relative to `pagesDir`. */
+async function listMdFiles(pagesDir, environment) {
+	return (await glob("**/*.md", { cwd: pagesDir })).filter((file) => {
+		const fileEnv = pageFileEnvironment(file);
+		return !fileEnv || fileEnv === environment;
+	});
 }
-function hasIslandFiles(dir) {
-	try {
-		for (const entry of readdirSync(dir, {
-			withFileTypes: true,
-			recursive: true
-		})) if (entry.isFile() && /\.island\./.test(entry.name)) return true;
-	} catch {}
+/** Whether any page has client code. Without it, pages would load an empty client entry. */
+async function hasMdClientCode(pagesDir, environment) {
+	for (const file of await listMdFiles(pagesDir, environment)) if (extractScript(readFileSync(join(pagesDir, file), "utf-8")).clientCode) return true;
 	return false;
 }
 function voidMarkdown(options) {
@@ -326,31 +316,51 @@ function voidMarkdown(options) {
 	let mdPages = [];
 	let root = "";
 	let pagesDir = "";
+	let logger;
 	let mdEnvironment = "prod";
 	const svelteModules = /* @__PURE__ */ new Map();
 	const solidModules = /* @__PURE__ */ new Map();
 	const clientScripts = /* @__PURE__ */ new Map();
+	const loggedPageErrors = /* @__PURE__ */ new Map();
 	function createVirtualModuleId(prefix, importerId, source, extension) {
 		return `${prefix}${Buffer.from(importerId).toString("base64url")}.${createHash("sha1").update(source).digest("hex").slice(0, 8)}.${extension}`;
 	}
+	function createPageError(file, error) {
+		const message = error instanceof Error ? error.message : String(error);
+		return new Error(`void-md: ${relative(root, file)}: ${message}`, { cause: error });
+	}
 	async function scanMdPages() {
 		if (!existsSync(pagesDir)) return [];
-		const liveFiles = (await glob("**/*.md", { cwd: pagesDir })).filter((file) => {
-			const fileEnv = pageFileEnvironment(file);
-			return !fileEnv || fileEnv === mdEnvironment;
-		});
+		const liveFiles = await listMdFiles(pagesDir, mdEnvironment);
 		return (await Promise.all(liveFiles.map(async (file) => {
-			const { body, clientCode } = extractScript(readFileSync(join(pagesDir, file), "utf-8"));
-			const result = extractMetadata(body);
-			const componentId = stripPageSuffix(file) || "index";
-			if (clientCode) clientScripts.set(componentId, clientCode);
-			return {
-				path: "/" + mdRouteName(file, pageFileEnvironment(file)),
-				title: result.title,
-				frontmatter: result.frontmatter,
-				headings: result.headings
-			};
-		}))).sort((leftPage, rightPage) => leftPage.path.localeCompare(rightPage.path));
+			const path = "/" + mdRouteName(file, pageFileEnvironment(file));
+			const filePath = join(pagesDir, file);
+			try {
+				const { body, clientCode } = extractScript(readFileSync(filePath, "utf-8"));
+				const result = extractMetadata(body);
+				const componentId = stripPageSuffix(file) || "index";
+				if (clientCode) clientScripts.set(componentId, clientCode);
+				loggedPageErrors.delete(file);
+				return {
+					path,
+					title: result.title,
+					frontmatter: result.frontmatter,
+					headings: result.headings
+				};
+			} catch (error) {
+				const pageError = createPageError(filePath, error);
+				if (mdEnvironment === "prod") throw pageError;
+				if (error.code === "ENOENT") return;
+				if (loggedPageErrors.get(file) !== pageError.message) {
+					loggedPageErrors.set(file, pageError.message);
+					logger?.error(pageError.message, {
+						error: pageError,
+						timestamp: true
+					});
+				}
+				return mdPages.find((page) => page.path === path);
+			}
+		}))).filter((page) => page !== void 0).sort((leftPage, rightPage) => leftPage.path.localeCompare(rightPage.path));
 	}
 	return [{
 		name: "void-md",
@@ -361,16 +371,17 @@ function voidMarkdown(options) {
 				return clientScripts;
 			}
 		},
-		config(config, env) {
+		async config(config, env) {
 			mdEnvironment = env.command === "serve" && !env.isPreview ? "dev" : "prod";
 			if (env.command === "serve") return;
 			const configRoot = config.root || process.cwd();
 			const pagesDir = resolvePagesDir(configRoot);
 			if (!existsSync(pagesDir)) return;
-			if (hasMdFilesWithScript(pagesDir) && hasIslandFiles(pagesDir)) return { environments: { client: { build: { rollupOptions: { input: { "md-client": MD_CLIENT_ENTRY_ID } } } } } };
+			if (await hasMdClientCode(pagesDir, mdEnvironment)) return { environments: { client: { build: { rollupOptions: { input: { "md-client": MD_CLIENT_ENTRY_ID } } } } } };
 		},
 		configResolved(config) {
 			root = config.root;
+			logger = config.logger;
 			pagesDir = resolvePagesDir(root);
 			for (const plugin of config.plugins) {
 				const match = ADAPTER_PLUGIN_NAMES[plugin.name];
@@ -392,7 +403,15 @@ function voidMarkdown(options) {
 			const isInPagesDir = (file) => file === normalizedPagesDir || file.startsWith(normalizedPagesDir + "/");
 			const handleMdChange = async (file) => {
 				if (!file.endsWith(".md") || !isInPagesDir(normalizePath(file))) return;
-				mdPages = await scanMdPages();
+				try {
+					mdPages = await scanMdPages();
+				} catch (error) {
+					server.config.logger.error(error instanceof Error ? error.message : String(error), {
+						error: error instanceof Error ? error : void 0,
+						timestamp: true
+					});
+					return;
+				}
 				const mod = server.moduleGraph.getModuleById("\0void-md-pages");
 				if (mod) server.moduleGraph.invalidateModule(mod);
 				for (const [compId] of clientScripts) {
@@ -481,8 +500,10 @@ export function useFrontmatter() { return useContext(FrontmatterContext) ?? {};
 						islandId
 					};
 				});
-				const { compile } = await import("./compile-BCD-iOV3.mjs");
-				const result = await compile(body, { shiki: options?.shiki });
+				const { compile } = await import("./compile-5IQ1Trxe.mjs");
+				const result = await compile(body, { shiki: options?.shiki }).catch((error) => {
+					throw createPageError(_id, error);
+				});
 				if (adapter === "vue") return {
 					code: emitVueComponent(result, islands),
 					map: null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@void/md",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "Markdown pages with layouts and interactive islands for Void.",
   "homepage": "https://void.cloud",
   "bugs": {
@@ -54,11 +54,11 @@
     "@types/node": "^26.6.6",
     "vite": "npm:@voidzero-dev/vite-plus-core@1.4.0",
     "vite-plus": "1.4.0",
-    "void": "1.5.0"
+    "void": "1.6.1"
   },
   "peerDependencies": {
     "vite": "^8.0.0",
-    "void": "1.5.0"
+    "void": "1.6.1"
   },
   "scripts": {
     "build": "vp pack",