webfuscator 1.0.1 → 1.2.0

package/src/transforms/yodify-conditions.ts

@@ -2,9 +2,9 @@ import type { Visitor } from '@babel/traverse'
 import * as t from '@babel/types'
 import type { File } from '@babel/types'
 
-import { traverseForChanges } from 'src/utils/change-tracking'
-import type { ChangeState } from 'src/utils/change-tracking'
-import { isLiteralShaped } from 'src/utils/literal'
+import { traverseForChanges } from '../utils/change-tracking'
+import type { ChangeState } from '../utils/change-tracking'
+import { isLiteralShaped } from '../utils/literal'
 
 /**
  * Moves a safe literal-shaped right operand to the left of a comparison.
@@ -31,7 +31,7 @@ export function yodifyConditions(ast: File): boolean {
 
 const visitor: Visitor<ChangeState> = {
   BinaryExpression(path, state) {
-    const { node } = path
+    const node = path.node
     const op = node.operator
     if (!isComparisonOp(op)) {
       return
@@ -51,8 +51,8 @@ const visitor: Visitor<ChangeState> = {
       return
     }
 
-    const { left } = node
-    const { right } = node
+    const left = node.left
+    const right = node.right
     node.left = right
     node.right = left
     const flipped = RELATIONAL_FLIP[op]

package/src/utils/ast.ts

@@ -13,7 +13,8 @@ export function isInDirectivePrologue(path: NodePath): boolean {
   if (!inBody) {
     return false
   }
-  const { container, key: index } = path
+  const container = path.container
+  const index = path.key
   if (!Array.isArray(container) || typeof index !== 'number') {
     return false
   }
@@ -125,5 +126,11 @@ function ownScopeHasDirectEval(owner: t.Node): boolean {
 }
 
 export function isDirectEvalCall(node: t.Node): boolean {
-  return t.isCallExpression(node) && t.isIdentifier(node.callee) && node.callee.name === 'eval'
+  // `eval?.(...)` is an OptionalCallExpression yet still a direct eval, so both
+  // call node shapes count.
+  return (
+    (t.isCallExpression(node) || t.isOptionalCallExpression(node)) &&
+    t.isIdentifier(node.callee) &&
+    node.callee.name === 'eval'
+  )
 }

package/src/utils/evaluation-order.ts

@@ -1,7 +1,7 @@
 import type { NodePath } from '@babel/traverse'
 import * as t from '@babel/types'
 
-import { isPure } from 'src/analysis/purity'
+import { isPure } from '../analysis/purity'
 
 // Moving a gated node can change whether it runs.
 export function isConditionalGate(parent: NodePath, cur: NodePath): boolean {

package/src/utils/logical-lowering.ts

@@ -1,8 +1,8 @@
 import type { NodePath } from '@babel/traverse'
 import * as t from '@babel/types'
 
-import { isSideEffectFree } from 'src/analysis/purity'
-import { isStandaloneDeclaration } from 'src/utils/paths'
+import { isSideEffectFree } from '../analysis/purity'
+import { isStandaloneDeclaration } from './paths'
 
 // Lowers a short-circuit expression assigned to a bare identifier:
 //
@@ -15,7 +15,7 @@ export function lowerLogicalWriteStatement(
   path: NodePath<t.LogicalExpression>,
   fallbackTest: (target: t.Identifier) => t.Expression,
 ): boolean {
-  const { node } = path
+  const node = path.node
   const parent = path.parentPath
   if (!parent) {
     return false

package/src/utils/loop-lowering.ts

@@ -76,7 +76,7 @@ const redirectVisitor: Visitor<RedirectState> = {
     path.skip()
   },
   ContinueStatement(path, state) {
-    const { label } = path.node
+    const label = path.node.label
     if (!label) {
       if (!hasInterposedLoop(path, state.rootPath)) {
         path.replaceWith(t.breakStatement(t.identifier(state.innerLabel)))

package/src/utils/string-generator.ts

@@ -1,4 +1,4 @@
-import { shuffleInPlace } from 'src/utils/random'
+import { shuffleInPlace } from './random'
 
 /**
  * Identifier styles supported by `StringGenerator`. An array chooses a style