Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Misc reorganizing and prep for ignore/only refactoring #5467

Merged
merged 7 commits into from Mar 17, 2017
Merged

Misc reorganizing and prep for ignore/only refactoring #5467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
540f9b2
Remove the nonstandard basename option.
loganfsmyth Mar 13, 2017
188fe10
Move option-defaulting to option-manager.
loganfsmyth Mar 13, 2017
c1be6a3
Delete Logger class.
loganfsmyth Mar 13, 2017
83356ab
Centralize transform API functions.
loganfsmyth Mar 14, 2017
738bd54
Move OptionManager calls out of 'new File'.
loganfsmyth Mar 14, 2017
dcb0f91
Ignore files if they don't match only OR they do match ignore.
loganfsmyth Mar 13, 2017
bf4664b
Invert the resolution order of config-chain to process higher-priorit…
loganfsmyth Mar 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
69 changes: 17 additions & 52 deletions packages/babel-core/src/index.js
View file
Open in desktop
@@ -1,64 +1,29 @@
import fs from "fs";

export { default as File } from "./transformation/file";
export { default as buildExternalHelpers } from "./tools/build-external-helpers";
export { default as template } from "babel-template";
export { default as resolvePlugin } from "./helpers/resolve-plugin";
export { default as resolvePreset } from "./helpers/resolve-preset";
export File from "./transformation/file";
export buildExternalHelpers from "./tools/build-external-helpers";
export resolvePlugin from "./helpers/resolve-plugin";
export resolvePreset from "./helpers/resolve-preset";

export { version } from "../package";
export { getEnv } from "./helpers/environment";

import * as util from "./util";
export { util };

import * as messages from "babel-messages";
export { messages };

import * as t from "babel-types";
export { t as types };
export * as util from "./util";

import traverse from "babel-traverse";
export { traverse };
export * as messages from "babel-messages";
export * as types from "babel-types";
export traverse from "babel-traverse";
export template from "babel-template";

import OptionManager from "./transformation/file/options/option-manager";
export { OptionManager };
export OptionManager from "./transformation/file/options/option-manager";

export function Plugin(alias) {
throw new Error(`The (${alias}) Babel 5 plugin is being run with Babel 6.`);
}

import { transform, analyse, transformFromAst } from "./transformation/pipeline";
export { transform, analyse, transformFromAst };

export function transformFile(filename: string, opts?: Object, callback: Function) {
if (typeof opts === "function") {
callback = opts;
opts = {};
}

opts.filename = filename;
export {
transform,
analyse,
transformFromAst,
transformFile,
transformFileSync,
} from "./transformation/pipeline";

fs.readFile(filename, function (err, code) {
let result;

if (!err) {
try {
result = transform(code, opts);
} catch (_err) {
err = _err;
}
}

if (err) {
callback(err);
} else {
callback(null, result);
}
});
}

