Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix simplifyCalls #125

Merged
merged 2 commits into from
Nov 3, 2024
Merged

Fix simplifyCalls #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2baf0f1
Fix case where there are no arguments beyond the 'this' object
BenBaryoPX Nov 3, 2024
33a8515
For SAFE: simplifyCalls -
BenBaryoPX Nov 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/modules/safe/simplifyCalls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ function simplifyCalls(arb, candidateFilter = () => true) {
for (let i = 0; i < arb.ast.length; i++) {
const n = arb.ast[i];
if (n.type === 'CallExpression' &&
n.arguments.length &&
n.arguments[0].type === 'ThisExpression' &&
n.arguments?.[0]?.type === 'ThisExpression' &&
n.callee.type === 'MemberExpression' &&
['apply', 'call'].includes(n.callee.property?.name || n.callee.property?.value) &&
(n.callee.object?.name || n.callee?.value) !== 'Function' &&
!/function/i.test(n.callee.object.type) &&
candidateFilter(n)) {
const args = (n.callee.property?.name || n.callee.property?.value) === 'apply' ? n.arguments[1].elements : n.arguments.slice(1);
const args = (n.callee.property?.name || n.callee.property?.value) === 'apply' ? n.arguments?.[1]?.elements : n.arguments?.slice(1);
arb.markNode(n, {
type: 'CallExpression',
callee: n.callee.object,
Expand Down
14 changes: 13 additions & 1 deletion tests/modules.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,12 +682,24 @@ describe('SAFE: separateChainedDeclarators', async () => {
});
describe('SAFE: simplifyCalls', async () => {
const targetModule = (await import('../src/modules/safe/simplifyCalls.js')).default;
it('TP-1', () => {
it('TP-1: With args', () => {
const code = `func1.apply(this, [arg1, arg2]); func2.call(this, arg1, arg2);`;
const expected = `func1(arg1, arg2);\nfunc2(arg1, arg2);`;
const result = applyModuleToCode(code, targetModule);
assert.strictEqual(result, expected);
});
it('TP-2: Without args', () => {
const code = `func1.apply(this); func2.call(this);`;
const expected = `func1();\nfunc2();`;
const result = applyModuleToCode(code, targetModule);
assert.strictEqual(result, expected);
});
it('TN-1: Ignore calls without ThisExpression', () => {
const code = `func1.apply({}); func2.call(null);`;
const expected = code;
const result = applyModuleToCode(code, targetModule);
assert.strictEqual(result, expected);
});
});
describe('SAFE: simplifyIfStatements', async () => {
const targetModule = (await import('../src/modules/safe/simplifyIfStatements.js')).default;
Expand Down
Loading