Fix octal and hex values in output

Author: danielstjules

lib/detector.js

@@ -1,7 +1,7 @@
 var util         = require('util');
 var EventEmitter = require('events').EventEmitter;
 var Promise      = require('bluebird');
-var acorn        = require('acorn');
+var parse        = require('acorn/acorn_loose').parse_dammit;
 var acornWalk    = require('acorn/util/walk');
 var fs           = Promise.promisifyAll(require('fs'));
 var utils        = require('./utils');
@@ -122,7 +122,7 @@ Detector.prototype._parseContents = function(filePath, contents) {
     contents = contents.replace('#!', '//');
   }
 
-  var syntaxTree = acorn.parse(contents, {
+  var syntaxTree = parse(contents, {
     ecmaVersion: 6,
     allowReturnOutsideFunction: true,
     locations: true,
@@ -196,7 +196,7 @@ Detector.prototype._detectMagicNumbers = function(syntaxTree, contents,
     }
 
     self.emit('found', {
-      value: node.value,
+      value: (node.raw !== undefined) ? node.raw : node.value,
       file: node.loc.source,
       fileLength: fileLength,
       lineNumber: node.loc.start.line,

package.json

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "bluebird": "*",
-    "acorn": "0.9.0",
+    "acorn": "0.10.0",
     "commander": "*",
     "node-filepaths": "0.0.2",
     "chalk": "*",
@@ -37,6 +37,6 @@
     "buddy": "./bin/buddy"
   },
   "scripts": {
-    "test": "./node_modules/.bin/mocha --recursive -R spec spec"
+    "test": "./node_modules/.bin/mocha -R spec spec/unit spec/integration"
   }
 }

spec/fixtures/hexOctal.js

@@ -0,0 +1,2 @@
+console.log(0x1A + 0x02);
+console.log(071);

spec/fixtures/index.js

@@ -4,7 +4,7 @@ var absolutePaths = {};
 var fixtures = ['emptyFile', 'singleVariable', 'es5', 'secondsInMinute',
                 'lineIgnore', 'blockIgnore', 'objectProperties',
                 'ignore', 'constVariable', 'constObject', 'shebang',
-                'testFile'];
+                'testFile', 'hexOctal'];
 
 absolutePaths.testFileOutput = path.resolve(__dirname, 'testFileOutput');
 

spec/unit/detectorSpec.js

@@ -131,7 +131,7 @@ describe('Detector', function() {
 
     detector.run().then(function() {
       expect(found).to.have.length(1);
-      expect(found[0].value).to.be(60);
+      expect(found[0].value).to.be('60');
       expect(found[0].file.substr(-18)).to.be('secondsInMinute.js');
       expect(found[0].startColumn).to.be(9);
       expect(found[0].endColumn).to.be(11);
@@ -146,13 +146,26 @@ describe('Detector', function() {
     }).catch(done);
   });
 
+  it('correctly emits hex and octal values', function(done) {
+    var detector = new Detector([fixtures.hexOctal]);
+    detector.on('found', listener);
+
+    detector.run().then(function() {
+      expect(found).to.have.length(3);
+      expect(found[0].value).to.be('0x1A');
+      expect(found[1].value).to.be('0x02');
+      expect(found[2].value).to.be('071');
+      done();
+    }).catch(done);
+  });
+
   it('skips unnamed constants within the ignore list', function(done) {
     var detector = new Detector([fixtures.ignore], false, [0]);
     detector.on('found', listener);
 
     detector.run().then(function() {
       expect(found).to.have.length(1);
-      expect(found[0].value).to.be(1);
+      expect(found[0].value).to.be('1');
       done();
     }).catch(done);
   });
@@ -164,7 +177,7 @@ describe('Detector', function() {
     detector.run().then(function() {
       expect(found).to.have.length(1);
       expect(found[0].lineNumber).to.be(4);
-      expect(found[0].value).to.be(100);
+      expect(found[0].value).to.be('100');
       done();
     }).catch(done);
   });
@@ -176,7 +189,7 @@ describe('Detector', function() {
 
       detector.run().then(function() {
         expect(found).to.have.length(1);
-        expect(found[0].value).to.be(10);
+        expect(found[0].value).to.be('10');
         done();
       }).catch(done);
     });
@@ -187,7 +200,7 @@ describe('Detector', function() {
 
       detector.run().then(function() {
         expect(found).to.have.length(1);
-        expect(found[0].value).to.be(10);
+        expect(found[0].value).to.be('10');
         done();
       }).catch(done);
     });