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

Optimize class properties output (#6656)

Browse Source
This commit is contained in:
Mateusz Burzyński
2018-04-15 07:03:47 +02:00
committed by Justin Ridgewell
parent 0ee9a4e612
commit 5166eef103
27 changed files with 120 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
packages/babel-plugin-proposal-class-properties/src/index.js
View File

@@ -51,19 +51,26 @@ export default declare((api, options) => {
environmentVisitor,
]);
const buildClassPropertySpec = (ref, { key, value, computed }, scope) => {
return template.statement`
Object.defineProperty(REF, KEY, {
configurable: true,
enumerable: true,
writable: true,
value: VALUE
});
`({
REF: t.cloneNode(ref),
KEY: t.isIdentifier(key) && !computed ? t.stringLiteral(key.name) : key,
VALUE: value || scope.buildUndefinedNode(),
});
const foldDefinePropertyCalls = nodes =>
t.expressionStatement(
nodes.reduce((folded, node) => {
// update defineProperty's obj argument
node.arguments[0] = folded;
return node;
}),
);
const buildClassPropertySpec = (
ref,
{ key, value, computed },
scope,
state,
) => {
return t.callExpression(state.addHelper("defineProperty"), [
ref,
t.isIdentifier(key) && !computed ? t.stringLiteral(key.name) : key,
value || scope.buildUndefinedNode(),
]);
};
const buildClassPropertyLoose = (ref, { key, value, computed }, scope) => {
@@ -85,7 +92,7 @@ export default declare((api, options) => {
inherits: syntaxClassProperties,
visitor: {
Class(path) {
Class(path, state) {
const isDerived = !!path.node.superClass;
let constructor;
const props = [];
@@ -146,17 +153,31 @@ export default declare((api, options) => {
if (propNode.decorators && propNode.decorators.length > 0) continue;
if (propNode.static) {
staticNodes.push(buildClassProperty(ref, propNode, path.scope));
staticNodes.push(
buildClassProperty(ref, propNode, path.scope, state),
);
} else {
instanceBody.push(
buildClassProperty(t.thisExpression(), propNode, path.scope),
buildClassProperty(
t.thisExpression(),
propNode,
path.scope,
state,
),
);
}
}
const afterNodes = [...staticNodes];
const afterNodes =
!loose && staticNodes.length
? foldDefinePropertyCalls(staticNodes)
: staticNodes;
if (instanceBody.length) {
const assignments = loose
? instanceBody
: foldDefinePropertyCalls(instanceBody);
if (!constructor) {
const newConstructor = t.classMethod(
"constructor",
@@ -186,10 +207,10 @@ export default declare((api, options) => {
const bareSupers = [];
constructor.traverse(findBareSupers, bareSupers);
for (const bareSuper of bareSupers) {
bareSuper.insertAfter(instanceBody);
bareSuper.insertAfter(assignments);
}
} else {
constructor.get("body").unshiftContainer("body", instanceBody);
constructor.get("body").unshiftContainer("body", assignments);
}
}