Fixes: #10. Use 'directoryFirst' to make sure folders first in the report.

Author: MrRaindrop

__test__/index.js

@@ -22,6 +22,7 @@ describe('use with require', function () {
         f: true,
         base: testBase,
         noreport: true,
+        directoryFirst: true,
       }).then((res) => {
         result = res;
         done();

__test__/o.data

@@ -1,9 +1,9 @@
 /Users/rdp/www/rdp/github/MrRaindrop/tree-cli/__test__/__data__
+├── node_modules/
+|  ├── bfolder/
+|  └── a.txt
 ├── a.ts
-├── b.data
-└── node_modules/
-   ├── a.txt
-   └── bfolder/
+└── b.data
 
 directory: 2 file: 3
 

bin/tree

@@ -48,6 +48,8 @@ var cli = meow({
     '  (current directory) and \'..\' (previous directory).',
     '-d',
     '  list directories only.',
+    '--directoryFirst',
+    '  list directories first.',
     '-f',
     '  append a \'/\' for directories, a \'=\' for socket files',
     '  and a \'|\' for FIFOs',

tree.js

@@ -54,6 +54,7 @@ var Promise = require('bluebird'),
     // append a '/' for directories, a '=' for socket files
     // and a '|' for FIFOs
     f: false,
+    directoryFirst: false,
   },
 
   _ignores = [],
@@ -221,6 +222,16 @@ var Promise = require('bluebird'),
 
   },
 
+  // calc priority when the flag directoryFirst is true.
+  _calcPriority = function (node) {
+    return node.type === 'directory' ? 1 : 0;
+  },
+
+  // compare priority when the flag directoryFirst is true.
+  _comparePriority = function (nodeA, nodeB) {
+    return _calcPriority(nodeB) - _calcPriority(nodeA);
+  },
+
   appendChildNodes = function (parent) {
 
     _debug('appendTreeNode:', parent);
@@ -278,8 +289,39 @@ var Promise = require('bluebird'),
                 if (_flags.d && type !== 'directory') {
                   return
                 }
+                if (_testIgnore(child, _ignores)) {
+                  child.ignore = true;
+                }
+                parent.children.push(child);
+                // for statistics.
+                if (!child.ignore) {
+                  _stats.all.push(child);
+                  _stats[type].push(child);
+                }
+                else {
+                  if (!_stats.ignore[type]) {
+                    _stats.ignore[type] = [];
+                  }
+                  _stats.ignore[type].push(child);
+                }
+              })
+              .catch(function (err) {
+                _debug(filePath, ' is invalid to access.');
+              })
+          });
+      })
+      .then(function () {
+        if (_flags.directoryFirst) {
+          parent.children.sort(_comparePriority);
+        }
+      })
+      .then(function () {
+        return Promise.resolve(parent.children)
+          .each(function (child, index) {
+            return Promise.resolve()
+              .then(function () {
                 // otherwise every type of file counts.
-                var isLast = index === files.length - 1;
+                var isLast = index === parent.children.length - 1;
                 isLast && (child.lasts[child.level - 1] = true);
                 if (_testIgnore(child, _ignores)) {
                   child.ignore = true;
@@ -297,25 +339,10 @@ var Promise = require('bluebird'),
                     }
                   }
                 }
-                parent.children.push(child);
-                // for statistics.
-                if (!child.ignore) {
-                  _stats.all.push(child);
-                  _stats[type].push(child);
-                }
-                else {
-                  if (!_stats.ignore[type]) {
-                    _stats.ignore[type] = [];
-                  }
-                  _stats.ignore[type].push(child);
-                }
-                if (type === 'directory') {
+                if (child.type === 'directory') {
                   return appendChildNodes(child);
                 }
-              })
-              .catch(function (err) {
-                _debug(filePath, ' is invalid to access.');
-              })
+              });
           });
       })
       .catch(function (err) {
@@ -327,7 +354,6 @@ var Promise = require('bluebird'),
           process.exit(-1);
         }
       });
-
   },
 
   genTree = function (rootPath) {

types/index.d.ts

@@ -28,6 +28,10 @@ namespace Tree {
     // append a '/' for directories, a '=' for socket files
     // and a '|' for FIFOs
     f: boolean;
+    // list directories only.
+    d: boolean;
+    // list directories first.
+    directoryFirst: boolean;
   }
 
   interface ITreeRoot {