prettierx test: move prettierX-specific test variations

into tests/format/x subdirectory tree

based on some updates proposed in:

- #603

update test comments

rename dirpath -> dirPath to avoid spellcheck issues with
updates from upstream Prettier

Co-authored-by: Adaline Valentina Simonian <[email protected]>
Co-authored-by: Christopher J. Brody <[email protected]>

tests/format/x/angular/interpolation-additional-pipe-expressions/with-inner-spacing/jsfmt.spec.js

@@ -2,9 +2,9 @@
 // This test script runs for test files in parent directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/..`;
 
-run_spec(dirpath, ["__ng_interpolation"], {
+run_spec(dirPath, ["__ng_interpolation"], {
   // [prettierx] test with --paren-spacing
   spaceInParens: true,
   computedPropertySpacing: true,

tests/flow_function_parentheses/with-inner-spacing/jsfmt.spec.js → tests/format/x/flow/function-parentheses-with-inner-spacing/jsfmt.spec.js

@@ -1,13 +1,13 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../flow_function_parentheses`;
 
 // [prettierx] test with --paren-spacing, only with defaults
 // including arrowParens: "avoid"
 // (note that this combination is **not** recommended)
-run_spec(dirpath, ["flow", "babel", "babel-flow"], {
+run_spec(dirPath, ["flow", "babel", "babel-flow"], {
   spaceInParens: true,
   typeAngleBracketSpacing: true,
 });

tests/format/x/js/align-object-properties/with-inner-spacing/jsfmt.spec.js

@@ -2,9 +2,9 @@
 // This test script runs for test files in parent directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/..`;
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // "Standard JS":
   alignObjectProperties: true,
   // prettierx: test with --paren-spacing

tests/arrows/with-inner-spacing/jsfmt.spec.js → tests/format/x/js/arrows-with-inner-spacing/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../arrows`;
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // [prettierx] recommended option, especially in combo with --paren-spacing
   arrowParens: "avoid",
   // [prettierx] test with --paren-spacing

tests/binary-expressions/with-inner-spacing/jsfmt.spec.js → tests/format/x/js/binary-expressions-with-inner-spacing/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../binary-expressions`;
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // [prettierx] test with --paren-spacing
   spaceInParens: true,
   computedPropertySpacing: true,

tests/break-calls/with-inner-spacing/jsfmt.spec.js → tests/format/x/js/break-calls-with-inner-spacing/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../break-calls`;
 
-run_spec(dirpath, ["babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel-flow", "flow", "typescript"], {
   // [prettierx] test with --paren-spacing
   spaceInParens: true,
   arrayBracketSpacing: true,

tests/comments_closure_typecast/with-inner-spacing/jsfmt.spec.js → tests/format/x/js/comments-closure-typecast-with-inner-spacing/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../comments_closure_typecast`;
 
-run_spec(dirpath, ["babel", "babel-flow"], {
+run_spec(dirPath, ["babel", "babel-flow"], {
   // [prettierx] test with --paren-spacing
   spaceInParens: true,
   arrayBracketSpacing: true,

tests/format/x/js/computed-props-with-inner-spacing/jsfmt.spec.js

@@ -0,0 +1,9 @@
+// [prettierx] test script notice:
+// This test script runs for test files in another directory,
+// **not** on any files in *this* directory.
+
+const dirPath = `${__dirname}/../../../../computed_props`;
+
+run_spec(dirPath, ["babel", "babel-flow"], {
+  computedPropertySpacing: true,
+});

tests/format/x/js/empty-paren-comment-with-inner-spacing/jsfmt.spec.js

@@ -0,0 +1,9 @@
+// [prettierx] test script notice:
+// This test script runs for test files in another directory,
+// **not** on any files in *this* directory.
+
+const dirPath = `${__dirname}/../../../../empty_statement`;
+
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
+  spaceInParens: true,
+});

tests/format/x/js/empty-statement-with-inner-spacing/jsfmt.spec.js

@@ -0,0 +1,9 @@
+// [prettierx] test script notice:
+// This test script runs for test files in another directory,
+// **not** on any files in *this* directory.
+
+const dirPath = `${__dirname}/../../../../empty_paren_comment`;
+
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
+  spaceInParens: true,
+});

tests/if/break-before-else/jsfmt.spec.js → tests/format/x/js/if-with-break-before-else/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../if`;
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // [prettierx] test with --break-before-else
   breakBeforeElse: true,
   // recommended:

tests/method-chain/with-inner-spacing/jsfmt.spec.js → tests/format/x/js/method-chain-with-inner-spacing/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../method-chain`;
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // [prettierx] recommended setting with --paren-spacing
   arrowParens: "avoid",
   // [prettierx] test with --paren-spacing

tests/format/x/js/no-indent-chains/with-inner-spacing/jsfmt.spec.js

@@ -2,9 +2,9 @@
 // This test script runs for test files in parent directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/..`;
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   indentChains: false,
   spaceInParens: true,
   spaceUnaryOps: true,

tests/template/with-inner-spacing/jsfmt.spec.js → tests/format/x/js/template-with-inner-spacing/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../template`;
 
-run_spec(dirpath, ["babel", "babel-flow"], {
+run_spec(dirPath, ["babel", "babel-flow"], {
   // [prettierx] test with --paren-spacing
   spaceInParens: true,
   arrayBracketSpacing: true,

tests/ternaries/with-balanced-formatting/jsfmt.spec.js → tests/format/x/js/ternaries-with-balanced-formatting/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../ternaries`;
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // [prettierx] balanced ternary formatting option
   // (with improved consistency with "Standard JS"):
   offsetTernaryExpressions: true,
@@ -13,7 +13,7 @@ run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
   trailingComma: "none",
 });
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // variation from ../jsfmt.spec.js:
   tabWidth: 4,
   // [prettierx] balanced ternary formatting option
@@ -24,7 +24,7 @@ run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
   trailingComma: "none",
 });
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // variation from ../jsfmt.spec.js:
   useTabs: true,
   // [prettierx] balanced ternary formatting option
