js-confuser 1.2.2 → 1.4.2

package/dist/traverse.js

@@ -3,24 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getBlocks = getBlocks;
 exports.getBlock = getBlock;
 exports.isBlock = isBlock;
-exports.getDepth = getDepth;
 exports.walk = walk;
 exports.default = traverse;
 
 var _identifiers = require("./util/identifiers");
 
-/**
- * Returns all the scopes given parents array.
- * - `[object, ...parents]` is recommended.
- *
- * @param parents
- */
-function getBlocks(parents) {
-  return parents.filter(x => isBlock(x));
-}
 /**
  * A block refers to any object that has a **`.body`** property where code is nested.
  *
@@ -29,8 +18,6 @@ function getBlocks(parents) {
  * @param object
  * @param parents
  */
-
-
 function getBlock(object, parents) {
   if (!Array.isArray(parents)) {
     throw new Error("parents must be an array");
@@ -51,27 +38,6 @@ function getBlock(object, parents) {
 function isBlock(object) {
   return object && (object.type == "BlockStatement" || object.type == "Program");
 }
-/**
- * Returns a numerical representation of the depth.
- * - Depth is how many blocks nested.
- * - Program = 1 depth
- * -    First Fn = 2 depth
- * -        Nested Fn = 3 depth
- * -    Second Fn = 2 depth
- * -        etc...
- * @param object
- * @param parents
- */
-
-
-function getDepth(object, parents) {
-  if (!Array.isArray(parents)) {
-    throw new Error("parents should be an array");
-  }
-
-  var scopes = getBlocks([object, ...parents].filter(x => x));
-  return scopes.length;
-}
 
 function walk(object, parents, onEnter, seen = new Set()) {
   if (typeof object === "object" && object) {

package/dist/util/gen.js

@@ -136,6 +136,8 @@ function ThisExpression() {
 }
 
 function SwitchCase(test, consequent) {
+  (0, _assert.ok)(test === null || test);
+  (0, _assert.ok)(Array.isArray(consequent));
   return {
     type: "SwitchCase",
     test,
@@ -471,7 +473,7 @@ function AssignmentPattern(left, right) {
   (0, _assert.ok)(left);
   (0, _assert.ok)(right);
   return {
-    type: "AssignmentExpression",
+    type: "AssignmentPattern",
     left: left,
     right: right
   };

package/dist/util/identifiers.js

@@ -4,8 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.validateChain = validateChain;
-exports.isWithinClass = isWithinClass;
-exports.isWithin = isWithin;
 exports.getIdentifierInfo = getIdentifierInfo;
 exports.getDefiningIdentifier = getDefiningIdentifier;
 exports.isFunctionParameter = isFunctionParameter;
@@ -44,14 +42,6 @@ function validateChain(object, parents) {
     }
   }
 }
-
-function isWithinClass(object, parents) {
-  return isWithin(object, parents, "ClassDeclaration") || isWithin(object, parents, "ClassExpression");
-}
-
-function isWithin(object, parents, type) {
-  return [object, ...parents].some(x => x.type == type);
-}
 /**
  * Returns detailed information about the given Identifier node.
  * @param object
@@ -99,8 +89,9 @@ function getIdentifierInfo(object, parents) {
   var isImportSpecifier = (parent.type == "ImportDefaultSpecifier" || parent.type == "ImportSpecifier") && parent.local == object;
   var isFunctionCall = parent.callee == object; // NewExpression and CallExpression
 
-  var isAssignmentLeft = parent.type == "AssignmentExpression" && parent.left == object;
-  var isAssignmentValue = parent.type == "AssignmentExpression" && parent.right == object;
+  var assignmentIndex = parents.findIndex(p => p.type === "AssignmentExpression");
+  var isAssignmentLeft = assignmentIndex !== -1 && parents[assignmentIndex].left === (parents[assignmentIndex - 1] || object);
+  var isAssignmentValue = assignmentIndex !== -1 && parents[assignmentIndex].right === (parents[assignmentIndex - 1] || object);
   var isUpdateExpression = parent.type == "UpdateExpression";
   var isClassDeclaration = (parent.type == "ClassDeclaration" || parent.type == "ClassExpression") && parent.id == object;
   var isMethodDefinition = parent.type == "MethodDefinition" && parent.key == object && !parent.computed;
@@ -300,7 +291,7 @@ function getDefiningIdentifier(object, parents) {
   }
 }
 
-function isFunctionParameter(o, p) {
+function isFunctionParameter(o, p, c) {
   (0, _assert.ok)(o);
   (0, _assert.ok)(p);
   validateChain(o, p);
@@ -315,7 +306,7 @@ function isFunctionParameter(o, p) {
     return false;
   }
 
-  var c = (0, _insert.getVarContext)(o, p);
+  c = c || (0, _insert.getVarContext)(o, p);
 
   if (c === object) {
     var pIndex = p.indexOf(object.params);
@@ -327,8 +318,7 @@ function isFunctionParameter(o, p) {
     var param = p[pIndex - 1] || o;
     var paramIndex = object.params.indexOf(param);
     (0, _assert.ok)(paramIndex !== -1);
-    var sliced = p.slice(p.indexOf(paramIndex));
-    (0, _assert.ok)(!sliced.includes(o));
+    var sliced = p.slice(0, pIndex);
     var isReferenced = true;
     var i = 0;
 
@@ -342,7 +332,7 @@ function isFunctionParameter(o, p) {
           break;
         }
 
-        if (node.type == "ObjectPattern" && node.key === down) {
+        if (node.type == "Property" && node.key === down && sliced[i + 2] && sliced[i + 2].type == "ObjectPattern") {
           isReferenced = false;
           break;
         }
@@ -365,7 +355,7 @@ function getFunctionParameters(object, parents) {
   var locations = [];
   (0, _traverse.walk)(object.params, [object, ...parents], (o, p) => {
     if (o.type == "Identifier") {
-      if (isFunctionParameter(o, p)) {
+      if (isFunctionParameter(o, p, object)) {
         locations.push([o, p]);
       }
     }

package/dist/util/insert.js

@@ -21,7 +21,6 @@ exports.prepend = prepend;
 exports.append = append;
 exports.clone = clone;
 exports.isForInitialize = isForInitialize;
-exports.isInBranch = isInBranch;
 
 var _assert = require("assert");
 
@@ -151,27 +150,15 @@ function getDefiningContext(o, p) {
   return getVarContext(o, p);
 }
 
-function getReferencingContexts(o, p) {
+function getReferencingContexts(o, p, info) {
   (0, _identifiers.validateChain)(o, p);
   (0, _assert.ok)(o.type == "Identifier");
-  var info = (0, _identifiers.getIdentifierInfo)(o, p);
-  (0, _assert.ok)(info.spec.isReferenced);
-  var assignmentPatternIndex = p.findIndex(x => x.type == "AssignmentPattern");
-
-  if (assignmentPatternIndex != -1) {
-    if (p[assignmentPatternIndex].right == (p[assignmentPatternIndex - 1] || o)) {
-      var sliced = p.slice(assignmentPatternIndex);
-      var fnIndex = sliced.findIndex(x => isFunction(x));
-      var associatedFn = sliced[fnIndex];
 
-      if (fnIndex !== -1 && sliced[fnIndex].params == (sliced[fnIndex - 1] || o)) {
-        if (associatedFn == getVarContext(o, p)) {
-          return isLexContext(associatedFn.body) ? [associatedFn, associatedFn.body] : [associatedFn];
-        }
-      }
-    }
+  if (!info) {
+    info = (0, _identifiers.getIdentifierInfo)(o, p);
   }
 
+  (0, _assert.ok)(info.spec.isReferenced);
   return [getVarContext(o, p), getLexContext(o, p)];
 }
 
@@ -339,25 +326,4 @@ function isForInitialize(o, p) {
   }
 
   return false;
-}
-
-function isInBranch(object, parents, context) {
-  (0, _assert.ok)(object);
-  (0, _assert.ok)(parents);
-  (0, _assert.ok)(context);
-  (0, _assert.ok)(parents.includes(context));
-  var definingContext = parents[0].type == "FunctionDeclaration" && parents[0].id == object ? getVarContext(parents[0], parents.slice(1)) : getVarContext(object, parents);
-  var contextIndex = parents.findIndex(x => x === context);
-  var slicedParents = parents.slice(0, contextIndex);
-  (0, _assert.ok)(!slicedParents.includes(object), "slicedParents includes object");
-  var slicedTypes = new Set(slicedParents.map(x => x.type));
-  var isBranch = definingContext !== context;
-
-  if (!isBranch) {
-    if (["IfStatement", "ForStatement", "ForInStatement", "ForOfStatement", "WhileStatement", "DoWhileStatement", "SwitchStatement", "ConditionalExpression", "LogicalExpression", "TryStatement", "ChainExpression", "BinaryExpression", "FunctionExpression", "FunctionDeclaration", "ArrowFunctionExpression", "ClassExpression", "ClassDeclaration"].find(x => slicedTypes.has(x))) {
-      isBranch = true;
-    }
-  }
-
-  return isBranch;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-confuser",
-  "version": "1.2.2",
+  "version": "1.4.2",
   "description": "JavaScript Obfuscation Tool.",
   "main": "dist/index.js",
   "types": "index.d.ts",
@@ -22,7 +22,7 @@
   "author": "MichaelXF",
   "license": "MIT",
   "dependencies": {
-    "acorn": "^8.4.0",
+    "acorn": "^8.5.0",
     "escodegen": "^2.0.0"
   },
   "devDependencies": {

package/src/options.ts

@@ -224,7 +224,7 @@ export interface ObfuscateOptions {
   /**
    * ### `stringConcealing`
    *
-   * [String Concealing](https://docs.jscrambler.com/code-integrity/documentation/transformations/string-concealing) involves encoding strings to conceal plain-text values. (`true/false`)
+   * [String Concealing](https://docs.jscrambler.com/code-integrity/documentation/transformations/string-concealing) involves encoding strings to conceal plain-text values. (`true/false/0-1`)
    *
    * `"console"` -> `decrypt('<~@rH7+Dert~>')`
    *
@@ -237,7 +237,7 @@ export interface ObfuscateOptions {
   /**
    * ### `stringEncoding`
    *
-   * [String Encoding](https://docs.jscrambler.com/code-integrity/documentation/transformations/string-encoding) transforms a string into an encoded representation. (`true/false`)
+   * [String Encoding](https://docs.jscrambler.com/code-integrity/documentation/transformations/string-encoding) transforms a string into an encoded representation. (`true/false/0-1`)
    *
    * `"console"` -> `'\x63\x6f\x6e\x73\x6f\x6c\x65'`
    *
@@ -252,7 +252,7 @@ export interface ObfuscateOptions {
   /**
    * ### `stringSplitting`
    *
-   * [String Splitting](https://docs.jscrambler.com/code-integrity/documentation/transformations/string-splitting) splits your strings into multiple expressions. (`true/false`)
+   * [String Splitting](https://docs.jscrambler.com/code-integrity/documentation/transformations/string-splitting) splits your strings into multiple expressions. (`true/false/0-1`)
    *
    * `"console"` -> `String.fromCharCode(99) + 'ons' + 'ole'`
    *

package/src/parser.ts

@@ -18,8 +18,7 @@ export default async function parseJS(code: string): Promise<{
     var parsed = parseSync(code);
     return parsed as any;
   } catch (e) {
-    console.error(e);
-    throw new Error("Failed to parse code.");
+    throw e;
   }
 }