[parser] Make decoratorsBeforeExport default to false

packages/babel-parser/src/plugin-utils.ts

@@ -1,5 +1,9 @@
 import type Parser from "./parser";
-import type { PluginConfig } from "./typings";
+import type {
+  PluginConfig,
+  ParserPluginWithOptions,
+  PluginOptions,
+} from "./typings";
 
 export type Plugin = PluginConfig;
 
@@ -47,11 +51,14 @@ export function hasPlugin(
   });
 }
 
-export function getPluginOption(
+export function getPluginOption<
+  PluginName extends ParserPluginWithOptions[0],
+  OptionName extends keyof PluginOptions<PluginName>,
+>(
   plugins: PluginList,
-  name: string,
-  option: string,
-) {
+  name: PluginName,
+  option: OptionName,
+): PluginOptions<PluginName>[OptionName] | null {
   const plugin = plugins.find(plugin => {
     if (Array.isArray(plugin)) {
       return plugin[0] === name;
@@ -60,9 +67,8 @@ export function getPluginOption(
     }
   });
 
-  if (plugin && Array.isArray(plugin)) {
-    // @ts-expect-error Fixme: should check whether option is defined
-    return plugin[1][option];
+  if (plugin && Array.isArray(plugin) && plugin.length >= 2) {
+    return (plugin[1] as PluginOptions<PluginName>)[option];
   }
 
   return null;
@@ -85,14 +91,10 @@ export function validatePlugins(plugins: PluginList) {
       "decorators",
       "decoratorsBeforeExport",
     );
-    if (decoratorsBeforeExport == null) {
-      throw new Error(
-        "The 'decorators' plugin requires a 'decoratorsBeforeExport' option," +
-          " whose value must be a boolean. If you are migrating from" +
-          " Babylon/Babel 6 or want to use the old decorators proposal, you" +
-          " should use the 'decorators-legacy' plugin instead of 'decorators'.",
-      );
-    } else if (typeof decoratorsBeforeExport !== "boolean") {
+    if (
+      decoratorsBeforeExport != null &&
+      typeof decoratorsBeforeExport !== "boolean"
+    ) {
       throw new Error("'decoratorsBeforeExport' must be a boolean.");
     }
   }
@@ -172,6 +174,7 @@ export function validatePlugins(plugins: PluginList) {
       }
       const moduleAttributesVersionPluginOption = getPluginOption(
         plugins,
+        // @ts-expect-error TODO: moduleAttributes's type definitions don't have options
         "moduleAttributes",
         "version",
       );

packages/babel-parser/src/typings.ts

@@ -53,6 +53,9 @@ export type ParserPluginWithOptions =
   | ["flow", FlowPluginOptions]
   | ["typescript", TypeScriptPluginOptions];
 
+export type PluginOptions<PluginName extends ParserPluginWithOptions[0]> =
+  Extract<ParserPluginWithOptions, [PluginName, any]>[1];
+
 export interface DecoratorsPluginOptions {
   decoratorsBeforeExport?: boolean;
 }

packages/babel-parser/test/fixtures/es2022/class-properties/arguments-in-nested-class-decorator-call-expression/options.json

@@ -1,3 +1,3 @@
 {
-  "plugins": [["decorators", { "decoratorsBeforeExport": false }]]
+  "plugins": ["decorators"]
 }

packages/babel-parser/test/fixtures/experimental/decorators/class-property/options.json

@@ -1,3 +1,3 @@
 {
-  "plugins": [["decorators", { "decoratorsBeforeExport": false }]]
+  "plugins": ["decorators"]
 }

packages/babel-parser/test/fixtures/experimental/decorators/compued-property/options.json

@@ -1,3 +1,3 @@
 {
-  "plugins": [["decorators", { "decoratorsBeforeExport": false }]]
+  "plugins": ["decorators"]
 }

packages/babel-parser/test/fixtures/experimental/decorators/no-object-methods/options.json

@@ -1,10 +1,3 @@
 {
-  "plugins": [
-    [
-      "decorators",
-      {
-        "decoratorsBeforeExport": false
-      }
-    ]
-  ]
+  "plugins": ["decorators"]
 }

packages/babel-parser/test/fixtures/experimental/decorators/no-semi/options.json

@@ -1,11 +1,4 @@
 {
-  "plugins": [
-    [
-      "decorators",
-      {
-        "decoratorsBeforeExport": false
-      }
-    ]
-  ],
+  "plugins": ["decorators"],
   "throws": "Decorators must not be followed by a semicolon. (2:5)"
-}
+}

packages/babel-parser/test/fixtures/experimental/decorators/options.json

@@ -1,3 +1,3 @@
 {
-  "plugins": [["decorators", { "decoratorsBeforeExport": false }]]
+  "plugins": ["decorators"]
 }

packages/babel-parser/test/fixtures/experimental/decorators/parenthesized-createParenthesizedExpressions/options.json

@@ -1,4 +1,4 @@
 {
-  "plugins": [["decorators", { "decoratorsBeforeExport": false }]],
+  "plugins": ["decorators"],
   "createParenthesizedExpressions": true
 }

packages/babel-parser/test/fixtures/experimental/decorators/private-property/options.json

@@ -1,3 +1,3 @@
 {
-  "plugins": [["decorators", { "decoratorsBeforeExport": false }]]
+  "plugins": ["decorators"]
 }

packages/babel-parser/test/fixtures/experimental/decorators/restricted-1/options.json

@@ -1,11 +1,4 @@
 {
-  "plugins": [
-    [
-      "decorators",
-      {
-        "decoratorsBeforeExport": false
-      }
-    ]
-  ],
+  "plugins": ["decorators"],
   "throws": "Leading decorators must be attached to a class declaration. (1:6)"
-}
+}

packages/babel-parser/test/fixtures/experimental/decorators/restricted-2/options.json

@@ -1,11 +1,4 @@
 {
-  "plugins": [
-    [
-      "decorators",
-      {
-        "decoratorsBeforeExport": false
-      }
-    ]
-  ],
+  "plugins": ["decorators"],
   "throws": "Leading decorators must be attached to a class declaration. (1:6)"
-}
+}

packages/babel-parser/test/fixtures/experimental/pipeline-operator/hack-double-at-proposal-class-decorator-with-bare-identifier/options.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
     ["pipelineOperator", { "proposal": "hack", "topicToken": "@@" }],
-    ["decorators", { "decoratorsBeforeExport": false }]
+    "decorators"
   ]
 }

