7.0.15

Switch to tap

Closes #16

See merge request !3

.gitlab-ci.yml

@@ -1,6 +1,11 @@
-# standard ci
+# gitzone standard
 image: hosttoday/ht-docker-node:npmci
 
+cache:
+  paths:
+  - .yarn/
+  key: "$CI_BUILD_STAGE"
+
 stages:
 - test
 - release
@@ -11,6 +16,7 @@ testLEGACY:
   stage: test
   script:
     - npmci test legacy
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
   allow_failure: true
@@ -19,6 +25,7 @@ testLTS:
   stage: test
   script:
     - npmci test lts
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
     
@@ -26,6 +33,7 @@ testSTABLE:
   stage: test
   script:
     - npmci test stable
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
 
@@ -48,10 +56,13 @@ trigger:
     - docker
 
 pages:
-  image: hosttoday/ht-docker-node:npmpage
+  image: hosttoday/ht-docker-node:npmci
   stage: pages
   script:
+    - npmci command yarn global add npmpage
     - npmci command npmpage --publish gitlab
+  tags:
+    - docker
   only:
     - tags
   artifacts:

CHANGELOG

@@ -3,3 +3,9 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 6.0.0 (released)
     - remove TypeDoc, please look at npmpage
     - check package.json
+
+v 7.0.0
+    - switch from mocha to tap
+    - run tests in SubProcesses with coverage
+    - improve ES6 handling
+    - add smartanalytics

assets/cli.js

@@ -1,2 +1,3 @@
 #!/usr/bin/env node
+process.env.CLI_CALL = 'true'
 var index = require("../{{pathToIndex}}");

dist/index.js

@@ -1,8 +1,8 @@
+"use strict";
 /* ================================================== *
     **** NPMTS ****
     Fabulous TypeScript development
  * ================================================== */
-"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const early = require("early");
 early.start('NPMTS');

dist/mod00/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /* ------------------------------------------
- * This module compiles TypeScript files
+ * This module compiles the module's TypeScript files
+ * Note: Test files are only compiled in memory
  * -------------------------------------------- */
 const q = require("smartq");
 const plugins = require("./mod00.plugins");

dist/mod00/mod00.assets.js

@@ -7,7 +7,7 @@ const mod00_check_1 = require("../mod00/mod00.check");
 exports.run = function (configArg) {
     let done = q.defer();
     let config = configArg;
-    plugins.beautylog.ora.text('now looking at ' + 'required assets'.yellow);
+    plugins.beautylog.ora.text('now looking at ' + 'required assets');
     if (config.cli === true) {
         let mainJsPath = mod00_check_1.projectInfo.packageJson.main;
         let cliJsString = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir, 'cli.js'));

dist/mod00/mod00.check.js

@@ -56,11 +56,11 @@ let checkDependencies = (configArg) => {
             process.exit(1);
         }
         for (let item in unused.invalidFiles) {
-            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
+            plugins.beautylog.warn(`Watch out: could not parse file ${item}`);
         }
         ;
         for (let item in unused.invalidDirs) {
-            plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`);
+            plugins.beautylog.warn(`Watch out: could not parse directory ${item}`);
         }
         done.resolve(configArg);
     });
@@ -82,20 +82,20 @@ let checkDevDependencies = (configArg) => {
     });
     plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
         for (let item of unused.devDependencies) {
-            plugins.beautylog.log(`unused devDependency ${item.red}`);
+            plugins.beautylog.log(`unused devDependency ${item}`);
         }
         for (let item in unused.missing) {
-            plugins.beautylog.error(`unused devDependency ${item.red}`);
+            plugins.beautylog.error(`unused devDependency ${item}`);
         }
         if (unused.missing.length > 0) {
             plugins.beautylog.info('exiting due to missing dependencies in package.json');
             process.exit(1);
         }
         for (let item in unused.invalidFiles) {
-            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
+            plugins.beautylog.warn(`Watch out: could not parse file ${item}`);
         }
         for (let item in unused.invalidDirs) {
-            plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`);
+            plugins.beautylog.warn(`Watch out: could not parse directory ${item}`);
         }
         done.resolve(configArg);
     });

dist/mod00/mod00.compile.js

