Print trailing comma after a single TS generic in arrow fns (#14113)

ozanhonamlioglu · web-flow · commit 1c32b670ce23 · 2022-01-10T15:37:05.000+01:00
diff --git a/packages/babel-generator/src/generators/typescript.ts b/packages/babel-generator/src/generators/typescript.ts
@@ -12,9 +12,13 @@ export function TSTypeAnnotation(this: Printer, node: t.TSTypeAnnotation) {
 export function TSTypeParameterInstantiation(
   this: Printer,
   node: t.TSTypeParameterInstantiation,
+  parent: t.Node,
 ): void {
   this.token("<");
   this.printList(node.params, node, {});
+  if (parent.type === "ArrowFunctionExpression" && node.params.length === 1) {
+    this.token(",");
+  }
   this.token(">");
 }
 
diff --git a/packages/babel-generator/test/fixtures/typescript/arrow-function-async-generic/output.js b/packages/babel-generator/test/fixtures/typescript/arrow-function-async-generic/output.js
@@ -1 +1 @@
-async <T>(a: T): T => a;
+async <T,>(a: T): T => a;
diff --git a/packages/babel-generator/test/fixtures/typescript/arrow-function-generic-tsx-trailing-comma/input.js b/packages/babel-generator/test/fixtures/typescript/arrow-function-generic-tsx-trailing-comma/input.js
@@ -0,0 +1,2 @@
+// Verify typescript doesn't change anything inside type parameter declaration
+const foo = <T,>(a: T): T => a;
diff --git a/packages/babel-generator/test/fixtures/typescript/arrow-function-generic-tsx-trailing-comma/options.json b/packages/babel-generator/test/fixtures/typescript/arrow-function-generic-tsx-trailing-comma/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["jsx", "typescript"]
+}
diff --git a/packages/babel-generator/test/fixtures/typescript/arrow-function-generic-tsx-trailing-comma/output.js b/packages/babel-generator/test/fixtures/typescript/arrow-function-generic-tsx-trailing-comma/output.js
@@ -0,0 +1,2 @@
+// Verify typescript doesn't change anything inside type parameter declaration
+const foo = <T,>(a: T): T => a;
diff --git a/packages/babel-generator/test/fixtures/typescript/arrow-function-generic-tsx/output.js b/packages/babel-generator/test/fixtures/typescript/arrow-function-generic-tsx/output.js
@@ -1,2 +1,2 @@
 // Same as `generic`. Verify that JSX doesn't change things.
-<T>(a: T): T => a;
+<T,>(a: T): T => a;
diff --git a/packages/babel-generator/test/fixtures/typescript/arrow-function-generic/output.js b/packages/babel-generator/test/fixtures/typescript/arrow-function-generic/output.js
@@ -1 +1 @@
-<T>(a: T): T => a;
+<T,>(a: T): T => a;
diff --git a/packages/babel-plugin-syntax-typescript/test/fixtures/disallow-jsx-ambiguity/type-parameter-unambiguous/output.js b/packages/babel-plugin-syntax-typescript/test/fixtures/disallow-jsx-ambiguity/type-parameter-unambiguous/output.js
@@ -1,3 +1,3 @@
-<T>() => 1;
+<T,>() => 1;
 
-<T>(x) => 1;
+<T,>(x) => 1;
diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/regression/11344-typescript/output.js b/packages/babel-plugin-transform-parameters/test/fixtures/regression/11344-typescript/output.js
@@ -4,6 +4,6 @@ function a() {
 }
 
 function d() {
-  let e = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : <T>() => {};
+  let e = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : <T,>() => {};
   let T;
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-async <T>(a: T): T => a;`
	`1`	`+async <T,>(a: T): T => a;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+// Verify typescript doesn't change anything inside type parameter declaration`
	`2`	`+const foo = <T,>(a: T): T => a;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "plugins": ["jsx", "typescript"]`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	// Same as `generic`. Verify that JSX doesn't change things.
`2`		`-<T>(a: T): T => a;`
	`2`	`+<T,>(a: T): T => a;`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ function a() {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`function d() {`
`7`		`- let e = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : <T>() => {};`
	`7`	`+ let e = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : <T,>() => {};`
`8`	`8`	`let T;`
`9`	`9`	`}`