prettier-plugin-mdc 0.1.2 → 0.1.4

package/dist/index.mjs

@@ -1,13 +1,11 @@
-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";
@@ -110,30 +108,16 @@ function quoteString(value, options) {
 	const quote = hasPreferred && !hasAlternative ? alternativeQuote : preferredQuote;
 	return `${quote}${escapeQuotes(value.replace(/\\/g, "\\\\"), quote)}${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
-	});
-};
-
-//#endregion
-//#region src/print.ts
-const { hardline, 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 = [];
@@ -215,46 +199,35 @@ 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.trimEnd().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);
-	const rawDataDoc = printRawData(node.rawData, options);
-	parts.push(...rawDataDoc);
+	parts.push(hardline$1);
+	if (yamlDoc.length > 0) parts.push(...yamlDoc);
 	if (node.children && node.children.length > 0) {
-		if (rawDataDoc.length > 0 && node.rawData) {
-			const componentStartLine = node.position?.start.line ?? 0;
+		const componentStartLine = node.position?.start.line ?? 0;
+		let prevEndLine;
+		if (yamlDoc.length > 0 && node.rawData) {
 			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);
+			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, childDocs));
-		parts.push(hardline);
+		parts.push(...childDocs);
+		parts.push(hardline$1);
 	}
 	parts.push(colons);
 	return parts;
@@ -265,10 +238,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));
+		const childDocs = path.map(print, "children");
+		parts.push(join(hardline$1, childDocs));
 	}
 	return parts;
 }
@@ -311,19 +284,47 @@ 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);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-mdc",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "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 {  };