@tsrx/prettier-plugin 0.3.79 → 0.3.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsrx/prettier-plugin",
-  "version": "0.3.79",
+  "version": "0.3.81",
   "description": "Ripple plugin for Prettier",
   "type": "module",
   "module": "src/index.js",
@@ -27,7 +27,7 @@
     "prettier": "^3.8.3"
   },
   "dependencies": {
-    "@tsrx/core": "0.1.27"
+    "@tsrx/core": "0.1.29"
   },
   "files": [
     "src/"

package/src/index.js

@@ -55,11 +55,11 @@ export const parsers = {
 		astFormat: 'ripple-ast',
 		/**
 		 * @param {string} text
-		 * @param {ParserOptions<AST.Node | AST.CSS.StyleSheet>} _options
+		 * @param {ParserOptions<AST.Node | AST.CSS.StyleSheet>} options
 		 * @returns {AST.Program}
 		 */
-		parse(text, _options) {
-			return parseModule(text);
+		parse(text, options) {
+			return parseModule(text, options.filepath || 'PrettierPlugin.tsrx');
 		},
 
 		/**
@@ -5912,6 +5912,7 @@ function printJSXElement(node, path, options, print) {
 					'{',
 					path.call(print, 'children', i, 'expression'),
 					'}',
+					...printTemplateChildTrailingComments(child),
 				]);
 				childNodes.push(child);
 			} else {
@@ -6065,6 +6066,7 @@ function printJSXFragment(node, path, options, print) {
 				'{',
 				path.call(print, 'children', i, 'expression'),
 				'}',
+				...printTemplateChildTrailingComments(child),
 			]);
 			childNodes.push(child);
 		} else {
@@ -6203,6 +6205,32 @@ function printTemplateChildLeadingComments(child) {
 	return parts;
 }
 
+/**
+ * Build doc parts for a template child's trailing comments (kept on the same
+ * line as the child). Used for `{expr}` children, whose `{ … }` form is printed
+ * inline by the JSX printers and so would otherwise skip the node's attached
+ * trailing comments.
+ * @param {AST.Node & AST.NodeWithMaybeComments} child
+ * @returns {Doc[]}
+ */
+function printTemplateChildTrailingComments(child) {
+	const comments = child.trailingComments;
+	if (!comments || comments.length === 0) {
+		return [];
+	}
+	/** @type {Doc[]} */
+	const parts = [];
+	for (const comment of comments) {
+		if (comment.type === 'Line') {
+			parts.push(lineSuffix([' ', '//' + comment.value]));
+			parts.push(breakParent);
+		} else if (comment.type === 'Block') {
+			parts.push(' /*' + comment.value + '*/');
+		}
+	}
+	return parts;
+}
+
 /**
  * Collect and print the comments that belong to an element/fragment body:
  * trailing comments after the last child (attached by the parser to the closing

package/src/index.test.js

@@ -2851,6 +2851,30 @@ function test() {
 			expect(result).toBeWithNewline(expected);
 		});
 
+		it('should keep a trailing line comment after an expression container child', async () => {
+			const expected = `function App() @{
+  <>
+    {q} // hey
+    // hello
+  </>
+}`;
+
+			const result = await format(expected, { singleQuote: true });
+			expect(result).toBeWithNewline(expected);
+		});
+
+		it('should keep a trailing block comment after an expression container child', async () => {
+			const expected = `function App() {
+  <div>
+    {x} /* note */
+    <span>{'tail'}</span>
+  </div>
+}`;
+
+			const result = await format(expected, { singleQuote: true });
+			expect(result).toBeWithNewline(expected);
+		});
+
 		it('should preserve trailing comments in function parameters', async () => {
 			const expected = `function test(
   // comment in params