Merge pull request #5602 from loganfsmyth/option-manager-cleanup

Refactor OptionManager to be a short class with a bunch of pure helper functions.

packages/babel-core/src/config/index.js

@@ -1,5 +1,5 @@
 import type Plugin from "./plugin";
-import OptionManager from "./option-manager";
+import manageOptions from "./option-manager";
 
 export type ResolvedConfig = {
   options: Object,
@@ -10,21 +10,5 @@ export type ResolvedConfig = {
  * Standard API for loading Babel configuration data. Not for public consumption.
  */
 export default function loadConfig(opts: Object): ResolvedConfig|null {
-  const mergedOpts = new OptionManager().init(opts);
-  if (!mergedOpts) return null;
-
-  let passes = [];
-  if (mergedOpts.plugins) {
-    passes.push(mergedOpts.plugins);
-  }
-
-  // With "passPerPreset" enabled there may still be presets in the options.
-  if (mergedOpts.presets) {
-    passes = passes.concat(mergedOpts.presets.map((preset) => preset.plugins).filter(Boolean));
-  }
-
-  return {
-    options: mergedOpts,
-    passes,
-  };
+  return manageOptions(opts);
 }

packages/babel-core/src/config/loading/files/index-browser.js

@@ -25,18 +25,18 @@ export function resolvePreset(name: string, dirname: string): string|null {
   return null;
 }
 
-export function loadPlugin(name: string, dirname: string): { filepath: string, plugin: mixed } {
+export function loadPlugin(name: string, dirname: string): { filepath: string, value: mixed } {
   throw new Error(`Cannot load plugin ${name} relative to ${dirname} in a browser`);
 }
 
-export function loadPreset(name: string, dirname: string): { filepath: string, preset: mixed } {
+export function loadPreset(name: string, dirname: string): { filepath: string, value: mixed } {
   throw new Error(`Cannot load preset ${name} relative to ${dirname} in a browser`);
 }
 
-export function loadParser(name: string, dirname: string): { filepath: string, parser: Function } {
+export function loadParser(name: string, dirname: string): { filepath: string, value: Function } {
   throw new Error(`Cannot load parser ${name} relative to ${dirname} in a browser`);
 }
 
-export function loadGenerator(name: string, dirname: string): { filepath: string, generator: Function } {
+export function loadGenerator(name: string, dirname: string): { filepath: string, value: Function } {
   throw new Error(`Cannot load generator ${name} relative to ${dirname} in a browser`);
 }

packages/babel-core/src/config/loading/files/plugins.js

@@ -26,27 +26,27 @@ export function resolvePreset(presetName: string, dirname: string): string|null
   return resolveFromPossibleNames(possibleNames, dirname);
 }
 
-export function loadPlugin(name: string, dirname: string): { filepath: string, plugin: mixed } {
+export function loadPlugin(name: string, dirname: string): { filepath: string, value: mixed } {
   const filepath = resolvePlugin(name, dirname);
   if (!filepath) throw new Error(`Plugin ${name} not found relative to ${dirname}`);
 
   return {
     filepath,
-    plugin: requireModule(filepath),
+    value: requireModule(filepath),
   };
 }
 
-export function loadPreset(name: string, dirname: string): { filepath: string, preset: mixed } {
+export function loadPreset(name: string, dirname: string): { filepath: string, value: mixed } {
   const filepath = resolvePreset(name, dirname);
   if (!filepath) throw new Error(`Preset ${name} not found relative to ${dirname}`);
 
   return {
     filepath,
-    preset: requireModule(filepath),
+    value: requireModule(filepath),
   };
 }
 
-export function loadParser(name: string, dirname: string): { filepath: string, parser: Function } {
+export function loadParser(name: string, dirname: string): { filepath: string, value: Function } {
   const filepath = resolveQuiet(name, dirname);
   if (!filepath) throw new Error(`Parser ${name} not found relative to ${dirname}`);
 
@@ -61,11 +61,11 @@ export function loadParser(name: string, dirname: string): { filepath: string, p
 
   return {
     filepath,
-    parser: mod.parse,
+    value: mod.parse,
   };
 }
 
-export function loadGenerator(name: string, dirname: string): { filepath: string, generator: Function } {
+export function loadGenerator(name: string, dirname: string): { filepath: string, value: Function } {
   const filepath = resolveQuiet(name, dirname);
   if (!filepath) throw new Error(`Generator ${name} not found relative to ${dirname}`);
 
@@ -80,7 +80,7 @@ export function loadGenerator(name: string, dirname: string): { filepath: string
 
   return {
     filepath,
-    generator: mod.print,
+    value: mod.print,
   };
 }