@@ -35,7 +35,7 @@ run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
   trailingComma: "none",
 });
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // variation from ../jsfmt.spec.js:
   useTabs: true,
   tabWidth: 4,

tests/ternaries/with-inner-spacing/jsfmt.spec.js → tests/format/x/js/ternaries-with-inner-spacing/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../ternaries`;
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   spaceInParens: true,
   arrayBracketSpacing: true,
   computedPropertySpacing: true,

tests/format/x/js/ternary-object-expressions/with-balanced-formatting/jsfmt.spec.js

@@ -2,9 +2,9 @@
 // This test script runs for test files in parent directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/..`;
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // [prettierx] balanced ternary formatting option,
   // for consistency with "Standard JS":
   offsetTernaryExpressions: true,
@@ -13,7 +13,7 @@ run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
   trailingComma: "none",
 });
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // variation from ../jsfmt.spec.js:
   tabWidth: 4,
   // [prettierx] balanced ternary formatting option,
@@ -24,7 +24,7 @@ run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
   trailingComma: "none",
 });
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // variation from ../jsfmt.spec.js:
   useTabs: true,
   // [prettierx] balanced ternary formatting option,
@@ -35,7 +35,7 @@ run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
   trailingComma: "none",
 });
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // variation from ../jsfmt.spec.js:
   useTabs: true,
   tabWidth: 4,

tests/test_declarations/with-inner-spacing/jsfmt.spec.js → tests/format/x/js/test-declarations-with-inner-spacing/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../test_declarations`;
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   // [prettierx] recommended option, especially in combo with --paren-spacing
   arrowParens: "avoid",
   // [prettierx] test with --paren-spacing

tests/jsx/with-inner-spacing/jsfmt.spec.js → tests/format/x/jsx/jsx-with-inner-spacing/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../jsx`;
 
-run_spec(dirpath, ["babel", "babel-flow", "flow", "typescript"], {
+run_spec(dirPath, ["babel", "babel-flow", "flow", "typescript"], {
   singleQuote: false,
   jsxSingleQuote: false,
   // [prettierx] test with --paren-spacing

tests/css_scss/with-inner-spacing/jsfmt.spec.js → tests/format/x/scss/scss-with-inner-spacing/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../css_scss`;
 
-run_spec(dirpath, ["scss"], {
+run_spec(dirPath, ["scss"], {
   // [prettierx] test with --css-paren-spacing
   cssParenSpacing: true,
 });

tests/typescript_conditional_types/with-balanced-formatting/jsfmt.spec.js → tests/format/x/typescript/conditional-types-with-balanced-formatting/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../typescript_conditional_types`;
 
-run_spec(dirpath, ["typescript"], {
+run_spec(dirPath, ["typescript"], {
   // [prettierx] balanced ternary formatting option
   // (with improved consistency with "Standard JS"):
   offsetTernaryExpressions: true,

tests/typescript/conformance/types/indexedAccesType/with-inner-spacing/jsfmt.spec.js → tests/format/x/typescript/conformance-types-indexedAccesType-with-inner-spacing/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../typescript/conformance/types/indexedAccesType`;
 
-run_spec(dirpath, ["typescript"], {
+run_spec(dirPath, ["typescript"], {
   // [prettierx] test with --paren-spacing
   spaceInParens: true,
   typeAngleBracketSpacing: true,

tests/format/x/typescript/conformance-types-mappedType-with-no-type-curly-spacing/jsfmt.spec.js

@@ -0,0 +1,9 @@
+// [prettierx] test script notice:
+// This test script runs for test files in another directory,
+// **not** on any files in *this* directory.
+
+const dirPath = `${__dirname}/../../../../typescript/conformance/types/mappedType`;
+
+run_spec(dirPath, ["typescript"], {
+  typeCurlySpacing: false,
+});

tests/typescript/custom/modifiers/with-inner-spacing/jsfmt.spec.js → tests/format/x/typescript/custom-modifiers-with-inner-spacing/jsfmt.spec.js

@@ -1,10 +1,10 @@
 // [prettierx] test script notice:
-// This test script runs for test files in parent directory,
+// This test script runs for test files in another directory,
 // **not** on any files in *this* directory.
 
-const dirpath = `${__dirname}/..`;
+const dirPath = `${__dirname}/../../../../typescript/custom/modifiers`;
 
-run_spec(dirpath, ["typescript"], {
+run_spec(dirPath, ["typescript"], {
   // [prettierx] test with spacing options (...)
   typeAngleBracketSpacing: true,
   typeBracketSpacing: true,