@@ -6,15 +6,10 @@ const plugins = require("./mod00.plugins");
 exports.run = function (configArg) {
     let done = q.defer();
     let config = configArg;
-    plugins.beautylog.ora.text('now compiling ' + 'TypeScript'.yellow);
+    plugins.beautylog.ora.text('now compiling ' + 'TypeScript');
     plugins.tsn.compileGlobStringObject(config.ts, config.tsOptions, paths.cwd)
         .then(() => {
-        plugins.beautylog.ok('compiled main TypeScript!');
-        plugins.beautylog.log('now compiling tests!');
-        return plugins.tsn.compileGlobStringObject(config.testTs, config.tsOptions, paths.cwd);
-    })
-        .then(function () {
-        plugins.beautylog.ok('compiled all TypeScript!');
+        plugins.beautylog.ok(`compiled the module's TypeScript!`);
         done.resolve(config);
     }).catch(err => { console.log(err); });
     return done.promise;

dist/mod02/index.js

@@ -13,17 +13,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * -------------------------------------------- */
 const plugins = require("./mod02.plugins");
 const paths = require("../npmts.paths");
+let gulp = require('gulp');
 const q = require("smartq");
 /**
  * runs mocha
  * @returns INpmtsConfig
  */
-let mocha = function (configArg) {
-    plugins.beautylog.ora.text('Instrumentalizing and testing transpiled JS');
-    plugins.beautylog.ora.end(); // end plugins.beautylog.ora for tests.
+let tap = function (configArg) {
     let done = q.defer();
-    let coverageSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, './ts/**/*.ts')]),
+    /**
+     * the TabBuffer for npmts
+     */
+    let npmtsTapBuffer = new plugins.tapbuffer.TabBuffer();
+    /**
+     * handle the testable files
+     */
+    let testableFilesSmartstream = new plugins.smartstream.Smartstream([
+        gulp.src([plugins.path.join(paths.cwd, './ts/**/*.ts')]),
         plugins.gulpSourcemaps.init(),
         plugins.gulpTypeScript({
             target: 'ES5',
@@ -31,38 +37,35 @@ let mocha = function (configArg) {
             experimentalDecorators: true,
             lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
         }),
-        plugins.gulpIstanbul({}),
         plugins.gulpSourcemaps.write(),
         plugins.gulpFunction.forEach((file) => __awaiter(this, void 0, void 0, function* () {
             file.path = file.path.replace(paths.tsDir, paths.distDir);
         })),
-        plugins.gulpInjectModules(),
-        plugins.through2.obj((file, enc, cb) => {
-            cb();
-        }, (cb) => {
-            cb();
-        })
+        npmtsTapBuffer.pipeTestableFiles(),
+        plugins.smartstream.cleanPipe()
     ]);
-    let localSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.ts')]),
+    /**
+     * handle the test files
+     */
+    let testFilesSmartstream = new plugins.smartstream.Smartstream([
+        gulp.src([plugins.path.join(paths.cwd, 'test/*.ts')]),
         plugins.gulpTypeScript({
             target: 'ES5',
             emitDecoratorMetadata: true,
             experimentalDecorators: true,
             lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
         }),
-        plugins.gulpInjectModules(),
-        plugins.gulpMocha(),
-        plugins.gulpIstanbul.writeReports({
-            dir: plugins.path.join(paths.cwd, './coverage'),
-            reporters: ['lcovonly', 'json', 'text', 'text-summary']
-        })
+        npmtsTapBuffer.pipeTestFiles(),
+        plugins.smartstream.cleanPipe()
     ]);
-    coverageSmartstream.run()
-        .then(() => {
-        plugins.beautylog.info('code is now transpiled to ES5, instrumented with istanbul, and injected for mocha!');
-        return localSmartstream.run()
-            .then(() => { done.resolve(configArg); }, (err) => {
+    // lets run the smartstream
+    Promise.all([
+        testableFilesSmartstream.run(),
+        testFilesSmartstream.run()
+    ]).then(() => __awaiter(this, void 0, void 0, function* () {
+        configArg.runData.coverageLcovInfo = yield npmtsTapBuffer.runTests();
+        done.resolve(configArg);
+    }), (err) => {
         plugins.beautylog.error('Tests failed!');
         console.log(err);
         if (configArg.watch) {
@@ -72,22 +75,17 @@ let mocha = function (configArg) {
             process.exit(1);
         }
     });
-    }, (err) => {
-        console.log(err);
-    });
     return done.promise;
 };
-let coverage = function (configArg) {
-    let done = q.defer();
-    plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, 'lcov.info'), 2)
-        .then(function (percentageArg) {
-        if (percentageArg >= configArg.coverageTreshold) {
-            plugins.beautylog.ok(`${percentageArg.toString()}% `
+let handleCoverageData = (configArg) => __awaiter(this, void 0, void 0, function* () {
+    let coverageResult = yield plugins.smartcov.get.percentageFromLcovString(configArg.runData.coverageLcovInfo, 2);
+    if (coverageResult >= configArg.coverageTreshold) {
+        plugins.beautylog.ok(`${(coverageResult).toString()}% `
             + `coverage exceeds your treshold of `
             + `${configArg.coverageTreshold.toString()}%`);
     }
     else {
-            plugins.beautylog.warn(`${percentageArg.toString()}% `
+        plugins.beautylog.warn(`${(coverageResult).toString()}% `
             + `coverage fails your treshold of `
             + `${configArg.coverageTreshold.toString()}%`);
         plugins.beautylog.error('exiting due to coverage failure');
@@ -95,20 +93,17 @@ let coverage = function (configArg) {
             process.exit(1);
         }
     }
-        done.resolve(configArg);
+    return configArg;
 });
-    return done.promise;
-};
 exports.run = function (configArg) {
     let done = q.defer();
     let config = configArg;
     if (config.test === true) {
         plugins.beautylog.ora.text('now starting tests');
-        plugins.beautylog.log('------------------------------------------------------\n' +
-            '*************************** TESTS: ***************************\n' +
-            '--------------------------------------------------------------');
-        mocha(config)
-            .then(coverage)
+        plugins.beautylog.ora.end();
+        plugins.beautylog.log('ready for tapbuffer:');
+        tap(config)
+            .then(handleCoverageData)
             .then(() => {
             done.resolve(config);
         }).catch(err => { console.log(err); });

dist/mod02/mod02.plugins.d.ts

@@ -1,9 +1,8 @@
 export * from '../npmts.plugins';
-import * as gulp from 'gulp';
+import * as gulp from 'smartgulp';
 import * as gulpFunction from 'gulp-function';
-import * as gulpIstanbul from 'gulp-istanbul';
-declare let gulpInjectModules: any;
-import * as gulpMocha from 'gulp-mocha';
 import * as gulpSourcemaps from 'gulp-sourcemaps';
 import * as gulpTypeScript from 'gulp-typescript';
-export { gulp, gulpFunction, gulpIstanbul, gulpInjectModules, gulpMocha, gulpSourcemaps, gulpTypeScript };
+import * as smartcov from 'smartcov';
+import * as tapbuffer from 'tapbuffer';
+export { gulp, gulpFunction, gulpSourcemaps, gulpTypeScript, smartcov, tapbuffer };

dist/mod02/mod02.plugins.js

@@ -4,17 +4,15 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("../npmts.plugins"));
-const gulp = require("gulp");
+const gulp = require("smartgulp");
 exports.gulp = gulp;
 const gulpFunction = require("gulp-function");
 exports.gulpFunction = gulpFunction;
-const gulpIstanbul = require("gulp-istanbul");
-exports.gulpIstanbul = gulpIstanbul;
-let gulpInjectModules = require('gulp-inject-modules');
-exports.gulpInjectModules = gulpInjectModules;
-const gulpMocha = require("gulp-mocha");
-exports.gulpMocha = gulpMocha;
 const gulpSourcemaps = require("gulp-sourcemaps");
 exports.gulpSourcemaps = gulpSourcemaps;
 const gulpTypeScript = require("gulp-typescript");
 exports.gulpTypeScript = gulpTypeScript;
+const smartcov = require("smartcov");
+exports.smartcov = smartcov;
+const tapbuffer = require("tapbuffer");
+exports.tapbuffer = tapbuffer;

dist/npmts.cli.js

@@ -7,6 +7,19 @@ const NpmtsConfig = require("./npmts.config");
 const NpmtsMods = require("./npmts.mods");
 const NpmtsWatch = require("./npmts.watch");
 const NpmtsShip = require("./npmts.ship");
+/**
+ * smartanalytics
+ * this data is fully anonymized (no Ips or any other personal information is tracked).
+ * It just keeps track which of our tools are really used...
+ * ... so we know where to spend our limited resources for improving them.
+ * Since yarn is out and there is heavy caching going on,
+ * pure download stats are just not reliable enough for us anymore
+ * Feel free to dig into the smartanalytics package, if you are interested in how it works.
+ * It is just an https call to Google Analytics.
+ * Our privacy policy can be found here: https://lossless.gmbh/privacy.html
+ */
+let npmtsAnalytics = new plugins.smartanalytics.AnalyticsAccount('npmts', 'UA-64087619-5');
+npmtsAnalytics.sendEvent('npm', 'exec', 'git.zone');
 exports.run = () => {
     let done = q.defer();
     let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot);

dist/npmts.config.d.ts

@@ -8,5 +8,9 @@ export interface INpmtsConfig {
     ts: any;
     tsOptions: any;
     watch: boolean;
+    runData: {
+        coverageLcovInfo?: string;
+        coverageResult?: number;
+    };
 }
 export declare let run: (argvArg: any) => Promise<{}>;

dist/npmts.config.js

@@ -14,7 +14,8 @@ exports.run = function (argvArg) {
         testTs: {},
         ts: {},
         tsOptions: {},
-        watch: false
+        watch: false,
+        runData: {}
     };
     // mix with configfile
     plugins.beautylog.ora.text('running npmextra');

dist/npmts.plugins.d.ts

@@ -5,9 +5,8 @@ import * as lodash from 'lodash';
 import * as npmextra from 'npmextra';
 import * as projectinfo from 'projectinfo';
 import * as path from 'path';
+import * as smartanalytics from 'smartanalytics';
 import * as smartcli from 'smartcli';
-import * as smartcov from 'smartcov';
-import * as smartenv from 'smartenv';
 import * as smartfile from 'smartfile';
 import * as smartpath from 'smartpath';
 import * as smartstream from 'smartstream';
@@ -15,4 +14,4 @@ import * as smartstring from 'smartstring';
 import * as smartsystem from 'smartsystem';
 import * as through2 from 'through2';
 export declare let sourceMapSupport: any;
-export { beautylog, depcheck, lodash, npmextra, projectinfo, path, smartcli, smartcov, smartenv, smartfile, smartpath, smartstream, smartstring, smartsystem, through2 };
+export { beautylog, depcheck, lodash, npmextra, projectinfo, path, smartanalytics, smartcli, smartfile, smartpath, smartstream, smartstring, smartsystem, through2 };

dist/npmts.plugins.js

@@ -13,12 +13,10 @@ const projectinfo = require("projectinfo");
 exports.projectinfo = projectinfo;
 const path = require("path");
 exports.path = path;
+const smartanalytics = require("smartanalytics");
+exports.smartanalytics = smartanalytics;
 const smartcli = require("smartcli");
 exports.smartcli = smartcli;
-const smartcov = require("smartcov");
-exports.smartcov = smartcov;
-const smartenv = require("smartenv");
-exports.smartenv = smartenv;
 const smartfile = require("smartfile");
 exports.smartfile = smartfile;
 const smartpath = require("smartpath");

docs/00footer.md

@@ -0,0 +1,9 @@
+[Legal Info](https://lossless.gmbh)
+[Privacy Policy](https://lossless.gmbh/privacy.html)
+///
+[Git.Zone](https://git.zone)
+<span>tools for a seamless dev workflow</span>
+
+[Lossless GmbH](https://push.rocks)
+<span>the company behind git.zone and npmts</span>
+///

docs/config.md

@@ -1,5 +1,8 @@
-# Configuration of NPMTS
-npmts can be configured to your needs:
+---
+name: config
+---
+# Configuration
+npmts can be configured to your needs.
 
 ### npmextra.json
 the npmts section in npmextra.json can be used to configure npmts.

docs/default.md

@@ -1,7 +1,11 @@
-# Default task execution of npmts
+---
+name: Default Behaviour
+---
+# Default Behaviour
+when you don't configure it otherwise.
 
 1. **Config:** Check config in ./npmextra.json (Check out [npmextra](https://www.npmjs.com/package/npmextra))
 1. **Clean:** Clean up from any previous builds (old js files)
 1. **Check:** Check project for typings declaration in package.json, unused dependencies and missing dependencies
 1. **Transpile:** Transpile TypeScript with **inline sourcemaps** and **declaration files** to ES target
-1. **Test:** Babelify ES6 to ES5 on the fly, instrumentalize ES5 JavaScript with istanbul and run tests with Mocha.
+1. **Test:** transpile TypeScript of module to ES5 for tests (so it can be instrumentalized) and pipe it to tapbuffer. All this happens in memory.

docs/examples.md

@@ -1,13 +1,21 @@
-# Examples for npmts
+---
+name: Examples
+---
+# Examples
+modules that use npmts in theis development workflow
 
-## Example Usage in modules:
-* [gulp-browser](https://www.npmjs.com/package/gulp-browser)
+Module Name | Description
+--- | ---
+[gitzone](https://www.npmjs.com/package/gitzone) | fast npm module prototyping
+[gulp-browser](https://www.npmjs.com/package/gulp-browser) | browserify for gulp
+[npmdocker](https://www.npmjs.com/package/npmdocker) | dockerized npm development
+[smartcli](https://www.npmjs.com/package/smartcli) | easy cli tool creation
 
-> We will add more options over time.
+> There are tons more... We will add them here over time.
 
-## Tips and tricks:
+### Tips and tricks:
 
 * Use [npmts-g](https://www.npmjs.com/package/npmts-g) to use globally installed npmts and install npmts locally if no global npmts is available.
 * Use [npmpage](https://www.npmjs.com/package/npmpage) to create a webpage from coverage reports and TypeDoc for the module
-* Use [hosttoday/ht-docker-node:npmts](https://hub.docker.com/r/hosttoday/ht-docker-node/) for speedy CI builds
+* Use [hosttoday/ht-docker-node:npmci](https://hub.docker.com/r/hosttoday/ht-docker-node/) for speedy CI builds
 * Use [npmdocker](https://www.npmjs.com/package/npmdocker) for running tests consistently with docker.

docs/index.md

@@ -1,44 +1,42 @@
+---
+name: Start
+---
 # npmts
 Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.
 
 ## Availabililty
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmts)
-[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/npmts)
-[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/npmts)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/npmts/)
+[![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmts)
+[![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/gitzone/npmts)
+[![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzone/npmts)
+[![docs](https://gitzone.gitlab.io/assets/repo-button-docs.svg)](https://gitzone.gitlab.io/npmts/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/npmts/badges/master/build.svg)](https://gitlab.com/pushrocks/npmts/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/npmts/badges/master/coverage.svg)](https://gitlab.com/pushrocks/npmts/commits/master)
+[![build status](https://GitLab.com/gitzone/npmts/badges/master/build.svg)](https://GitLab.com/gitzone/npmts/commits/master)
+[![coverage report](https://GitLab.com/gitzone/npmts/badges/master/coverage.svg)](https://GitLab.com/gitzone/npmts/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/npmts.svg)](https://www.npmjs.com/package/npmts)
-[![docker pulls](https://img.shields.io/docker/pulls/hosttoday/ht-docker-node.svg)](https://hub.docker.com/r/hosttoday/ht-docker-node/)
-[![Dependency Status](https://david-dm.org/pushrocks/npmts.svg)](https://david-dm.org/pushrocks/npmts)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/npmts/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/npmts/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/npmts/badges/code.svg)](https://www.bithound.io/github/pushrocks/npmts)
+[![Dependency Status](https://david-dm.org/gitzone/npmts.svg)](https://david-dm.org/gitzone/npmts)
+[![bitHound Dependencies](https://www.bithound.io/github/gitzone/npmts/badges/dependencies.svg)](https://www.bithound.io/github/gitzone/npmts/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/gitzone/npmts/badges/code.svg)](https://www.bithound.io/github/gitzone/npmts)
 [![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/)
 
-## Introduction
+## Usage
 NPMTS is your friend when writing, testing, publishing and documenting npm modules written in TypeScript.
 
 npmts will
     
-1. check your dependencies and package.json
+1. check your dependencies and package.json (unused, missing, updates, security)
 1. transpile your code with tsc,
-1. document your code with typedoc,
-1. test your code with mocha
-1. create coverage with istanbul
+1. test your code with tap (supports the fancy stuff like Promises, Generators, async/await, sourcemaps, parallel test execution in child processes)
+1. create coverage with istanbul (supports tracing of the originating TypeScript)
+
+For more information on how tests are run check out the [tapbuffer module](https://www.npmjs.com/package/tapbuffer).
 
 This works on your machine and in CI. There is a prebuild docker image available that includes npmts to make CI a breeze:  
 [hosttoday/ht-docker-node:npmts on Dockerhub](https://hub.docker.com/r/hosttoday/ht-docker-node/)
 
-For further information read the docs:
-1. [Intro](https://pushrocks.gitlab.io/npmts/index.html)
-2. [Install](https://pushrocks.gitlab.io/npmts/install.html)
-3. [Default Behaviour](https://pushrocks.gitlab.io/npmts/default.html)
-4. [Configuration](https://pushrocks.gitlab.io/npmts/config.html)
-5. [Examples](https://pushrocks.gitlab.io/npmts/examples.html)
-6. [Info](https://pushrocks.gitlab.io/npmts/info.html)
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
 
-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
+[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https:/git.zone)

docs/info.md

@@ -1,14 +0,0 @@
-# Info
-
-## Future Scope:
-* automatically manage badges in README
-* manage tslint to enforce code best practices
-* tear down any differences between local and CI environments by using brand new npmdocker
-
-## About the authors:
-[![Project Phase](https://mediaserve.lossless.digital/lossless.com/img/createdby_github.svg)](https://lossless.com/)
-
-[![PayPal](https://img.shields.io/badge/Support%20us-PayPal-blue.svg)](https://paypal.me/lossless)
-
-## Legal Info
-https://lossless.gmbh

docs/install.md

@@ -1,5 +1,5 @@
 # Install npmts
-First install npmts globally, then install the npmts-g locally.
+Get started with TypeScript awesomeness.
 
 > **npmts-g* checks if the global version of npmts suffices the modules requirements.
 If not it installs npmts locally in the right version during npm install. 

docs/summary.md

@@ -1,8 +0,0 @@
-# Summary
-
-* [1. Intro](index.md)
-* [2. Install](install.md)
-* [3. Default Behaviour](default.md)
-* [4. Configuration](config.md)
-* [5. Examples](examples.md)
-* [6. Info](info.md)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "6.1.15",
+  "version": "7.0.15",
   "description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.",
   "main": "dist/index.js",
   "bin": {
@@ -14,7 +14,7 @@
     "setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)",
     "typedoc": "(typedoc --out ./pages/api --target ES6 ./ts/)",
     "npmpage": "(npmpage)",
-    "check": "(cd test && npm install && node ../dist/index.js)",
+    "check": "(cd test && yarn install && node ../dist/index.js)",
     "checkVersion": "(cd test/ && node ../dist/index.js -v)",
     "checkNoTest": "(cd test && node ../dist/index.js --notest)",
     "checkNoDocs": "(cd test && node ../dist/index.js --nodocs)"
@@ -34,40 +34,36 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmts#readme",
   "dependencies": {
-    "@types/gulp": "^3.8.32",
-    "@types/gulp-istanbul": "^0.9.30",
-    "@types/gulp-mocha": "0.0.29",
-    "@types/gulp-sourcemaps": "0.0.29",
+    "@types/gulp-sourcemaps": "0.0.30",
     "@types/minimatch": "^2.0.29",
     "@types/through2": "^2.0.32",
-    "beautylog": "6.1.1",
+    "beautylog": "6.1.10",
     "depcheck": "^0.6.7",
-    "early": "^2.0.36",
-    "gulp": "3.9.1",
-    "gulp-function": "^2.2.3",
-    "gulp-inject-modules": "^1.0.0",
-    "gulp-istanbul": "^1.1.1",
-    "gulp-mocha": "^3.0.1",
-    "gulp-sourcemaps": "^2.4.1",
-    "gulp-typescript": "^3.1.5",
+    "early": "^2.1.1",
+    "gulp": "^3.9.1",
+    "gulp-function": "^2.2.9",
+    "gulp-sourcemaps": "^2.6.0",
+    "gulp-typescript": "^3.1.6",
     "lodash": "^4.17.4",
-    "npmextra": "^2.0.3",
+    "npmextra": "^2.0.5",
     "projectinfo": "^3.0.2",
-    "smartchok": "^1.0.5",
-    "smartcli": "2.0.1",
-    "smartcov": "1.0.0",
-    "smartenv": "2.0.0",
-    "smartfile": "^4.1.6",
+    "smartanalytics": "^1.0.6",
+    "smartchok": "^1.0.8",
+    "smartcli": "^2.0.6",
+    "smartcov": "^1.0.2",
+    "smartfile": "^4.2.4",
+    "smartgulp": "^1.0.4",
     "smartpath": "^3.2.8",
     "smartq": "^1.1.1",
-    "smartstream": "^1.0.5",
+    "smartstream": "^1.0.8",
     "smartstring": "^2.0.24",
     "smartsystem": "^1.0.12",
-    "source-map-support": "^0.4.11",
+    "source-map-support": "^0.4.15",
+    "tapbuffer": "^1.0.11",
     "through2": "^2.0.3",
     "tsn": "^2.0.15",
-    "typescript": "^2.2.1",
-    "typings-global": "^1.0.14"
+    "typescript": "^2.3.2",
+    "typings-global": "^1.0.16"
   },
   "devDependencies": {}
 }

readme.md

@@ -3,37 +3,37 @@ Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.
 
 ## Availabililty
 [![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmts)
-[![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://gitlab.com/gitzone/npmts)
-[![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzonetools/npmts)
+[![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/gitzone/npmts)
+[![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzone/npmts)
 [![docs](https://gitzone.gitlab.io/assets/repo-button-docs.svg)](https://gitzone.gitlab.io/npmts/)
 
 ## Status for master
-[![build status](https://gitlab.com/gitzone/npmts/badges/master/build.svg)](https://gitlab.com/gitzone/npmts/commits/master)
-[![coverage report](https://gitlab.com/gitzone/npmts/badges/master/coverage.svg)](https://gitlab.com/gitzone/npmts/commits/master)
+[![build status](https://GitLab.com/gitzone/npmts/badges/master/build.svg)](https://GitLab.com/gitzone/npmts/commits/master)
+[![coverage report](https://GitLab.com/gitzone/npmts/badges/master/coverage.svg)](https://GitLab.com/gitzone/npmts/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/npmts.svg)](https://www.npmjs.com/package/npmts)
-[![docker pulls](https://img.shields.io/docker/pulls/hosttoday/ht-docker-node.svg)](https://hub.docker.com/r/hosttoday/ht-docker-node/)
-[![Dependency Status](https://david-dm.org/gitzonetools/npmts.svg)](https://david-dm.org/gitzonetools/npmts)
-[![bitHound Dependencies](https://www.bithound.io/github/gitzonetools/npmts/badges/dependencies.svg)](https://www.bithound.io/github/gitzonetools/npmts/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/gitzonetools/npmts/badges/code.svg)](https://www.bithound.io/github/gitzonetools/npmts)
+[![Dependency Status](https://david-dm.org/gitzone/npmts.svg)](https://david-dm.org/gitzone/npmts)
+[![bitHound Dependencies](https://www.bithound.io/github/gitzone/npmts/badges/dependencies.svg)](https://www.bithound.io/github/gitzone/npmts/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/gitzone/npmts/badges/code.svg)](https://www.bithound.io/github/gitzone/npmts)
 [![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/)
 
-## Introduction
+## Usage
 NPMTS is your friend when writing, testing, publishing and documenting npm modules written in TypeScript.
 
 npmts will
     
 1. check your dependencies and package.json (unused, missing, updates, security)
 1. transpile your code with tsc,
-1. test your code with mocha (supports the fancy stuff like Promises, Generators, async/await, sourcemaps)
+1. test your code with tap (supports the fancy stuff like Promises, Generators, async/await, sourcemaps, parallel test execution in child processes)
 1. create coverage with istanbul (supports tracing of the originating TypeScript)
 
+For more information on how tests are run check out the [tapbuffer module](https://www.npmjs.com/package/tapbuffer).
+
 This works on your machine and in CI. There is a prebuild docker image available that includes npmts to make CI a breeze:  
 [hosttoday/ht-docker-node:npmts on Dockerhub](https://hub.docker.com/r/hosttoday/ht-docker-node/)
 
-For further information read the linked docs at the top of this README.
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
 
-> MIT licensed | **©** 2016 - 2017 [Lossless GmbH](https://lossless.gmbh)
-
-[![npm](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone)
+[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone)

ts/mod00/index.ts

@@ -1,5 +1,6 @@
 /* ------------------------------------------
- * This module compiles TypeScript files
+ * This module compiles the module's TypeScript files
+ * Note: Test files are only compiled in memory
  * -------------------------------------------- */
 import * as q from 'smartq'
 

ts/mod00/mod00.assets.ts

@@ -8,7 +8,7 @@ import { projectInfo } from '../mod00/mod00.check'
 export let run = function(configArg){
     let done = q.defer()
     let config = configArg
-    plugins.beautylog.ora.text('now looking at ' + 'required assets'.yellow)
+    plugins.beautylog.ora.text('now looking at ' + 'required assets')
     if (config.cli === true) {
         let mainJsPath = projectInfo.packageJson.main
         let cliJsString: string = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir,'cli.js'))

ts/mod00/mod00.check.ts

@@ -60,10 +60,10 @@ let checkDependencies = (configArg) => {
             process.exit(1)
         }
         for (let item in unused.invalidFiles) {
-            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`)
+            plugins.beautylog.warn(`Watch out: could not parse file ${item}`)
         };
         for (let item in unused.invalidDirs) {
-            plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`)
+            plugins.beautylog.warn(`Watch out: could not parse directory ${item}`)
         }
         done.resolve(configArg)
     })
@@ -86,20 +86,20 @@ let checkDevDependencies = (configArg) => {
     })
     plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
         for (let item of unused.devDependencies) {
-            plugins.beautylog.log(`unused devDependency ${item.red}`)
+            plugins.beautylog.log(`unused devDependency ${item}`)
         }
         for (let item in unused.missing) {
-            plugins.beautylog.error(`unused devDependency ${item.red}`)
+            plugins.beautylog.error(`unused devDependency ${item}`)
         }
         if (unused.missing.length > 0) {
             plugins.beautylog.info('exiting due to missing dependencies in package.json')
             process.exit(1)
         }
         for (let item in unused.invalidFiles) {
-            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`)
+            plugins.beautylog.warn(`Watch out: could not parse file ${item}`)
         }
         for (let item in unused.invalidDirs) {
-            plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`)
+            plugins.beautylog.warn(`Watch out: could not parse directory ${item}`)
         }
         done.resolve(configArg)
     })

ts/mod00/mod00.compile.ts

@@ -7,15 +7,10 @@ import * as plugins from './mod00.plugins'
 export let run = function (configArg) {
   let done = q.defer()
   let config = configArg
-    plugins.beautylog.ora.text('now compiling ' + 'TypeScript'.yellow)
+  plugins.beautylog.ora.text('now compiling ' + 'TypeScript')
   plugins.tsn.compileGlobStringObject(config.ts, config.tsOptions, paths.cwd)
     .then(() => {
-            plugins.beautylog.ok('compiled main TypeScript!')
-            plugins.beautylog.log('now compiling tests!')
-            return plugins.tsn.compileGlobStringObject(config.testTs,config.tsOptions,paths.cwd)
-        })
-        .then(function () {
-            plugins.beautylog.ok('compiled all TypeScript!')
+      plugins.beautylog.ok(`compiled the module's TypeScript!`)
       done.resolve(config)
     }).catch(err => { console.log(err) })
   return done.promise

ts/mod02/index.ts

@@ -4,6 +4,8 @@
 import plugins = require('./mod02.plugins')
 import paths = require('../npmts.paths')
 
+let gulp = require('gulp')
+
 import * as q from 'smartq'
 
 import { INpmtsConfig } from '../npmts.config'
@@ -12,13 +14,19 @@ import { INpmtsConfig } from '../npmts.config'
  * runs mocha
  * @returns INpmtsConfig
  */
-let mocha = function (configArg: INpmtsConfig) {
-    plugins.beautylog.ora.text('Instrumentalizing and testing transpiled JS')
-    plugins.beautylog.ora.end() // end plugins.beautylog.ora for tests.
+let tap = function (configArg: INpmtsConfig) {
   let done = q.defer()
 
-    let coverageSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, './ts/**/*.ts')]),
+  /**
+   * the TabBuffer for npmts
+   */
+  let npmtsTapBuffer = new plugins.tapbuffer.TabBuffer()
+
+  /**
+   * handle the testable files
+   */
+  let testableFilesSmartstream = new plugins.smartstream.Smartstream([
+    gulp.src([ plugins.path.join(paths.cwd, './ts/**/*.ts') ]),
     plugins.gulpSourcemaps.init(),
     plugins.gulpTypeScript({
       target: 'ES5',
@@ -26,44 +34,38 @@ let mocha = function (configArg: INpmtsConfig) {
       experimentalDecorators: true,
       lib: [ 'DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable' ]
     }),
-        plugins.gulpIstanbul({
-        }),
     plugins.gulpSourcemaps.write(),
     plugins.gulpFunction.forEach(async file => {
       file.path = file.path.replace(paths.tsDir, paths.distDir)
     }),
-        plugins.gulpInjectModules(),
-        plugins.through2.obj(
-            (file, enc, cb) => {
-                cb()
-            },
-            (cb) => {
-                cb()
-            }
-        )
+    npmtsTapBuffer.pipeTestableFiles(),
+    plugins.smartstream.cleanPipe()
   ])
 
-    let localSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.ts')]),
+  /**
+   * handle the test files
+   */
+  let testFilesSmartstream = new plugins.smartstream.Smartstream([
+    gulp.src([ plugins.path.join(paths.cwd, 'test/*.ts') ]),
     plugins.gulpTypeScript({
       target: 'ES5',
       emitDecoratorMetadata: true,
       experimentalDecorators: true,
       lib: [ 'DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable' ]
     }),
-        plugins.gulpInjectModules(),
-        plugins.gulpMocha(),
-        plugins.gulpIstanbul.writeReports({
-            dir: plugins.path.join(paths.cwd, './coverage'),
-            reporters: ['lcovonly', 'json', 'text', 'text-summary']
-        })
+    npmtsTapBuffer.pipeTestFiles(),
+    plugins.smartstream.cleanPipe()
   ])
-    coverageSmartstream.run()
-        .then(
-        () => {
-            plugins.beautylog.info('code is now transpiled to ES5, instrumented with istanbul, and injected for mocha!')
-            return localSmartstream.run()
-                .then(() => { done.resolve(configArg) }, (err) => {
+
+  // lets run the smartstream
+  Promise.all([
+    testableFilesSmartstream.run(),
+    testFilesSmartstream.run()
+  ]).then(
+    async () => {
+      configArg.runData.coverageLcovInfo = await npmtsTapBuffer.runTests()
+      done.resolve(configArg)
+    }, (err) => {
       plugins.beautylog.error('Tests failed!')
       console.log(err)
       if (configArg.watch) {
@@ -72,35 +74,31 @@ let mocha = function (configArg: INpmtsConfig) {
         process.exit(1)
       }
     })
-        },
-        (err) => {
-            console.log(err)
-        })
+
   return done.promise
 }
 
-let coverage = function (configArg: INpmtsConfig) {
-    let done = q.defer()
-    plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, 'lcov.info'), 2)
-        .then(function (percentageArg) {
-            if (percentageArg >= configArg.coverageTreshold) {
+let handleCoverageData = async (configArg: INpmtsConfig) => {
+  let coverageResult = await plugins.smartcov.get.percentageFromLcovString(
+    configArg.runData.coverageLcovInfo,
+    2
+  )
+  if (coverageResult >= configArg.coverageTreshold) {
     plugins.beautylog.ok(
-                    `${percentageArg.toString()}% `
+      `${(coverageResult).toString()}% `
       + `coverage exceeds your treshold of `
       + `${configArg.coverageTreshold.toString()}%`
     )
   } else {
     plugins.beautylog.warn(
-                    `${percentageArg.toString()}% `
+      `${(coverageResult).toString()}% `
       + `coverage fails your treshold of `
       + `${configArg.coverageTreshold.toString()}%`
     )
     plugins.beautylog.error('exiting due to coverage failure')
     if (!configArg.watch) { process.exit(1) }
   }
-            done.resolve(configArg)
-        })
-    return done.promise
+  return configArg
 }
 
 export let run = function (configArg: INpmtsConfig) {
@@ -108,14 +106,11 @@ export let run = function (configArg: INpmtsConfig) {
   let config = configArg
   if (config.test === true) {
     plugins.beautylog.ora.text('now starting tests')
-        plugins.beautylog.log(
-            '------------------------------------------------------\n' +
-            '*************************** TESTS: ***************************\n' +
-            '--------------------------------------------------------------'
-        )
+    plugins.beautylog.ora.end()
+    plugins.beautylog.log('ready for tapbuffer:')
 
-        mocha(config)
-            .then(coverage)
+    tap(config)
+      .then(handleCoverageData)
       .then(() => {
         done.resolve(config)
       }).catch(err => { console.log(err) })

ts/mod02/mod02.plugins.ts

@@ -1,19 +1,17 @@
 export * from '../npmts.plugins'
 
-import * as gulp from 'gulp'
+import * as gulp from 'smartgulp'
 import * as gulpFunction from 'gulp-function'
-import * as gulpIstanbul from 'gulp-istanbul'
-let gulpInjectModules = require('gulp-inject-modules')
-import * as gulpMocha from 'gulp-mocha'
 import * as gulpSourcemaps from 'gulp-sourcemaps'
 import * as gulpTypeScript from 'gulp-typescript'
+import * as smartcov from 'smartcov'
+import * as tapbuffer from 'tapbuffer'
 
 export {
     gulp,
     gulpFunction,
-    gulpIstanbul,
-    gulpInjectModules,
-    gulpMocha,
     gulpSourcemaps,
-    gulpTypeScript
+    gulpTypeScript,
+    smartcov,
+    tapbuffer
 }

ts/npmts.cli.ts

@@ -7,6 +7,20 @@ import * as NpmtsMods from './npmts.mods'
 import * as NpmtsWatch from './npmts.watch'
 import * as NpmtsShip from './npmts.ship'
 
+/**
+ * smartanalytics
+ * this data is fully anonymized (no Ips or any other personal information is tracked).
+ * It just keeps track which of our tools are really used...
+ * ... so we know where to spend our limited resources for improving them.
+ * Since yarn is out and there is heavy caching going on,
+ * pure download stats are just not reliable enough for us anymore
+ * Feel free to dig into the smartanalytics package, if you are interested in how it works.
+ * It is just an https call to Google Analytics.
+ * Our privacy policy can be found here: https://lossless.gmbh/privacy.html
+ */
+let npmtsAnalytics = new plugins.smartanalytics.AnalyticsAccount('npmts','UA-64087619-5')
+npmtsAnalytics.sendEvent('npm','exec','git.zone')
+
 export let run = () => {
   let done = q.defer()
   let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot)

ts/npmts.config.ts

@@ -14,7 +14,10 @@ export interface INpmtsConfig {
   ts: any,
   tsOptions: any,
   watch: boolean
-
+  runData: {
+    coverageLcovInfo?: string,
+    coverageResult?: number
+  }
 };
 
 export let run = function (argvArg) {
@@ -27,7 +30,8 @@ export let run = function (argvArg) {
     testTs: {},
     ts: {},
     tsOptions: {},
-        watch: false
+    watch: false,
+    runData: {}
   }
 
   // mix with configfile

ts/npmts.plugins.ts

@@ -6,9 +6,8 @@ import * as lodash from 'lodash'
 import * as npmextra from 'npmextra'
 import * as projectinfo from 'projectinfo'
 import * as path from 'path'
+import * as smartanalytics from 'smartanalytics'
 import * as smartcli from 'smartcli'
-import * as smartcov from 'smartcov'
-import * as smartenv from 'smartenv'
 import * as smartfile from 'smartfile'
 import * as smartpath from 'smartpath'
 import * as smartstream from 'smartstream'
@@ -24,9 +23,8 @@ export {
     npmextra,
     projectinfo,
     path,
+    smartanalytics,
     smartcli,
-    smartcov,
-    smartenv,
     smartfile,
     smartpath,
     smartstream,