1.0.13

update from q to smartq

See merge request !1

.gitignore

@@ -1,7 +1,4 @@
-.idea/
 coverage/
-docs/
-ts/*.js
-ts/*.js.map
-ts/typings/
 node_modules
+pages/
+.nogit/

.gitlab-ci.yml

@@ -0,0 +1,36 @@
+image: hosttoday/ht-docker-node:npmts
+
+stages:
+- test
+- release
+
+testLEGACY:
+  stage: test
+  script:
+    - npmci test legacy
+  tags:
+    - docker
+
+testLTS:
+  stage: test
+  script:
+    - npmci test lts
+  tags:
+    - docker
+    
+testSTABLE:
+  stage: test
+  script:
+    - npmci test stable
+  tags:
+    - docker
+
+release:
+  stage: release
+  environment: npmjs-com_registry
+  script:
+    - npmci publish
+  only:
+    - tags
+  tags:
+    - docker

.npmignore

@@ -1,5 +1,5 @@
-.idea/
 docs/
 coverage/
 ts/
 node_modules/
+pages/

.travis.yml

@@ -1,11 +0,0 @@
-language: node_js
-node_js:
-- stable
-deploy:
-  provider: npm
-  email: npm@lossless.digital
-  api_key:
-    secure: NejErc2+ohEEH8DecYcx6/2oSdEQQBRzlOwTMxQBftHdIkvziwOcCerqCJtrXuzalqAofVCcVisunWIXZmxfIBGV6mJVauCIp5KzH4JUhYzLym33p9MSphjlPNfsI6nKkW0LAgOMjkJGuHLqU3oskvBqYyh8m3NuCna5mNwm8lo5WGckzHSwdsmhnb839WhlZbmQc6M6WW6Ir7bbxX9ZOmNUYUWH6VdXfPBxoXN3nO21pXKt7Zg8/nU7IkF+VEUVfYNlR3xUiocWemuBFxjtsfoliQ/y/oGL7ccQ7OeE4PxSu+xNUpYYVipkQcRtyWDKCwJp4R2DNTj/ikOHH+BEFOBDG8qYxwf37Ju0jFybzslAEJLy5gl4bFjiZNA8ldUXY5ubJb56iZTNSbMU0lmXw+qKvIoyVY/1JAE5lzFGVA6nDdiUGAEOg/ajzAC3gjFU2QS2Wvncz3dky0k/2INBVUwmmAvAMazl5XkvHtQ3Wzb+Fc8TXWflqBDF0okySoJzlY13pm/OtOHipiqEyUCnqaUUwJtLIb6tHOPzxZKlWLCem7y84cDlxQSbLVItbArOJFHdr66sp/U/FqYAtWeLdbkhjCENFwzR9kYtEyEl+QWLTckO1/lVF4xJLh6drfhQ66CwF5bfqr5xIS08mnKuYBfJOA4/wV4bQFPhtYm7Oi8=
-  on:
-    tags: true
-    repo: pushrocks/taskbuffer

README.md

@@ -1,8 +1,22 @@
 # taskbuffer
-Flexible task organization for gulp. TypeScript ready!
+flexible task management. TypeScript ready!
 
-## Status
-[![Coverage Status](https://coveralls.io/repos/github/pushrocks/taskbuffer/badge.svg?branch=master)](https://coveralls.io/github/pushrocks/taskbuffer?branch=master)
+## Availabililty
+[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/taskbuffer)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/taskbuffer)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/taskbuffer)
+[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/taskbuffer/)
+
+## Status for master
+[![build status](https://GitLab.com/pushrocks/taskbuffer/badges/master/build.svg)](https://GitLab.com/pushrocks/taskbuffer/commits/master)
+[![coverage report](https://GitLab.com/pushrocks/taskbuffer/badges/master/coverage.svg)](https://GitLab.com/pushrocks/taskbuffer/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/taskbuffer.svg)](https://www.npmjs.com/package/taskbuffer)
+[![Dependency Status](https://david-dm.org/pushrocks/taskbuffer.svg)](https://david-dm.org/pushrocks/taskbuffer)
+[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/taskbuffer/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/taskbuffer/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/pushrocks/taskbuffer/badges/code.svg)](https://www.bithound.io/github/pushrocks/taskbuffer)
+[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 ## Install
 
@@ -28,24 +42,35 @@ npm install taskbuffer --save
 * Task is compatible to gulp streams.
 
 ### class `TaskChain`
-* Multiple Tasks can be combined in a bigger task using a Taskchain.
-* Taskchain extends Task.
+* TaskChain extends Task.
+* Multiple Tasks can be combined in a bigger task using a TaskChain.
 * While the tasks are async in themselve, TaskChain **runs Tasks serialized** (one after the other)
 * that means that tasks can rely on each other and 
 
 ### class `TaskParallel`
+* TaskParallel extends Task.
 * like TaskChain, however **tasks run in parallel**
-* Tasks cannot rely on each other
+* Tasks cannot rely on each other.
 
 ### Usage
 We highly recommend TypeScript as this module supports **TypeScript intellisense**.
-```
+```javascript
 import * as taskbuffer from "taskbuffer";
 
 myTask = new taskbuffer.Task({
+  preTask: someOtherTask // optional, don't worry loops are prevented
+  afterTask: someOtherTask // optional, don't worry loops are prevented
   name:"myTask1",
   taskFunction:() => {
-    //do some stuff and return promise
+    // do some stuff and return promise
+    // pass on any data through promise resolution
+    // Use TypeScript for better understanding and code completion
   }
 })
-```
+```
+
+For further information read the linked docs at the top of this README.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

dist/index.d.ts

@@ -1,5 +1,5 @@
-export { Task } from "./taskbuffer.classes.task";
-export { Taskchain } from "./taskbuffer.classes.taskchain";
-export { Taskparallel } from "./taskbuffer.classes.taskparallel";
-export { Taskspace } from "./taskbuffer.classes.taskspace";
-import "./taskbuffer.classes.helpers";
+export { Task, ITaskFunction } from './taskbuffer.classes.task';
+export { Taskchain } from './taskbuffer.classes.taskchain';
+export { Taskparallel } from './taskbuffer.classes.taskparallel';
+export { Taskspace } from './taskbuffer.classes.taskspace';
+import './taskbuffer.classes.helpers';

dist/index.js

@@ -1,5 +1,5 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+Object.defineProperty(exports, "__esModule", { value: true });
 var taskbuffer_classes_task_1 = require("./taskbuffer.classes.task");
 exports.Task = taskbuffer_classes_task_1.Task;
 var taskbuffer_classes_taskchain_1 = require("./taskbuffer.classes.taskchain");
@@ -10,5 +10,4 @@ var taskbuffer_classes_taskspace_1 = require("./taskbuffer.classes.taskspace");
 exports.Taskspace = taskbuffer_classes_taskspace_1.Taskspace;
 // import for naming only
 require("./taskbuffer.classes.helpers");
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSw0Q0FBNEM7QUFDNUMsd0NBQW1CLDJCQUEyQixDQUFDO0FBQXZDLDhDQUF1QztBQUMvQyw2Q0FBd0IsZ0NBQWdDLENBQUM7QUFBakQsNkRBQWlEO0FBQ3pELGdEQUEyQixtQ0FBbUMsQ0FBQztBQUF2RCxzRUFBdUQ7QUFDL0QsNkNBQXdCLGdDQUFnQyxDQUFDO0FBQWpELDZEQUFpRDtBQUV6RCx5QkFBeUI7QUFDekIsUUFBTyw4QkFBOEIsQ0FBQyxDQUFEIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxyXG5leHBvcnQge1Rhc2t9IGZyb20gXCIuL3Rhc2tidWZmZXIuY2xhc3Nlcy50YXNrXCI7XHJcbmV4cG9ydCB7VGFza2NoYWlufSBmcm9tIFwiLi90YXNrYnVmZmVyLmNsYXNzZXMudGFza2NoYWluXCI7XHJcbmV4cG9ydCB7VGFza3BhcmFsbGVsfSBmcm9tIFwiLi90YXNrYnVmZmVyLmNsYXNzZXMudGFza3BhcmFsbGVsXCI7XHJcbmV4cG9ydCB7VGFza3NwYWNlfSBmcm9tIFwiLi90YXNrYnVmZmVyLmNsYXNzZXMudGFza3NwYWNlXCI7XHJcblxyXG4vLyBpbXBvcnQgZm9yIG5hbWluZyBvbmx5XHJcbmltcG9ydCBcIi4vdGFza2J1ZmZlci5jbGFzc2VzLmhlbHBlcnNcIiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHFFQUE2RDtBQUFyRCx5Q0FBQSxJQUFJLENBQUE7QUFDWiwrRUFBeUQ7QUFBakQsbURBQUEsU0FBUyxDQUFBO0FBQ2pCLHFGQUErRDtBQUF2RCx5REFBQSxZQUFZLENBQUE7QUFDcEIsK0VBQXlEO0FBQWpELG1EQUFBLFNBQVMsQ0FBQTtBQUVqQix5QkFBeUI7QUFDekIsd0NBQXFDIn0=

dist/taskbuffer.classes.helpers.d.ts

@@ -1,9 +1,30 @@
-import { Task } from "./taskbuffer.classes.task";
-export declare let emptyTaskFunction: () => any;
-export declare let isTask: (taskArg: any) => boolean;
+import plugins = require('./taskbuffer.plugins');
+import { Task, ITaskFunction } from './taskbuffer.classes.task';
+export declare let emptyTaskFunction: ITaskFunction;
+export declare let isTask: (taskArg: Task) => boolean;
 export declare let isTaskTouched: (taskArg: Task, touchedTasksArray: Task[]) => boolean;
-export declare let runTask: (taskArg: Task, optionsArg?: {
-    touchedTasksArray: Task[];
-}) => any;
-export declare let runBufferedTask: (taskArg: Task) => void;
-export declare let updateTaskStatus: (taskArg: any, statusArg: string) => void;
+export declare let runTask: (taskArg: Task, optionsArg: {
+    x?: any;
+    touchedTasksArray?: Task[];
+}) => Promise<{}>;
+export interface cycleObject {
+    cycleCounter: number;
+    deferred: plugins.q.Deferred<any>;
+}
+export declare class CycleCounter {
+    task: Task;
+    cycleObjectArray: cycleObject[];
+    constructor(taskArg: Task);
+    getPromiseForCycle(cycleCountArg: number): Promise<{}>;
+    informOfCycle(x: any): void;
+}
+export declare class BufferRunner {
+    task: Task;
+    bufferCounter: number;
+    bufferMax: number;
+    running: boolean;
+    constructor(taskArg: Task);
+    private _run(x);
+    setBufferMax(bufferMaxArg: number): void;
+    trigger(x: any): Promise<any>;
+}

dist/taskbuffer.classes.task.d.ts

@@ -1,25 +1,37 @@
+import * as helpers from './taskbuffer.classes.helpers';
+export interface ITaskFunction {
+    (x?: any): PromiseLike<any>;
+}
 export declare class Task {
     name: string;
-    task: any;
-    running: boolean;
-    idle: boolean;
+    taskFunction: ITaskFunction;
     buffered: boolean;
-    bufferCounter: number;
-    bufferMax: number;
-    private _counterTriggerAbsolute;
-    private _state;
     preTask: Task;
     afterTask: Task;
+    running: boolean;
+    bufferRunner: helpers.BufferRunner;
+    cycleCounter: helpers.CycleCounter;
+    idle: boolean;
+    private _state;
     constructor(optionsArg: {
-        taskFunction: any;
+        taskFunction: ITaskFunction;
         preTask?: Task;
         afterTask?: Task;
         buffered?: boolean;
         bufferMax?: number;
         name?: string;
     });
-    trigger(): any;
-    triggerUnBuffered(): any;
-    triggerBuffered(): any;
+    /**
+     * trigger the task. Will trigger buffered if this.buffered is true
+     */
+    trigger(x?: any): Promise<any>;
+    /**
+     * trigger task unbuffered.
+     */
+    triggerUnBuffered(x?: any): Promise<any>;
+    /**
+     * trigger task buffered.
+     */
+    triggerBuffered(x?: any): Promise<any>;
     state: string;
 }

