From 63cf7091a1f344964aefbbe44deb7211139c4466 Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Wed, 19 Oct 2016 00:35:41 +0200 Subject: [PATCH] add possibility to modify the file object --- .gitignore | 2 + .gitlab-ci.yml | 30 ++++++--- README.md | 26 +++++--- dist/gulpfunction.plugins.d.ts | 3 - dist/gulpfunction.plugins.js | 6 -- dist/index.d.ts | 6 +- dist/index.js | 68 ++++++++++---------- npmextra.json | 5 ++ npmts.json | 4 -- package.json | 10 +-- test/test.js | 7 +-- ts/gulpfunction.plugins.ts | 4 -- ts/index.ts | 110 ++++++++++++++++++--------------- ts/tsd.json | 15 ----- tslint.json | 3 + 15 files changed, 159 insertions(+), 140 deletions(-) delete mode 100644 dist/gulpfunction.plugins.d.ts delete mode 100644 dist/gulpfunction.plugins.js create mode 100644 npmextra.json delete mode 100644 npmts.json delete mode 100644 ts/gulpfunction.plugins.ts delete mode 100644 ts/tsd.json create mode 100644 tslint.json diff --git a/.gitignore b/.gitignore index fb20809..70da2df 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ node_modules/ .idea/ coverage/ docs/ +public/ +pages/ ts/*.js ts/*.js.map diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e22cf48..ccd25c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,17 +1,16 @@ -image: hosttoday/ht-docker-node:npmts - +image: hosttoday/ht-docker-node:npmci stages: - test - release -- page - +- trigger +- pages testLEGACY: stage: test script: - npmci test legacy tags: - docker - + allow_failure: true testLTS: stage: test script: @@ -25,13 +24,30 @@ testSTABLE: - npmci test stable tags: - docker - release: stage: release script: - - npmci publish npm + - 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 \ No newline at end of file diff --git a/README.md b/README.md index 2c97c71..ee55205 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,21 @@ # gulp-function accepts call to execute in gulp pipeline. -### Status +## Availabililty +[![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) [![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) +[![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 @@ -18,7 +23,7 @@ var gulp = require("gulp"); var gulpFunction = require("gulp-function"); var Q = require("q"); -var myFunction = function () { +var myFunction = function (file, enc) { // file and enc are optional in case you want to modify the file object var done = Q.defer(); console.log("Hello World!") @@ -41,11 +46,14 @@ gulp.task('gulpTest',function() { ### 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. +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**!!! \ No newline at end of file + That means the stream's "finish" event fires **before "atLast" is executed**!!! + +[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks) diff --git a/dist/gulpfunction.plugins.d.ts b/dist/gulpfunction.plugins.d.ts deleted file mode 100644 index 97d5ca8..0000000 --- a/dist/gulpfunction.plugins.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import "typings-global"; -export declare let Q: any; -export declare let through2: any; diff --git a/dist/gulpfunction.plugins.js b/dist/gulpfunction.plugins.js deleted file mode 100644 index 32a3d0f..0000000 --- a/dist/gulpfunction.plugins.js +++ /dev/null @@ -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= diff --git a/dist/index.d.ts b/dist/index.d.ts index 62d7805..09731ee 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -1 +1,5 @@ -import "typings-global"; +import 'typings-global'; +export declare type TExecutionMode = 'forEach' | 'forFirst' | 'atEnd'; +export interface IPromiseFunction { + (file?: any, enc?: any): PromiseLike; +} diff --git a/dist/index.js b/dist/index.js index 2dd3ec7..99ebd8e 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,56 +1,59 @@ "use strict"; require("typings-global"); -var plugins = require("./gulpfunction.plugins"); -module.exports = function (functionsToExecuteArg, executionModeArg) { - if (executionModeArg === void 0) { executionModeArg = 'forEach'; } - //important vars - var executionMode = executionModeArg; //can be forEach or atEnd - var functionsToExecute = functionsToExecuteArg; - var promiseArray = []; - var runFunction = function (functionArg) { - var returnValue = functionArg(); - if (typeof returnValue !== "undefined" && typeof returnValue.then !== "undefined") { +const q = require("q"); +const through2 = require("through2"); +module.exports = (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); } }; - var checkAndRunFunction = function () { - if (typeof functionsToExecute === "function") { - runFunction(functionsToExecute); + let checkAndRunFunction = function (file, enc) { + if (typeof functionsToExecuteArg === 'function') { + runFunction(functionsToExecuteArg, file, enc); } - else if (Array.isArray(functionsToExecute)) { - for (var anyFunction in functionsToExecute) { - runFunction(functionsToExecute[anyFunction]); + 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"); + throw new Error('gulp-callfunction: something is strange with the given arguments'); } - return plugins.Q.all(promiseArray); + return q.all(promiseArray); }; - var hasExecutedOnce = false; - var forEach = function (file, enc, cb) { - switch (executionMode) { - case "forEach": - checkAndRunFunction().then(function () { + let hasExecutedOnce = false; + let forEach = function (file, enc, cb) { + switch (executionModeArg) { + case 'forEach': + checkAndRunFunction(file, enc).then(function () { cb(null, file); }); break; - case "forFirst": - !hasExecutedOnce ? checkAndRunFunction().then(function () { + case 'forFirst': + if (hasExecutedOnce) { + checkAndRunFunction(file, enc) + .then(function () { + cb(null, file); + }); + } + else { cb(null, file); - }) : cb(null, file); + } hasExecutedOnce = true; break; - case "atEnd": + case 'atEnd': cb(null, file); break; default: break; } }; - var atEnd = function (cb) { - if (executionMode === "atEnd") { - checkAndRunFunction().then(function () { + let atEnd = function (cb) { + if (executionModeArg === 'atEnd') { + checkAndRunFunction(null, null).then(function () { cb(); }); } @@ -58,7 +61,6 @@ module.exports = function (functionsToExecuteArg, executionModeArg) { cb(); } }; - return plugins.through2.obj(forEach, atEnd); + return through2.obj(forEach, atEnd); }; - -//# sourceMappingURL=data:application/json;charset=utf8;base64,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QUFFLENBQUM7UUFDVCxDQUFDO0lBQ0wsQ0FBQyxDQUFDO0lBQ0YsTUFBTSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBQyxLQUFLLENBQUMsQ0FBQztBQUMvQyxDQUFDLENBQUMiLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5cclxuaW1wb3J0IHBsdWdpbnMgPSByZXF1aXJlKFwiLi9ndWxwZnVuY3Rpb24ucGx1Z2luc1wiKTtcclxuXHJcblxyXG5cclxuXHJcbm1vZHVsZS5leHBvcnRzID0gZnVuY3Rpb24gKGZ1bmN0aW9uc1RvRXhlY3V0ZUFyZzphbnl8YW55W10sZXhlY3V0aW9uTW9kZUFyZzpzdHJpbmcgPSAnZm9yRWFjaCcpIHtcclxuICAgIC8vaW1wb3J0YW50IHZhcnNcclxuICAgIGxldCBleGVjdXRpb25Nb2RlID0gZXhlY3V0aW9uTW9kZUFyZzsgLy9jYW4gYmUgZm9yRWFjaCBvciBhdEVuZFxyXG4gICAgbGV0IGZ1bmN0aW9uc1RvRXhlY3V0ZSA9IGZ1bmN0aW9uc1RvRXhlY3V0ZUFyZztcclxuICAgIGxldCBwcm9taXNlQXJyYXkgPSBbXTtcclxuICAgIGxldCBydW5GdW5jdGlvbiA9IGZ1bmN0aW9uKGZ1bmN0aW9uQXJnKXtcclxuICAgICAgICBsZXQgcmV0dXJuVmFsdWUgPSBmdW5jdGlvbkFyZygpO1xyXG4gICAgICAgIGlmICh0eXBlb2YgcmV0dXJuVmFsdWUgIT09IFwidW5kZWZpbmVkXCIgJiYgdHlwZW9mIHJldHVyblZhbHVlLnRoZW4gIT09IFwidW5kZWZpbmVkXCIpIHtcclxuICAgICAgICAgICAgcHJvbWlzZUFycmF5LnB1c2gocmV0dXJuVmFsdWUpO1xyXG4gICAgICAgIH1cclxuICAgIH07XHJcblxyXG4gICAgbGV0IGNoZWNrQW5kUnVuRnVuY3Rpb24gPSBmdW5jdGlvbiAoKSB7XHJcbiAgICAgICAgaWYgKHR5cGVvZiBmdW5jdGlvbnNUb0V4ZWN1dGUgPT09IFwiZnVuY3Rpb25cIiApIHtcclxuICAgICAgICAgICAgcnVuRnVuY3Rpb24oZnVuY3Rpb25zVG9FeGVjdXRlKTtcclxuICAgICAgICB9IGVsc2UgaWYgKEFycmF5LmlzQXJyYXkoZnVuY3Rpb25zVG9FeGVjdXRlKSkge1xyXG4gICAgICAgICAgICBmb3IgKGxldCBhbnlGdW5jdGlvbiBpbiBmdW5jdGlvbnNUb0V4ZWN1dGUpIHtcclxuICAgICAgICAgICAgICAgIHJ1bkZ1bmN0aW9uKGZ1bmN0aW9uc1RvRXhlY3V0ZVthbnlGdW5jdGlvbl0pO1xyXG4gICAgICAgICAgICB9XHJcbiAgICAgICAgfSBlbHNlIHtcclxuICAgICAgICAgICAgdGhyb3cgbmV3IEVycm9yKFwiZ3VscC1jYWxsZnVuY3Rpb246IHNvbWV0aGluZyBpcyBzdHJhbmdlIHdpdGggdGhlIGdpdmVuIGFyZ3VtZW50c1wiKTtcclxuICAgICAgICB9XHJcbiAgICAgICAgcmV0dXJuIHBsdWdpbnMuUS5hbGwocHJvbWlzZUFycmF5KTtcclxuICAgIH07XHJcblxyXG4gICAgbGV0IGhhc0V4ZWN1dGVkT25jZSA9IGZhbHNlO1xyXG4gICAgbGV0IGZvckVhY2ggPSBmdW5jdGlvbiAoZmlsZSwgZW5jLCBjYikgeyAvL3RoZSBmb3JFYWNoIGZ1bmN0aW9uIGlzIGNhbGxlZCBmb3IgZXZlcnkgY2h1bmtcclxuICAgICAgICBzd2l0Y2ggKGV4ZWN1dGlvbk1vZGUpe1xyXG4gICAgICAgICAgICBjYXNlIFwiZm9yRWFjaFwiOlxyXG4gICAgICAgICAgICAgICAgY2hlY2tBbmRSdW5GdW5jdGlvbigpLnRoZW4oZnVuY3Rpb24oKXtcclxuICAgICAgICAgICAgICAgICAgICBjYihudWxsLCBmaWxlKTtcclxuICAgICAgICAgICAgICAgIH0pO1xyXG4gICAgICAgICAgICAgICAgYnJlYWs7XHJcbiAgICAgICAgICAgIGNhc2UgXCJmb3JGaXJzdFwiOlxyXG4gICAgICAgICAgICAgICAgIWhhc0V4ZWN1dGVkT25jZSA/IGNoZWNrQW5kUnVuRnVuY3Rpb24oKS50aGVuKGZ1bmN0aW9uKCl7XHJcbiAgICAgICAgICAgICAgICAgICAgY2IobnVsbCwgZmlsZSk7XHJcbiAgICAgICAgICAgICAgICB9KSA6IGNiKG51bGwsIGZpbGUpO1xyXG4gICAgICAgICAgICAgICAgaGFzRXhlY3V0ZWRPbmNlID0gdHJ1ZTtcclxuICAgICAgICAgICAgICAgIGJyZWFrO1xyXG4gICAgICAgICAgICBjYXNlIFwiYXRFbmRcIjpcclxuICAgICAgICAgICAgICAgIGNiKG51bGwsIGZpbGUpO1xyXG4gICAgICAgICAgICAgICAgYnJlYWs7XHJcbiAgICAgICAgICAgIGRlZmF1bHQ6XHJcbiAgICAgICAgICAgICAgICBicmVhaztcclxuICAgICAgICB9XHJcbiAgICB9O1xyXG5cclxuICAgIGxldCBhdEVuZCA9IGZ1bmN0aW9uKGNiKSB7XHJcbiAgICAgICAgaWYgKGV4ZWN1dGlvbk1vZGUgPT09IFwiYXRFbmRcIikge1xyXG4gICAgICAgICAgICBjaGVja0FuZFJ1bkZ1bmN0aW9uKCkudGhlbihmdW5jdGlvbigpe1xyXG4gICAgICAgICAgICAgICAgY2IoKTtcclxuICAgICAgICAgICAgfSk7XHJcbiAgICAgICAgfSBlbHNlIHtcclxuICAgICAgICAgICAgY2IoKTtcclxuICAgICAgICB9XHJcbiAgICB9O1xyXG4gICAgcmV0dXJuIHBsdWdpbnMudGhyb3VnaDIub2JqKGZvckVhY2gsYXRFbmQpO1xyXG59O1xyXG4iXX0= +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLHVCQUFzQjtBQUN0QixxQ0FBb0M7QUFTcEMsTUFBTSxDQUFDLE9BQU8sR0FBRyxDQUNiLHFCQUE0RCxFQUM1RCxnQkFBZ0IsR0FBbUIsU0FBUztJQUc1QyxJQUFJLFlBQVksR0FBRyxFQUFFLENBQUE7SUFDckIsSUFBSSxXQUFXLEdBQUcsVUFBVSxXQUFXLEVBQUUsSUFBSSxFQUFFLEdBQUc7UUFDOUMsSUFBSSxXQUFXLEdBQUcsV0FBVyxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQTtRQUN4QyxFQUFFLENBQUMsQ0FBQyxPQUFPLFdBQVcsS0FBSyxXQUFXLElBQUksT0FBTyxXQUFXLENBQUMsSUFBSSxLQUFLLFdBQVcsQ0FBQyxDQUFDLENBQUM7WUFDaEYsWUFBWSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQTtRQUNsQyxDQUFDO0lBQ0wsQ0FBQyxDQUFBO0lBRUQsSUFBSSxtQkFBbUIsR0FBRyxVQUFVLElBQUksRUFBRSxHQUFHO1FBQ3pDLEVBQUUsQ0FBQyxDQUFDLE9BQU8scUJBQXFCLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztZQUM5QyxXQUFXLENBQUMscUJBQXFCLEVBQUUsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFBO1FBQ2pELENBQUM7UUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM5QyxHQUFHLENBQUMsQ0FBQyxJQUFJLFdBQVcsSUFBSSxxQkFBcUIsQ0FBQyxDQUFDLENBQUM7Z0JBQzVDLFdBQVcsQ0FBQyxxQkFBcUIsQ0FBQyxXQUFXLENBQUMsRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUE7WUFDOUQsQ0FBQztRQUNMLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLE1BQU0sSUFBSSxLQUFLLENBQUMsa0VBQWtFLENBQUMsQ0FBQTtRQUN2RixDQUFDO1FBQ0QsTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUE7SUFDOUIsQ0FBQyxDQUFBO0lBRUQsSUFBSSxlQUFlLEdBQUcsS0FBSyxDQUFBO0lBQzNCLElBQUksT0FBTyxHQUFHLFVBQVUsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ2pDLE1BQU0sQ0FBQyxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQztZQUN2QixLQUFLLFNBQVM7Z0JBQ1YsbUJBQW1CLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQztvQkFDaEMsRUFBRSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQTtnQkFDbEIsQ0FBQyxDQUFDLENBQUE7Z0JBQ0YsS0FBSyxDQUFBO1lBQ1QsS0FBSyxVQUFVO2dCQUNYLEVBQUUsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUM7b0JBQ2xCLG1CQUFtQixDQUFDLElBQUksRUFBRSxHQUFHLENBQUM7eUJBQ3pCLElBQUksQ0FBQzt3QkFDRixFQUFFLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFBO29CQUNsQixDQUFDLENBQUMsQ0FBQTtnQkFDVixDQUFDO2dCQUFDLElBQUksQ0FBQyxDQUFDO29CQUNKLEVBQUUsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUE7Z0JBQ2xCLENBQUM7Z0JBQ0QsZUFBZSxHQUFHLElBQUksQ0FBQTtnQkFDdEIsS0FBSyxDQUFBO1lBQ1QsS0FBSyxPQUFPO2dCQUNSLEVBQUUsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUE7Z0JBQ2QsS0FBSyxDQUFBO1lBQ1Q7Z0JBQ0ksS0FBSyxDQUFBO1FBQ2IsQ0FBQztJQUNMLENBQUMsQ0FBQTtJQUVELElBQUksS0FBSyxHQUFHLFVBQVUsRUFBRTtRQUNwQixFQUFFLENBQUMsQ0FBQyxnQkFBZ0IsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQy9CLG1CQUFtQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBQ2pDLEVBQUUsRUFBRSxDQUFBO1lBQ1IsQ0FBQyxDQUFDLENBQUE7UUFDTixDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixFQUFFLEVBQUUsQ0FBQTtRQUNSLENBQUM7SUFDTCxDQUFDLENBQUE7SUFDRCxNQUFNLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUE7QUFDdkMsQ0FBQyxDQUFBIn0= \ No newline at end of file diff --git a/npmextra.json b/npmextra.json new file mode 100644 index 0000000..916763c --- /dev/null +++ b/npmextra.json @@ -0,0 +1,5 @@ +{ + "npmts": { + "mode": "default" + } +} \ No newline at end of file diff --git a/npmts.json b/npmts.json deleted file mode 100644 index 85f70a8..0000000 --- a/npmts.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "mode":"default", - "coveralls":true -} \ No newline at end of file diff --git a/package.json b/package.json index 468d8cd..5f70900 100644 --- a/package.json +++ b/package.json @@ -26,14 +26,16 @@ }, "homepage": "https://gitlab.com/pushrocks/gulp-function", "dependencies": { + "@types/q": "0.0.32", + "@types/through2": "^2.0.31", "q": "^1.4.1", "through2": "^2.0.1", - "typings-global": "^1.0.3" + "typings-global": "^1.0.14" }, "devDependencies": { - "beautylog": "^5.0.8", + "beautylog": "^6.0.0", "gulp": "^3.9.1", - "npmts-g": "^5.2.6", - "typings-test": "^1.0.1" + "npmts-g": "^5.2.8", + "typings-test": "^1.0.3" } } diff --git a/test/test.js b/test/test.js index 50e19a6..1c741cd 100644 --- a/test/test.js +++ b/test/test.js @@ -45,7 +45,7 @@ var afterFunction = function () { done.resolve(); return done.promise; }; -var timeoutFunction = function () { +let timeoutFunction = function () { var done = Q.defer(); setTimeout(function () { beautylog.log("largeTimeout fired"); @@ -80,7 +80,7 @@ describe("gulpFunction", function () { }); it("should run in order", function (done) { this.timeout(5000); - var stream = gulp.src('./test/*.md') + let stream = gulp.src('./test/*.md') .pipe(gulpFunction([beforeFunction, middleFunction, middleFunction], 'atEnd')) .pipe(gulpFunction(function () { beautylog.log("stream progressed"); @@ -99,5 +99,4 @@ describe("gulpFunction", function () { }); }); }); - -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test.ts"],"names":[],"mappings":"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","file":"test.js","sourcesContent":["import \"typings-test\"\r\nvar gulp = require(\"gulp\");\r\nvar gulpFunction = require(\"../dist/index.js\");\r\nvar beautylog = require(\"beautylog\");\r\nvar Q = require(\"q\");\r\n\r\nvar myFunction = function () {\r\n    var done = Q.defer()\r\n    beautylog.log(\"Function executed\");\r\n    done.resolve();\r\n    return done.promise;\r\n};\r\nvar myFunction2 = function () {\r\n    var done = Q.defer();\r\n    beautylog.ok(\"Function2 executed\");\r\n    done.resolve();\r\n    return done.promise;\r\n};\r\nvar myFunction3 = function () {\r\n    var done = Q.defer();\r\n    beautylog.success(\"Function3 executed\");\r\n    done.resolve();\r\n    return done.promise;\r\n};\r\n\r\nvar beforeFunction = function () {\r\n    var done = Q.defer();\r\n    beautylog.success(\"beforeFunction executed\");\r\n    done.resolve();\r\n    return done.promise;\r\n};\r\n\r\nvar middleFunctionRun = false;\r\n\r\nvar middleFunction = function () {\r\n    var done = Q.defer();\r\n    beautylog.success(\"middleFunction executed\");\r\n    setTimeout(function(){\r\n        beautylog.log(\"timeout fired\");\r\n        middleFunctionRun = true;\r\n        done.resolve();\r\n    }, 500);\r\n    return done.promise;\r\n};\r\n\r\nvar afterFunction = function () {\r\n    var done = Q.defer();\r\n    beautylog.success(\"afterFunction executed\");\r\n    done.resolve();\r\n    return done.promise;\r\n};\r\n\r\nlet timeoutFunction = function(){\r\n    var done = Q.defer();\r\n    setTimeout(function(){\r\n        beautylog.log(\"largeTimeout fired\");\r\n        done.resolve();\r\n    },2000);\r\n    return done.promise;\r\n};\r\n\r\n\r\n\r\ndescribe(\"gulpFunction\",function(){\r\n    it(\"should run through smoothly with \" + \"'forEach'\".blue,function(done){\r\n        gulp.src('./test/*.md')\r\n            .pipe(gulpFunction(myFunction,'forEach'))\r\n            .pipe(gulp.dest(\"./test/result/\"));\r\n\r\n        gulp.src('./test/*.md')\r\n            .pipe(gulpFunction([myFunction2,myFunction3],'forEach'))\r\n            .pipe(gulp.dest(\"./test/result/\"))\r\n            .pipe(gulpFunction(done,\"atEnd\"));\r\n\r\n    });\r\n\r\n    it(\"should run through smoothly with \" + \"'atEnd'\".blue,function(done){\r\n        gulp.src('./test/*.md')\r\n            .pipe(gulpFunction(myFunction,'atEnd'))\r\n            .pipe(gulp.dest(\"./test/result/\"));\r\n\r\n        gulp.src('./test/*.md')\r\n            .pipe(gulpFunction([myFunction2,myFunction3],'atEnd'))\r\n            .pipe(gulp.dest(\"./test/result/\"))\r\n            .pipe(gulpFunction(done,\"atEnd\"));\r\n    });\r\n\r\n    it(\"should run through smoothly once with \" + \"'atFirst'\".blue,function(done){\r\n\r\n        gulp.src('./test/*.md')\r\n            .pipe(gulpFunction([myFunction2,myFunction3],'forFirst'))\r\n            .pipe(gulp.dest(\"./test/result/\"))\r\n            .pipe(gulpFunction(done,\"atEnd\"));\r\n    });\r\n\r\n    it(\"should run in order\",function(done){\r\n        this.timeout(5000);\r\n        let stream = gulp.src('./test/*.md')\r\n            .pipe(gulpFunction([beforeFunction,middleFunction,middleFunction],'atEnd'))\r\n            .pipe(gulpFunction(function(){\r\n                beautylog.log(\"stream progressed\");\r\n                var done2 = Q.defer();\r\n                done2.resolve();\r\n                return done2.promise;\r\n            },\"forEach\"))\r\n            .pipe(gulpFunction(function(){\r\n                beautylog.log(\"nextStep\");\r\n            }))\r\n            .pipe(gulpFunction(afterFunction,\"atEnd\"))\r\n            .pipe(gulpFunction(timeoutFunction,\"atEnd\"));\r\n\r\n        stream.on(\"finish\",function(){\r\n            beautylog.info(\"stream finished\");\r\n            done();\r\n        });\r\n    });\r\n});\r\n\r\n"]} +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDM0IsSUFBSSxZQUFZLEdBQUcsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBQUM7QUFDL0MsSUFBSSxTQUFTLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBQ3JDLElBQUksQ0FBQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUVyQixJQUFJLFVBQVUsR0FBRztJQUNiLElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUNwQixTQUFTLENBQUMsR0FBRyxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFDbkMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFDO0FBQ0YsSUFBSSxXQUFXLEdBQUc7SUFDZCxJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDckIsU0FBUyxDQUFDLEVBQUUsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0lBQ25DLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQztBQUNGLElBQUksV0FBVyxHQUFHO0lBQ2QsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQ3JCLFNBQVMsQ0FBQyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUN4QyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUM7QUFFRixJQUFJLGNBQWMsR0FBRztJQUNqQixJQUFJLElBQUksR0FB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 \ No newline at end of file diff --git a/ts/gulpfunction.plugins.ts b/ts/gulpfunction.plugins.ts deleted file mode 100644 index dbb7491..0000000 --- a/ts/gulpfunction.plugins.ts +++ /dev/null @@ -1,4 +0,0 @@ -import "typings-global"; - -export let Q = require("q"); -export let through2 = require("through2"); diff --git a/ts/index.ts b/ts/index.ts index 4058f82..302f00c 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,65 +1,75 @@ -import "typings-global"; +import 'typings-global' +import * as q from 'q' +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 +} +module.exports = ( + functionsToExecuteArg: IPromiseFunction | IPromiseFunction[], + executionModeArg: TExecutionMode = 'forEach' +): Transform => { - -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 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 () { - if (typeof functionsToExecute === "function" ) { - runFunction(functionsToExecute); - } else if (Array.isArray(functionsToExecute)) { - for (let anyFunction in functionsToExecute) { - runFunction(functionsToExecute[anyFunction]); + 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"); + throw new Error('gulp-callfunction: something is strange with the given arguments') } - return plugins.Q.all(promiseArray); - }; + return q.all(promiseArray) + } - 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; + 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 { + cb(null, file) + } + hasExecutedOnce = true + break + case 'atEnd': + cb(null, file) + break default: - break; + break } - }; + } - let atEnd = function(cb) { - if (executionMode === "atEnd") { - checkAndRunFunction().then(function(){ - cb(); - }); + let atEnd = function (cb) { + if (executionModeArg === 'atEnd') { + checkAndRunFunction(null, null).then(function () { + cb() + }) } else { - cb(); + cb() } - }; - return plugins.through2.obj(forEach,atEnd); -}; + } + return through2.obj(forEach, atEnd) +} diff --git a/ts/tsd.json b/ts/tsd.json deleted file mode 100644 index ed09359..0000000 --- a/ts/tsd.json +++ /dev/null @@ -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" - } - } -} diff --git a/tslint.json b/tslint.json new file mode 100644 index 0000000..45052ad --- /dev/null +++ b/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": "tslint-config-standard" +}