now returning correct Promise types

dist/taskbuffer.classes.helpers.d.ts

@@ -1,6 +1,8 @@
 /// <reference types="q" />
 import plugins = require("./taskbuffer.plugins");
 import { Task, ITaskFunction } from "./taskbuffer.classes.task";
+import { Promise } from "q";
+export { Promise } from "q";
 export declare let emptyTaskFunction: ITaskFunction;
 export declare let isTask: (taskArg: any) => boolean;
 export declare let isTaskTouched: (taskArg: Task, touchedTasksArray: Task[]) => boolean;
@@ -17,7 +19,7 @@ export declare class CycleCounter {
     cycleObjectArray: cycleObject[];
     constructor(taskArg: Task);
     getPromiseForCycle(cycleCountArg: number): plugins.Q.Promise<{}>;
-    informOfCycle(): void;
+    informOfCycle(x: any): void;
 }
 export declare class BufferRunner {
     task: Task;
@@ -27,5 +29,5 @@ export declare class BufferRunner {
     constructor(taskArg: Task);
     private _run(x);
     setBufferMax(bufferMaxArg: number): void;
-    trigger(x: any): PromiseLike<any>;
+    trigger(x: any): Promise<any>;
 }

dist/taskbuffer.classes.task.d.ts

@@ -1,4 +1,7 @@
+/// <reference types="q" />
 import * as helpers from "./taskbuffer.classes.helpers";
+import { Promise } from "q";
+export { Promise } from "q";
 export interface ITaskFunction {
     (x?: any): PromiseLike<any>;
 }
@@ -24,14 +27,14 @@ export declare class Task {
     /**
      * trigger the task. Will trigger buffered if this.buffered is true
      */
-    trigger(x?: any): PromiseLike<any>;
+    trigger(x?: any): Promise<any>;
     /**
      * trigger task unbuffered.
      */
-    triggerUnBuffered(x?: any): PromiseLike<any>;
+    triggerUnBuffered(x?: any): Promise<any>;
     /**
      * trigger task buffered.
      */
-    triggerBuffered(x?: any): PromiseLike<any>;
+    triggerBuffered(x?: any): Promise<any>;
     state: string;
 }

dist/taskbuffer.classes.task.js

@@ -1,6 +1,8 @@
 "use strict";
 const plugins = require("./taskbuffer.plugins");
 const helpers = require("./taskbuffer.classes.helpers");
+var q_1 = require("q");
+exports.Promise = q_1.Promise;
 class Task {
     constructor(optionsArg) {
         // initialize by default
@@ -56,4 +58,4 @@ class Task {
     }
 }
 exports.Task = Task;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFza2J1ZmZlci5jbGFzc2VzLnRhc2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90YXNrYnVmZmVyLmNsYXNzZXMudGFzay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsTUFBWSxPQUFPLFdBQU0sc0JBQ3pCLENBQUMsQ0FEOEM7QUFDL0MsTUFBWSxPQUFPLFdBQU0sOEJBR3pCLENBQUMsQ0FIc0Q7QUFPdkQ7SUFjSSxZQUFZLFVBT1g7UUFkRCx3QkFBd0I7UUFDeEIsWUFBTyxHQUFXLEtBQUssQ0FBQztRQUN4QixpQkFBWSxHQUFHLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM5QyxpQkFBWSxHQUFHLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM5QyxTQUFJLEdBQVcsSUFBSSxDQUFDO1FBQ1osV0FBTSxHQUFVLE9BQU8sQ0FBQztRQVU1QixJQUFJLE9BQU8sR0FBRyxVQUFVLENBQUM7UUFDekIsSUFBSSxDQUFDLFlBQVksR0FBRyxVQUFVLENBQUMsWUFBWSxDQUFDO1FBQzVDLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQztRQUMvQixJQUFJLENBQUMsU0FBUyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUM7UUFDbkMsSUFBSSxDQUFDLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7UUFDMUIsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDO1FBQ2pDLElBQUksQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUNsRCxJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUM7SUFDN0IsQ0FBQztJQUVEOztPQUVHO0lBQ0gsT0FBTyxDQUFDLENBQUU7UUFDTixFQUFFLENBQUEsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztZQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ2xDLENBQUM7UUFDRCxJQUFJLENBQUMsQ0FBQztZQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDckMsQ0FBQztRQUFBLENBQUM7SUFDTixDQUFDOztJQUVEOztPQUVHO0lBQ0gsaUJBQWlCLENBQUMsQ0FBRTtRQUNoQixNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUMsRUFBQyxDQUFDLEVBQUMsQ0FBQyxFQUFDLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxlQUFlLENBQUMsQ0FBRTtRQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN4QyxDQUFDO0lBRUQsSUFBSSxLQUFLO1FBQ0wsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDdkIsQ0FBQztJQUNELElBQUksS0FBSyxDQUFDLFFBQWU7UUFDckIsRUFBRSxDQUFDLENBQUMsUUFBUSxJQUFJLFFBQVEsQ0FBQyxDQUFBLENBQUM7WUFDdEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxRQUFRLENBQUM7UUFDM0IsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsYUFBYSxHQUFHLFFBQVEsQ0FBQyxJQUFJLEdBQUcsbUJBQW1CLENBQUMsQ0FBQztRQUNqRixDQUFDO0lBQ0wsQ0FBQztBQUNMLENBQUM7QUFwRVksWUFBSSxPQW9FaEIsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFza2J1ZmZlci5jbGFzc2VzLnRhc2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90YXNrYnVmZmVyLmNsYXNzZXMudGFzay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsTUFBWSxPQUFPLFdBQU0sc0JBQ3pCLENBQUMsQ0FEOEM7QUFDL0MsTUFBWSxPQUFPLFdBQU0sOEJBR3pCLENBQUMsQ0FIc0Q7QUFJdkQsa0JBQXNCLEdBQUcsQ0FBQztBQUFsQiw4QkFBa0I7QUFNMUI7SUFjSSxZQUFZLFVBT1g7UUFkRCx3QkFBd0I7UUFDeEIsWUFBTyxHQUFXLEtBQUssQ0FBQztRQUN4QixpQkFBWSxHQUFHLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM5QyxpQkFBWSxHQUFHLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM5QyxTQUFJLEdBQVcsSUFBSSxDQUFDO1FBQ1osV0FBTSxHQUFVLE9BQU8sQ0FBQztRQVU1QixJQUFJLE9BQU8sR0FBRyxVQUFVLENBQUM7UUFDekIsSUFBSSxDQUFDLFlBQVksR0FBRyxVQUFVLENBQUMsWUFBWSxDQUFDO1FBQzVDLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQztRQUMvQixJQUFJLENBQUMsU0FBUyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUM7UUFDbkMsSUFBSSxDQUFDLElBQUksR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7UUFDMUIsSUFBSSxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDO1FBQ2pDLElBQUksQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUNsRCxJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUM7SUFDN0IsQ0FBQztJQUVEOztPQUVHO0lBQ0gsT0FBTyxDQUFDLENBQUU7UUFDTixFQUFFLENBQUEsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztZQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ2xDLENBQUM7UUFDRCxJQUFJLENBQUMsQ0FBQztZQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDckMsQ0FBQztRQUFBLENBQUM7SUFDTixDQUFDOztJQUVEOztPQUVHO0lBQ0gsaUJBQWlCLENBQUMsQ0FBRTtRQUNoQixNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUMsRUFBQyxDQUFDLEVBQUMsQ0FBQyxFQUFDLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxlQUFlLENBQUMsQ0FBRTtRQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN4QyxDQUFDO0lBRUQsSUFBSSxLQUFLO1FBQ0wsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDdkIsQ0FBQztJQUNELElBQUksS0FBSyxDQUFDLFFBQWU7UUFDckIsRUFBRSxDQUFDLENBQUMsUUFBUSxJQUFJLFFBQVEsQ0FBQyxDQUFBLENBQUM7WUFDdEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxRQUFRLENBQUM7UUFDM0IsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsYUFBYSxHQUFHLFFBQVEsQ0FBQyxJQUFJLEdBQUcsbUJBQW1CLENBQUMsQ0FBQztRQUNqRixDQUFDO0lBQ0wsQ0FBQztBQUNMLENBQUM7QUFwRVksWUFBSSxPQW9FaEIsQ0FBQSJ9

test/test.ts

@@ -167,6 +167,19 @@ describe("taskbuffer", function () {
                 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();
@@ -178,7 +191,7 @@ describe("taskbuffer", function () {
             preTask:flowTask1
         });
         let flowTask3 = new taskbuffer.Taskchain({
-            taskArray:[flowTask1,flowTask2];
+            taskArray:[flowTask1,flowTask2]
         });
         it("should let a value flow through a task",function(done){
             flowTask1.trigger(12).then((x) => {
@@ -192,6 +205,14 @@ describe("taskbuffer", function () {
                 done();
             }).catch(done);
         });
+
+        it("should let a values flow between tasks when buffered",function(done){
+            flowTaskBuffered.trigger(12).then((x) => {
+                should.equal(x,12);
+                done();
+            }).catch(done);
+        });
+
         it("should let a values flow between tasks in Taskchain",function(done){
             flowTask3.trigger(12).then((x) => {
                 should.equal(x,12);

ts/taskbuffer.classes.helpers.ts

@@ -1,6 +1,9 @@
 import plugins = require("./taskbuffer.plugins");
 import { Task, ITaskFunction } from "./taskbuffer.classes.task";
 
+import {Promise} from "q";
+export {Promise} from "q";
+
 export let emptyTaskFunction: ITaskFunction = function (x) {
     let done = plugins.Q.defer();
     done.resolve();
@@ -100,12 +103,12 @@ export class CycleCounter {
         this.cycleObjectArray.push(cycleObject);
         return done.promise;
     };
-    informOfCycle(){
+    informOfCycle(x){
         let newCycleObjectArray:cycleObject[] = [];
         this.cycleObjectArray.forEach(cycleObjectArg => {
             cycleObjectArg.cycleCounter--;
             if(cycleObjectArg.cycleCounter <= 0){
-                cycleObjectArg.deferred.resolve();
+                cycleObjectArg.deferred.resolve(x);
             } else {
                 newCycleObjectArray.push(cycleObjectArg);
             };
@@ -131,7 +134,7 @@ export class BufferRunner {
                 runTask(this.task,{x:x})
                     .then((x) => {
                         this.bufferCounter--;
-                        this.task.cycleCounter.informOfCycle();
+                        this.task.cycleCounter.informOfCycle(x);
                         recursiveBufferRunner(x);
                     });
             } else {
@@ -144,11 +147,11 @@ export class BufferRunner {
     setBufferMax(bufferMaxArg:number){
         this.bufferMax = bufferMaxArg;
     };
-    trigger(x): PromiseLike<any> {
+    trigger(x): Promise<any> {
         if(!(this.bufferCounter >= this.bufferMax)){
             this.bufferCounter++
         };
-        let returnPromise:PromiseLike<any> = this.task.cycleCounter.getPromiseForCycle(this.bufferCounter + 1);
+        let returnPromise:Promise<any> = this.task.cycleCounter.getPromiseForCycle(this.bufferCounter + 1);
         if(!this.running){
             this._run(x);
         }

ts/taskbuffer.classes.task.ts

@@ -1,6 +1,9 @@
 import * as plugins from "./taskbuffer.plugins"
 import * as helpers from "./taskbuffer.classes.helpers"
 
+//interfaces
+import {Promise} from "q";
+export {Promise} from "q";
 
 export interface ITaskFunction {
     (x?:any):PromiseLike<any>;
@@ -41,7 +44,7 @@ export class Task {
     /**
      * trigger the task. Will trigger buffered if this.buffered is true
      */
-    trigger(x?):PromiseLike<any> {
+    trigger(x?):Promise<any> {
         if(this.buffered) {
             return this.triggerBuffered(x)
         }
@@ -53,14 +56,14 @@ export class Task {
     /**
      * trigger task unbuffered.
      */
-    triggerUnBuffered(x?):PromiseLike<any>{
+    triggerUnBuffered(x?):Promise<any>{
         return helpers.runTask(this,{x:x});
     }
     
     /**
      * trigger task buffered.
      */
-    triggerBuffered(x?):PromiseLike<any>{
+    triggerBuffered(x?):Promise<any>{
         return this.bufferRunner.trigger(x);
     }