Bläddra i källkod

Version update
Fix of incorrect `Utils.decToHex` method

sanex3339 8 år sedan
förälder
incheckning
f258be294e
5 ändrade filer med 12 tillägg och 20 borttagningar
  1. 5 1
      CHANGELOG.md
  2. 2 5
      dist/index.js
  3. 1 1
      package.json
  4. 3 13
      src/Utils.ts
  5. 1 0
      test/unit-tests/Utils.spec.ts

+ 5 - 1
CHANGELOG.md

@@ -1,7 +1,11 @@
 Change Log
 ===
 
-v0.7.0-dev.0
+v0.7.0-dev.2
+---
+* Fix of incorrect `Utils.decToHex` method
+
+v0.7.0-dev.1
 ---
 * **Breaking API change:** now `obfuscate(sourceCode, options)` returns `ObfuscationResult` object instead `string`. `ObfuscationResult` object contains two public methods: `getObfuscatedCode()` and `getSourceMap()`.
 * CLI. Now any code can be obfuscated through CLI `javascript-obfuscator` command. See `README.md` for available options. 

+ 2 - 5
dist/index.js

@@ -142,10 +142,8 @@ var Utils = function () {
     }, {
         key: 'decToHex',
         value: function decToHex(dec) {
-            var decToHexSliceValue = -6,
-                exponent = 6,
-                radix = 16;
-            return (dec + Math.pow(radix, exponent)).toString(radix).substr(decToHexSliceValue).replace(Utils.hexRepetitiveZerosRegExp, '');
+            var radix = 16;
+            return Number(dec).toString(radix);
         }
     }, {
         key: 'getRandomGenerator',
@@ -205,7 +203,6 @@ var Utils = function () {
     return Utils;
 }();
 
-Utils.hexRepetitiveZerosRegExp = new RegExp('^(0{2,})+(?!$)', '');
 Utils.randomGenerator = new chance_1.Chance();
 exports.Utils = Utils;
 

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "javascript-obfuscator",
-  "version": "0.7.0-dev.1",
+  "version": "0.7.0-dev.2",
   "description": "JavaScript obfuscator",
   "keywords": [
     "obfuscator",

+ 3 - 13
src/Utils.ts

@@ -3,11 +3,6 @@ import { Chance } from 'chance';
 import { JSFuck } from './enums/JSFuck';
 
 export class Utils {
-    /**
-     * @type {RegExp}
-     */
-    private static hexRepetitiveZerosRegExp: RegExp = new RegExp('^(0{2,})+(?!$)', '');
-
     /**
      * @type {Chance.Chance}
      */
@@ -62,14 +57,9 @@ export class Utils {
      * @returns {string}
      */
     public static decToHex (dec: number): string {
-        const decToHexSliceValue: number = -6,
-            exponent: number = 6,
-            radix: number = 16;
-
-        return (dec + Math.pow(radix, exponent))
-            .toString(radix)
-            .substr(decToHexSliceValue)
-            .replace(Utils.hexRepetitiveZerosRegExp, '');
+        const radix: number = 16;
+
+        return Number(dec).toString(radix);
     }
 
     /**

+ 1 - 0
test/unit-tests/Utils.spec.ts

@@ -46,6 +46,7 @@ describe('Utils', () => {
             assert.equal(Utils.decToHex(0), '0');
             assert.equal(Utils.decToHex(10), 'a');
             assert.equal(Utils.decToHex(17), '11');
+            assert.equal(Utils.decToHex(536870912), '20000000');
         });
     });