Reuse printFunctionType (prettier#14189)

medikoo · Feb 7, 2024 · 61b64f7 · 61b64f7
1 parent 242fae8
commit 61b64f7
Show file tree

Hide file tree

Showing 4 changed files with 120 additions and 41 deletions.
diff --git a/src/language-js/print/type-annotation.js b/src/language-js/print/type-annotation.js
@@ -214,10 +214,28 @@ function printUnionType(path, options, print) {
   return group(shouldIndent ? indent(code) : code);
 }
 
-// `TSFunctionType` and `FunctionTypeAnnotation`
+/*
+- `TSFunctionType` (TypeScript)
+- `TSCallSignatureDeclaration` (TypeScript)
+- `TSConstructorType` (TypeScript)
+- `TSConstructSignatureDeclaration` (TypeScript)
+- `FunctionTypeAnnotation` (Flow)
+*/
 function printFunctionType(path, options, print) {
   const { node } = path;
   const parts = [];
+
+  if (node.type === "TSConstructorType" && node.abstract) {
+    parts.push("abstract ");
+  }
+
+  if (
+    node.type === "TSConstructorType" ||
+    node.type === "TSConstructSignatureDeclaration"
+  ) {
+    parts.push("new ");
+  }
+
   // FunctionTypeAnnotation is ambiguous:
   // declare function foo(a: B): void; OR
   // var A: (a: B) => void;
@@ -226,15 +244,17 @@ function printFunctionType(path, options, print) {
   const parentParentParent = path.getParentNode(2);
   let isArrowFunctionTypeAnnotation =
     node.type === "TSFunctionType" ||
-    !(
-      ((parent.type === "ObjectTypeProperty" ||
-        parent.type === "ObjectTypeInternalSlot") &&
-        !parent.variance &&
-        !parent.optional &&
-        locStart(parent) === locStart(node)) ||
-      parent.type === "ObjectTypeCallProperty" ||
-      parentParentParent?.type === "DeclareFunction"
-    );
+    node.type === "TSConstructorType" ||
+    (node.type === "FunctionTypeAnnotation" &&
+      !(
+        ((parent.type === "ObjectTypeProperty" ||
+          parent.type === "ObjectTypeInternalSlot") &&
+          !parent.variance &&
+          !parent.optional &&
+          locStart(parent) === locStart(node)) ||
+        parent.type === "ObjectTypeCallProperty" ||
+        parentParentParent?.type === "DeclareFunction"
+      ));
 
   let needsColon =
     isArrowFunctionTypeAnnotation &&

diff --git a/src/language-js/print/typescript.js b/src/language-js/print/typescript.js
@@ -258,37 +258,6 @@ function printTypescript(path, options, print) {
       return print("literal");
     case "TSIndexedAccessType":
       return printIndexedAccessType(path, options, print);
-    case "TSConstructSignatureDeclaration":
-    case "TSCallSignatureDeclaration":
-    case "TSConstructorType":
-      if (node.type === "TSConstructorType" && node.abstract) {
-        parts.push("abstract ");
-      }
-      if (node.type !== "TSCallSignatureDeclaration") {
-        parts.push("new ");
-      }
-
-      parts.push(
-        group(
-          printFunctionParameters(
-            path,
-            print,
-            options,
-            /* expandArg */ false,
-            /* printTypeParams */ true
-          )
-        )
-      );
-
-      if (node.returnType || node.typeAnnotation) {
-        const isType = node.type === "TSConstructorType";
-        parts.push(
-          isType ? " => " : ": ",
-          print("returnType"),
-          print("typeAnnotation")
-        );
-      }
-      return parts;
 
     case "TSTypeOperator":
       return [node.operator, " ", print("typeAnnotation")];
@@ -440,6 +409,9 @@ function printTypescript(path, options, print) {
     case "TSUnionType":
       return printUnionType(path, options, print);
     case "TSFunctionType":
+    case "TSCallSignatureDeclaration":
+    case "TSConstructorType":
+    case "TSConstructSignatureDeclaration":
       return printFunctionType(path, options, print);
     case "TSTupleType":
       return printArray(path, options, print);

diff --git a/tests/format/typescript/function-type/__snapshots__/jsfmt.spec.js.snap b/tests/format/typescript/function-type/__snapshots__/jsfmt.spec.js.snap
@@ -1,5 +1,67 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`consistent.ts format 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 80
+                                                                                | printWidth
+=====================================input======================================
+// TSFunctionType
+type A = (
+  tpl: TemplateStringsArray,
+  ...args: Array<unknown>
+) => (replacements?: PublicReplacements) => T;
+
+// TSConstructorType
+type B = new (
+  tpl: TemplateStringsArray,
+  ...args: Array<unknown>
+) => (replacements?: PublicReplacements) => T;
+
+type X = {
+  // TSCallSignatureDeclaration
+  (
+    tpl: TemplateStringsArray,
+    ...args: Array<unknown>
+  ): (replacements?: PublicReplacements) => T;
+
+  // TSConstructSignatureDeclaration
+  new (
+    tpl: TemplateStringsArray,
+    ...args: Array<unknown>
+  ): (replacements?: PublicReplacements) => T;
+};
+
+=====================================output=====================================
+// TSFunctionType
+type A = (
+  tpl: TemplateStringsArray,
+  ...args: Array<unknown>
+) => (replacements?: PublicReplacements) => T;
+
+// TSConstructorType
+type B = new (
+  tpl: TemplateStringsArray,
+  ...args: Array<unknown>
+) => (replacements?: PublicReplacements) => T;
+
+type X = {
+  // TSCallSignatureDeclaration
+  (
+    tpl: TemplateStringsArray,
+    ...args: Array<unknown>
+  ): (replacements?: PublicReplacements) => T;
+
+  // TSConstructSignatureDeclaration
+  new (
+    tpl: TemplateStringsArray,
+    ...args: Array<unknown>
+  ): (replacements?: PublicReplacements) => T;
+};
+
+================================================================================
+`;
+
 exports[`single-parameter.ts format 1`] = `
 ====================================options=====================================
 parsers: ["typescript"]

diff --git a/tests/format/typescript/function-type/consistent.ts b/tests/format/typescript/function-type/consistent.ts
@@ -0,0 +1,25 @@
+// TSFunctionType
+type A = (
+  tpl: TemplateStringsArray,
+  ...args: Array<unknown>
+) => (replacements?: PublicReplacements) => T;
+
+// TSConstructorType
+type B = new (
+  tpl: TemplateStringsArray,
+  ...args: Array<unknown>
+) => (replacements?: PublicReplacements) => T;
+
+type X = {
+  // TSCallSignatureDeclaration
+  (
+    tpl: TemplateStringsArray,
+    ...args: Array<unknown>
+  ): (replacements?: PublicReplacements) => T;
+
+  // TSConstructSignatureDeclaration
+  new (
+    tpl: TemplateStringsArray,
+    ...args: Array<unknown>
+  ): (replacements?: PublicReplacements) => T;
+};