webfuscator 1.2.1 → 1.3.1

package/dist/utils/logical-lowering.js

@@ -6,7 +6,7 @@ import { isStandaloneDeclaration } from './paths.js';
 //   x = L;
 //   if (<fallbackTest(x)>) x = R;
 //
-// `fallbackTest` selects `!x`, `x`, or `x == null`. The parent must accept a
+// `fallbackTest` selects the short-circuit condition. The parent must accept a
 // multi-statement replacement.
 export function lowerLogicalWriteStatement(path, fallbackTest) {
     const node = path.node;
@@ -19,20 +19,19 @@ export function lowerLogicalWriteStatement(path, fallbackTest) {
         t.isIdentifier(parent.node.id)) {
         const declStmt = parent.parentPath;
         if (!declStmt?.isVariableDeclaration() ||
-            // The split would emit illegal `const x;` and then write it.
-            declStmt.node.kind === 'const' ||
             declStmt.node.declarations.length !== 1 ||
             !isStandaloneDeclaration(declStmt)) {
             return false;
         }
         const target = parent.node.id;
-        // The split writes `x` before evaluating the right side. Refuse any right
-        // side that could observe the new value or the ended TDZ.
-        if (rightCanObserveTarget(node.right, target.name)) {
+        // A `var` initializer can observe its previous value while evaluating the
+        // right side. Reads before lexical initialization are intentionally ignored.
+        if (declStmt.node.kind === 'var' && rightCanObserveTarget(node.right, target.name)) {
             return false;
         }
+        const declarationKind = declStmt.node.kind === 'const' ? 'let' : declStmt.node.kind;
         declStmt.replaceWithMultiple([
-            t.variableDeclaration(declStmt.node.kind, [
+            t.variableDeclaration(declarationKind, [
                 t.variableDeclarator(t.cloneNode(target), node.left),
             ]),
             guardedReassignment(target, fallbackTest, node.right),
@@ -54,8 +53,7 @@ export function lowerLogicalWriteStatement(path, fallbackTest) {
             return false;
         }
         // Writing first would change `x = 0 || x` before the right side reads `x`.
-        if (!isSideEffectFree(node.right, path.scope, path) ||
-            referencesName(node.right, target.name)) {
+        if (!isSideEffectFree(node.right, path.scope) || referencesName(node.right, target.name)) {
             return false;
         }
         exprStmt.replaceWithMultiple([

package/dist/utils/logical-lowering.js.map

@@ -1 +1 @@
-{"version":3,"file":"logical-lowering.js","sourceRoot":"","sources":["../../src/utils/logical-lowering.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logical-lowering.js","sourceRoot":"","sources":["../../src/utils/logical-lowering.ts"],"names":[],"mappings":"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"}

package/dist/utils/nullish.d.ts

@@ -0,0 +1,4 @@
+import * as t from '@babel/types';
+export declare function buildNullishCheck(firstRead: t.Expression, secondRead: t.Expression): t.ConditionalExpression;
+export declare function buildNonNullishCheck(firstRead: t.Expression, secondRead: t.Expression): t.ConditionalExpression;
+//# sourceMappingURL=nullish.d.ts.map

package/dist/utils/nullish.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nullish.d.ts","sourceRoot":"","sources":["../../src/utils/nullish.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAEjC,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,CAAC,CAAC,UAAU,EACvB,UAAU,EAAE,CAAC,CAAC,UAAU,GACvB,CAAC,CAAC,qBAAqB,CAMzB;AAED,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,CAAC,CAAC,UAAU,EACvB,UAAU,EAAE,CAAC,CAAC,UAAU,GACvB,CAAC,CAAC,qBAAqB,CAMzB"}

package/dist/utils/nullish.js

@@ -0,0 +1,8 @@
+import * as t from '@babel/types';
+export function buildNullishCheck(firstRead, secondRead) {
+    return t.conditionalExpression(t.binaryExpression('===', firstRead, t.nullLiteral()), t.booleanLiteral(true), t.binaryExpression('===', secondRead, t.unaryExpression('void', t.numericLiteral(0))));
+}
+export function buildNonNullishCheck(firstRead, secondRead) {
+    return t.conditionalExpression(t.binaryExpression('!==', firstRead, t.nullLiteral()), t.binaryExpression('!==', secondRead, t.unaryExpression('void', t.numericLiteral(0))), t.booleanLiteral(false));
+}
+//# sourceMappingURL=nullish.js.map

package/dist/utils/nullish.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nullish.js","sourceRoot":"","sources":["../../src/utils/nullish.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAEjC,MAAM,UAAU,iBAAiB,CAC/B,SAAuB,EACvB,UAAwB;IAExB,OAAO,CAAC,CAAC,qBAAqB,CAC5B,CAAC,CAAC,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,EACrD,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,EACtB,CAAC,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CACtF,CAAA;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,SAAuB,EACvB,UAAwB;IAExB,OAAO,CAAC,CAAC,qBAAqB,CAC5B,CAAC,CAAC,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,EACrD,CAAC,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,EACrF,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CACxB,CAAA;AACH,CAAC"}

package/dist/utils/paths.d.ts

@@ -4,6 +4,4 @@ export declare function isStandaloneDeclaration(declPath: NodePath<t.VariableDec
 export declare function referencesOrWritesVariable(path: NodePath<t.Identifier>): boolean;
 export declare function isCalleeOrTagOf(path: NodePath): boolean;
 export declare function isInStrictContext(path: NodePath): boolean;
-export declare function hasAnnexBFunctionAlias(path: NodePath): boolean;
-export declare function hasConstantViolation(path: NodePath<t.VariableDeclaration>): boolean;
 //# sourceMappingURL=paths.d.ts.map

package/dist/utils/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAGjC,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAe1F;AAID,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,OAAO,CAQhF;AAGD,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAYvD;AAGD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAiBzD;AAQD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAiB9D;AAGD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAQnF"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,CAAC,MAAM,cAAc,CAAA;AAGjC,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAe1F;AAID,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,OAAO,CAQhF;AAGD,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAYvD;AAGD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAiBzD"}

package/dist/utils/paths.js

@@ -59,32 +59,4 @@ export function isInStrictContext(path) {
 function hasUseStrictDirective(directives) {
     return directives.some((directive) => directive.value.value === 'use strict');
 }
-// ECMA-262 B.3.3 gives sloppy block-level functions a `var` alias that Babel
-// omits from the enclosing scope. Renaming, moving, or removing one can expose it.
-export function hasAnnexBFunctionAlias(path) {
-    if (!path.isFunctionDeclaration()) {
-        return false;
-    }
-    const parent = path.parentPath;
-    if (!parent || parent.isProgram()) {
-        return false;
-    }
-    if (parent.isBlockStatement() &&
-        parent.key === 'body' &&
-        parent.parentPath != null &&
-        parent.parentPath.isFunction()) {
-        return false;
-    }
-    return !isInStrictContext(parent);
-}
-// A later write to `const` must keep throwing after transformation.
-export function hasConstantViolation(path) {
-    for (const name of Object.keys(path.getBindingIdentifiers())) {
-        const binding = path.scope.getBinding(name);
-        if (binding && binding.constantViolations.length > 0) {
-            return true;
-        }
-    }
-    return false;
-}
 //# sourceMappingURL=paths.js.map

package/dist/utils/paths.js.map

@@ -1 +1 @@
-{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"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"}

package/dist/utils/statement-lists.d.ts

@@ -0,0 +1,9 @@
+import type { NodePath } from '@babel/traverse';
+import type * as t from '@babel/types';
+import type { File } from '@babel/types';
+export type StatementListContainer = t.Program | t.BlockStatement | t.StaticBlock | t.SwitchCase;
+type Rewrite = (statements: NodePath<t.Statement>[], container: NodePath<StatementListContainer>) => t.Statement[] | null;
+/** Applies a rewrite to every statement-list container in the AST. */
+export declare function rewriteStatementLists(ast: File, rewrite: Rewrite): boolean;
+export {};
+//# sourceMappingURL=statement-lists.d.ts.map

package/dist/utils/statement-lists.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"statement-lists.d.ts","sourceRoot":"","sources":["../../src/utils/statement-lists.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,KAAK,CAAC,MAAM,cAAc,CAAA;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAKxC,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,UAAU,CAAA;AAEhG,KAAK,OAAO,GAAG,CACb,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,EACnC,SAAS,EAAE,QAAQ,CAAC,sBAAsB,CAAC,KACxC,CAAC,CAAC,SAAS,EAAE,GAAG,IAAI,CAAA;AAEzB,sEAAsE;AACtE,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAe1E"}

package/dist/utils/statement-lists.js

@@ -0,0 +1,27 @@
+import { traverseForChanges } from './change-tracking.js';
+/** Applies a rewrite to every statement-list container in the AST. */
+export function rewriteStatementLists(ast, rewrite) {
+    return traverseForChanges(ast, {
+        Program(path, state) {
+            apply(path, 'body', rewrite, state);
+        },
+        BlockStatement(path, state) {
+            apply(path, 'body', rewrite, state);
+        },
+        StaticBlock(path, state) {
+            apply(path, 'body', rewrite, state);
+        },
+        SwitchCase(path, state) {
+            apply(path, 'consequent', rewrite, state);
+        },
+    });
+}
+function apply(container, key, rewrite, state) {
+    const statements = container.get(key);
+    const replacement = rewrite(statements, container);
+    if (replacement) {
+        container.set(key, replacement);
+        state.changed = true;
+    }
+}
+//# sourceMappingURL=statement-lists.js.map

package/dist/utils/statement-lists.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"statement-lists.js","sourceRoot":"","sources":["../../src/utils/statement-lists.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAUtD,sEAAsE;AACtE,MAAM,UAAU,qBAAqB,CAAC,GAAS,EAAE,OAAgB;IAC/D,OAAO,kBAAkB,CAAC,GAAG,EAAE;QAC7B,OAAO,CAAC,IAAI,EAAE,KAAK;YACjB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QACrC,CAAC;QACD,cAAc,CAAC,IAAI,EAAE,KAAK;YACxB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QACrC,CAAC;QACD,WAAW,CAAC,IAAI,EAAE,KAAK;YACrB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QACrC,CAAC;QACD,UAAU,CAAC,IAAI,EAAE,KAAK;YACpB,KAAK,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QAC3C,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,KAAK,CACZ,SAA2C,EAC3C,GAA0B,EAC1B,OAAgB,EAChB,KAAkB;IAElB,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAA4B,CAAA;IAChE,MAAM,WAAW,GAAG,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;IAClD,IAAI,WAAW,EAAE,CAAC;QAChB,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QAC/B,KAAK,CAAC,OAAO,GAAG,IAAI,CAAA;IACtB,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webfuscator",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "JavaScript obfuscator built on Babel",
   "keywords": [
     "babel",
@@ -24,6 +24,8 @@
   },
   "files": [
     "DISCLOSURE",
+    "LICENSE",
+    "README.md",
     "dist",
     "src"
   ],
@@ -43,8 +45,10 @@
   },
   "scripts": {
     "prepublishOnly": "pnpm --workspace-root check",
-    "prepack": "pnpm run build",
+    "prepack": "pnpm run package-files:check && pnpm run build",
     "build": "node --eval \"require('node:fs').rmSync('dist', { force: true, recursive: true })\" && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && node scripts/verify-dist.mjs",
+    "package-files:check": "node scripts/sync-package-files.mjs --check",
+    "package-files:sync": "node scripts/sync-package-files.mjs",
     "test": "vitest run",
     "test:watch": "vitest",
     "typecheck": "tsc --noEmit"

package/src/analysis/constant.ts

@@ -1,12 +1,7 @@
 import type { Binding, NodePath, Scope } from '@babel/traverse'
 import * as t from '@babel/types'
 
-import { enclosingScopeHasDirectEval, isInsideWith } from '../utils/ast'
-import {
-  declarationReaches,
-  initializerReaches,
-  readCrossesFunctionBoundary,
-} from './document-order'
+import { initializerReaches, readCrossesFunctionBoundary } from './document-order'
 import { isSideEffectFree } from './purity'
 
 export type Evaluation = { known: true; value: unknown } | { known: false }
@@ -24,7 +19,7 @@ export function isOpaque(value: unknown): boolean {
 interface Env {
   scope: Scope | undefined
   seen: Set<Binding>
-  // Use the binding path while recursing so later declarations still hit TDZ.
+  // Only `var` reads need proof that their initializer ran.
   referencePath: NodePath | undefined
 }
 
@@ -74,9 +69,7 @@ function run(node: t.Node, env: Env): Evaluation {
 function evaluateUnary(node: t.Node, env: Env): Evaluation {
   const unary = node as t.UnaryExpression
   if (unary.operator === 'void') {
-    return isSideEffectFree(unary.argument, env.scope, env.referencePath)
-      ? { known: true, value: undefined }
-      : UNKNOWN
+    return isSideEffectFree(unary.argument, env.scope) ? { known: true, value: undefined } : UNKNOWN
   }
   if (unary.operator === 'delete' || unary.operator === 'throw') {
     return UNKNOWN
@@ -141,13 +134,6 @@ function evaluateIdentifier(node: t.Node, env: Env): Evaluation {
     return UNKNOWN
   }
 
-  // `with` and direct `eval` can redirect names outside Babel's scope table.
-  if (
-    env.referencePath &&
-    (isInsideWith(env.referencePath) || enclosingScopeHasDirectEval(env.referencePath))
-  ) {
-    return UNKNOWN
-  }
   const binding = env.scope.getBinding(identifier.name)
 
   // Only an unbound `undefined` names the immutable global property.
@@ -163,16 +149,7 @@ function evaluateIdentifier(node: t.Node, env: Env): Evaluation {
     return binding.constant ? { known: true, value: OPAQUE_TRUTHY } : UNKNOWN
   }
   if (t.isClassDeclaration(binding.path.node)) {
-    if (!binding.constant) {
-      return UNKNOWN
-    }
-    // A nested function can read the class before its declaration runs.
-    if (readCrossesFunctionBoundary(binding, env.referencePath)) {
-      return UNKNOWN
-    }
-    return declarationReaches(binding.path, env.referencePath)
-      ? { known: true, value: OPAQUE_TRUTHY }
-      : UNKNOWN
+    return binding.constant ? { known: true, value: OPAQUE_TRUTHY } : UNKNOWN
   }
 
   if (binding.kind === 'var' || binding.kind === 'let' || binding.kind === 'const') {
@@ -183,16 +160,18 @@ function evaluateIdentifier(node: t.Node, env: Env): Evaluation {
     if (!t.isIdentifier(declarator.id) || declarator.id.name !== identifier.name) {
       return UNKNOWN
     }
-    // A nested function can read the binding before its initializer runs.
-    if (readCrossesFunctionBoundary(binding, env.referencePath)) {
-      return UNKNOWN
-    }
-    // A preceding `var` initializer may still sit on an untaken branch.
-    if (!initializerReaches(binding.path, env.referencePath)) {
+    // A nested function can run before a `var` initializer, and a conditional
+    // initializer may not run at all.
+    if (
+      binding.kind === 'var' &&
+      (readCrossesFunctionBoundary(binding, env.referencePath) ||
+        !initializerReaches(binding.path, env.referencePath))
+    ) {
       return UNKNOWN
     }
     // Babel counts a looped `var` initializer as its own constant violation.
     if (
+      binding.kind !== 'const' &&
       !binding.constant &&
       !(
         binding.constantViolations.length === 1 &&

package/src/analysis/inlineability.ts

@@ -3,7 +3,7 @@ import type { Binding, NodePath, Visitor } from '@babel/traverse'
 import * as t from '@babel/types'
 import type { File } from '@babel/types'
 
-import { hasAnnexBFunctionAlias, referencesOrWritesVariable } from '../utils/paths'
+import { referencesOrWritesVariable } from '../utils/paths'
 
 export interface InlineCandidate {
   name: string
@@ -30,10 +30,6 @@ export function analyzeInlineability(ast: File): Map<string, InlineCandidate> {
       if (!path.node.id) {
         return
       }
-      // Babel misses the sloppy Annex B `var` alias of a block-level function.
-      if (hasAnnexBFunctionAlias(path)) {
-        return
-      }
       const binding = path.scope.getBinding(path.node.id.name)
       if (!binding) {
         return
@@ -131,9 +127,9 @@ function checkCandidate(
   if (!t.isBlockStatement(fnNode.body)) {
     return null
   }
-  // Writes live in `constantViolations`, not `referencePaths`. Any write can
-  // make a call resolve to a different function.
-  if (binding.constantViolations.length > 0) {
+  // Writes to mutable bindings live in `constantViolations`, not
+  // `referencePaths`, and can make a call resolve to a different function.
+  if (binding.kind !== 'const' && binding.constantViolations.length > 0) {
     return null
   }
   // Splicing loses a named function expression's inner binding.
@@ -273,13 +269,9 @@ const analyzeBodyVisitor: Visitor<AnalyzeBodyState> = {
       path.stop()
     }
   },
-  WithStatement(path, state) {
-    state.unsafe = true
-    path.stop()
-  },
   Identifier(path, state) {
     const name = path.node.name
-    if (state.innerFnDepth === 0 && (name === 'arguments' || name === 'eval')) {
+    if (state.innerFnDepth === 0 && name === 'arguments') {
       state.unsafe = true
       path.stop()
       return

package/src/analysis/purity.ts

@@ -1,18 +1,11 @@
-import type { Binding, NodePath, Scope } from '@babel/traverse'
+import type { Scope } from '@babel/traverse'
 import * as t from '@babel/types'
 
-import { isInsideWith } from '../utils/ast'
 import { isPrimitiveLiteral } from '../utils/literal'
-import {
-  declarationReaches,
-  initializerReaches,
-  readCrossesFunctionBoundary,
-} from './document-order'
 
 // Purity also requires deterministic repetition and no throw. Identifier reads
-// need scope and reference paths to prove resolution, initialization, and the
-// absence of `with` interception.
-export function isPure(node: t.Node, scope?: Scope, referencePath?: NodePath): boolean {
+// need scope to prove resolution.
+export function isPure(node: t.Node, scope?: Scope): boolean {
   if (
     t.isNumericLiteral(node) ||
     t.isStringLiteral(node) ||
@@ -25,7 +18,7 @@ export function isPure(node: t.Node, scope?: Scope, referencePath?: NodePath): b
     return true
   }
   if (t.isIdentifier(node)) {
-    return identifierReadIsSafe(node, scope, referencePath)
+    return identifierReadIsSafe(node, scope)
   }
   if (t.isTemplateLiteral(node)) {
     // ToString can call object code or throw on Symbol.
@@ -39,7 +32,7 @@ export function isPure(node: t.Node, scope?: Scope, referencePath?: NodePath): b
   if (t.isUnaryExpression(node)) {
     // Numeric unary operators invoke ToPrimitive. `delete` and `throw` act.
     if (node.operator === '!' || node.operator === 'typeof' || node.operator === 'void') {
-      return isPure(node.argument, scope, referencePath)
+      return isPure(node.argument, scope)
     }
     return false
   }
@@ -47,7 +40,7 @@ export function isPure(node: t.Node, scope?: Scope, referencePath?: NodePath): b
     if (!t.isExpression(node.left)) {
       return false
     }
-    if (!isPure(node.left, scope, referencePath) || !isPure(node.right, scope, referencePath)) {
+    if (!isPure(node.left, scope) || !isPure(node.right, scope)) {
       return false
     }
     // Only strict equality avoids coercion. Other operators need safe literals.
@@ -57,18 +50,16 @@ export function isPure(node: t.Node, scope?: Scope, referencePath?: NodePath): b
     return coercesWithoutEffect(node.left, node.right, node.operator)
   }
   if (t.isLogicalExpression(node)) {
-    return isPure(node.left, scope, referencePath) && isPure(node.right, scope, referencePath)
+    return isPure(node.left, scope) && isPure(node.right, scope)
   }
   if (t.isConditionalExpression(node)) {
     return (
-      isPure(node.test, scope, referencePath) &&
-      isPure(node.consequent, scope, referencePath) &&
-      isPure(node.alternate, scope, referencePath)
+      isPure(node.test, scope) && isPure(node.consequent, scope) && isPure(node.alternate, scope)
     )
   }
   if (t.isSequenceExpression(node)) {
     for (const expr of node.expressions) {
-      if (!isPure(expr, scope, referencePath)) {
+      if (!isPure(expr, scope)) {
         return false
       }
     }
@@ -77,8 +68,9 @@ export function isPure(node: t.Node, scope?: Scope, referencePath?: NodePath): b
   return false
 }
 
-// A droppable identifier read must resolve after binding initialization.
-export function isSideEffectFree(node: t.Node, scope?: Scope, referencePath?: NodePath): boolean {
+// A droppable identifier read must resolve to a local binding or immutable
+// global `undefined`.
+export function isSideEffectFree(node: t.Node, scope?: Scope): boolean {
   if (
     t.isNumericLiteral(node) ||
     t.isStringLiteral(node) ||
@@ -99,7 +91,7 @@ export function isSideEffectFree(node: t.Node, scope?: Scope, referencePath?: No
     return true
   }
   if (t.isIdentifier(node)) {
-    return identifierReadIsSafe(node, scope, referencePath)
+    return identifierReadIsSafe(node, scope)
   }
   if (t.isFunctionExpression(node) || t.isArrowFunctionExpression(node)) {
     return true
@@ -107,7 +99,7 @@ export function isSideEffectFree(node: t.Node, scope?: Scope, referencePath?: No
   if (t.isClassExpression(node)) {
     // `extends` and computed keys run during class definition.
     if (node.superClass) {
-      if (!isSideEffectFree(node.superClass, scope, referencePath)) {
+      if (!isSideEffectFree(node.superClass, scope)) {
         return false
       }
       // ClassDefinitionEvaluation accepts only `null` or a constructor.
@@ -127,7 +119,7 @@ export function isSideEffectFree(node: t.Node, scope?: Scope, referencePath?: No
         'computed' in member &&
         member.computed &&
         'key' in member &&
-        !isSideEffectFree(member.key, scope, referencePath)
+        !isSideEffectFree(member.key, scope)
       ) {
         return false
       }
@@ -142,7 +134,7 @@ export function isSideEffectFree(node: t.Node, scope?: Scope, referencePath?: No
       if (t.isSpreadElement(element)) {
         return false
       }
-      if (!isSideEffectFree(element, scope, referencePath)) {
+      if (!isSideEffectFree(element, scope)) {
         return false
       }
     }
@@ -154,7 +146,7 @@ export function isSideEffectFree(node: t.Node, scope?: Scope, referencePath?: No
         return false
       }
       if (t.isObjectMethod(prop)) {
-        if (prop.computed && !isSideEffectFree(prop.key, scope, referencePath)) {
+        if (prop.computed && !isSideEffectFree(prop.key, scope)) {
           return false
         }
         continue
@@ -162,13 +154,13 @@ export function isSideEffectFree(node: t.Node, scope?: Scope, referencePath?: No
       if (!t.isObjectProperty(prop)) {
         return false
       }
-      if (prop.computed && !isSideEffectFree(prop.key, scope, referencePath)) {
+      if (prop.computed && !isSideEffectFree(prop.key, scope)) {
         return false
       }
       if (!t.isExpression(prop.value)) {
         return false
       }
-      if (!isSideEffectFree(prop.value, scope, referencePath)) {
+      if (!isSideEffectFree(prop.value, scope)) {
         return false
       }
     }
@@ -179,7 +171,7 @@ export function isSideEffectFree(node: t.Node, scope?: Scope, referencePath?: No
       return false
     }
     if (node.operator === '!' || node.operator === 'typeof' || node.operator === 'void') {
-      return isSideEffectFree(node.argument, scope, referencePath)
+      return isSideEffectFree(node.argument, scope)
     }
     return false
   }
@@ -187,10 +179,7 @@ export function isSideEffectFree(node: t.Node, scope?: Scope, referencePath?: No
     if (!t.isExpression(node.left)) {
       return false
     }
-    if (
-      !isSideEffectFree(node.left, scope, referencePath) ||
-      !isSideEffectFree(node.right, scope, referencePath)
-    ) {
+    if (!isSideEffectFree(node.left, scope) || !isSideEffectFree(node.right, scope)) {
       return false
     }
     // Coercing operators need compatible literals that cannot throw.
@@ -200,21 +189,18 @@ export function isSideEffectFree(node: t.Node, scope?: Scope, referencePath?: No
     return coercesWithoutEffect(node.left, node.right, node.operator)
   }
   if (t.isLogicalExpression(node)) {
-    return (
-      isSideEffectFree(node.left, scope, referencePath) &&
-      isSideEffectFree(node.right, scope, referencePath)
-    )
+    return isSideEffectFree(node.left, scope) && isSideEffectFree(node.right, scope)
   }
   if (t.isConditionalExpression(node)) {
     return (
-      isSideEffectFree(node.test, scope, referencePath) &&
-      isSideEffectFree(node.consequent, scope, referencePath) &&
-      isSideEffectFree(node.alternate, scope, referencePath)
+      isSideEffectFree(node.test, scope) &&
+      isSideEffectFree(node.consequent, scope) &&
+      isSideEffectFree(node.alternate, scope)
     )
   }
   if (t.isSequenceExpression(node)) {
     for (const expr of node.expressions) {
-      if (!isSideEffectFree(expr, scope, referencePath)) {
+      if (!isSideEffectFree(expr, scope)) {
         return false
       }
     }
@@ -223,43 +209,13 @@ export function isSideEffectFree(node: t.Node, scope?: Scope, referencePath?: No
   return false
 }
 
-// A safe read needs a resolved, initialized binding outside `with`. Unbound
-// `undefined` is safe because the global property is immutable.
-function identifierReadIsSafe(
-  node: t.Identifier,
-  scope: Scope | undefined,
-  referencePath: NodePath | undefined,
-): boolean {
-  // A `with` property can shadow any name, including `undefined`.
-  if (referencePath && isInsideWith(referencePath)) {
-    return false
-  }
+// Unbound `undefined` is safe because the global property is immutable.
+function identifierReadIsSafe(node: t.Identifier, scope: Scope | undefined): boolean {
   const isUndefinedName = node.name === 'undefined'
   if (!scope) {
     return isUndefinedName
   }
-  const binding = scope.getBinding(node.name)
-  if (!binding) {
-    return isUndefinedName
-  }
-  if (t.isFunctionDeclaration(binding.path.node) || binding.kind === 'module') {
-    return true
-  }
-  if (binding.kind === 'param') {
-    // Earlier parameter defaults can read later parameters in TDZ.
-    if (!referencePath || !readIsInOwnParamList(binding, referencePath)) {
-      return true
-    }
-    return declarationReaches(binding.path, referencePath)
-  }
-  // Lexical reads need an unconditionally reached declaration in the same call.
-  if (isLexicalBinding(binding)) {
-    if (referencePath && readCrossesFunctionBoundary(binding, referencePath)) {
-      return false
-    }
-    return initializerReaches(binding.path, referencePath)
-  }
-  return declarationReaches(binding.path, referencePath)
+  return scope.getBinding(node.name) !== undefined || isUndefinedName
 }
 
 // Only `null` and plain function expressions are known-valid superclass values.
@@ -294,22 +250,3 @@ function coercesWithoutEffect(left: t.Node, right: t.Node, operator: string): bo
   }
   return leftKind !== 'bigint' || !THROWING_BIGINT_OPERATORS.has(operator)
 }
-
-function isLexicalBinding(binding: Binding): boolean {
-  return (
-    binding.kind === 'let' || binding.kind === 'const' || t.isClassDeclaration(binding.path.node)
-  )
-}
-
-function readIsInOwnParamList(binding: Binding, referencePath: NodePath): boolean {
-  const owner = binding.scope.block
-  let current: NodePath | null = referencePath
-  while (current) {
-    const parent: NodePath | null = current.parentPath
-    if (parent && parent.node === owner && current.listKey === 'params') {
-      return true
-    }
-    current = parent
-  }
-  return false
-}

package/src/index.ts

@@ -1,5 +1,6 @@
 export { obfuscate } from './obfuscator'
 export type {
+  ConcealStringsOptions,
   ManglePropertiesOptions,
   ObfuscatorOptions,
   PackOptions,