@contrast/contrast 1.0.7 → 1.0.8

package/src/scan/fileUtils.js

@@ -29,7 +29,7 @@ const findFilesJava = async languagesFound => {
 
 const findFilesJavascript = async languagesFound => {
   const result = await fg(
-    ['**/package.json', '**/yarn.lock', '**/package.lock.json'],
+    ['**/package.json', '**/yarn.lock', '**/package-lock.json'],
     {
       dot: false,
       deep: 1,
@@ -112,7 +112,18 @@ const fileExists = path => {
 
 const fileIsEmpty = path => {
   if (fileExists(path) && checkFilePermissions(path)) {
-    return fs.readFileSync(path).length === 0
+    try {
+      return fs.readFileSync(path).length === 0
+    } catch (e) {
+      if (
+        e.message.toString().includes('illegal operation on a directory, read')
+      ) {
+        console.log('file provided cannot be a directory')
+      } else {
+        console.log(e.message.toString())
+      }
+      process.exit(0)
+    }
   }
   return false
 }

package/src/utils/filterProjectPath.js

@@ -1,4 +1,5 @@
 const path = require('path')
+const child_process = require('child_process')
 
 function resolveFilePath(filepath) {
   if (filepath[0] === '~') {
@@ -8,10 +9,13 @@ function resolveFilePath(filepath) {
 }
 
 const returnProjectPath = () => {
-  if (process.env.PWD !== (undefined || null || 'undefined')) {
+  if (process.platform == 'win32') {
+    let winPath = child_process.execSync('cd').toString()
+    return winPath.replace(/\//g, '\\').trim()
+  } else if (process.env.PWD !== (undefined || null || 'undefined')) {
     return process.env.PWD
   } else {
-    return process.argv[process.argv.indexOf('--project_path') + 1]
+    return process.argv[process.argv.indexOf('--file') + 1]
   }
 }