webfuscator 1.3.0 → 1.3.1
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/DISCLOSURE +9 -0
- package/README.md +67 -0
- package/dist/analysis/constant.d.ts.map +1 -1
- package/dist/analysis/constant.js +10 -26
- package/dist/analysis/constant.js.map +1 -1
- package/dist/analysis/inlineability.d.ts.map +1 -1
- package/dist/analysis/inlineability.js +4 -12
- package/dist/analysis/inlineability.js.map +1 -1
- package/dist/analysis/purity.d.ts +3 -3
- package/dist/analysis/purity.d.ts.map +1 -1
- package/dist/analysis/purity.js +28 -75
- package/dist/analysis/purity.js.map +1 -1
- package/dist/preparation/expand-destructuring.d.ts +2 -3
- package/dist/preparation/expand-destructuring.d.ts.map +1 -1
- package/dist/preparation/expand-destructuring.js +2 -8
- package/dist/preparation/expand-destructuring.js.map +1 -1
- package/dist/transforms/arguments-to-parameters.d.ts +5 -4
- package/dist/transforms/arguments-to-parameters.d.ts.map +1 -1
- package/dist/transforms/arguments-to-parameters.js +5 -4
- package/dist/transforms/arguments-to-parameters.js.map +1 -1
- package/dist/transforms/arrow-to-function.d.ts +4 -3
- package/dist/transforms/arrow-to-function.d.ts.map +1 -1
- package/dist/transforms/arrow-to-function.js +6 -8
- package/dist/transforms/arrow-to-function.js.map +1 -1
- package/dist/transforms/collapse-single-use-temps.d.ts +2 -1
- package/dist/transforms/collapse-single-use-temps.d.ts.map +1 -1
- package/dist/transforms/collapse-single-use-temps.js +12 -20
- package/dist/transforms/collapse-single-use-temps.js.map +1 -1
- package/dist/transforms/conceal-strings.d.ts +1 -2
- package/dist/transforms/conceal-strings.d.ts.map +1 -1
- package/dist/transforms/conceal-strings.js +2 -7
- package/dist/transforms/conceal-strings.js.map +1 -1
- package/dist/transforms/const-let-to-var.d.ts +4 -3
- package/dist/transforms/const-let-to-var.d.ts.map +1 -1
- package/dist/transforms/const-let-to-var.js +8 -94
- package/dist/transforms/const-let-to-var.js.map +1 -1
- package/dist/transforms/const-to-let.d.ts +1 -2
- package/dist/transforms/const-to-let.d.ts.map +1 -1
- package/dist/transforms/const-to-let.js +1 -6
- package/dist/transforms/const-to-let.js.map +1 -1
- package/dist/transforms/drop-console.d.ts.map +1 -1
- package/dist/transforms/drop-console.js +3 -5
- package/dist/transforms/drop-console.js.map +1 -1
- package/dist/transforms/expand-binary-assignment.d.ts.map +1 -1
- package/dist/transforms/expand-binary-assignment.js +0 -5
- package/dist/transforms/expand-binary-assignment.js.map +1 -1
- package/dist/transforms/expand-logical-assignment.d.ts.map +1 -1
- package/dist/transforms/expand-logical-assignment.js +0 -5
- package/dist/transforms/expand-logical-assignment.js.map +1 -1
- package/dist/transforms/extract-object-properties.js +5 -12
- package/dist/transforms/extract-object-properties.js.map +1 -1
- package/dist/transforms/fold-builtin-methods.js +3 -11
- package/dist/transforms/fold-builtin-methods.js.map +1 -1
- package/dist/transforms/fold-constants.js +2 -2
- package/dist/transforms/fold-constants.js.map +1 -1
- package/dist/transforms/function-declaration-to-expression.d.ts +5 -6
- package/dist/transforms/function-declaration-to-expression.d.ts.map +1 -1
- package/dist/transforms/function-declaration-to-expression.js +5 -6
- package/dist/transforms/function-declaration-to-expression.js.map +1 -1
- package/dist/transforms/hoist-variables.d.ts +1 -2
- package/dist/transforms/hoist-variables.d.ts.map +1 -1
- package/dist/transforms/hoist-variables.js +2 -11
- package/dist/transforms/hoist-variables.js.map +1 -1
- package/dist/transforms/inline-functions.js +11 -39
- package/dist/transforms/inline-functions.js.map +1 -1
- package/dist/transforms/logical-to-ternary.d.ts +1 -1
- package/dist/transforms/logical-to-ternary.js +5 -9
- package/dist/transforms/logical-to-ternary.js.map +1 -1
- package/dist/transforms/mangle-properties.d.ts +2 -5
- package/dist/transforms/mangle-properties.d.ts.map +1 -1
- package/dist/transforms/mangle-properties.js +2 -5
- package/dist/transforms/mangle-properties.js.map +1 -1
- package/dist/transforms/nullish-coalescing-to-ternary.d.ts +4 -5
- package/dist/transforms/nullish-coalescing-to-ternary.d.ts.map +1 -1
- package/dist/transforms/nullish-coalescing-to-ternary.js +7 -12
- package/dist/transforms/nullish-coalescing-to-ternary.js.map +1 -1
- package/dist/transforms/object-method-to-property.d.ts +1 -1
- package/dist/transforms/object-method-to-property.js +1 -1
- package/dist/transforms/optional-chaining-to-ternary.d.ts +4 -3
- package/dist/transforms/optional-chaining-to-ternary.d.ts.map +1 -1
- package/dist/transforms/optional-chaining-to-ternary.js +9 -9
- package/dist/transforms/optional-chaining-to-ternary.js.map +1 -1
- package/dist/transforms/pack-declarations-into-parameters.d.ts.map +1 -1
- package/dist/transforms/pack-declarations-into-parameters.js +4 -16
- package/dist/transforms/pack-declarations-into-parameters.js.map +1 -1
- package/dist/transforms/pack.d.ts +4 -11
- package/dist/transforms/pack.d.ts.map +1 -1
- package/dist/transforms/pack.js +4 -17
- package/dist/transforms/pack.js.map +1 -1
- package/dist/transforms/remove-anonymous-function-names.d.ts +2 -4
- package/dist/transforms/remove-anonymous-function-names.d.ts.map +1 -1
- package/dist/transforms/remove-anonymous-function-names.js +2 -40
- package/dist/transforms/remove-anonymous-function-names.js.map +1 -1
- package/dist/transforms/remove-unreachable-code.js +2 -21
- package/dist/transforms/remove-unreachable-code.js.map +1 -1
- package/dist/transforms/remove-unused-code.d.ts.map +1 -1
- package/dist/transforms/remove-unused-code.js +5 -10
- package/dist/transforms/remove-unused-code.js.map +1 -1
- package/dist/transforms/rename-identifiers.d.ts +3 -3
- package/dist/transforms/rename-identifiers.d.ts.map +1 -1
- package/dist/transforms/rename-identifiers.js +4 -20
- package/dist/transforms/rename-identifiers.js.map +1 -1
- package/dist/transforms/reorder-function-declarations.d.ts +1 -2
- package/dist/transforms/reorder-function-declarations.d.ts.map +1 -1
- package/dist/transforms/reorder-function-declarations.js +2 -4
- package/dist/transforms/reorder-function-declarations.js.map +1 -1
- package/dist/transforms/specials-to-strings.d.ts.map +1 -1
- package/dist/transforms/specials-to-strings.js +2 -4
- package/dist/transforms/specials-to-strings.js.map +1 -1
- package/dist/transforms/switch-to-if.js +5 -15
- package/dist/transforms/switch-to-if.js.map +1 -1
- package/dist/transforms/ternary-to-if.d.ts.map +1 -1
- package/dist/transforms/ternary-to-if.js +5 -9
- package/dist/transforms/ternary-to-if.js.map +1 -1
- package/dist/transforms/update-to-assignment.d.ts.map +1 -1
- package/dist/transforms/update-to-assignment.js +6 -8
- package/dist/transforms/update-to-assignment.js.map +1 -1
- package/dist/transforms/yodify-conditions.d.ts +3 -4
- package/dist/transforms/yodify-conditions.d.ts.map +1 -1
- package/dist/transforms/yodify-conditions.js +3 -4
- package/dist/transforms/yodify-conditions.js.map +1 -1
- package/dist/utils/ast.d.ts +0 -1
- package/dist/utils/ast.d.ts.map +1 -1
- package/dist/utils/ast.js +0 -26
- package/dist/utils/ast.js.map +1 -1
- package/dist/utils/evaluation-order.js +1 -1
- package/dist/utils/evaluation-order.js.map +1 -1
- package/dist/utils/logical-lowering.d.ts.map +1 -1
- package/dist/utils/logical-lowering.js +7 -9
- package/dist/utils/logical-lowering.js.map +1 -1
- package/dist/utils/nullish.d.ts +4 -0
- package/dist/utils/nullish.d.ts.map +1 -0
- package/dist/utils/nullish.js +8 -0
- package/dist/utils/nullish.js.map +1 -0
- package/dist/utils/paths.d.ts +0 -2
- package/dist/utils/paths.d.ts.map +1 -1
- package/dist/utils/paths.js +0 -28
- package/dist/utils/paths.js.map +1 -1
- package/package.json +16 -10
- package/src/analysis/constant.ts +12 -30
- package/src/analysis/inlineability.ts +4 -12
- package/src/analysis/purity.ts +29 -92
- package/src/preparation/expand-destructuring.ts +2 -10
- package/src/transforms/arguments-to-parameters.ts +5 -4
- package/src/transforms/arrow-to-function.ts +6 -8
- package/src/transforms/collapse-single-use-temps.ts +12 -23
- package/src/transforms/conceal-strings.ts +3 -8
- package/src/transforms/const-let-to-var.ts +9 -100
- package/src/transforms/const-to-let.ts +1 -6
- package/src/transforms/drop-console.ts +3 -5
- package/src/transforms/expand-binary-assignment.ts +0 -5
- package/src/transforms/expand-logical-assignment.ts +0 -5
- package/src/transforms/extract-object-properties.ts +5 -14
- package/src/transforms/fold-builtin-methods.ts +3 -12
- package/src/transforms/fold-constants.ts +2 -2
- package/src/transforms/function-declaration-to-expression.ts +5 -6
- package/src/transforms/hoist-variables.ts +2 -12
- package/src/transforms/inline-functions.ts +16 -46
- package/src/transforms/logical-to-ternary.ts +5 -10
- package/src/transforms/mangle-properties.ts +2 -5
- package/src/transforms/nullish-coalescing-to-ternary.ts +7 -13
- package/src/transforms/object-method-to-property.ts +1 -1
- package/src/transforms/optional-chaining-to-ternary.ts +9 -9
- package/src/transforms/pack-declarations-into-parameters.ts +10 -16
- package/src/transforms/pack.ts +4 -17
- package/src/transforms/remove-anonymous-function-names.ts +3 -46
- package/src/transforms/remove-unreachable-code.ts +2 -22
- package/src/transforms/remove-unused-code.ts +5 -10
- package/src/transforms/rename-identifiers.ts +4 -20
- package/src/transforms/reorder-function-declarations.ts +2 -4
- package/src/transforms/specials-to-strings.ts +2 -4
- package/src/transforms/switch-to-if.ts +5 -22
- package/src/transforms/ternary-to-if.ts +5 -9
- package/src/transforms/update-to-assignment.ts +6 -8
- package/src/transforms/yodify-conditions.ts +3 -4
- package/src/utils/ast.ts +0 -29
- package/src/utils/evaluation-order.ts +1 -1
- package/src/utils/logical-lowering.ts +7 -11
- package/src/utils/nullish.ts +23 -0
- package/src/utils/paths.ts +0 -32
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
import * as t from '@babel/types';
|
|
2
1
|
import { traverseForChanges } from '../utils/change-tracking.js';
|
|
3
2
|
/**
|
|
4
|
-
* Removes a function expression's name when
|
|
5
|
-
* and NamedEvaluation restores the same `.name`. Other positions could infer no
|
|
6
|
-
* name or a different one.
|
|
3
|
+
* Removes a function expression's name when its body does not reference it.
|
|
7
4
|
*
|
|
8
5
|
* @example
|
|
9
6
|
* // ◀️ before
|
|
@@ -12,7 +9,7 @@ import { traverseForChanges } from '../utils/change-tracking.js';
|
|
|
12
9
|
*
|
|
13
10
|
* // ▶️ after
|
|
14
11
|
* var greet = function () {};
|
|
15
|
-
* var a = function
|
|
12
|
+
* var a = function () {};
|
|
16
13
|
*/
|
|
17
14
|
export function removeAnonymousFunctionNames(ast) {
|
|
18
15
|
return traverseForChanges(ast, visitor);
|
|
@@ -30,43 +27,8 @@ const visitor = {
|
|
|
30
27
|
(binding.references > 0 || binding.constantViolations.length > 0)) {
|
|
31
28
|
return;
|
|
32
29
|
}
|
|
33
|
-
if (inferredName(path) !== id.name) {
|
|
34
|
-
return;
|
|
35
|
-
}
|
|
36
30
|
path.node.id = null;
|
|
37
31
|
state.changed = true;
|
|
38
32
|
},
|
|
39
33
|
};
|
|
40
|
-
// No inferred name means `.name` would become empty.
|
|
41
|
-
function inferredName(path) {
|
|
42
|
-
const node = path.node;
|
|
43
|
-
const parentPath = path.parentPath;
|
|
44
|
-
if (!parentPath) {
|
|
45
|
-
return null;
|
|
46
|
-
}
|
|
47
|
-
const parent = parentPath.node;
|
|
48
|
-
if (t.isVariableDeclarator(parent) && parent.init === node && t.isIdentifier(parent.id)) {
|
|
49
|
-
return parent.id.name;
|
|
50
|
-
}
|
|
51
|
-
if (t.isAssignmentExpression(parent) &&
|
|
52
|
-
parent.operator === '=' &&
|
|
53
|
-
parent.right === node &&
|
|
54
|
-
t.isIdentifier(parent.left)) {
|
|
55
|
-
return parent.left.name;
|
|
56
|
-
}
|
|
57
|
-
if (t.isAssignmentPattern(parent) && parent.right === node && t.isIdentifier(parent.left)) {
|
|
58
|
-
return parent.left.name;
|
|
59
|
-
}
|
|
60
|
-
if ((t.isObjectProperty(parent) || t.isClassProperty(parent)) &&
|
|
61
|
-
parent.value === node &&
|
|
62
|
-
!parent.computed) {
|
|
63
|
-
if (t.isIdentifier(parent.key)) {
|
|
64
|
-
return parent.key.name;
|
|
65
|
-
}
|
|
66
|
-
if (t.isStringLiteral(parent.key)) {
|
|
67
|
-
return parent.key.value;
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
return null;
|
|
71
|
-
}
|
|
72
34
|
//# sourceMappingURL=remove-anonymous-function-names.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-anonymous-function-names.js","sourceRoot":"","sources":["../../src/transforms/remove-anonymous-function-names.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"remove-anonymous-function-names.js","sourceRoot":"","sources":["../../src/transforms/remove-anonymous-function-names.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAG7D;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,4BAA4B,CAAC,GAAS;IACpD,OAAO,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;AACzC,CAAC;AAED,MAAM,OAAO,GAAyB;IACpC,kBAAkB,CAAC,IAAI,EAAE,KAAK;QAC5B,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;QACvB,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAM;QACR,CAAC;QACD,0EAA0E;QAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;QAC9C,IACE,OAAO;YACP,OAAO,CAAC,UAAU,KAAK,EAAE;YACzB,CAAC,OAAO,CAAC,UAAU,GAAG,CAAC,IAAI,OAAO,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,EACjE,CAAC;YACD,OAAM;QACR,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAA;QACnB,KAAK,CAAC,OAAO,GAAG,IAAI,CAAA;IACtB,CAAC;CACF,CAAA"}
|
|
@@ -58,39 +58,20 @@ function isCompletion(node) {
|
|
|
58
58
|
t.isBreakStatement(node) ||
|
|
59
59
|
t.isContinueStatement(node));
|
|
60
60
|
}
|
|
61
|
-
// Hoisted bindings and referenced lexical TDZ remain observable from reachable
|
|
62
|
-
// code. An unreferenced lexical declaration is inert.
|
|
63
61
|
function isSafeToRemoveAfterCompletion(path) {
|
|
64
62
|
const node = path.node;
|
|
65
63
|
if (t.isFunctionDeclaration(node) || (t.isVariableDeclaration(node) && node.kind === 'var')) {
|
|
66
64
|
return false;
|
|
67
65
|
}
|
|
68
|
-
|
|
69
|
-
return !declaresReferencedBinding(path);
|
|
70
|
-
}
|
|
71
|
-
return !nestsHoistedDeclaration(node);
|
|
66
|
+
return !nestsHoistedVar(node);
|
|
72
67
|
}
|
|
73
|
-
|
|
74
|
-
function declaresReferencedBinding(path) {
|
|
75
|
-
for (const name of Object.keys(path.getBindingIdentifiers())) {
|
|
76
|
-
const binding = path.scope.getBinding(name);
|
|
77
|
-
if (binding && (binding.references > 0 || binding.constantViolations.length > 0)) {
|
|
78
|
-
return true;
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
return false;
|
|
82
|
-
}
|
|
83
|
-
function nestsHoistedDeclaration(node) {
|
|
68
|
+
function nestsHoistedVar(node) {
|
|
84
69
|
let found = false;
|
|
85
70
|
t.traverseFast(node, (child) => {
|
|
86
71
|
if (found) {
|
|
87
72
|
return t.traverseFast.skip;
|
|
88
73
|
}
|
|
89
74
|
if (child !== node && t.isFunction(child)) {
|
|
90
|
-
// Function declarations may add Annex B aliases. Function bodies do not.
|
|
91
|
-
if (t.isFunctionDeclaration(child)) {
|
|
92
|
-
found = true;
|
|
93
|
-
}
|
|
94
75
|
return t.traverseFast.skip;
|
|
95
76
|
}
|
|
96
77
|
if (t.isVariableDeclaration(child) && child.kind === 'var') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-unreachable-code.js","sourceRoot":"","sources":["../../src/transforms/remove-unreachable-code.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAGjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAG7D;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAS;IAC7C,OAAO,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;AACzC,CAAC;AAED,MAAM,OAAO,GAAyB;IACpC,cAAc,CAAC,IAAI,EAAE,KAAK;QACxB,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YAChC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAA;QACtB,CAAC;IACH,CAAC;IACD,UAAU,CAAC,IAAI,EAAE,KAAK;QACpB,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;YACtC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAA;QACtB,CAAC;IACH,CAAC;CACF,CAAA;AAED,SAAS,SAAS,CAAC,IAA6B;IAC9C,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,MAAM,QAAQ,GAA4B,EAAE,CAAA;IAC5C,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,6BAA6B,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACrB,CAAC;YACD,SAAQ;QACV,CAAC;QACD,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,QAAQ,GAAG,IAAI,CAAA;QACjB,CAAC;IACH,CAAC;IACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,OAAO,CAAC,MAAM,EAAE,CAAA;IAClB,CAAC;IACD,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;AAC5B,CAAC;AAED,SAAS,YAAY,CAAC,IAAY;IAChC,OAAO,CACL,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC;QACzB,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACxB,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACxB,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAC5B,CAAA;AACH,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"remove-unreachable-code.js","sourceRoot":"","sources":["../../src/transforms/remove-unreachable-code.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-unused-code.d.ts","sourceRoot":"","sources":["../../src/transforms/remove-unused-code.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"remove-unused-code.d.ts","sourceRoot":"","sources":["../../src/transforms/remove-unused-code.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAKxC;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,IAAI,GAAG,OAAO,CAcnD"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import traverse from '@babel/traverse';
|
|
2
2
|
import * as t from '@babel/types';
|
|
3
3
|
import { isSideEffectFree } from '../analysis/purity.js';
|
|
4
|
-
import { hasAnnexBFunctionAlias } from '../utils/paths.js';
|
|
5
4
|
/**
|
|
6
5
|
* Removes unused declarations and expression statements that have no effects.
|
|
7
6
|
* Sweeps continue because each removal can strand another binding.
|
|
@@ -104,7 +103,7 @@ function tryRemoveDeclarator(path) {
|
|
|
104
103
|
return false;
|
|
105
104
|
}
|
|
106
105
|
const init = path.node.init;
|
|
107
|
-
if (init && !isSideEffectFree(init, path.scope
|
|
106
|
+
if (init && !isSideEffectFree(init, path.scope)) {
|
|
108
107
|
return false;
|
|
109
108
|
}
|
|
110
109
|
const binding = path.scope.getBinding(id.name);
|
|
@@ -114,7 +113,7 @@ function tryRemoveDeclarator(path) {
|
|
|
114
113
|
if (binding.references > 0) {
|
|
115
114
|
return false;
|
|
116
115
|
}
|
|
117
|
-
if (binding.constantViolations.length > 0) {
|
|
116
|
+
if (declaration.node.kind !== 'const' && binding.constantViolations.length > 0) {
|
|
118
117
|
return false;
|
|
119
118
|
}
|
|
120
119
|
if (path.node.init) {
|
|
@@ -131,10 +130,6 @@ function tryRemoveFunctionDecl(path) {
|
|
|
131
130
|
if (isExported(path)) {
|
|
132
131
|
return false;
|
|
133
132
|
}
|
|
134
|
-
// Babel misses the sloppy Annex B alias of a block-level function.
|
|
135
|
-
if (hasAnnexBFunctionAlias(path)) {
|
|
136
|
-
return false;
|
|
137
|
-
}
|
|
138
133
|
const id = path.node.id;
|
|
139
134
|
if (!id) {
|
|
140
135
|
return false;
|
|
@@ -163,7 +158,7 @@ function tryRemoveClassDecl(path) {
|
|
|
163
158
|
return false;
|
|
164
159
|
}
|
|
165
160
|
// `extends`, computed keys, static fields, and static blocks run on evaluation.
|
|
166
|
-
if (path.node.superClass && !isSideEffectFree(path.node.superClass, path.scope
|
|
161
|
+
if (path.node.superClass && !isSideEffectFree(path.node.superClass, path.scope)) {
|
|
167
162
|
return false;
|
|
168
163
|
}
|
|
169
164
|
for (const member of path.node.body.body) {
|
|
@@ -177,7 +172,7 @@ function tryRemoveClassDecl(path) {
|
|
|
177
172
|
if ('computed' in member &&
|
|
178
173
|
member.computed &&
|
|
179
174
|
'key' in member &&
|
|
180
|
-
!isSideEffectFree(member.key, path.scope
|
|
175
|
+
!isSideEffectFree(member.key, path.scope)) {
|
|
181
176
|
return false;
|
|
182
177
|
}
|
|
183
178
|
}
|
|
@@ -200,7 +195,7 @@ function tryRemoveClassDecl(path) {
|
|
|
200
195
|
return true;
|
|
201
196
|
}
|
|
202
197
|
function tryRemoveExpressionStatement(path) {
|
|
203
|
-
if (!isSideEffectFree(path.node.expression, path.scope
|
|
198
|
+
if (!isSideEffectFree(path.node.expression, path.scope)) {
|
|
204
199
|
return false;
|
|
205
200
|
}
|
|
206
201
|
dereferenceSubtree(path.get('expression'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-unused-code.js","sourceRoot":"","sources":["../../src/transforms/remove-unused-code.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAA;AAEtC,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAGjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"remove-unused-code.js","sourceRoot":"","sources":["../../src/transforms/remove-unused-code.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import type { File } from '@babel/types';
|
|
2
2
|
import type { TransformContext } from '../options.js';
|
|
3
3
|
/**
|
|
4
|
-
* Renames bindings and labels with
|
|
5
|
-
*
|
|
6
|
-
* sibling scopes.
|
|
4
|
+
* Renames bindings and labels with the configured string generator. Generated
|
|
5
|
+
* names do not capture unresolved names or bindings still used from an outer
|
|
6
|
+
* scope. Separate sibling scopes may reuse the same names.
|
|
7
7
|
*
|
|
8
8
|
* @example
|
|
9
9
|
* // ◀️ before
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rename-identifiers.d.ts","sourceRoot":"","sources":["../../src/transforms/rename-identifiers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAExC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"rename-identifiers.d.ts","sourceRoot":"","sources":["../../src/transforms/rename-identifiers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAExC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAKlD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CA6I3E"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import traverse from '@babel/traverse';
|
|
2
2
|
import * as t from '@babel/types';
|
|
3
|
-
import {
|
|
4
|
-
import { hasAnnexBFunctionAlias, referencesOrWritesVariable } from '../utils/paths.js';
|
|
3
|
+
import { referencesOrWritesVariable } from '../utils/paths.js';
|
|
5
4
|
import { mulberry32 } from '../utils/random.js';
|
|
6
5
|
import { StringGenerator } from '../utils/string-generator.js';
|
|
7
6
|
/**
|
|
8
|
-
* Renames bindings and labels with
|
|
9
|
-
*
|
|
10
|
-
* sibling scopes.
|
|
7
|
+
* Renames bindings and labels with the configured string generator. Generated
|
|
8
|
+
* names do not capture unresolved names or bindings still used from an outer
|
|
9
|
+
* scope. Separate sibling scopes may reuse the same names.
|
|
11
10
|
*
|
|
12
11
|
* @example
|
|
13
12
|
* // ◀️ before
|
|
@@ -41,7 +40,6 @@ export function renameIdentifiers(ast, ctx) {
|
|
|
41
40
|
const liveAncestors = new Map();
|
|
42
41
|
// Reserve unbound names so generated bindings cannot capture them.
|
|
43
42
|
const freeNames = new Set();
|
|
44
|
-
// A reference inside `with` pins its binding to the source name.
|
|
45
43
|
const unrenamable = new Set();
|
|
46
44
|
// Reserve pinned source names globally, including before their binding is seen.
|
|
47
45
|
const pinnedNames = new Set();
|
|
@@ -62,9 +60,6 @@ export function renameIdentifiers(ast, ctx) {
|
|
|
62
60
|
}
|
|
63
61
|
return;
|
|
64
62
|
}
|
|
65
|
-
if (isInsideWith(path)) {
|
|
66
|
-
pin(binding, path.node.name);
|
|
67
|
-
}
|
|
68
63
|
let scope = path.scope;
|
|
69
64
|
while (scope && scope !== binding.scope) {
|
|
70
65
|
let live = liveAncestors.get(scope);
|
|
@@ -76,17 +71,6 @@ export function renameIdentifiers(ast, ctx) {
|
|
|
76
71
|
scope = scope.parent;
|
|
77
72
|
}
|
|
78
73
|
},
|
|
79
|
-
FunctionDeclaration(path) {
|
|
80
|
-
// ECMA-262 B.3.3 gives sloppy block functions an alias Babel does not model.
|
|
81
|
-
if (!hasAnnexBFunctionAlias(path)) {
|
|
82
|
-
return;
|
|
83
|
-
}
|
|
84
|
-
const name = path.node.id?.name;
|
|
85
|
-
const binding = name === undefined ? undefined : path.scope.getBinding(name);
|
|
86
|
-
if (binding && name !== undefined) {
|
|
87
|
-
pin(binding, name);
|
|
88
|
-
}
|
|
89
|
-
},
|
|
90
74
|
CatchClause(path) {
|
|
91
75
|
// Babel splits a catch parameter and same-named `var` that share one runtime
|
|
92
76
|
// variable. They must keep the same name.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rename-identifiers.js","sourceRoot":"","sources":["../../src/transforms/rename-identifiers.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAA;AAEtC,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAIjC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"rename-identifiers.js","sourceRoot":"","sources":["../../src/transforms/rename-identifiers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import type { File } from '@babel/types';
|
|
2
2
|
/**
|
|
3
3
|
* Moves hoisted function declarations to the end of each program, block, switch
|
|
4
|
-
* case, or static block. It keeps declaration order, including duplicate names
|
|
5
|
-
* and leaves sloppy Annex B block functions in place.
|
|
4
|
+
* case, or static block. It keeps declaration order, including duplicate names.
|
|
6
5
|
*
|
|
7
6
|
* If moving every declaration would turn a string expression into a directive,
|
|
8
7
|
* one declaration stays before the string. Direct exports stay in place.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reorder-function-declarations.d.ts","sourceRoot":"","sources":["../../src/transforms/reorder-function-declarations.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"reorder-function-declarations.d.ts","sourceRoot":"","sources":["../../src/transforms/reorder-function-declarations.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAKxC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,IAAI,GAAG,OAAO,CAI9D"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
import { hasAnnexBFunctionAlias } from '../utils/paths.js';
|
|
2
1
|
import { rewriteStatementLists } from '../utils/statement-lists.js';
|
|
3
2
|
/**
|
|
4
3
|
* Moves hoisted function declarations to the end of each program, block, switch
|
|
5
|
-
* case, or static block. It keeps declaration order, including duplicate names
|
|
6
|
-
* and leaves sloppy Annex B block functions in place.
|
|
4
|
+
* case, or static block. It keeps declaration order, including duplicate names.
|
|
7
5
|
*
|
|
8
6
|
* If moving every declaration would turn a string expression into a directive,
|
|
9
7
|
* one declaration stays before the string. Direct exports stay in place.
|
|
@@ -59,6 +57,6 @@ function createsDirective(statements) {
|
|
|
59
57
|
first.expression.type === 'StringLiteral');
|
|
60
58
|
}
|
|
61
59
|
function isMovable(child) {
|
|
62
|
-
return child.isFunctionDeclaration() && child.node.id !== null
|
|
60
|
+
return child.isFunctionDeclaration() && child.node.id !== null;
|
|
63
61
|
}
|
|
64
62
|
//# sourceMappingURL=reorder-function-declarations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reorder-function-declarations.js","sourceRoot":"","sources":["../../src/transforms/reorder-function-declarations.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"reorder-function-declarations.js","sourceRoot":"","sources":["../../src/transforms/reorder-function-declarations.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAA;AAGhE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,2BAA2B,CAAC,GAAS;IACnD,OAAO,qBAAqB,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE,CAC1D,mBAAmB,CAAC,UAAU,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC,CACrE,CAAA;AACH,CAAC;AAED,uFAAuF;AACvF,SAAS,wBAAwB,CAAC,SAA2C;IAC3E,IAAI,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,SAAS,CAAC,gBAAgB,EAAE,IAAI,SAAS,CAAC,UAAU,CAAC,UAAU,EAAE,CAAA;AAC1E,CAAC;AAED,SAAS,mBAAmB,CAC1B,QAAiC,EACjC,kBAA2B;IAE3B,MAAM,IAAI,GAAkB,EAAE,CAAA;IAC9B,MAAM,KAAK,GAAkB,EAAE,CAAA;IAC/B,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC7B,IAAI,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACrB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACxB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACvB,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,kBAAkB,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QACjD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAG,CAAC,CAAA;IAC9B,CAAC;IACD,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC,CAAA;IACrC,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;AAC5F,CAAC;AAED,SAAS,gBAAgB,CAAC,UAAkC;IAC1D,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;IAC3B,OAAO,CACL,KAAK,KAAK,SAAS;QACnB,KAAK,CAAC,IAAI,KAAK,qBAAqB;QACpC,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,eAAe,CAC1C,CAAA;AACH,CAAC;AAED,SAAS,SAAS,CAAC,KAA4B;IAC7C,OAAO,KAAK,CAAC,qBAAqB,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,CAAA;AAChE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"specials-to-strings.d.ts","sourceRoot":"","sources":["../../src/transforms/specials-to-strings.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAExC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"specials-to-strings.d.ts","sourceRoot":"","sources":["../../src/transforms/specials-to-strings.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAExC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAKlD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAO3E"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import traverse from '@babel/traverse';
|
|
2
2
|
import * as t from '@babel/types';
|
|
3
|
-
import { isInsideWith } from '../utils/ast.js';
|
|
4
3
|
import { mulberry32 } from '../utils/random.js';
|
|
5
4
|
import { StringGenerator } from '../utils/string-generator.js';
|
|
6
5
|
/**
|
|
@@ -57,9 +56,8 @@ const visitor = {
|
|
|
57
56
|
if (path.scope.getBinding(name)) {
|
|
58
57
|
return;
|
|
59
58
|
}
|
|
60
|
-
// A replacement cannot occupy a write target.
|
|
61
|
-
|
|
62
|
-
if (isWriteTarget(path) || isInsideWith(path)) {
|
|
59
|
+
// A replacement cannot occupy a write target.
|
|
60
|
+
if (isWriteTarget(path)) {
|
|
63
61
|
return;
|
|
64
62
|
}
|
|
65
63
|
const str = t.stringLiteral(state.generator.next());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"specials-to-strings.js","sourceRoot":"","sources":["../../src/transforms/specials-to-strings.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAA;AAEtC,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"specials-to-strings.js","sourceRoot":"","sources":["../../src/transforms/specials-to-strings.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,8 +40,7 @@ const visitor = {
|
|
|
40
40
|
};
|
|
41
41
|
function transformSwitch(path) {
|
|
42
42
|
const node = path.node;
|
|
43
|
-
// Separate `if` blocks cannot preserve cross-case lexical scope
|
|
44
|
-
// function hoisting.
|
|
43
|
+
// Separate `if` blocks cannot preserve cross-case lexical scope.
|
|
45
44
|
if (hasBlockScopedDeclaration(node)) {
|
|
46
45
|
return false;
|
|
47
46
|
}
|
|
@@ -49,7 +48,7 @@ function transformSwitch(path) {
|
|
|
49
48
|
lowerToIfElseChain(path);
|
|
50
49
|
return true;
|
|
51
50
|
}
|
|
52
|
-
if (!labeledLoweringIsSafe(node, path.scope
|
|
51
|
+
if (!labeledLoweringIsSafe(node, path.scope)) {
|
|
53
52
|
return false;
|
|
54
53
|
}
|
|
55
54
|
lowerToLabeledBlock(path);
|
|
@@ -60,30 +59,21 @@ function hasBlockScopedDeclaration(node) {
|
|
|
60
59
|
for (const stmt of caseClause.consequent) {
|
|
61
60
|
if ((t.isVariableDeclaration(stmt) && stmt.kind !== 'var') ||
|
|
62
61
|
t.isClassDeclaration(stmt) ||
|
|
63
|
-
t.isFunctionDeclaration(stmt)
|
|
64
|
-
isLabeledFunctionDeclaration(stmt)) {
|
|
62
|
+
t.isFunctionDeclaration(stmt)) {
|
|
65
63
|
return true;
|
|
66
64
|
}
|
|
67
65
|
}
|
|
68
66
|
}
|
|
69
67
|
return false;
|
|
70
68
|
}
|
|
71
|
-
// Babel hides an Annex B.3.4 labeled function under LabeledStatement wrappers.
|
|
72
|
-
function isLabeledFunctionDeclaration(stmt) {
|
|
73
|
-
let current = stmt;
|
|
74
|
-
while (t.isLabeledStatement(current)) {
|
|
75
|
-
current = current.body;
|
|
76
|
-
}
|
|
77
|
-
return t.isFunctionDeclaration(current);
|
|
78
|
-
}
|
|
79
69
|
// A non-final default needs match results from later cases. Precomputing that
|
|
80
70
|
// result rereads tests, so every test must be pure in this shape.
|
|
81
|
-
function labeledLoweringIsSafe(node, scope
|
|
71
|
+
function labeledLoweringIsSafe(node, scope) {
|
|
82
72
|
const defaultIndex = node.cases.findIndex((caseClause) => caseClause.test === null);
|
|
83
73
|
if (defaultIndex === -1 || defaultIndex === node.cases.length - 1) {
|
|
84
74
|
return true;
|
|
85
75
|
}
|
|
86
|
-
return node.cases.every((caseClause) => caseClause.test == null || isPure(caseClause.test, scope
|
|
76
|
+
return node.cases.every((caseClause) => caseClause.test == null || isPure(caseClause.test, scope));
|
|
87
77
|
}
|
|
88
78
|
function canLowerToIfElseChain(node) {
|
|
89
79
|
for (let i = 0; i < node.cases.length; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switch-to-if.js","sourceRoot":"","sources":["../../src/transforms/switch-to-if.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAGjC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAE7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAE1D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,UAAU,CAAC,GAAS;IAClC,OAAO,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;AACzC,CAAC;AAED,MAAM,OAAO,GAAyB;IACpC,eAAe,CAAC,IAAI,EAAE,KAAK;QACzB,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,KAAK,CAAC,OAAO,GAAG,IAAI,CAAA;QACtB,CAAC;IACH,CAAC;CACF,CAAA;AAED,SAAS,eAAe,CAAC,IAAiC;IACxD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;IACtB,
|
|
1
|
+
{"version":3,"file":"switch-to-if.js","sourceRoot":"","sources":["../../src/transforms/switch-to-if.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ternary-to-if.d.ts","sourceRoot":"","sources":["../../src/transforms/ternary-to-if.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"ternary-to-if.d.ts","sourceRoot":"","sources":["../../src/transforms/ternary-to-if.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAOxC;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,IAAI,GAAG,OAAO,CAM9C"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import * as t from '@babel/types';
|
|
2
|
-
import { isInsideWith } from '../utils/ast.js';
|
|
3
2
|
import { traverseForChanges } from '../utils/change-tracking.js';
|
|
4
3
|
import { isConditionalGate, reorderableToStatement } from '../utils/evaluation-order.js';
|
|
5
4
|
import { isStandaloneDeclaration } from '../utils/paths.js';
|
|
@@ -29,7 +28,7 @@ export function ternaryToIf(ast) {
|
|
|
29
28
|
}
|
|
30
29
|
const preparationVisitor = {
|
|
31
30
|
ConditionalExpression(path, state) {
|
|
32
|
-
if (!isPathLive(path)
|
|
31
|
+
if (!isPathLive(path)) {
|
|
33
32
|
return;
|
|
34
33
|
}
|
|
35
34
|
const stmtPath = path.getStatementParent();
|
|
@@ -43,9 +42,8 @@ const preparationVisitor = {
|
|
|
43
42
|
};
|
|
44
43
|
const visitor = {
|
|
45
44
|
ConditionalExpression(path, state) {
|
|
46
|
-
// Statement replacement detaches queued siblings.
|
|
47
|
-
|
|
48
|
-
if (!isPathLive(path) || isInsideWith(path)) {
|
|
45
|
+
// Statement replacement detaches queued siblings.
|
|
46
|
+
if (!isPathLive(path)) {
|
|
49
47
|
return;
|
|
50
48
|
}
|
|
51
49
|
if (lowerConditional(path)) {
|
|
@@ -92,15 +90,13 @@ function lowerConditional(path) {
|
|
|
92
90
|
t.isIdentifier(parent.node.id) &&
|
|
93
91
|
parent.node.init === path.node &&
|
|
94
92
|
parent.parentPath?.isVariableDeclaration() &&
|
|
95
|
-
// Splitting lexical declarations would end TDZ early, and bare `const` is
|
|
96
|
-
// invalid. Keep their initializer behind a result temp.
|
|
97
|
-
parent.parentPath.node.kind === 'var' &&
|
|
98
93
|
parent.parentPath.node.declarations.length === 1 &&
|
|
99
94
|
isStandaloneDeclaration(parent.parentPath)) {
|
|
100
95
|
const declPath = parent.parentPath;
|
|
101
96
|
const target = parent.node.id;
|
|
97
|
+
const declarationKind = declPath.node.kind === 'const' ? 'let' : declPath.node.kind;
|
|
102
98
|
declPath.replaceWithMultiple([
|
|
103
|
-
t.variableDeclaration(
|
|
99
|
+
t.variableDeclaration(declarationKind, [t.variableDeclarator(t.cloneNode(target))]),
|
|
104
100
|
t.ifStatement(test, t.blockStatement(seqWithAssignment(consequent, target)), t.blockStatement(seqWithAssignment(alternate, target))),
|
|
105
101
|
]);
|
|
106
102
|
path.skip();
|