prettier-plugin-mdc 0.1.3 → 0.1.4

package/dist/index.mjs

@@ -108,17 +108,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 +209,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 +240,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-mdc",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "author": "Ray <i@mk1.io> (@so1ve)",
   "type": "module",
   "description": "Prettier plugin for MDC syntax",