Treat --trailing-comma=es5 as all when printing tuple types (#14086)

src/language-js/print/array.js

@@ -109,12 +109,7 @@ function printArray(path, options, print) {
       ? ""
       : needsForcedTrailingComma
       ? ","
-      : !shouldPrintComma(
-          options,
-          node.type === "TSTupleType" || node.type === "TupleTypeAnnotation"
-            ? "all"
-            : "es5"
-        )
+      : !shouldPrintComma(options)
       ? ""
       : shouldUseConciseFormatting
       ? ifBreak(",", "", { groupId })

tests/format/flow/tuple-types/__snapshots__/jsfmt.spec.js.snap

@@ -0,0 +1,124 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`trailing-comma.js - {"trailingComma":"all"} format 1`] = `
+====================================options=====================================
+parsers: ["flow", "babel-flow"]
+printWidth: 80
+trailingComma: "all"
+                                                                                | printWidth
+=====================================input======================================
+export interface ShopQueryResult {
+  chic: boolean;
+  location: number[];
+  menus: Menu[];
+  openingDays: number[];
+  closingDays: [
+    {
+      from: string,
+      to: string,
+    }, // <== this one
+  ];
+  shop: string;
+  distance: number;
+}
+
+=====================================output=====================================
+export interface ShopQueryResult {
+  chic: boolean;
+  location: number[];
+  menus: Menu[];
+  openingDays: number[];
+  closingDays: [
+    {
+      from: string,
+      to: string,
+    }, // <== this one
+  ];
+  shop: string;
+  distance: number;
+}
+
+================================================================================
+`;
+
+exports[`trailing-comma.js - {"trailingComma":"es5"} format 1`] = `
+====================================options=====================================
+parsers: ["flow", "babel-flow"]
+printWidth: 80
+trailingComma: "es5"
+                                                                                | printWidth
+=====================================input======================================
+export interface ShopQueryResult {
+  chic: boolean;
+  location: number[];
+  menus: Menu[];
+  openingDays: number[];
+  closingDays: [
+    {
+      from: string,
+      to: string,
+    }, // <== this one
+  ];
+  shop: string;
+  distance: number;
+}
+
+=====================================output=====================================
+export interface ShopQueryResult {
+  chic: boolean;
+  location: number[];
+  menus: Menu[];
+  openingDays: number[];
+  closingDays: [
+    {
+      from: string,
+      to: string,
+    }, // <== this one
+  ];
+  shop: string;
+  distance: number;
+}
+
+================================================================================
+`;
+
+exports[`trailing-comma.js - {"trailingComma":"none"} format 1`] = `
+====================================options=====================================
+parsers: ["flow", "babel-flow"]
+printWidth: 80
+trailingComma: "none"
+                                                                                | printWidth
+=====================================input======================================
+export interface ShopQueryResult {
+  chic: boolean;
+  location: number[];
+  menus: Menu[];
+  openingDays: number[];
+  closingDays: [
+    {
+      from: string,
+      to: string,
+    }, // <== this one
+  ];
+  shop: string;
+  distance: number;
+}
+
+=====================================output=====================================
+export interface ShopQueryResult {
+  chic: boolean;
+  location: number[];
+  menus: Menu[];
+  openingDays: number[];
+  closingDays: [
+    {
+      from: string,
+      to: string
+    } // <== this one
+  ];
+  shop: string;
+  distance: number;
+}
+
+================================================================================
+`;

tests/format/flow/tuple-types/jsfmt.spec.js

@@ -0,0 +1,3 @@
+run_spec(import.meta, ["flow", "babel-flow"], { trailingComma: "none" });
+run_spec(import.meta, ["flow", "babel-flow"], { trailingComma: "es5" });
+run_spec(import.meta, ["flow", "babel-flow"], { trailingComma: "all" });

tests/format/flow/tuple-types/trailing-comma.js

@@ -0,0 +1,14 @@
+export interface ShopQueryResult {
+  chic: boolean;
+  location: number[];
+  menus: Menu[];
+  openingDays: number[];
+  closingDays: [
+    {
+      from: string,
+      to: string,
+    }, // <== this one
+  ];
+  shop: string;
+  distance: number;
+}

tests/format/typescript/tuple/__snapshots__/jsfmt.spec.js.snap

@@ -271,7 +271,7 @@ export interface ShopQueryResult {
     {
       from: string;
       to: string;
-    } // <== this one
+    }, // <== this one
   ];
   shop: string;
   distance: number;
@@ -439,7 +439,7 @@ type ValidateArgs = [
   },
   string,
   string,
-  ...string[]
+  ...string[],
 ];
 
 ================================================================================
@@ -528,7 +528,7 @@ export type SCMRawResource = [
   modes.Command /*command*/,
   string[] /*icons: light, dark*/,
   boolean /*strike through*/,
-  boolean /*faded*/
+  boolean /*faded*/,
 ];
 
 ================================================================================