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

Merge branch 'master' into esnext

Browse Source
This commit is contained in:
Sebastian McKenzie 2015-01-04 15:32:41 +11:00
commit 18813f26bb
14 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/6to5/file.js
View File

@ -17,7 +17,7 @@ function File(opts) {
this.ast = {};
}
File.declarations = [
File.helpers = [
"inherits",
"defaults",
"prototype-properties",
@ -33,7 +33,7 @@ File.declarations = [
"async-to-generator"
];
File.excludeDeclarationsFromRuntime = [
File.excludeHelpersFromRuntime = [
"async-to-generator"
];
@ -121,7 +121,7 @@ File.prototype.toArray = function (node, i) {
if (t.isArrayExpression(node)) {
return node;
} else if (t.isIdentifier(node) && node.name === "arguments") {
return t.callExpression(t.memberExpression(this.addDeclaration("slice"), t.identifier("call")), [node]);
return t.callExpression(t.memberExpression(this.addHelper("slice"), t.identifier("call")), [node]);
} else {
var declarationName = "to-array";
var args = [node];
@ -129,7 +129,7 @@ File.prototype.toArray = function (node, i) {
args.push(t.literal(i));
declarationName = "sliced-to-array";
}
return t.callExpression(this.addDeclaration(declarationName), args);
return t.callExpression(this.addHelper(declarationName), args);
}
};
@ -167,8 +167,8 @@ File.prototype.addImport = function (id, source) {
this.dynamicImports.push(declar);
};
File.prototype.addDeclaration = function (name) {
if (!_.contains(File.declarations, name)) {
File.prototype.addHelper = function (name) {
if (!_.contains(File.helpers, name)) {
throw new ReferenceError("unknown declaration " + name);
}
@ -179,7 +179,7 @@ File.prototype.addDeclaration = function (name) {
var ref;
var runtimeNamespace = this.opts.runtime;
if (runtimeNamespace && !_.contains(File.excludeDeclarationsFromRuntime, name)) {
if (runtimeNamespace && !_.contains(File.excludeHelpersFromRuntime, name)) {
name = t.identifier(t.toIdentifier(name));
return t.memberExpression(t.identifier(runtimeNamespace), name);
} else {

4
lib/6to5/runtime-generator.js
View File

@ -18,8 +18,8 @@ module.exports = function (namespace) {
)
]));
_.each(File.declarations, function (name) {
if (_.contains(File.excludeDeclarationsFromRuntime, name)) {
_.each(File.helpers, function (name) {
if (_.contains(File.excludeHelpersFromRuntime, name)) {
return false;
}

2
lib/6to5/transformation/modules/amd.js
View File

@ -85,7 +85,7 @@ AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
// import * as bar from "foo";
} else if (t.isSpecifierDefault(specifier) && !this.noInteropRequire) {
// import foo from "foo";
ref = t.callExpression(this.file.addDeclaration("interop-require"), [ref]);
ref = t.callExpression(this.file.addHelper("interop-require"), [ref]);
} else {
// import {foo} from "foo";
ref = t.memberExpression(ref, specifier.id, false);

2
lib/6to5/transformation/modules/common.js
View File

@ -26,7 +26,7 @@ CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes)
if (t.isSpecifierDefault(specifier)) {
nodes.push(t.variableDeclaration("var", [
t.variableDeclarator(variableName,
t.callExpression(this.file.addDeclaration("interop-require"), [util.template("require", {
t.callExpression(this.file.addHelper("interop-require"), [util.template("require", {
MODULE_NAME: node.source
})])
)

4
lib/6to5/transformation/transformers/es6-classes.js
View File

@ -96,7 +96,7 @@ Class.prototype.run = function () {
superName = superRef;
this.superName = superName;
body.push(t.expressionStatement(t.callExpression(file.addDeclaration("inherits"), [className, superName])));
body.push(t.expressionStatement(t.callExpression(file.addHelper("inherits"), [className, superName])));
}
this.buildBody();
@ -175,7 +175,7 @@ Class.prototype.buildBody = function () {
if (instanceProps) args.push(instanceProps);
body.push(t.expressionStatement(
t.callExpression(this.file.addDeclaration("prototype-properties"), args)
t.callExpression(this.file.addHelper("prototype-properties"), args)
));
}
};

2
lib/6to5/transformation/transformers/es6-computed-property-names.js
View File

@ -68,7 +68,7 @@ exports.ObjectExpression = function (node, parent, file, scope) {
prop.value
);
} else {
bodyNode = t.callExpression(file.addDeclaration("define-property"), [objId, key, prop.value]);
bodyNode = t.callExpression(file.addHelper("define-property"), [objId, key, prop.value]);
}
body.push(t.expressionStatement(bodyNode));

2
lib/6to5/transformation/transformers/es6-destructuring.js
View File

@ -45,7 +45,7 @@ var pushObjectPattern = function (opts, nodes, pattern, parentId) {
}
keys = t.arrayExpression(keys);
var value = t.callExpression(opts.file.addDeclaration("object-without-properties"), [parentId, keys]);
var value = t.callExpression(opts.file.addHelper("object-without-properties"), [parentId, keys]);
nodes.push(buildVariableAssign(opts, prop.argument, value));
} else {
var pattern2 = prop.value;

2
lib/6to5/transformation/transformers/es6-spread.js
View File

@ -107,5 +107,5 @@ exports.NewExpression = function (node, parent, file) {
args = first;
}
return t.callExpression(file.addDeclaration("apply-constructor"), [node.callee, args]);
return t.callExpression(file.addHelper("apply-constructor"), [node.callee, args]);
};

2
lib/6to5/transformation/transformers/es6-template-literals.js
View File

@ -17,7 +17,7 @@ exports.TaggedTemplateExpression = function (node, parent, file) {
raw.push(t.literal(elem.value.raw));
}
args.push(t.callExpression(file.addDeclaration("tagged-template-literal"), [
args.push(t.callExpression(file.addHelper("tagged-template-literal"), [
t.arrayExpression(strings),
t.arrayExpression(raw)
]));

2
lib/6to5/transformation/transformers/optional-async-to-generator.js
View File

@ -7,5 +7,5 @@ exports.manipulateOptions = bluebirdCoroutines.manipulateOptions;
exports.Function = function (node, parent, file) {
if (!node.async || node.generator) return;
return bluebirdCoroutines._Function(node, file.addDeclaration("async-to-generator"));
return bluebirdCoroutines._Function(node, file.addHelper("async-to-generator"));
};

2
lib/6to5/transformation/transformers/optional-proto-to-assign.js
View File

@ -13,7 +13,7 @@ var isProtoAssignmentExpression = function (node) {
};
var buildDefaultsCallExpression = function (expr, ref, file) {
return t.expressionStatement(t.callExpression(file.addDeclaration("defaults"), [ref, expr.right]));
return t.expressionStatement(t.callExpression(file.addHelper("defaults"), [ref, expr.right]));
};
exports.optional = true;

2
lib/6to5/transformation/transformers/playground-memoization-operator.js
View File

@ -30,7 +30,7 @@ var buildHasOwn = function (obj, prop, file) {
return t.unaryExpression(
"!",
t.callExpression(
t.memberExpression(file.addDeclaration("has-own"), t.identifier("call")),
t.memberExpression(file.addHelper("has-own"), t.identifier("call")),
[obj, prop]
),
true

2
lib/6to5/transformation/transformers/playground-object-getter-memoization.js
View File

@ -20,7 +20,7 @@ exports.MethodDefinition = function (node, parent, file) {
if (t.isFunction(node)) return;
if (t.isReturnStatement(node) && node.argument) {
node.argument = t.memberExpression(t.callExpression(file.addDeclaration("define-property"), [
node.argument = t.memberExpression(t.callExpression(file.addHelper("define-property"), [
t.thisExpression(),
key,
node.argument

4
test/api.js
View File

@ -13,10 +13,10 @@ suite("api", function () {
assert.ok(!result.ast);
});
test("addDeclaration unknown", function () {
test("addHelper unknown", function () {
var file = new File;
assert.throws(function () {
file.addDeclaration("foob");
file.addHelper("foob");
}, /unknown declaration foob/);
});
});