2.1.0

.gitignore

@@ -1,6 +1,10 @@
 node_modules/
 .settings/
 .idea/
+coverage/
+docs/
+public/
+pages/
 
 ts/*.js
 ts/*.js.map

.gitlab-ci.yml

@@ -0,0 +1,53 @@
+image: hosttoday/ht-docker-node:npmts
+stages:
+- test
+- release
+- trigger
+- pages
+testLEGACY:
+  stage: test
+  script:
+    - npmci test legacy
+  tags:
+    - docker
+  allow_failure: true
+testLTS:
+  stage: test
+  script:
+    - npmci test lts
+  tags:
+    - docker
+    
+testSTABLE:
+  stage: test
+  script:
+    - npmci test stable
+  tags:
+    - docker
+release:
+  stage: release
+  script:
+    - npmci publish
+  only:
+    - tags
+  tags:
+    - docker
+trigger:
+  stage: trigger
+  script:
+    - npmci trigger
+  only:
+    - tags
+  tags:
+    - docker
+pages:
+  image: hosttoday/ht-docker-node:npmpage
+  stage: pages
+  script:
+    - npmci command npmpage --host gitlab
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public

.npmignore

@@ -1,3 +1,5 @@
 ts/
 test/
+docs/
+coverage/
 node_modules/

.travis.yml

@@ -1,14 +0,0 @@
-language: node_js
-node_js:
-- 4.2.4
-deploy:
-  provider: npm
-  email: npm@lossless.digital
-  api_key:
-    secure: TWN/oiICeNbAhGTbwf75FnKhXnIvyA66FhNF7C0jpjn2SChSgTANai87r0f9oU9ZP3307XdGHB+fTTCJnk3upNiBoWZnkV8skkAlseOY4mVzF9mS0ZEkxVR32FjJDWfqzv6hC+Y9qNDsGs2+Avsm6fQUOispLXYAk6VzSQC1HgIfyOJtIWT5LqEyXyT6oJIZ7xwt1CYcIeEpHUiAaPYsMEpwF5OBDFByVmNV38VdRGIBsoQd3lixso7/zOOgYvjR4b/onz5WzeWYlhzAuyzOnRGr1r/9eXAzzkYydvgFx3ix5OlrreKVFB6OtMpz4jmHdu9YDGT5bcvL2bSU2SGVQM5Bx8zZXkAxACQR8ZvWmPaWYAWCu9wrW5oovjqFUV0iR26z/sTABJqz4GaXf/vFcll2EdTfUT6xj2kCodfxljaudjPUF27FSt1UJBC7jQky08wHb6+onrE8WoQXteIE2oxtHWEGOlV/GAz0+q4ih0bdOSKfThmux0iEFmeF16sWH9UdL2jBBKuus+fBPdhA3V6uwYQtsCAurhquQLISkf7kT3KujdLS302bEbkut+D1Kd22IYA1J0wYd87th88TZHx7wgQyC+8lVHG+B1R20xGLxyHVEOfyZtChfBRdn53EcUiA2XriJbfiIym4dAMUtOg2iRJamHAL7jebQEUu7oA=
-  on:
-    tags: true
-    repo: pushrocks/gulp-function
-notifications:
-  slack:
-    secure: Bb8P3fboL52CugSsp0RhOkGCeWVbgjb+QDpnMHdSOa0Nequj8V4kvrzBLZOBOjaSB0/gMvdoB4Slv2bls1dAxXW1IX1DdRb3RLMKj/Owje7eTd4IoUuSs49y6/yEkVK+E1wicdwjlMmvsk8fQE/owDRMRXYoXxhN2ZOVSQvAQ3iBO0eokFvWO7yj/VSxKoITymCXA3LfyzXXUuhvxuQd3BPZCe25xa6GWuHtaa5fbJg17pp8jJX6VZYLSRcSYyJxMU8SLdkrOsQZKj0+/Yfpu7XTmPbqxjNapuE7Zm70mi+aB26IQCnmwkdcEQNJVxQOKoP2+/ZnDfcTLQROwH1PJVzol0hneH6DdOlWt9bvBJcUvFRwaDgIb5xXQV8bGsRe5ayE/4MgCgfvdBTvevu6n12fmPx74prIv4pOPMwlALjjP8XavGL4A6amOuV7fJiSyGAku8aUe1rlUXyfoHJswMyOfkIsvnGDE3eEfq1WUIjn8tW1ZozJyoCTAIh6IHPI3Nsg3LkTRvDHPYq25/xCKWxGb2OaJc3JeqVREqm0auDqj6HoVAi/mW/uyvwX9jEVX8fNoQ69ac5VUMFfn2Mx3sU6aHKgZe/tdrtql6NYtIA+g5/ZDnHE1mnbl6MfrYiKwRbrICH5v/u1xK+4+yh09BUqazi3PzOhyTRfba/gRUg=

README.md

@@ -1,26 +1,59 @@
 # gulp-function
 accepts call to execute in gulp pipeline.
 
-### build status/Dependencies
+## Availabililty
-[![Build Status](https://travis-ci.org/pushrocks/gulp-function.svg?branch=v0.0.2)](https://travis-ci.org/pushrocks/gulp-function)
+[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/gulp-function)
+[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/gulp-function)
+[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/gulp-function)
+[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/gulp-function/)
+
+## Status for master
+[![build status](https://gitlab.com/pushrocks/gulp-function/badges/master/build.svg)](https://gitlab.com/pushrocks/gulp-function/commits/master)
+[![coverage report](https://gitlab.com/pushrocks/gulp-function/badges/master/coverage.svg)](https://gitlab.com/pushrocks/gulp-function/commits/master)
 [![Dependency Status](https://david-dm.org/pushrocks/gulp-function.svg)](https://david-dm.org/pushrocks/gulp-function)
-[![devDependency Status](https://david-dm.org/pushrocks/gulp-function/dev-status.svg)](https://david-dm.org/pushrocks/gulp-function#info=devDependencies)
+[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/gulp-function/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/gulp-function/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/pushrocks/gulp-function/badges/code.svg)](https://www.bithound.io/github/pushrocks/gulp-function)
+[![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/)
 
 ### Usage
 ```javascript
-var gulp = require("gulp");
+import * as gulp from 'gulp';
-var gulpFunction = require("gulp-function");
+import gulpFunction from 'gulp-function' // default ES6 export
+let Q = require("q");
 
-var myFunction = function () {
+let myFunction = function (file, enc) { // file and enc are optional in case you want to modify the file object
+    let done = Q.defer();
     console.log("Hello World!")
+    
+    // NOTE:
+    // you can use done.resolve as callback function
+    // of any async tasks within this function
+    done.resolve();
+    
+    return done.promise;
 }
 
 gulp.task('gulpTest',function() {
-    gulp.src('./mydir/*.something')
+    let stream = gulp.src('./mydir/*.something')
-        .pipe(gulpFunction(myFunction,'forEach'))
+        .pipe(gulpFunction(myFunction,'forEach')) //read the notes below
-        .pipe(gulp.dest("./build/"))
+        .pipe(gulp.dest("./build/"));
+    return stream; // by returning the stream gulp knows when our task has finished.
 });
 ```
 
->Note: The first argument of gulpFunction can also be an array of multiple functionnames.  
+### Notes:
->Note: the second argument can be empty (defaults to 'forEach') or 'atEnd'
+
+* The first argument of gulpFunction can also be an **array of multiple functionnames**.
+Each function can return a promise. The pipe stop will finish when every promise is fullfilled.
+When providing an array of functions be careful with modifying the file object -> race condition
+* The second argument can be empty, it defaults to "forEach"
+* The following options are available:
+    * "forFirst" - executes when first chunk/vinylfile of the stream reaches the pipestop.
+       file is pushed further down the line when function's returned promise is fullfilled.
+    *  "forEach" - executes like "forFirst" but with every chunk/vinylfile in the stream;
+    *  "atEnd" - executes after all chunks have passed and are processed in full.
+       That means the stream's "finish" event fires **before "atLast" is executed**!!!
+
+[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)

dist/index.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="node" />
+import 'typings-global';
+import { Transform } from 'stream';
+export declare type TExecutionMode = 'forEach' | 'forFirst' | 'atEnd';
+export interface IPromiseFunction {
+    (file?: any, enc?: any): PromiseLike<any>;
+}
+declare let mainExportFunction: (functionsToExecuteArg: IPromiseFunction | IPromiseFunction[], executionModeArg?: TExecutionMode) => Transform;
+export default mainExportFunction;

dist/index.js

@@ -0,0 +1,68 @@
+"use strict";
+require("typings-global");
+const q = require("q");
+const through2 = require("through2");
+let mainExportFunction = (functionsToExecuteArg, executionModeArg = 'forEach') => {
+    let promiseArray = [];
+    let runFunction = function (functionArg, file, enc) {
+        let returnValue = functionArg(file, enc);
+        if (typeof returnValue !== 'undefined' && typeof returnValue.then !== 'undefined') {
+            promiseArray.push(returnValue);
+        }
+    };
+    let checkAndRunFunction = function (file, enc) {
+        if (typeof functionsToExecuteArg === 'function') {
+            runFunction(functionsToExecuteArg, file, enc);
+        }
+        else if (Array.isArray(functionsToExecuteArg)) {
+            for (let anyFunction in functionsToExecuteArg) {
+                runFunction(functionsToExecuteArg[anyFunction], file, enc);
+            }
+        }
+        else {
+            throw new Error('gulp-callfunction: something is strange with the given arguments');
+        }
+        return q.all(promiseArray);
+    };
+    let hasExecutedOnce = false;
+    let forEach = function (file, enc, cb) {
+        switch (executionModeArg) {
+            case 'forEach':
+                checkAndRunFunction(file, enc).then(function () {
+                    cb(null, file);
+                });
+                break;
+            case 'forFirst':
+                if (hasExecutedOnce) {
+                    checkAndRunFunction(file, enc)
+                        .then(function () {
+                        cb(null, file);
+                    });
+                }
+                else {
+                    cb(null, file);
+                }
+                hasExecutedOnce = true;
+                break;
+            case 'atEnd':
+                cb(null, file);
+                break;
+            default:
+                break;
+        }
+    };
+    let atEnd = function (cb) {
+        if (executionModeArg === 'atEnd') {
+            checkAndRunFunction(null, null).then(function () {
+                cb();
+            });
+        }
+        else {
+            cb();
+        }
+    };
+    return through2.obj(forEach, atEnd);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = mainExportFunction;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLHVCQUFzQjtBQUN0QixxQ0FBb0M7QUFTcEMsSUFBSSxrQkFBa0IsR0FBRyxDQUNyQixxQkFBNEQsRUFDNUQsZ0JBQWdCLEdBQW1CLFNBQVM7SUFHNUMsSUFBSSxZQUFZLEdBQUcsRUFBRSxDQUFBO0lBQ3JCLElBQUksV0FBVyxHQUFHLFVBQVUsV0FBVyxFQUFFLElBQUksRUFBRSxHQUFHO1FBQzlDLElBQUksV0FBVyxHQUFHLFdBQVcsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUE7UUFDeEMsRUFBRSxDQUFDLENBQUMsT0FBTyxXQUFXLEtBQUssV0FBVyxJQUFJLE9BQU8sV0FBVyxDQUFDLElBQUksS0FBSyxXQUFXLENBQUMsQ0FBQyxDQUFDO1lBQ2hGLFlBQVksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUE7UUFDbEMsQ0FBQztJQUNMLENBQUMsQ0FBQTtJQUVELElBQUksbUJBQW1CLEdBQUcsVUFBVSxJQUFJLEVBQUUsR0FBRztRQUN6QyxFQUFFLENBQUMsQ0FBQyxPQUFPLHFCQUFxQixLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUM7WUFDOUMsV0FBVyxDQUFDLHFCQUFxQixFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQTtRQUNqRCxDQUFDO1FBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMscUJBQXFCLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDOUMsR0FBRyxDQUFDLENBQUMsSUFBSSxXQUFXLElBQUkscUJBQXFCLENBQUMsQ0FBQyxDQUFDO2dCQUM1QyxXQUFXLENBQUMscUJBQXFCLENBQUMsV0FBVyxDQUFDLEVBQUUsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFBO1lBQzlELENBQUM7UUFDTCxDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixNQUFNLElBQUksS0FBSyxDQUFDLGtFQUFrRSxDQUFDLENBQUE7UUFDdkYsQ0FBQztRQUNELE1BQU0sQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQzlCLENBQUMsQ0FBQTtJQUVELElBQUksZUFBZSxHQUFHLEtBQUssQ0FBQTtJQUMzQixJQUFJLE9BQU8sR0FBRyxVQUFVLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRTtRQUNqQyxNQUFNLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUM7WUFDdkIsS0FBSyxTQUFTO2dCQUNWLG1CQUFtQixDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7b0JBQ2hDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUE7Z0JBQ2xCLENBQUMsQ0FBQyxDQUFBO2dCQUNGLEtBQUssQ0FBQTtZQUNULEtBQUssVUFBVTtnQkFDWCxFQUFFLENBQUMsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO29CQUNsQixtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDO3lCQUN6QixJQUFJLENBQUM7d0JBQ0YsRUFBRSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQTtvQkFDbEIsQ0FBQyxDQUFDLENBQUE7Z0JBQ1YsQ0FBQztnQkFBQyxJQUFJLENBQUMsQ0FBQztvQkFDSixFQUFFLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFBO2dCQUNsQixDQUFDO2dCQUNELGVBQWUsR0FBRyxJQUFJLENBQUE7Z0JBQ3RCLEtBQUssQ0FBQTtZQUNULEtBQUssT0FBTztnQkFDUixFQUFFLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFBO2dCQUNkLEtBQUssQ0FBQTtZQUNUO2dCQUNJLEtBQUssQ0FBQTtRQUNiLENBQUM7SUFDTCxDQUFDLENBQUE7SUFFRCxJQUFJLEtBQUssR0FBRyxVQUFVLEVBQUU7UUFDcEIsRUFBRSxDQUFDLENBQUMsZ0JBQWdCLEtBQUssT0FBTyxDQUFDLENBQUMsQ0FBQztZQUMvQixtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDO2dCQUNqQyxFQUFFLEVBQUUsQ0FBQTtZQUNSLENBQUMsQ0FBQyxDQUFBO1FBQ04sQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ0osRUFBRSxFQUFFLENBQUE7UUFDUixDQUFDO0lBQ0wsQ0FBQyxDQUFBO0lBQ0QsTUFBTSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFBO0FBQ3ZDLENBQUMsQ0FBQTs7QUFFRCxrQkFBZSxrQkFBa0IsQ0FBQSJ9

index.d.ts

@@ -1,4 +0,0 @@
-/// <reference path="ts/typings/main.d.ts" />
-declare var through: any;
-declare var path: any;
-declare var beautylog: any;

index.js

@@ -1,47 +0,0 @@
-#!/usr/bin/env node
-
-/// <reference path="typings/main.d.ts" />
-var through = require("through2");
-var path = require("path");
-var beautylog = require("beautylog");
-module.exports = function (functionsToExecuteArg, executionModeArg, logBoolArg) {
-    if (executionModeArg === void 0) { executionModeArg = 'forEach'; }
-    if (logBoolArg === void 0) { logBoolArg = false; }
-    //important vars
-    var gulpFunction = {
-        executionMode: executionModeArg,
-        functionsToExecute: functionsToExecuteArg,
-        logBool: logBoolArg
-    };
-    var runFunctionNames = function () {
-        if (typeof gulpFunction.functionsToExecute == "function") {
-            gulpFunction.functionsToExecute();
-        }
-        else if (Array.isArray(gulpFunction.functionsToExecute)) {
-            for (var anyFunction in gulpFunction.functionsToExecute) {
-                anyFunction();
-            }
-        }
-        else {
-            beautylog.error('gulp-callfunction: something is strange with the given arguments');
-        }
-    };
-    var forEach = function (file, enc, cb) {
-        if (gulpFunction.logBool)
-            beautylog.log(gulpFunction.executionMode);
-        if (gulpFunction.executionMode === 'forEach') {
-            if (gulpFunction.logBool)
-                beautylog.log('is forEach');
-            runFunctionNames();
-        }
-        //tell gulp that we are complete
-        return cb(null, file);
-    };
-    var atEnd = function (cb) {
-        if (gulpFunction.executionMode == "atEnd") {
-            runFunctionNames();
-        }
-        cb();
-    };
-    return through.obj(forEach, atEnd);
-};

npmextra.json

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

package.json

@@ -1,8 +1,9 @@
 {
   "name": "gulp-function",
-  "version": "1.0.1",
+  "version": "2.1.0",
   "description": "accepts a function call as parameter to execute in gulp pipeline",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
     "test": "(npmts)",
     "reinstall": "(rm -r node_modules && npm install)",
@@ -11,25 +12,30 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/pushrocks/gulp-function.git"
+    "url": "https://gitlab.com/pushrocks/gulp-function.git"
   },
   "keywords": [
     "gulpplugin",
     "gulp",
     "function"
   ],
-  "author": "Smart Coordination GmbH <office@push.rocks> (https://push.rocks)",
+  "author": "Lossless GmbH <office@lossless.com> (https://lossless.com)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/pushrocks/gulp-function/issues"
+    "url": "https://gitlab.com/pushrocks/gulp-function/issues"
   },
-  "homepage": "https://github.com/pushrocks/gulp-function",
+  "homepage": "https://gitlab.com/pushrocks/gulp-function",
   "dependencies": {
-    "beautylog": "2.0.4",
+    "@types/q": "0.0.32",
-    "through2": "2.0.0"
+    "@types/through2": "^2.0.31",
+    "q": "^1.4.1",
+    "through2": "^2.0.1",
+    "typings-global": "^1.0.14"
   },
   "devDependencies": {
-    "gulp": "^3.9.0",
+    "beautylog": "^6.0.0",
-    "npmts": "^2.0.2"
+    "gulp": "^3.9.1",
+    "npmts-g": "^5.2.8",
+    "typings-test": "^1.0.3"
   }
 }

test/test.d.ts

@@ -0,0 +1 @@
+import 'typings-test';

test/test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"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"}

test/test.ts

@@ -0,0 +1,118 @@
+import 'typings-test'
+let gulp = require('gulp');
+import gulpFunction from '../dist/index'
+let beautylog = require('beautylog')
+let Q = require('q')
+
+let myFunction = function () {
+    let done = Q.defer()
+    beautylog.log('Function executed');
+    done.resolve();
+    return done.promise;
+};
+let myFunction2 = function () {
+    let done = Q.defer();
+    beautylog.ok('Function2 executed');
+    done.resolve();
+    return done.promise;
+};
+let myFunction3 = function () {
+    let done = Q.defer();
+    beautylog.success('Function3 executed');
+    done.resolve();
+    return done.promise;
+};
+
+let beforeFunction = function () {
+    let done = Q.defer();
+    beautylog.success('beforeFunction executed');
+    done.resolve();
+    return done.promise;
+};
+
+let middleFunctionRun = false;
+
+let middleFunction = function () {
+    let done = Q.defer();
+    beautylog.success('middleFunction executed');
+    setTimeout(function(){
+        beautylog.log('timeout fired');
+        middleFunctionRun = true;
+        done.resolve();
+    }, 500);
+    return done.promise;
+};
+
+let afterFunction = function () {
+    let done = Q.defer();
+    beautylog.success('afterFunction executed');
+    done.resolve();
+    return done.promise;
+};
+
+let timeoutFunction = function(){
+    let done = Q.defer();
+    setTimeout(function(){
+        beautylog.log('largeTimeout fired');
+        done.resolve();
+    },2000);
+    return done.promise;
+};
+
+
+
+describe('gulpFunction',function(){
+    it('should run through smoothly with ' + "'forEach'",function(done){
+        gulp.src('./test/*.md')
+            .pipe(gulpFunction(myFunction,'forEach'))
+            .pipe(gulp.dest('./test/result/'));
+
+        gulp.src('./test/*.md')
+            .pipe(gulpFunction([myFunction2,myFunction3],'forEach'))
+            .pipe(gulp.dest('./test/result/'))
+            .pipe(gulpFunction(done,'atEnd'));
+
+    });
+
+    it('should run through smoothly with ' + "'atEnd'",function(done){
+        gulp.src('./test/*.md')
+            .pipe(gulpFunction(myFunction,'atEnd'))
+            .pipe(gulp.dest('./test/result/'));
+
+        gulp.src('./test/*.md')
+            .pipe(gulpFunction([myFunction2,myFunction3],'atEnd'))
+            .pipe(gulp.dest('./test/result/'))
+            .pipe(gulpFunction(done,'atEnd'));
+    });
+
+    it('should run through smoothly once with ' + "'atFirst'",function(done){
+
+        gulp.src('./test/*.md')
+            .pipe(gulpFunction([myFunction2,myFunction3],'forFirst'))
+            .pipe(gulp.dest('./test/result/'))
+            .pipe(gulpFunction(done,'atEnd'));
+    });
+
+    it('should run in order',function(done){
+        this.timeout(5000);
+        let stream = gulp.src('./test/*.md')
+            .pipe(gulpFunction([beforeFunction,middleFunction,middleFunction],'atEnd'))
+            .pipe(gulpFunction(function(){
+                beautylog.log('stream progressed');
+                let done2 = Q.defer();
+                done2.resolve();
+                return done2.promise;
+            },'forEach'))
+            .pipe(gulpFunction(function(){
+                beautylog.log('nextStep');
+            }))
+            .pipe(gulpFunction(afterFunction,'atEnd'))
+            .pipe(gulpFunction(timeoutFunction,'atEnd'));
+
+        stream.on('finish',function(){
+            beautylog.info('stream finished');
+            done();
+        });
+    });
+});
+

test/test02.md

@@ -0,0 +1,2 @@
+# Test.md
+This is another test file for the test.js gulp pipeline

ts/index.ts

@@ -1,45 +1,77 @@
-/// <reference path="typings/main.d.ts" />
+import 'typings-global'
-var through = require("through2");
+import * as q from 'q'
-var path = require("path");
+import * as through2 from 'through2'
-var beautylog = require("beautylog");
+import { Transform } from 'stream'
 
+export type TExecutionMode = 'forEach' | 'forFirst' | 'atEnd'
 
-module.exports = function (functionsToExecuteArg:any|any[],executionModeArg:string = 'forEach', logBoolArg = false) {
+export interface IPromiseFunction {
-    //important vars
+    (file?, enc?): PromiseLike<any>
-    var gulpFunction = {
+}
-        executionMode: executionModeArg, //can be forEach or atEnd
-        functionsToExecute: functionsToExecuteArg,
-        logBool: logBoolArg
-    };
 
-    var runFunctionNames = function () {
+let mainExportFunction = (
-        if (typeof gulpFunction.functionsToExecute == "function" ) {
+    functionsToExecuteArg: IPromiseFunction | IPromiseFunction[],
-            gulpFunction.functionsToExecute();
+    executionModeArg: TExecutionMode = 'forEach'
-        } else if (Array.isArray(gulpFunction.functionsToExecute)) {
+): Transform => {
-            for (var anyFunction in gulpFunction.functionsToExecute) {
+
-                anyFunction();
+    let promiseArray = []
+    let runFunction = function (functionArg, file, enc) {
+        let returnValue = functionArg(file, enc)
+        if (typeof returnValue !== 'undefined' && typeof returnValue.then !== 'undefined') {
+            promiseArray.push(returnValue)
+        }
+    }
+
+    let checkAndRunFunction = function (file, enc) {
+        if (typeof functionsToExecuteArg === 'function') {
+            runFunction(functionsToExecuteArg, file, enc)
+        } else if (Array.isArray(functionsToExecuteArg)) {
+            for (let anyFunction in functionsToExecuteArg) {
+                runFunction(functionsToExecuteArg[anyFunction], file, enc)
             }
         } else {
-            beautylog.error('gulp-callfunction: something is strange with the given arguments');
+            throw new Error('gulp-callfunction: something is strange with the given arguments')
         }
-    };
+        return q.all(promiseArray)
+    }
 
-
+    let hasExecutedOnce = false
-    var forEach = function (file, enc, cb) {
+    let forEach = function (file, enc, cb) { // the forEach function is called for every chunk
-        if (gulpFunction.logBool) beautylog.log(gulpFunction.executionMode);
+        switch (executionModeArg) {
-        if (gulpFunction.executionMode === 'forEach') {
+            case 'forEach':
-            if(gulpFunction.logBool) beautylog.log('is forEach');
+                checkAndRunFunction(file, enc).then(function () {
-            runFunctionNames();
+                    cb(null, file)
+                })
+                break
+            case 'forFirst':
+                if (hasExecutedOnce) {
+                    checkAndRunFunction(file, enc)
+                        .then(function () {
+                            cb(null, file)
+                        })
+                } else {
+                    cb(null, file)
+                }
+                hasExecutedOnce = true
+                break
+            case 'atEnd':
+                cb(null, file)
+                break
+            default:
+                break
         }
-        //tell gulp that we are complete
+    }
-        return cb(null, file);
-    };
 
-    var atEnd = function(cb) {
+    let atEnd = function (cb) {
-        if (gulpFunction.executionMode == "atEnd") {
+        if (executionModeArg === 'atEnd') {
-            runFunctionNames();
+            checkAndRunFunction(null, null).then(function () {
+                cb()
+            })
+        } else {
+            cb()
         }
-        cb();
+    }
-    };
+    return through2.obj(forEach, atEnd)
-    return through.obj(forEach,atEnd);
+}
-};
+
+export default mainExportFunction

ts/test.ts

@@ -1,20 +0,0 @@
-/// <reference path="typings/main.d.ts" />
-var gulp = require("gulp");
-var gulpFunction = require("../index.js");
-var beautylog = require("beautylog");
-
-var myFunction = function () {
-    beautylog.log("Mocha Test successfull!");
-};
-
-describe("gulpFunction",function(){
-    it("should run through smoothly",function(){
-        gulp.task('default',function() {
-            gulp.src('./test/test.md')
-                .pipe(gulpFunction(myFunction,'forEach'))
-                .pipe(gulp.dest("./test/result/"))
-        });
-        gulp.start.apply(gulp, ['default']);
-    });
-});
-

ts/tsd.json

@@ -1,15 +0,0 @@
-{
-  "version": "v4",
-  "repo": "borisyankov/DefinitelyTyped",
-  "ref": "master",
-  "path": "typings",
-  "bundle": "typings/tsd.d.ts",
-  "installed": {
-    "node/node.d.ts": {
-      "commit": "efa0c1196d7280640e624ac1e7fa604502e7bd63"
-    },
-    "colors/colors.d.ts": {
-      "commit": "3191f6e0088eee07c4d8fd24e4d27a40a60d9eb9"
-    }
-  }
-}

ts/typings.json

@@ -1,7 +0,0 @@
-{
-  "ambientDependencies": {
-    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts",
-    "mocha": "github:Bartvds/tsd-deftools/typings/DefinitelyTyped/mocha/mocha.d.ts",
-    "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts"
-  }
-}

tslint.json

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