2.2.7

.gitlab-ci.yml

@@ -1,20 +1,31 @@
-image: hosttoday/ht-docker-node:npmts
+# gitzone standard
+image: hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+  - .yarn/
+  key: "$CI_BUILD_STAGE"
+
 stages:
 - test
 - release
 - trigger
 - pages
+
 testLEGACY:
   stage: test
   script:
     - npmci test legacy
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
   allow_failure: true
+
 testLTS:
   stage: test
   script:
     - npmci test lts
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
     
@@ -22,8 +33,10 @@ testSTABLE:
   stage: test
   script:
     - npmci test stable
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
+
 release:
   stage: release
   script:
@@ -32,6 +45,7 @@ release:
     - tags
   tags:
     - docker
+
 trigger:
   stage: trigger
   script:
@@ -40,14 +54,18 @@ trigger:
     - tags
   tags:
     - docker
+
 pages:
-  image: hosttoday/ht-docker-node:npmpage
+  image: hosttoday/ht-docker-node:npmci
   stage: pages
   script:
-    - npmci command npmpage --host gitlab
+    - npmci command yarn global add npmpage
+    - npmci command npmpage
+  tags:
+    - docker
   only:
     - tags
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+    - public

README.md

@@ -1,15 +1,16 @@
 # gulp-function
