3.0.3

Fix sample code in README.md

See merge request pushrocks/gulp-function!2

.gitignore

@@ -1,11 +1,22 @@
-node_modules/
-.settings/
-.idea/
+.nogit/
+
+# artifacts
 coverage/
-docs/
+public/
+pages/
 
-ts/*.js
-ts/*.js.map
-ts/typings/
-test/result/
+# installs
+node_modules/
 
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,37 +1,126 @@
-image: hosttoday/ht-docker-node:npmts
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- test
-- release
-- page
+  - security
+  - test
+  - release
+  - metadata
 
-testLEGACY:
-  stage: test
+# ====================
+# security stage
+# ====================
+mirror:
+  stage: security
   script:
-    - npmci test legacy
+    - npmci git mirror
   tags:
+    - lossless
     - docker
+    - notpriv
 
-testLTS:
+snyk:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --ignore-scripts
+    - npmci command snyk test
+  tags:
+    - lossless
+    - docker
+    - notpriv
+
+# ====================
+# test stage
+# ====================
+
+testStable:
   stage: test
   script:
-    - npmci test lts
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
-    
-testSTABLE:
+    - priv
+
+testBuild:
   stage: test
   script:
-    - npmci test stable
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
+    - notpriv
 
 release:
   stage: release
   script:
-    - npmci publish npm
+    - npmci node install stable
+    - npmci npm publish
+  only:
+    - tags
+  tags:
+    - lossless
+    - docker
+    - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  allow_failure: true
+  script:
+    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
+  tags:
+    - lossless
+    - docker
+    - priv
+
+trigger:
+  stage: metadata
+  script:
     - npmci trigger
   only:
     - tags
   tags:
+    - lossless
     - docker
+    - notpriv
+
+pages:
+  stage: metadata
+  script:
+    - npmci node install lts
+    - npmci command npm install -g @gitzone/tsdoc
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command tsdoc
+  tags:
+    - lossless
+    - docker
+    - notpriv
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - public
+  allow_failure: true

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Push.Rocks
+Copyright (c) 2015 Lossless GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,51 +0,0 @@
-# gulp-function
-accepts call to execute in gulp pipeline.
-
-### Status
-[![build status](https://gitlab.com/pushrocks/gulp-function/badges/master/build.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)
-[![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)
-[![codecov.io](https://codecov.io/github/pushrocks/gulp-function/coverage.svg?branch=master)](https://codecov.io/github/pushrocks/gulp-function?branch=master)
-
-### Version
-[![GitHub version](https://badge.fury.io/gh/pushrocks%2Fgulp-function.svg)](https://badge.fury.io/gh/pushrocks%2Fgulp-function)
-[![npm version](https://badge.fury.io/js/gulp-function.svg)](https://badge.fury.io/js/gulp-function)
-
-### Usage
-```javascript
-var gulp = require("gulp");
-var gulpFunction = require("gulp-function");
-var Q = require("q");
-
-var myFunction = function () {
-    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() {
-    var stream = gulp.src('./mydir/*.something')
-        .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:
-
-* 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.  
-* 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**!!!

dist/gulpfunction.plugins.d.ts

@@ -1,3 +0,0 @@
-import "typings-global";
-export declare let Q: any;
-export declare let through2: any;

dist/gulpfunction.plugins.js

@@ -1,6 +0,0 @@
-"use strict";
-require("typings-global");
-exports.Q = require("q");
-exports.through2 = require("through2");
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImd1bHBmdW5jdGlvbi5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFFYixTQUFDLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ2pCLGdCQUFRLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDIiwiZmlsZSI6Imd1bHBmdW5jdGlvbi5wbHVnaW5zLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcclxuXHJcbmV4cG9ydCBsZXQgUSA9IHJlcXVpcmUoXCJxXCIpO1xyXG5leHBvcnQgbGV0IHRocm91Z2gyID0gcmVxdWlyZShcInRocm91Z2gyXCIpO1xyXG4iXX0=

dist/index.d.ts

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

npmextra.json

@@ -0,0 +1,19 @@
+{
+  "npmts": {
+    "mode": "default"
+  },
+  "npmci": {
+    "npmGlobalTools": [],
+    "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "gulp-function",
+      "shortDescription": "accepts a function call as parameter to execute in gulp pipeline",
+      "npmPackagename": "@pushrocks/gulp-function",
+      "license": "MIT"
+    }
+  }
+}

npmts.json

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

package.json

@@ -1,14 +1,13 @@
 {
-  "name": "gulp-function",
-  "version": "1.3.6",
+  "name": "@pushrocks/gulp-function",
+  "private": false,
+  "version": "3.0.3",
   "description": "accepts a function call as parameter to execute in gulp pipeline",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "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)"
+    "test": "(tstest test/)",
+    "build": "(tsbuild)"
   },
   "repository": {
     "type": "git",
@@ -17,7 +16,8 @@
   "keywords": [
     "gulpplugin",
     "gulp",
-    "function"
+    "function",
+    "pushrocks"
   ],
   "author": "Lossless GmbH <office@lossless.com> (https://lossless.com)",
   "license": "MIT",
@@ -26,14 +26,28 @@
   },
   "homepage": "https://gitlab.com/pushrocks/gulp-function",
   "dependencies": {
-    "q": "^1.4.1",
-    "through2": "^2.0.1",
-    "typings-global": "^1.0.3"
+    "@pushrocks/smartpromise": "^3.0.6",
+    "@types/through2": "^2.0.32",
+    "through2": "^3.0.1"
   },
   "devDependencies": {
-    "beautylog": "^5.0.8",
-    "gulp": "^3.9.1",
-    "npmts-g": "^5.2.6",
-    "typings-test": "^1.0.1"
-  }
+    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tstest": "^1.0.28",
+    "@pushrocks/smartgulp": "^2.0.2",
+    "@pushrocks/tapbundle": "^3.2.0",
+    "gulp": "^4.0.2",
+    "tslint": "^5.20.1",
+    "tslint-config-prettier": "^1.18.0"
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_web/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

readme.md

@@ -0,0 +1,64 @@
+# @pushrocks/gulp-function
+accepts a function call as parameter to execute in gulp pipeline
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/gulp-function)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/gulp-function)
+* [github.com (source mirror)](https://github.com/pushrocks/gulp-function)
+* [docs (typedoc)](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)
+[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/gulp-function.svg)](https://www.npmjs.com/package/@pushrocks/gulp-function)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/gulp-function/badge.svg)](https://snyk.io/test/npm/@pushrocks/gulp-function)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+## Usage
+
+Please use TypeScript for best in class intellisense.
+
+```typescript
+import gulp = require('gulp');
+import gulpFunction from 'gulp-function'; // default ES6 export
+// import {forFirst, forEach, atEnd} from 'gulp-function'
+
+let myAsyncFunction = async (file, enc) => {
+  // await some async stuff
+};
+
+gulp.task('gulpTest', function() {
+  let stream = gulp
+    .src('./mydir/*.something')
+    .pipe(gulpFunction(myAsyncFunction, 'forEach')) //read the notes below
+    // .pipe(forEach(myAsyncFunction)) // if imported as >> import { forEach } from 'gulp-function' <<
+    .pipe(gulp.dest('./build/'));
+  return stream; // by returning the stream gulp knows when our task has finished.
+});
+```
+
+### Notes
+
+- 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**!!!
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
+For further information read the linked docs at the top of this readme.
+
+> MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

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,35 @@
-import "typings-test"
-var gulp = require("gulp");
-var gulpFunction = require("../dist/index.js");
-var beautylog = require("beautylog");
-var Q = require("q");
+import { expect, tap } from '@pushrocks/tapbundle';
 
-var myFunction = function () {
-    var done = Q.defer()
-    beautylog.log("Function executed");
-    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;
-};
+import * as smartgulp from '@pushrocks/smartgulp';
+let gulp = require('gulp');
+import * as gulpFunction from '../ts/index';
 
-var beforeFunction = function () {
-    var done = Q.defer();
-    beautylog.success("beforeFunction executed");
-    done.resolve();
-    return done.promise;
-};
+import * as smartpromise from '@pushrocks/smartpromise';
 
-var middleFunctionRun = false;
-
-var middleFunction = function () {
-    var done = Q.defer();
-    beautylog.success("middleFunction executed");
-    setTimeout(function(){
-        beautylog.log("timeout fired");
-        middleFunctionRun = true;
+tap.test('should run through smoothly with ' + "'forEach'", async tools => {
+  let done = smartpromise.defer();
+  let counter = 0;
+  gulp.src('./test/testfiles/*.md').pipe(
+    gulpFunction.forEach(async () => {
+      counter++;
+      if (counter === 2) {
         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;
-};
-
-
-
-describe("gulpFunction",function(){
-    it("should run through smoothly with " + "'forEach'".blue,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'".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();
-        });
-    });
+      }
+    })
+  );
+  await done.promise;
 });
 
+tap.test('should run through smoothly with ' + "'forEach'", async tools => {
+  let done = smartpromise.defer();
+  let counter = 0;
+  smartgulp.src(['./test/testfiles/*.md']).pipe(
+    gulpFunction.atEnd(async () => {
+      console.log('atEnd');
+      done.resolve();
+    })
+  );
+  await done.promise;
+});
+
+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/gulpfunction.plugins.ts

@@ -1,4 +0,0 @@
-import "typings-global";
-
-export let Q = require("q");
-export let through2 = require("through2");

ts/index.ts

@@ -1,65 +1,87 @@
-import "typings-global";
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as through2 from 'through2';
+import { Transform } from 'stream';
 
-import plugins = require("./gulpfunction.plugins");
+export type TExecutionMode = 'forEach' | 'forFirst' | 'atEnd';
 
+export interface IPromiseFunction {
+  (file?, enc?): PromiseLike<any>;
+}
 
+let defaultExport = (
+  functionsToExecuteArg: IPromiseFunction | IPromiseFunction[],
+  executionModeArg: TExecutionMode = 'forEach'
+): Transform => {
+  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 Promise.all(promiseArray);
+  };
 
-module.exports = function (functionsToExecuteArg:any|any[],executionModeArg:string = 'forEach') {
-    //important vars
-    let executionMode = executionModeArg; //can be forEach or atEnd
-    let functionsToExecute = functionsToExecuteArg;
-    let promiseArray = [];
-    let runFunction = function(functionArg){
-        let returnValue = functionArg();
-        if (typeof returnValue !== "undefined" && typeof returnValue.then !== "undefined") {
-            promiseArray.push(returnValue);
-        }
-    };
-
-    let checkAndRunFunction = function () {
-        if (typeof functionsToExecute === "function" ) {
-            runFunction(functionsToExecute);
-        } else if (Array.isArray(functionsToExecute)) {
-            for (let anyFunction in functionsToExecute) {
-                runFunction(functionsToExecute[anyFunction]);
-            }
+  let hasExecutedOnce = false;
+  let forEach = function(file, enc, cb) {
+    // the forEach function is called for every chunk
+    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 {
-            throw new Error("gulp-callfunction: something is strange with the given arguments");
+          cb(null, file);
         }
-        return plugins.Q.all(promiseArray);
-    };
+        hasExecutedOnce = true;
+        break;
+      case 'atEnd':
+        cb();
+        break;
+      default:
+        break;
+    }
+  };
 
-    let hasExecutedOnce = false;
-    let forEach = function (file, enc, cb) { //the forEach function is called for every chunk
-        switch (executionMode){
-            case "forEach":
-                checkAndRunFunction().then(function(){
-                    cb(null, file);
-                });
-                break;
-            case "forFirst":
-                !hasExecutedOnce ? checkAndRunFunction().then(function(){
-                    cb(null, file);
-                }) : cb(null, file);
-                hasExecutedOnce = true;
-                break;
-            case "atEnd":
-                cb(null, file);
-                break;
-            default:
-                break;
-        }
-    };
-
-    let atEnd = function(cb) {
-        if (executionMode === "atEnd") {
-            checkAndRunFunction().then(function(){
-                cb();
-            });
-        } else {
-            cb();
-        }
-    };
-    return plugins.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;

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"
-    }
-  }
-}

tslint.json

@@ -0,0 +1,17 @@
+{
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
+}