@tsrx/prettier-plugin 0.3.58 → 0.3.59

package/package.json

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

package/src/index.js

@@ -4286,23 +4286,17 @@ function printTSInterfaceBody(node, path, options, print) {
  * @param {AstPath<AST.TSTypeAliasDeclaration>} path - The AST path
  * @param {RippleFormatOptions} options - Prettier options
  * @param {PrintFn} print - Print callback
- * @returns {Doc[]}
+ * @returns {Doc}
  */
 function printTSTypeAliasDeclaration(node, path, options, print) {
 	/** @type {Doc[]} */
-	const parts = [];
-	parts.push('type ');
-	parts.push(node.id.name);
+	const head = ['type ', node.id.name];
 
 	if (node.typeParameters) {
-		parts.push(path.call(print, 'typeParameters'));
+		head.push(path.call(print, 'typeParameters'));
 	}
 
-	parts.push(' = ');
-	parts.push(path.call(print, 'typeAnnotation'));
-	parts.push(semi(options));
-
-	return parts;
+	return group([head, ' =', indent([line, path.call(print, 'typeAnnotation')]), semi(options)]);
 }
 
 /**
@@ -5394,19 +5388,22 @@ function printTSConstructorType(node, path, options, print) {
  * @param {AstPath<AST.TSConditionalType>} path - The AST path
  * @param {RippleFormatOptions} options - Prettier options
  * @param {PrintFn} print - Print callback
- * @returns {Doc[]}
+ * @returns {Doc}
  */
 function printTSConditionalType(node, path, options, print) {
-	/** @type {Doc[]} */
-	const parts = [];
-	parts.push(path.call(print, 'checkType'));
-	parts.push(' extends ');
-	parts.push(path.call(print, 'extendsType'));
-	parts.push(' ? ');
-	parts.push(path.call(print, 'trueType'));
-	parts.push(' : ');
-	parts.push(path.call(print, 'falseType'));
-	return parts;
+	const trueType = path.call(print, 'trueType');
+	const falseType = path.call(print, 'falseType');
+
+	const shouldIndentTrueType = node.trueType.type !== 'TSConditionalType';
+	const shouldIndentFalseType = node.falseType.type !== 'TSConditionalType';
+
+	return group([
+		path.call(print, 'checkType'),
+		' extends ',
+		path.call(print, 'extendsType'),
+		indent([line, '? ', shouldIndentTrueType ? indent(trueType) : trueType]),
+		indent([line, ': ', shouldIndentFalseType ? indent(falseType) : falseType]),
+	]);
 }
 
 /**
@@ -6384,12 +6381,23 @@ function printElement(element, path, options, print) {
 			isTextLikeChild && Array.isArray(currentChild.expression?.leadingComments)
 				? currentChild.expression.leadingComments
 				: null;
+		const elementBodyLeadingComments =
+			hasTextLeadingComments && node.openingElement
+				? /** @type {AST.Comment[]} */ (currentChild.leadingComments).filter(
+						(comment) =>
+							comment.context?.containerId === node.metadata?.commentContainerId &&
+							comment.context?.beforeMeaningfulChild &&
+							typeof comment.start === 'number' &&
+							comment.start >= /** @type {AST.NodeWithLocation} */ (node.openingElement).end &&
+							comment.start < /** @type {AST.NodeWithLocation} */ (currentChild).start,
+					)
+				: [];
 
 		if (hasTextLeadingComments) {
 			for (let j = 0; j < /** @type {AST.Comment[]} */ (currentChild.leadingComments).length; j++) {
 				const comment = /** @type {AST.Comment[]} */ (currentChild.leadingComments)[j];
 				// Don't lift comments that belong inside the opening tag (handled in attribute section)
-				if (!openingTagCommentsSet.has(comment)) {
+				if (!openingTagCommentsSet.has(comment) && !elementBodyLeadingComments.includes(comment)) {
 					fallbackElementComments.push(comment);
 				}
 			}
@@ -6408,10 +6416,15 @@ function printElement(element, path, options, print) {
 				? path.call((childPath) => print(childPath, childPrintArgs), 'children', i)
 				: path.call(print, 'children', i);
 
-		const childDoc =
-			rawExpressionLeadingComments && rawExpressionLeadingComments.length > 0
-				? [...createElementLevelCommentParts(rawExpressionLeadingComments), printedChild]
-				: printedChild;
+		const childLeadingCommentParts =
+			elementBodyLeadingComments.length > 0
+				? createElementLevelCommentParts(elementBodyLeadingComments)
+				: rawExpressionLeadingComments && rawExpressionLeadingComments.length > 0
+					? createElementLevelCommentParts(rawExpressionLeadingComments)
+					: null;
+		const childDoc = childLeadingCommentParts
+			? [...childLeadingCommentParts, printedChild]
+			: printedChild;
 		finalChildren.push(childDoc);
 
 		// Insert element-body comments that fall between this child and the next child (or the closing tag).

package/src/index.test.js

@@ -3474,6 +3474,20 @@ const items = [] as unknown[];`;
 			expect(result).toBeWithNewline(expected);
 		});
 
+		it('should break long nested TypeScript conditional type aliases', async () => {
+			const input = `type PageModelValue<Value> = Value extends ReadonlySignal<unknown> ? Value : Value extends (...args: any[]) => any ? Value : Value extends object ? { [Key in keyof Value]: PageModelValue<Value[Key]> } : never;`;
+			const expected = `type PageModelValue<Value> =
+  Value extends ReadonlySignal<unknown>
+    ? Value
+    : Value extends (...args: any[]) => any
+      ? Value
+      : Value extends object
+        ? { [Key in keyof Value]: PageModelValue<Value[Key]> }
+        : never;`;
+			const result = await format(input);
+			expect(result).toBeWithNewline(expected);
+		});
+
 		it('should format TypeScript mapped types (TSMappedType)', async () => {
 			const input = `type ReadonlyPartial<T> = { readonly [K in keyof T]?: T[K] }`;
 			const expected = `type ReadonlyPartial<T> = { readonly [K in keyof T]?: T[K] };`;