js-confuser 1.7.2 → 1.7.3

package/dist/transforms/calculator.js

@@ -58,7 +58,7 @@ class Calculator extends _transform.default {
     });
     var func = (0, _gen.FunctionDeclaration)(this.calculatorFn, [leftArg, rightArg].map(x => (0, _gen.Identifier)(x)), [(0, _gen.SwitchStatement)((0, _gen.Identifier)(this.calculatorOpVar), switchCases)]);
     (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.calculatorOpVar)));
-    (0, _insert.prepend)(tree, (0, _template.default)(`function {name}(a){
+    (0, _insert.prepend)(tree, new _template.default(`function {name}(a){
         a = {b} + ({b}=a, 0);
         return a;
       }`).single({
@@ -91,7 +91,7 @@ class Calculator extends _transform.default {
       if (precedences.find(x => x >= myPrecedence)) {
         return;
       }
-      if (parents.find(x => x.$dispatcherSkip || x.type == "BinaryExpression")) {
+      if (parents.find(x => x.$multiTransformSkip || x.type == "BinaryExpression")) {
         return;
       }
     }

package/dist/transforms/controlFlowFlattening/controlFlowFlattening.js

@@ -17,6 +17,7 @@ var _transform = _interopRequireDefault(require("../transform"));
 var _expressionObfuscation = _interopRequireDefault(require("./expressionObfuscation"));
 var _constants = require("../../constants");
 var _compare = require("../../util/compare");
+var _guard = require("../../util/guard");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
@@ -850,7 +851,7 @@ class ControlFlowFlattening extends _transform.default {
         } else {
           var tempVar = this.getPlaceholder();
           newStatements.push((0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(tempVar, callExpression)));
-          const t = str => (0, _template.default)(str).single().expression;
+          const t = str => new _template.default(str).single().expression;
           newStatements.push((0, _gen.IfStatement)(t(`${tempVar} === "${breakFlag}"`), [(0, _gen.BreakStatement)(switchLabel)], [(0, _gen.IfStatement)(t(`typeof ${tempVar} == "object"`), [(0, _gen.ReturnStatement)(t(`${tempVar}["${returnFlag}"]`))])]));
         }
 
@@ -950,6 +951,11 @@ class ControlFlowFlattening extends _transform.default {
                 return;
               }
 
+              // Ignore __JS_CONFUSER_VAR__()
+              if ((0, _guard.isJSConfuserVar)(p)) {
+                return;
+              }
+
               // TYPEOF expression check
               if (p[0] && p[0].type === "UnaryExpression" && p[0].operator === "typeof" && p[0].argument === o) {
                 return;
@@ -1114,7 +1120,7 @@ class ControlFlowFlattening extends _transform.default {
         (0, _random.shuffle)(cases);
         (0, _random.shuffle)(controlProperties);
       }
-      var discriminant = (0, _template.default)(`${stateVars.join("+")}`).single().expression;
+      var discriminant = new _template.default(`${stateVars.join("+")}`).single().expression;
       objectBody.length = 0;
       // Perverse position of import declarations
       for (var importDeclaration of importDeclarations) {

package/dist/transforms/controlFlowFlattening/expressionObfuscation.js

@@ -25,7 +25,7 @@ class ExpressionObfuscation extends _transform.default {
   apply(tree) {
     super.apply(tree);
     if (typeof this.fnName === "string") {
-      (0, _insert.prepend)(tree, (0, _template.default)(`
+      (0, _insert.prepend)(tree, new _template.default(`
         function {fnName}(...args){
           return args[args["length"] - 1]
         }

package/dist/transforms/deadCode.js

@@ -16,7 +16,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-const templates = [(0, _template.default)(`
+const templates = [new _template.default(`
   function curCSS( elem, name, computed ) {
     var ret;
   
@@ -36,7 +36,7 @@ const templates = [(0, _template.default)(`
       // IE returns zIndex value as an integer.
       ret + "" :
       ret;
-  }`), (0, _template.default)(`
+  }`), new _template.default(`
   function Example() {
     var state = redacted.useState(false);
     return x(
@@ -47,7 +47,7 @@ const templates = [(0, _template.default)(`
         null,
       )
     );
-  }`), (0, _template.default)(`
+  }`), new _template.default(`
   const path = require('path');
 const { version } = require('../../package');
 const { version: dashboardPluginVersion } = require('@redacted/enterprise-plugin/package');
@@ -56,7 +56,7 @@ const { sdkVersion } = require('@redacted/enterprise-plugin');
 const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
 const resolveLocalRedactedPath = require('./resolve-local-redacted-path');
 
-const redactedPath = path.resolve(__dirname, '../redacted.js');`), (0, _template.default)(`
+const redactedPath = path.resolve(__dirname, '../redacted.js');`), new _template.default(`
 module.exports = async (resolveLocalRedactedPath = ()=>{throw new Error("No redacted path provided")}) => {
   const cliParams = new Set(process.argv.slice(2));
   if (!cliParams.has('--version')) {
@@ -71,13 +71,13 @@ module.exports = async (resolveLocalRedactedPath = ()=>{throw new Error("No reda
   })();
 
   return true;
-};`), (0, _template.default)(`
+};`), new _template.default(`
 function setCookie(cname, cvalue, exdays) {
   var d = new Date();
   d.setTime(d.getTime() + (exdays*24*60*60*1000));
   var expires = "expires="+ d.toUTCString();
   document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
-}`), (0, _template.default)(`function getCookie(cname) {
+}`), new _template.default(`function getCookie(cname) {
   var name = cname + "=";
   var decodedCookie = decodeURIComponent(document.cookie);
   var ca = decodedCookie.split(';');
@@ -91,7 +91,7 @@ function setCookie(cname, cvalue, exdays) {
     }
   }
   return "";
-}`), (0, _template.default)(`function getLocalStorageValue(key, cb){
+}`), new _template.default(`function getLocalStorageValue(key, cb){
     if ( typeof key !== "string" ) {
       throw new Error("Invalid data key provided (not type string)")
     }
@@ -106,14 +106,14 @@ function setCookie(cname, cvalue, exdays) {
     }
 
     cb(null, value)
-  }`), (0, _template.default)(`
+  }`), new _template.default(`
   
     var __ = "(c=ak(<~F$VU'9f)~><&85dBPL-module/from";
     var s = "q:function(){var ad=ad=>b(ad-29);if(!T.r[(typeof ab==ad(123)?";
     var g = "return U[c[c[d(-199)]-b(205)]]||V[ae(b(166))];case T.o[c[c[c[d(-199)]+d(-174)]-(c[b(119)]-(c[d(-199)]-163))]+ae(b(146))](0)==b(167)?d(-130):-d(-144)";
 
     __.match(s + g);
-  `), (0, _template.default)(`
+  `), new _template.default(`
   function vec_pack(vec) {
     return vec[1] * 67108864 + (vec[0] < 0 ? 33554432 | vec[0] : vec[0]);
   }
@@ -149,7 +149,7 @@ function setCookie(cname, cvalue, exdays) {
   console.log(vec_unpack(d)); // [2, 4]
   console.log(vec_unpack(e)); // [4, 8]
   console.log(vec_unpack(f)); // [2, 4]
-  `), (0, _template.default)(`
+  `), new _template.default(`
   function buildCharacterMap(str) {
     const characterMap = {};
   
@@ -209,7 +209,7 @@ function setCookie(cname, cvalue, exdays) {
     isBalanced,
     getHeightBalanced,
   };
-  `), (0, _template.default)(`
+  `), new _template.default(`
   function ListNode(){}
   var addTwoNumbers = function(l1, l2) {
     var carry = 0;
@@ -231,7 +231,7 @@ function setCookie(cname, cvalue, exdays) {
   };
 
   console.log(addTwoNumbers)
-  `), (0, _template.default)(`
+  `), new _template.default(`
   var threeSum = function(nums) {
     var len = nums.length;
     var res = [];
@@ -259,7 +259,7 @@ function setCookie(cname, cvalue, exdays) {
     return res;
   };
   console.log(threeSum)
-  `), (0, _template.default)(`
+  `), new _template.default(`
   var combinationSum2 = function(candidates, target) {
     var res = [];
     var len = candidates.length;
@@ -282,7 +282,7 @@ function setCookie(cname, cvalue, exdays) {
   };
 
   console.log(combinationSum2);
-  `), (0, _template.default)(`
+  `), new _template.default(`
   var isScramble = function(s1, s2) {
     return helper({}, s1, s2);
   };
@@ -322,7 +322,7 @@ function setCookie(cname, cvalue, exdays) {
   };
 
   console.log(isScramble);
-  `), (0, _template.default)(`
+  `), new _template.default(`
   var candy = function(ratings) {
     var len = ratings.length;
     var res = [];
@@ -338,7 +338,7 @@ function setCookie(cname, cvalue, exdays) {
   };
   
   console.log(candy)
-  `), (0, _template.default)(`
+  `), new _template.default(`
   var maxPoints = function(points) {
     var max = 0;
     var map = {};
@@ -368,7 +368,7 @@ function setCookie(cname, cvalue, exdays) {
   };
   
   console.log(maxPoints)
-  `), (0, _template.default)(`
+  `), new _template.default(`
   var maximumGap = function(nums) {
     var len = nums.length;
     if (len < 2) return 0;
@@ -401,7 +401,7 @@ function setCookie(cname, cvalue, exdays) {
   };
 
   console.log(maximumGap);
-  `), (0, _template.default)(`
+  `), new _template.default(`
   var LRUCache = function(capacity) {
     this.capacity = capacity;
     this.length = 0;
@@ -467,7 +467,7 @@ function setCookie(cname, cvalue, exdays) {
   };
 
   console.log(LRUCache);
-  `), (0, _template.default)(`
+  `), new _template.default(`
   var isInterleave = function(s1, s2, s3) {
     var dp = {};
     if (s3.length !== s1.length + s2.length) return false;
@@ -494,7 +494,7 @@ function setCookie(cname, cvalue, exdays) {
   };
 
   console.log(isInterleave);
-  `), (0, _template.default)(`
+  `), new _template.default(`
   var solveNQueens = function(n) {
     var res = [];
     if (n === 1 || n >= 4) dfs(res, [], n, 0);
@@ -549,10 +549,12 @@ class DeadCode extends _transform.default {
   constructor(o) {
     super(o, _order.ObfuscateOrder.DeadCode);
     _defineProperty(this, "made", void 0);
+    _defineProperty(this, "compareObjectName", void 0);
+    _defineProperty(this, "gen", this.getGenerator("randomized"));
     this.made = 0;
   }
   match(object, parents) {
-    return (0, _insert.isFunction)(object) && (0, _traverse.isBlock)(object.body) && !parents.find(x => x.$dispatcherSkip);
+    return (0, _insert.isFunction)(object) && (0, _traverse.isBlock)(object.body) && !object.$multiTransformSkip && !parents.find(x => x.$multiTransformSkip);
   }
   transform(object, parents) {
     if (!(0, _probability.ComputeProbabilityMap)(this.options.deadCode)) {
@@ -573,13 +575,21 @@ class DeadCode extends _transform.default {
         if (node.type === "ImportDeclaration" || node.directive) safeOffset++;else break;
       }
       var index = (0, _random.getRandomInteger)(safeOffset, body.length);
+      if (!this.compareObjectName) {
+        this.compareObjectName = this.getPlaceholder();
+        (0, _insert.prepend)(parents[parents.length - 1] || object, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.compareObjectName, new _template.default(`Object["create"](null)`).single().expression)));
+      }
       var name = this.getPlaceholder();
-      var variableDeclaration = (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(name, (0, _gen.Literal)(false)));
+      var variableDeclaration = (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(name, (0, _gen.BinaryExpression)("in", (0, _gen.Literal)(this.gen.generate()), (0, _gen.Identifier)(this.compareObjectName))));
       var template;
       do {
         template = (0, _random.choice)(templates);
-      } while (this.options.es5 && template.source.includes("async"));
-      var ifStatement = (0, _gen.IfStatement)((0, _gen.Identifier)(name), template.compile(), null);
+      } while (this.options.es5 && template.templates[0].includes("async"));
+      var nodes = template.compile();
+      if ((0, _random.chance)(50)) {
+        nodes.unshift((0, _gen.ExpressionStatement)((0, _gen.AssignmentExpression)("=", (0, _gen.MemberExpression)((0, _gen.Identifier)(this.compareObjectName), (0, _gen.Literal)(this.gen.generate()), true), (0, _gen.Literal)(this.gen.generate()))));
+      }
+      var ifStatement = (0, _gen.IfStatement)((0, _gen.Identifier)(name), nodes, null);
       body.splice(index, 0, ifStatement);
       (0, _insert.prepend)(object, variableDeclaration);
     };

package/dist/transforms/dispatcher.js

@@ -18,6 +18,7 @@ var _template = _interopRequireDefault(require("../templates/template"));
 var _functionLength = require("../templates/functionLength");
 var _globals = require("../templates/globals");
 var _scope = require("../util/scope");
+var _guard = require("../util/guard");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
@@ -68,7 +69,7 @@ class Dispatcher extends _transform.default {
     if ((0, _compare.isInsideType)("AwaitExpression", object, parents)) {
       return false;
     }
-    return (0, _insert.isVarContext)(object) && object.type !== "ArrowFunctionExpression" && !object.$dispatcherSkip && !parents.find(x => x.$dispatcherSkip);
+    return (0, _insert.isVarContext)(object) && object.type !== "ArrowFunctionExpression" && !object.$multiTransformSkip && !parents.find(x => x.$multiTransformSkip);
   }
   transform(object, parents) {
     return () => {
@@ -101,7 +102,7 @@ class Dispatcher extends _transform.default {
           if (context === c) {
             if (o.type == "FunctionDeclaration" && o.id.name) {
               var name = o.id.name;
-              if (o.$requiresEval || o.async || o.generator || p.find(x => x.$dispatcherSkip || x.type == "MethodDefinition") || o.body.type != "BlockStatement") {
+              if (o.$requiresEval || o.async || o.generator || p.find(x => x.$multiTransformSkip || x.type == "MethodDefinition") || o.body.type != "BlockStatement") {
                 illegalFnNames.add(name);
                 return;
               }
@@ -144,6 +145,9 @@ class Dispatcher extends _transform.default {
             if (!info.spec.isReferenced) {
               return;
             }
+            if ((0, _guard.isJSConfuserVar)(p)) {
+              illegalFnNames.add(o.name);
+            }
             if (info.spec.isDefined) {
               if (info.isFunctionDeclaration) {
                 if (p[0].id && (!functionDeclarations[p[0].id.name] || functionDeclarations[p[0].id.name][0] !== p[0])) {
@@ -246,7 +250,7 @@ class Dispatcher extends _transform.default {
               key: newFnNames[name],
               value: (0, _insert.computeFunctionLength)(def.params)
             };
-          }).filter(item => item.value !== 0).map(item => (0, _gen.Property)((0, _gen.Literal)(item.key), (0, _gen.Literal)(item.value)))))), (0, _template.default)(`
+          }).filter(item => item.value !== 0).map(item => (0, _gen.Property)((0, _gen.Literal)(item.key), (0, _gen.Literal)(item.value)))))), new _template.default(`
               function makeFn${_constants.predictableFunctionTag}(){
                 var fn = function(...args){
                   ${payloadArg} = args;
@@ -340,7 +344,7 @@ class Dispatcher extends _transform.default {
               this.replace(o, (0, _gen.CallExpression)((0, _gen.Identifier)(dispatcherFnName), [(0, _gen.Literal)(newName), (0, _gen.Literal)(expectedGet)]));
             }
           });
-          (0, _insert.prepend)(object, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)((0, _gen.Identifier)(cacheName), (0, _template.default)(`Object.create(null)`).single().expression)));
+          (0, _insert.prepend)(object, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)((0, _gen.Identifier)(cacheName), new _template.default(`Object.create(null)`).single().expression)));
         }
       }
     };

package/dist/transforms/es5/antiClass.js

@@ -34,8 +34,8 @@ class AntiClass extends _transform.default {
       var thisName = "this" + this.getPlaceholder();
 
       // self this
-      virtualBody.push((0, _template.default)(`var ${thisName} = this;`).single());
-      virtualBody.push((0, _template.default)(`${thisName}["constructor"] = null;`).single());
+      virtualBody.push(new _template.default(`var ${thisName} = this;`).single());
+      virtualBody.push(new _template.default(`${thisName}["constructor"] = null;`).single());
       var superArguments;
       var superBody = [];
       if (object.superClass) {
@@ -45,10 +45,10 @@ class AntiClass extends _transform.default {
       var staticDescriptorsName = this.getPlaceholder();
 
       // getters/setters
-      virtualBody.push((0, _template.default)(`var ${virtualDescriptorsName} = {getters: {}, setters: {}}`).single());
+      virtualBody.push(new _template.default(`var ${virtualDescriptorsName} = {getters: {}, setters: {}}`).single());
 
       // getters/setters
-      staticBody.push((0, _template.default)(`var ${staticDescriptorsName} = {getters: {}, setters: {}}`).single());
+      staticBody.push(new _template.default(`var ${staticDescriptorsName} = {getters: {}, setters: {}}`).single());
       body.body.forEach(methodDefinition => {
         if (!methodDefinition.key) {
           return;
@@ -94,7 +94,7 @@ class AntiClass extends _transform.default {
           throw new Error("Unsupported method definition");
         }
       });
-      virtualBody.push((0, _template.default)(`
+      virtualBody.push(new _template.default(`
       [...Object.keys(${virtualDescriptorsName}.getters), ...Object.keys(${virtualDescriptorsName}.setters)].forEach(key=>{
   
         if( !${thisName}.hasOwnProperty(key) ) {
@@ -110,7 +110,7 @@ class AntiClass extends _transform.default {
       })
       
       `).single());
-      staticBody.push((0, _template.default)(`
+      staticBody.push(new _template.default(`
       [...Object.keys(${staticDescriptorsName}.getters), ...Object.keys(${staticDescriptorsName}.setters)].forEach(key=>{
   
         if( !${virtualName}.hasOwnProperty(key) ) {
@@ -130,7 +130,7 @@ class AntiClass extends _transform.default {
         (0, _assert.ok)(superArguments, "Failed to find super() arguments");
 
         // save the super state
-        virtualBody.unshift((0, _template.default)(`
+        virtualBody.unshift(new _template.default(`
             Object.keys(this).forEach(key=>{
               var descriptor = Object.getOwnPropertyDescriptor(this, key);
               if ( descriptor) {
@@ -140,17 +140,17 @@ class AntiClass extends _transform.default {
               }
             })`).single());
         virtualBody.unshift((0, _gen.ExpressionStatement)((0, _gen.CallExpression)((0, _gen.MemberExpression)(object.superClass, (0, _gen.Identifier)("call"), false), [(0, _gen.ThisExpression)(), ...superArguments])));
-        virtualBody.unshift((0, _template.default)(`var ${superName} = {}`).single());
+        virtualBody.unshift(new _template.default(`var ${superName} = {}`).single());
       }
-      virtualBody.push((0, _template.default)(`if(!this["constructor"]){this["constructor"] = ()=>{}};`).single());
+      virtualBody.push(new _template.default(`if(!this["constructor"]){this["constructor"] = ()=>{}};`).single());
       if (object.id && object.id.name) {
-        virtualBody.push((0, _template.default)(`Object.defineProperty(this["constructor"], 'name', {
+        virtualBody.push(new _template.default(`Object.defineProperty(this["constructor"], 'name', {
           writable: true,
           configurable: true,
           value: '${object.id.name}'
         });`).single());
       }
-      virtualBody.push((0, _template.default)(`this["constructor"](...arguments)`).single());
+      virtualBody.push(new _template.default(`this["constructor"](...arguments)`).single());
       var virtualFunction = (0, _gen.FunctionExpression)([], virtualBody);
       var completeBody = [(0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(virtualName, virtualFunction)), ...staticBody, (0, _gen.ReturnStatement)((0, _gen.Identifier)(virtualName))];
       var expr = (0, _gen.CallExpression)((0, _gen.FunctionExpression)([], completeBody), []);

package/dist/transforms/es5/antiDestructuring.js

@@ -84,7 +84,7 @@ class AntiDestructuringParameters extends _transform.default {
           (0, _insert.getBlockBody)(object.body).unshift((0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(arrayPattern, (0, _gen.ArrayExpression)(object.params))));
         } else {
           object.params = [];
-          (0, _insert.getBlockBody)(object.body).unshift((0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(arrayPattern, (0, _template.default)(`Array.prototype.slice.call(arguments)`).single().expression)));
+          (0, _insert.getBlockBody)(object.body).unshift((0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(arrayPattern, new _template.default(`Array.prototype.slice.call(arguments)`).single().expression)));
           if (object.type == "ArrowFunctionExpression") {
             object.type = "FunctionExpression";
             object.expression = false;

package/dist/transforms/es5/antiES6Object.js

@@ -13,7 +13,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var HelperFunctions = (0, _template.default)(`
+var HelperFunctions = new _template.default(`
   function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -121,7 +121,7 @@ class AntiES6Object extends _transform.default {
       if (needsChanging) {
         if (!this.makerFn) {
           this.makerFn = this.getPlaceholder();
-          (0, _insert.prepend)(parents[parents.length - 1] || block, (0, _template.default)(`
+          (0, _insert.prepend)(parents[parents.length - 1] || block, new _template.default(`
             function {name}(base, computedProps, getters, setters){
 
               for ( var i = 0; i < computedProps.length; i++ ) {

package/dist/transforms/es5/antiTemplate.js

@@ -49,7 +49,7 @@ class AntiTemplate extends _transform.default {
         var literal = object.quasi;
         if (!this.makerFn) {
           this.makerFn = "es6_template" + this.getPlaceholder();
-          (0, _insert.prepend)(parents[parents.length - 1], (0, _template.default)(`
+          (0, _insert.prepend)(parents[parents.length - 1], new _template.default(`
           function {name}(arr, raw){
             arr.raw = raw;
             return arr;

package/dist/transforms/extraction/duplicateLiteralsRemoval.js

@@ -68,7 +68,7 @@ class DuplicateLiteralsRemoval extends _transform.default {
       (0, _insert.append)(tree, (0, _gen.FunctionDeclaration)(getArrayFn, [], [(0, _gen.ReturnStatement)(this.arrayExpression)]));
 
       // This variable holds the array
-      (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.arrayName, (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(getArrayFn), (0, _gen.Literal)("call"), true), [(0, _gen.ThisExpression)()]))));
+      (0, _insert.prepend)(tree, (0, _gen.VariableDeclaration)((0, _gen.VariableDeclarator)(this.arrayName, (0, _gen.CallExpression)((0, _gen.Identifier)(getArrayFn), []))));
 
       // Create all the functions needed
       for (var blockNode of this.functions.keys()) {
@@ -95,7 +95,7 @@ class DuplicateLiteralsRemoval extends _transform.default {
     }
   }
   match(object, parents) {
-    return (0, _compare.isPrimitive)(object) && !(0, _compare.isDirective)(object, parents) && !(0, _compare.isModuleSource)(object, parents) && !parents.find(x => x.$dispatcherSkip);
+    return (0, _compare.isPrimitive)(object) && !(0, _compare.isDirective)(object, parents) && !(0, _compare.isModuleSource)(object, parents) && !parents.find(x => x.$multiTransformSkip);
   }
 
   /**

package/dist/transforms/identifier/globalAnalysis.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _constants = require("../../constants");
+var _guard = require("../../util/guard");
 var _identifiers = require("../../util/identifiers");
 var _transform = _interopRequireDefault(require("../transform"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -41,9 +42,21 @@ class GlobalAnalysis extends _transform.default {
     if (!info.spec.isReferenced) {
       return;
     }
+    if ((0, _guard.isJSConfuserVar)(parents)) {
+      delete this.globals[object.name];
+      this.notGlobals.add(object.name);
+      return;
+    }
 
     // Cannot be defined or overridden
     if (info.spec.isDefined || info.spec.isModified) {
+      if (info.spec.isModified) {
+        // Only direct overwrites should be considered
+        // Changing object properties is allowed
+        if (parents[0].type === "MemberExpression" && parents[0].object === object) {
+          return;
+        }
+      }
       delete this.globals[object.name];
       this.notGlobals.add(object.name);
       return;

package/dist/transforms/identifier/globalConcealing.js

@@ -27,7 +27,7 @@ class GlobalConcealing extends _transform.default {
   constructor(o) {
     super(o, _order.ObfuscateOrder.GlobalConcealing);
     _defineProperty(this, "globalAnalysis", void 0);
-    _defineProperty(this, "ignoreGlobals", new Set(["require", "__dirname", "eval"]));
+    _defineProperty(this, "ignoreGlobals", new Set(["require", "__dirname", "eval", _constants.variableFunctionName]));
     this.globalAnalysis = new _globalAnalysis.default(o);
     this.before.push(this.globalAnalysis);
   }
@@ -63,7 +63,7 @@ class GlobalConcealing extends _transform.default {
         var getGlobalVariableFnName = this.getPlaceholder() + _constants.predictableFunctionTag;
 
         // Returns global variable or fall backs to `this`
-        var getGlobalVariableFn = _bufferToString.GetGlobalTemplate.compile({
+        var getGlobalVariableFn = (0, _bufferToString.createGetGlobalTemplate)(this, object, parents).compile({
           getGlobalFnName: getGlobalVariableFnName
         });
 
@@ -79,8 +79,43 @@ class GlobalConcealing extends _transform.default {
           usedStates.add(state);
           newNames[name] = state;
           locations.forEach(_ref => {
-            let [node, parents] = _ref;
-            this.replace(node, (0, _gen.CallExpression)((0, _gen.Identifier)(globalFn), [(0, _gen.Literal)(state)]));
+            var _this$options$lock;
+            let [node, p] = _ref;
+            if (p.find(x => x.$multiTransformSkip)) {
+              return;
+            }
+            var newExpression = (0, _gen.CallExpression)((0, _gen.Identifier)(globalFn), [(0, _gen.Literal)(state)]);
+            this.replace(node, newExpression);
+            if ((_this$options$lock = this.options.lock) !== null && _this$options$lock !== void 0 && _this$options$lock.tamperProtection && this.lockTransform.nativeFunctionName) {
+              var isMemberExpression = false;
+              var nameAndPropertyPath = [name];
+              var callExpression;
+              var index = 0;
+              do {
+                if (p[index].type === "CallExpression") {
+                  callExpression = p[index];
+                  break;
+                }
+                var memberExpression = p[index];
+                if (memberExpression.type !== "MemberExpression") return;
+                var property = memberExpression.property;
+                var stringValue = property.type === "Literal" ? property.value : memberExpression.computed ? null : property.type === "Identifier" ? property.name : null;
+                if (!stringValue) return;
+                isMemberExpression = true;
+                nameAndPropertyPath.push(stringValue);
+                index++;
+              } while (index < p.length);
+              if (!this.lockTransform.shouldTransformNativeFunction(nameAndPropertyPath)) return;
+              if (callExpression && callExpression.type === "CallExpression") {
+                if (isMemberExpression) {
+                  callExpression.callee = (0, _gen.CallExpression)((0, _gen.Identifier)(this.lockTransform.nativeFunctionName), [callExpression.callee.object, callExpression.callee.computed ? callExpression.callee.property : (0, _gen.Literal)(callExpression.callee.property.name || callExpression.callee.property.value)]);
+                } else {
+                  callExpression.callee = (0, _gen.CallExpression)((0, _gen.Identifier)(this.lockTransform.nativeFunctionName), [{
+                    ...callExpression.callee
+                  }]);
+                }
+              }
+            }
           });
         });
 
@@ -106,10 +141,10 @@ class GlobalConcealing extends _transform.default {
           return (0, _gen.SwitchCase)((0, _gen.Literal)(code), body);
         })), (0, _gen.ReturnStatement)((0, _gen.MemberExpression)((0, _gen.Identifier)(globalVar), (0, _gen.Identifier)(returnName), true))]);
         var tempVar = this.getPlaceholder();
-        var variableDeclaration = (0, _template.default)(`
+        var variableDeclaration = new _template.default(`
         var ${globalVar};
         `).single();
-        variableDeclaration.declarations.push((0, _gen.VariableDeclarator)(tempVar, (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.FunctionExpression)([], [...getGlobalVariableFn, (0, _template.default)(`return ${globalVar} = ${getGlobalVariableFnName}["call"](this)`).single()]), (0, _gen.Literal)("call"), true), [])));
+        variableDeclaration.declarations.push((0, _gen.VariableDeclarator)(tempVar, (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.FunctionExpression)([], [...getGlobalVariableFn, new _template.default(`return ${globalVar} = ${getGlobalVariableFnName}["call"](this)`).single()]), (0, _gen.Literal)("call"), true), [])));
         (0, _insert.prepend)(object, variableDeclaration);
         (0, _insert.append)(object, functionDeclaration);
       }

package/dist/transforms/identifier/renameVariables.js

@@ -7,6 +7,7 @@ exports.default = void 0;
 var _assert = require("assert");
 var _order = require("../../order");
 var _traverse = require("../../traverse");
+var _gen = require("../../util/gen");
 var _identifiers = require("../../util/identifiers");
 var _insert = require("../../util/insert");
 var _transform = _interopRequireDefault(require("../transform"));
@@ -196,6 +197,12 @@ class RenameVariables extends _transform.default {
           parents[importSpecifierIndex].imported = (0, _insert.clone)(parents[importSpecifierIndex - 1] || object);
         }
       }
+      if (parents[1] && parents[1].type === "CallExpression" && parents[1].arguments === parents[0]) {
+        if (parents[1].callee.type === "Identifier" && parents[1].callee.name === _constants.variableFunctionName) {
+          this.replace(parents[1], (0, _gen.Literal)(newName));
+          return;
+        }
+      }
 
       // console.log(o.name, "->", newName);
       // 5. Update Identifier node's 'name' property

package/dist/transforms/lock/antiDebug.js

@@ -15,7 +15,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-var DevToolsDetection = (0, _template.default)(`
+var DevToolsDetection = new _template.default(`
   try {
     if ( setInterval ) {
       setInterval(()=>{
@@ -40,7 +40,7 @@ class AntiDebug extends _transform.default {
     var startTimeName = this.getPlaceholder();
     var endTimeName = this.getPlaceholder();
     var isDevName = this.getPlaceholder();
-    var functionDeclaration = (0, _gen.FunctionDeclaration)(fnName, [], [...(0, _template.default)(`
+    var functionDeclaration = (0, _gen.FunctionDeclaration)(fnName, [], [...new _template.default(`
       var ${startTimeName} = new Date();
       debugger;
       var ${endTimeName} = new Date();