prettier-plugin-mdc 0.1.3 → 0.2.0

package/dist/index.mjs

@@ -1,9 +1,12 @@
+import { fromMarkdown } from "mdast-util-from-markdown";
+import { frontmatterFromMarkdown } from "mdast-util-frontmatter";
+import { gfmFromMarkdown } from "mdast-util-gfm";
+import { mathFromMarkdown } from "mdast-util-math";
+import { frontmatter } from "micromark-extension-frontmatter";
+import { gfm } from "micromark-extension-gfm";
+import { math } from "micromark-extension-math";
 import markdown from "prettier/parser-markdown";
-import remarkGfm from "remark-gfm";
-import remarkMath from "remark-math";
-import remarkMdc from "remark-mdc";
-import remarkParse from "remark-parse";
-import { unified } from "unified";
+import remarkMdc, { micromarkExtension } from "remark-mdc";
 import { doc } from "prettier";
 import * as markdown$1 from "prettier/plugins/markdown";
 
@@ -17,6 +20,7 @@ const isContainerComponentNode = (node) => node.type === "containerComponent";
 const isComponentContainerSectionNode = (node) => node.type === "componentContainerSection";
 const isLinkNode = (node) => node.type === "link";
 const isWordOrTextNode = (node) => node.type === "word" || node.type === "text";
+const isYamlNode = (node) => node.type === "yaml";
 /**
 * Check if a node has any textComponent descendants
 */
