fix(un-variable-merging): should not split varaible declration in for…

… init that was actually used
pionxzh · Jul 13, 2024 · acd9379 · acd9379
1 parent 22ad078
commit acd9379
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/packages/unminify/src/transformations/__tests__/un-variable-merging.spec.ts b/packages/unminify/src/transformations/__tests__/un-variable-merging.spec.ts
@@ -59,12 +59,20 @@ inlineTest('variable declaration that is not used in for statement should not be
 for (var i = 0, j = 0, k = 0; j < 10; k++) {
   console.log(k);
 }
+
+for (var _len = arguments.length, _arguments = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+  _arguments[_key - 2] = arguments[_key];
+}
 `,
   `
 var i = 0;
 for (var j = 0, k = 0; j < 10; k++) {
   console.log(k);
 }
+
+for (var _len = arguments.length, _arguments = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+  _arguments[_key - 2] = arguments[_key];
+}
 `,
 )
 

diff --git a/packages/unminify/src/transformations/un-variable-merging.ts b/packages/unminify/src/transformations/un-variable-merging.ts
@@ -1,5 +1,6 @@
 import { mergeComments } from '@wakaru/ast-utils/comments'
 import { replaceWithMultipleStatements } from '@wakaru/ast-utils/insert'
+import { findReferences } from '@wakaru/ast-utils/reference'
 import { createJSCodeshiftTransformationRule } from '@wakaru/shared/rule'
 import type { ASTTransformation } from '@wakaru/shared/rule'
 import type { ForStatement } from 'jscodeshift'
@@ -32,23 +33,21 @@ export const transformAST: ASTTransformation = (context) => {
         .find(j.VariableDeclaration)
         .forEach((p) => {
             if (j.ForStatement.check(p.parent.node)) {
-                const { init, test, update } = p.parent.node as ForStatement
+                const { init } = p.parent.node as ForStatement
                 if (init && j.VariableDeclaration.check(init) && init.kind === 'var') {
                     const initDeclarators = init.declarations
                     // filter out the declarations that are used in test or update
-                    const usedDeclarators = initDeclarators.filter((d) => {
-                        if (!j.VariableDeclarator.check(d)) return false
+                    const usedDeclarators = initDeclarators.filter((declarator) => {
+                        if (!j.VariableDeclarator.check(declarator)) return false
 
-                        const { id } = d
+                        const { id } = declarator
                         if (!j.Identifier.check(id)) return false
 
                         // check if the name is declared outside of the for statement
                         if (p.parent?.parent?.scope.lookup(id.name)) return true
 
-                        const name = id.name
-                        const isUsedInTest = test && j(test).find(j.Identifier, { name }).size() > 0
-                        const isUsedInUpdate = update && j(update).find(j.Identifier, { name }).size() > 0
-                        if (isUsedInTest || isUsedInUpdate) return true
+                        const isUsed = findReferences(j, p.parent, id.name).size() > 1
+                        if (isUsed) return true
 
                         return false
                     })