Merge pull request #8 from inspekter/develop

Develop

Author: pablomdo

index.js

@@ -1,30 +1,30 @@
 'use strict'
 
-const escomplex = require('escomplex')
+const escomplex = require('typhonjs-escomplex')
 const path = require('path')
 const read = require('read-file')
 
 function sanitize (fileName, filePath, result) {
   return {
-    cyclomatic: result.aggregate.cyclomatic,
-    cyclomaticDensity: result.aggregate.cyclomaticDensity,
+    cyclomatic: result.methodAggregate.cyclomatic,
+    cyclomaticDensity: result.methodAggregate.cyclomaticDensity,
     file: {
       name: fileName,
       path: filePath
     },
     halstead: {
-      bugs: result.aggregate.halstead.bugs,
-      difficulty: result.aggregate.halstead.difficulty,
-      effort: result.aggregate.halstead.effort,
-      length: result.aggregate.halstead.length,
-      time: result.aggregate.halstead.time,
-      vocabulary: result.aggregate.halstead.vocabulary,
-      volume: result.aggregate.halstead.volume
+      bugs: result.methodAggregate.halstead.bugs,
+      difficulty: result.methodAggregate.halstead.difficulty,
+      effort: result.methodAggregate.halstead.effort,
+      length: result.methodAggregate.halstead.length,
+      time: result.methodAggregate.halstead.time,
+      vocabulary: result.methodAggregate.halstead.vocabulary,
+      volume: result.methodAggregate.halstead.volume
     },
     maintainability: result.maintainability,
     sloc: {
-      logical: result.aggregate.sloc.logical,
-      physical: result.aggregate.sloc.physical
+      logical: result.methodAggregate.sloc.logical,
+      physical: result.methodAggregate.sloc.physical
     }
   }
 }
@@ -36,9 +36,9 @@ module.exports.analyze = (source) => {
 
   if (Array.isArray(source)) {
     source.forEach((filePath) => {
-      // let fullPath = path.resolve(__dirname, filePath)
-      let content = read.sync(filePath, 'utf8')
-      result = escomplex.analyse(content)
+      let fullPath = path.resolve(__dirname, filePath)
+      let content = read.sync(fullPath, 'utf8')
+      result = escomplex.analyzeModule(content)
       report = sanitize(path.basename(filePath), filePath, result)
       reports.push(report)
     })
@@ -47,6 +47,4 @@ module.exports.analyze = (source) => {
   return reports
 }
 
-module.exports.getExtension = () => {
-  return 'js'
-}
+module.exports.extension = 'js'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "inspekter-plugin-javascript",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Inspekter JavaScript reporter",
   "main": "index.js",
   "scripts": {
@@ -20,9 +20,8 @@
   },
   "homepage": "https://github.com/inspekter/inspekter-plugin-javascript#readme",
   "dependencies": {
-    "escomplex": "^2.0.0-alpha",
-    "esprima": "^4.0.0",
-    "read-file": "^0.2.0"
+    "read-file": "^0.2.0",
+    "typhonjs-escomplex": "0.0.12"
   },
   "devDependencies": {
     "chai": "^4.1.2",

test/fixtures/file3.js

@@ -0,0 +1,11 @@
+'use strict'
+
+import os from 'os'
+
+class CpuInfo {
+  getCpuInfo () {
+    return os.cpus()
+  }
+}
+
+export default CpuInfo

test/index.js

@@ -75,11 +75,11 @@ describe('inspekter-plugin-javascript', () => {
     })
 
     it('should return one report object for each file', () => {
-      const source = ['test/fixtures/file1.js', 'test/fixtures/file2.js']
+      const source = ['test/fixtures/file1.js', 'test/fixtures/file2.js', 'test/fixtures/file3.js']
       const actual = ipj.analyze(source)
 
       expect(actual).to.be.an('array')
-      expect(actual).to.have.lengthOf(2)
+      expect(actual).to.have.lengthOf(source.length)
     })
 
     it('should return an object with all standard properties', () => {
@@ -92,9 +92,9 @@ describe('inspekter-plugin-javascript', () => {
     })
   })
 
-  describe('getExtension', () => {
+  describe('extension', () => {
     it('should return js', () => {
-      const actual = ipj.getExtension()
+      const actual = ipj.extension
 
       expect(actual).to.equal('js')
     })