Skip to content

Commit

Permalink
constant-folding: Use path.evaluate() on array elements.
Browse files Browse the repository at this point in the history
  • Loading branch information
@goto-bus-stop
goto-bus-stop committed Aug 15, 2017
1 parent f45656b commit aa4f987
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 42 deletions.
2 changes: 1 addition & 1 deletion packages/babel-plugin-minify-constant-folding/__tests__/constant-folding-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ describe("constant-folding-plugin", () => {
"a,b,c";
"a@b@c";
"/1";
"/xyz/imabctrue";
[/xyz/im, true].join("abc");
[\`a\${xyz}\`].join("1");
"abc";
Expand Down
16 changes: 8 additions & 8 deletions packages/babel-plugin-minify-constant-folding/src/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ function getName(member) {
}

function swap(path, member, handlers, ...args) {
const key = getName(member);
const key = getName(member.node);
if (key === undefined) return;
let handler = handlers[key];
if (
typeof handler !== "function" ||
!Object.hasOwnProperty.call(handlers, key)
) {
if (typeof handlers[FALLBACK_HANDLER] === "function") {
handler = handlers[FALLBACK_HANDLER].bind(member.object, key);
handler = handlers[FALLBACK_HANDLER].bind(member.get('object'), key);
} else {
return false;
}
}
const replacement = handler.apply(member.object, args);
const replacement = handler.apply(member.get('object'), args);
if (replacement) {
path.replaceWith(replacement);
return true;
Expand Down Expand Up @@ -168,18 +168,18 @@ module.exports = babel => {
},
CallExpression(path) {
const { node } = path;
const { callee: member } = node;
const member = path.get('callee');
if (t.isMemberExpression(member)) {
const helpers = replacements[member.object.type];
const helpers = replacements[member.node.object.type];
if (!helpers || !helpers.calls) return;
swap(path, member, helpers.calls, ...node.arguments);
}
},
MemberExpression(path) {
const { node: member } = path;
const helpers = replacements[member.object.type];
const { node } = path;
const helpers = replacements[node.object.type];
if (!helpers || !helpers.members) return;
swap(path, member, helpers.members);
swap(path, path, helpers.members);
}
}
};
Expand Down
54 changes: 21 additions & 33 deletions packages/babel-plugin-minify-constant-folding/src/replacements.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = ({ types: t }) => {
function defaultZero(cb) {
return function(i = t.numericLiteral(0), ...args) {
if (t.isNumericLiteral(i)) {
return cb.call(this, this, i.value, ...args);
return cb.call(this.node, this.node, i.value, ...args);
}
};
}
Expand All @@ -23,70 +23,58 @@ module.exports = ({ types: t }) => {
ArrayExpression: {
members: {
length() {
if (this.elements.some(el => t.isSpreadElement(el))) {
if (this.node.elements.some(el => t.isSpreadElement(el))) {
return;
}
return t.numericLiteral(this.elements.length);
return t.numericLiteral(this.node.elements.length);
},
[FALLBACK_HANDLER](i) {
if (this.elements.some(el => t.isSpreadElement(el))) {
if (this.node.elements.some(el => t.isSpreadElement(el))) {
return;
}
if (typeof i === "number" || i.match(/^\d+$/)) {
return this.elements[i] || undef;
return this.node.elements[i] || undef;
}
}
},
calls: {
join(sep = t.stringLiteral(",")) {
if (!t.isStringLiteral(sep)) return;
let bad = false;
const str = this.elements
const str = this.get('elements')
.map(el => {
if (t.isRegExpLiteral(el)) {
return `/${el.pattern}/${el.flags}`;
const evaled = el.evaluate();
if (!evaled.confident) {
bad = true;
return;
}
if (t.isNullLiteral(el)) {
return null;
}
if (
t.isStringLiteral(el) ||
t.isBooleanLiteral(el) ||
t.isNumericLiteral(el)
) {
return el.value;
}
if (t.isTemplateLiteral(el) && el.expressions.length === 0) {
return el.quasis[0].value.cooked;
}
bad = true;
return;
return evaled.value;
})
.join(sep.value);
return bad ? undefined : t.stringLiteral(str);
},
push(...args) {
return t.numericLiteral(this.elements.length + args.length);
return t.numericLiteral(this.node.elements.length + args.length);
},
shift() {
if (this.elements.length === 0) {
if (this.node.elements.length === 0) {
return undef;
}
return t.numericLiteral(this.elements.length - 1);
return t.numericLiteral(this.node.elements.length - 1);
},
slice(start = t.numericLiteral(0), end) {
if (!t.isNumericLiteral(start) || (end && !t.isNumericLiteral(end))) {
return;
}
return t.arrayExpression(
this.elements.slice(start.value, end && end.value)
this.node.elements.slice(start.value, end && end.value)
);
},
pop() {
return this.elements[this.elements.length - 1] || undef;
return this.node.elements[this.node.elements.length - 1] || undef;
},
reverse() {
return t.arrayExpression(this.elements.reverse());
return t.arrayExpression(this.node.elements.reverse());
},
splice(start, end, ...args) {
if (!t.isNumericLiteral(start) || (end && !t.isNumericLiteral(end))) {
Expand All @@ -96,19 +84,19 @@ module.exports = ({ types: t }) => {
args.unshift(end.value);
}
return t.arrayExpression(
this.elements.slice().splice(start.value, ...args)
this.node.elements.slice().splice(start.value, ...args)
);
}
}
},
StringLiteral: {
members: {
length() {
return t.numericLiteral(this.value.length);
return t.numericLiteral(this.node.value.length);
},
[FALLBACK_HANDLER](i) {
if (typeof i === "number" || i.match(/^\d+$/)) {
const ch = this.value[i];
const ch = this.node.value[i];
return ch ? t.stringLiteral(ch) : undef;
}
}
Expand All @@ -124,7 +112,7 @@ module.exports = ({ types: t }) => {
}
if (realSep !== null) {
return t.arrayExpression(
this.value.split(realSep).map(str => t.stringLiteral(str))
this.node.value.split(realSep).map(str => t.stringLiteral(str))
);
}
},
Expand Down

0 comments on commit aa4f987

Please sign in to comment.