@ripple-ts/prettier-plugin 0.2.160 → 0.2.162

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ripple-ts/prettier-plugin",
-  "version": "0.2.160",
+  "version": "0.2.162",
   "description": "Ripple plugin for Prettier",
   "type": "module",
   "module": "src/index.js",
@@ -25,7 +25,7 @@
   },
   "devDependencies": {
     "prettier": "^3.6.2",
-    "ripple": "0.2.160"
+    "ripple": "0.2.162"
   },
   "dependencies": {},
   "files": [

package/src/index.js

@@ -627,7 +627,7 @@ function printRippleNode(node, path, options, print, args) {
 			break;
 
 		case 'Component':
-			nodeContent = printComponent(node, path, options, print);
+			nodeContent = printComponent(node, path, options, print, innerCommentParts);
 			break;
 
 		case 'ExportNamedDeclaration':
@@ -1456,13 +1456,59 @@ function printRippleNode(node, path, options, print, args) {
 			if (!node.body || node.body.length === 0) {
 				// Handle innerComments for empty blocks
 				if (innerCommentParts.length > 0) {
-					nodeContent = group([
-						'{',
-						indent([hardline, join(hardline, innerCommentParts)]),
-						hardline,
-						'}',
-					]);
-					break;
+					// Check if we need to preserve blank lines between comments
+					if (node.innerComments && node.innerComments.length > 0) {
+						const commentDocs = [];
+						const comments = node.innerComments;
+
+						for (let i = 0; i < comments.length; i++) {
+							const comment = comments[i];
+							const prevComment = i > 0 ? comments[i - 1] : null;
+
+							// Check if there's a blank line before this comment
+							const hasBlankLineBefore =
+								prevComment && getBlankLinesBetweenNodes(prevComment, comment) > 0;
+
+							let commentDoc;
+							if (comment.type === 'Line') {
+								commentDoc = '//' + comment.value;
+							} else if (comment.type === 'Block') {
+								commentDoc = '/*' + comment.value + '*/';
+							}
+
+							commentDocs.push({ doc: commentDoc, hasBlankLineBefore });
+						}
+
+						// Build the content with proper spacing
+						const contentParts = [];
+						for (let i = 0; i < commentDocs.length; i++) {
+							const { doc, hasBlankLineBefore } = commentDocs[i];
+
+							if (i > 0) {
+								// Add blank line if needed (two hardlines = one blank line)
+								if (hasBlankLineBefore) {
+									contentParts.push(hardline);
+									contentParts.push(hardline);
+								} else {
+									contentParts.push(hardline);
+								}
+							}
+
+							contentParts.push(doc);
+						}
+
+						nodeContent = group(['{', indent([hardline, concat(contentParts)]), hardline, '}']);
+						break;
+					} else {
+						// Fallback to simple join
+						nodeContent = group([
+							'{',
+							indent([hardline, join(hardline, innerCommentParts)]),
+							hardline,
+							'}',
+						]);
+						break;
+					}
 				}
 				nodeContent = '{}';
 				break;
@@ -2096,7 +2142,7 @@ function printExportNamedDeclaration(node, path, options, print) {
 	return 'export';
 }
 
-function printComponent(node, path, options, print) {
+function printComponent(node, path, options, print, innerCommentParts = []) {
 	// Use arrays instead of string concatenation
 	const signatureParts = ['component ', node.id.name];
 
@@ -2196,10 +2242,70 @@ function printComponent(node, path, options, print) {
 		// Add the body and closing brace
 		parts.push(indentedContent, hardline, '}');
 	} else {
-		// Empty component body
+		// Empty component body - check for inner comments or trailing comments on id
+		// When a component body is empty with only comments, the parser attaches them
+		// as trailingComments on the id node (component name)
+		const commentDocs = [];
+
+		// Check innerComments first (standard case for empty blocks)
+		if (innerCommentParts.length > 0) {
+			for (const part of innerCommentParts) {
+				commentDocs.push({ doc: part, hasBlankLineBefore: false });
+			}
+		}
+
+		// Check for trailing comments on the id (component name)
+		// These are comments that appear inside an empty component body
+		if (node.id && node.id.trailingComments && node.id.trailingComments.length > 0) {
+			const comments = node.id.trailingComments;
+
+			for (let i = 0; i < comments.length; i++) {
+				const comment = comments[i];
+				const prevComment = i > 0 ? comments[i - 1] : null;
+
+				// Check if there's a blank line before this comment
+				const hasBlankLineBefore =
+					prevComment && getBlankLinesBetweenNodes(prevComment, comment) > 0;
+
+				let commentDoc;
+				if (comment.type === 'Line') {
+					commentDoc = '//' + comment.value;
+				} else if (comment.type === 'Block') {
+					commentDoc = '/*' + comment.value + '*/';
+				}
+
+				commentDocs.push({ doc: commentDoc, hasBlankLineBefore });
+			}
+		}
+
+		if (commentDocs.length > 0) {
+			// Build the content with proper spacing
+			const contentParts = [];
+			for (let i = 0; i < commentDocs.length; i++) {
+				const { doc, hasBlankLineBefore } = commentDocs[i];
+
+				if (i > 0) {
+					// Add blank line if needed (two hardlines = one blank line)
+					if (hasBlankLineBefore) {
+						contentParts.push(hardline);
+						contentParts.push(hardline);
+					} else {
+						contentParts.push(hardline);
+					}
+				}
+
+				contentParts.push(doc);
+			}
+
+			return concat([
+				concat(signatureParts),
+				' ',
+				group(['{', indent([hardline, concat(contentParts)]), hardline, '}']),
+			]);
+		}
+
 		parts[1] = ' {}';
 	}
-
 	return concat(parts);
 }
 

package/src/index.test.js

@@ -1881,6 +1881,53 @@ const obj2 = #{
 		expect(result).toBeWithNewline(expected);
 	});
 
+	it('should preserve comment if the whole component code is commented out', async () => {
+		const expected = `export component Test() {
+  // thing
+  // thing
+  // thing
+}`;
+
+		const result = await format(expected, { singleQuote: true });
+		expect(result).toBeWithNewline(expected);
+	});
+
+	it('should preserve comment if the whole component code is commented out, including blank lines', async () => {
+		const expected = `export component Test() {
+  // thing
+  // thing
+  /* thing */
+  // thing
+
+  /* thing */
+  // thing
+
+  /* thing */
+  // thing
+}`;
+
+		const result = await format(expected, { singleQuote: true });
+		expect(result).toBeWithNewline(expected);
+	});
+
+	it('should preserve comment if the whole function code is commented out, including blank lines', async () => {
+		const expected = `export function Test() {
+  // thing
+  // thing
+  /* thing */
+  // thing
+
+  /* thing */
+  // thing
+
+  /* thing */
+  // thing
+}`;
+
+		const result = await format(expected, { singleQuote: true });
+		expect(result).toBeWithNewline(expected);
+	});
+
 	it('should preserve comments in arrays with width 80', async () => {
 		const input = `const arr = [
   1,