prettier-plugin-mdc 0.1.1 → 0.1.3

package/README.md

@@ -27,7 +27,15 @@ Add the plugin to your Prettier configuration:
 ```json
 // .prettierrc
 {
-  "plugins": ["prettier-plugin-mdc"]
+  "plugins": ["prettier-plugin-mdc"],
+  "overrides": [
+    {
+      "files": ["*.md"],
+      "options": {
+        "parser": "mdc"
+      }
+    }
+  ]
 }
 ```
 
@@ -36,6 +44,14 @@ Or in `prettier.config.js`:
 ```js
 export default {
   plugins: ["prettier-plugin-mdc"],
+  overrides: [
+    {
+      files: ["*.md"],
+      options: {
+        parser: "mdc",
+      },
+    },
+  ],
 };
 ```
 

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { Parser, Printer } from "prettier";
+import { Parser, Printer, SupportLanguage } from "prettier";
 import { Node } from "unist";
 
 //#region src/constants.d.ts
@@ -10,4 +10,7 @@ declare const parsers: Record<typeof AST_FORMAT, Parser<Node>>;
 //#region src/printers.d.ts
 declare const printers: Record<typeof AST_FORMAT, Printer<Node>>;
 //#endregion
-export { parsers, printers };
+//#region src/index.d.ts
+declare const languages: Partial<SupportLanguage>[];
+//#endregion
+export { languages, parsers, printers };

package/dist/index.mjs

@@ -1,28 +1,15 @@
-import { createRequire } from "node:module";
 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 * as markdown$1 from "prettier/plugins/markdown";
 import { doc } from "prettier";
-import { createSyncFn } from "synckit";
+import * as markdown$1 from "prettier/plugins/markdown";
 
 //#region src/constants.ts
 const AST_FORMAT = "mdc";
 
-//#endregion
-//#region src/parsers.ts
-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);
-		return await processor.run(processor.parse(text));
-	}
-} };
-
 //#endregion
 //#region src/is.ts
 const isTextComponentNode = (node) => node.type === "textComponent";
@@ -52,6 +39,39 @@ function linkNeedsCustomPrinting(node) {
 	return false;
 }
 
