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

enable prefer const (#5113)

Browse Source
This commit is contained in:
Henry Zhu
2017-01-14 09:48:52 -05:00
committed by GitHub
parent 982850731e
commit 672adba9a1
177 changed files with 1862 additions and 1863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/babel-plugin-transform-es2015-classes/src/index.js
View File

@@ -4,15 +4,15 @@ import nameFunction from "babel-helper-function-name";
export default function ({ types: t }) {
// todo: investigate traversal requeueing
let VISITED = Symbol();
const VISITED = Symbol();
return {
visitor: {
ExportDefaultDeclaration(path) {
if (!path.get("declaration").isClassDeclaration()) return;
let { node } = path;
let ref = node.declaration.id || path.scope.generateUidIdentifier("class");
const { node } = path;
const ref = node.declaration.id || path.scope.generateUidIdentifier("class");
node.declaration.id = ref;
// Split the class declaration and the export into two separate statements.
@@ -21,9 +21,9 @@ export default function ({ types: t }) {
},
ClassDeclaration(path) {
let { node } = path;
const { node } = path;
let ref = node.id || path.scope.generateUidIdentifier("class");
const ref = node.id || path.scope.generateUidIdentifier("class");
path.replaceWith(t.variableDeclaration("let", [
t.variableDeclarator(ref, t.toExpression(node))
@@ -31,10 +31,10 @@ export default function ({ types: t }) {
},
ClassExpression(path, state) {
let { node } = path;
const { node } = path;
if (node[VISITED]) return;
let inferred = nameFunction(path);
const inferred = nameFunction(path);
if (inferred && inferred !== node) return path.replaceWith(inferred);
node[VISITED] = true;

8
packages/babel-plugin-transform-es2015-classes/src/lib/memoise-decorators.js
View File

@@ -2,14 +2,14 @@ import type { Scope } from "babel-traverse";
import * as t from "babel-types";
export default function (decorators: Array<Object>, scope: Scope): Array<Object> {
for (let decorator of decorators) {
let expression = decorator.expression;
for (const decorator of decorators) {
const expression = decorator.expression;
if (!t.isMemberExpression(expression)) continue;
let temp = scope.maybeGenerateMemoised(expression.object);
const temp = scope.maybeGenerateMemoised(expression.object);
let ref;
let nodes = [];
const nodes = [];
if (temp) {
ref = temp;

6
packages/babel-plugin-transform-es2015-classes/src/loose.js
View File

@@ -14,11 +14,11 @@ export default class LooseClassTransformer extends VanillaTransformer {
let classRef = this.classRef;
if (!node.static) classRef = t.memberExpression(classRef, t.identifier("prototype"));
let methodName = t.memberExpression(classRef, node.key, node.computed || t.isLiteral(node.key));
const methodName = t.memberExpression(classRef, node.key, node.computed || t.isLiteral(node.key));
let func = t.functionExpression(null, node.params, node.body, node.generator, node.async);
func.returnType = node.returnType;
let key = t.toComputedKey(node, node.key);
const key = t.toComputedKey(node, node.key);
if (t.isStringLiteral(key)) {
func = nameFunction({
node: func,
@@ -27,7 +27,7 @@ export default class LooseClassTransformer extends VanillaTransformer {
});
}
let expr = t.expressionStatement(t.assignmentExpression("=", methodName, func));
const expr = t.expressionStatement(t.assignmentExpression("=", methodName, func));
t.inheritsComments(expr, node);
this.body.push(expr);
return true;

70
packages/babel-plugin-transform-es2015-classes/src/vanilla.js
View File

@@ -8,13 +8,13 @@ import * as defineMap from "babel-helper-define-map";
import template from "babel-template";
import * as t from "babel-types";
let buildDerivedConstructor = template(`
const buildDerivedConstructor = template(`
(function () {
super(...arguments);
})
`);
let noMethodVisitor = {
const noMethodVisitor = {
"FunctionExpression|FunctionDeclaration"(path) {
if (!path.is("shadow")) {
path.skip();
@@ -26,7 +26,7 @@ let noMethodVisitor = {
}
};
let verifyConstructorVisitor = visitors.merge([noMethodVisitor, {
const verifyConstructorVisitor = visitors.merge([noMethodVisitor, {
Super(path) {
if (this.isDerived && !this.hasBareSuper && !path.parentPath.isCallExpression({ callee: path.node })) {
throw path.buildCodeFrameError("'super.*' is not allowed before super()");
@@ -54,7 +54,7 @@ let verifyConstructorVisitor = visitors.merge([noMethodVisitor, {
}
}]);
let findThisesVisitor = visitors.merge([noMethodVisitor, {
const findThisesVisitor = visitors.merge([noMethodVisitor, {
ThisExpression(path) {
this.superThises.push(path);
}
@@ -96,18 +96,18 @@ export default class ClassTransformer {
run() {
let superName = this.superName;
let file = this.file;
const file = this.file;
let body = this.body;
//
let constructorBody = this.constructorBody = t.blockStatement([]);
const constructorBody = this.constructorBody = t.blockStatement([]);
this.constructor = this.buildConstructor();
//
let closureParams = [];
let closureArgs = [];
const closureParams = [];
const closureArgs = [];
//
if (this.isDerived) {
@@ -138,13 +138,13 @@ export default class ClassTransformer {
//
body.push(t.returnStatement(this.classRef));
let container = t.functionExpression(null, closureParams, t.blockStatement(body));
const container = t.functionExpression(null, closureParams, t.blockStatement(body));
container.shadow = true;
return t.callExpression(container, closureArgs);
}
buildConstructor() {
let func = t.functionDeclaration(this.classRef, [], this.constructorBody);
const func = t.functionDeclaration(this.classRef, [], this.constructorBody);
t.inherits(func, this.node);
return func;
}
@@ -159,7 +159,7 @@ export default class ClassTransformer {
mutatorMap = this.instanceMutatorMap;
}
let map = defineMap.push(mutatorMap, node, kind, this.file, scope);
const map = defineMap.push(mutatorMap, node, kind, this.file, scope);
if (enumerable) {
map.enumerable = t.booleanLiteral(true);
@@ -175,8 +175,8 @@ export default class ClassTransformer {
constructorMeMaybe() {
let hasConstructor = false;
let paths = this.path.get("body.body");
for (let path of (paths: Array)) {
const paths = this.path.get("body.body");
for (const path of (paths: Array)) {
hasConstructor = path.equals("kind", "constructor");
if (hasConstructor) break;
}
@@ -185,7 +185,7 @@ export default class ClassTransformer {
let params, body;
if (this.isDerived) {
let constructor = buildDerivedConstructor().expression;
const constructor = buildDerivedConstructor().expression;
params = constructor.params;
body = constructor.body;
} else {
@@ -207,7 +207,7 @@ export default class ClassTransformer {
this.verifyConstructor();
if (this.userConstructor) {
let constructorBody = this.constructorBody;
const constructorBody = this.constructorBody;
constructorBody.body = constructorBody.body.concat(this.userConstructor.body.body);
t.inherits(this.constructor, this.userConstructor);
t.inherits(constructorBody, this.userConstructor.body);
@@ -217,10 +217,10 @@ export default class ClassTransformer {
}
pushBody() {
let classBodyPaths: Array<Object> = this.path.get("body.body");
const classBodyPaths: Array<Object> = this.path.get("body.body");
for (let path of classBodyPaths) {
let node = path.node;
for (const path of classBodyPaths) {
const node = path.node;
if (path.isClassProperty()) {
throw path.buildCodeFrameError("Missing class properties transform.");
@@ -231,7 +231,7 @@ export default class ClassTransformer {
}
if (t.isClassMethod(node)) {
let isConstructor = node.kind === "constructor";
const isConstructor = node.kind === "constructor";
if (isConstructor) {
path.traverse(verifyConstructorVisitor, this);
@@ -241,7 +241,7 @@ export default class ClassTransformer {
}
}
let replaceSupers = new ReplaceSupers({
const replaceSupers = new ReplaceSupers({
forceSuperMemoisation: isConstructor,
methodPath: path,
methodNode: node,
@@ -275,7 +275,7 @@ export default class ClassTransformer {
pushDescriptors() {
this.pushInherits();
let body = this.body;
const body = this.body;
let instanceProps;
let staticProps;
@@ -292,7 +292,7 @@ export default class ClassTransformer {
if (instanceProps) instanceProps = defineMap.toComputedObjectFromClass(instanceProps);
if (staticProps) staticProps = defineMap.toComputedObjectFromClass(staticProps);
let nullNode = t.nullLiteral();
const nullNode = t.nullLiteral();
// (Constructor, instanceDescriptors, staticDescriptors, instanceInitializers, staticInitializers)
let args = [this.classRef, nullNode, nullNode, nullNode, nullNode];
@@ -363,7 +363,7 @@ export default class ClassTransformer {
[t.thisExpression(), bareSuperNode]
);
let bareSuperAfter = this.bareSuperAfter.map((fn) => fn(thisRef));
const bareSuperAfter = this.bareSuperAfter.map((fn) => fn(thisRef));
if (bareSuper.parentPath.isExpressionStatement() && bareSuper.parentPath.container === body.node.body && body.node.body.length - 1 === bareSuper.parentPath.key) {
// this super call is the last statement in the body so we can just straight up
@@ -394,17 +394,17 @@ export default class ClassTransformer {
verifyConstructor() {
if (!this.isDerived) return;
let path = this.userConstructorPath;
let body = path.get("body");
const path = this.userConstructorPath;
const body = path.get("body");
path.traverse(findThisesVisitor, this);
let guaranteedSuperBeforeFinish = !!this.bareSupers.length;
let superRef = this.superName || t.identifier("Function");
let thisRef = path.scope.generateUidIdentifier("this");
const superRef = this.superName || t.identifier("Function");
const thisRef = path.scope.generateUidIdentifier("this");
for (let bareSuper of this.bareSupers) {
for (const bareSuper of this.bareSupers) {
this.wrapSuperCall(bareSuper, superRef, thisRef, body);
if (guaranteedSuperBeforeFinish) {
@@ -422,25 +422,25 @@ export default class ClassTransformer {
}
}
for (let thisPath of this.superThises) {
for (const thisPath of this.superThises) {
thisPath.replaceWith(thisRef);
}
let wrapReturn = (returnArg) => t.callExpression(
const wrapReturn = (returnArg) => t.callExpression(
this.file.addHelper("possibleConstructorReturn"),
[thisRef].concat(returnArg || [])
);
// if we have a return as the last node in the body then we've already caught that
// return
let bodyPaths = body.get("body");
const bodyPaths = body.get("body");
if (bodyPaths.length && !bodyPaths.pop().isReturnStatement()) {
body.pushContainer("body", t.returnStatement(guaranteedSuperBeforeFinish ? thisRef : wrapReturn()));
}
for (let returnPath of this.superReturns) {
for (const returnPath of this.superReturns) {
if (returnPath.node.argument) {
let ref = returnPath.scope.generateDeclaredUidIdentifier("ret");
const ref = returnPath.scope.generateDeclaredUidIdentifier("ret");
returnPath.get("argument").replaceWithMultiple([
t.assignmentExpression("=", ref, returnPath.node.argument),
wrapReturn(ref)
@@ -456,7 +456,7 @@ export default class ClassTransformer {
*/
pushMethod(node: { type: "ClassMethod" }, path?: NodePath) {
let scope = path ? path.scope : this.scope;
const scope = path ? path.scope : this.scope;
if (node.kind === "method") {
if (this._processMethod(node, scope)) return;
@@ -482,7 +482,7 @@ export default class ClassTransformer {
path.scope.rename(this.classRef.name);
}
let construct = this.constructor;
const construct = this.constructor;
this.userConstructorPath = path;
this.userConstructor = method;