0.1.0

.npmignore

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

README.md

@@ -14,10 +14,17 @@ npm install taskbuffer --save
 
 #### Task
 * A Task in its most simple form is a function that is executed when the task runs.
-* It can have a preTaska and an afterTask (those are run before or after the main function whenever the task is called)
-* A Task can be buffered. That means it can be called multiple times in a very short time. However execution happens in line: meaning execution of the task's main function is on halt until the previous task call has finished.
-* Task.trigger() and Task.triggerBuffered() always return a Promise;
-* Task.triggered() is an ObservableStram that emits events every time a task is promised.
+* A Task can have a **preTask** and an **afterTask**
+  (those are run before or after the main function whenever the task is called)
+* A Task can be buffered.
+  That means it can be called multiple times in a very short time.
+  However execution happens in line:
+  meaning execution of the task's main function is on halt until the previous task call has finished.
+  You can set bufferMax number, which is the max number of buffered task calls.
+  Any additional calls will then be truncated
+* Task.trigger() and Task.triggerBuffered() always return a Promise
+  which is fullfilled once the related task call has completed.
+* Task.triggered() is an Observable stream that emits events every time a task call is called and every time a call is completed.
 * Task is compatible to gulp streams.
 
 #### Taskchain

dist/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./taskbuffer.classes";
+import "./taskbuffer.classes.helpers";

dist/index.js

@@ -1,7 +1,10 @@
-var task = require("./taskbuffer.task");
-var taskbuffer = {
-    task: task
-};
-module.exports = taskbuffer;
+"use strict";
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+/// <reference path="./typings/main.d.ts" />
+__export(require("./taskbuffer.classes"));
+// import for naming only
+require("./taskbuffer.classes.helpers");
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLElBQU8sSUFBSSxXQUFXLG1CQUFtQixDQUFDLENBQUM7QUFHM0MsSUFBSSxVQUFVLEdBQUc7SUFDYixJQUFJLEVBQUUsSUFBSTtDQUNiLENBQUM7QUFFRixpQkFBUyxVQUFVLENBQUMiLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XG5pbXBvcnQgcGx1Z2lucyA9IHJlcXVpcmUoXCIuL3Rhc2tidWZmZXIucGx1Z2luc1wiKTtcbmltcG9ydCB0YXNrID0gcmVxdWlyZShcIi4vdGFza2J1ZmZlci50YXNrXCIpO1xuaW1wb3J0IHRhc2tjaGFpbiA9IHJlcXVpcmUoXCIuL3Rhc2tidWZmZXIudGFza2NoYWluXCIpO1xuXG52YXIgdGFza2J1ZmZlciA9IHtcbiAgICB0YXNrOiB0YXNrXG59O1xuXG5leHBvcnQgPSB0YXNrYnVmZmVyOyJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFBQSw0Q0FBNEM7QUFDNUMsaUJBQWMsc0JBQXNCLENBQUMsRUFBQTtBQUVyQyx5QkFBeUI7QUFDekIsUUFBTyw4QkFBOEIsQ0FBQyxDQUFEIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxyXG5leHBvcnQgKiBmcm9tIFwiLi90YXNrYnVmZmVyLmNsYXNzZXNcIjtcclxuXHJcbi8vIGltcG9ydCBmb3IgbmFtaW5nIG9ubHlcclxuaW1wb3J0IFwiLi90YXNrYnVmZmVyLmNsYXNzZXMuaGVscGVyc1wiIl19

dist/taskbuffer.classes.d.ts

@@ -0,0 +1,2 @@
+export * from "./taskbuffer.classes.task";
+export * from "./taskbuffer.classes.taskchain";

dist/taskbuffer.classes.helpers.d.ts

@@ -0,0 +1,9 @@
+import { Task } from "./taskbuffer.classes";
+export declare let emptyTaskFunction: () => any;
+export declare let isTask: (taskArg: any) => 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;

dist/taskbuffer.classes.js

