cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add more types around descriptor processing.

Browse Source
This commit is contained in:
Logan Smyth 2017-10-05 21:24:52 -04:00
parent 2ee45bd04d
commit 1e12bb6a23
1 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
packages/babel-core/src/config/option-manager.js
View File

@ -220,6 +220,11 @@ type BasicDescriptor = {
loc: string, loc: string,
}; };
type LoadedDescriptor = {
value: {},
descriptor: BasicDescriptor,
};
/** /**
* Load and validate the given config into a set of options, plugins, and presets. * Load and validate the given config into a set of options, plugins, and presets.
*/ */
@ -282,38 +287,40 @@ const loadConfig = makeWeakCache((config): {
/** /**
* Load a generic plugin/preset from the given descriptor loaded from the config object. * Load a generic plugin/preset from the given descriptor loaded from the config object.
*/ */
const loadDescriptor = makeWeakCache((descriptor, cache) => { const loadDescriptor = makeWeakCache(
if (typeof descriptor.value !== "function") { (descriptor: BasicDescriptor, cache): LoadedDescriptor => {
return { value: descriptor.value, descriptor }; if (typeof descriptor.value !== "function") {
} return { value: descriptor.value, descriptor };
const { value, options } = descriptor;
const api = Object.assign(Object.create(context), {
cache,
env: () => cache.using(() => getEnv()),
});
let item;
try {
item = value(api, options, { dirname: descriptor.dirname });
} catch (e) {
if (descriptor.alias) {
e.message += ` (While processing: ${JSON.stringify(descriptor.alias)})`;
} }
throw e; const { value, options } = descriptor;
}
if (!item || typeof item !== "object") { const api = Object.assign(Object.create(context), {
throw new Error("Plugin/Preset did not return an object."); cache,
} env: () => cache.using(() => getEnv()),
});
return { value: item, descriptor }; let item;
}); try {
item = value(api, options, { dirname: descriptor.dirname });
} catch (e) {
if (descriptor.alias) {
e.message += ` (While processing: ${JSON.stringify(descriptor.alias)})`;
}
throw e;
}
if (!item || typeof item !== "object") {
throw new Error("Plugin/Preset did not return an object.");
}
return { value: item, descriptor };
},
);
/** /**
* Instantiate a plugin for the given descriptor, returning the plugin/options pair. * Instantiate a plugin for the given descriptor, returning the plugin/options pair.
*/ */
function loadPluginDescriptor(descriptor: BasicDescriptor) { function loadPluginDescriptor(descriptor: BasicDescriptor): Plugin {
if (descriptor.value instanceof Plugin) { if (descriptor.value instanceof Plugin) {
if (descriptor.options) { if (descriptor.options) {
throw new Error( throw new Error(
@ -328,7 +335,7 @@ function loadPluginDescriptor(descriptor: BasicDescriptor) {
} }
const instantiatePlugin = makeWeakCache( const instantiatePlugin = makeWeakCache(
({ value: pluginObj, descriptor }, cache) => { ({ value: pluginObj, descriptor }: LoadedDescriptor, cache): Plugin => {
Object.keys(pluginObj).forEach(key => { Object.keys(pluginObj).forEach(key => {
if (!ALLOWED_PLUGIN_KEYS.has(key)) { if (!ALLOWED_PLUGIN_KEYS.has(key)) {
throw new Error( throw new Error(
@ -391,15 +398,17 @@ const loadPresetDescriptor = (descriptor: BasicDescriptor): MergeOptions => {
return instantiatePreset(loadDescriptor(descriptor)); return instantiatePreset(loadDescriptor(descriptor));
}; };
const instantiatePreset = makeWeakCache(({ value, descriptor }) => { const instantiatePreset = makeWeakCache(
return { ({ value, descriptor }: LoadedDescriptor): MergeOptions => {
type: "preset", return {
options: value, type: "preset",
alias: descriptor.alias, options: value,
loc: descriptor.loc, alias: descriptor.alias,
dirname: descriptor.dirname, loc: descriptor.loc,
}; dirname: descriptor.dirname,
}); };
},
);
/** /**
* Validate and return the options object for the config. * Validate and return the options object for the config.