disallowJSXAmbiguity -> disallowAmbiguousJSXLike

babel · Oct 26, 2021 · 07343ca · 07343ca
1 parent 7e55e16
commit 07343ca
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 23 deletions.
diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js
@@ -1428,7 +1428,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
     }
 
     tsParseTypeAssertion(): N.TsTypeAssertion {
-      if (this.getPluginOption("typescript", "disallowJSXAmbiguity")) {
+      if (this.getPluginOption("typescript", "disallowAmbiguousJSXLike")) {
         this.raise(this.state.start, TSErrors.ReservedTypeAssertion);
       }
 
@@ -2959,7 +2959,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       if (
         node.params.length === 1 &&
         !node.extra?.trailingComma &&
-        this.getPluginOption("typescript", "disallowJSXAmbiguity")
+        this.getPluginOption("typescript", "disallowAmbiguousJSXLike")
       ) {
         this.raise(node.start, TSErrors.ReservedArrowTypeParam);
       }

diff --git a/packages/babel-parser/test/fixtures/typescript/disallow-jsx-ambiguity/options.json b/packages/babel-parser/test/fixtures/typescript/disallow-jsx-ambiguity/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": [["typescript", { "disallowJSXAmbiguity": true }]]
+  "plugins": [["typescript", { "disallowAmbiguousJSXLike": true }]]
 }
diff --git a/packages/babel-parser/typings/babel-parser.d.ts b/packages/babel-parser/typings/babel-parser.d.ts
@@ -185,7 +185,7 @@ export interface FlowPluginOptions {
 
 export interface TypeScriptPluginOptions {
   dts?: boolean;
-  disallowJSXAmbiguity?: boolean;
+  disallowAmbiguousJSXLike?: boolean;
 }
 
 export const tokTypes: {

diff --git a/packages/babel-plugin-syntax-typescript/src/index.js b/packages/babel-plugin-syntax-typescript/src/index.js
@@ -15,7 +15,7 @@ function removePlugin(plugins, name) {
   }
 }
 
-export default declare((api, { isTSX, disallowJSXAmbiguity }) => {
+export default declare((api, { isTSX, disallowAmbiguousJSXLike }) => {
   api.assertVersion(7);
 
   return {
@@ -32,7 +32,7 @@ export default declare((api, { isTSX, disallowJSXAmbiguity }) => {
       removePlugin(plugins, "jsx");
 
       parserOpts.plugins.push(
-        ["typescript", { disallowJSXAmbiguity }],
+        ["typescript", { disallowAmbiguousJSXLike }],
         "classProperties",
       );
 

diff --git a/packages/babel-plugin-syntax-typescript/test/fixtures/disallow-jsx-ambiguity/options.json b/packages/babel-plugin-syntax-typescript/test/fixtures/disallow-jsx-ambiguity/options.json
@@ -1,3 +1,3 @@
 {
-  "plugins": [["syntax-typescript", { "disallowJSXAmbiguity": true }]]
+  "plugins": [["syntax-typescript", { "disallowAmbiguousJSXLike": true }]]
 }
diff --git a/packages/babel-preset-typescript/src/index.js b/packages/babel-preset-typescript/src/index.js
@@ -8,7 +8,7 @@ export default declare((api, opts) => {
   const {
     allExtensions,
     allowNamespaces,
-    disallowJSXAmbiguity,
+    disallowAmbiguousJSXLike,
     isTSX,
     jsxPragma,
     jsxPragmaFrag,
@@ -17,19 +17,19 @@ export default declare((api, opts) => {
   } = normalizeOptions(opts);
 
   const pluginOptions = process.env.BABEL_8_BREAKING
-    ? (isTSX, disallowJSXAmbiguity) => ({
+    ? (isTSX, disallowAmbiguousJSXLike) => ({
         allowNamespaces,
-        disallowJSXAmbiguity,
+        disallowAmbiguousJSXLike,
         isTSX,
         jsxPragma,
         jsxPragmaFrag,
         onlyRemoveTypeImports,
         optimizeConstEnums,
       })
-    : (isTSX, disallowJSXAmbiguity) => ({
+    : (isTSX, disallowAmbiguousJSXLike) => ({
         allowDeclareFields: opts.allowDeclareFields,
         allowNamespaces,
-        disallowJSXAmbiguity,
+        disallowAmbiguousJSXLike,
         isTSX,
         jsxPragma,
         jsxPragmaFrag,
@@ -42,7 +42,10 @@ export default declare((api, opts) => {
       ? [
           {
             plugins: [
-              [transformTypeScript, pluginOptions(isTSX, disallowJSXAmbiguity)],
+              [
+                transformTypeScript,
+                pluginOptions(isTSX, disallowAmbiguousJSXLike),
+              ],
             ],
           },
         ]
@@ -65,7 +68,7 @@ export default declare((api, opts) => {
           },
           {
             test: /\.tsx$/,
-            // disallowJSXAmbiguity is a no-op when parsing TSX, since it's
+            // disallowAmbiguousJSXLike is a no-op when parsing TSX, since it's
             // always disallowed.
             plugins: [[transformTypeScript, pluginOptions(true, false)]],
           },

diff --git a/packages/babel-preset-typescript/src/normalize-options.js b/packages/babel-preset-typescript/src/normalize-options.js
@@ -7,7 +7,7 @@ export default function normalizeOptions(options = {}) {
   const TopLevelOptions = {
     allExtensions: "allExtensions",
     allowNamespaces: "allowNamespaces",
-    disallowJSXAmbiguity: "disallowJSXAmbiguity",
+    disallowAmbiguousJSXLike: "disallowAmbiguousJSXLike",
     isTSX: "isTSX",
     jsxPragma: "jsxPragma",
     jsxPragmaFrag: "jsxPragmaFrag",
@@ -55,15 +55,15 @@ export default function normalizeOptions(options = {}) {
     v.invariant(allExtensions, "isTSX:true requires allExtensions:true");
   }
 
-  const disallowJSXAmbiguity = v.validateBooleanOption(
-    TopLevelOptions.disallowJSXAmbiguity,
-    options.disallowJSXAmbiguity,
+  const disallowAmbiguousJSXLike = v.validateBooleanOption(
+    TopLevelOptions.disallowAmbiguousJSXLike,
+    options.disallowAmbiguousJSXLike,
     false,
   );
-  if (disallowJSXAmbiguity) {
+  if (disallowAmbiguousJSXLike) {
     v.invariant(
       allExtensions,
-      "disallowJSXAmbiguity:true requires allExtensions:true",
+      "disallowAmbiguousJSXLike:true requires allExtensions:true",
     );
   }
 
@@ -76,7 +76,7 @@ export default function normalizeOptions(options = {}) {
   return {
     allExtensions,
     allowNamespaces,
-    disallowJSXAmbiguity,
+    disallowAmbiguousJSXLike,
     isTSX,
     jsxPragma,
     jsxPragmaFrag,

diff --git a/packages/babel-preset-typescript/test/normalize-options.spec.js b/packages/babel-preset-typescript/test/normalize-options.spec.js
@@ -33,7 +33,7 @@ describe("normalize options", () => {
 Object {
   "allExtensions": false,
   "allowNamespaces": true,
-  "disallowJSXAmbiguity": false,
+  "disallowAmbiguousJSXLike": false,
   "isTSX": false,
   "jsxPragma": "React",
   "jsxPragmaFrag": "React.Fragment",
@@ -82,7 +82,7 @@ Object {
 Object {
   "allExtensions": false,
   "allowNamespaces": true,
-  "disallowJSXAmbiguity": false,
+  "disallowAmbiguousJSXLike": false,
   "isTSX": false,
   "jsxPragma": undefined,
   "jsxPragmaFrag": "React.Fragment",