-accepts call to execute in gulp pipeline.
+accepts a function call as parameter to execute in gulp pipeline
 
 ## Availabililty
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/gulp-function)
+[![npm](https://pushrocks.gitlab.io/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://pushrocks.gitlab.io/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)
+[![git](https://pushrocks.gitlab.io/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/)
+[![docs](https://pushrocks.gitlab.io/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)
+[![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)
+[![coverage report](https://GitLab.com/pushrocks/gulp-function/badges/master/coverage.svg)](https://GitLab.com/pushrocks/gulp-function/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/gulp-function.svg)](https://www.npmjs.com/package/gulp-function)
 [![Dependency Status](https://david-dm.org/pushrocks/gulp-function.svg)](https://david-dm.org/pushrocks/gulp-function)
 [![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)
@@ -17,43 +18,12 @@ accepts call to execute in gulp pipeline.
 [![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
+## Usage
-```javascript
+Use TypeScript for best in class instellisense.
-var gulp = require("gulp");
-var gulpFunction = require("gulp-function");
-var Q = require("q");
 
-var myFunction = function (file, enc) { // file and enc are optional in case you want to modify the file object
+For further information read the linked docs at the top of this README.
-    var 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() {
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-    var stream = gulp.src('./mydir/*.something')
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
-        .pipe(gulpFunction(myFunction,'forEach')) //read the notes below
-        .pipe(gulp.dest("./build/"));
-    return stream; // by returning the stream gulp knows when our task has finished.
-});
-```
 
-### Notes:
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
-
-* 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

@@ -1,5 +1,12 @@
+/// <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 defaultExport: (functionsToExecuteArg: IPromiseFunction | IPromiseFunction[], executionModeArg?: TExecutionMode) => Transform;
+export declare let forEach: (funcArg: IPromiseFunction) => Transform;
+export declare let forFirst: (funcArg: IPromiseFunction) => Transform;
+export declare let atEnd: (funcArg: IPromiseFunction) => Transform;
+export default defaultExport;

dist/index.js

@@ -1,8 +1,8 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("typings-global");
-const q = require("q");
 const through2 = require("through2");
-module.exports = (functionsToExecuteArg, executionModeArg = 'forEach') => {
+let defaultExport = (functionsToExecuteArg, executionModeArg = 'forEach') => {
     let promiseArray = [];
     let runFunction = function (functionArg, file, enc) {
         let returnValue = functionArg(file, enc);
@@ -22,7 +22,7 @@ module.exports = (functionsToExecuteArg, executionModeArg = 'forEach') => {
         else {
             throw new Error('gulp-callfunction: something is strange with the given arguments');
         }
-        return q.all(promiseArray);
+        return Promise.all(promiseArray);
     };
     let hasExecutedOnce = false;
     let forEach = function (file, enc, cb) {
@@ -45,7 +45,7 @@ module.exports = (functionsToExecuteArg, executionModeArg = 'forEach') => {
                 hasExecutedOnce = true;
                 break;
             case 'atEnd':
-                cb(null, file);
+                cb();
                 break;
             default:
                 break;
@@ -63,4 +63,14 @@ module.exports = (functionsToExecuteArg, executionModeArg = 'forEach') => {
     };
     return through2.obj(forEach, atEnd);
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLHVCQUFzQjtBQUN0QixxQ0FBb0M7QUFTcEMsTUFBTSxDQUFDLE9BQU8sR0FBRyxDQUNiLHFCQUE0RCxFQUM1RCxnQkFBZ0IsR0FBbUIsU0FBUztJQUc1QyxJQUFJLFlBQVksR0FBRyxFQUFFLENBQUE7SUFDckIsSUFBSSxXQUFXLEdBQUcsVUFBVSxXQUFXLEVBQUUsSUFBSSxFQUFFLEdBQUc7UUFDOUMsSUFBSSxXQUFXLEdBQUcsV0FBVyxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQTtRQUN4QyxFQUFFLENBQUMsQ0FBQyxPQUFPLFdBQVcsS0FBSyxXQUFXLElBQUksT0FBTyxXQUFXLENBQUMsSUFBSSxLQUFLLFdBQVcsQ0FBQyxDQUFDLENBQUM7WUFDaEYsWUFBWSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQTtRQUNsQyxDQUFDO0lBQ0wsQ0FBQyxDQUFBO0lBRUQsSUFBSSxtQkFBbUIsR0FBRyxVQUFVLElBQUksRUFBRSxHQUFHO1FBQ3pDLEVBQUUsQ0FBQyxDQUFDLE9BQU8scUJBQXFCLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztZQUM5QyxXQUFXLENBQUMscUJBQXFCLEVBQUUsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFBO1FBQ2pELENBQUM7UUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM5QyxHQUFHLENBQUMsQ0FBQyxJQUFJLFdBQVcsSUFBSSxxQkFBcUIsQ0FBQyxDQUFDLENBQUM7Z0JBQzVDLFdBQVcsQ0FBQyxxQkFBcUIsQ0FBQyxXQUFXLENBQUMsRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUE7WUFDOUQsQ0FBQztRQUNMLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLE1BQU0sSUFBSSxLQUFLLENBQUMsa0VBQWtFLENBQUMsQ0FBQTtRQUN2RixDQUFDO1FBQ0QsTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUE7SUFDOUIsQ0FBQyxDQUFBO0lBRUQsSUFBSSxlQUFlLEdBQUcsS0FBSyxDQUFBO0lBQzNCLElBQUksT0FBTyxHQUFHLFVBQVUsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ2pDLE1BQU0sQ0FBQyxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQztZQUN2QixLQUFLLFNBQVM7Z0JBQ1YsbUJBQW1CLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQztvQkFDaEMsRUFBRSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQTtnQkFDbEIsQ0FBQyxDQUFDLENBQUE7Z0JBQ0YsS0FBSyxDQUFBO1lBQ1QsS0FBSyxVQUFVO2dCQUNYLEVBQUUsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUM7b0JBQ2xCLG1CQUFtQixDQUFDLElBQUksRUFBRSxHQUFHLENBQUM7eUJBQ3pCLElBQUksQ0FBQzt3QkFDRixFQUFFLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFBO29CQUNsQixDQUFDLENBQUMsQ0FBQTtnQkFDVixDQUFDO2dCQUFDLElBQUksQ0FBQyxDQUFDO29CQUNKLEVBQUUsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUE7Z0JBQ2xCLENBQUM7Z0JBQ0QsZUFBZSxHQUFHLElBQUksQ0FBQTtnQkFDdEIsS0FBSyxDQUFBO1lBQ1QsS0FBSyxPQUFPO2dCQUNSLEVBQUUsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUE7Z0JBQ2QsS0FBSyxDQUFBO1lBQ1Q7Z0JBQ0ksS0FBSyxDQUFBO1FBQ2IsQ0FBQztJQUNMLENBQUMsQ0FBQTtJQUVELElBQUksS0FBSyxHQUFHLFVBQVUsRUFBRTtRQUNwQixFQUFFLENBQUMsQ0FBQyxnQkFBZ0IsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQy9CLG1CQUFtQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBQ2pDLEVBQUUsRUFBRSxDQUFBO1lBQ1IsQ0FBQyxDQUFDLENBQUE7UUFDTixDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixFQUFFLEVBQUUsQ0FBQTtRQUNSLENBQUM7SUFDTCxDQUFDLENBQUE7SUFDRCxNQUFNLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUE7QUFDdkMsQ0FBQyxDQUFBIn0=
+exports.forEach = (funcArg) => {
+    return defaultExport(funcArg, 'forEach');
+};
+exports.forFirst = (funcArg) => {
+    return defaultExport(funcArg, 'forFirst');
+};
+exports.atEnd = (funcArg) => {
+    return defaultExport(funcArg, 'atEnd');
+};
+exports.default = defaultExport;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF1QjtBQUV2QixxQ0FBb0M7QUFTcEMsSUFBSSxhQUFhLEdBQUcsQ0FDbEIscUJBQTRELEVBQzVELG1CQUFtQyxTQUFTO0lBRzVDLElBQUksWUFBWSxHQUFHLEVBQUUsQ0FBQTtJQUNyQixJQUFJLFdBQVcsR0FBRyxVQUFVLFdBQVcsRUFBRSxJQUFJLEVBQUUsR0FBRztRQUNoRCxJQUFJLFdBQVcsR0FBRyxXQUFXLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFBO1FBQ3hDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sV0FBVyxLQUFLLFdBQVcsSUFBSSxPQUFPLFdBQVcsQ0FBQyxJQUFJLEtBQUssV0FBVyxDQUFDLENBQUMsQ0FBQztZQUNsRixZQUFZLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFBO1FBQ2hDLENBQUM7SUFDSCxDQUFDLENBQUE7SUFFRCxJQUFJLG1CQUFtQixHQUFHLFVBQVUsSUFBSSxFQUFFLEdBQUc7UUFDM0MsRUFBRSxDQUFDLENBQUMsT0FBTyxxQkFBcUIsS0FBSyxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBQ2hELFdBQVcsQ0FBQyxxQkFBcUIsRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUE7UUFDL0MsQ0FBQztRQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ2hELEdBQUcsQ0FBQyxDQUFDLElBQUksV0FBVyxJQUFJLHFCQUFxQixDQUFDLENBQUMsQ0FBQztnQkFDOUMsV0FBVyxDQUFDLHFCQUFxQixDQUFFLFdBQVcsQ0FBRSxFQUFFLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQTtZQUM5RCxDQUFDO1FBQ0gsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ04sTUFBTSxJQUFJLEtBQUssQ0FBQyxrRUFBa0UsQ0FBQyxDQUFBO1FBQ3JGLENBQUM7UUFDRCxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQTtJQUNsQyxDQUFDLENBQUE7SUFFRCxJQUFJLGVBQWUsR0FBRyxLQUFLLENBQUE7SUFDM0IsSUFBSSxPQUFPLEdBQUcsVUFBVSxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUU7UUFDbkMsTUFBTSxDQUFDLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO1lBQ3pCLEtBQUssU0FBUztnQkFDWixtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDO29CQUNsQyxFQUFFLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFBO2dCQUNoQixDQUFDLENBQUMsQ0FBQTtnQkFDRixLQUFLLENBQUE7WUFDUCxLQUFLLFVBQVU7Z0JBQ2IsRUFBRSxDQUFDLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQztvQkFDcEIsbUJBQW1CLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQzt5QkFDM0IsSUFBSSxDQUFDO3dCQUNKLEVBQUUsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUE7b0JBQ2hCLENBQUMsQ0FBQyxDQUFBO2dCQUNOLENBQUM7Z0JBQUMsSUFBSSxDQUFDLENBQUM7b0JBQ04sRUFBRSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQTtnQkFDaEIsQ0FBQztnQkFDRCxlQUFlLEdBQUcsSUFBSSxDQUFBO2dCQUN0QixLQUFLLENBQUE7WUFDUCxLQUFLLE9BQU87Z0JBQ1YsRUFBRSxFQUFFLENBQUE7Z0JBQ0osS0FBSyxDQUFBO1lBQ1A7Z0JBQ0UsS0FBSyxDQUFBO1FBQ1QsQ0FBQztJQUNILENBQUMsQ0FBQTtJQUVELElBQUksS0FBSyxHQUFHLFVBQVUsRUFBRTtRQUN0QixFQUFFLENBQUMsQ0FBQyxnQkFBZ0IsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQ2pDLG1CQUFtQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBQ25DLEVBQUUsRUFBRSxDQUFBO1lBQ04sQ0FBQyxDQUFDLENBQUE7UUFDSixDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDTixFQUFFLEVBQUUsQ0FBQTtRQUNOLENBQUM7SUFDSCxDQUFDLENBQUE7SUFDRCxNQUFNLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUE7QUFDckMsQ0FBQyxDQUFBO0FBRVUsUUFBQSxPQUFPLEdBQUcsQ0FBQyxPQUF5QjtJQUM3QyxNQUFNLENBQUMsYUFBYSxDQUFDLE9BQU8sRUFBRSxTQUFTLENBQUMsQ0FBQTtBQUMxQyxDQUFDLENBQUE7QUFFVSxRQUFBLFFBQVEsR0FBRyxDQUFDLE9BQXlCO0lBQzlDLE1BQU0sQ0FBQyxhQUFhLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFBO0FBQzNDLENBQUMsQ0FBQTtBQUVVLFFBQUEsS0FBSyxHQUFHLENBQUMsT0FBeUI7SUFDM0MsTUFBTSxDQUFDLGFBQWEsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUE7QUFDeEMsQ0FBQyxDQUFBO0FBRUQsa0JBQWUsYUFBYSxDQUFBIn0=

npmextra.json

@@ -1,5 +1,10 @@
 {
   "npmts": {
     "mode": "default"
+  },
+  "npmci": {
+    "globalNpmTools": [
+      "npmts"
+    ]
   }
 }

package.json

@@ -1,14 +1,11 @@
 {
   "name": "gulp-function",
-  "version": "2.0.1",
+  "version": "2.2.7",
   "description": "accepts a function call as parameter to execute in gulp pipeline",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts)",
+    "test": "(npmts)"
-    "reinstall": "(rm -r node_modules && npm install)",
-    "release": "(git pull origin master && npm version patch && git push origin master && git checkout release && git merge master && git push origin release && git checkout master)",
-    "startdev": "(git checkout master && git pull origin master)"
   },
   "repository": {
     "type": "git",
@@ -26,16 +23,14 @@
   },
   "homepage": "https://gitlab.com/pushrocks/gulp-function",
   "dependencies": {
-    "@types/q": "0.0.32",
+    "@types/through2": "^2.0.32",
-    "@types/through2": "^2.0.31",
+    "smartq": "^1.1.1",
-    "q": "^1.4.1",
+    "through2": "^2.0.3",
-    "through2": "^2.0.1",
+    "typings-global": "^1.0.16"
-    "typings-global": "^1.0.14"
   },
   "devDependencies": {
-    "beautylog": "^6.0.0",
     "gulp": "^3.9.1",
-    "npmts-g": "^5.2.8",
+    "smartgulp": "^1.0.1",
-    "typings-test": "^1.0.3"
+    "tapbundle": "^1.0.10"
   }
 }

test/test.d.ts

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

test/test.js.map

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

test/test.ts

@@ -1,118 +1,34 @@
-import "typings-test"
+import { expect, tap } from 'tapbundle'
-var gulp = require("gulp");
-var gulpFunction = require("../dist/index.js");
-var beautylog = require("beautylog");
-var Q = require("q");
 
-var myFunction = function () {
+import * as smartgulp from 'smartgulp'
-    var done = Q.defer()
+let gulp = require('gulp')
-    beautylog.log("Function executed");
+import * as gulpFunction from '../dist/index'
-    done.resolve();
-    return done.promise;
-};
-var myFunction2 = function () {
-    var done = Q.defer();
-    beautylog.ok("Function2 executed");
-    done.resolve();
-    return done.promise;
-};
-var myFunction3 = function () {
-    var done = Q.defer();
-    beautylog.success("Function3 executed");
-    done.resolve();
-    return done.promise;
-};
 
-var beforeFunction = function () {
+let smartq = require('smartq')
-    var done = Q.defer();
-    beautylog.success("beforeFunction executed");
-    done.resolve();
-    return done.promise;
-};
-
-var middleFunctionRun = false;
-
-var middleFunction = function () {
-    var done = Q.defer();
-    beautylog.success("middleFunction executed");
-    setTimeout(function(){
-        beautylog.log("timeout fired");
-        middleFunctionRun = true;
-        done.resolve();
-    }, 500);
-    return done.promise;
-};
-
-var afterFunction = function () {
-    var done = Q.defer();
-    beautylog.success("afterFunction executed");
-    done.resolve();
-    return done.promise;
-};
-
-let timeoutFunction = function(){
-    var done = Q.defer();
-    setTimeout(function(){
-        beautylog.log("largeTimeout fired");
-        done.resolve();
-    },2000);
-    return done.promise;
-};
 
 
+tap.test('should run through smoothly with ' + "'forEach'", async (tools) => {
+  let done = smartq.defer()
+  let counter = 0
+  gulp.src('./test/testfiles/*.md')
+    .pipe(gulpFunction.forEach(async () => {
+      counter++
+      if (counter === 2) {
+        done.resolve()
+      }
+    }))
+  await done.promise
+})
 
-describe("gulpFunction",function(){
+tap.test('should run through smoothly with ' + "'forEach'", async (tools) => {
-    it("should run through smoothly with " + "'forEach'".blue,function(done){
+  let done = smartq.defer()
-        gulp.src('./test/*.md')
+  let counter = 0
-            .pipe(gulpFunction(myFunction,'forEach'))
+  smartgulp.src(['./test/testfiles/*.md'])
-            .pipe(gulp.dest("./test/result/"));
+    .pipe(gulpFunction.atEnd(async () => {
-
+      console.log('atEnd')
-        gulp.src('./test/*.md')
+      done.resolve()
-            .pipe(gulpFunction([myFunction2,myFunction3],'forEach'))
+    }))
-            .pipe(gulp.dest("./test/result/"))
+  await done.promise
-            .pipe(gulpFunction(done,"atEnd"));
+})
-
-    });
-
-    it("should run through smoothly with " + "'atEnd'".blue,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'".blue,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");
-                var 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();
-        });
-    });
-});
 
+tap.start()

test/test01.md

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

test/test02.md

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

test/testfiles/test01.md

@@ -0,0 +1 @@
+# the 1st testfile

test/testfiles/test02.md

@@ -0,0 +1 @@
+# the second testfile

test/testfiles/test03.md

@@ -0,0 +1 @@
+# the third testfile

test/testfiles/test04.md

@@ -0,0 +1 @@
+# the fourth testfile

test/testfiles/test05.md

@@ -0,0 +1 @@
+# the fifth testfile

test/testfiles/test06.md

@@ -0,0 +1 @@
+# the sixth testfile

test/testfiles/test07.md

@@ -0,0 +1 @@
+# the seventh testfile

test/testfiles/test08.md

@@ -0,0 +1 @@
+# the eighth testfile

test/testfiles/test09.md

@@ -0,0 +1 @@
+# the nineth testfile

test/testfiles/test10.md

@@ -0,0 +1 @@
+# the tenth testfile

test/testfiles/test11.md

@@ -0,0 +1 @@
+# the eleventh testfile

test/testfiles/test12.md

@@ -0,0 +1 @@
+# the twelveth testfile

test/testfiles/test13.md

@@ -0,0 +1 @@
+# the second testfile

test/testfiles/test14.md

@@ -0,0 +1 @@
+# the second testfile

test/testfiles/test15.md

@@ -0,0 +1 @@
+# the second testfile

test/testfiles/test16.md

@@ -0,0 +1 @@
+# the second testfile

test/testfiles/test17.md

@@ -0,0 +1 @@
+# the second testfile

test/testfiles/test18.md

@@ -0,0 +1 @@
+# the 18th testfile

ts/index.ts

@@ -1,75 +1,89 @@
 import 'typings-global'
-import * as q from 'q'
+import * as q from 'smartq'
 import * as through2 from 'through2'
 import { Transform } from 'stream'
 
 export type TExecutionMode = 'forEach' | 'forFirst' | 'atEnd'
 
 export interface IPromiseFunction {
-    (file?, enc?): PromiseLike<any>
+  (file?, enc?): PromiseLike<any>
 }
 
-module.exports = (
+let defaultExport = (
-    functionsToExecuteArg: IPromiseFunction | IPromiseFunction[],
+  functionsToExecuteArg: IPromiseFunction | IPromiseFunction[],
-    executionModeArg: TExecutionMode = 'forEach'
+  executionModeArg: TExecutionMode = 'forEach'
 ): Transform => {
 
-    let promiseArray = []
+  let promiseArray = []
-    let runFunction = function (functionArg, file, enc) {
+  let runFunction = function (functionArg, file, enc) {
-        let returnValue = functionArg(file, enc)
+    let returnValue = functionArg(file, enc)
-        if (typeof returnValue !== 'undefined' && typeof returnValue.then !== 'undefined') {
+    if (typeof returnValue !== 'undefined' && typeof returnValue.then !== 'undefined') {
-            promiseArray.push(returnValue)
+      promiseArray.push(returnValue)
-        }
     }
+  }
 
-    let checkAndRunFunction = function (file, enc) {
+  let checkAndRunFunction = function (file, enc) {
-        if (typeof functionsToExecuteArg === 'function') {
+    if (typeof functionsToExecuteArg === 'function') {
-            runFunction(functionsToExecuteArg, file, enc)
+      runFunction(functionsToExecuteArg, file, enc)
-        } else if (Array.isArray(functionsToExecuteArg)) {
+    } else if (Array.isArray(functionsToExecuteArg)) {
-            for (let anyFunction in functionsToExecuteArg) {
+      for (let anyFunction in functionsToExecuteArg) {
-                runFunction(functionsToExecuteArg[anyFunction], file, enc)
+        runFunction(functionsToExecuteArg[ anyFunction ], file, enc)
-            }
+      }
-        } else {
+    } else {
-            throw new 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)
     }
+    return Promise.all(promiseArray)
+  }
 
-    let hasExecutedOnce = false
+  let hasExecutedOnce = false
-    let forEach = function (file, enc, cb) { // the forEach function is called for every chunk
+  let forEach = function (file, enc, cb) { // the forEach function is called for every chunk
-        switch (executionModeArg) {
+    switch (executionModeArg) {
-            case 'forEach':
+      case 'forEach':
-                checkAndRunFunction(file, enc).then(function () {
+        checkAndRunFunction(file, enc).then(function () {
-                    cb(null, file)
+          cb(null, file)
-                })
+        })
-                break
+        break
-            case 'forFirst':
+      case 'forFirst':
-                if (hasExecutedOnce) {
+        if (hasExecutedOnce) {
-                    checkAndRunFunction(file, enc)
+          checkAndRunFunction(file, enc)
-                        .then(function () {
+            .then(function () {
-                            cb(null, file)
+              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()
+          cb(null, file)
         }
+        hasExecutedOnce = true
+        break
+      case 'atEnd':
+        cb()
+        break
+      default:
+        break
     }
-    return through2.obj(forEach, atEnd)
+  }
+
+  let atEnd = function (cb) {
+    if (executionModeArg === 'atEnd') {
+      checkAndRunFunction(null, null).then(function () {
+        cb()
+      })
+    } else {
+      cb()
+    }
+  }
+  return through2.obj(forEach, atEnd)
 }
+
+export let forEach = (funcArg: IPromiseFunction) => {
+  return defaultExport(funcArg, 'forEach')
+}
+
+export let forFirst = (funcArg: IPromiseFunction) => {
+  return defaultExport(funcArg, 'forFirst')
+}
+
+export let atEnd = (funcArg: IPromiseFunction) => {
+  return defaultExport(funcArg, 'atEnd')
+}
+
+export default defaultExport