Add defaul console options, remove empty attr

Author: MatthD

app.js

@@ -52,17 +52,19 @@ if (program.folder) {
 
 function actionsToDo() {
 
-  if (program.output === 'console') {
+  if (!program.output || program.output === 'console') {
     if (program.type === 'xpaths') {
       return function (path) {
-        console.log(`${path} ${results[path].count} ${program.attributes ? JSON.stringify(results[path].attributes) : ''}`)
+        let nbOfAttr = program.attributes ? Object.keys(results[path].attributes).length : 0;
+        console.log(`${path} ${results[path].count} ${nbOfAttr ? JSON.stringify(results[path].attributes) : ''}`)
       };
     }
     //tree
     return function (path) {
       let elements = path.split('/'),
           elementName = elements[elements.length-1];
-      console.log(`${'│  '.repeat(results[path].level)}├── ${elementName} ${results[path].count} ${program.attributes ? JSON.stringify(results[path].attributes) : ''}`)
+      let nbOfAttr = program.attributes ? Object.keys(results[path].attributes).length : 0;
+      console.log(`${'│  '.repeat(results[path].level)}├── ${elementName} ${results[path].count} ${nbOfAttr ? JSON.stringify(results[path].attributes) : ''}`)
     };
   }
   // Write file, no output
@@ -75,29 +77,27 @@ function actionsToDo() {
     if (program.type === 'xpaths') {
       xpathsFile = writeStream('xpaths', program.output, 'csv');
       return function (path) {
-        xpathsFile.write(`${path};${results[path].count}`)
-        if(program.attributes){
-          for(var attr in results[path].attributes){
-            xpathsFile.write(`;"${attr} => ${results[path].attributes[attr].join('\n')}"`)
-          }
-        }
-        xpathsFile.write('\n');
+        let nbOfAttr = program.attributes ? Object.keys(results[path].attributes).length : 0;
+        xpathsFile.write(`${path} ${results[path].count} ${nbOfAttr ? JSON.stringify(results[path].attributes) : ''}\n`)
       }
     }
     if (program.type === 'tree') {
       treeFile = writeStream('tree', program.output,'txt');
       return function (path) {
-        treeFile.write(`${'│  '.repeat(results[path].level)}├── ${path} ${results[path].count} ${program.attributes ? JSON.stringify(results[path].attributes) : ''}\n`);
+        let nbOfAttr = program.attributes ? Object.keys(results[path].attributes).length : 0;
+        treeFile.write(`${'│  '.repeat(results[path].level)}├── ${path} ${results[path].count} ${nbOfAttr ? JSON.stringify(results[path].attributes) : ''}\n`);
       }
     }
     //both
     xpathsFile = writeStream('xpaths', program.output,'csv');
     treeFile = writeStream('tree', program.output,'txt');
     return function (path) {
-      xpathsFile.write(`${path} ${results[path].count}\n`)
-      treeFile.write(`${'│  '.repeat(results[path].level)}├── ${path} ${results[path].count}\n`);
+      let nbOfAttr = program.attributes ? Object.keys(results[path].attributes).length : 0;
+      xpathsFile.write(`${path} ${results[path].count} ${nbOfAttr ? JSON.stringify(results[path].attributes) : ''}\n`)
+      treeFile.write(`${'│  '.repeat(results[path].level)}├── ${path} ${results[path].count} ${nbOfAttr ? JSON.stringify(results[path].attributes) : ''}\n`);
     }
   }
+
 }
 
 function writeStream(type, output, extension) {

readme.md

@@ -41,13 +41,13 @@ xpath-generator --help
 
   -a, --attributes               //Will return all attributes & uniques values for all paths
 
-  -i, --input <path>             //An xml input file
+  -i, --input <"path">             //An xml input file
 
-  -f, --folder <path>            //A folder containing xml files
+  -f, --folder <"path">            //A folder containing xml files
 
-  -o, --output <path>            //Generate files to specific path, default output is terminal
+  -o, --output <path/"console">            //Generate files to specific folder, default output is terminal
 
-  -t, --type <tree/xpaths/both>  Type of format output, can be 'tree' 'xpaths' or 'both' for outputdir, 'tree' 'xpaths' for console
+  -t, --type <"tree"/"xpaths"/"both">  Type of format output, can be 'tree' 'xpaths' or 'both' for outputdir, 'tree' 'xpaths' for console
 
 
 ## Use xpath-generator as API :