dist/taskbuffer.classes.taskchain.d.ts

@@ -1,14 +1,15 @@
-import { Task } from "./taskbuffer.classes.task";
+import { Task } from './taskbuffer.classes.task';
 export declare class Taskchain extends Task {
     taskArray: Task[];
     private _oraObject;
     constructor(optionsArg: {
+        taskArray: Task[];
         name?: string;
         log?: boolean;
-        taskArray: Task[];
+        buffered?: boolean;
+        bufferMax?: number;
     });
     addTask(taskArg: Task): void;
     removeTask(taskArg: Task): void;
     shiftTask(): void;
-    trigger(): any;
 }

dist/taskbuffer.classes.taskmanager.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFza2J1ZmZlci5jbGFzc2VzLnRhc2ttYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdGFza2J1ZmZlci5jbGFzc2VzLnRhc2ttYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==

dist/taskbuffer.classes.taskparallel.js

@@ -1,32 +1,24 @@
 "use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-/// <reference path="./typings/main.d.ts" />
-var plugins = require("./taskbuffer.plugins");
-var taskbuffer_classes_task_1 = require("./taskbuffer.classes.task");
-var Taskparallel = (function (_super) {
-    __extends(Taskparallel, _super);
-    function Taskparallel(optionsArg) {
-        var _this = this;
-        var options = plugins.lodash.assign(optionsArg, {
-            taskFunction: function () {
-                var done = plugins.Q.defer();
-                var promiseArray; // stores promises of all tasks, since they run in parallel
-                _this.taskArray.forEach(function (taskArg) {
+Object.defineProperty(exports, "__esModule", { value: true });
+const plugins = require("./taskbuffer.plugins");
+const taskbuffer_classes_task_1 = require("./taskbuffer.classes.task");
+class Taskparallel extends taskbuffer_classes_task_1.Task {
+    constructor(optionsArg) {
+        let options = plugins.lodash.merge(optionsArg, {
+            taskFunction: () => {
+                let done = plugins.q.defer();
+                let promiseArray = []; // stores promises of all tasks, since they run in parallel
+                this.taskArray.forEach(function (taskArg) {
                     promiseArray.push(taskArg.trigger());
                 });
-                plugins.Q.all(promiseArray)
+                Promise.all(promiseArray)
                     .then(done.resolve);
                 return done.promise;
             }
         });
-        _super.call(this, options);
+        super(options);
+        this.taskArray = optionsArg.taskArray;
     }
-    return Taskparallel;
-}(taskbuffer_classes_task_1.Task));
+}
 exports.Taskparallel = Taskparallel;
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRhc2tidWZmZXIuY2xhc3Nlcy50YXNrcGFyYWxsZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsNENBQTRDO0FBQzVDLElBQVksT0FBTyxXQUFNLHNCQUN6QixDQUFDLENBRDhDO0FBRS9DLHdDQUFtQiwyQkFFbkIsQ0FBQyxDQUY2QztBQUU5QztJQUFrQyxnQ0FBSTtJQUVsQyxzQkFBWSxVQUVYO1FBSkwsaUJBc0JDO1FBakJPLElBQUksT0FBTyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUMvQixVQUFVLEVBQ1Y7WUFDSSxZQUFZLEVBQUM7Z0JBQ1QsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztnQkFDN0IsSUFBSSxZQUFZLENBQUMsQ0FBQywyREFBMkQ7Z0JBQzdFLEtBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLFVBQVMsT0FBWTtvQkFDeEMsWUFBWSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztnQkFDekMsQ0FBQyxDQUFDLENBQUE7Z0JBQ0YsT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDO3FCQUN0QixJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUN4QixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztZQUN4QixDQUFDO1NBQ0osQ0FDSixDQUFBO1FBQ0Qsa0JBQU0sT0FBTyxDQUFDLENBQUM7SUFDbkIsQ0FBQztJQUNMLG1CQUFDO0FBQUQsQ0F0QkEsQUFzQkMsQ0F0QmlDLDhCQUFJLEdBc0JyQztBQXRCWSxvQkFBWSxlQXNCeEIsQ0FBQSIsImZpbGUiOiJ0YXNrYnVmZmVyLmNsYXNzZXMudGFza3BhcmFsbGVsLmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL3Rhc2tidWZmZXIucGx1Z2luc1wiXHJcbmltcG9ydCAqIGFzIGhlbHBlcnMgZnJvbSBcIi4vdGFza2J1ZmZlci5jbGFzc2VzLmhlbHBlcnNcIlxyXG5pbXBvcnQge1Rhc2t9IGZyb20gXCIuL3Rhc2tidWZmZXIuY2xhc3Nlcy50YXNrXCJcclxuXHJcbmV4cG9ydCBjbGFzcyBUYXNrcGFyYWxsZWwgZXh0ZW5kcyBUYXNrIHtcclxuICAgIHRhc2tBcnJheTpUYXNrW107XHJcbiAgICBjb25zdHJ1Y3RvcihvcHRpb25zQXJnOntcclxuICAgICAgICB0YXNrQXJyYXk6VGFza1tdXHJcbiAgICB9KXtcclxuICAgICAgICBsZXQgb3B0aW9ucyA9IHBsdWdpbnMubG9kYXNoLmFzc2lnbihcclxuICAgICAgICAgICAgb3B0aW9uc0FyZyxcclxuICAgICAgICAgICAge1xyXG4gICAgICAgICAgICAgICAgdGFza0Z1bmN0aW9uOigpID0+IHtcclxuICAgICAgICAgICAgICAgICAgICBsZXQgZG9uZSA9IHBsdWdpbnMuUS5kZWZlcigpO1xyXG4gICAgICAgICAgICAgICAgICAgIGxldCBwcm9taXNlQXJyYXk7IC8vIHN0b3JlcyBwcm9taXNlcyBvZiBhbGwgdGFza3MsIHNpbmNlIHRoZXkgcnVuIGluIHBhcmFsbGVsXHJcbiAgICAgICAgICAgICAgICAgICAgdGhpcy50YXNrQXJyYXkuZm9yRWFjaChmdW5jdGlvbih0YXNrQXJnOlRhc2spe1xyXG4gICAgICAgICAgICAgICAgICAgICAgICBwcm9taXNlQXJyYXkucHVzaCh0YXNrQXJnLnRyaWdnZXIoKSk7XHJcbiAgICAgICAgICAgICAgICAgICAgfSlcclxuICAgICAgICAgICAgICAgICAgICBwbHVnaW5zLlEuYWxsKHByb21pc2VBcnJheSlcclxuICAgICAgICAgICAgICAgICAgICAgICAgLnRoZW4oZG9uZS5yZXNvbHZlKTtcclxuICAgICAgICAgICAgICAgICAgICByZXR1cm4gZG9uZS5wcm9taXNlO1xyXG4gICAgICAgICAgICAgICAgfVxyXG4gICAgICAgICAgICB9XHJcbiAgICAgICAgKVxyXG4gICAgICAgIHN1cGVyKG9wdGlvbnMpO1xyXG4gICAgfVxyXG59XHJcblxyXG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFza2J1ZmZlci5jbGFzc2VzLnRhc2twYXJhbGxlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3Rhc2tidWZmZXIuY2xhc3Nlcy50YXNrcGFyYWxsZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxnREFBK0M7QUFFL0MsdUVBQWdEO0FBRWhELGtCQUEwQixTQUFRLDhCQUFJO0lBRWxDLFlBQVksVUFFWDtRQUNHLElBQUksT0FBTyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUM5QixVQUFVLEVBQ1Y7WUFDSSxZQUFZLEVBQUU7Z0JBQ1YsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztnQkFDN0IsSUFBSSxZQUFZLEdBQW1CLEVBQUUsQ0FBQyxDQUFDLDJEQUEyRDtnQkFDbEcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsVUFBVSxPQUFPO29CQUNwQyxZQUFZLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO2dCQUN6QyxDQUFDLENBQUMsQ0FBQTtnQkFDRixPQUFPLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQztxQkFDcEIsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDeEIsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7WUFDeEIsQ0FBQztTQUNKLENBQ0osQ0FBQztRQUNGLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNmLElBQUksQ0FBQyxTQUFTLEdBQUcsVUFBVSxDQUFDLFNBQVMsQ0FBQztJQUMxQyxDQUFDO0NBQ0o7QUF2QkQsb0NBdUJDIn0=

dist/taskbuffer.classes.taskspace.js

@@ -1,9 +1,6 @@
 "use strict";
-var Taskspace = (function () {
-    function Taskspace() {
-    }
-    return Taskspace;
-}());
+Object.defineProperty(exports, "__esModule", { value: true });
+class Taskspace {
+}
 exports.Taskspace = Taskspace;
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRhc2tidWZmZXIuY2xhc3Nlcy50YXNrc3BhY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUlBO0lBQUE7SUFFQSxDQUFDO0lBQUQsZ0JBQUM7QUFBRCxDQUZBLEFBRUMsSUFBQTtBQUZZLGlCQUFTLFlBRXJCLENBQUEiLCJmaWxlIjoidGFza2J1ZmZlci5jbGFzc2VzLnRhc2tzcGFjZS5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi90YXNrYnVmZmVyLnBsdWdpbnNcIlxyXG5pbXBvcnQgKiBhcyBoZWxwZXJzIGZyb20gXCIuL3Rhc2tidWZmZXIuY2xhc3Nlcy5oZWxwZXJzXCJcclxuXHJcbmV4cG9ydCBjbGFzcyBUYXNrc3BhY2Uge1xyXG4gICAgXHJcbn0iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFza2J1ZmZlci5jbGFzc2VzLnRhc2tzcGFjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3Rhc2tidWZmZXIuY2xhc3Nlcy50YXNrc3BhY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFHQTtDQUVDO0FBRkQsOEJBRUMifQ==

dist/taskbuffer.plugins.d.ts

@@ -1,3 +1,6 @@
-export import beautylog = require("beautylog");
-export declare let Q: any;
-export declare let lodash: any;
+import 'typings-global';
+import * as beautylog from 'beautylog';
+import * as lodash from 'lodash';
+import * as rxjs from 'rxjs';
+import * as q from 'smartq';
+export { beautylog, lodash, rxjs, q };

dist/taskbuffer.plugins.js

@@ -1,7 +1,12 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
-exports.beautylog = require("beautylog");
-exports.Q = require("q");
-exports.lodash = require("lodash");
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRhc2tidWZmZXIucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsNENBQTRDO0FBQzlCLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsU0FBQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNqQixjQUFNLEdBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDIiwiZmlsZSI6InRhc2tidWZmZXIucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cclxuZXhwb3J0IGltcG9ydCBiZWF1dHlsb2cgPSByZXF1aXJlKFwiYmVhdXR5bG9nXCIpO1xyXG5leHBvcnQgbGV0IFEgPSByZXF1aXJlKFwicVwiKTtcclxuZXhwb3J0IGxldCBsb2Rhc2g9IHJlcXVpcmUoXCJsb2Rhc2hcIik7XHJcbiJdfQ==
+Object.defineProperty(exports, "__esModule", { value: true });
+require("typings-global");
+const beautylog = require("beautylog");
+exports.beautylog = beautylog;
+const lodash = require("lodash");
+exports.lodash = lodash;
+const rxjs = require("rxjs");
+exports.rxjs = rxjs;
+const q = require("smartq");
+exports.q = q;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFza2J1ZmZlci5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvdGFza2J1ZmZlci5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMEJBQXVCO0FBQ3ZCLHVDQUFzQztBQU1sQyw4QkFBUztBQUxiLGlDQUFnQztBQU01Qix3QkFBTTtBQUxWLDZCQUE0QjtBQU14QixvQkFBSTtBQUxSLDRCQUEyQjtBQU12QixjQUFDIn0=

npmextra.json

@@ -0,0 +1,5 @@
+{
+  "npmts":{
+    "mode":"default"
+  }
+}

npmts.json

@@ -1,4 +0,0 @@
-{
-  "mode":"default",
-  "coveralls":true
-}

package.json

@@ -1,36 +1,38 @@
 {
   "name": "taskbuffer",
-  "version": "0.1.1",
-  "description": "Flexible task organization for gulp. TypeScript ready!",
+  "version": "1.0.13",
+  "description": "flexible task management. TypeScript ready!",
   "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
     "test": "(npmts)"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/pushrocks/taskbuffer.git"
+    "url": "git+https://gitlab.com/pushrocks/taskbuffer.git"
   },
   "keywords": [
     "gulp",
-    "tasks",
-    "watch",
-    "buffer"
+    "task",
+    "buffer",
+    "TypeScript",
+    "push.rocks"
   ],
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/pushrocks/taskbuffer/issues"
+    "url": "https://gitlab.com/pushrocks/taskbuffer/issues"
   },
-  "homepage": "https://github.com/pushrocks/taskbuffer#readme",
+  "homepage": "https://gitlab.com/pushrocks/taskbuffer#readme",
   "dependencies": {
-    "beautylog": "^5.0.0",
-    "lodash": "^4.12.0",
-    "projectinfo": "1.0.1",
-    "q": "^1.4.1",
-    "rx": "^4.1.0"
+    "@types/lodash": "4.x.x",
+    "beautylog": "^6.1.10",
+    "lodash": "^4.17.4",
+    "rxjs": "^5.4.0",
+    "smartq": "^1.1.1",
+    "typings-global": "^1.0.17"
   },
   "devDependencies": {
-    "should": "^8.3.1",
-    "npmts": "^5.1.5"
+    "tapbundle": "^1.0.14"
   }
 }

test/test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,IAAI,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAC1C,IAAI,OAAO,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AACpD,IAAI,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,QAAQ,CAAC,YAAY,EAAC;IAClB,QAAQ,CAAC,SAAS,EAAC;QACf,IAAI,QAAQ,CAAC;QACb,EAAE,CAAC,0CAA0C,EAAC;YAC1C,QAAQ,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAC;YACrC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,uBAAuB,EAAC;YACvB,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YACjD,CAAC;QACL,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,sDAAsD,EAAC;YACtD,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QACvC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

test/test.ts

@@ -1,83 +1,208 @@
-/// <reference path="../ts/typings/main.d.ts" />
-import taskbuffer = require("../dist/index");
-let should = require("should");
-let plugins = {
-    q: require("q")
-}
+import { expect, tap } from 'tapbundle'
+import taskbuffer = require('../dist/index')
+
+import * as q from 'smartq'
 
 // setup some testData to work with
-let testTask:taskbuffer.Task;
-let testTaskFunction = function(){
-    let done = plugins.q.defer();
-    console.log("main function executed!")
-    done.resolve();
-    return done.promise;
+let testTask: taskbuffer.Task
+let testTaskFunction = function () {
+  let done = q.defer()
+  console.log('main function executed!')
+  done.resolve()
+  return done.promise
 }
-let testPreTask = new taskbuffer.Task({
-    taskFunction:function(){
-        console.log("preTask executed");
-    },
-    preTask:testTask
-});
 
-describe("taskbuffer",function(){
-    describe(".Task",function(){
-        it("new Task() should return a new task",function(){
-            testTask = new taskbuffer.Task({taskFunction:testTaskFunction,preTask:testPreTask});
-        });
-        it("testTask should be and instance of Task",function(){
-            testTask.should.be.instanceof(taskbuffer.Task);
-        });
-        it("testTask.idle is true",function(){
-            if (!testTask.idle){
-                throw new Error("testTask.idle is not true");
-            }
-            
-        });
-        it("testTask.running is type boolean and initially false",function(){
-            testTask.running.should.be.type("boolean");
-            testTask.running.should.be.false();
-        });
-        it("testTask.trigger() should return Promise",function(){
-            testTask.trigger().should.be.Promise();
-        });
-        it("testTask.trigger() returned Promise should be fullfilled",function(done){
-            testTask.trigger()
-                .then(done);
-        });
-        it("should run a task without pre and afterTask",function(done){
-            let localTestTask = new taskbuffer.Task({taskFunction:testTaskFunction});
-            localTestTask.trigger().then(done);
-        });
-    });
-    describe("Taskchain",function(){
-        let testTaskchain;
-        let testTaskArray = [
-            new taskbuffer.Task({
-                name:"task1",
-                taskFunction:function(){
-                    let done = plugins.q.defer();
-                    setTimeout(done.resolve,2000);
-                    return done.promise;
-                }
-            }),
-            new taskbuffer.Task({
-                name:"task2",
-                taskFunction: function(){
-                    let done = plugins.q.defer();
-                    setTimeout(done.resolve,2000);
-                    return done.promise;
-                }
-            }),
-        ];
-        it("should run tasks in sequence",function(done){
-            this.timeout(5000);
-            testTaskchain = new taskbuffer.Taskchain({
-                name:"Taskchain1",
-                taskArray:testTaskArray
-            });
-            testTaskchain.trigger().then(done);
-            
-        });
-    });
-});
+let testTaskFunctionTimeout = function () {
+  let done = q.defer()
+  console.log('main function started!')
+  setTimeout(() => {
+    console.log('main function ended!')
+    done.resolve()
+  }, 2000)
+  return done.promise
+}
+
+let testPreTask = new taskbuffer.Task({
+  taskFunction: function () {
+    let done = q.defer()
+    console.log('preTask executed')
+    done.resolve()
+    return done.promise
+  },
+  preTask: testTask
+})
+
+// some more tasks to wirj with
+let task1 = new taskbuffer.Task({
+  name: 'Task 1',
+  taskFunction: () => {
+    let done = q.defer()
+    console.log('Task1 started')
+    setTimeout(() => {
+      console.log('Task1 executed')
+      done.resolve()
+    }, 5000)
+    return done.promise
+  }
+})
+let task2 = new taskbuffer.Task({
+  name: 'Task 1',
+  taskFunction: () => {
+    let done = q.defer()
+    console.log('Task2 started')
+    setTimeout(() => {
+      console.log('Task2 executed')
+      done.resolve()
+    }, 5000)
+    return done.promise
+  }
+})
+let task3 = new taskbuffer.Task({
+  name: 'Task 3',
+  taskFunction: () => {
+    let done = q.defer()
+    console.log('Task3 started')
+    setTimeout(() => {
+      console.log('Task3 executed')
+      done.resolve()
+    }, 5000)
+    return done.promise
+  }
+})
+
+tap.test('new Task() should return a new task', async () => {
+  testTask = new taskbuffer.Task({ taskFunction: testTaskFunction, preTask: testPreTask })
+})
+tap.test('testTask should be and instance of Task', async () => {
+  expect(testTask).to.be.instanceof(taskbuffer.Task)
+})
+tap.test('testTask.idle is true', async () => {
+  if (!testTask.idle) {
+    throw new Error('testTask.idle is not true')
+  }
+
+})
+tap.test('testTask.running is type boolean and initially false', async () => {
+  expect(testTask.running).to.be.a('boolean')
+  // tslint:disable-next-line:no-unused-expression
+  expect(testTask.running).to.be.false
+})
+
+tap.test('testTask.trigger() expect return Promise', async () => {
+  expect(testTask.trigger()).to.be.instanceof(Promise)
+})
+
+tap.test('testTask.trigger() returned Promise expect be fullfilled', async () => {
+  await testTask.trigger()
+})
+
+tap.test('expect run a task without pre and afterTask', async () => {
+  let localTestTask = new taskbuffer.Task({ taskFunction: testTaskFunction })
+  await localTestTask.trigger()
+})
+
+tap.test('expect run buffered', async () => {
+  let localTestTask = new taskbuffer.Task({
+    taskFunction: testTaskFunctionTimeout,
+    buffered: true,
+    bufferMax: 2
+  })
+  localTestTask.trigger()
+  localTestTask.trigger()
+  localTestTask.trigger()
+  await localTestTask.trigger()
+})
+
+let testTaskchain
+let testTaskArray = [
+  new taskbuffer.Task({
+    name: 'task1',
+    taskFunction: function () {
+      let done = q.defer()
+      setTimeout(done.resolve, 2000)
+      return done.promise
+    }
+  }),
+  new taskbuffer.Task({
+    name: 'task2',
+    taskFunction: function () {
+      let done = q.defer()
+      setTimeout(done.resolve, 2000)
+      return done.promise
+    }
+  })
+]
+
+tap.test('expect run tasks in sequence', async () => {
+  testTaskchain = new taskbuffer.Taskchain({
+    name: 'Taskchain1',
+    taskArray: testTaskArray
+  })
+  await testTaskchain.trigger()
+})
+
+tap.test('expect run in Parallel', async () => {
+  let testTaskparallel = new taskbuffer.Taskparallel({
+    taskArray: [ task1, task2, task3 ]
+  })
+  await testTaskparallel.trigger()
+})
+
+let flowTask1 = new taskbuffer.Task({
+  taskFunction: (x: number) => {
+    let done = q.defer()
+    console.log('flowTask1')
+    console.log(x)
+    done.resolve(x)
+    return done.promise
+  }
+})
+
+let flowTaskBuffered = new taskbuffer.Task({
+  taskFunction: (x: number) => {
+    let done = q.defer()
+    console.log('flowTask1')
+    console.log(x)
+    done.resolve(x)
+    return done.promise
+  },
+  buffered: true,
+  bufferMax: 1
+})
+
+let flowTask2 = new taskbuffer.Task({
+  taskFunction: (x: number) => {
+    let done = q.defer()
+    console.log('flowTask2')
+    console.log(x)
+    done.resolve(x)
+    return done.promise
+  },
+  preTask: flowTask1
+})
+
+let flowTask3 = new taskbuffer.Taskchain({
+  taskArray: [ flowTask1, flowTask2 ]
+})
+
+tap.test('should let a value flow through a task', async () => {
+  let result = await flowTask1.trigger(12)
+  expect(result).to.equal(12)
+})
+
+tap.test('should let a values flow between tasks', async () => {
+  let result = await flowTask2.trigger(12)
+  expect(result).to.equal(12)
+})
+
+tap.test('expect let a values flow between tasks when buffered', async () => {
+  let result = await flowTaskBuffered.trigger(12)
+  expect(result).to.equal(12)
+})
+
+tap.test('should let a values flow between tasks in Taskchain', async () => {
+  let result = await flowTask3.trigger(12)
+  expect(result).to.equal(12)
+})
+
+tap.start()

ts/index.ts

@@ -1,8 +1,7 @@
-/// <reference path="./typings/main.d.ts" />
-export {Task} from "./taskbuffer.classes.task";
-export {Taskchain} from "./taskbuffer.classes.taskchain";
-export {Taskparallel} from "./taskbuffer.classes.taskparallel";
-export {Taskspace} from "./taskbuffer.classes.taskspace";
+export {Task,ITaskFunction} from './taskbuffer.classes.task';
+export {Taskchain} from './taskbuffer.classes.taskchain';
+export {Taskparallel} from './taskbuffer.classes.taskparallel';
+export {Taskspace} from './taskbuffer.classes.taskspace';
 
 // import for naming only
-import "./taskbuffer.classes.helpers"
+import './taskbuffer.classes.helpers'

ts/taskbuffer.classes.helpers.ts

@@ -1,97 +1,157 @@
-/// <reference path="./typings/main.d.ts" />
-import plugins = require("./taskbuffer.plugins");
-import {Task} from "./taskbuffer.classes.task";
+import plugins = require('./taskbuffer.plugins');
+import { Task, ITaskFunction } from './taskbuffer.classes.task'
 
-export let emptyTaskFunction = function(){
-    let done = plugins.Q.defer();
-    done.resolve();
-    return done.promise;
-};
-
-export let isTask = function(taskArg):boolean{
-    if(
-        taskArg instanceof Task
-        && typeof taskArg.task === "function"
-    ){
-        return true;
-    } else {
-        return false;
-    }
-};
-
-
-export let isTaskTouched = (taskArg:Task, touchedTasksArray:Task[]):boolean => {
-    let result = false;
-    for (let keyArg in touchedTasksArray){
-        if(taskArg === touchedTasksArray[keyArg]){
-            result = true;
-        }
-    }
-    return result;
+export let emptyTaskFunction: ITaskFunction = function (x) {
+  let done = plugins.q.defer()
+  done.resolve()
+  return done.promise
 }
 
-export let runTask = function(taskArg:Task,optionsArg:{touchedTasksArray:Task[]} = {touchedTasksArray:[]}){
-    let done = plugins.Q.defer();
-    updateTaskStatus(taskArg,"running");
-    done.promise.then(function(){updateTaskStatus(taskArg,"idle")})
-    let localDeferred = plugins.Q.defer();
-    let touchedTasksArray:Task[];
-    if(optionsArg.touchedTasksArray){
-        touchedTasksArray = optionsArg.touchedTasksArray;
-    } else {
-        touchedTasksArray = [];
-    }
-    touchedTasksArray.push(taskArg);
-    localDeferred.promise
-        .then(() =>{
-            if(taskArg.preTask && !isTaskTouched(taskArg.preTask,touchedTasksArray)){
-                return runTask(taskArg.preTask,{touchedTasksArray:touchedTasksArray})
-            } else {
-                let done2 = plugins.Q.defer();
-                done2.resolve();
-                return done2.promise;
-            }
-        })
-        .then(() => {
-            return taskArg.task();
-        })
-        .then(() => {
-            if(taskArg.afterTask && !isTaskTouched(taskArg.afterTask,touchedTasksArray)){
-                return runTask(taskArg.afterTask,{touchedTasksArray:touchedTasksArray})
-            } else {
-                let done2 = plugins.Q.defer();
-                done2.resolve();
-                return done2.promise;
-            }
-        })
-        .then(() => {
-            done.resolve();
-        });
-    localDeferred.resolve();
-    return done.promise;
-};
-
-export let runBufferedTask = (taskArg:Task) => {
-    let recursiveBufferRunner = () => {
-        if(taskArg.bufferCounter > 0){
-            taskArg.bufferCounter--;
-            runTask(taskArg)
-                .then(recursiveBufferRunner);
-        }
-    }
+export let isTask = function (taskArg: Task): boolean {
+  if (
+    taskArg instanceof Task
+    && typeof taskArg.taskFunction === 'function'
+  ) {
+    return true
+  } else {
+    return false
+  }
 }
 
-export let updateTaskStatus = (taskArg,statusArg:string) => {
-    switch (statusArg) {
-        case "running":
-            taskArg.running = true;
-            taskArg.idle = false;
-            break;
-        case "idle":
-            taskArg.running = false;
-            taskArg.idle = true;
-            break;
-        default:
-            throw new Error("status not recognised");
+
+export let isTaskTouched = (taskArg: Task, touchedTasksArray: Task[]): boolean => {
+  let result = false
+  for (let keyArg in touchedTasksArray) {
+    if (taskArg === touchedTasksArray[ keyArg ]) {
+      result = true
     }
-}
+  }
+  return result
+}
+
+export let runTask = function (taskArg: Task, optionsArg: { x?, touchedTasksArray?: Task[] }) {
+  let done = plugins.q.defer()
+
+  //  set running params
+  taskArg.running = true
+  done.promise.then(function () { taskArg.running = false })
+
+  // handle options
+  let options = plugins.lodash.merge(
+    { x: undefined, touchedTasksArray: [] },
+    optionsArg
+  )
+  let x = options.x
+  let touchedTasksArray: Task[] = options.touchedTasksArray
+
+  touchedTasksArray.push(taskArg)
+
+  // run the task cascade
+  let localDeferred = plugins.q.defer()
+  localDeferred.promise
+    .then(() => {
+      if (taskArg.preTask && !isTaskTouched(taskArg.preTask, touchedTasksArray)) {
+        return runTask(taskArg.preTask, { x: x, touchedTasksArray: touchedTasksArray })
+      } else {
+        let done2 = plugins.q.defer()
+        done2.resolve(x)
+        return done2.promise
+      }
+    })
+    .then(x => {
+      return taskArg.taskFunction(x)
+    })
+    .then(x => {
+      if (taskArg.afterTask && !isTaskTouched(taskArg.afterTask, touchedTasksArray)) {
+        return runTask(taskArg.afterTask, { x: x, touchedTasksArray: touchedTasksArray })
+      } else {
+        let done2 = plugins.q.defer()
+        done2.resolve(x)
+        return done2.promise
+      }
+    })
+    .then(x => {
+      done.resolve(x)
+    }).catch((err) => {
+      console.log(err)
+    })
+  localDeferred.resolve()
+  return done.promise
+}
+
+
+export interface cycleObject {
+  cycleCounter: number,
+  deferred: plugins.q.Deferred<any>
+}
+
+export class CycleCounter {
+  task: Task
+  cycleObjectArray: cycleObject[] = []
+  constructor(taskArg: Task) {
+    this.task = taskArg
+  };
+  getPromiseForCycle(cycleCountArg: number) {
+    let done = plugins.q.defer()
+    let cycleObject: cycleObject = {
+      cycleCounter: cycleCountArg,
+      deferred: done
+    }
+    this.cycleObjectArray.push(cycleObject)
+    return done.promise
+  };
+  informOfCycle(x) {
+    let newCycleObjectArray: cycleObject[] = []
+    this.cycleObjectArray.forEach(cycleObjectArg => {
+      cycleObjectArg.cycleCounter--
+      if (cycleObjectArg.cycleCounter <= 0) {
+        cycleObjectArg.deferred.resolve(x)
+      } else {
+        newCycleObjectArray.push(cycleObjectArg)
+      };
+    })
+    this.cycleObjectArray = newCycleObjectArray
+  }
+}
+
+export class BufferRunner {
+  task: Task
+  // initialze by default
+  bufferCounter: number = 0
+  bufferMax: number = 1
+  running: boolean = false
+  constructor(taskArg: Task) {
+    this.task = taskArg
+  };
+  private _run(x) {
+    let recursiveBufferRunner = (x) => {
+      if (this.bufferCounter >= 0) {
+        this.running = true
+        this.task.running = true
+        runTask(this.task, { x: x })
+          .then((x) => {
+            this.bufferCounter--
+            this.task.cycleCounter.informOfCycle(x)
+            recursiveBufferRunner(x)
+          })
+      } else {
+        this.running = false
+        this.task.running = false
+      }
+    }
+    recursiveBufferRunner(x)
+  };
+  setBufferMax(bufferMaxArg: number) {
+    this.bufferMax = bufferMaxArg
+  };
+  trigger(x): Promise<any> {
+    if (!(this.bufferCounter >= this.bufferMax)) {
+      this.bufferCounter++
+    };
+    let returnPromise: Promise<any> = this.task.cycleCounter.getPromiseForCycle(this.bufferCounter + 1)
+    if (!this.running) {
+      this._run(x)
+    }
+    return returnPromise
+  };
+};

ts/taskbuffer.classes.task.ts

@@ -1,72 +1,76 @@
-/// <reference path="./typings/main.d.ts" />
-import * as plugins from "./taskbuffer.plugins"
-import * as helpers from "./taskbuffer.classes.helpers"
+import * as plugins from './taskbuffer.plugins'
+import * as helpers from './taskbuffer.classes.helpers'
+
+export interface ITaskFunction {
+  (x?: any): PromiseLike<any>;
+}
 
 export class Task {
-    name:string;
-    task:any;
-    running:boolean;
-    idle:boolean;
-    buffered:boolean;
-    bufferCounter:number;
-    bufferMax:number;
-    private _counterTriggerAbsolute:number;
-    private _state:string;
-    preTask:Task;
-    afterTask:Task;
+  name: string;
+  taskFunction: ITaskFunction
+  buffered: boolean
+  preTask: Task
+  afterTask: Task
 
-    constructor(optionsArg:{
-        taskFunction:any,
-        preTask?:Task,
-        afterTask?:Task,
-        buffered?:boolean,
-        bufferMax?:number,
-        name?:string
-    }){
-        if (!optionsArg){optionsArg = {taskFunction:function(){}}}
-        var options = optionsArg;
-        this.task = optionsArg.taskFunction;
-        this.preTask = options.preTask;
-        this.afterTask = options.afterTask;
-        this.running = false;
-        this.idle = true;
-        this.buffered = options.buffered;
-        this.bufferMax = options.bufferMax;
-        this.name = options.name;
+  // initialize by default
+  running: boolean = false
+  bufferRunner = new helpers.BufferRunner(this)
+  cycleCounter = new helpers.CycleCounter(this)
+  idle: boolean = true
+  private _state: string = 'ready'
+
+  constructor(optionsArg: {
+    taskFunction: ITaskFunction,
+    preTask?: Task,
+    afterTask?: Task,
+    buffered?: boolean,
+    bufferMax?: number,
+    name?: string
+  }) {
+    let options = optionsArg
+    this.taskFunction = optionsArg.taskFunction
+    this.preTask = options.preTask
+    this.afterTask = options.afterTask
+    this.idle = !this.running
+    this.buffered = options.buffered
+    this.bufferRunner.setBufferMax(options.bufferMax)
+    this.name = options.name
+  }
+
+  /**
+   * trigger the task. Will trigger buffered if this.buffered is true
+   */
+  trigger(x?): Promise<any> {
+    if (this.buffered) {
+      return this.triggerBuffered(x)
     }
-    
-    trigger(){
-        let done = plugins.Q.defer();
-        if(this.buffered) {
-            this.triggerBuffered()
-                .then(done.resolve);
-        }
-        else {
-            this.triggerUnBuffered()
-                .then(done.resolve);
-        };
-        return done.promise;
+    else {
+      return this.triggerUnBuffered(x)
     };
-    triggerUnBuffered(){
-        return helpers.runTask(this);
-    }
-    triggerBuffered(){
-        var done = plugins.Q.defer();
-        if(!(this.bufferCounter >= this.bufferMax)){
-            this.bufferCounter++
-        }
-        helpers.runBufferedTask(this);
-        return done.promise;
-    }
+  };
 
-    get state():string {
-        return this._state;
-    }
-    set state(stateArg:string){
-        if (stateArg == "locked"){
-            this._state = "locked";
-        } else {
-            plugins.beautylog.error("state type " + stateArg.blue + " could not be set");
-        }
+  /**
+   * trigger task unbuffered.
+   */
+  triggerUnBuffered(x?): Promise<any> {
+    return helpers.runTask(this, { x: x })
+  }
+
+  /**
+   * trigger task buffered.
+   */
+  triggerBuffered(x?): Promise<any> {
+    return this.bufferRunner.trigger(x)
+  }
+
+  get state(): string {
+    return this._state
+  }
+  set state(stateArg: string) {
+    if (stateArg === 'locked') {
+      this._state = 'locked'
+    } else {
+      plugins.beautylog.error('state type ' + stateArg + ' could not be set')
     }
+  }
 }

ts/taskbuffer.classes.taskchain.ts

@@ -1,60 +1,60 @@
-/// <reference path="./typings/main.d.ts" />
-import * as plugins from "./taskbuffer.plugins";
-import {Task} from "./taskbuffer.classes.task";
-import helpers = require("./taskbuffer.classes.helpers");
+import * as plugins from './taskbuffer.plugins';
+import { Task } from './taskbuffer.classes.task';
+import helpers = require('./taskbuffer.classes.helpers');
 
 export class Taskchain extends Task {
-    taskArray:Task[];
-    private _oraObject:plugins.beautylog.Ora;
-    constructor(optionsArg:{
-        name?:string,
-        log?:boolean,
-        taskArray:Task[]
-    }){
-        let options = plugins.lodash.assign(
-            {
-                name:"unnamed Taskchain",
-                log:false
-            },
-            optionsArg,
-            {
-                taskFunction: () => { // this is the function that gets executed when TaskChain is triggered
-                    let done = plugins.Q.defer(); // this is the starting Deferred object 
-                    let taskCounter = 0;
-                    let iterateTasks = () => {
-                        if(typeof this.taskArray[taskCounter] != "undefined"){
-                            this._oraObject.text(this.name + " running: Task" + this.taskArray[taskCounter].name);
-                            this.taskArray[taskCounter].trigger()
-                                .then(()=>{
-                                    this._oraObject.log(this.taskArray[taskCounter].name,"ok");
-                                    taskCounter++;
-                                    iterateTasks();
-                                });     
-                        } else {
-                            this._oraObject.endOk("Taskchain \"" + this.name +  "\" completed successfully");
-                            done.resolve();
-                        }
-                    };
-                    iterateTasks();
-                    return done.promise;
-                }
+  taskArray: Task[]
+  private _oraObject
+  constructor(optionsArg: {
+    taskArray: Task[],
+    name?: string,
+    log?: boolean,
+    buffered?: boolean,
+    bufferMax?: number
+  }) {
+    let options = plugins.lodash.merge(
+      {
+        name: 'unnamed Taskchain',
+        log: false
+      },
+      optionsArg,
+      {
+        taskFunction: (x: any) => { // this is the function that gets executed when TaskChain is triggered
+          let done = plugins.q.defer() // this is the starting Deferred object
+          let taskCounter = 0 // counter for iterating async over the taskArray
+          let iterateTasks = (x) => {
+            if (typeof this.taskArray[ taskCounter ] !== 'undefined') {
+              this._oraObject.text(this.name + ' running: Task' + this.taskArray[ taskCounter ].name)
+              this.taskArray[ taskCounter ].trigger(x)
+                .then((x) => {
+                  plugins.beautylog.ok(this.taskArray[ taskCounter ].name)
+                  taskCounter++
+                  iterateTasks(x)
+                })
+            } else {
+              this._oraObject.endOk('Taskchain "' + this.name + '" completed successfully')
+              done.resolve(x)
             }
-        );
-        super(options);
-        this.taskArray = optionsArg.taskArray;
-        this._oraObject = new plugins.beautylog.Ora("Taskchain idle","blue");
-    }
-    addTask(taskArg:Task){
-        this.taskArray.push(taskArg);
+          }
+          iterateTasks(x)
+          return done.promise
+        }
+      }
+    )
+    super(options)
+    this.taskArray = optionsArg.taskArray
+    this._oraObject = plugins.beautylog.ora
+    if (optionsArg.log === true) {
+      this._oraObject.start()
     };
-    removeTask(taskArg:Task){
-        //TODO
-    };
-    shiftTask(){
-        
-    };
-    trigger(){
-        this._oraObject.start(this.name + " running...");
-        return helpers.runTask(this);
-    }
-};
+  }
+  addTask(taskArg: Task) {
+    this.taskArray.push(taskArg)
+  };
+  removeTask(taskArg: Task) {
+    // TODO
+  };
+  shiftTask() {
+
+  };
+}

ts/taskbuffer.classes.taskmanager.ts

@@ -0,0 +1 @@
+import * as plugins from './taskbuffer.plugins'

ts/taskbuffer.classes.taskparallel.ts

@@ -1,29 +1,29 @@
-/// <reference path="./typings/main.d.ts" />
 import * as plugins from "./taskbuffer.plugins"
 import * as helpers from "./taskbuffer.classes.helpers"
-import {Task} from "./taskbuffer.classes.task"
+import { Task } from "./taskbuffer.classes.task"
 
 export class Taskparallel extends Task {
-    taskArray:Task[];
-    constructor(optionsArg:{
-        taskArray:Task[]
+    taskArray: Task[];
+    constructor(optionsArg: {
+        taskArray: Task[]
     }){
-        let options = plugins.lodash.assign(
+        let options = plugins.lodash.merge(
             optionsArg,
             {
-                taskFunction:() => {
-                    let done = plugins.Q.defer();
-                    let promiseArray; // stores promises of all tasks, since they run in parallel
-                    this.taskArray.forEach(function(taskArg:Task){
+                taskFunction: () => {
+                    let done = plugins.q.defer();
+                    let promiseArray: Promise<any>[] = []; // stores promises of all tasks, since they run in parallel
+                    this.taskArray.forEach(function (taskArg) {
                         promiseArray.push(taskArg.trigger());
                     })
-                    plugins.Q.all(promiseArray)
+                    Promise.all(promiseArray)
                         .then(done.resolve);
                     return done.promise;
                 }
             }
-        )
+        );
         super(options);
+        this.taskArray = optionsArg.taskArray;
     }
 }
 

ts/taskbuffer.classes.taskspace.ts

@@ -1,4 +1,3 @@
-/// <reference path="./typings/main.d.ts" />
 import * as plugins from "./taskbuffer.plugins"
 import * as helpers from "./taskbuffer.classes.helpers"
 

ts/taskbuffer.plugins.ts

@@ -1,4 +1,12 @@
-/// <reference path="./typings/main.d.ts" />
-export import beautylog = require("beautylog");
-export let Q = require("q");
-export let lodash= require("lodash");
+import 'typings-global'
+import * as beautylog from 'beautylog'
+import * as lodash from 'lodash'
+import * as rxjs from 'rxjs'
+import * as q from 'smartq'
+
+export {
+    beautylog,
+    lodash,
+    rxjs,
+    q
+}

ts/typings.json

@@ -1,8 +0,0 @@
-{
-  "ambientDependencies": {
-    "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts",
-    "mocha": "github:Bartvds/tsd-deftools/typings/DefinitelyTyped/mocha/mocha.d.ts",
-    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts",
-    "should": "registry:dt/should#8.1.1+20160316155526"
-  }
-}

tslint.json

@@ -0,0 +1,3 @@
+{
+    "extends": "tslint-config-standard"
+}

yarn.lock

@@ -0,0 +1,426 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/chai-as-promised@0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-0.0.29.tgz#43d52892aa998e185a3de3e2477edb8573be1d77"
+  dependencies:
+    "@types/chai" "*"
+    "@types/promises-a-plus" "*"
+
+"@types/chai-string@^1.1.30":
+  version "1.1.30"
+  resolved "https://registry.yarnpkg.com/@types/chai-string/-/chai-string-1.1.30.tgz#4d8744b31a5a2295fc01c981ed1e2d4c8a070f0a"
+  dependencies:
+    "@types/chai" "*"
+
+"@types/chai@*", "@types/chai@^3.4.35":
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-3.5.2.tgz#c11cd2817d3a401b7ba0f5a420f35c56139b1c1e"
+
+"@types/lodash@4.x.x", "@types/lodash@^4.14.55":
+  version "4.14.65"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.65.tgz#a0f78d71ffcd3c02628d5f616410c98c424326d5"
+
+"@types/node@*", "@types/node@^7.0.29":
+  version "7.0.29"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.29.tgz#ccfcec5b7135c7caf6c4ffb8c7f33102340d99df"
+
+"@types/promises-a-plus@*":
+  version "0.0.27"
+  resolved "https://registry.yarnpkg.com/@types/promises-a-plus/-/promises-a-plus-0.0.27.tgz#c64651134614c84b8f5d7114ce8901d36a609780"
+
+"@types/shelljs@^0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.6.0.tgz#090b705c102ce7fc5c0c5ea9b524418ff15840df"
+  dependencies:
+    "@types/node" "*"
+
+"@types/which@^1.0.28":
+  version "1.0.28"
+  resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
+
+ansi-256-colors@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-256-colors/-/ansi-256-colors-1.1.0.tgz#910de50efcc7c09e3d82f2f87abd6b700c18818a"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+assertion-error@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
+
+balanced-match@^0.4.1:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+
+beautycolor@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/beautycolor/-/beautycolor-1.0.7.tgz#a4715738ac4c8221371e9cbeb5a6cc6d11ecbf7c"
+  dependencies:
+    ansi-256-colors "^1.1.0"
+    typings-global "^1.0.14"
+
+beautylog@^6.1.10:
+  version "6.1.10"
+  resolved "https://registry.yarnpkg.com/beautylog/-/beautylog-6.1.10.tgz#9c27e566937684cb689f9372d98cfa5415d50b72"
+  dependencies:
+    "@types/lodash" "^4.14.55"
+    beautycolor "^1.0.7"
+    figlet "^1.2.0"
+    lodash "^4.17.4"
+    ora "^1.1.0"
+    smartenv "^2.0.0"
+    smartq "^1.1.1"
+    typings-global "^1.0.14"
+
+bindings@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"
+
+brace-expansion@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
+  dependencies:
+    balanced-match "^0.4.1"
+    concat-map "0.0.1"
+
+chai-as-promised@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-6.0.0.tgz#1a02a433a6f24dafac63b9c96fa1684db1aa8da6"
+  dependencies:
+    check-error "^1.0.2"
+
+chai-string@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/chai-string/-/chai-string-1.3.0.tgz#df6139f294391b1035be5606f60a843b3a5041e7"
+
+chai@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
+  dependencies:
+    assertion-error "^1.0.1"
+    deep-eql "^0.1.3"
+    type-detect "^1.0.0"
+
+chalk@^1.0.0, chalk@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+check-error@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-spinners@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.0.0.tgz#ef987ed3d48391ac3dab9180b406a742180d6e6a"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+deep-eql@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
+  dependencies:
+    type-detect "0.1.1"
+
+early@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/early/-/early-2.1.1.tgz#841e23254ea5dc54d8afaeee82f5ab65c00ee23c"
+  dependencies:
+    beautycolor "^1.0.7"
+    smartq "^1.1.1"
+    typings-global "^1.0.16"
+
+es6-error@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
+
+escape-string-regexp@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+figlet@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/figlet/-/figlet-1.2.0.tgz#6c46537378fab649146b5a6143dda019b430b410"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+glob@^7.0.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+interpret@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+
+leakage@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/leakage/-/leakage-0.3.0.tgz#15d698abdc76bbc6439601f4f3020e77e2d50c39"
+  dependencies:
+    es6-error "^4.0.2"
+    left-pad "^1.1.3"
+    memwatch-next "^0.3.0"
+    minimist "^1.2.0"
+    pretty-bytes "^4.0.2"
+
+left-pad@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a"
+
+lodash@^4.17.4:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
+log-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
+  dependencies:
+    chalk "^1.0.0"
+
+memwatch-next@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/memwatch-next/-/memwatch-next-0.3.0.tgz#2111050f9a906e0aa2d72a4ec0f0089c78726f8f"
+  dependencies:
+    bindings "^1.2.1"
+    nan "^2.3.2"
+
+mimic-fn@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+
+minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+nan@^2.3.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+ora@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-1.2.0.tgz#32fb3183500efe83f5ea89101785f0ee6060fec9"
+  dependencies:
+    chalk "^1.1.1"
+    cli-cursor "^2.1.0"
+    cli-spinners "^1.0.0"
+    log-symbols "^1.0.2"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
+pretty-bytes@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
+
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  dependencies:
+    resolve "^1.1.6"
+
+resolve@^1.1.6:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
+  dependencies:
+    path-parse "^1.0.5"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
+rxjs@^5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.0.tgz#a7db14ab157f9d7aac6a56e655e7a3860d39bf26"
+  dependencies:
+    symbol-observable "^1.0.1"
+
+semver@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
+shelljs@^0.7.6:
+  version "0.7.8"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
+signal-exit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+smartchai@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/smartchai/-/smartchai-1.0.3.tgz#de6d010bb8b5aef24cb70b31a5f5334e8c41b72f"
+  dependencies:
+    "@types/chai" "^3.4.35"
+    "@types/chai-as-promised" "0.0.29"
+    "@types/chai-string" "^1.1.30"
+    chai "^3.5.0"
+    chai-as-promised "^6.0.0"
+    chai-string "^1.3.0"
+
+smartdelay@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/smartdelay/-/smartdelay-1.0.3.tgz#5fd44dad77262d110702f0293efa80c072cfb579"
+  dependencies:
+    smartq "^1.1.1"
+    typings-global "^1.0.16"
+
+smartenv@^2.0.0:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/smartenv/-/smartenv-2.0.6.tgz#b38c679b0c151b9af548f68c3a072c29d1417e8d"
+  dependencies:
+    lodash "^4.17.4"
+    smartq "^1.1.1"
+    typings-global "^1.0.14"
+
+smartq@^1.1.0, smartq@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/smartq/-/smartq-1.1.1.tgz#efb358705260d41ae18aef7ffd815f7b6fe17dd3"
+  dependencies:
+    typed-promisify "^0.3.0"
+    typings-global "^1.0.14"
+
+smartshell@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/smartshell/-/smartshell-1.0.6.tgz#27b1c79029784abe72ac7e91fe698b7ebecc6629"
+  dependencies:
+    "@types/shelljs" "^0.6.0"
+    "@types/which" "^1.0.28"
+    shelljs "^0.7.6"
+    smartq "^1.1.0"
+    which "^1.2.12"
+
+strip-ansi@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+symbol-observable@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
+
+tapbundle@^1.0.14:
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/tapbundle/-/tapbundle-1.0.14.tgz#75827e335fcb02216f0267a26a26d702ddc02e3c"
+  dependencies:
+    early "^2.1.1"
+    leakage "^0.3.0"
+    smartchai "^1.0.3"
+    smartdelay "^1.0.3"
+    smartq "^1.1.1"
+    typings-global "^1.0.16"
+
+type-detect@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
+
+type-detect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
+
+typed-promisify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/typed-promisify/-/typed-promisify-0.3.0.tgz#1ba0af5e444c87d8047406f18ce49092a1191853"
+
+typings-global@^1.0.14, typings-global@^1.0.16, typings-global@^1.0.17:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/typings-global/-/typings-global-1.0.17.tgz#41edc331ccec3168289adc8849e1e255efbe7152"
+  dependencies:
+    "@types/node" "^7.0.29"
+    semver "^5.3.0"
+    smartshell "^1.0.6"
+
+which@^1.2.12:
+  version "1.2.14"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
+  dependencies:
+    isexe "^2.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"