var -> let

This commit is contained in:
Sebastian McKenzie
2015-09-18 18:45:55 +01:00
parent 0708edb927
commit c99a179401
111 changed files with 1137 additions and 1114 deletions

View File

@@ -9,7 +9,7 @@ import * as babel from "babel-core";
import vm from "vm";
import _ from "lodash";
var program = new commander.Command("babel-node");
let program = new commander.Command("babel-node");
program.option("-e, --eval [script]", "Evaluate script");
program.option("-p, --print [code]", "Evaluate script and print result");
@@ -18,7 +18,7 @@ program.option("-x, --extensions [extensions]", "List of extensions to hook into
program.option("-w, --plugins [string]", "TODO", util.list);
program.option("-b, --presets [string]", "TODO", util.list);
var pkg = require("../package.json");
let pkg = require("../package.json");
program.version(pkg.version);
program.usage("[options] [ -e script | script.js ] [arguments]");
program.parse(process.argv);
@@ -35,7 +35,7 @@ babel.register({
//
var replPlugin = new babel.Plugin("repl", {
let replPlugin = new babel.Plugin("repl", {
visitor: {
ModuleDeclaration() {
throw this.errorWithNode("Modules aren't supported in the REPL");
@@ -51,7 +51,7 @@ var replPlugin = new babel.Plugin("repl", {
//
var _eval = function (code, filename) {
let _eval = function (code, filename) {
code = code.trim();
if (!code) return undefined;
@@ -70,13 +70,13 @@ var _eval = function (code, filename) {
};
if (program.eval || program.print) {
var code = program.eval;
let code = program.eval;
if (!code || code === true) code = program.print;
global.__filename = "[eval]";
global.__dirname = process.cwd();
var module = new Module(global.__filename);
let module = new Module(global.__filename);
module.filename = global.__filename;
module.paths = Module._nodeModulePaths(global.__dirname);
@@ -84,18 +84,18 @@ if (program.eval || program.print) {
global.module = module;
global.require = module.require.bind(module);
var result = _eval(code, global.__filename);
let result = _eval(code, global.__filename);
if (program.print) {
var output = _.isString(result) ? result : inspect(result);
let output = _.isString(result) ? result : inspect(result);
process.stdout.write(output + "\n");
}
} else {
if (program.args.length) {
// slice all arguments up to the first filename since they're babel args that we handle
var args = process.argv.slice(2);
let args = process.argv.slice(2);
var i = 0;
var ignoreNext = false;
let i = 0;
let ignoreNext = false;
_.each(args, function (arg, i2) {
if (ignoreNext) {
ignoreNext = false;
@@ -103,7 +103,7 @@ if (program.eval || program.print) {
}
if (arg[0] === "-") {
var parsedArg = program[arg.slice(2)];
let parsedArg = program[arg.slice(2)];
if (parsedArg && parsedArg !== true) {
ignoreNext = true;
}
@@ -115,7 +115,7 @@ if (program.eval || program.print) {
args = args.slice(i);
// make the filename absolute
var filename = args[0];
let filename = args[0];
if (!pathIsAbsolute(filename)) args[0] = path.join(process.cwd(), filename);
// add back on node and concat the sliced args
@@ -139,8 +139,8 @@ function replStart() {
}
function replEval(code, context, filename, callback) {
var err;
var result;
let err;
let result;
try {
if (code[0] === "(" && code[code.length - 1] === ")") {

View File

@@ -3,16 +3,16 @@
* when found, before invoking the "real" _babel-node(1) executable.
*/
var getV8Flags = require("v8flags");
var path = require("path");
let getV8Flags = require("v8flags");
let path = require("path");
var args = [path.join(__dirname, "_babel-node")];
let args = [path.join(__dirname, "_babel-node")];
var babelArgs = process.argv.slice(2);
var userArgs;
let babelArgs = process.argv.slice(2);
let userArgs;
// separate node arguments from script arguments
var argSeparator = babelArgs.indexOf("--");
let argSeparator = babelArgs.indexOf("--");
if (argSeparator > -1) {
userArgs = babelArgs.slice(argSeparator); // including the --
babelArgs = babelArgs.slice(0, argSeparator);
@@ -20,7 +20,7 @@ if (argSeparator > -1) {
getV8Flags(function (v8Flags) {
babelArgs.forEach(function(arg){
var flag = arg.split("=")[0];
let flag = arg.split("=")[0];
switch (flag) {
case "-d":
@@ -54,13 +54,13 @@ getV8Flags(function (v8Flags) {
}
try {
var kexec = require("kexec");
let kexec = require("kexec");
kexec(process.argv[0], args);
} catch (err) {
if (err.code !== "MODULE_NOT_FOUND") throw err;
var child_process = require("child_process");
var proc = child_process.spawn(process.argv[0], args, { stdio: "inherit" });
let child_process = require("child_process");
let proc = child_process.spawn(process.argv[0], args, { stdio: "inherit" });
proc.on("exit", function (code, signal) {
process.on("exit", function () {
if (signal) {

View File

@@ -7,7 +7,7 @@ import fs from "fs";
function spawn(cmd, args, callback) {
console.log(">", cmd, args);
var spawn = child.spawn(cmd, args, { stdio: "inherit" });
let spawn = child.spawn(cmd, args, { stdio: "inherit" });
spawn.on("exit", function (code) {
if (code === 0) {
@@ -21,7 +21,7 @@ function spawn(cmd, args, callback) {
function spawnMultiple(cmds) {
function next() {
var cmd = cmds.shift();
let cmd = cmds.shift();
if (cmd) {
spawn(cmd.command, cmd.args, next);
} else {
@@ -33,7 +33,7 @@ function spawnMultiple(cmds) {
}
function template(name, data = {}) {
var source = fs.readFileSync(path.join(__dirname, "templates", name), "utf8");
let source = fs.readFileSync(path.join(__dirname, "templates", name), "utf8");
source = source.replace(/[A-Z_]+/g, function (key) {
return data[key] === undefined ? key : data[key];
});
@@ -53,23 +53,23 @@ function execMaybe(cmd) {
}
}
var rl = readline.createInterface({
let rl = readline.createInterface({
input: process.stdin,
output: process.stdout
});
var BABEL_PLUGIN_PREFIX = "babel-plugin-";
let BABEL_PLUGIN_PREFIX = "babel-plugin-";
var cmds = {
let cmds = {
init: function () {
var name = path.basename(process.cwd());
let name = path.basename(process.cwd());
if (name.indexOf(BABEL_PLUGIN_PREFIX) === 0) {
name = name.slice(BABEL_PLUGIN_PREFIX.length);
}
rl.question("Description (optional): ", function (description) {
var remote = execMaybe("git config --get remote.origin.url").trim().match(/git@github.com:(.*?).git/);
let remote = execMaybe("git config --get remote.origin.url").trim().match(/git@github.com:(.*?).git/);
if (remote) {
build(description, remote[1]);
} else {
@@ -82,7 +82,7 @@ var cmds = {
function build(description, repo) {
rl.close();
var templateData = {
let templateData = {
DESCRIPTION: description,
FULL_NAME: BABEL_PLUGIN_PREFIX + name,
NAME: name
@@ -133,7 +133,7 @@ var cmds = {
},
publish: function () {
var pkg = require(process.cwd() + "/package.json");
let pkg = require(process.cwd() + "/package.json");
console.log("Current version:", pkg.version);
rl.question("New version (enter nothing for patch): ", function (newVersion) {
@@ -153,7 +153,7 @@ var cmds = {
}
};
var cmd = cmds[process.argv[2]];
let cmd = cmds[process.argv[2]];
if (cmd) {
cmd();
} else {

View File

@@ -1,27 +1,27 @@
var outputFileSync = require("output-file-sync");
var pathExists = require("path-exists");
var chokidar = require("chokidar");
var slash = require("slash");
var path = require("path");
var util = require("./util");
var fs = require("fs");
var _ = require("lodash");
let outputFileSync = require("output-file-sync");
let pathExists = require("path-exists");
let chokidar = require("chokidar");
let slash = require("slash");
let path = require("path");
let util = require("./util");
let fs = require("fs");
let _ = require("lodash");
module.exports = function (commander, filenames) {
function write(src, relative) {
// remove extension and then append back on .js
relative = relative.replace(/\.(\w*?)$/, "") + ".js";
var dest = path.join(commander.outDir, relative);
let dest = path.join(commander.outDir, relative);
var data = util.compile(src, {
let data = util.compile(src, {
sourceFileName: slash(path.relative(dest + "/..", src)),
sourceMapTarget: path.basename(relative)
});
if (!commander.copyFiles && data.ignored) return;
if (data.map && commander.sourceMaps && commander.sourceMaps !== "inline") {
var mapLoc = dest + ".map";
let mapLoc = dest + ".map";
data.code = util.addSourceMappingUrl(data.code, mapLoc);
outputFileSync(mapLoc, JSON.stringify(data.map));
}
@@ -44,13 +44,13 @@ module.exports = function (commander, filenames) {
function handle(filename) {
if (!pathExists.sync(filename)) return;
var stat = fs.statSync(filename);
let stat = fs.statSync(filename);
if (stat.isDirectory(filename)) {
var dirname = filename;
let dirname = filename;
_.each(util.readdir(dirname), function (filename) {
var src = path.join(dirname, filename);
let src = path.join(dirname, filename);
handleFile(src, filename);
});
} else {
@@ -62,14 +62,14 @@ module.exports = function (commander, filenames) {
if (commander.watch) {
_.each(filenames, function (dirname) {
var watcher = chokidar.watch(dirname, {
let watcher = chokidar.watch(dirname, {
persistent: true,
ignoreInitial: true
});
_.each(["add", "change"], function (type) {
watcher.on(type, function (filename) {
var relative = path.relative(dirname, filename) || filename;
let relative = path.relative(dirname, filename) || filename;
try {
handleFile(filename, relative);
} catch (err) {

View File

@@ -1,37 +1,37 @@
var convertSourceMap = require("convert-source-map");
var pathExists = require("path-exists");
var sourceMap = require("source-map");
var chokidar = require("chokidar");
var slash = require("slash");
var path = require("path");
var util = require("./util");
var fs = require("fs");
var _ = require("lodash");
let convertSourceMap = require("convert-source-map");
let pathExists = require("path-exists");
let sourceMap = require("source-map");
let chokidar = require("chokidar");
let slash = require("slash");
let path = require("path");
let util = require("./util");
let fs = require("fs");
let _ = require("lodash");
module.exports = function (commander, filenames, opts) {
if (commander.sourceMaps === "inline") {
opts.sourceMaps = true;
}
var results = [];
let results = [];
var buildResult = function () {
var map = new sourceMap.SourceMapGenerator({
let buildResult = function () {
let map = new sourceMap.SourceMapGenerator({
file: path.basename(commander.outFile) || "stdout",
sourceRoot: opts.sourceRoot
});
var code = "";
var offset = 0;
let code = "";
let offset = 0;
_.each(results, function (result) {
var filename = result.filename;
let filename = result.filename;
code += result.code + "\n";
if (result.map) {
var consumer = new sourceMap.SourceMapConsumer(result.map);
let consumer = new sourceMap.SourceMapConsumer(result.map);
var sourceFilename = filename;
let sourceFilename = filename;
if (commander.outFile) {
sourceFilename = path.relative(path.dirname(commander.outFile), sourceFilename);
}
@@ -64,12 +64,12 @@ module.exports = function (commander, filenames, opts) {
};
};
var output = function () {
var result = buildResult();
let output = function () {
let result = buildResult();
if (commander.outFile) {
if (commander.sourceMaps && commander.sourceMaps !== "inline") {
var mapLoc = commander.outFile + ".map";
let mapLoc = commander.outFile + ".map";
result.code = util.addSourceMappingUrl(result.code, mapLoc);
fs.writeFileSync(mapLoc, JSON.stringify(result.map));
}
@@ -80,13 +80,13 @@ module.exports = function (commander, filenames, opts) {
}
};
var stdin = function () {
var code = "";
let stdin = function () {
let code = "";
process.stdin.setEncoding("utf8");
process.stdin.on("readable", function () {
var chunk = process.stdin.read();
let chunk = process.stdin.read();
if (chunk !== null) code += chunk;
});
@@ -96,16 +96,16 @@ module.exports = function (commander, filenames, opts) {
});
};
var walk = function () {
var _filenames = [];
let walk = function () {
let _filenames = [];
results = [];
_.each(filenames, function (filename) {
if (!pathExists.sync(filename)) return;
var stat = fs.statSync(filename);
let stat = fs.statSync(filename);
if (stat.isDirectory()) {
var dirname = filename;
let dirname = filename;
_.each(util.readdirFilter(filename), function (filename) {
_filenames.push(path.join(dirname, filename));
@@ -118,7 +118,7 @@ module.exports = function (commander, filenames, opts) {
_.each(_filenames, function (filename) {
if (util.shouldIgnore(filename)) return;
var data = util.compile(filename);
let data = util.compile(filename);
if (data.ignored) return;
results.push(data);
});
@@ -126,7 +126,7 @@ module.exports = function (commander, filenames, opts) {
output();
};
var files = function () {
let files = function () {
walk();
if (commander.watch) {

View File

@@ -2,19 +2,19 @@
require("babel-core");
var pathExists = require("path-exists");
var commander = require("commander");
var kebabCase = require("lodash/string/kebabCase");
var options = require("babel-core").options;
var util = require("babel-core").util;
var uniq = require("lodash/array/uniq");
var each = require("lodash/collection/each");
var glob = require("glob");
let pathExists = require("path-exists");
let commander = require("commander");
let kebabCase = require("lodash/string/kebabCase");
let options = require("babel-core").options;
let util = require("babel-core").util;
let uniq = require("lodash/array/uniq");
let each = require("lodash/collection/each");
let glob = require("glob");
each(options, function (option, key) {
if (option.hidden) return;
var arg = kebabCase(key);
let arg = kebabCase(key);
if (option.type !== "boolean") {
arg += " [" + (option.type || "string") + "]";
@@ -30,7 +30,7 @@ each(options, function (option, key) {
arg = "-" + option.shorthand + ", " + arg;
}
var desc = [];
let desc = [];
if (option.deprecated) desc.push("[DEPRECATED] " + option.deprecated);
if (option.description) desc.push(option.description);
@@ -44,7 +44,7 @@ commander.option("-d, --out-dir [out]", "Compile an input directory of modules i
commander.option("-D, --copy-files", "When compiling a directory copy over non-compilable files");
commander.option("-q, --quiet", "Don't log anything");
var pkg = require("../../package.json");
let pkg = require("../../package.json");
commander.version(pkg.version + " (babel-core " + require("babel-core").version + ")");
commander.usage("[options] <files ...>");
commander.parse(process.argv);
@@ -57,10 +57,10 @@ if (commander.extensions) {
//
var errors = [];
let errors = [];
var filenames = commander.args.reduce(function (globbed, input) {
var files = glob.sync(input);
let filenames = commander.args.reduce(function (globbed, input) {
let files = glob.sync(input);
if (!files.length) files = [input];
return globbed.concat(files);
}, []);
@@ -98,7 +98,7 @@ if (errors.length) {
//
var opts = exports.opts = {};
let opts = exports.opts = {};
each(options, function (opt, key) {
if (commander[key] !== undefined) {
@@ -112,7 +112,7 @@ if (opts.only) {
opts.only = util.arrayify(opts.only, util.regexify);
}
var fn;
let fn;
if (commander.outDir) {
fn = require("./dir");

View File

@@ -1,11 +1,11 @@
var commander = require("commander");
var readdir = require("fs-readdir-recursive");
var index = require("./index");
var babel = require("babel-core");
var util = require("babel-core").util;
var path = require("path");
var fs = require("fs");
var _ = require("lodash");
let commander = require("commander");
let readdir = require("fs-readdir-recursive");
let index = require("./index");
let babel = require("babel-core");
let util = require("babel-core").util;
let path = require("path");
let fs = require("fs");
let _ = require("lodash");
exports.readdirFilter = function (filename) {
return readdir(filename).filter(function (filename) {
@@ -35,7 +35,7 @@ exports.transform = function (filename, code, opts) {
opts.ignore = null;
opts.only = null;
var result = babel.transform(code, opts);
let result = babel.transform(code, opts);
result.filename = filename;
result.actual = code;
return result;
@@ -43,7 +43,7 @@ exports.transform = function (filename, code, opts) {
exports.compile = function (filename, opts) {
try {
var code = fs.readFileSync(filename, "utf8");
let code = fs.readFileSync(filename, "utf8");
return exports.transform(filename, code, opts);
} catch (err) {
if (commander.watch) {