updated error messages for invalid parser syntaxType option

babel · Jan 15, 2020 · 7686bf4 · 7686bf4
1 parent 2ddfcd0
commit 7686bf4
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/packages/babel-generator/src/generators/types.js b/packages/babel-generator/src/generators/types.js
@@ -119,7 +119,7 @@ export function RecordExpression(node: Object) {
     endToken = "}";
   } else {
     throw new Error(
-      `The "recordAndTupleSyntaxType" generator option must be either "bar" or "hash" (${JSON.stringify(
+      `The "recordAndTupleSyntaxType" generator option must be "bar" or "hash" (${JSON.stringify(
         this.format.recordAndTupleSyntaxType,
       )} received).`,
     );

diff --git a/packages/babel-parser/src/plugin-utils.js b/packages/babel-parser/src/plugin-utils.js
@@ -39,6 +39,7 @@ export function getPluginOption(
 }
 
 const PIPELINE_PROPOSALS = ["minimal", "smart", "fsharp"];
+const RECORD_AND_TUPLE_SYNTAX_TYPES = ["hash", "bar"];
 
 export function validatePlugins(plugins: PluginList) {
   if (hasPlugin(plugins, "decorators")) {
@@ -84,6 +85,18 @@ export function validatePlugins(plugins: PluginList) {
         PIPELINE_PROPOSALS.map(p => `'${p}'`).join(", "),
     );
   }
+
+  if (
+    hasPlugin(plugins, "recordAndTuple") &&
+    !RECORD_AND_TUPLE_SYNTAX_TYPES.includes(
+      getPluginOption(plugins, "recordAndTuple", "syntaxType"),
+    )
+  ) {
+    throw new Error(
+      "'recordAndTuple' requires 'syntaxType' option whose value should be one of: " +
+        RECORD_AND_TUPLE_SYNTAX_TYPES.map(p => `'${p}'`).join(", "),
+    );
+  }
 }
 
 // These plugins are defined using a mixin which extends the parser class.

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": "Unexpected token (1:1)"
+  "throws": "'recordAndTuple' requires 'syntaxType' option whose value should 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": "Unexpected token (1:1)"
+  "throws": "'recordAndTuple' requires 'syntaxType' option whose value should 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": "Unexpected character '#' (1:0)"
+  "throws": "'recordAndTuple' requires 'syntaxType' option whose value should 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": "Unexpected character '#' (1:0)"
+  "throws": "'recordAndTuple' requires 'syntaxType' option whose value should be one of: 'hash', 'bar'"
 }