packages/babel-parser/test/fixtures/experimental/pipeline-operator/hack-double-at-proposal-class-decorator-with-parenthesized-identifier/options.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
     ["pipelineOperator", { "proposal": "hack", "topicToken": "@@" }],
-    ["decorators", { "decoratorsBeforeExport": false }]
+    "decorators"
   ]
 }

packages/babel-parser/test/fixtures/experimental/pipeline-operator/hack-double-at-proposal-class-decorator-with-parenthesized-topic/options.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
     ["pipelineOperator", { "proposal": "hack", "topicToken": "@@" }],
-    ["decorators", { "decoratorsBeforeExport": false }]
+    "decorators"
   ]
 }

packages/babel-parser/test/fixtures/experimental/pipeline-operator/hack-double-caret-proposal-class-decorator-with-bare-identifier/options.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
     ["pipelineOperator", { "proposal": "hack", "topicToken": "^^" }],
-    ["decorators", { "decoratorsBeforeExport": false }]
+    "decorators"
   ]
 }

packages/babel-parser/test/fixtures/experimental/pipeline-operator/hack-double-caret-proposal-class-decorator-with-parenthesized-identifier/options.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
     ["pipelineOperator", { "proposal": "hack", "topicToken": "^^" }],
-    ["decorators", { "decoratorsBeforeExport": false }]
+    "decorators"
   ]
 }

packages/babel-parser/test/fixtures/experimental/pipeline-operator/hack-double-caret-proposal-class-decorator-with-parenthesized-topic/options.json

@@ -1,6 +1,6 @@
 {
   "plugins": [
     ["pipelineOperator", { "proposal": "hack", "topicToken": "^^" }],
-    ["decorators", { "decoratorsBeforeExport": false }]
+    "decorators"
   ]
 }

packages/babel-parser/test/fixtures/flow/class-properties/declare-after-decorators/options.json

@@ -1,4 +1,4 @@
 {
   "sourceType": "module",
-  "plugins": ["flow", ["decorators", { "decoratorsBeforeExport": false }]]
+  "plugins": ["flow", "decorators"]
 }

packages/babel-parser/test/fixtures/flow/class-properties/declare-before-decorators/options.json

@@ -1,5 +1,5 @@
 {
   "sourceType": "module",
-  "plugins": ["flow", ["decorators", { "decoratorsBeforeExport": false }]],
+  "plugins": ["flow", "decorators"],
   "throws": "Unexpected token (2:10)"
 }