+//#endregion
+//#region src/validate.ts
+function validateYamlBlocks(ast, text) {
+	function visit(node) {
+		if (isContainerComponentNode(node)) {
+			const pos = node.position;
+			if (pos) {
+				const startLine = pos.start.line;
+				const lines = text.split("\n");
+				if (startLine < lines.length) {
+					if (lines[startLine]?.trim() === "---" && !node.rawData) throw new Error(`Invalid YAML block in component "${node.name}" at line ${startLine + 1}: YAML block is
+    not properly closed`);
+				}
+			}
+			if (node.children) for (const child of node.children) visit(child);
+		} else if ("children" in node && Array.isArray(node.children)) for (const child of node.children) visit(child);
+	}
+	visit(ast);
+}
+
+//#endregion
+//#region src/parsers.ts
+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));
+		validateYamlBlocks(ast, text);
+		return ast;
+	}
+} };
+
 //#endregion
 //#region src/visitor-keys.ts
 const visitorKeys = {
@@ -73,35 +93,36 @@ const extendedInlineNodes = [
 ];
 const extendedInlineNodesHaveAttributes = (node) => extendedInlineNodes.includes(node.type) && "attributes" in node;
 const escapeQuotes = (value, quote) => value.replace(new RegExp(quote, "g"), `\\${quote}`);
-
-//#endregion
-//#region src/yaml.ts
-const require = createRequire(import.meta.url);
-const formatYaml = (text, options) => {
-	return createSyncFn(require.resolve("./yaml-worker.mjs"))(text, {
-		tabWidth: options.tabWidth,
-		useTabs: options.useTabs,
-		singleQuote: options.singleQuote,
-		printWidth: options.printWidth,
-		proseWrap: options.proseWrap
-	});
-};
+/**
+* Quote a string value using Prettier's quote selection logic:
+*
+* - Use preferred quote if value doesn't contain it
+* - Switch to alternative quote if value contains preferred but not alternative
+* - Use preferred quote with escaping if value contains both
+*/
+function quoteString(value, options) {
+	const preferredQuote = options.singleQuote ? "'" : "\"";
+	const alternativeQuote = options.singleQuote ? "\"" : "'";
+	const hasPreferred = value.includes(preferredQuote);
+	const hasAlternative = value.includes(alternativeQuote);
+	const quote = hasPreferred && !hasAlternative ? alternativeQuote : preferredQuote;
+	return `${quote}${escapeQuotes(value.replace(/\\/g, "\\\\"), quote)}${quote}`;
+}
 
 //#endregion
 //#region src/print.ts
-const { hardline, join } = doc.builders;
+const { hardline: hardline$1, join } = doc.builders;
 const mapChildren = (path, print) => path.map(print, "children");
 function serializeValue(value, options) {
-	const quote = options.singleQuote ? "'" : "\"";
-	if (typeof value === "string") return `${quote}${escapeQuotes(value.replace(/\\/g, "\\\\"), quote)}${quote}`;
+	if (typeof value === "string") return quoteString(value, options);
 	if (typeof value === "number" || typeof value === "boolean") return String(value);
-	return `${quote}${escapeQuotes(JSON.stringify(value), quote)}${quote}`;
+	const preferredQuote = options.singleQuote ? "'" : "\"";
+	return `${preferredQuote}${escapeQuotes(JSON.stringify(value), preferredQuote)}${preferredQuote}`;
 }
-function printAttributes(node, options) {
-	const attrs = node.attributes;
-	if (!attrs || Object.keys(attrs).length === 0) return "";
+function printAttributes({ attributes }, options) {
+	if (!attributes || Object.keys(attributes).length === 0) return "";
 	const parts = [];
-	for (const [key, value] of Object.entries(attrs)) if (key === "id") parts.push(`#${value}`);
+	for (const [key, value] of Object.entries(attributes)) if (key === "id") parts.push(`#${value}`);
 	else if (key === "class") {
 		const classes = String(value).split(/\s+/).filter(Boolean);
 		for (const cls of classes) parts.push(`.${cls}`);
@@ -115,8 +136,7 @@ function printAttributes(node, options) {
 function printBinding(node, options) {
 	const value = node.attributes?.value ?? "";
 	const defaultValue = node.attributes?.defaultValue;
-	const quote = options.singleQuote ? "'" : "\"";
-	if (defaultValue !== void 0 && defaultValue !== "undefined") return [`{{ ${value} || ${quote}${escapeQuotes(String(defaultValue), quote)}${quote} }}`];
+	if (defaultValue !== void 0 && defaultValue !== "undefined") return [`{{ ${value} || ${quoteString(String(defaultValue), options)} }}`];
 	return [`{{ ${value} }}`];
 }
 /**
@@ -134,6 +154,7 @@ function isShorthandSpan(node) {
 	}
 	return nodeLength <= 3;
 }
+const EMPTY_PROPS_RE = /\{\s*\}\s*$/;
 /**
 * Print inline text component: :name[content]{attrs} Special cases:
 *
@@ -165,6 +186,10 @@ function printTextComponent(path, print, options) {
 	const parts = [`:${node.name}`];
 	if (node.children && node.children.length > 0) parts.push("[", ...printChildrenWithEscapedBrackets(), "]");
 	if (attrStr) parts.push(attrStr);
+	else if (node.position) {
+		const text = options.originalText.slice(node.position.start.offset, node.position.end.offset);
+		if (EMPTY_PROPS_RE.test(text)) parts.push("{}");
+	}
 	return parts;
 }
 /**
@@ -175,39 +200,25 @@ function getContainerDepth(path) {
 	for (const item of path.stack) if (typeof item === "object" && item !== null && "type" in item && item.type === "containerComponent") depth++;
 	return Math.max(0, depth - 1);
 }
-/**
-* Print YAML front matter from rawData rawData format: "\nkey: value\n---"
-*/
-function printRawData(rawData, options) {
-	if (!rawData) return [];
-	let content = rawData.slice(1, -3).trimEnd();
-	if (!content) return [];
-	content = formatYaml(content, options);
-	return [
-		"---",
-		hardline,
-		join(hardline, content.split("\n")),
-		hardline,
-		"---",
-		hardline
-	];
-}
-/**
-* Print container component: ::name{attrs}\n---\nfmAttrs\n---\nchildren\n::
-*/
-function printContainerComponent(path, print, options) {
+function printContainerComponentWithYamlDoc(path, print, options, yamlDoc) {
 	const { node } = path;
 	const depth = getContainerDepth(path);
 	const colons = ":".repeat(depth + 2);
 	const parts = [colons, node.name];
 	const attrStr = printAttributes(node, options);
 	if (attrStr) parts.push(attrStr);
-	parts.push(hardline);
-	parts.push(...printRawData(node.rawData, options));
+	parts.push(hardline$1);
+	if (yamlDoc.length > 0) parts.push(...yamlDoc);
 	if (node.children && node.children.length > 0) {
+		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);
+		}
 		const childDocs = mapChildren(path, print);
-		parts.push(join(hardline, childDocs));
-		parts.push(hardline);
+		parts.push(join(hardline$1, childDocs));
+		parts.push(hardline$1);
 	}
 	parts.push(colons);
 	return parts;
@@ -218,10 +229,10 @@ function printContainerComponent(path, print, options) {
 function printComponentContainerSection(path, print) {
 	const { node } = path;
 	const parts = [];
-	if (node.name && node.name !== "default") parts.push(`#${node.name}`, hardline);
+	if (node.name && node.name !== "default") parts.push(`#${node.name}`, hardline$1);
 	if (node.children && node.children.length > 0) {
 		const childDocs = mapChildren(path, print);
-		parts.push(join(hardline, childDocs));
+		parts.push(join(hardline$1, childDocs));
 	}
 	return parts;
 }
@@ -264,23 +275,60 @@ function printLink(path, print, options) {
 
 //#endregion
 //#region src/printers.ts
+const { hardline } = doc.builders;
 const mdastPrinter = markdown$1.printers.mdast;
+function extractYamlContent(rawData) {
+	if (!rawData) return;
+	return rawData.trimEnd().slice(1, -3).trimEnd() || void 0;
+}
 const printers = { [AST_FORMAT]: {
 	...mdastPrinter,
 	getVisitorKeys(node, nonTraversableKeys) {
 		if (mdcNodeTypes.includes(node.type)) return visitorKeys[node.type];
 		return mdastPrinter.getVisitorKeys(node, nonTraversableKeys);
 	},
+	embed(path) {
+		const { node } = path;
+		if (isContainerComponentNode(node) && node.rawData) {
+			const yamlContent = extractYamlContent(node.rawData);
+			if (yamlContent) return async (textToDoc, print, _path, options) => {
+				let yamlDoc;
+				try {
+					yamlDoc = await textToDoc(yamlContent, { parser: "yaml" });
+				} catch {
+					yamlDoc = yamlContent;
+				}
+				return printContainerComponentWithYamlDoc(path, print, options, [
+					"---",
+					hardline,
+					yamlDoc,
+					hardline,
+					"---",
+					hardline
+				]);
+			};
+		}
+		return null;
+	},
 	print(path, options, print, args) {
 		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 (isTextComponentNode(node)) return printTextComponent(path, print, options);
-		else if (isContainerComponentNode(node)) return printContainerComponent(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);
 	}
 } };
 
 //#endregion
-export { parsers, printers };
+//#region src/index.ts
+const languages = [{
+	name: "mdc",
+	parsers: [AST_FORMAT],
+	extensions: [".mdc"],
+	vscodeLanguageIds: ["mdc"]
+}];
+
+//#endregion
+export { languages, parsers, printers };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-mdc",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "author": "Ray <i@mk1.io> (@so1ve)",
   "type": "module",
   "description": "Prettier plugin for MDC syntax",
@@ -24,7 +24,6 @@
   "sideEffects": false,
   "exports": {
     ".": "./dist/index.mjs",
-    "./yaml-worker": "./dist/yaml-worker.mjs",
     "./package.json": "./package.json"
   },
   "main": "./dist/index.mjs",
@@ -43,7 +42,6 @@
     "remark-math": "^6.0.0",
     "remark-mdc": "^3.10.0",
     "remark-parse": "^11.0.0",
-    "synckit": "^0.11.11",
     "unified": "^11.0.5"
   },
   "devDependencies": {

package/dist/yaml-worker.d.mts

@@ -1 +0,0 @@
-export { };

package/dist/yaml-worker.mjs

@@ -1,13 +0,0 @@
-import * as prettier from "prettier";
-import { runAsWorker } from "synckit";
-
-//#region src/yaml-worker.ts
-runAsWorker(async (text, options) => {
-	return (await prettier.format(text, {
-		...options,
-		parser: "yaml"
-	})).trimEnd();
-});
-
-//#endregion
-export {  };