feature(trammel) drop support of node < 4

coderaiser · coderaiser · commit 5ccf5e92ac84 · 2018-06-12T16:07:43.000+03:00
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,22 @@
+{
+    "env": {
+        "es6": true,
+        "node": true,
+    },
+    "parserOptions": {
+        "ecmaVersion": 2017,
+    },
+    "rules": {
+        "indent": ["error", 4],
+        "semi": "error",
+        "no-console": 0,
+        "no-use-before-define": ["error", "nofunc"]
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:node/recommended"
+    ],
+    "plugins": [
+        "node"
+    ]
+}
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 coderaiser
+Copyright (c) 2014-2018 coderaiser
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -2,32 +2,33 @@
 
 Get directory size.
 
-If you want get realtime size updates use [dirsize](https://github.com/coderaiser/node-dirsize). 
+If you want get realtime size updates use [dirsize](https://github.com/coderaiser/node-dirsize).
 
 ## Example
 
 ```js
-var trammel = require('trammel');
+const trammel = require('trammel');
 
-trammel('.', function(error, size) {
+trammel('.', (error, size) => {
     console.log(error, size);
     //undefined '58.47kb'
 });
 
-trammel('.', {type: 'raw'}, function(error, size) {
+trammel('.', {type: 'raw'}, (error, size) => {
     console.log(error, size);
     //undefined 59974
 });
 
-trammel('do not exist', {stopOnError: true}, function(error, size) {
+trammel('do not exist', {stopOnError: true}, (error, size) => {
     if (error)
-        console.error(error.message);
-    else
-        console.log(size);
+        return console.error(error.message);
+    
+    console.log(size);
 });
 
 ```
 
 ## License
 
 MIT
+
diff --git a/lib/size.js b/lib/size.js
@@ -1,133 +1,126 @@
 /* inspired by http://procbits.com/2011/10/29/a-node-js-experiment-thinking-asynchronously-recursion-calculate-file-size-directory */
-(function(){
-    'use strict';
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const EventEmitter = require('events').EventEmitter;
+
+const format = require('format-io');
+
+/*  The lstat() function shall be equivalent to stat(),
+    except when path refers to a symbolic link. In that case lstat()
+    shall return information about the link, while stat() shall return
+    information about the file the link references. 
+*/
+const stat    = fs.lstat;
+
+module.exports = (dir, options, callback) => {
+    let type;
+    const ERROR_EMPTY = 'could not be empty!';
+    const emitter = new EventEmitter();
+    let total = 0;
     
-    var fs          = require('fs'),
-        path        = require('path'),
-        
-        format      = require('format-io'),
-        
-        EventEmitter= require('events').EventEmitter,
-        
-        /*  The lstat() function shall be equivalent to stat(),
-            except when path refers to a symbolic link. In that case lstat()
-            shall return information about the link, while stat() shall return
-            information about the file the link references. 
-        */
-        stat    = fs.lstat;
+    if (!callback) {
+        callback    = options;
+        options     = {};
+    } else {
+        type        = options.type;
+    }
     
-    module.exports = function(dir, options, callback) {
-        var type, stopOnError,
-            ERROR_EMPTY     = 'could not be empty!',
-            emitter         = new EventEmitter(),
-            total           = 0;
-        
-        if (!callback) {
-            callback    = options;
-            options     = {};
-        } else {
-            type        = options.type;
-            stopOnError = options.stopOnError;
-        }
-        
-        if (!dir)
-            throw(Error('dir ' + ERROR_EMPTY));
-        
-        if (!callback)
-            throw(Error('callback' + ERROR_EMPTY));
-        
-        emitter.on('file', function(file, stat) {
-            total      += stat.size;
-        });
+    if (!dir)
+        throw Error('dir ' + ERROR_EMPTY);
+    
+    if (!callback)
+        throw Error('callback' + ERROR_EMPTY);
+    
+    emitter.on('file', (file, stat) => {
+        total      += stat.size;
+    });
+    
+    emitter.on('error', (error) => {
+        callback(error);
+    });
+    
+    emitter.on('end', () => {
+        let result;
         
-        emitter.on('error', function(error) {
-            callback(error);
-        });
+        if (type !== 'raw')
+            result  = format.size(total);
+        else
+            result  = total;
         
-        emitter.on('end', function() {
-            var result;
-            
-            if (type !== 'raw')
-                result  = format.size(total);
-            else
-                result  = total;
-            
-            callback(null, result);
-        });
+        callback(null, result);
+    });
+    
+    processDir(dir, options, emitter);
+};
+
+function processDir(dir, options, emitter) {
+    var stopOnError     = options.stopOnError,
+        wasError        = false,
+        asyncRunning    = 0,
+        fileCounter     = 1,
         
-        processDir(dir, options, emitter);
-    };
-   
-    function processDir(dir, options, emitter) {
-        var stopOnError     = options.stopOnError,
-            wasError        = false,
-            asyncRunning    = 0,
-            fileCounter     = 1,
-            
-            execCallBack    = function () {
-                var noErrors    = !wasError || !stopOnError,
-                    yesAllDone   = !fileCounter && !asyncRunning;
-                
-                if (yesAllDone && noErrors)
-                    emitter.emit('end');
-            },
+        execCallBack    = function () {
+            let noErrors = !wasError || !stopOnError;
+            let yesAllDone = !fileCounter && !asyncRunning;
             
-            getDirInfo      = function(dir) {
-               stat(dir, getStat.bind(null, dir));
-            };
+            if (yesAllDone && noErrors)
+                emitter.emit('end');
+        },
         
-        getDirInfo(dir);
+        getDirInfo = (dir) => {
+            stat(dir, getStat.bind(null, dir));
+        };
+    
+    getDirInfo(dir);
+    
+    function getStat(dir, error, stat) {
+        --fileCounter;
         
-        function getStat(dir, error, stat) {
-            var isDir;
-            
-            --fileCounter;
-            
-            if (!wasError || !stopOnError) {
-                if (error && stopOnError) {
-                    wasError    = true;
-                    emitter.emmit('error', error);
-                } else if (!error) {
-                    isDir   = stat.isDirectory();
+        if (!wasError || !stopOnError) {
+            if (error && stopOnError) {
+                wasError    = true;
+                emitter.emmit('error', error);
+            } else if (!error) {
+                let isDir = stat.isDirectory();
+                
+                if (!isDir)
+                    return emitter.emit('file', dir, stat);
+                
+                ++asyncRunning;
+                
+                fs.readdir(dir, (error, files) => {
+                    asyncRunning--;
                     
-                    if (!isDir) {
-                        emitter.emit('file', dir, stat);
-                    } else {
-                        ++asyncRunning;
-                        
-                        fs.readdir(dir, function(error, files) {
-                            asyncRunning--;
-                            
-                            if (!error) {
-                                onReaddir(dir, files);
-                            } else if (error && stopOnError) {
-                                wasError = true;
-                                emitter.emit('error', error);
-                            }
-                        });
+                    if (!error) {
+                        onReaddir(dir, files);
+                    } else if (error && stopOnError) {
+                        wasError = true;
+                        emitter.emit('error', error);
                     }
-                }
-                
-                execCallBack();
+                });
             }
-        }
-        
-        function onReaddir(dir, files) {
-            var n        = files.length;
-            
-            fileCounter += n;
             
-            if (!n)
-                execCallBack();
-            else
-                files.forEach(function(file) {
-                    var dirPath     = path.join(dir, file);
-                    
-                    process.nextTick(function() {
-                        getDirInfo(dirPath);
-                    });
-                });
+            execCallBack();
         }
     }
     
-})();
+    function onReaddir(dir, files) {
+        let n = files.length;
+        
+        fileCounter += n;
+        
+        if (!n)
+            return execCallBack();
+        
+        files.forEach((file) => {
+            const dirPath = path.join(dir, file);
+            
+            process.nextTick(() => {
+                getDirInfo(dirPath);
+            });
+        });
+    }
+}
+
diff --git a/package.json b/package.json
@@ -8,13 +8,19 @@
     "type": "git",
     "url": "git://github.com/coderaiser/trammel.git"
   },
+  "scripts": {
+    "lint": "eslint lib"
+  },
   "dependencies": {
     "format-io": "~0.9.5"
   },
-  "devDependencies": {},
+  "devDependencies": {
+    "eslint": "^4.19.1",
+    "eslint-plugin-node": "^6.0.1"
+  },
   "license": "MIT",
   "engines": {
-    "node": ">=0.4.x"
+    "node": ">=4"
   },
   "main": "lib/size.js"
 }
