bal-util - npm Package Compare versions

Comparing version 1.7.0 to 1.8.0

lib/flow.js

@@ -5,3 +5,4 @@ // Generated by CoffeeScript 1.3.1
     __hasProp = {}.hasOwnProperty,
-    __slice = [].slice;
+    __slice = [].slice,
+    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; };
 
@@ -58,250 +59,394 @@ balUtilFlow = {
       return this;
-    },
-    /*
-    	Usage:
-    		# Add tasks to a queue then fire them in parallel (asynchronously)
-    		tasks = new Group (err) -> next err
-    		tasks.push (complete) -> someAsyncFunction(arg1, arg2, complete)
-    		tasks.push (complete) -> anotherAsyncFunction(arg1, arg2, complete)
-    		tasks.async()
-    
-    		# Add tasks to a queue then fire them in serial (synchronously)
-    		tasks = new Group (err) -> next err
-    		tasks.push (complete) -> someAsyncFunction(arg1, arg2, complete)
-    		tasks.push (complete) -> anotherAsyncFunction(arg1, arg2, complete)
-    		tasks.sync()
-    */
+    }
+  };
 
-    Group: (function() {
+  /*
+  Usage:
+  	# Add tasks to a queue then fire them in parallel (asynchronously)
+  	tasks = new Group (err) -> next err
+  	tasks.push (complete) -> someAsyncFunction(arg1, arg2, complete)
+  	tasks.push (complete) -> anotherAsyncFunction(arg1, arg2, complete)
+  	tasks.async()
+  
+  	# Add tasks to a queue then fire them in serial (synchronously)
+  	tasks = new Group (err) -> next err
+  	tasks.push (complete) -> someAsyncFunction(arg1, arg2, complete)
+  	tasks.push (complete) -> anotherAsyncFunction(arg1, arg2, complete)
+  	tasks.sync()
+  */
 
-      _Class.prototype.total = 0;
 
-      _Class.prototype.completed = 0;
+  balUtilFlow.Group = (function() {
 
-      _Class.prototype.running = 0;
+    _Class.prototype.total = 0;
 
-      _Class.prototype.exited = false;
+    _Class.prototype.completed = 0;
 
-      _Class.prototype.breakOnError = true;
+    _Class.prototype.running = 0;
 
-      _Class.prototype.autoClear = false;
+    _Class.prototype.exited = false;
 
-      _Class.prototype.queue = [];
+    _Class.prototype.breakOnError = true;
 
-      _Class.prototype.mode = 'async';
+    _Class.prototype.autoClear = false;
 
-      _Class.prototype.lastResult = null;
+    _Class.prototype.queue = [];
 
-      _Class.prototype.results = [];
+    _Class.prototype.mode = 'async';
 
-      _Class.prototype.errors = [];
+    _Class.prototype.lastResult = null;
 
-      _Class.prototype.next = function() {
-        throw new Error('Groups require a completion callback');
-      };
+    _Class.prototype.results = [];
 
-      function _Class() {
-        var arg, args, autoClear, breakOnError, mode, next, _i, _len;
-        args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-        this.clear();
-        for (_i = 0, _len = args.length; _i < _len; _i++) {
-          arg = args[_i];
-          if (typeof arg === 'string') {
-            this.mode = arg;
-          } else if (typeof arg === 'function') {
-            this.next = arg;
-          } else if (typeof arg === 'object') {
-            next = arg.next, mode = arg.mode, breakOnError = arg.breakOnError, autoClear = arg.autoClear;
-            if (next) {
-              this.next = next;
-            }
-            if (mode) {
-              this.mode = mode;
-            }
-            if (breakOnError) {
-              this.breakOnError = breakOnError;
-            }
-            if (autoClear) {
-              this.autoClear = autoClear;
-            }
-          } else {
-            throw new Error('Unknown argument sent to Groups constructor');
+    _Class.prototype.errors = [];
+
+    _Class.prototype.next = function() {
+      throw new Error('Groups require a completion callback');
+    };
+
+    function _Class() {
+      var arg, args, autoClear, breakOnError, mode, next, _i, _len;
+      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      this.clear();
+      for (_i = 0, _len = args.length; _i < _len; _i++) {
+        arg = args[_i];
+        if (typeof arg === 'string') {
+          this.mode = arg;
+        } else if (typeof arg === 'function') {
+          this.next = arg;
+        } else if (typeof arg === 'object') {
+          next = arg.next, mode = arg.mode, breakOnError = arg.breakOnError, autoClear = arg.autoClear;
+          if (next) {
+            this.next = next;
           }
+          if (mode) {
+            this.mode = mode;
+          }
+          if (breakOnError) {
+            this.breakOnError = breakOnError;
+          }
+          if (autoClear) {
+            this.autoClear = autoClear;
+          }
+        } else {
+          throw new Error('Unknown argument sent to Groups constructor');
         }
       }
+    }
 
-      _Class.prototype.clear = function() {
-        this.total = 0;
-        this.completed = 0;
-        this.running = 0;
-        this.exited = false;
-        this.queue = [];
-        this.results = [];
-        this.errors = [];
-        this.lastResult = null;
-        return this;
-      };
+    _Class.prototype.clear = function() {
+      this.total = 0;
+      this.completed = 0;
+      this.running = 0;
+      this.exited = false;
+      this.queue = [];
+      this.results = [];
+      this.errors = [];
+      this.lastResult = null;
+      return this;
+    };
 
-      _Class.prototype.hasTasks = function() {
-        return this.queue.length !== 0;
-      };
+    _Class.prototype.hasTasks = function() {
+      return this.queue.length !== 0;
+    };
 
-      _Class.prototype.hasCompleted = function() {
-        return this.total !== 0 && this.total === this.completed;
-      };
+    _Class.prototype.hasCompleted = function() {
+      return this.total !== 0 && this.total === this.completed;
+    };
 
-      _Class.prototype.isRunning = function() {
-        return this.running !== 0;
-      };
+    _Class.prototype.isRunning = function() {
+      return this.running !== 0;
+    };
 
-      _Class.prototype.hasExited = function(value) {
-        if (value != null) {
-          this.exited = value;
-        }
-        return this.exited === true;
-      };
+    _Class.prototype.hasExited = function(value) {
+      if (value != null) {
+        this.exited = value;
+      }
+      return this.exited === true;
+    };
 
-      _Class.prototype.complete = function() {
-        var args, err;
-        args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-        err = args[0] || void 0;
-        this.lastResult = args;
-        if (err) {
-          this.errors.push(err);
-        }
-        this.results.push(args);
-        if (this.running !== 0) {
-          --this.running;
-        }
-        if (this.hasExited()) {
+    _Class.prototype.complete = function() {
+      var args, err;
+      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      err = args[0] || void 0;
+      this.lastResult = args;
+      if (err) {
+        this.errors.push(err);
+      }
+      this.results.push(args);
+      if (this.running !== 0) {
+        --this.running;
+      }
+      if (this.hasExited()) {
 
+      } else {
+        if (err && this.breakOnError) {
+          this.exit();
         } else {
-          if (err && this.breakOnError) {
+          ++this.completed;
+          if (this.hasTasks()) {
+            this.nextTask();
+          } else if (this.isRunning() === false && this.hasCompleted()) {
             this.exit();
-          } else {
-            ++this.completed;
-            if (this.hasTasks()) {
-              this.nextTask();
-            } else if (this.isRunning() === false && this.hasCompleted()) {
-              this.exit();
-            }
           }
         }
-        return this;
-      };
+      }
+      return this;
+    };
 
-      _Class.prototype.completer = function() {
-        var _this = this;
-        return function() {
-          var args;
-          args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-          return _this.complete.apply(_this, args);
-        };
+    _Class.prototype.completer = function() {
+      var _this = this;
+      return function() {
+        var args;
+        args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+        return _this.complete.apply(_this, args);
       };
+    };
 
-      _Class.prototype.exit = function(err) {
-        var errors, lastResult, results;
-        if (err == null) {
-          err = null;
-        }
-        if (this.hasExited()) {
+    _Class.prototype.exit = function(err) {
+      var errors, lastResult, results;
+      if (err == null) {
+        err = null;
+      }
+      if (this.hasExited()) {
 
+      } else {
+        lastResult = this.lastResult;
+        errors = this.errors.length !== 0 ? this.errors : null;
+        results = this.results;
+        if (this.autoClear) {
+          this.clear();
         } else {
-          lastResult = this.lastResult;
-          errors = this.errors.length !== 0 ? this.errors : null;
-          results = this.results;
-          if (this.autoClear) {
-            this.clear();
-          } else {
-            this.hasExited(true);
-          }
-          if (typeof this.next === "function") {
-            this.next(errors, lastResult, results);
-          }
+          this.hasExited(true);
         }
-        return this;
-      };
-
-      _Class.prototype.tasks = function(tasks) {
-        var task, _i, _len;
-        for (_i = 0, _len = tasks.length; _i < _len; _i++) {
-          task = tasks[_i];
-          this.push(task);
+        if (typeof this.next === "function") {
+          this.next(errors, lastResult, results);
         }
-        return this;
-      };
+      }
+      return this;
+    };
 
-      _Class.prototype.push = function(task) {
+    _Class.prototype.tasks = function(tasks) {
+      var task, _i, _len;
+      for (_i = 0, _len = tasks.length; _i < _len; _i++) {
+        task = tasks[_i];
+        this.push(task);
+      }
+      return this;
+    };
+
+    _Class.prototype.push = function(task) {
+      ++this.total;
+      this.queue.push(task);
+      return this;
+    };
+
+    _Class.prototype.pushAndRun = function(task) {
+      if (this.mode === 'sync' && this.isRunning()) {
+        this.push(task);
+      } else {
         ++this.total;
-        this.queue.push(task);
-        return this;
-      };
+        this.runTask(task);
+      }
+      return this;
+    };
 
-      _Class.prototype.pushAndRun = function(task) {
-        if (this.mode === 'sync' && this.isRunning()) {
-          this.push(task);
+    _Class.prototype.nextTask = function() {
+      var task;
+      if (this.hasTasks()) {
+        task = this.queue.shift();
+        this.runTask(task);
+      }
+      return this;
+    };
+
+    _Class.prototype.runTask = function(task) {
+      try {
+        ++this.running;
+        task(this.completer());
+      } catch (err) {
+        this.complete(err);
+      }
+      return this;
+    };
+
+    _Class.prototype.run = function() {
+      var task, _i, _len, _ref;
+      if (this.isRunning() === false) {
+        this.hasExited(false);
+        if (this.hasTasks()) {
+          if (this.mode === 'sync') {
+            this.nextTask();
+          } else {
+            _ref = this.queue;
+            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+              task = _ref[_i];
+              this.nextTask();
+            }
+          }
         } else {
-          ++this.total;
-          this.runTask(task);
+          this.exit();
         }
-        return this;
-      };
+      }
+      return this;
+    };
 
-      _Class.prototype.nextTask = function() {
-        var task;
-        if (this.hasTasks()) {
-          task = this.queue.shift();
-          this.runTask(task);
+    _Class.prototype.async = function() {
+      this.mode = 'async';
+      this.run();
+      return this;
+    };
+
+    _Class.prototype.sync = function() {
+      this.mode = 'sync';
+      this.run();
+      return this;
+    };
+
+    return _Class;
+
+  })();
+
+  balUtilFlow.Block = (function(_super) {
+
+    __extends(_Class, _super);
+
+    _Class.prototype.blockBefore = function(block) {};
+
+    _Class.prototype.blockAfter = function(block, err) {};
+
+    _Class.prototype.blockTaskBefore = function(block, task, err) {};
+
+    _Class.prototype.blockTaskAfter = function(block, task, err) {};
+
+    function _Class(name, initFunction, parentBlock) {
+      var block;
+      block = this;
+      _Class.__super__.constructor.call(this, function(err) {
+        var _ref;
+        block.blockAfter(block, err);
+        return (_ref = block.parentBlock) != null ? _ref.complete(err) : void 0;
+      });
+      block.blockName = name;
+      if (parentBlock != null) {
+        block.parentBlock = parentBlock;
+      }
+      block.mode = 'sync';
+      block.initFunction = initFunction;
+      block.blockBefore(block);
+      if (block.initFunction != null) {
+        if (block.initFunction.length === 3) {
+          block.total = Infinity;
         }
-        return this;
-      };
-
-      _Class.prototype.runTask = function(task) {
         try {
-          ++this.running;
-          task(this.completer());
+          block.initFunction(function(name, fn) {
+            return block.block(name, fn);
+          }, function(name, fn) {
+            return block.task(name, fn);
+          }, function(err) {
+            return block.exit(err);
+          });
         } catch (err) {
-          this.complete(err);
+          block.exit(err);
         }
-        return this;
-      };
+        if (block.initFunction.length !== 3) {
+          block.run();
+        }
+      } else {
+        block.total = Infinity;
+      }
+      this;
 
-      _Class.prototype.run = function() {
-        var task, _i, _len, _ref;
-        if (this.isRunning() === false) {
-          this.hasExited(false);
-          if (this.hasTasks()) {
-            if (this.mode === 'sync') {
-              this.nextTask();
-            } else {
-              _ref = this.queue;
-              for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-                task = _ref[_i];
-                this.nextTask();
-              }
-            }
-          } else {
-            this.exit();
-          }
+    }
+
+    _Class.prototype.block = function(name, fn) {
+      var block, push;
+      block = this;
+      push = function(complete) {
+        if (block.total === Infinity) {
+          return block.pushAndRun(complete);
+        } else {
+          return block.push(complete);
         }
-        return this;
       };
+      push(function() {
+        var subBlock;
+        return subBlock = block.createSubBlock(name, fn, block);
+      });
+      return this;
+    };
 
-      _Class.prototype.async = function() {
-        this.mode = 'async';
-        this.run();
-        return this;
-      };
+    _Class.prototype.createSubBlock = function(name, fn, parentBlock) {
+      return new balUtilFlow.Block(name, fn, parentBlock);
+    };
 
-      _Class.prototype.sync = function() {
-        this.mode = 'sync';
-        this.run();
-        return this;
+    _Class.prototype.task = function(name, fn) {
+      var block, pushTask;
+      block = this;
+      pushTask = function(complete) {
+        if (block.total === Infinity) {
+          return block.pushAndRun(complete);
+        } else {
+          return block.push(complete);
+        }
       };
+      pushTask(function(complete) {
+        var preComplete;
+        preComplete = function(err) {
+          block.blockTaskAfter(block, name, err);
+          return complete(err);
+        };
+        block.blockTaskBefore(block, name);
+        if (fn.length < 1) {
+          try {
+            fn();
+            return preComplete();
+          } catch (err) {
+            return preComplete(err);
+          }
+        } else {
+          try {
+            return fn(preComplete);
+          } catch (err) {
+            return preComplete(err);
+          }
+        }
+      });
+      return this;
+    };
 
-      return _Class;
+    return _Class;
 
-    })()
-  };
+  })(balUtilFlow.Group);
 
+  balUtilFlow.Runner = (function() {
+
+    _Class.prototype.runnerBlock = null;
+
+    function _Class() {
+      if (this.runnerBlock == null) {
+        this.runnerBlock = new balUtilFlow.Block();
+      }
+    }
+
+    _Class.prototype.getRunnerBlock = function() {
+      return this.runnerBlock;
+    };
+
+    _Class.prototype.block = function() {
+      var args, _ref;
+      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      return (_ref = this.getRunnerBlock()).block.apply(_ref, args);
+    };
+
+    _Class.prototype.task = function() {
+      var args, _ref;
+      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      return (_ref = this.getRunnerBlock()).task.apply(_ref, args);
+    };
+
+    return _Class;
+
+  })();
+
   if (typeof module !== "undefined" && module !== null) {
@@ -308,0 +453,0 @@ module.exports = balUtilFlow;

lib/paths.js

@@ -276,8 +276,14 @@ // Generated by CoffeeScript 1.3.1
       balUtilPaths.readdir(options.path, function(err, files) {
-        if (err) {
+        if (tasks.exited) {
+          return;
+        } else if (err) {
+          debugger;
           console.log('balUtilPaths.scandir: readdir has failed on:', options.path);
           return tasks.exit(err);
         }
-        files.forEach(function(file) {
-          return tasks.push(function(complete) {
+        tasks.total += files.length;
+        if (!files.length) {
+          return tasks.exit();
+        } else {
+          return files.forEach(function(file) {
             var fileFullPath, fileRelativePath, isHiddenFile, isIgnoredFile;
@@ -292,2 +298,3 @@ isHiddenFile = options.ignoreHiddenFiles && /^\./.test(file);
             return balUtilPaths.isDirectory(fileFullPath, function(err, isDirectory, fileStat) {
+              var complete;
               if (tasks.exited) {
@@ -390,4 +397,3 @@
           });
-        });
-        return tasks.async();
+        }
       });
@@ -531,22 +537,25 @@ return this;
       balUtilPaths.ensurePath(dstPath, function(err) {
+        var fileFullPath, fileRelativePath, value;
         if (err) {
           return tasks.exit(err);
         }
-        balUtilFlow.each(tree, function(value, fileRelativePath) {
-          return tasks.push(function(complete) {
-            var fileFullPath;
-            fileFullPath = pathUtil.join(dstPath, fileRelativePath.replace(/^\/+/, ''));
-            if (typeof value === 'object') {
-              return balUtilPaths.writetree(fileFullPath, value, complete);
-            } else {
-              return balUtilPaths.writeFile(fileFullPath, value, function(err) {
-                if (err) {
-                  console.log('balUtilPaths.writetree: writeFile failed on:', fileFullPath);
-                }
-                return complete(err);
-              });
-            }
-          });
-        });
-        tasks.async();
+        for (fileRelativePath in tree) {
+          if (!__hasProp.call(tree, fileRelativePath)) continue;
+          value = tree[fileRelativePath];
+          ++tasks.total;
+          fileFullPath = pathUtil.join(dstPath, fileRelativePath.replace(/^\/+/, ''));
+          if (typeof value === 'object') {
+            balUtilPaths.writetree(fileFullPath, value, tasks.completer());
+          } else {
+            balUtilPaths.writeFile(fileFullPath, value, function(err) {
+              if (err) {
+                console.log('balUtilPaths.writetree: writeFile failed on:', fileFullPath);
+              }
+              return tasks.complete(err);
+            });
+          }
+        }
+        if (tasks.total === 0) {
+          tasks.exit();
+        }
       });
@@ -553,0 +562,0 @@ return this;

package.json

 {
 	"name": "bal-util",
-	"version": "1.7.0",
+	"version": "1.8.0",
 	"description": "Common utility functions for Node.js used and maintained by Benjamin Lupton",
@@ -5,0 +5,0 @@ "homepage": "https://github.com/balupton/bal-util",

No alert changes

Improved metrics

Total package byte prevSize

58022

increased by7.04%

Lines of code

1670

increased by8.51%

No dependency changes