Skip to content

Commit acd23d5

Browse files
feat(javascript): unwrap calls in place inside a statement's sequence
terser joins adjacent statements into one sequence first, so split it at each call run in place. A body kept in a block is written as one block.
1 parent 30587e2 commit acd23d5

4 files changed

Lines changed: 197 additions & 107 deletions

File tree

‎lib/javascript/syntax-printer.js‎

Lines changed: 72 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19129,13 +19129,13 @@ const installImprove = (modules) => {
1912919129
};
1913019130

1913119131
/**
19132-
* The function a statement calls in place, with nothing passed and its
19132+
* The function an expression calls in place, with nothing passed and its
1913319133
* value dropped, when its body runs the same as a block there.
19134-
* @param {Node} statement a statement
19134+
* @param {Node} expression an expression whose value is dropped
1913519135
* @returns {Node | undefined} the function
1913619136
*/
19137-
const calledInPlace = (statement) => {
19138-
let call = statement.body;
19137+
const calledInPlace = (expression) => {
19138+
let call = expression;
1913919139
// The value is dropped, so a `!` or `void` before the call reads nothing.
1914019140
while (
1914119141
call instanceof A.AST_UnaryPrefix &&
@@ -19159,7 +19159,61 @@ const installImprove = (modules) => {
1915919159
};
1916019160

1916119161
const { MAP } = modules.utils;
19162-
const { can_be_evicted_from_block: canBeEvictedFromBlock } = modules.common;
19162+
const {
19163+
can_be_evicted_from_block: canBeEvictedFromBlock,
19164+
make_sequence: makeSequence
19165+
} = modules.common;
19166+
19167+
/**
19168+
* A statement's expressions as statements, each function it calls in place
19169+
* written as its body, or as a block where that declares something scoped.
19170+
* @param {Node} statement a statement whose value is dropped
19171+
* @returns {Node[] | undefined} the statements, or nothing to rewrite
19172+
*/
19173+
const runInPlace = (statement) => {
19174+
const expressions =
19175+
statement.body instanceof A.AST_Sequence
19176+
? statement.body.expressions
19177+
: [statement.body];
19178+
/** @type {Node[]} */
19179+
const statements = [];
19180+
/** @type {Node[]} */
19181+
let pending = [];
19182+
let rewritten = false;
19183+
for (const expression of expressions) {
19184+
const fn = calledInPlace(expression);
19185+
if (!fn) {
19186+
pending.push(expression);
19187+
continue;
19188+
}
19189+
rewritten = true;
19190+
if (pending.length > 0) {
19191+
statements.push(
19192+
makeNode(A.AST_SimpleStatement, statement, {
19193+
body: makeSequence(statement, pending)
19194+
})
19195+
);
19196+
pending = [];
19197+
}
19198+
if (fn.body.every(canBeEvictedFromBlock)) {
19199+
statements.push(...fn.body);
19200+
} else {
19201+
statements.push(
19202+
makeNode(A.AST_BlockStatement, statement, { body: fn.body })
19203+
);
19204+
}
19205+
}
19206+
if (!rewritten) return undefined;
19207+
if (pending.length > 0) {
19208+
statements.push(
19209+
makeNode(A.AST_SimpleStatement, statement, {
19210+
body: makeSequence(statement, pending)
19211+
})
19212+
);
19213+
}
19214+
return statements;
19215+
};
19216+
1916319217
// Run on the finished tree, so terser has already inlined what it would
1916419218
// from inside the function, which a block at the top level would stop.
1916519219
const { Compressor } = modules.compress;
@@ -19181,18 +19235,23 @@ const installImprove = (modules) => {
1918119235
null,
1918219236
(/** @type {Node} */ node, /** @type {boolean} */ inList) => {
1918319237
if (!(node instanceof A.AST_SimpleStatement)) return;
19184-
const fn = calledInPlace(node);
19185-
if (!fn) return;
19186-
const { body } = fn;
19238+
const statements = runInPlace(node);
19239+
if (!statements) return;
19240+
if (
19241+
!inList &&
19242+
statements.length === 1 &&
19243+
statements[0] instanceof A.AST_BlockStatement
19244+
) {
19245+
return statements[0];
19246+
}
1918719247
// A string first in a list could read as a directive there.
1918819248
return inList &&
19189-
body.every(canBeEvictedFromBlock) &&
1919019249
!(
19191-
body[0] instanceof A.AST_SimpleStatement &&
19192-
body[0].body instanceof A.AST_String
19250+
statements[0] instanceof A.AST_SimpleStatement &&
19251+
statements[0].body instanceof A.AST_String
1919319252
)
19194-
? MAP.splice(body)
19195-
: makeNode(A.AST_BlockStatement, node, { body });
19253+
? MAP.splice(statements)
19254+
: makeNode(A.AST_BlockStatement, node, { body: statements });
1919619255
}
1919719256
)
1919819257
);

‎test/helpers/swcSmaller.js‎

Lines changed: 90 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -207,97 +207,6 @@ const SWC_SMALLER_BY_REASON = [
207207
"terser compress: typeof/issue_2728_4"
208208
]
209209
],
210-
[
211-
"swc inlines a function into its call site, where terser keeps the call: one used once, a small one used a few times, or an IIFE unwrapped into statements",
212-
[
213-
"swc minifier: fixture/issues/10054/for/input.js",
214-
"swc minifier: fixture/issues/10054/if/input.js",
215-
"swc minifier: fixture/issues/10532/input.js",
216-
"swc minifier: fixture/issues/10746/input.js",
217-
"swc minifier: fixture/issues/10876/1/input.js",
218-
"swc minifier: fixture/issues/10876/2/input.js",
219-
"swc minifier: fixture/issues/10876/3/input.js",
220-
"swc minifier: fixture/issues/11007/input.js",
221-
"swc minifier: fixture/issues/11103/input.js",
222-
"swc minifier: fixture/issues/11158/input.js",
223-
"swc minifier: fixture/issues/11512-exhaustive/fn-multi-use-default-side-effect/input.js",
224-
"swc minifier: fixture/issues/11512-exhaustive/fn-multi-use-default-unused/input.js",
225-
"swc minifier: fixture/issues/11512-exhaustive/iife-default-side-effect/input.js",
226-
"swc minifier: fixture/issues/11512-simple/input.js",
227-
"swc minifier: fixture/issues/11512/input.js",
228-
"swc minifier: fixture/issues/11755/input.js",
229-
"swc minifier: fixture/issues/11871/input.js",
230-
"swc minifier: fixture/issues/11983/input.js",
231-
"swc minifier: fixture/issues/12032/input.js",
232-
"swc minifier: fixture/issues/12128/input.js",
233-
"swc minifier: fixture/issues/12177/input.js",
234-
"swc minifier: fixture/issues/12219/iife_rest_control_primitive/input.js",
235-
"swc minifier: fixture/issues/12226/input.js",
236-
"swc minifier: fixture/issues/12311/input.js",
237-
"swc minifier: fixture/issues/6279/1/input.js",
238-
"swc minifier: fixture/issues/6279/2/input.js",
239-
"swc minifier: fixture/issues/6751/1/input.js",
240-
"swc minifier: fixture/issues/6837/1/input.js",
241-
"swc minifier: fixture/issues/6837/2/input.js",
242-
"swc minifier: fixture/issues/7004/input.js",
243-
"swc minifier: fixture/issues/7241/input.js",
244-
"swc minifier: fixture/issues/7287/1/input.js",
245-
"swc minifier: fixture/issues/7784/1/input.js",
246-
"swc minifier: fixture/issues/7784/2/input.js",
247-
"swc minifier: fixture/issues/8271/input.js",
248-
"swc minifier: fixture/issues/8622/input.js",
249-
"swc minifier: fixture/issues/8826/input.js",
250-
"swc minifier: fixture/issues/9148/input.js",
251-
"swc minifier: fixture/issues/9468/input.js",
252-
"swc minifier: fixture/issues/9610-arrow-functions/input.js",
253-
"swc minifier: fixture/issues/9756/input.js",
254-
"swc minifier: fixture/issues/9785/input.js",
255-
"swc minifier: fixture/issues/cycle-1/input.js",
256-
"swc minifier: fixture/issues/cycle-2/input.js",
257-
"swc minifier: fixture/issues/pure-callee-call/input.js",
258-
"swc minifier: fixture/issues/react/hooks/3/input.js",
259-
"swc minifier: fixture/pr/7690/input.js",
260-
"swc minifier: fixture/projects/next/archive-1/pages/about-9ff906d607f52933d473/input.js",
261-
"swc minifier: fixture/projects/next/archive-1/pages/process-env-ea448cdafe7e87f74757/input.js",
262-
"swc minifier: fixture/projects/wmr/archive-1/chunks/prerender.93c6f601/input.js",
263-
"swc minifier: fixture/simple/inline/1/input.js",
264-
"swc minifier: fixture/simple/inline/3/input.js",
265-
"swc minifier: fixture/simple/inline/4/input.js",
266-
"swc minifier: full/issues/8288/input.js",
267-
"swc minifier: pass-1/9/1/input.js",
268-
"terser compress: block-scope/issue_334",
269-
"terser compress: collapse_vars/issue_2436_2",
270-
"terser compress: collapse_vars/issue_2436_3",
271-
"terser compress: collapse_vars/issue_2436_5",
272-
"terser compress: collapse_vars/issue_2453",
273-
"terser compress: collapse_vars/recursive_function_replacement",
274-
"terser compress: destructuring/issue_3205_2",
275-
"terser compress: destructuring/issue_3205_3",
276-
"terser compress: destructuring/issue_3205_4",
277-
"terser compress: functions/inline_loop_1",
278-
"terser compress: functions/inline_loop_2",
279-
"terser compress: functions/inline_loop_3",
280-
"terser compress: functions/issue_2476",
281-
"terser compress: functions/issue_2604_1",
282-
"terser compress: functions/issue_2616",
283-
"terser compress: functions/issue_2630_1",
284-
"terser compress: functions/issue_2630_3",
285-
"terser compress: functions/issue_2630_4",
286-
"terser compress: functions/issue_2657",
287-
"terser compress: functions/issue_2663_2",
288-
"terser compress: functions/issue_2737_1",
289-
"terser compress: functions/issue_2737_2",
290-
"terser compress: functions/issue_2783",
291-
"terser compress: functions/loop_init_arg",
292-
"terser compress: hoist_props/issue_2377_1",
293-
"terser compress: identity/inline_identity_extra_params",
294-
"terser compress: identity/inline_identity_higher_order",
295-
"terser compress: inline/issue_308",
296-
"terser compress: issue-t292/no_flatten_with_arg_colliding_with_arg_value_inner_scope",
297-
"terser compress: issue-t292/no_flatten_with_var_colliding_with_arg_value_inner_scope",
298-
"terser compress: reduce_vars/variables_collision_in_immediately_invoked_func"
299-
]
300-
],
301210
[
302211
"swc writes a variable's value at its one read and drops the variable, an alias of another binding or an assignment folded into its next read included",
303212
[
@@ -389,6 +298,96 @@ const SWC_SMALLER_BY_REASON = [
389298
"terser compress: sequences/lift_sequences_6"
390299
]
391300
],
301+
[
302+
"swc inlines a function into its call site, where terser keeps the call: one used once, a small one used a few times, or an IIFE unwrapped into statements",
303+
[
304+
"swc minifier: fixture/issues/10054/for/input.js",
305+
"swc minifier: fixture/issues/10054/if/input.js",
306+
"swc minifier: fixture/issues/10532/input.js",
307+
"swc minifier: fixture/issues/10746/input.js",
308+
"swc minifier: fixture/issues/10876/1/input.js",
309+
"swc minifier: fixture/issues/10876/2/input.js",
310+
"swc minifier: fixture/issues/10876/3/input.js",
311+
"swc minifier: fixture/issues/11007/input.js",
312+
"swc minifier: fixture/issues/11103/input.js",
313+
"swc minifier: fixture/issues/11158/input.js",
314+
"swc minifier: fixture/issues/11512-exhaustive/fn-multi-use-default-side-effect/input.js",
315+
"swc minifier: fixture/issues/11512-exhaustive/fn-multi-use-default-unused/input.js",
316+
"swc minifier: fixture/issues/11512-exhaustive/iife-default-side-effect/input.js",
317+
"swc minifier: fixture/issues/11512-simple/input.js",
318+
"swc minifier: fixture/issues/11512/input.js",
319+
"swc minifier: fixture/issues/11755/input.js",
320+
"swc minifier: fixture/issues/11871/input.js",
321+
"swc minifier: fixture/issues/11983/input.js",
322+
"swc minifier: fixture/issues/12128/input.js",
323+
"swc minifier: fixture/issues/12177/input.js",
324+
"swc minifier: fixture/issues/12219/iife_rest_control_primitive/input.js",
325+
"swc minifier: fixture/issues/12226/input.js",
326+
"swc minifier: fixture/issues/12311/input.js",
327+
"swc minifier: fixture/issues/6279/1/input.js",
328+
"swc minifier: fixture/issues/6279/2/input.js",
329+
"swc minifier: fixture/issues/6751/1/input.js",
330+
"swc minifier: fixture/issues/6837/1/input.js",
331+
"swc minifier: fixture/issues/6837/2/input.js",
332+
"swc minifier: fixture/issues/7004/input.js",
333+
"swc minifier: fixture/issues/7241/input.js",
334+
"swc minifier: fixture/issues/7287/1/input.js",
335+
"swc minifier: fixture/issues/7784/1/input.js",
336+
"swc minifier: fixture/issues/7784/2/input.js",
337+
"swc minifier: fixture/issues/8271/input.js",
338+
"swc minifier: fixture/issues/8622/input.js",
339+
"swc minifier: fixture/issues/8826/input.js",
340+
"swc minifier: fixture/issues/9148/input.js",
341+
"swc minifier: fixture/issues/9468/input.js",
342+
"swc minifier: fixture/issues/9610-arrow-functions/input.js",
343+
"swc minifier: fixture/issues/9756/input.js",
344+
"swc minifier: fixture/issues/9785/input.js",
345+
"swc minifier: fixture/issues/cycle-1/input.js",
346+
"swc minifier: fixture/issues/cycle-2/input.js",
347+
"swc minifier: fixture/issues/pure-callee-call/input.js",
348+
"swc minifier: fixture/issues/react/hooks/3/input.js",
349+
"swc minifier: fixture/pr/7690/input.js",
350+
"swc minifier: fixture/projects/next/archive-1/pages/about-9ff906d607f52933d473/input.js",
351+
"swc minifier: fixture/projects/next/archive-1/pages/process-env-ea448cdafe7e87f74757/input.js",
352+
"swc minifier: fixture/projects/wmr/archive-1/chunks/prerender.93c6f601/input.js",
353+
"swc minifier: fixture/simple/inline/1/input.js",
354+
"swc minifier: fixture/simple/inline/3/input.js",
355+
"swc minifier: fixture/simple/inline/4/input.js",
356+
"swc minifier: full/issues/8288/input.js",
357+
"swc minifier: pass-1/9/1/input.js",
358+
"terser compress: block-scope/issue_334",
359+
"terser compress: collapse_vars/issue_2436_2",
360+
"terser compress: collapse_vars/issue_2436_3",
361+
"terser compress: collapse_vars/issue_2436_5",
362+
"terser compress: collapse_vars/issue_2453",
363+
"terser compress: collapse_vars/recursive_function_replacement",
364+
"terser compress: destructuring/issue_3205_2",
365+
"terser compress: destructuring/issue_3205_3",
366+
"terser compress: destructuring/issue_3205_4",
367+
"terser compress: functions/inline_loop_1",
368+
"terser compress: functions/inline_loop_2",
369+
"terser compress: functions/inline_loop_3",
370+
"terser compress: functions/issue_2476",
371+
"terser compress: functions/issue_2604_1",
372+
"terser compress: functions/issue_2616",
373+
"terser compress: functions/issue_2630_1",
374+
"terser compress: functions/issue_2630_3",
375+
"terser compress: functions/issue_2630_4",
376+
"terser compress: functions/issue_2657",
377+
"terser compress: functions/issue_2663_2",
378+
"terser compress: functions/issue_2737_1",
379+
"terser compress: functions/issue_2737_2",
380+
"terser compress: functions/issue_2783",
381+
"terser compress: functions/loop_init_arg",
382+
"terser compress: hoist_props/issue_2377_1",
383+
"terser compress: identity/inline_identity_extra_params",
384+
"terser compress: identity/inline_identity_higher_order",
385+
"terser compress: inline/issue_308",
386+
"terser compress: issue-t292/no_flatten_with_arg_colliding_with_arg_value_inner_scope",
387+
"terser compress: issue-t292/no_flatten_with_var_colliding_with_arg_value_inner_scope",
388+
"terser compress: reduce_vars/variables_collision_in_immediately_invoked_func"
389+
]
390+
],
392391
[
393392
"webpack writes the same program in a spelling longer or compressing worse than swc's: `,` where swc keeps `;` between statements, operand order, `{0}` for an empty body",
394393
[

‎test/specCases/minify-corpora.spectest.js‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,16 @@ const CORRECTED = {
900900
"terser drops destructuring defaults and patterns whose evaluation has effects or throws"
901901
};
902902

903+
/**
904+
* Outputs the `improve` phase writes shorter yet gzip compresses worse, each
905+
* with why; an entry that stops compressing worse fails until retired.
906+
* @type {Record<string, string>}
907+
*/
908+
const IMPROVED_YET_BIGGER = {
909+
"fixture/next/wrap-contracts/input.js (the default minimizer's options)":
910+
"31 bytes fewer, 1 more gzipped: the dropped wrapper had matched a run gzip reused"
911+
};
912+
903913
/**
904914
* @param {Minify} minify a minifier
905915
* @param {string} code the source
@@ -1313,9 +1323,15 @@ describe("JavaScript minifier", () => {
13131323
oursGzip: withSize.gzip,
13141324
theirsGzip: withoutSize.gzip
13151325
};
1316-
if (standingOf(lead) === "worse") {
1326+
const listed = Object.prototype.hasOwnProperty.call(
1327+
IMPROVED_YET_BIGGER,
1328+
`${source.name} (${setName})`
1329+
);
1330+
if (listed !== (standingOf(lead) === "worse")) {
13171331
differences.push(
1318-
`${source.name} (${setName}) is bigger with the improvements: ${withSize.raw} raw, ${withSize.gzip} gzip, against ${withoutSize.raw} raw, ${withoutSize.gzip} gzip\n\twith: ${ours.code}\n\twithout: ${unimproved.code}`
1332+
listed
1333+
? `${source.name} (${setName}) is no bigger with the improvements now: retire it from IMPROVED_YET_BIGGER`
1334+
: `${source.name} (${setName}) is bigger with the improvements: ${withSize.raw} raw, ${withSize.gzip} gzip, against ${withoutSize.raw} raw, ${withoutSize.gzip} gzip\n\twith: ${ours.code}\n\twithout: ${unimproved.code}`
13191335
);
13201336
}
13211337
}

‎test/unitCases/syntax-printer.unittest.js‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,11 @@ const IMPROVED_CASES = [
193193
`for (const x of [1, 2]) (() => { ${TRY} console.log(x); })();`,
194194
{ compress: {}, mangle: false }
195195
],
196+
[
197+
"a loop's body declaring a `const`, one block",
198+
"for (const x of [1, 2]) (() => { const a = console.log.name + x; console.log(a, a); })();",
199+
{ compress: {}, mangle: false }
200+
],
196201
[
197202
"a string first, kept in a block",
198203
`(() => { ("x"); ${TRY} })();`,
@@ -203,6 +208,16 @@ const IMPROVED_CASES = [
203208
`(() => { ${TRY} console.log(typeof this); })();`,
204209
{ compress: {}, mangle: false }
205210
],
211+
[
212+
"a call between expressions, which terser joined in a sequence",
213+
`console.log(0); (() => { ${TRY} console.log(2); })(); console.log(3);`,
214+
{ compress: {}, mangle: false }
215+
],
216+
[
217+
"two calls in a sequence, one keeping a `let` in a block",
218+
`(() => { let a = console.log.name; console.log(a, a); })(); (() => { ${TRY} console.log(2); })();`,
219+
{ compress: { passes: 2 }, mangle: true }
220+
],
206221
[
207222
"a nested function reading its own `this`",
208223
`!function () { ${TRY} console.log([1].map(function () { return typeof this; })[0]); }();`,
@@ -233,7 +248,8 @@ const KEPT_CASES = [
233248
["`with`", "!function () { with (Math) console.log(PI); console.log(2); }();"],
234249
["`new`", `new function () { ${TRY} console.log(2); }();`],
235250
["an optional call", `(() => { ${TRY} console.log(2); })?.();`],
236-
["its value used", `console.log(function () { ${TRY} console.log(2); }());`]
251+
["its value used", `console.log(function () { ${TRY} console.log(2); }());`],
252+
["a sequence calling nothing in place", "console.log(1); console.log(2);"]
237253
];
238254

239255
// Each prints one thing and terser's output another, under the options named.

0 commit comments

Comments
 (0)