@@ -1,65 +1,8 @@
-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 helpers = require("./taskbuffer.classes.helpers");
-var Task = (function () {
-    function Task(taskArg, optionsArg) {
-        if (optionsArg === void 0) { optionsArg = {}; }
-        var options = optionsArg;
-        this.task = taskArg;
-        this.preTask = options.preTask;
-        this.afterTask = options.afterTask;
-        this.idle = true;
-        this.running = false;
-        if (typeof options.buffered === "boolean") {
-            this.buffered = options.buffered;
-        }
-        else {
-            this.buffered = false;
-        }
-    }
-    Task.prototype.trigger = function () {
-        helpers.runTask(this.preTask)
-            .then(function () {
-        })
-            .then(function () {
-        });
-    };
-    ;
-    Task.prototype.triggerBuffered = function () {
-        var done = plugins.Q.defer();
-    };
-    Object.defineProperty(Task.prototype, "state", {
-        get: function () {
-            return this._state;
-        },
-        set: function (stateArg) {
-            if (stateArg == "locked") {
-                this._state = "locked";
-            }
-            else {
-                plugins.beautylog.error("state type");
-            }
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return Task;
-})();
-exports.Task = Task;
-var TaskChain = (function (_super) {
-    __extends(TaskChain, _super);
-    function TaskChain(taskArrayArg) {
-        _super.call(this, {
-            task: function () { }
-        });
-    }
-    return TaskChain;
-})(Task);
-exports.TaskChain = TaskChain;
+"use strict";
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+__export(require("./taskbuffer.classes.task"));
+__export(require("./taskbuffer.classes.taskchain"));
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRhc2tidWZmZXIuY2xhc3Nlcy50cyJdLCJuYW1lcyI6WyJUYXNrIiwiVGFzay5jb25zdHJ1Y3RvciIsIlRhc2sudHJpZ2dlciIsIlRhc2sudHJpZ2dlckJ1ZmZlcmVkIiwiVGFzay5zdGF0ZSIsIlRhc2tDaGFpbiIsIlRhc2tDaGFpbi5jb25zdHJ1Y3RvciJdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw0Q0FBNEM7QUFDNUMsSUFBTyxPQUFPLFdBQVcsc0JBQXNCLENBQUMsQ0FBQztBQUNqRCxJQUFPLE9BQU8sV0FBVyw4QkFBOEIsQ0FBQyxDQUFDO0FBQ3pEO0lBV0lBLGNBQVlBLE9BQU9BLEVBQUNBLFVBQWtFQTtRQUFsRUMsMEJBQWtFQSxHQUFsRUEsZUFBa0VBO1FBQ2xGQSxJQUFJQSxPQUFPQSxHQUFHQSxVQUFVQSxDQUFDQTtRQUN6QkEsSUFBSUEsQ0FBQ0EsSUFBSUEsR0FBR0EsT0FBT0EsQ0FBQ0E7UUFDcEJBLElBQUlBLENBQUNBLE9BQU9BLEdBQUdBLE9BQU9BLENBQUNBLE9BQU9BLENBQUNBO1FBQy9CQSxJQUFJQSxDQUFDQSxTQUFTQSxHQUFHQSxPQUFPQSxDQUFDQSxTQUFTQSxDQUFDQTtRQUNuQ0EsSUFBSUEsQ0FBQ0EsSUFBSUEsR0FBR0EsSUFBSUEsQ0FBQ0E7UUFDakJBLElBQUlBLENBQUNBLE9BQU9BLEdBQUdBLEtBQUtBLENBQUNBO1FBQ3JCQSxFQUFFQSxDQUFDQSxDQUFDQSxPQUFPQSxPQUFPQSxDQUFDQSxRQUFRQSxLQUFLQSxTQUFTQSxDQUFDQSxDQUFBQSxDQUFDQTtZQUN2Q0EsSUFBSUEsQ0FBQ0EsUUFBUUEsR0FBR0EsT0FBT0EsQ0FBQ0EsUUFBUUEsQ0FBQ0E7UUFDckNBLENBQUNBO1FBQUNBLElBQUlBLENBQUNBLENBQUNBO1lBQ0pBLElBQUlBLENBQUNBLFFBQVFBLEdBQUdBLEtBQUtBLENBQUNBO1FBQzFCQSxDQUFDQTtJQUNMQSxDQUFDQTtJQUNERCxzQkFBT0EsR0FBUEE7UUFDSUUsT0FBT0EsQ0FBQ0EsT0FBT0EsQ0FBQ0EsSUFBSUEsQ0FBQ0EsT0FBT0EsQ0FBQ0E7YUFDeEJBLElBQUlBLENBQUNBO1FBRU4sQ0FBQyxDQUFDQTthQUNEQSxJQUFJQSxDQUFDQTtRQUVOLENBQUMsQ0FBQ0EsQ0FBQUE7SUFDVkEsQ0FBQ0E7O0lBQ0RGLDhCQUFlQSxHQUFmQTtRQUNJRyxJQUFJQSxJQUFJQSxHQUFHQSxPQUFPQSxDQUFDQSxDQUFDQSxDQUFDQSxLQUFLQSxFQUFFQSxDQUFDQTtJQUNqQ0EsQ0FBQ0E7SUFFREgsc0JBQUlBLHVCQUFLQTthQUFUQTtZQUNJSSxNQUFNQSxDQUFDQSxJQUFJQSxDQUFDQSxNQUFNQSxDQUFDQTtRQUN2QkEsQ0FBQ0E7YUFDREosVUFBVUEsUUFBZUE7WUFDckJJLEVBQUVBLENBQUNBLENBQUNBLFFBQVFBLElBQUlBLFFBQVFBLENBQUNBLENBQUFBLENBQUNBO2dCQUN0QkEsSUFBSUEsQ0FBQ0EsTUFBTUEsR0FBR0EsUUFBUUEsQ0FBQ0E7WUFDM0JBLENBQUNBO1lBQUNBLElBQUlBLENBQUNBLENBQUNBO2dCQUNKQSxPQUFPQSxDQUFDQSxTQUFTQSxDQUFDQSxLQUFLQSxDQUFDQSxZQUFZQSxDQUFFQSxDQUFDQTtZQUMzQ0EsQ0FBQ0E7UUFDTEEsQ0FBQ0E7OztPQVBBSjtJQVFMQSxXQUFDQTtBQUFEQSxDQS9DQSxBQStDQ0EsSUFBQTtBQS9DWSxZQUFJLE9BK0NoQixDQUFBO0FBR0Q7SUFBK0JLLDZCQUFJQTtJQUMvQkEsbUJBQVlBLFlBQW1CQTtRQUMzQkMsa0JBQU1BO1lBQ0ZBLElBQUlBLEVBQUNBLGNBQVcsQ0FBQztTQUNwQkEsQ0FBQ0EsQ0FBQ0E7SUFDUEEsQ0FBQ0E7SUFDTEQsZ0JBQUNBO0FBQURBLENBTkEsQUFNQ0EsRUFOOEIsSUFBSSxFQU1sQztBQU5ZLGlCQUFTLFlBTXJCLENBQUEiLCJmaWxlIjoidGFza2J1ZmZlci5jbGFzc2VzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxuaW1wb3J0IHBsdWdpbnMgPSByZXF1aXJlKFwiLi90YXNrYnVmZmVyLnBsdWdpbnNcIik7XG5pbXBvcnQgaGVscGVycyA9IHJlcXVpcmUoXCIuL3Rhc2tidWZmZXIuY2xhc3Nlcy5oZWxwZXJzXCIpO1xuZXhwb3J0IGNsYXNzIFRhc2sge1xuICAgIHRhc2s6YW55O1xuICAgIGlkbGU6Ym9vbGVhbjtcbiAgICBydW5uaW5nOmJvb2xlYW47XG4gICAgYnVmZmVyZWQ6Ym9vbGVhbjtcbiAgICBwcml2YXRlIF9jb3VudGVyQnVmZmVyUmVsYXRpdmU7XG4gICAgcHJpdmF0ZSBfY291bnRlclRyaWdnZXJBYnNvbHV0ZTtcbiAgICBwcml2YXRlIF9zdGF0ZTpzdHJpbmc7XG4gICAgcHJlVGFzazpUYXNrO1xuICAgIGFmdGVyVGFzazpUYXNrO1xuXG4gICAgY29uc3RydWN0b3IodGFza0FyZyxvcHRpb25zQXJnOntwcmVUYXNrPzpUYXNrLGFmdGVyVGFzaz86VGFzaywgYnVmZmVyZWQ/OmJvb2xlYW59ID0ge30pe1xuICAgICAgICB2YXIgb3B0aW9ucyA9IG9wdGlvbnNBcmc7XG4gICAgICAgIHRoaXMudGFzayA9IHRhc2tBcmc7XG4gICAgICAgIHRoaXMucHJlVGFzayA9IG9wdGlvbnMucHJlVGFzaztcbiAgICAgICAgdGhpcy5hZnRlclRhc2sgPSBvcHRpb25zLmFmdGVyVGFzaztcbiAgICAgICAgdGhpcy5pZGxlID0gdHJ1ZTtcbiAgICAgICAgdGhpcy5ydW5uaW5nID0gZmFsc2U7XG4gICAgICAgIGlmICh0eXBlb2Ygb3B0aW9ucy5idWZmZXJlZCA9PT0gXCJib29sZWFuXCIpe1xuICAgICAgICAgICAgdGhpcy5idWZmZXJlZCA9IG9wdGlvbnMuYnVmZmVyZWQ7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICB0aGlzLmJ1ZmZlcmVkID0gZmFsc2U7XG4gICAgICAgIH1cbiAgICB9XG4gICAgdHJpZ2dlcigpe1xuICAgICAgICBoZWxwZXJzLnJ1blRhc2sodGhpcy5wcmVUYXNrKVxuICAgICAgICAgICAgLnRoZW4oZnVuY3Rpb24oKXtcblxuICAgICAgICAgICAgfSlcbiAgICAgICAgICAgIC50aGVuKGZ1bmN0aW9uKCl7XG5cbiAgICAgICAgICAgIH0pXG4gICAgfTtcbiAgICB0cmlnZ2VyQnVmZmVyZWQoKXtcbiAgICAgICAgdmFyIGRvbmUgPSBwbHVnaW5zLlEuZGVmZXIoKTtcbiAgICB9XG5cbiAgICBnZXQgc3RhdGUoKTpzdHJpbmcge1xuICAgICAgICByZXR1cm4gdGhpcy5fc3RhdGU7XG4gICAgfVxuICAgIHNldCBzdGF0ZShzdGF0ZUFyZzpzdHJpbmcpe1xuICAgICAgICBpZiAoc3RhdGVBcmcgPT0gXCJsb2NrZWRcIil7XG4gICAgICAgICAgICB0aGlzLl9zdGF0ZSA9IFwibG9ja2VkXCI7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5lcnJvcihcInN0YXRlIHR5cGVcIiApO1xuICAgICAgICB9XG4gICAgfVxufVxuXG5cbmV4cG9ydCBjbGFzcyBUYXNrQ2hhaW4gZXh0ZW5kcyBUYXNrIHtcbiAgICBjb25zdHJ1Y3Rvcih0YXNrQXJyYXlBcmc6VGFza1tdKXtcbiAgICAgICAgc3VwZXIoe1xuICAgICAgICAgICAgdGFzazpmdW5jdGlvbigpe31cbiAgICAgICAgfSk7XG4gICAgfVxufSJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRhc2tidWZmZXIuY2xhc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsaUJBQWMsMkJBQ2QsQ0FBQyxFQUR3QztBQUN6QyxpQkFBYyxnQ0FDZCxDQUFDLEVBRDZDIiwiZmlsZSI6InRhc2tidWZmZXIuY2xhc3Nlcy5qcyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCAqIGZyb20gXCIuL3Rhc2tidWZmZXIuY2xhc3Nlcy50YXNrXCJcclxuZXhwb3J0ICogZnJvbSBcIi4vdGFza2J1ZmZlci5jbGFzc2VzLnRhc2tjaGFpblwiXHJcbiJdfQ==

dist/taskbuffer.classes.task.d.ts

@@ -0,0 +1,25 @@
+export declare class Task {
+    name: string;
+    task: any;
+    running: boolean;
+    idle: boolean;
+    buffered: boolean;
+    bufferCounter: number;
+    bufferMax: number;
+    private _counterTriggerAbsolute;
+    private _state;
+    preTask: Task;
+    afterTask: Task;
+    constructor(optionsArg: {
+        taskFunction: any;
+        preTask?: Task;
+        afterTask?: Task;
+        buffered?: boolean;
+        bufferMax?: number;
+        name?: string;
+    });
+    trigger(): any;
+    triggerUnBuffered(): any;
+    triggerBuffered(): any;
+    state: string;
+}

dist/taskbuffer.classes.taskchain.d.ts

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

dist/taskbuffer.classes.taskspace.js

@@ -0,0 +1,3 @@
+
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiJ0YXNrYnVmZmVyLmNsYXNzZXMudGFza3NwYWNlLmpzIiwic291cmNlc0NvbnRlbnQiOltdfQ==

dist/taskbuffer.plugins.d.ts

@@ -0,0 +1,3 @@
+export import beautylog = require("beautylog");
+export declare let Q: any;
+export declare let lodash: any;

dist/taskbuffer.plugins.js

@@ -1,8 +1,7 @@
+"use strict";
 /// <reference path="./typings/main.d.ts" />
-var plugins = {
-    beautylog: require("beautylog"),
-    Q: require("q")
-};
-module.exports = plugins;
+exports.beautylog = require("beautylog");
+exports.Q = require("q");
+exports.lodash = require("lodash");
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRhc2tidWZmZXIucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSw0Q0FBNEM7QUFDNUMsSUFBSSxPQUFPLEdBQUc7SUFDVixTQUFTLEVBQUUsT0FBTyxDQUFDLFdBQVcsQ0FBQztJQUMvQixDQUFDLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQztDQUNsQixDQUFDO0FBQ0YsaUJBQVMsT0FBTyxDQUFDIiwiZmlsZSI6InRhc2tidWZmZXIucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cbnZhciBwbHVnaW5zID0ge1xuICAgIGJlYXV0eWxvZzogcmVxdWlyZShcImJlYXV0eWxvZ1wiKSxcbiAgICBROiByZXF1aXJlKFwicVwiKVxufTtcbmV4cG9ydCA9IHBsdWdpbnM7XG4iXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRhc2tidWZmZXIucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsNENBQTRDO0FBQzlCLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsU0FBQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNqQixjQUFNLEdBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDIiwiZmlsZSI6InRhc2tidWZmZXIucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cclxuZXhwb3J0IGltcG9ydCBiZWF1dHlsb2cgPSByZXF1aXJlKFwiYmVhdXR5bG9nXCIpO1xyXG5leHBvcnQgbGV0IFEgPSByZXF1aXJlKFwicVwiKTtcclxuZXhwb3J0IGxldCBsb2Rhc2g9IHJlcXVpcmUoXCJsb2Rhc2hcIik7XHJcbiJdfQ==

dist/taskbuffer.promisechain.js

@@ -1,3 +0,0 @@
-/// <reference path="./typings/main.d.ts" /> 
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRhc2tidWZmZXIucHJvbWlzZWNoYWluLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0QyIsImZpbGUiOiJ0YXNrYnVmZmVyLnByb21pc2VjaGFpbi5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz4iXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=

dist/taskbuffer.task.js

@@ -1,9 +0,0 @@
-/// <reference path="./typings/main.d.ts" />
-var classes = require("./taskbuffer.classes");
-var task = function (taskArg, options) {
-    var task = taskArg;
-    return new classes.Task(task, options);
-};
-module.exports = task;
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRhc2tidWZmZXIudGFzay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSw0Q0FBNEM7QUFDNUMsSUFBTyxPQUFPLFdBQVcsc0JBQXNCLENBQUMsQ0FBQztBQUNqRCxJQUFJLElBQUksR0FBRyxVQUFTLE9BQU8sRUFBQyxPQUFRO0lBQ2hDLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQTtJQUNsQixNQUFNLENBQUMsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksRUFBQyxPQUFPLENBQUMsQ0FBQztBQUMxQyxDQUFDLENBQUM7QUFDRixpQkFBUyxJQUFJLENBQUMiLCJmaWxlIjoidGFza2J1ZmZlci50YXNrLmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxuaW1wb3J0IGNsYXNzZXMgPSByZXF1aXJlKFwiLi90YXNrYnVmZmVyLmNsYXNzZXNcIik7XG52YXIgdGFzayA9IGZ1bmN0aW9uKHRhc2tBcmcsb3B0aW9ucz8pe1xuICAgIHZhciB0YXNrID0gdGFza0FyZ1xuICAgIHJldHVybiBuZXcgY2xhc3Nlcy5UYXNrKHRhc2ssb3B0aW9ucyk7XG59O1xuZXhwb3J0ID0gdGFzazsiXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=

dist/taskbuffer.taskchain.js

@@ -1,8 +0,0 @@
-/// <reference path="./typings/main.d.ts" />
-var classes = require("./taskbuffer.classes");
-var taskChain = function (taskArrayArg) {
-    return new classes.TaskChain(taskArrayArg);
-};
-module.exports = taskChain;
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRhc2tidWZmZXIudGFza2NoYWluLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0QztBQUM1QyxJQUFPLE9BQU8sV0FBVyxzQkFBc0IsQ0FBQyxDQUFDO0FBQ2pELElBQUksU0FBUyxHQUFHLFVBQVMsWUFBMkI7SUFFaEQsTUFBTSxDQUFDLElBQUksT0FBTyxDQUFDLFNBQVMsQ0FBQyxZQUFZLENBQUMsQ0FBQztBQUMvQyxDQUFDLENBQUM7QUFDRixpQkFBUyxTQUFTLENBQUMiLCJmaWxlIjoidGFza2J1ZmZlci50YXNrY2hhaW4uanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XG5pbXBvcnQgY2xhc3NlcyA9IHJlcXVpcmUoXCIuL3Rhc2tidWZmZXIuY2xhc3Nlc1wiKTtcbnZhciB0YXNrQ2hhaW4gPSBmdW5jdGlvbih0YXNrQXJyYXlBcmc6Y2xhc3Nlcy5UYXNrW10pe1xuXG4gICAgcmV0dXJuIG5ldyBjbGFzc2VzLlRhc2tDaGFpbih0YXNrQXJyYXlBcmcpO1xufTtcbmV4cG9ydCA9IHRhc2tDaGFpbjtcbiJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==

package.json

@@ -1,6 +1,6 @@
 {
   "name": "taskbuffer",
-  "version": "0.0.3",
+  "version": "0.1.0",
   "description": "manage triggers and execution of tasks with promises",
   "main": "dist/index.js",
   "scripts": {
@@ -23,13 +23,14 @@
   },
   "homepage": "https://github.com/pushrocks/taskbuffer#readme",
   "dependencies": {
-    "beautylog": "^2.1.1",
-    "npmts": "^3.1.2",
-    "projectinfo": "0.0.2",
+    "beautylog": "^5.0.0",
+    "lodash": "^4.12.0",
+    "projectinfo": "1.0.1",
     "q": "^1.4.1",
     "rx": "^4.1.0"
   },
   "devDependencies": {
-    "should": "^8.2.2"
+    "should": "^8.3.1",
+    "npmts": "^5.1.5"
   }
 }

test/test.ts

@@ -1,25 +1,84 @@
 /// <reference path="../ts/typings/main.d.ts" />
-var taskbuffer = require("../dist/index");
-var classes = require("../dist/taskbuffer.classes");
-var should = require("should");
-describe("taskbuffer",function(){
-    describe(".task()",function(){
-        var testTask;
-        it("should return a new task to var testTask",function(){
-            testTask = taskbuffer.task();
-        });
+import taskbuffer = require("../dist/index");
+let should = require("should");
+let plugins = {
+    q: require("q")
+}
 
-        it("testTask should be instance of Task",function(){
-            testTask.should.be.instanceof(classes.Task);
+// 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 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();
+                    console.log("Task1 run");
+                    done.resolve();
+                    return done.promise;
+                }
+            }),
+            new taskbuffer.Task({
+                name:"task2",
+                taskFunction: function(){
+                    let done = plugins.q.defer();
+                    console.log("Task2 run");
+                    done.resolve();
+                    return done.promise;
+                }
+            }),
+        ];
+        it("should run tasks in sequence",function(done){
+            testTaskchain = new taskbuffer.Taskchain({
+                name:"Taskchain1",
+                taskArray:testTaskArray
+            });
+            testTaskchain.trigger().then(done);
+            
+        });
     });
 });

ts/index.ts

@@ -1,2 +1,5 @@
 /// <reference path="./typings/main.d.ts" />
-export * from "./taskbuffer.classes"
+export * from "./taskbuffer.classes";
+
+// import for naming only
+import "./taskbuffer.classes.helpers"

ts/taskbuffer.classes.helpers.ts

@@ -1,16 +1,16 @@
 /// <reference path="./typings/main.d.ts" />
 import plugins = require("./taskbuffer.plugins");
-import classes = require("./taskbuffer.classes");
+import {Task} from "./taskbuffer.classes"
 
-export var emptyTaskFunction = function(){
-    var done = plugins.Q.defer();
+export let emptyTaskFunction = function(){
+    let done = plugins.Q.defer();
     done.resolve();
     return done.promise;
 };
 
-export var isTask = function(taskArg):boolean{
+export let isTask = function(taskArg):boolean{
     if(
-        taskArg instanceof classes.Task
+        taskArg instanceof Task
         && typeof taskArg.task === "function"
     ){
         return true;
@@ -19,11 +19,79 @@ export var isTask = function(taskArg):boolean{
     }
 };
 
-export var runTask = function(taskArg){
-    var done = plugins.Q.defer();
-    var taskReturn;
-    if(isTask(taskArg)){
-        taskReturn taskArg.task();
+
+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:{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 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");
+    }
+}

ts/taskbuffer.classes.task.ts

@@ -3,45 +3,60 @@ import * as plugins from "./taskbuffer.plugins"
 import * as helpers from "./taskbuffer.classes.helpers"
 
 export class Task {
-    task:function;
-    idle:boolean;
+    name:string;
+    task:any;
     running:boolean;
+    idle:boolean;
     buffered:boolean;
-    private _counterBufferRelative;
-    private _counterTriggerAbsolute;
+    bufferCounter:number;
+    bufferMax:number;
+    private _counterTriggerAbsolute:number;
     private _state:string;
     preTask:Task;
     afterTask:Task;
 
-    constructor(taskArg,optionsArg:{preTask?:Task,afterTask?:Task, buffered?:boolean} = {}){
+    constructor(optionsArg:{
+        taskFunction:any,
+        preTask?:Task,
+        afterTask?:Task,
+        buffered?:boolean,
+        bufferMax?:number,
+        name?:string
+    }){
+        if (!optionsArg){optionsArg = {taskFunction:function(){}}}
         var options = optionsArg;
-        this.task = taskArg;
+        this.task = optionsArg.taskFunction;
         this.preTask = options.preTask;
         this.afterTask = options.afterTask;
-        this.idle = true;
         this.running = false;
-        if (typeof options.buffered === "boolean"){
-            this.buffered = options.buffered;
-        } else {
-            this.buffered = false;
-        }
+        this.idle = true;
+        this.buffered = options.buffered;
+        this.bufferMax = options.bufferMax;
+        this.name = options.name;
     }
+    
     trigger(){
         let done = plugins.Q.defer();
-        helpers.runTask(this.preTask)
-            .then(function(){
-
-            })
-            .then(function(){
-
-            })
-            .then(function(){
-                done.resolve();
-            });
-       return done.promise;
+        if(this.buffered) {
+            this.triggerBuffered()
+                .then(done.resolve);
+        }
+        else {
+            this.triggerUnBuffered()
+                .then(done.resolve);
+        };
+        return done.promise;
     };
+    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 {
@@ -51,7 +66,7 @@ export class Task {
         if (stateArg == "locked"){
             this._state = "locked";
         } else {
-            plugins.beautylog.error("state type" );
+            plugins.beautylog.error("state type " + stateArg.blue + " could not be set");
         }
     }
 }

ts/taskbuffer.classes.taskchain.ts

@@ -1,11 +1,68 @@
 /// <reference path="./typings/main.d.ts" />
+import * as plugins from "./taskbuffer.plugins";
+import {Task} from "./taskbuffer.classes";
 import helpers = require("./taskbuffer.classes.helpers");
-import * as classes from "./taskbuffer.classes"
 
-export class Taskchain extends classes.Task {
-    constructor(taskArrayArg:classes.Task[]){
-        super({
-            task: function(){}
-        });
+export class Taskchain extends Task {
+    taskArray:Task[];
+    private _oraObject;
+    constructor(optionsArg:{
+        name?:string,
+        log?:boolean,
+        taskArray:Task[]
+    }){
+        let options = plugins.lodash.assign(
+            {
+                name:"unnamed Task",
+                log:false
+            },
+            optionsArg,
+            {
+                taskFunction: () => { // this is the function that gets executed when TaskChain is triggered
+                    console.log("running taskchain function");
+                    let done = plugins.Q.defer(); // this is the starting Deferred object 
+                    let taskCounter = 0;
+                    let iterateTasks = () => {
+                        if(typeof this.taskArray[taskCounter] != "undefined"){
+                            this.taskArray[taskCounter].trigger()
+                                .then(()=>{
+                                    taskCounter++;
+                                    iterateTasks();
+                                });     
+                        } else {
+                            done.resolve();
+                        }
+                    };
+                    iterateTasks();
+                    return done.promise;
+                }
+            }
+        );
+        super(options);
+        this.taskArray = optionsArg.taskArray;
+        this._oraObject = new plugins.beautylog.Ora("Taskchain idle","blue");
     }
-}
+    addTask(taskArg:Task){
+        this.taskArray.push(taskArg);
+    };
+    removeTask(taskArg:Task){
+        //TODO
+    };
+    shiftTask(){
+        
+    };
+    trigger(){
+        this._oraObject.start(this.name + " running...");
+        return helpers.runTask(this);
+    }
+};
+
+let myTask = new Taskchain(
+    {
+        taskArray: [
+            new Task({
+                taskFunction:function(){}
+            })
+        ]
+    }
+);

ts/taskbuffer.plugins.ts

@@ -1,6 +1,4 @@
 /// <reference path="./typings/main.d.ts" />
-var plugins = {
-    beautylog: require("beautylog"),
-    Q: require("q")
-};
-export = plugins;
+export import beautylog = require("beautylog");
+export let Q = require("q");
+export let lodash= require("lodash");

ts/typings.json

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