@@ -61,12 +65,30 @@ function validateYamlBlocks(ast, text) {
 
 //#endregion
 //#region src/parsers.ts
+function getMdcFromMarkdownExtensions() {
+	const data = {};
+	remarkMdc.call({ data: () => data }, {});
+	return data.fromMarkdownExtensions ?? [];
+}
+const mdcFromMarkdownExtensions = getMdcFromMarkdownExtensions();
 const parsers = { [AST_FORMAT]: {
 	...markdown.parsers.markdown,
 	astFormat: AST_FORMAT,
-	parse: async (text) => {
-		const processor = unified().use(remarkParse, { commonmark: true }).use(remarkMath).use(remarkGfm).use(remarkMdc);
-		const ast = await processor.run(processor.parse(text));
+	parse(text) {
+		const ast = fromMarkdown(text, {
+			extensions: [
+				frontmatter(["yaml"]),
+				gfm(),
+				math(),
+				micromarkExtension()
+			],
+			mdastExtensions: [
+				frontmatterFromMarkdown(["yaml"]),
+				gfmFromMarkdown(),
+				mathFromMarkdown(),
+				...mdcFromMarkdownExtensions
+			]
+		});
 		validateYamlBlocks(ast, text);
 		return ast;
 	}
@@ -77,7 +99,8 @@ const parsers = { [AST_FORMAT]: {
 const visitorKeys = {
 	componentContainerSection: ["children"],
 	containerComponent: ["children"],
-	textComponent: ["children"]
+	textComponent: ["children"],
+	yaml: []
 };
 const mdcNodeTypes = Object.keys(visitorKeys);
 
@@ -108,17 +131,16 @@ function quoteString(value, options) {
 	const quote = hasPreferred && !hasAlternative ? alternativeQuote : preferredQuote;
 	return `${quote}${escapeQuotes(value.replace(/\\/g, "\\\\"), quote)}${quote}`;
 }
-
-//#endregion
-//#region src/print.ts
-const { hardline: hardline$1, join } = doc.builders;
-const mapChildren = (path, print) => path.map(print, "children");
 function serializeValue(value, options) {
 	if (typeof value === "string") return quoteString(value, options);
 	if (typeof value === "number" || typeof value === "boolean") return String(value);
 	const preferredQuote = options.singleQuote ? "'" : "\"";
 	return `${preferredQuote}${escapeQuotes(JSON.stringify(value), preferredQuote)}${preferredQuote}`;
 }
+
+//#endregion
+//#region src/print.ts
+const { hardline: hardline$1, join } = doc.builders;
 function printAttributes({ attributes }, options) {
 	if (!attributes || Object.keys(attributes).length === 0) return "";
 	const parts = [];
@@ -210,14 +232,24 @@ function printContainerComponentWithYamlDoc(path, print, options, yamlDoc) {
 	parts.push(hardline$1);
 	if (yamlDoc.length > 0) parts.push(...yamlDoc);
 	if (node.children && node.children.length > 0) {
+		const componentStartLine = node.position?.start.line ?? 0;
+		let prevEndLine;
 		if (yamlDoc.length > 0 && node.rawData) {
-			const componentStartLine = node.position?.start.line ?? 0;
 			const rawDataNewlines = (node.rawData.match(/\n/g) ?? []).length;
-			const rawDataEndLine = componentStartLine + 1 + rawDataNewlines;
-			if ((node.children[0].position?.start.line ?? 0) > rawDataEndLine + 1) parts.push(hardline$1);
+			prevEndLine = componentStartLine + 1 + rawDataNewlines;
+		} else prevEndLine = componentStartLine;
+		const childDocs = [];
+		for (let i = 0; i < node.children.length; i++) {
+			const child = node.children[i];
+			const childStartLine = child.position?.start.line ?? 0;
+			if (i > 0) {
+				childDocs.push(hardline$1);
+				if (childStartLine > prevEndLine + 1) childDocs.push(hardline$1);
+			} else if (yamlDoc.length > 0 && node.rawData && childStartLine > prevEndLine + 1) childDocs.push(hardline$1);
+			childDocs.push(path.call(print, "children", i));
+			prevEndLine = child.position?.end.line ?? prevEndLine;
 		}
-		const childDocs = mapChildren(path, print);
-		parts.push(join(hardline$1, childDocs));
+		parts.push(...childDocs);
 		parts.push(hardline$1);
 	}
 	parts.push(colons);
@@ -231,7 +263,7 @@ function printComponentContainerSection(path, print) {
 	const parts = [];
 	if (node.name && node.name !== "default") parts.push(`#${node.name}`, hardline$1);
 	if (node.children && node.children.length > 0) {
-		const childDocs = mapChildren(path, print);
+		const childDocs = path.map(print, "children");
 		parts.push(join(hardline$1, childDocs));
 	}
 	return parts;
@@ -289,6 +321,22 @@ const printers = { [AST_FORMAT]: {
 	},
 	embed(path) {
 		const { node } = path;
+		if (isYamlNode(node)) return async (textToDoc) => {
+			let yamlDoc;
+			try {
+				yamlDoc = await textToDoc(node.value, { parser: "yaml" });
+			} catch {
+				yamlDoc = node.value;
+			}
+			return [
+				"---",
+				hardline,
+				yamlDoc,
+				hardline,
+				"---",
+				hardline
+			];
+		};
 		if (isContainerComponentNode(node) && node.rawData) {
 			const yamlContent = extractYamlContent(node.rawData);
 			if (yamlContent) return async (textToDoc, print, _path, options) => {
@@ -310,14 +358,14 @@ const printers = { [AST_FORMAT]: {
 		}
 		return null;
 	},
-	print(path, options, print, args) {
+	print(path, options, print) {
 		const { node } = path;
 		if (isLinkNode(node) && linkNeedsCustomPrinting(node)) return printLink(path, print, options);
-		if (extendedInlineNodesHaveAttributes(node)) return [mdastPrinter.print(path, options, print, args), printAttributes(node, options)];
+		if (extendedInlineNodesHaveAttributes(node)) return [mdastPrinter.print(path, options, print), printAttributes(node, options)];
 		if (isTextComponentNode(node)) return printTextComponent(path, print, options);
 		else if (isContainerComponentNode(node)) return printContainerComponentWithYamlDoc(path, print, options, []);
 		else if (isComponentContainerSectionNode(node)) return printComponentContainerSection(path, print);
-		return mdastPrinter.print(path, options, print, args);
+		return mdastPrinter.print(path, options, print);
 	}
 } };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-mdc",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "author": "Ray <i@mk1.io> (@so1ve)",
   "type": "module",
   "description": "Prettier plugin for MDC syntax",
@@ -38,11 +38,14 @@
   "dependencies": {
     "@types/mdast": "^4.0.4",
     "@types/unist": "^3.0.3",
-    "remark-gfm": "^4.0.1",
-    "remark-math": "^6.0.0",
-    "remark-mdc": "^3.10.0",
-    "remark-parse": "^11.0.0",
-    "unified": "^11.0.5"
+    "mdast-util-from-markdown": "^2.0.2",
+    "mdast-util-frontmatter": "^2.0.1",
+    "mdast-util-gfm": "^3.1.0",
+    "mdast-util-math": "^3.0.0",
+    "micromark-extension-frontmatter": "^2.0.0",
+    "micromark-extension-gfm": "^3.0.0",
+    "micromark-extension-math": "^3.1.0",
+    "remark-mdc": "^3.10.0"
   },
   "devDependencies": {
     "@antfu/ni": "^28.0.0",
@@ -54,6 +57,7 @@
     "dedent": "^1.7.1",
     "eslint": "^9.39.2",
     "prettier": "^3.7.4",
+    "prettier-dev": "https://pkg.pr.new/prettier@c54b26c",
     "tsdown": "^0.18.3",
     "typescript": "^5.9.3",
     "vite": "^7.3.0",