Move option validation

nicolo-ribaudo · nicolo-ribaudo · commit 283141962a30 · 2021-05-17T22:57:51.000+02:00
diff --git a/packages/babel-preset-typescript/src/normalize-options.js b/packages/babel-preset-typescript/src/normalize-options.js
@@ -2,23 +2,19 @@ import { OptionValidator } from "@babel/helper-validator-option";
 const v = new OptionValidator("@babel/preset-typescript");
 
 export default function normalizeOptions(options = {}) {
-  let {
-    allowNamespaces = true,
-    jsxPragma,
-    onlyRemoveTypeImports,
-    optimizeConstEnums,
-  } = options;
+  let { allowNamespaces = true, jsxPragma, onlyRemoveTypeImports } = options;
+
+  const TopLevelOptions = {
+    allExtensions: "allExtensions",
+    allowNamespaces: "allowNamespaces",
+    isTSX: "isTSX",
+    jsxPragma: "jsxPragma",
+    jsxPragmaFrag: "jsxPragmaFrag",
+    onlyRemoveTypeImports: "onlyRemoveTypeImports",
+    optimizeConstEnums: "optimizeConstEnums",
+  };
 
   if (process.env.BABEL_8_BREAKING) {
-    const TopLevelOptions = {
-      allExtensions: "allExtensions",
-      allowNamespaces: "allowNamespaces",
-      isTSX: "isTSX",
-      jsxPragma: "jsxPragma",
-      jsxPragmaFrag: "jsxPragmaFrag",
-      onlyRemoveTypeImports: "onlyRemoveTypeImports",
-      optimizeConstEnums: "optimizeConstEnums",
-    };
     v.validateTopLevelOptions(options, TopLevelOptions);
     allowNamespaces = v.validateBooleanOption(
       TopLevelOptions.allowNamespaces,
@@ -35,31 +31,35 @@ export default function normalizeOptions(options = {}) {
       options.onlyRemoveTypeImports,
       true,
     );
-    optimizeConstEnums = v.validateBooleanOption(
-      TopLevelOptions.optimizeConstEnums,
-      options.optimizeConstEnums,
-      true,
-    );
   }
 
   const jsxPragmaFrag = v.validateStringOption(
-    "jsxPragmaFrag",
+    TopLevelOptions.jsxPragmaFrag,
     options.jsxPragmaFrag,
     "React.Fragment",
   );
 
   const allExtensions = v.validateBooleanOption(
-    "allExtensions",
+    TopLevelOptions.allExtensions,
     options.allExtensions,
     false,
   );
 
-  const isTSX = v.validateBooleanOption("isTSX", options.isTSX, false);
-
+  const isTSX = v.validateBooleanOption(
+    TopLevelOptions.isTSX,
+    options.isTSX,
+    false,
+  );
   if (isTSX) {
     v.invariant(allExtensions, "isTSX:true requires allExtensions:true");
   }
 
+  const optimizeConstEnums = v.validateBooleanOption(
+    TopLevelOptions.optimizeConstEnums,
+    options.optimizeConstEnums,
+    false,
+  );
+
   return {
     allExtensions,
     allowNamespaces,
diff --git a/packages/babel-preset-typescript/test/normalize-options.spec.js b/packages/babel-preset-typescript/test/normalize-options.spec.js
@@ -37,7 +37,7 @@ describe("normalize options", () => {
           "jsxPragma": "React",
           "jsxPragmaFrag": "React.Fragment",
           "onlyRemoveTypeImports": true,
-          "optimizeConstEnums": true,
+          "optimizeConstEnums": false,
         }
       `);
     });
@@ -48,21 +48,19 @@ describe("normalize options", () => {
         normalizeOptions({ allowNamespace: true }),
       ).not.toThrowError();
     });
-    it.each([
-      "allowDeclareFields",
-      "allowNamespaces",
-      "onlyRemoveTypeImports",
-      "optimizeConstEnums",
-    ])("should not throw when `%p` is not a boolean", optionName => {
-      expect(() => normalizeOptions({ [optionName]: 0 })).not.toThrowError();
-    });
+    it.each(["allowDeclareFields", "allowNamespaces", "onlyRemoveTypeImports"])(
+      "should not throw when `%p` is not a boolean",
+      optionName => {
+        expect(() => normalizeOptions({ [optionName]: 0 })).not.toThrowError();
+      },
+    );
     it.each(["jsxPragma"])(
       "should throw when `%p` is not a string",
       optionName => {
         expect(() => normalizeOptions({ [optionName]: 0 })).not.toThrowError();
       },
     );
-    it.each(["allExtensions", "isTSX"])(
+    it.each(["allExtensions", "isTSX", "optimizeConstEnums"])(
       "should throw when `%p` is not a boolean",
       optionName => {
         expect(() => normalizeOptions({ [optionName]: 0 })).toThrow(
@@ -87,7 +85,7 @@ describe("normalize options", () => {
           "jsxPragma": undefined,
           "jsxPragmaFrag": "React.Fragment",
           "onlyRemoveTypeImports": undefined,
-          "optimizeConstEnums": undefined,
+          "optimizeConstEnums": false,
         }
       `);
     });