export function transformFileSync(filename: string, opts?: Object = {}): string {
opts.filename = filename;
return transform(fs.readFileSync(filename, "utf8"), opts);
}
59 changes: 8 additions & 51 deletions packages/babel-core/src/transformation/file/index.js
View file
Open in desktop
Expand Up @@ -3,15 +3,12 @@
import getHelper from "babel-helpers";
import * as metadataVisitor from "./metadata";
import convertSourceMap from "convert-source-map";
import OptionManager from "./options/option-manager";
import PluginPass from "../plugin-pass";
import { NodePath, Hub, Scope } from "babel-traverse";
import sourceMap from "source-map";
import generate from "babel-generator";
import codeFrame from "babel-code-frame";
import defaults from "lodash/defaults";
import traverse from "babel-traverse";
import Logger from "./logger";
import Store from "../../store";
import { parse } from "babylon";
import * as util from "../../util";
Expand Down Expand Up @@ -44,10 +41,6 @@ export default class File extends Store {
constructor(opts: Object = {}) {
super();

this.log = new Logger(this, opts.filename || "unknown");

opts = this.initOptions(opts);

let passes = [];
if (opts.plugins) passes.push(opts.plugins);

Expand Down Expand Up @@ -102,7 +95,6 @@ export default class File extends Store {

pluginPasses: Array<Array<[Plugin, Object]>>;
parserOpts: BabelParserOptions;
log: Logger;
opts: Object;
dynamicImportTypes: Object;
dynamicImportIds: Object;
Expand Down Expand Up @@ -130,41 +122,6 @@ export default class File extends Store {
}
}

initOptions(opts) {
opts = this.log.wrap(() => new OptionManager().init(opts));

if (opts.inputSourceMap) {
opts.sourceMaps = true;
}

if (opts.moduleId) {
opts.moduleIds = true;
}

opts.basename = path.basename(opts.filename, path.extname(opts.filename));

defaults(opts, {
moduleRoot: opts.sourceRoot,
});

defaults(opts, {
sourceRoot: opts.moduleRoot,
});

defaults(opts, {
filenameRelative: opts.filename,
});

const basenameRelative = path.basename(opts.filenameRelative);

defaults(opts, {
sourceFileName: basenameRelative,
sourceMapTarget: basenameRelative,
});

return opts;
}

getModuleName(): ?string {
const opts = this.opts;
if (!opts.moduleIds) {
Expand Down Expand Up @@ -404,9 +361,9 @@ export default class File extends Store {
}
}

this.log.debug("Parse start");
util.debug(this.opts, "Parse start");
const ast = parseCode(code, parserOpts || this.parserOpts);
this.log.debug("Parse stop");
util.debug(this.opts, "Parse stop");
return ast;
}

Expand All @@ -424,9 +381,9 @@ export default class File extends Store {
}

addAst(ast) {
this.log.debug("Start set AST");
util.debug(this.opts, "Start set AST");
this._addAst(ast);
this.log.debug("End set AST");
util.debug(this.opts, "End set AST");
}

transform(): BabelFileResult {
Expand All @@ -441,13 +398,13 @@ export default class File extends Store {
}

this.call("pre", passes);
this.log.debug("Start transform traverse");
util.debug(this.opts, "Start transform traverse");

// merge all plugin visitors into a single visitor
const visitor = traverse.visitors.merge(visitors, passes, this.opts.wrapPluginVisitorMethod);
traverse(this.ast, visitor, this.scope);

this.log.debug("End transform traverse");
util.debug(this.opts, "End transform traverse");
this.call("post", passes);
}

Expand Down Expand Up @@ -588,14 +545,14 @@ export default class File extends Store {
}
}

this.log.debug("Generation start");
util.debug(this.opts, "Generation start");

const _result = gen(ast, opts.generatorOpts ? Object.assign(opts, opts.generatorOpts) : opts,
this.code);
result.code = _result.code;
result.map = _result.map;

this.log.debug("Generation end");
util.debug(this.opts, "Generation end");

if (this.shebang) {
// add back shebang
Expand Down
66 changes: 0 additions & 66 deletions packages/babel-core/src/transformation/file/logger.js
View file
Open in desktop

This file was deleted.

70 changes: 34 additions & 36 deletions packages/babel-core/src/transformation/file/options/build-config-chain.js
View file
Open in desktop
Expand Up @@ -25,18 +25,18 @@ export default function buildConfigChain(opts: Object = {}) {
const filename = opts.filename;
const builder = new ConfigChainBuilder();

// resolve all .babelrc files
if (opts.babelrc !== false) {
builder.findConfigs(filename);
}

builder.mergeConfig({
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By swapping the order of these, we'll be able to bail out based on ignore and only match failure, before having to search for the .babelrc which will be a big performance win.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's really good 🚀

options: opts,
alias: "base",
dirname: filename && path.dirname(filename),
});

return builder.configs;
// resolve all .babelrc files
if (opts.babelrc !== false) {
builder.findConfigs(filename);
}

return builder.configs.reverse();
}

class ConfigChainBuilder {
Expand All @@ -61,6 +61,14 @@ class ConfigChainBuilder {
let foundIgnore = false;

while (loc !== (loc = path.dirname(loc))) {
if (!foundIgnore) {
const ignoreLoc = path.join(loc, BABELIGNORE_FILENAME);
if (exists(ignoreLoc)) {
this.addIgnoreConfig(ignoreLoc);
foundIgnore = true;
}
}

if (!foundConfig) {
const configLoc = path.join(loc, BABELRC_FILENAME);
const configJSLoc = path.join(loc, BABELRC_JS_FILENAME);
Expand All @@ -85,14 +93,6 @@ class ConfigChainBuilder {
foundConfig = !!foundConfigs.length;
}

if (!foundIgnore) {
const ignoreLoc = path.join(loc, BABELIGNORE_FILENAME);
if (exists(ignoreLoc)) {
this.addIgnoreConfig(ignoreLoc);
foundIgnore = true;
}
}

if (foundIgnore && foundConfig) return;
}
}
Expand Down Expand Up @@ -176,15 +176,17 @@ class ConfigChainBuilder {
dirname = dirname || process.cwd();
loc = loc || alias;

// add extends clause
if (options.extends) {
const extendsLoc = resolve(options.extends, dirname);
if (extendsLoc) {
this.addConfig(extendsLoc);
} else {
throw new Error(`Couldn't resolve extends clause of ${options.extends} in ${alias}`);
}
delete options.extends;
// env
const envKey = babel.getEnv();
if (options.env) {
const envOpts = options.env[envKey];
delete options.env;

this.mergeConfig({
options: envOpts,
alias: `${alias}.env.${envKey}`,
dirname: dirname,
});
}

this.configs.push({
Expand All @@ -194,20 +196,16 @@ class ConfigChainBuilder {
dirname,
});

// env
let envOpts;

const envKey = babel.getEnv();
if (options.env) {
envOpts = options.env[envKey];
delete options.env;
// add extends clause
if (options.extends) {
const extendsLoc = resolve(options.extends, dirname);
if (extendsLoc) {
this.addConfig(extendsLoc);
} else {
throw new Error(`Couldn't resolve extends clause of ${options.extends} in ${alias}`);
}
delete options.extends;
}

this.mergeConfig({
options: envOpts,
alias: `${alias}.env.${envKey}`,
dirname: dirname,
});
}
}