js-confuser 1.7.3 → 2.0.0-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/ISSUE_TEMPLATE/bug_report.md +6 -4
- package/CHANGELOG.md +70 -0
- package/Migration.md +57 -0
- package/README.md +23 -929
- package/dist/constants.js +65 -14
- package/dist/index.js +108 -160
- package/dist/obfuscator.js +316 -118
- package/dist/options.js +1 -119
- package/dist/order.js +30 -30
- package/dist/presets.js +47 -45
- package/dist/probability.js +25 -32
- package/dist/templates/bufferToStringTemplate.js +9 -0
- package/dist/templates/deadCodeTemplates.js +9 -0
- package/dist/templates/getGlobalTemplate.js +19 -0
- package/dist/templates/integrityTemplate.js +30 -0
- package/dist/templates/setFunctionLengthTemplate.js +9 -0
- package/dist/templates/stringCompressionTemplate.js +10 -0
- package/dist/templates/tamperProtectionTemplates.js +21 -0
- package/dist/templates/template.js +199 -184
- package/dist/transforms/astScrambler.js +100 -0
- package/dist/transforms/calculator.js +70 -127
- package/dist/transforms/controlFlowFlattening.js +1182 -0
- package/dist/transforms/deadCode.js +62 -587
- package/dist/transforms/dispatcher.js +300 -313
- package/dist/transforms/extraction/duplicateLiteralsRemoval.js +88 -189
- package/dist/transforms/extraction/objectExtraction.js +131 -215
- package/dist/transforms/finalizer.js +56 -59
- package/dist/transforms/flatten.js +275 -276
- package/dist/transforms/functionOutlining.js +230 -0
- package/dist/transforms/identifier/globalConcealing.js +214 -135
- package/dist/transforms/identifier/movedDeclarations.js +167 -91
- package/dist/transforms/identifier/renameVariables.js +239 -193
- package/dist/transforms/lock/integrity.js +61 -184
- package/dist/transforms/lock/lock.js +261 -387
- package/dist/transforms/minify.js +431 -436
- package/dist/transforms/opaquePredicates.js +65 -118
- package/dist/transforms/pack.js +160 -0
- package/dist/transforms/plugin.js +179 -0
- package/dist/transforms/preparation.js +261 -173
- package/dist/transforms/renameLabels.js +132 -56
- package/dist/transforms/rgf.js +140 -267
- package/dist/transforms/shuffle.js +52 -145
- package/dist/transforms/string/encoding.js +44 -175
- package/dist/transforms/string/stringCompression.js +79 -155
- package/dist/transforms/string/stringConcealing.js +189 -225
- package/dist/transforms/string/stringEncoding.js +32 -40
- package/dist/transforms/string/stringSplitting.js +54 -55
- package/dist/transforms/variableMasking.js +232 -0
- package/dist/utils/ControlObject.js +125 -0
- package/dist/utils/IntGen.js +46 -0
- package/dist/utils/NameGen.js +106 -0
- package/dist/utils/ast-utils.js +560 -0
- package/dist/utils/function-utils.js +56 -0
- package/dist/utils/gen-utils.js +48 -0
- package/dist/utils/node.js +77 -0
- package/dist/utils/object-utils.js +21 -0
- package/dist/utils/random-utils.js +91 -0
- package/dist/utils/static-utils.js +64 -0
- package/dist/validateOptions.js +122 -0
- package/index.d.ts +1 -17
- package/package.json +27 -22
- package/src/constants.ts +139 -82
- package/src/index.ts +70 -165
- package/src/obfuscationResult.ts +43 -0
- package/src/obfuscator.ts +328 -135
- package/src/options.ts +149 -658
- package/src/order.ts +14 -14
- package/src/presets.ts +39 -34
- package/src/probability.ts +21 -36
- package/src/templates/bufferToStringTemplate.ts +57 -0
- package/src/templates/deadCodeTemplates.ts +1185 -0
- package/src/templates/getGlobalTemplate.ts +72 -0
- package/src/templates/integrityTemplate.ts +69 -0
- package/src/templates/setFunctionLengthTemplate.ts +11 -0
- package/src/templates/stringCompressionTemplate.ts +42 -0
- package/src/templates/tamperProtectionTemplates.ts +116 -0
- package/src/templates/template.ts +149 -157
- package/src/transforms/astScrambler.ts +99 -0
- package/src/transforms/calculator.ts +96 -226
- package/src/transforms/controlFlowFlattening.ts +1594 -0
- package/src/transforms/deadCode.ts +85 -676
- package/src/transforms/dispatcher.ts +431 -640
- package/src/transforms/extraction/duplicateLiteralsRemoval.ts +147 -295
- package/src/transforms/extraction/objectExtraction.ts +160 -333
- package/src/transforms/finalizer.ts +63 -64
- package/src/transforms/flatten.ts +439 -557
- package/src/transforms/functionOutlining.ts +225 -0
- package/src/transforms/identifier/globalConcealing.ts +255 -266
- package/src/transforms/identifier/movedDeclarations.ts +228 -142
- package/src/transforms/identifier/renameVariables.ts +250 -271
- package/src/transforms/lock/integrity.ts +85 -263
- package/src/transforms/lock/lock.ts +338 -579
- package/src/transforms/minify.ts +523 -663
- package/src/transforms/opaquePredicates.ts +90 -229
- package/src/transforms/pack.ts +195 -0
- package/src/transforms/plugin.ts +185 -0
- package/src/transforms/preparation.ts +337 -231
- package/src/transforms/renameLabels.ts +176 -77
- package/src/transforms/rgf.ts +293 -424
- package/src/transforms/shuffle.ts +80 -254
- package/src/transforms/string/encoding.ts +20 -126
- package/src/transforms/string/stringCompression.ts +117 -307
- package/src/transforms/string/stringConcealing.ts +254 -342
- package/src/transforms/string/stringEncoding.ts +28 -47
- package/src/transforms/string/stringSplitting.ts +61 -75
- package/src/transforms/variableMasking.ts +257 -0
- package/src/utils/ControlObject.ts +141 -0
- package/src/utils/IntGen.ts +33 -0
- package/src/utils/NameGen.ts +106 -0
- package/src/utils/ast-utils.ts +667 -0
- package/src/utils/function-utils.ts +50 -0
- package/src/utils/gen-utils.ts +48 -0
- package/src/utils/node.ts +78 -0
- package/src/utils/object-utils.ts +21 -0
- package/src/utils/random-utils.ts +79 -0
- package/src/utils/static-utils.ts +66 -0
- package/src/validateOptions.ts +256 -0
- package/tsconfig.json +13 -8
- package/babel.config.js +0 -12
- package/dev.js +0 -8
- package/dist/compiler.js +0 -34
- package/dist/parser.js +0 -59
- package/dist/precedence.js +0 -66
- package/dist/templates/bufferToString.js +0 -129
- package/dist/templates/core.js +0 -35
- package/dist/templates/crash.js +0 -28
- package/dist/templates/es5.js +0 -137
- package/dist/templates/functionLength.js +0 -34
- package/dist/templates/globals.js +0 -9
- package/dist/transforms/antiTooling.js +0 -88
- package/dist/transforms/controlFlowFlattening/controlFlowFlattening.js +0 -1287
- package/dist/transforms/controlFlowFlattening/expressionObfuscation.js +0 -131
- package/dist/transforms/es5/antiClass.js +0 -164
- package/dist/transforms/es5/antiDestructuring.js +0 -193
- package/dist/transforms/es5/antiES6Object.js +0 -185
- package/dist/transforms/es5/antiSpreadOperator.js +0 -35
- package/dist/transforms/es5/antiTemplate.js +0 -66
- package/dist/transforms/es5/es5.js +0 -123
- package/dist/transforms/extraction/classExtraction.js +0 -83
- package/dist/transforms/identifier/globalAnalysis.js +0 -83
- package/dist/transforms/identifier/variableAnalysis.js +0 -104
- package/dist/transforms/lock/antiDebug.js +0 -76
- package/dist/transforms/stack.js +0 -349
- package/dist/transforms/transform.js +0 -372
- package/dist/traverse.js +0 -110
- package/dist/util/compare.js +0 -145
- package/dist/util/gen.js +0 -564
- package/dist/util/guard.js +0 -14
- package/dist/util/identifiers.js +0 -355
- package/dist/util/insert.js +0 -362
- package/dist/util/math.js +0 -19
- package/dist/util/object.js +0 -40
- package/dist/util/random.js +0 -156
- package/dist/util/scope.js +0 -20
- package/docs/ControlFlowFlattening.md +0 -595
- package/docs/Countermeasures.md +0 -70
- package/docs/ES5.md +0 -197
- package/docs/Integrity.md +0 -82
- package/docs/RGF.md +0 -424
- package/docs/RenameVariables.md +0 -116
- package/docs/TamperProtection.md +0 -100
- package/docs/Template.md +0 -117
- package/samples/example.js +0 -15
- package/samples/high.js +0 -1
- package/samples/input.js +0 -3
- package/samples/javascriptobfuscator.com.js +0 -8
- package/samples/jscrambler_advanced.js +0 -1894
- package/samples/jscrambler_light.js +0 -1134
- package/samples/low.js +0 -1
- package/samples/medium.js +0 -1
- package/samples/obfuscator.io.js +0 -1686
- package/samples/preemptive.com.js +0 -16
- package/src/compiler.ts +0 -35
- package/src/parser.ts +0 -49
- package/src/precedence.ts +0 -61
- package/src/templates/bufferToString.ts +0 -136
- package/src/templates/core.ts +0 -29
- package/src/templates/crash.ts +0 -23
- package/src/templates/es5.ts +0 -131
- package/src/templates/functionLength.ts +0 -32
- package/src/templates/globals.ts +0 -3
- package/src/transforms/antiTooling.ts +0 -102
- package/src/transforms/controlFlowFlattening/controlFlowFlattening.ts +0 -2153
- package/src/transforms/controlFlowFlattening/expressionObfuscation.ts +0 -179
- package/src/transforms/es5/antiClass.ts +0 -276
- package/src/transforms/es5/antiDestructuring.ts +0 -294
- package/src/transforms/es5/antiES6Object.ts +0 -267
- package/src/transforms/es5/antiSpreadOperator.ts +0 -56
- package/src/transforms/es5/antiTemplate.ts +0 -98
- package/src/transforms/es5/es5.ts +0 -149
- package/src/transforms/extraction/classExtraction.ts +0 -168
- package/src/transforms/identifier/globalAnalysis.ts +0 -102
- package/src/transforms/identifier/variableAnalysis.ts +0 -118
- package/src/transforms/lock/antiDebug.ts +0 -112
- package/src/transforms/stack.ts +0 -557
- package/src/transforms/transform.ts +0 -441
- package/src/traverse.ts +0 -120
- package/src/types.ts +0 -133
- package/src/util/compare.ts +0 -181
- package/src/util/gen.ts +0 -651
- package/src/util/guard.ts +0 -17
- package/src/util/identifiers.ts +0 -494
- package/src/util/insert.ts +0 -419
- package/src/util/math.ts +0 -15
- package/src/util/object.ts +0 -39
- package/src/util/random.ts +0 -221
- package/src/util/scope.ts +0 -21
- package/test/code/Cash.src.js +0 -1011
- package/test/code/Cash.test.ts +0 -132
- package/test/code/Dynamic.src.js +0 -118
- package/test/code/Dynamic.test.ts +0 -49
- package/test/code/ES6.src.js +0 -235
- package/test/code/ES6.test.ts +0 -42
- package/test/code/NewFeatures.test.ts +0 -19
- package/test/code/StrictMode.src.js +0 -65
- package/test/code/StrictMode.test.js +0 -37
- package/test/compare.test.ts +0 -104
- package/test/index.test.ts +0 -249
- package/test/options.test.ts +0 -150
- package/test/presets.test.ts +0 -22
- package/test/probability.test.ts +0 -44
- package/test/templates/template.test.ts +0 -224
- package/test/transforms/antiTooling.test.ts +0 -52
- package/test/transforms/calculator.test.ts +0 -78
- package/test/transforms/controlFlowFlattening/controlFlowFlattening.test.ts +0 -1274
- package/test/transforms/controlFlowFlattening/expressionObfuscation.test.ts +0 -192
- package/test/transforms/deadCode.test.ts +0 -85
- package/test/transforms/dispatcher.test.ts +0 -457
- package/test/transforms/es5/antiClass.test.ts +0 -427
- package/test/transforms/es5/antiDestructuring.test.ts +0 -157
- package/test/transforms/es5/antiES6Object.test.ts +0 -245
- package/test/transforms/es5/antiTemplate.test.ts +0 -116
- package/test/transforms/es5/es5.test.ts +0 -110
- package/test/transforms/extraction/classExtraction.test.ts +0 -86
- package/test/transforms/extraction/duplicateLiteralsRemoval.test.ts +0 -200
- package/test/transforms/extraction/objectExtraction.test.ts +0 -491
- package/test/transforms/flatten.test.ts +0 -721
- package/test/transforms/hexadecimalNumbers.test.ts +0 -62
- package/test/transforms/identifier/globalConcealing.test.ts +0 -142
- package/test/transforms/identifier/movedDeclarations.test.ts +0 -275
- package/test/transforms/identifier/renameVariables.test.ts +0 -695
- package/test/transforms/lock/antiDebug.test.ts +0 -66
- package/test/transforms/lock/browserLock.test.ts +0 -129
- package/test/transforms/lock/countermeasures.test.ts +0 -100
- package/test/transforms/lock/integrity.test.ts +0 -161
- package/test/transforms/lock/lock.test.ts +0 -204
- package/test/transforms/lock/osLock.test.ts +0 -312
- package/test/transforms/lock/selfDefending.test.ts +0 -68
- package/test/transforms/lock/tamperProtection.test.ts +0 -336
- package/test/transforms/minify.test.ts +0 -575
- package/test/transforms/opaquePredicates.test.ts +0 -43
- package/test/transforms/preparation.test.ts +0 -157
- package/test/transforms/renameLabels.test.ts +0 -95
- package/test/transforms/rgf.test.ts +0 -378
- package/test/transforms/shuffle.test.ts +0 -135
- package/test/transforms/stack.test.ts +0 -573
- package/test/transforms/string/stringCompression.test.ts +0 -120
- package/test/transforms/string/stringConcealing.test.ts +0 -299
- package/test/transforms/string/stringEncoding.test.ts +0 -95
- package/test/transforms/string/stringSplitting.test.ts +0 -135
- package/test/transforms/transform.test.ts +0 -66
- package/test/traverse.test.ts +0 -139
- package/test/util/compare.test.ts +0 -34
- package/test/util/gen.test.ts +0 -121
- package/test/util/identifiers.test.ts +0 -253
- package/test/util/insert.test.ts +0 -142
- package/test/util/math.test.ts +0 -5
- package/test/util/random.test.ts +0 -71
- /package/dist/{types.js → obfuscationResult.js} +0 -0
|
@@ -1,153 +1,239 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
1
|
+
import { NodePath } from "@babel/core";
|
|
2
|
+
import { Order } from "../../order";
|
|
3
|
+
import { PluginArg, PluginObject } from "../plugin";
|
|
4
|
+
import { NodeSymbol, PREDICTABLE } from "../../constants";
|
|
5
|
+
import * as t from "@babel/types";
|
|
6
|
+
import { isStaticValue } from "../../utils/static-utils";
|
|
3
7
|
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
Identifier,
|
|
7
|
-
Node,
|
|
8
|
-
VariableDeclarator,
|
|
9
|
-
AssignmentPattern,
|
|
10
|
-
} from "../../util/gen";
|
|
11
|
-
import {
|
|
12
|
-
isForInitialize,
|
|
13
|
-
isFunction,
|
|
14
|
-
isStrictModeFunction,
|
|
8
|
+
getPatternIdentifierNames,
|
|
9
|
+
isStrictMode,
|
|
15
10
|
prepend,
|
|
16
|
-
} from "../../
|
|
17
|
-
import
|
|
18
|
-
import { ObfuscateOrder } from "../../order";
|
|
19
|
-
import { choice } from "../../util/random";
|
|
20
|
-
import { predictableFunctionTag } from "../../constants";
|
|
21
|
-
import { isIndependent, isMoveable } from "../../util/compare";
|
|
22
|
-
import { getFunctionParameters } from "../../util/identifiers";
|
|
23
|
-
import { isLexicalScope } from "../../util/scope";
|
|
11
|
+
} from "../../utils/ast-utils";
|
|
12
|
+
import Template from "../../templates/template";
|
|
24
13
|
|
|
25
14
|
/**
|
|
26
|
-
*
|
|
15
|
+
* Moved Declarations moves variables in two ways:
|
|
16
|
+
*
|
|
17
|
+
* 1) Move variables to top of the current block
|
|
18
|
+
* 2) Move variables as unused function parameters
|
|
27
19
|
*/
|
|
28
|
-
export default
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
20
|
+
export default ({ Plugin }: PluginArg): PluginObject => {
|
|
21
|
+
const me = Plugin(Order.MovedDeclarations, {
|
|
22
|
+
changeData: {
|
|
23
|
+
variableDeclarations: 0,
|
|
24
|
+
functionParameters: 0,
|
|
25
|
+
},
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
function isFunctionEligibleForParameterPacking(
|
|
29
|
+
functionPath: NodePath<t.Function>,
|
|
30
|
+
proposedParameterName: string
|
|
31
|
+
) {
|
|
32
|
+
// Getter/setter functions must have zero or one formal parameter
|
|
33
|
+
// We cannot add extra parameters to them
|
|
34
|
+
if (functionPath.isObjectMethod() || functionPath.isClassMethod()) {
|
|
35
|
+
if (functionPath.node.kind !== "method") {
|
|
36
|
+
return false;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
// Rest params check
|
|
41
|
+
if (functionPath.get("params").find((p) => p.isRestElement())) return false;
|
|
42
|
+
|
|
43
|
+
// Max 1,000 parameters
|
|
44
|
+
if (functionPath.get("params").length > 1_000) return false;
|
|
32
45
|
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
object.kind === "var" &&
|
|
37
|
-
object.declarations.length === 1 &&
|
|
38
|
-
object.declarations[0].id.type === "Identifier"
|
|
46
|
+
// Check for duplicate parameter names
|
|
47
|
+
var bindingIdentifiers = getPatternIdentifierNames(
|
|
48
|
+
functionPath.get("params")
|
|
39
49
|
);
|
|
50
|
+
|
|
51
|
+
// Duplicate parameter name not allowed
|
|
52
|
+
if (bindingIdentifiers.has(proposedParameterName)) return false;
|
|
53
|
+
|
|
54
|
+
return true;
|
|
40
55
|
}
|
|
41
56
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
if (defineWithValue) {
|
|
95
|
-
predictableFunction.params.push(
|
|
96
|
-
AssignmentPattern(Identifier(varName), value)
|
|
57
|
+
return {
|
|
58
|
+
visitor: {
|
|
59
|
+
FunctionDeclaration: {
|
|
60
|
+
exit(path) {
|
|
61
|
+
var functionPath = path.findParent((path) =>
|
|
62
|
+
path.isFunction()
|
|
63
|
+
) as NodePath<t.Function>;
|
|
64
|
+
|
|
65
|
+
if (!functionPath || !(functionPath.node as NodeSymbol)[PREDICTABLE])
|
|
66
|
+
return;
|
|
67
|
+
|
|
68
|
+
// Must be direct child of the function
|
|
69
|
+
if (path.parentPath !== functionPath.get("body")) return;
|
|
70
|
+
|
|
71
|
+
const functionName = path.node.id.name;
|
|
72
|
+
|
|
73
|
+
// Must be eligible for parameter packing
|
|
74
|
+
if (
|
|
75
|
+
!isFunctionEligibleForParameterPacking(functionPath, functionName)
|
|
76
|
+
)
|
|
77
|
+
return;
|
|
78
|
+
|
|
79
|
+
var strictMode = isStrictMode(functionPath);
|
|
80
|
+
|
|
81
|
+
// Default parameters are not allowed when 'use strict' is declared
|
|
82
|
+
if (strictMode) return;
|
|
83
|
+
|
|
84
|
+
var functionExpression = path.node as t.Node as t.FunctionExpression;
|
|
85
|
+
functionExpression.type = "FunctionExpression";
|
|
86
|
+
functionExpression.id = null;
|
|
87
|
+
|
|
88
|
+
var identifier = t.identifier(functionName);
|
|
89
|
+
functionPath.node.params.push(identifier);
|
|
90
|
+
|
|
91
|
+
var paramPath = functionPath.get("params").at(-1);
|
|
92
|
+
|
|
93
|
+
// Update binding to point to new path
|
|
94
|
+
const binding = functionPath.scope.getBinding(functionName);
|
|
95
|
+
if (binding) {
|
|
96
|
+
binding.kind = "param";
|
|
97
|
+
binding.path = paramPath;
|
|
98
|
+
binding.identifier = identifier;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
prepend(
|
|
102
|
+
functionPath,
|
|
103
|
+
new Template(`
|
|
104
|
+
if(!${functionName}) {
|
|
105
|
+
${functionName} = {functionExpression};
|
|
106
|
+
}
|
|
107
|
+
`).single({ functionExpression: functionExpression })
|
|
97
108
|
);
|
|
98
|
-
object.declarations[0].init = null;
|
|
99
|
-
deleteStatement = true;
|
|
100
|
-
} else {
|
|
101
|
-
predictableFunction.params.push(Identifier(varName));
|
|
102
|
-
}
|
|
103
|
-
} else {
|
|
104
|
-
// Use 'var x, y, z' to declare name
|
|
105
|
-
|
|
106
|
-
// Make sure in the block statement, and not already at the top of it
|
|
107
|
-
if (index === -1 || index === 0) return;
|
|
108
|
-
|
|
109
|
-
var topVariableDeclaration;
|
|
110
|
-
if (body[0].type === "VariableDeclaration" && body[0].kind === "var") {
|
|
111
|
-
topVariableDeclaration = body[0];
|
|
112
|
-
} else {
|
|
113
|
-
topVariableDeclaration = {
|
|
114
|
-
type: "VariableDeclaration",
|
|
115
|
-
declarations: [],
|
|
116
|
-
kind: "var",
|
|
117
|
-
};
|
|
118
|
-
|
|
119
|
-
prepend(block, topVariableDeclaration);
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
// Add `var x` at the top of the block
|
|
123
|
-
topVariableDeclaration.declarations.push(
|
|
124
|
-
VariableDeclarator(Identifier(varName))
|
|
125
|
-
);
|
|
126
|
-
}
|
|
127
109
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
110
|
+
path.remove();
|
|
111
|
+
me.changeData.functionParameters++;
|
|
112
|
+
},
|
|
113
|
+
},
|
|
114
|
+
VariableDeclaration: {
|
|
115
|
+
exit(path) {
|
|
116
|
+
if (path.node.kind !== "var") return;
|
|
117
|
+
if (path.node.declarations.length !== 1) return;
|
|
118
|
+
|
|
119
|
+
var insertionMethod = "variableDeclaration";
|
|
120
|
+
var functionPath = path.findParent((path) =>
|
|
121
|
+
path.isFunction()
|
|
122
|
+
) as NodePath<t.Function>;
|
|
123
|
+
|
|
124
|
+
const declaration = path.node.declarations[0];
|
|
125
|
+
if (!t.isIdentifier(declaration.id)) return;
|
|
126
|
+
const varName = declaration.id.name;
|
|
127
|
+
|
|
128
|
+
var allowDefaultParamValue = true;
|
|
129
|
+
|
|
130
|
+
if (functionPath && (functionPath.node as NodeSymbol)[PREDICTABLE]) {
|
|
131
|
+
// Check for "use strict" directive
|
|
132
|
+
// Strict mode disallows non-simple parameters
|
|
133
|
+
// So we can't move the declaration to the function parameters
|
|
134
|
+
var strictMode = isStrictMode(functionPath);
|
|
135
|
+
if (strictMode) {
|
|
136
|
+
allowDefaultParamValue = false;
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
// Cannot add variables after rest element
|
|
140
|
+
// Cannot add over 1,000 parameters
|
|
141
|
+
if (isFunctionEligibleForParameterPacking(functionPath, varName)) {
|
|
142
|
+
insertionMethod = "functionParameter";
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
const { name } = declaration.id;
|
|
147
|
+
const value = declaration.init || t.identifier("undefined");
|
|
148
|
+
|
|
149
|
+
const isStatic = isStaticValue(value);
|
|
150
|
+
let isDefinedAtTop = false;
|
|
151
|
+
const parentPath = path.parentPath;
|
|
152
|
+
if (parentPath.isBlock()) {
|
|
153
|
+
isDefinedAtTop = parentPath.get("body").indexOf(path) === 0;
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
// Already at the top - nothing will change
|
|
157
|
+
if (insertionMethod === "variableDeclaration" && isDefinedAtTop) {
|
|
158
|
+
return;
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
let defaultParamValue: t.Expression;
|
|
162
|
+
|
|
163
|
+
if (
|
|
164
|
+
insertionMethod === "functionParameter" &&
|
|
165
|
+
isStatic &&
|
|
166
|
+
isDefinedAtTop &&
|
|
167
|
+
allowDefaultParamValue
|
|
168
|
+
) {
|
|
169
|
+
defaultParamValue = value;
|
|
170
|
+
path.remove();
|
|
171
|
+
} else {
|
|
172
|
+
// For-in / For-of can only reference the variable name
|
|
173
|
+
if (
|
|
174
|
+
parentPath.isForInStatement() ||
|
|
175
|
+
parentPath.isForOfStatement()
|
|
176
|
+
) {
|
|
177
|
+
path.replaceWith(t.identifier(name));
|
|
178
|
+
} else {
|
|
179
|
+
path.replaceWith(
|
|
180
|
+
t.assignmentExpression(
|
|
181
|
+
"=",
|
|
182
|
+
t.identifier(name),
|
|
183
|
+
declaration.init || t.identifier("undefined")
|
|
184
|
+
)
|
|
185
|
+
);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
switch (insertionMethod) {
|
|
190
|
+
case "functionParameter":
|
|
191
|
+
var identifier = t.identifier(name);
|
|
192
|
+
|
|
193
|
+
var param: t.Pattern | t.Identifier = identifier;
|
|
194
|
+
if (allowDefaultParamValue && defaultParamValue) {
|
|
195
|
+
param = t.assignmentPattern(param, defaultParamValue);
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
functionPath.node.params.push(param);
|
|
199
|
+
|
|
200
|
+
var paramPath = functionPath.get("params").at(-1);
|
|
201
|
+
|
|
202
|
+
// Update binding to point to new path
|
|
203
|
+
const binding = functionPath.scope.getBinding(name);
|
|
204
|
+
if (binding) {
|
|
205
|
+
binding.kind = "param";
|
|
206
|
+
binding.path = paramPath;
|
|
207
|
+
binding.identifier = identifier;
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
me.changeData.functionParameters++;
|
|
211
|
+
break;
|
|
212
|
+
case "variableDeclaration":
|
|
213
|
+
var block = path.findParent((path) =>
|
|
214
|
+
path.isBlock()
|
|
215
|
+
) as NodePath<t.Block>;
|
|
216
|
+
|
|
217
|
+
var topNode = block.node.body[0];
|
|
218
|
+
const variableDeclarator = t.variableDeclarator(
|
|
219
|
+
t.identifier(name)
|
|
220
|
+
);
|
|
221
|
+
|
|
222
|
+
if (t.isVariableDeclaration(topNode) && topNode.kind === "var") {
|
|
223
|
+
topNode.declarations.push(variableDeclarator);
|
|
224
|
+
break;
|
|
225
|
+
} else {
|
|
226
|
+
block.node.body.unshift(
|
|
227
|
+
t.variableDeclaration("var", [variableDeclarator])
|
|
228
|
+
);
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
me.changeData.variableDeclarations++;
|
|
232
|
+
|
|
233
|
+
break;
|
|
234
|
+
}
|
|
235
|
+
},
|
|
236
|
+
},
|
|
237
|
+
},
|
|
238
|
+
};
|
|
239
|
+
};
|