js-confuser 1.5.8 → 1.6.0

package/dist/transforms/string/encoding.js

@@ -10,200 +10,171 @@ var _template = _interopRequireDefault(require("../../templates/template"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const Encoding = {
-  ascii85: {
-    encode(a) {
-      var b, c, d, e, f, g, h, i, j, k; // @ts-ignore
-
-      for ( // @ts-ignore
-      !/[^\x00-\xFF]/.test(a), b = "\x00\x00\x00\x00".slice(a.length % 4 || 4), a += b, c = [], d = 0, e = a.length; e > d; d += 4) f = (a.charCodeAt(d) << 24) + (a.charCodeAt(d + 1) << 16) + (a.charCodeAt(d + 2) << 8) + a.charCodeAt(d + 3), 0 !== f ? (k = f % 85, f = (f - k) / 85, j = f % 85, f = (f - j) / 85, i = f % 85, f = (f - i) / 85, h = f % 85, f = (f - h) / 85, g = f % 85, c.push(g + 33, h + 33, i + 33, j + 33, k + 33)) : c.push(122);
-
-      return function (a, b) {
-        for (var c = b; c > 0; c--) a.pop();
-      }(c, b.length), "<~" + String.fromCharCode.apply(String, c) + "~>";
-    },
-
-    decode(a) {
-      var c,
-          d,
-          e,
-          f,
-          g,
-          h = String,
-          l = "length",
-          w = 255,
-          x = "charCodeAt",
-          y = "slice",
-          z = "replace";
-
-      for ("<~" === a[y](0, 2) && "~>" === a[y](-2), a = a[y](2, -2)[z](/s/g, "")[z]("z", "!!!!!"), c = "uuuuu"[y](a[l] % 5 || 5), a += c, e = [], f = 0, g = a[l]; g > f; f += 5) d = 52200625 * (a[x](f) - 33) + 614125 * (a[x](f + 1) - 33) + 7225 * (a[x](f + 2) - 33) + 85 * (a[x](f + 3) - 33) + (a[x](f + 4) - 33), e.push(w & d >> 24, w & d >> 16, w & d >> 8, w & d);
-
-      return function (a, b) {
-        for (var c = b; c > 0; c--) a.pop();
-      }(e, c[l]), h.fromCharCode.apply(h, e);
-    },
-
-    template: (0, _template.default)("\n    function {name}(a, LL = [\"fromCharCode\", \"apply\"]) {\n      var c, d, e, f, g, h = String, l = \"length\", w = 255, x = \"charCodeAt\", y = \"slice\", z = \"replace\";\n      for (\"<~\" === a[y](0, 2) && \"~>\" === a[y](-2), a = a[y](2, -2)[z](/s/g, \"\")[z](\"z\", \"!!!!!\"), \n      c = \"uuuuu\"[y](a[l] % 5 || 5), a += c, e = [], f = 0, g = a[l]; g > f; f += 5) d = 52200625 * (a[x](f) - 33) + 614125 * (a[x](f + 1) - 33) + 7225 * (a[x](f + 2) - 33) + 85 * (a[x](f + 3) - 33) + (a[x](f + 4) - 33), \n      e.push(w & d >> 24, w & d >> 16, w & d >> 8, w & d);\n      return function(a, b) {\n        for (var c = b; c > 0; c--) a.pop();\n      }(e, c[l]), h[LL[0]][LL[1]](h, e);\n    }\n    ")
-  },
-  base32: {
-    encode: function (s) {
-      var a = "!\"#$%&'()*+,-./0123456789:;<=>?@";
-      var len = s.length;
-      var o = "";
-      var w,
-          c,
-          r = 0,
-          sh = 0,
-          i;
-
-      for (i = 0; i < len; i += 5) {
-        // mask top 5 bits
-        c = s.charCodeAt(i);
-        w = 0xf8 & c;
-        o += a.charAt(w >> 3);
-        r = 0x07 & c;
-        sh = 2;
-
-        if (i + 1 < len) {
-          c = s.charCodeAt(i + 1); // mask top 2 bits
-
-          w = 0xc0 & c;
-          o += a.charAt((r << 2) + (w >> 6));
-          o += a.charAt((0x3e & c) >> 1);
-          r = c & 0x01;
-          sh = 4;
-        }
-
-        if (i + 2 < len) {
-          c = s.charCodeAt(i + 2); // mask top 4 bits
-
-          w = 0xf0 & c;
-          o += a.charAt((r << 4) + (w >> 4));
-          r = 0x0f & c;
-          sh = 1;
-        }
-
-        if (i + 3 < len) {
-          c = s.charCodeAt(i + 3); // mask top 1 bit
-
-          w = 0x80 & c;
-          o += a.charAt((r << 1) + (w >> 7));
-          o += a.charAt((0x7c & c) >> 2);
-          r = 0x03 & c;
-          sh = 3;
-        }
-
-        if (i + 4 < len) {
-          c = s.charCodeAt(i + 4); // mask top 3 bits
-
-          w = 0xe0 & c;
-          o += a.charAt((r << 3) + (w >> 5));
-          o += a.charAt(0x1f & c);
-          r = 0;
-          sh = 0;
+  base91: {
+    encode(str) {
+      const table = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!#$%&()*+,./:;<=>?@[]^_`{|}~"';
+      const raw = Buffer.from(str, "utf-8");
+      const len = raw.length;
+      let ret = "";
+      let n = 0;
+      let b = 0;
+
+      for (let i = 0; i < len; i++) {
+        b |= raw[i] << n;
+        n += 8;
+
+        if (n > 13) {
+          let v = b & 8191;
+
+          if (v > 88) {
+            b >>= 13;
+            n -= 13;
+          } else {
+            v = b & 16383;
+            b >>= 14;
+            n -= 14;
+          }
+
+          ret += table[v % 91] + table[v / 91 | 0];
         }
-      } // Calculate length of pad by getting the
-      // number of words to reach an 8th octet.
-
-
-      if (r != 0) {
-        o += a.charAt(r << sh);
       }
 
-      return o;
-    },
-    decode: function (s) {
-      var v,
-          x,
-          bits = 0,
-          o = "",
-          len = s.length,
-          d = String,
-          e = "charCodeAt",
-          f = "fromCharCode",
-          i;
-
-      for (i = 0; i < len; i += 1) {
-        v = s[e](i) - 33, v >= 0 && v < 32 ? (bits += (x = x << 5 | v, 5), bits >= 8 ? bits -= (o += d[f](x >> bits - 8 & 0xff), 8) : 0) : 0;
+      if (n) {
+        ret += table[b % 91];
+        if (n > 7 || b > 90) ret += table[b / 91 | 0];
       }
 
-      return o;
+      return ret;
     },
-    template: (0, _template.default)("\n    function {name}(s) {\n      var v,\n        x,\n        b = 0,\n        o = \"\",\n        len = s.length,\n        d = String,\n        e = \"charCodeAt\",\n        f = \"fromCharCode\", i;\n  \n      for (i = 0; i < len; i += 1) {\n        (v = s[e](i) - 33),\n          v >= 0 && v < 32\n            ? ((b += ((x = (x << 5) | v), 5)),\n              b >= 8\n                ? (b -= ((o += d[f]((x >> (b - 8)) & 0xff)), 8))\n                : 0)\n            : 0;\n      }\n      return o;\n    }\n    ")
-  },
-  hexTable: {
-    encode: function (str) {
-      var output = "";
 
-      for (var j = 0; j < str.length; j += 3) {
-        var chunk = str.substring(j, j + 3);
-
-        if (!chunk) {
-          continue;
+    decode(str) {
+      const table = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!#$%&()*+,./:;<=>?@[]^_`{|}~"';
+      const raw = "" + (str || "");
+      const len = raw.length;
+      const ret = [];
+      let b = 0;
+      let n = 0;
+      let v = -1;
+
+      for (let i = 0; i < len; i++) {
+        const p = table.indexOf(raw[i]);
+        if (p === -1) continue;
+
+        if (v < 0) {
+          v = p;
+        } else {
+          v += p * 91;
+          b |= v << n;
+          n += (v & 8191) > 88 ? 13 : 14;
+
+          do {
+            ret.push(b & 0xff);
+            b >>= 8;
+            n -= 8;
+          } while (n > 7);
+
+          v = -1;
         }
-
-        chunk = chunk + "~";
-        var uniqueChars = new Set([]);
-
-        for (var char of chunk) {
-          uniqueChars.add(char);
-        }
-
-        var keys = Array.from(uniqueChars).sort();
-        var table = {},
-            i = 0;
-
-        for (var key of keys) {
-          table[key] = i++;
-        }
-
-        var idx = [];
-
-        for (var char of chunk) {
-          idx.push(table[char]);
-        }
-
-        var table64 = "0x";
-
-        for (var i = keys.length - 1; i >= 0; i--) {
-          table64 += keys[i].charCodeAt(0).toString(16).toUpperCase();
-        }
-
-        var idxInt = 0;
-
-        for (var i = idx.length - 1; i >= 0; i--) {
-          idxInt = idxInt << 3 | idx[i];
-        }
-
-        var idx64 = "0x" + idxInt.toString(16).toUpperCase(); // console.log(chunk, table, idx, table64, idx64);
-
-        output += table64 + "," + idx64 + ",";
       }
 
-      if (output.endsWith(",")) {
-        output = output.substring(0, output.length - 1);
+      if (v > -1) {
+        ret.push((b | v << n) & 0xff);
       }
 
-      return "{" + output + "}";
+      return Buffer.from(ret).toString("utf-8");
     },
-    decode: function (str) {
-      var output = "";
-      str = str.substring(1, str.length - 1);
-      var chunks = str.split(",");
-
-      for (var i = 0; i < chunks.length; i += 2) {
-        var arr = [chunks[i], chunks[i + 1]];
-        var [table, idx] = arr.map(Number); // console.log(table, idx);
-
-        while (idx) {
-          output += String.fromCharCode(table >> 8 * (idx & 7) & 0xff);
-          idx >>= 3;
-        }
-      }
 
-      return output.replace(/~/g, "");
-    },
-    template: (0, _template.default)("\n      function {name}(str){\n        var output = \"\";\n    \n        str = str.substring(1, str.length - 1);\n        var chunks = str.split(\",\");\n      \n        for (var i = 0; i < chunks.length; i += 2) {\n          var arr = [chunks[i], chunks[i + 1]];\n      \n          var [table, idx] = arr.map(Number);\n      \n          // console.log(table, idx);\n          while (idx) {\n            output += String.fromCharCode((table >> (8 * (idx & 7))) & 0xff);\n            idx >>= 3;\n          }\n        }\n      \n        return output.replace(/~/g, \"\");\n      }\n    \n    ")
+    template: (0, _template.default)("  \n      function {name}(str){\n        const table =\n          'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!#$%&()*+,./:;<=>?@[]^_`{|}~\"';\n\n        const raw = \"\" + (str || \"\");\n        const len = raw.length;\n        const ret = [];\n\n        let b = 0;\n        let n = 0;\n        let v = -1;\n\n        for (let i = 0; i < len; i++) {\n          const p = table.indexOf(raw[i]);\n          if (p === -1) continue;\n          if (v < 0) {\n            v = p;\n          } else {\n            v += p * 91;\n            b |= v << n;\n            n += (v & 8191) > 88 ? 13 : 14;\n            do {\n              ret.push(b & 0xff);\n              b >>= 8;\n              n -= 8;\n            } while (n > 7);\n            v = -1;\n          }\n        }\n\n        if (v > -1) {\n          ret.push((b | (v << n)) & 0xff);\n        }\n\n        return {bufferToString}(ret);\n      }\n    ")
   }
+  /* ascii85: { This implementation is flaky and causes decoding errors 
+    encode(a) {
+      var b, c, d, e, f, g, h, i, j, k;
+      // @ts-ignore
+      for (
+        // @ts-ignore
+        !/[^\x00-\xFF]/.test(a),
+          b = "\x00\x00\x00\x00".slice(a.length % 4 || 4),
+          a += b,
+          c = [],
+          d = 0,
+          e = a.length;
+        e > d;
+        d += 4
+      )
+        (f =
+          (a.charCodeAt(d) << 24) +
+          (a.charCodeAt(d + 1) << 16) +
+          (a.charCodeAt(d + 2) << 8) +
+          a.charCodeAt(d + 3)),
+          0 !== f
+            ? ((k = f % 85),
+              (f = (f - k) / 85),
+              (j = f % 85),
+              (f = (f - j) / 85),
+              (i = f % 85),
+              (f = (f - i) / 85),
+              (h = f % 85),
+              (f = (f - h) / 85),
+              (g = f % 85),
+              c.push(g + 33, h + 33, i + 33, j + 33, k + 33))
+            : c.push(122);
+      return (
+        (function (a, b) {
+          for (var c = b; c > 0; c--) a.pop();
+        })(c, b.length),
+        "<~" + String.fromCharCode.apply(String, c) + "~>"
+      );
+    },
+    decode(a) {
+      var c,
+        d,
+        e,
+        f,
+        g,
+        h = String,
+        l = "length",
+        w = 255,
+        x = "charCodeAt",
+        y = "slice",
+        z = "replace";
+      for (
+        "<~" === a[y](0, 2) && "~>" === a[y](-2),
+          a = a[y](2, -2)[z](/s/g, "")[z]("z", "!!!!!"),
+          c = "uuuuu"[y](a[l] % 5 || 5),
+          a += c,
+          e = [],
+          f = 0,
+          g = a[l];
+        g > f;
+        f += 5
+      )
+        (d =
+          52200625 * (a[x](f) - 33) +
+          614125 * (a[x](f + 1) - 33) +
+          7225 * (a[x](f + 2) - 33) +
+          85 * (a[x](f + 3) - 33) +
+          (a[x](f + 4) - 33)),
+          e.push(w & (d >> 24), w & (d >> 16), w & (d >> 8), w & d);
+      return (
+        (function (a, b) {
+          for (var c = b; c > 0; c--) a.pop();
+        })(e, c[l]),
+        h.fromCharCode.apply(h, e)
+      );
+    },
+    template: Template(`
+    function {name}(a, LL = ["fromCharCode", "apply"]) {
+      var c, d, e, f, g, h = String, l = "length", w = 255, x = "charCodeAt", y = "slice", z = "replace";
+      for ("<~" === a[y](0, 2) && "~>" === a[y](-2), a = a[y](2, -2)[z](/\s/g, "")[z]("z", "!!!!!"), 
+      c = "uuuuu"[y](a[l] % 5 || 5), a += c, e = [], f = 0, g = a[l]; g > f; f += 5) d = 52200625 * (a[x](f) - 33) + 614125 * (a[x](f + 1) - 33) + 7225 * (a[x](f + 2) - 33) + 85 * (a[x](f + 3) - 33) + (a[x](f + 4) - 33), 
+      e.push(w & d >> 24, w & d >> 16, w & d >> 8, w & d);
+      return function(a, b) {
+        for (var c = b; c > 0; c--) a.pop();
+      }(e, c[l]), h[LL[0]][LL[1]](h, e);
+    }
+    `),
+  }, */
+
 };
 var _default = Encoding;
 exports.default = _default;

package/dist/transforms/string/stringCompression.js

@@ -23,6 +23,8 @@ var _transform = _interopRequireDefault(require("../transform"));
 
 var _stringConcealing = require("./stringConcealing");
 
+var _random = require("../../util/random");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -74,7 +76,7 @@ class StringCompression extends _transform.default {
 
     _defineProperty(this, "string", void 0);
 
-    _defineProperty(this, "delimiter", "1");
+    _defineProperty(this, "delimiter", "|");
 
     _defineProperty(this, "fnName", void 0);
 
@@ -98,7 +100,7 @@ class StringCompression extends _transform.default {
     var encoded = LZ_encode(this.string);
 
     if (LZ_decode(encoded) !== this.string) {
-      this.error(new Error("String failed to be decoded"));
+      this.error(new Error("String failed to be decoded. Try disabling the 'stringCompression' option."));
     }
 
     var getStringParamName = this.getPlaceholder();
@@ -130,33 +132,30 @@ class StringCompression extends _transform.default {
       return;
     }
 
-    if (!(0, _probability.ComputeProbabilityMap)(object.value, x => x)) {
+    if (!(0, _probability.ComputeProbabilityMap)(this.options.stringCompression, x => x, object.value)) {
       return;
-    }
+    } // HARD CODED LIMIT of 10,000 (after 1,000 elements)
 
-    var index = this.map.get(object.value);
+
+    if (this.map.size > 1000 && !(0, _random.chance)(this.map.size / 100)) return;
+    var index = this.map.get(object.value); // New string, add it!
 
     if (typeof index !== "number") {
+      // Ensure the string gets properly decoded
       if (LZ_decode(LZ_encode(object.value)) !== object.value) {
         this.ignore.add(object.value);
         return;
       }
 
-      var before = this.string;
       index = this.map.size;
       this.map.set(object.value, index);
-      this.string += object.value + this.delimiter; // allow rollback if string becomes corrupted
-
-      if (LZ_decode(LZ_encode(this.string)) !== this.string) {
-        this.string = before;
-        this.map.delete(object.value);
-        this.ignore.add(object.value);
-        return;
-      }
+      this.string += object.value + this.delimiter;
     }
 
     (0, _assert.ok)(typeof index === "number");
-    this.replaceIdentifierOrLiteral(object, (0, _gen.CallExpression)((0, _gen.Identifier)(this.fnName), [(0, _gen.Literal)(index)]), parents);
+    return () => {
+      this.replaceIdentifierOrLiteral(object, (0, _gen.CallExpression)((0, _gen.Identifier)(this.fnName), [(0, _gen.Literal)(index)]), parents);
+    };
   }
 
 }

package/dist/transforms/string/stringConcealing.js

@@ -26,6 +26,10 @@ var _transform = _interopRequireDefault(require("../transform"));
 
 var _encoding = _interopRequireDefault(require("./encoding"));
 
+var _probability = require("../../probability");
+
+var _bufferToString = require("../../templates/bufferToString");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -95,6 +99,11 @@ class StringConcealing extends _transform.default {
   apply(tree) {
     super.apply(tree);
     var cacheName = this.getPlaceholder();
+    var bufferToStringName = this.getPlaceholder(); // This helper functions convert UInt8 Array to UTf-string
+
+    (0, _insert.prepend)(tree, ..._bufferToString.BufferToStringTemplate.compile({
+      name: bufferToStringName
+    }));
     Object.keys(this.encoding).forEach(type => {
       var {
         template
@@ -102,7 +111,8 @@ class StringConcealing extends _transform.default {
       var decodeFn = this.getPlaceholder();
       var getterFn = this.encoding[type];
       (0, _insert.append)(tree, template.single({
-        name: decodeFn
+        name: decodeFn,
+        bufferToString: bufferToStringName
       }));
       (0, _insert.append)(tree, (0, _template.default)("\n            \n            function ".concat(getterFn, "(x, y, z, a = ").concat(decodeFn, ", b = ").concat(cacheName, "){\n              if ( z ) {\n                return y[").concat(cacheName, "[z]] = ").concat(getterFn, "(x, y);\n              } else if ( y ) {\n                [b, y] = [a(b), x || z]\n              }\n            \n              return y ? x[b[y]] : ").concat(cacheName, "[x] || (z=(b[x], a), ").concat(cacheName, "[x] = z(").concat(this.arrayName, "[x]))\n            }\n  \n            ")).single());
     });
@@ -122,12 +132,19 @@ class StringConcealing extends _transform.default {
       // Empty strings are discarded
       if (!object.value || this.ignore.has(object.value) || object.value.length == 0) {
         return;
-      }
+      } // Allow user to choose which strings get changed
+
+
+      if (!(0, _probability.ComputeProbabilityMap)(this.options.stringConcealing, x => x, object.value)) {
+        return;
+      } // HARD CODED LIMIT of 10,000 (after 1,000 elements)
+
 
+      if (this.set.size > 1000 && !(0, _random.chance)(this.set.size / 100)) return;
       var types = Object.keys(this.encoding);
       var type = (0, _random.choice)(types);
 
-      if (!type || !this.hasAllEncodings && Math.random() > 0.9) {
+      if (!type || !this.hasAllEncodings && (0, _random.chance)(10)) {
         var allowed = Object.keys(_encoding.default).filter(type => !this.encoding[type]);
 
         if (!allowed.length) {
@@ -165,16 +182,16 @@ class StringConcealing extends _transform.default {
       (0, _assert.ok)(index != -1, "index == -1");
       var callExpr = (0, _gen.CallExpression)((0, _gen.Identifier)(fnName), [(0, _gen.Literal)(index)]); // use `.apply` to fool automated de-obfuscators
 
-      if (Math.random() > 0.5) {
-        callExpr = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(fnName), (0, _gen.Identifier)("apply"), false), [(0, _gen.ThisExpression)(), (0, _gen.ArrayExpression)([(0, _gen.Literal)(index)])]);
+      if ((0, _random.chance)(10)) {
+        callExpr = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(fnName), (0, _gen.Literal)("apply"), true), [(0, _gen.Identifier)("undefined"), (0, _gen.ArrayExpression)([(0, _gen.Literal)(index)])]);
       } // use `.call`
-      else if (Math.random() > 0.5) {
-        callExpr = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(fnName), (0, _gen.Identifier)("call"), false), [(0, _gen.ThisExpression)(), (0, _gen.Literal)(index)]);
+      else if ((0, _random.chance)(10)) {
+        callExpr = (0, _gen.CallExpression)((0, _gen.MemberExpression)((0, _gen.Identifier)(fnName), (0, _gen.Literal)("call"), true), [(0, _gen.Identifier)("undefined"), (0, _gen.Literal)(index)]);
       }
 
       var referenceType = "call";
 
-      if (parents.length && Math.random() < 0.5 / this.variablesMade) {
+      if (parents.length && (0, _random.chance)(50 - this.variablesMade)) {
         referenceType = "constantReference";
       }
 

package/dist/transforms/string/stringEncoding.js

@@ -9,15 +9,15 @@ var _transform = _interopRequireDefault(require("../transform"));
 
 var _random = require("../../util/random");
 
-var _order = require("../../order");
-
 var _compare = require("../../util/compare");
 
 var _stringConcealing = require("./stringConcealing");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _probability = require("../../probability");
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+var _gen = require("../../util/gen");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function pad(x, len) {
   while (x.length < len) {
@@ -73,34 +73,23 @@ function toUnicodeRepresentation(str) {
 
 class StringEncoding extends _transform.default {
   constructor(o) {
-    super(o, _order.ObfuscateOrder.StringEncoding);
-
-    _defineProperty(this, "seen", void 0);
-  }
-
-  apply(tree) {
-    this.seen = new Set();
-    super.apply(tree);
+    super(o);
   }
 
   match(object, parents) {
-    return object.type == "Literal" && typeof object.value === "string" && !(0, _stringConcealing.isModuleSource)(object, parents) && !(0, _compare.isDirective)(object, parents);
+    return object.type == "Literal" && typeof object.value === "string" && object.value.length > 0 && !(0, _stringConcealing.isModuleSource)(object, parents) && !(0, _compare.isDirective)(object, parents);
   }
 
   transform(object, parents) {
-    // Todo fix circular json problems
-    if (this.seen.has(object)) {
-      return;
-    }
-
-    this.seen.add(object);
+    // Allow percentages
+    if (!(0, _probability.ComputeProbabilityMap)(this.options.stringEncoding, x => x, object.value)) return;
     var type = (0, _random.choice)(["hexadecimal", "unicode"]);
-    var escapedString = (type == "hexadecimal" ? toHexRepresentation : toUnicodeRepresentation)(object.value); // escodegen tries to escape backslashes, here is a work-around
+    var escapedString = (type == "hexadecimal" ? toHexRepresentation : toUnicodeRepresentation)(object.value);
+    return () => {
+      if (object.type !== "Literal") return; // ESCodeGen tries to escape backslashes, here is a work-around
 
-    this.replace(object, {
-      type: "Identifier",
-      name: "'".concat(escapedString, "'")
-    });
+      this.replace(object, (0, _gen.Identifier)("'".concat(escapedString, "'")));
+    };
   }
 
 }

package/dist/transforms/transform.js

@@ -81,10 +81,6 @@ class Transform {
   /**
    * Transforms to run after.
    */
-
-  /**
-   * Transformations to run at the same time (can cause conflicts so use sparingly)
-   */
   constructor(obfuscator) {
     let priority = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
 
@@ -98,15 +94,12 @@ class Transform {
 
     _defineProperty(this, "after", void 0);
 
-    _defineProperty(this, "concurrent", void 0);
-
     (0, _assert.ok)(obfuscator instanceof _obfuscator.default, "obfuscator should be an Obfuscator");
     this.obfuscator = obfuscator;
     this.options = this.obfuscator.options;
     this.priority = priority;
     this.before = [];
     this.after = [];
-    this.concurrent = [];
   }
   /**
    * The transformation name.
@@ -136,12 +129,12 @@ class Transform {
 
 
     this.before.forEach(x => x.apply(tree));
-    (0, _traverse.default)(tree, (object, parents) => {
-      var fns = [];
-      fns.push(this.input(object, parents)); // Fix 1. Increase performance with multiple transforms on one iteration.
+    /**
+     * Run this transformation
+     */
 
-      this.concurrent.forEach(x => fns.push(x.input(object, parents)));
-      return () => fns.forEach(x => x && x());
+    (0, _traverse.default)(tree, (object, parents) => {
+      return this.input(object, parents);
     });
     /**
      * Cleanup transformations
@@ -206,14 +199,13 @@ class Transform {
   }
   /**
    * Returns an independent name generator with it's own counter.
-   * @param offset
+   * @param overrideMode - Override the user's `identifierGenerator` option
    * @returns
    */
 
 
-  getGenerator() {
-    let offset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-    var count = offset;
+  getGenerator(overrideMode) {
+    var count = 0;
     var identifiers = new Set();
     return {
       generate: () => {
@@ -221,7 +213,7 @@ class Transform {
 
         do {
           count++;
-          retValue = this.generateIdentifier(-1, count);
+          retValue = this.generateIdentifier(-1, count, overrideMode);
         } while (identifiers.has(retValue));
 
         identifiers.add(retValue);
@@ -239,6 +231,7 @@ class Transform {
   generateIdentifier() {
     let length = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : -1;
     let count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
+    let overrideMode = arguments.length > 2 ? arguments[2] : undefined;
 
     if (length == -1) {
       length = (0, _random.getRandomInteger)(6, 8);
@@ -255,7 +248,7 @@ class Transform {
     var identifier;
 
     do {
-      identifier = (0, _probability.ComputeProbabilityMap)(this.options.identifierGenerator, function () {
+      identifier = (0, _probability.ComputeProbabilityMap)(overrideMode || this.options.identifierGenerator, function () {
         let mode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "randomized";
 
         switch (mode) {