Default to hash syntax for Record&Tuple

babel · Jul 8, 2022 · e1c4980 · e1c4980
1 parent 0d87fe7
commit e1c4980
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 15 deletions.
diff --git a/packages/babel-generator/src/generators/types.ts b/packages/babel-generator/src/generators/types.ts
@@ -117,15 +117,18 @@ export function RecordExpression(this: Printer, node: t.RecordExpression) {
   if (this.format.recordAndTupleSyntaxType === "bar") {
     startToken = "{|";
     endToken = "|}";
-  } else if (this.format.recordAndTupleSyntaxType === "hash") {
-    startToken = "#{";
-    endToken = "}";
-  } else {
+  } else if (
+    this.format.recordAndTupleSyntaxType !== "hash" &&
+    this.format.recordAndTupleSyntaxType != null
+  ) {
     throw new Error(
       `The "recordAndTupleSyntaxType" generator option must be "bar" or "hash" (${JSON.stringify(
         this.format.recordAndTupleSyntaxType,
       )} received).`,
     );
+  } else {
+    startToken = "#{";
+    endToken = "}";
   }
 
   this.token(startToken);

diff --git a/packages/babel-generator/test/fixtures/recordAndTupleSyntaxType/missing-option/input.js b/packages/babel-generator/test/fixtures/recordAndTupleSyntaxType/missing-option/input.js
diff --git a/packages/babel-generator/test/fixtures/recordAndTupleSyntaxType/missing-option/options.json b/packages/babel-generator/test/fixtures/recordAndTupleSyntaxType/missing-option/options.json
diff --git a/packages/babel-parser/src/plugin-utils.js b/packages/babel-parser/src/plugin-utils.js
@@ -185,12 +185,13 @@ export function validatePlugins(plugins: PluginList) {
 
   if (
     hasPlugin(plugins, "recordAndTuple") &&
+    getPluginOption(plugins, "recordAndTuple", "syntaxType") != null &&
     !RECORD_AND_TUPLE_SYNTAX_TYPES.includes(
       getPluginOption(plugins, "recordAndTuple", "syntaxType"),
     )
   ) {
     throw new Error(
-      "'recordAndTuple' requires 'syntaxType' option whose value should be one of: " +
+      "The 'syntaxType' option of the 'recordAndTuple' plugin must be one of: " +
         RECORD_AND_TUPLE_SYNTAX_TYPES.map(p => `'${p}'`).join(", "),
     );
   }

diff --git a/packages/babel-parser/src/tokenizer/index.js b/packages/babel-parser/src/tokenizer/index.js
@@ -519,7 +519,7 @@ export default class Tokenizer extends CommentsParser {
       // which is not allowed in the spec. Throwing expecting recordAndTuple is
       // misleading
       this.expectPlugin("recordAndTuple");
-      if (this.getPluginOption("recordAndTuple", "syntaxType") !== "hash") {
+      if (this.getPluginOption("recordAndTuple", "syntaxType") === "bar") {
         throw this.raise(
           next === charCodes.leftCurlyBrace
             ? Errors.RecordExpressionHashIncorrectStartSyntaxType

diff --git a/...l-parser/test/fixtures/experimental/record-and-tuple/invalid-type-bar-record/options.json b/...l-parser/test/fixtures/experimental/record-and-tuple/invalid-type-bar-record/options.json
@@ -1,4 +1,4 @@
 {
   "plugins": [["recordAndTuple", { "syntaxType": "invalid" }]],
-  "throws": "'recordAndTuple' requires 'syntaxType' option whose value should be one of: 'hash', 'bar'"
+  "throws": "The 'syntaxType' option of the 'recordAndTuple' plugin must be one of: 'hash', 'bar'"
 }
diff --git a/...el-parser/test/fixtures/experimental/record-and-tuple/invalid-type-bar-tuple/options.json b/...el-parser/test/fixtures/experimental/record-and-tuple/invalid-type-bar-tuple/options.json
@@ -1,4 +1,4 @@
 {
   "plugins": [["recordAndTuple", { "syntaxType": "invalid" }]],
-  "throws": "'recordAndTuple' requires 'syntaxType' option whose value should be one of: 'hash', 'bar'"
+  "throws": "The 'syntaxType' option of the 'recordAndTuple' plugin must be one of: 'hash', 'bar'"
 }
diff --git a/...-parser/test/fixtures/experimental/record-and-tuple/invalid-type-hash-record/options.json b/...-parser/test/fixtures/experimental/record-and-tuple/invalid-type-hash-record/options.json
@@ -1,4 +1,4 @@
 {
   "plugins": [["recordAndTuple", { "syntaxType": "invalid" }]],
-  "throws": "'recordAndTuple' requires 'syntaxType' option whose value should be one of: 'hash', 'bar'"
+  "throws": "The 'syntaxType' option of the 'recordAndTuple' plugin must be one of: 'hash', 'bar'"
 }
diff --git a/...l-parser/test/fixtures/experimental/record-and-tuple/invalid-type-hash-tuple/options.json b/...l-parser/test/fixtures/experimental/record-and-tuple/invalid-type-hash-tuple/options.json
@@ -1,4 +1,4 @@
 {
   "plugins": [["recordAndTuple", { "syntaxType": "invalid" }]],
-  "throws": "'recordAndTuple' requires 'syntaxType' option whose value should be one of: 'hash', 'bar'"
+  "throws": "The 'syntaxType' option of the 'recordAndTuple' plugin must be one of: 'hash', 'bar'"
 }