5.4.45

.gitignore

@@ -1,4 +1,6 @@
 node_modules/
 test/
 pages/
+public/
+npm-debug/
 .DS_Store

README.md

@@ -5,7 +5,7 @@ Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.
 [![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/docs)
+[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/npmts/)
 
 ## Status for master
 [![build status](https://gitlab.com/pushrocks/npmts/badges/master/build.svg)](https://gitlab.com/pushrocks/npmts/commits/master)
@@ -31,6 +31,12 @@ npmts will
 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.
+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)
 
 [![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)

dist/index.d.ts

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

dist/index.js

@@ -1,27 +1,22 @@
-"use strict";
-require('typings-global');
 /* ================================================== *
-    Starting NPMTS main process.
+    **** NPMTS ****
+    Fabulous TypeScript development
  * ================================================== */
-var early = require('early');
+"use strict";
+const early = require("early");
 early.start('NPMTS');
-var plugins = require('./npmts.plugins');
+const plugins = require("./npmts.plugins");
-var paths = require('./npmts.paths');
+const paths = require("./npmts.paths");
-var npmts_promisechain_1 = require('./npmts.promisechain');
+const promisechain = require("./npmts.promisechain");
 early.stop()
-    .then(function () {
+    .then(() => {
-    var npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot);
+    let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot);
-    var npmtsCli = new plugins.smartcli.Smartcli();
+    let npmtsCli = new plugins.smartcli.Smartcli();
     npmtsCli.standardTask()
-        .then(function (argvArg) {
+        .then((argvArg) => {
         plugins.beautylog.figletSync('NPMTS');
         plugins.beautylog.info('npmts version: ' + npmtsProjectInfo.version);
-        try {
+        promisechain.run(argvArg).catch((err) => { console.log(err); });
-            npmts_promisechain_1.promisechain(argvArg);
-        }
-        catch (err) {
-            console.log(err);
-        }
     });
     npmtsCli.addVersion(npmtsProjectInfo.version);
     npmtsCli.startParse();

dist/npmts.assets.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="q" />
-import 'typings-global';
+import * as q from 'q';
-import plugins = require('./npmts.plugins');
+export declare var run: (configArg: any) => q.Promise<{}>;
-export declare var run: (configArg: any) => plugins.Q.Promise<{}>;

dist/npmts.assets.js

@@ -1,11 +1,11 @@
 "use strict";
-require('typings-global');
+const plugins = require("./npmts.plugins");
-var plugins = require('./npmts.plugins');
+const paths = require("./npmts.paths");
-var paths = require('./npmts.paths');
+const q = require("q");
-var npmts_promisechain_1 = require('./npmts.promisechain');
+const npmts_promisechain_1 = require("./npmts.promisechain");
 exports.run = function (configArg) {
-    var done = plugins.Q.defer();
+    let done = q.defer();
-    var config = configArg;
+    let config = configArg;
     npmts_promisechain_1.npmtsOra.text('now looking at ' + 'required assets'.yellow);
     if (config.cli === true) {
         plugins.smartfile.fs.copySync(plugins.path.join(paths.npmtsAssetsDir, 'cli.js'), plugins.path.join(paths.distDir, 'cli.js'));

dist/npmts.check.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="q" />
-import * as plugins from './npmts.plugins';
+import * as q from 'q';
 import { ProjectinfoNpm } from 'projectinfo';
 export declare let projectInfo: ProjectinfoNpm;
-export declare let run: (configArg: any) => plugins.Q.Promise<{}>;
+export declare let run: (configArg: any) => q.Promise<{}>;

dist/npmts.check.js

@@ -1,20 +1,22 @@
 "use strict";
-var plugins = require('./npmts.plugins');
+const plugins = require("./npmts.plugins");
-var paths = require('./npmts.paths');
+const paths = require("./npmts.paths");
-var npmts_promisechain_1 = require('./npmts.promisechain');
+const q = require("q");
-var projectinfo_1 = require('projectinfo');
+const npmts_promisechain_1 = require("./npmts.promisechain");
-var checkProjectTypings = function (configArg) {
+const projectinfo_1 = require("projectinfo");
-    var done = plugins.Q.defer();
+let checkProjectTypings = (configArg) => {
+    let done = q.defer();
+    npmts_promisechain_1.npmtsOra.text('Check Module: Check Project Typings...');
     exports.projectInfo = new projectinfo_1.ProjectinfoNpm(paths.cwd);
     if (typeof exports.projectInfo.packageJson.typings === 'undefined') {
-        plugins.beautylog.error("please add typings field to package.json");
+        plugins.beautylog.error(`please add typings field to package.json`);
         process.exit(1);
     }
     ;
     done.resolve(configArg);
     return done.promise;
 };
-var depcheckOptions = {
+const depcheckOptions = {
     ignoreBinPackage: false,
     parsers: {
         '*.ts': plugins.depcheck.parser.typescript
@@ -28,9 +30,10 @@ var depcheckOptions = {
         plugins.depcheck.special.webpack
     ]
 };
-var checkDependencies = function (configArg) {
+let checkDependencies = (configArg) => {
-    var done = plugins.Q.defer();
+    let done = q.defer();
-    var depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+    npmts_promisechain_1.npmtsOra.text('Check Module: Check Dependencies...');
+    let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [
             'test',
             'dist',
@@ -41,38 +44,32 @@ var checkDependencies = function (configArg) {
             'babel-preset-*'
         ]
     });
-    plugins.depcheck(paths.cwd, depcheckOptionsMerged, function (unused) {
+    plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
-        for (var _i = 0, _a = unused.dependencies; _i < _a.length; _i++) {
+        for (let item of unused.dependencies) {
-            var item = _a[_i];
+            plugins.beautylog.warn(`Watch out: unused dependency "${item}"`);
-            plugins.beautylog.warn("Watch out: unused dependency " + item.red);
         }
-        ;
+        for (let item in unused.missing) {
-        for (var _b = 0, _c = unused.missing; _b < _c.length; _b++) {
+            plugins.beautylog.error(`unused devDependency "${item}"`);
-            var item = _c[_b];
-            plugins.beautylog.error("unused devDependency " + item.red);
         }
-        ;
         if (unused.missing.length > 0) {
             plugins.beautylog.info('exiting due to missing dependencies in package.json');
             process.exit(1);
         }
-        for (var _d = 0, _e = unused.invalidFiles; _d < _e.length; _d++) {
+        for (let item in unused.invalidFiles) {
-            var item = _e[_d];
+            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
-            plugins.beautylog.warn("Watch out: could not parse file " + item.red);
         }
         ;
-        for (var _f = 0, _g = unused.invalidDirs; _f < _g.length; _f++) {
+        for (let item in unused.invalidDirs) {
-            var item = _g[_f];
+            plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`);
-            plugins.beautylog.warn("Watch out: could not parse directory " + item.red);
         }
-        ;
         done.resolve(configArg);
     });
     return done.promise;
 };
-var checkDevDependencies = function (configArg) {
+let checkDevDependencies = (configArg) => {
-    var done = plugins.Q.defer();
+    let done = q.defer();
-    var depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+    npmts_promisechain_1.npmtsOra.text('Check Module: Check devDependencies...');
+    let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [
             'ts',
             'dist',
@@ -83,45 +80,41 @@ var checkDevDependencies = function (configArg) {
             'babel-preset-*'
         ]
     });
-    plugins.depcheck(paths.cwd, depcheckOptionsMerged, function (unused) {
+    plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
-        for (var _i = 0, _a = unused.devDependencies; _i < _a.length; _i++) {
+        for (let item of unused.devDependencies) {
-            var item = _a[_i];
+            plugins.beautylog.log(`unused devDependency ${item.red}`);
-            plugins.beautylog.log("unused devDependency " + item.red);
         }
-        ;
+        for (let item in unused.missing) {
-        for (var _b = 0, _c = unused.missing; _b < _c.length; _b++) {
+            plugins.beautylog.error(`unused devDependency ${item.red}`);
-            var item = _c[_b];
-            plugins.beautylog.error("unused devDependency " + item.red);
         }
-        ;
         if (unused.missing.length > 0) {
             plugins.beautylog.info('exiting due to missing dependencies in package.json');
             process.exit(1);
         }
-        for (var _d = 0, _e = unused.invalidFiles; _d < _e.length; _d++) {
+        for (let item in unused.invalidFiles) {
-            var item = _e[_d];
+            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
-            plugins.beautylog.warn("Watch out: could not parse file " + item.red);
         }
-        for (var _f = 0, _g = unused.invalidDirs; _f < _g.length; _f++) {
+        for (let item in unused.invalidDirs) {
-            var item = _g[_f];
+            plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`);
-            plugins.beautylog.warn("Watch out: could not parse directory " + item.red);
         }
         done.resolve(configArg);
     });
     return done.promise;
 };
-var checkNodeVersion = function (configArg) {
+let checkNodeVersion = (configArg) => {
-    var done = plugins.Q.defer();
+    let done = q.defer();
+    npmts_promisechain_1.npmtsOra.text('checking node version');
     done.resolve(configArg);
     return done.promise;
 };
-exports.run = function (configArg) {
+exports.run = (configArg) => {
-    var done = plugins.Q.defer();
+    let done = q.defer();
-    npmts_promisechain_1.npmtsOra.text('running project checks...');
+    npmts_promisechain_1.npmtsOra.text('Check Module: ...');
     checkProjectTypings(configArg)
         .then(checkDependencies)
         .then(checkDevDependencies)
         .then(checkNodeVersion)
-        .then(done.resolve);
+        .then(done.resolve)
+        .catch((err) => { console.log(err); });
     return done.promise;
 };

dist/npmts.clean.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="q" />
-import 'typings-global';
+import * as q from 'q';
-import plugins = require('./npmts.plugins');
+export declare let run: (configArg: any) => q.Promise<{}>;
-export declare let run: (configArg: any) => plugins.Q.Promise<{}>;

dist/npmts.clean.js

@@ -1,20 +1,38 @@
 "use strict";
-require('typings-global');
+const plugins = require("./npmts.plugins");
-var plugins = require('./npmts.plugins');
+const paths = require("./npmts.paths");
-var paths = require('./npmts.paths');
+const q = require("q");
-var npmts_promisechain_1 = require('./npmts.promisechain');
+const npmts_promisechain_1 = require("./npmts.promisechain");
-var removeDist = function () {
+/**
+ * removes the  dist directory which will be entirely rebuild
+ */
+let removeDist = function () {
     npmts_promisechain_1.npmtsOra.text('cleaning dist folder');
     return plugins.smartfile.fs.remove(paths.distDir);
 };
-var removePages = function () {
+/**
+ * remove .d.ts files from testDirctory
+ */
+let removeTestDeclarations = function () {
+    let done = q.defer();
+    plugins.smartfile.fs.listFileTree('./test/', '**/*.d.ts').then(fileArray => {
+        let fileArrayToRemove = plugins.smartpath.transform.toAbsolute(fileArray, process.cwd() + '//test/');
+        plugins.smartfile.fs.removeManySync(fileArrayToRemove);
+        done.resolve();
+    });
+};
+/**
+ * remove old pages
+ */
+let removePages = function () {
     npmts_promisechain_1.npmtsOra.text('cleaning pages folder');
     return plugins.smartfile.fs.remove(paths.pagesDir);
 };
 exports.run = function (configArg) {
     npmts_promisechain_1.npmtsOra.text('cleaning up from previous builds...');
-    var done = plugins.Q.defer();
+    let done = q.defer();
     removeDist()
+        .then(removeTestDeclarations)
         .then(removePages)
         .then(function () {
         plugins.beautylog.ok('Cleaned up from previous builds!');

dist/npmts.compile.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="q" />
-import 'typings-global';
+import * as q from 'q';
-import plugins = require('./npmts.plugins');
+export declare let run: (configArg: any) => q.Promise<{}>;
-export declare let run: (configArg: any) => plugins.Q.Promise<{}>;

dist/npmts.compile.helpers.d.ts

@@ -1 +0,0 @@
-export declare let checkOutputPath: (tsArrayArg: any, keyArg: any) => boolean;

dist/npmts.compile.helpers.js

@@ -1,16 +0,0 @@
-"use strict";
-var plugins = require('./npmts.plugins');
-var paths = require('./npmts.paths');
-var outputPathIsDir = function (tsArrayArg, keyArg) {
-    return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, tsArrayArg[keyArg]));
-};
-exports.checkOutputPath = function (tsArrayArg, keyArg) {
-    if (!outputPathIsDir(tsArrayArg, keyArg)) {
-        plugins.beautylog.warn('Skipping ' + keyArg + ' because ' + tsArrayArg[keyArg] + ' it is no directory!');
-        return false;
-    }
-    else {
-        return true;
-    }
-    ;
-};

dist/npmts.compile.js

@@ -1,64 +1,21 @@
 "use strict";
-require('typings-global');
+const plugins = require("./npmts.plugins");
-var plugins = require('./npmts.plugins');
+const paths = require("./npmts.paths");
-var helpers = require('./npmts.compile.helpers');
+const q = require("q");
-var npmts_promisechain_1 = require('./npmts.promisechain');
+const npmts_promisechain_1 = require("./npmts.promisechain");
-var promiseArray = [];
-var compileTs = function (tsFileArrayArg, tsOptionsArg) {
-    if (tsOptionsArg === void 0) { tsOptionsArg = {}; }
-    var done = plugins.Q.defer();
-    var compilerOptionsDefault = {
-        declaration: true,
-        module: 'CommonJS',
-        target: 'ES6'
-    };
-    /**
-     * merges default ts options with those found in npmts.json
-     */
-    var compilerOptions = function (keyArg) {
-        var tsOptionsCombined = plugins.lodashObject.merge(compilerOptionsDefault, tsOptionsArg);
-        var compilerOptions = {
-            declaration: tsOptionsCombined.declaration,
-            module: plugins.tsn.ModuleKind[tsOptionsCombined.module],
-            target: plugins.tsn.ScriptTarget[tsOptionsCombined.target],
-            exclude: 'node_modules/**/*'
-        };
-        return compilerOptions;
-    };
-    var _loop_1 = function(keyArg) {
-        plugins.beautylog.info("TypeScript assignment: transpile from " + keyArg.blue + " to " + tsFileArrayArg[keyArg].blue);
-        if (helpers.checkOutputPath(tsFileArrayArg, keyArg)) {
-            var filesReadPromise = plugins.smartfile.fs.listFileTree(process.cwd(), keyArg)
-                .then(function (filesToConvertArg) {
-                var filesToConvertAbsolute = plugins.smartpath.transform.toAbsolute(filesToConvertArg, process.cwd());
-                var destDir = plugins.smartpath.transform.toAbsolute(tsFileArrayArg[keyArg], process.cwd());
-                var filesCompiledPromise = plugins.tsn.compile(filesToConvertAbsolute, destDir, compilerOptions(keyArg));
-                promiseArray.push(filesCompiledPromise);
-            });
-            promiseArray.push(filesReadPromise);
-        }
-    };
-    for (var keyArg in tsFileArrayArg) {
-        _loop_1(keyArg);
-    }
-    ;
-    plugins.Q.all(promiseArray)
-        .then(done.resolve);
-    return done.promise;
-};
 exports.run = function (configArg) {
-    var done = plugins.Q.defer();
+    let done = q.defer();
-    var config = configArg;
+    let config = configArg;
     npmts_promisechain_1.npmtsOra.text('now compiling ' + 'TypeScript'.yellow);
-    compileTs(config.ts, config.tsOptions)
+    plugins.tsn.compileGlobStringObject(config.ts, config.tsOptions, paths.cwd)
-        .then(function () {
+        .then(() => {
         plugins.beautylog.ok('compiled main TypeScript!');
         plugins.beautylog.log('now compiling tests!');
-        return compileTs(config.testTs);
+        return plugins.tsn.compileGlobStringObject(config.testTs, config.tsOptions, paths.cwd);
     })
         .then(function () {
         plugins.beautylog.ok('compiled all TypeScript!');
         done.resolve(config);
-    });
+    }).catch(err => { console.log(err); });
     return done.promise;
 };

dist/npmts.options.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="q" />
-import 'typings-global';
+import * as q from 'q';
-import plugins = require('./npmts.plugins');
 export declare type npmtsMode = 'default' | 'custom';
 export interface INpmtsConfig {
     argv: any;
@@ -11,5 +10,6 @@ export interface INpmtsConfig {
     testTs: any;
     ts: any;
     tsOptions: any;
+    watch: boolean;
 }
-export declare var run: (argvArg: any) => plugins.Q.Promise<{}>;
+export declare var run: (argvArg: any) => q.Promise<{}>;

dist/npmts.options.js

@@ -1,12 +1,12 @@
 "use strict";
-require('typings-global');
+const plugins = require("./npmts.plugins");
-var plugins = require('./npmts.plugins');
+const paths = require("./npmts.paths");
-var paths = require('./npmts.paths');
+const q = require("q");
-var npmts_promisechain_1 = require('./npmts.promisechain');
+const npmts_promisechain_1 = require("./npmts.promisechain");
 ;
 exports.run = function (argvArg) {
-    var done = plugins.Q.defer();
+    let done = q.defer();
-    var defaultConfig = {
+    let defaultConfig = {
         argv: undefined,
         coverageTreshold: 70,
         docs: true,
@@ -14,15 +14,13 @@ exports.run = function (argvArg) {
         test: true,
         testTs: {},
         ts: {},
-        tsOptions: {}
+        tsOptions: {},
+        watch: false
     };
     // mix with configfile
-    npmts_promisechain_1.npmtsOra.text('looking for npmextra.json');
+    npmts_promisechain_1.npmtsOra.text('running npmextra');
-    var config = plugins.npmextra.dataFor({
+    let localNpmextra = new plugins.npmextra.Npmextra(paths.cwd);
-        toolName: 'npmts',
+    let config = localNpmextra.dataFor('npmts', defaultConfig);
-        defaultSettings: defaultConfig,
-        cwd: paths.cwd
-    });
     // add argv
     config.argv = argvArg;
     // check mode
@@ -33,20 +31,18 @@ exports.run = function (argvArg) {
             done.resolve(config);
             break;
         default:
-            plugins.beautylog.error("mode not recognised!");
+            plugins.beautylog.error(`mode not recognised!`);
             process.exit(1);
     }
     ;
     // handle default mode
     if (config.mode === 'default') {
-        config.ts = (_a = {},
+        config.ts = {
-            _a['./ts/**/*.ts'] = './dist/',
+            './ts/**/*.ts': './dist/'
-            _a
+        };
-        );
+        config.testTs = {
-        config.testTs = (_b = {},
+            './test/**/*.ts': './test/'
-            _b['./test/test.ts'] = './test/',
+        };
-            _b
-        );
     }
     ;
     // mix with commandline
@@ -58,8 +54,11 @@ exports.run = function (argvArg) {
         config.docs = false;
     }
     ;
+    if (config.argv.watch) {
+        config.watch = true;
+    }
+    ;
     plugins.beautylog.ok('build options are ready!');
     done.resolve(config);
     return done.promise;
-    var _a, _b;
 };

dist/npmts.paths.d.ts

@@ -1,4 +1,3 @@
-import 'typings-global';
 export declare let npmtsPackageRoot: string;
 export declare let cwd: string;
 export declare let tsDir: string;

dist/npmts.paths.js

@@ -1,6 +1,5 @@
 "use strict";
-require('typings-global');
+const plugins = require("./npmts.plugins");
-var plugins = require('./npmts.plugins');
 // NPMTS Paths
 exports.npmtsPackageRoot = plugins.path.join(__dirname, '../');
 // Project paths

dist/npmts.plugins.d.ts

@@ -1,8 +1,8 @@
 import 'typings-global';
-export import beautylog = require('beautylog');
+import * as beautylog from 'beautylog';
-export declare let depcheck: any;
+declare let depcheck: any;
-export import gulp = require('gulp');
+import * as gulp from 'gulp';
-export declare let g: {
+declare let g: {
     babel: any;
     istanbul: any;
     gFunction: any;
@@ -11,17 +11,19 @@ export declare let g: {
     sourcemaps: any;
     typedoc: any;
 };
-export import lodashObject = require('lodash');
+import * as lodash from 'lodash';
-export import npmextra = require('npmextra');
+import * as npmextra from 'npmextra';
-export import projectinfo = require('projectinfo');
+import * as projectinfo from 'projectinfo';
-export import path = require('path');
+import * as path from 'path';
-export import Q = require('q');
+import * as shelljs from 'shelljs';
-export import shelljs = require('shelljs');
+import * as smartchok from 'smartchok';
-export import smartcli = require('smartcli');
+import * as smartcli from 'smartcli';
-export import smartcov = require('smartcov');
+import * as smartcov from 'smartcov';
-export import smartenv = require('smartenv');
+import * as smartenv from 'smartenv';
-export import smartfile = require('smartfile');
+import * as smartfile from 'smartfile';
-export import smartpath = require('smartpath');
+import * as smartpath from 'smartpath';
-export import smartstring = require('smartstring');
+import * as smartstream from 'smartstream';
+import * as smartstring from 'smartstring';
 export declare let sourceMapSupport: any;
-export import tsn = require('tsn');
+import * as tsn from 'tsn';
+export { beautylog, depcheck, gulp, g, lodash, npmextra, projectinfo, path, shelljs, smartchok, smartcli, smartcov, smartenv, smartfile, smartpath, smartstream, smartstring, tsn };

dist/npmts.plugins.js

@@ -1,9 +1,12 @@
 "use strict";
-require('typings-global');
+require("typings-global");
-exports.beautylog = require('beautylog');
+const beautylog = require("beautylog");
-exports.depcheck = require('depcheck');
+exports.beautylog = beautylog;
-exports.gulp = require('gulp');
+let depcheck = require('depcheck');
-exports.g = {
+exports.depcheck = depcheck;
+const gulp = require("gulp");
+exports.gulp = gulp;
+let g = {
     babel: require('gulp-babel'),
     istanbul: require('gulp-istanbul'),
     gFunction: require('gulp-function'),
@@ -12,17 +15,33 @@ exports.g = {
     sourcemaps: require('gulp-sourcemaps'),
     typedoc: require('gulp-typedoc')
 };
-exports.lodashObject = require('lodash');
+exports.g = g;
-exports.npmextra = require('npmextra');
+const lodash = require("lodash");
-exports.projectinfo = require('projectinfo');
+exports.lodash = lodash;
-exports.path = require('path');
+const npmextra = require("npmextra");
-exports.Q = require('q');
+exports.npmextra = npmextra;
-exports.shelljs = require('shelljs');
+const projectinfo = require("projectinfo");
-exports.smartcli = require('smartcli');
+exports.projectinfo = projectinfo;
-exports.smartcov = require('smartcov');
+const path = require("path");
-exports.smartenv = require('smartenv');
+exports.path = path;
-exports.smartfile = require('smartfile');
+const shelljs = require("shelljs");
-exports.smartpath = require('smartpath');
+exports.shelljs = shelljs;
-exports.smartstring = require('smartstring');
+const smartchok = require("smartchok");
+exports.smartchok = smartchok;
+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");
+exports.smartpath = smartpath;
+const smartstream = require("smartstream");
+exports.smartstream = smartstream;
+const smartstring = require("smartstring");
+exports.smartstring = smartstring;
 exports.sourceMapSupport = require('source-map-support').install(); // display errors correctly during testing
-exports.tsn = require('tsn');
+const tsn = require("tsn");
+exports.tsn = tsn;

dist/npmts.promisechain.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="q" />
-import 'typings-global';
-import plugins = require('./npmts.plugins');
 import { Ora } from 'beautylog';
+import * as q from 'q';
 export declare let npmtsOra: Ora;
-export declare let promisechain: (argvArg: any) => plugins.Q.Promise<{}>;
+export declare let run: (argvArg: any) => q.Promise<{}>;

dist/npmts.promisechain.js

@@ -1,17 +1,18 @@
 "use strict";
-require('typings-global');
+const plugins = require("./npmts.plugins");
-var plugins = require('./npmts.plugins');
+const beautylog_1 = require("beautylog");
-var beautylog_1 = require('beautylog');
+const q = require("q");
 exports.npmtsOra = new beautylog_1.Ora('setting up TaskChain', 'cyan');
-var NpmtsAssets = require('./npmts.assets');
+const NpmtsAssets = require("./npmts.assets");
-var NpmtsCheck = require('./npmts.check');
+const NpmtsCheck = require("./npmts.check");
-var NpmtsClean = require('./npmts.clean');
+const NpmtsClean = require("./npmts.clean");
-var NpmtsCompile = require('./npmts.compile');
+const NpmtsCompile = require("./npmts.compile");
-var NpmtsTypeDoc = require('./npmts.typedoc');
+const NpmtsTypeDoc = require("./npmts.typedoc");
-var NpmtsOptions = require('./npmts.options');
+const NpmtsOptions = require("./npmts.options");
-var NpmtsTests = require('./npmts.tests');
+const NpmtsTests = require("./npmts.tests");
-exports.promisechain = function (argvArg) {
+const NpmtsWatch = require("./npmts.watch");
-    var done = plugins.Q.defer();
+exports.run = function (argvArg) {
+    let done = q.defer();
     exports.npmtsOra.start();
     NpmtsOptions.run(argvArg)
         .then(NpmtsClean.run)
@@ -20,8 +21,9 @@ exports.promisechain = function (argvArg) {
         .then(NpmtsAssets.run)
         .then(NpmtsTypeDoc.run)
         .then(NpmtsTests.run)
+        .then(NpmtsWatch.run)
         .then(function (configArg) {
-        var shipString = '' +
+        let shipString = '' +
             '\n' +
             '\n' +
             '                                         # #  ( )\n' +
@@ -42,7 +44,7 @@ exports.promisechain = function (argvArg) {
         else {
             plugins.beautylog.success('Done!');
         }
-        done.resolve();
+        done.resolve(configArg);
     });
     return done.promise;
 };

dist/npmts.tests.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="q" />
-import 'typings-global';
+import * as q from 'q';
-import plugins = require('./npmts.plugins');
+import { INpmtsConfig } from './npmts.options';
-export declare let run: (configArg: any) => plugins.Q.Promise<{}>;
+export declare let run: (configArg: INpmtsConfig) => q.Promise<{}>;

dist/npmts.tests.js

@@ -1,16 +1,16 @@
 "use strict";
-require('typings-global');
+const plugins = require("./npmts.plugins");
-var plugins = require('./npmts.plugins');
+const paths = require("./npmts.paths");
-var paths = require('./npmts.paths');
+const q = require("q");
-var npmts_promisechain_1 = require('./npmts.promisechain');
+const npmts_promisechain_1 = require("./npmts.promisechain");
 /**
- *
+ * runs mocha
- * @returns {*}
+ * @returns INpmtsConfig
  */
-var mocha = function (configArg) {
+let mocha = function (configArg) {
     npmts_promisechain_1.npmtsOra.text('Instrumentalizing and testing transpiled JS');
     npmts_promisechain_1.npmtsOra.end(); // end npmtsOra for tests.
-    var done = plugins.Q.defer();
+    let done = q.defer();
     plugins.gulp.src([plugins.path.join(paths.cwd, 'dist/*.js')])
         .pipe(plugins.g.sourcemaps.init())
         .pipe(plugins.g.babel({
@@ -22,48 +22,58 @@ var mocha = function (configArg) {
         .pipe(plugins.g.sourcemaps.write())
         .pipe(plugins.g.injectModules())
         .on('finish', function () {
-        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.js')])
+        let localSmartstream = new plugins.smartstream.Smartstream([
-            .pipe(plugins.g.babel({
+            plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.js')]),
+            plugins.g.babel({
                 presets: [
                     require.resolve('babel-preset-es2015')
                 ]
-        }))
+            }),
-            .pipe(plugins.g.injectModules())
+            plugins.g.injectModules(),
-            .pipe(plugins.g.mocha())
+            plugins.g.mocha(),
-            .pipe(plugins.g.istanbul.writeReports({
+            plugins.g.istanbul.writeReports({
                 dir: plugins.path.join(paths.cwd, './coverage'),
                 reporters: ['lcovonly', 'json', 'text', 'text-summary']
-        }))
+            })
-            .pipe(plugins.g.gFunction(function () {
+        ]);
-            plugins.beautylog.ok('Tested!');
+        localSmartstream.run()
+            .then(() => { done.resolve(configArg); }, (err) => {
+            plugins.beautylog.error('Tests failed!');
+            if (configArg.watch) {
                 done.resolve(configArg);
-        }, 'atEnd'));
+            }
+            else {
+                process.exit(1);
+            }
+        });
     });
     return done.promise;
 };
-var coverage = function (configArg) {
+let coverage = function (configArg) {
-    var done = plugins.Q.defer();
+    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() + "% ")
+            plugins.beautylog.ok(`${percentageArg.toString()}% `
-                + "coverage exceeds your treshold of "
+                + `coverage exceeds your treshold of `
-                + (configArg.coverageTreshold.toString() + "%"));
+                + `${configArg.coverageTreshold.toString()}%`);
         }
         else {
-            plugins.beautylog.warn((percentageArg.toString() + "% ")
+            plugins.beautylog.warn(`${percentageArg.toString()}% `
-                + "coverage fails your treshold of "
+                + `coverage fails your treshold of `
-                + (configArg.coverageTreshold.toString() + "%"));
+                + `${configArg.coverageTreshold.toString()}%`);
             plugins.beautylog.error('exiting due to coverage failure');
+            if (!configArg.watch) {
                 process.exit(1);
             }
+        }
         done.resolve(configArg);
     });
     return done.promise;
 };
 exports.run = function (configArg) {
-    var done = plugins.Q.defer();
+    let done = q.defer();
-    var config = configArg;
+    let config = configArg;
     if (config.test === true) {
         npmts_promisechain_1.npmtsOra.text('now starting tests');
         plugins.beautylog.log('-------------------------------------------------------\n' +
@@ -71,7 +81,7 @@ exports.run = function (configArg) {
             '--------------------------------------------------------------');
         mocha(config)
             .then(coverage)
-            .then(function () {
+            .then(() => {
             done.resolve(config);
         });
     }

dist/npmts.typedoc.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="q" />
-import 'typings-global';
+import * as q from 'q';
-import plugins = require('./npmts.plugins');
+export declare let run: (configArg: any) => q.Promise<{}>;
-export declare let run: (configArg: any) => plugins.Q.Promise<{}>;

dist/npmts.typedoc.js

@@ -1,11 +1,11 @@
 "use strict";
-require('typings-global');
+const plugins = require("./npmts.plugins");
-var plugins = require('./npmts.plugins');
+const paths = require("./npmts.paths");
-var paths = require('./npmts.paths');
+const npmts_promisechain_1 = require("./npmts.promisechain");
-var npmts_promisechain_1 = require('./npmts.promisechain');
+const q = require("q");
-var npmts_check_1 = require('./npmts.check');
+const npmts_check_1 = require("./npmts.check");
-var genTypeDoc = function (configArg) {
+let genTypeDoc = function (configArg) {
-    var done = plugins.Q.defer();
+    let done = q.defer();
     npmts_promisechain_1.npmtsOra.text('now generating ' + 'TypeDoc documentation'.yellow);
     plugins.beautylog.log('TypeDoc Output:');
     plugins.gulp.src(plugins.path.join(paths.tsDir, '**/*.ts'))
@@ -28,10 +28,10 @@ var genTypeDoc = function (configArg) {
     return done.promise;
 };
 exports.run = function (configArg) {
-    var done = plugins.Q.defer();
+    let done = q.defer();
     if (configArg.docs) {
         genTypeDoc(configArg)
-            .then(function () {
+            .then(() => {
             done.resolve(configArg);
         });
     }

dist/npmts.watch.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="q" />
+import * as q from 'q';
+import { INpmtsConfig } from './npmts.options';
+export declare let run: (configArg: INpmtsConfig) => q.Promise<{}>;

dist/npmts.watch.js

@@ -0,0 +1,30 @@
+"use strict";
+const plugins = require("./npmts.plugins");
+const promisechain = require("./npmts.promisechain");
+const q = require("q");
+let npmtsSmartchok = null;
+exports.run = (configArg) => {
+    let done = q.defer();
+    if (configArg.watch && npmtsSmartchok === null) {
+        let pathsToWatch = [];
+        for (let key in configArg.ts) {
+            pathsToWatch.push(key);
+        }
+        for (let key in configArg.testTs) {
+            pathsToWatch.push(key);
+        }
+        npmtsSmartchok = new plugins.smartchok.Smartchok(pathsToWatch);
+        npmtsSmartchok.getObservableFor('change').then((changeObservableArg) => {
+            plugins.beautylog.info('now watching...');
+            changeObservableArg.subscribe(() => {
+                promisechain.run(configArg);
+            });
+        });
+        npmtsSmartchok.start();
+        done.resolve(configArg);
+    }
+    else {
+        done.resolve(configArg);
+    }
+    return done.promise;
+};

docs/book.json

@@ -1,15 +0,0 @@
-{
-    "structure": {
-        "readme": "index.md"
-    },
-    "plugins": [
-        "tonic",
-        "edit-link"
-    ],
-    "pluginsConfig": {
-        "edit-link": {
-            "base": "https://gitlab.com/pushrocks/npmts/edit/master/docs/",
-            "label": "Edit on GitLab"
-        }
-    }
-}

docs/index.md

@@ -5,7 +5,7 @@ Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.
 [![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/docs)
+[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/npmts/gitbook)
 
 ## Status for master
 [![build status](https://gitlab.com/pushrocks/npmts/badges/master/build.svg)](https://gitlab.com/pushrocks/npmts/commits/master)
@@ -31,6 +31,12 @@ npmts will
 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.
+For further information read the docs:
+    * [1. Intro](https://pushrocks.gitlab.io/npmts/gitbook/index.md)
+    * [2. Install](https://pushrocks.gitlab.io/npmts/gitbook/install.md)
+    * [3. Default Behaviour](https://pushrocks.gitlab.io/npmts/gitbook/default.md)
+    * [4. Configuration](https://pushrocks.gitlab.io/npmts/gitbook/config.md)
+    * [5. Examples](https://pushrocks.gitlab.io/npmts/gitbook/examples.md)
+    * [6. Info](https://pushrocks.gitlab.io/npmts/gitbook/info.md) 
 
 [![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)

package.json

@@ -1,14 +1,16 @@
 {
   "name": "npmts",
-  "version": "5.4.30",
+  "version": "5.4.45",
   "description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.",
   "main": "dist/index.js",
   "bin": {
     "npmts": "dist/cli.js"
   },
   "scripts": {
-    "test": "(npm run compile && npm run setupCheck && npm run check && npm run checkVersion && npm run checkNoTest && npm run checkNoDocs)",
+    "test": "(npm run compile && npm run prepareTest && npm run setupCheck && npm run check && npm run checkVersion && npm run checkNoTest && npm run checkNoDocs)",
-    "compile": "(rm -rf test/ && rm -r dist/ && mkdir dist/ && tsc && cp assets/cli.js dist/ )",
+    "testShort": "(npm run compile && npm run check)",
+    "prepareTest": "(rm -rf test/)",
+    "compile": "(rm -r dist/ && tsc && cp assets/cli.js dist/ )",
     "setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)",
     "typedoc": "(typedoc --out ./pages/api --target ES6 ./ts/)",
     "npmpage": "(npmpage)",
@@ -32,14 +34,14 @@
   },
   "homepage": "https://gitlab.com/pushrocks/npmts#readme",
   "dependencies": {
-    "@types/gulp": "^3.8.31",
+    "@types/gulp": "^3.8.32",
-    "@types/minimatch": "^2.0.28",
+    "@types/minimatch": "^2.0.29",
     "@types/q": "^0.x.x",
-    "@types/shelljs": "^0.3.30",
+    "@types/shelljs": "^0.3.31",
-    "babel-preset-es2015": "^6.14.0",
+    "babel-preset-es2015": "^6.16.0",
-    "beautylog": "5.0.22",
+    "beautylog": "5.0.23",
     "depcheck": "^0.6.4",
-    "early": "^2.0.26",
+    "early": "^2.0.35",
     "gulp": "3.9.1",
     "gulp-babel": "^6.1.2",
     "gulp-function": "^1.3.6",
@@ -48,19 +50,21 @@
     "gulp-mocha": "^3.0.1",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-typedoc": "^2.0.0",
-    "lodash": "^4.15.0",
+    "lodash": "^4.16.2",
-    "npmextra": "^1.0.9",
+    "npmextra": "^2.0.3",
     "projectinfo": "1.0.3",
     "q": "^1.4.1",
     "shelljs": "^0.7.4",
-    "smartcli": "1.0.5",
+    "smartchok": "^1.0.2",
+    "smartcli": "1.0.9",
     "smartcov": "1.0.0",
     "smartenv": "1.2.5",
-    "smartfile": "4.0.15",
+    "smartfile": "4.0.22",
     "smartpath": "3.2.2",
+    "smartstream": "^1.0.5",
     "smartstring": "^2.0.17",
-    "source-map-support": "^0.4.2",
+    "source-map-support": "^0.4.3",
-    "tsn": "^1.0.12",
+    "tsn": "^2.0.4",
     "typedoc": "^0.4.5",
     "typescript": "next",
     "typings-global": "^1.0.14"

ts/index.ts

@@ -1,13 +1,13 @@
-import 'typings-global'
-
 /* ================================================== *
-    Starting NPMTS main process.
+    **** NPMTS ****
+    Fabulous TypeScript development
  * ================================================== */
+
 import * as early from 'early'
 early.start('NPMTS')
 import * as plugins from './npmts.plugins'
 import * as paths from './npmts.paths'
-import {promisechain} from './npmts.promisechain'
+import * as promisechain from './npmts.promisechain'
 early.stop()
     .then(() => {
         let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot)
@@ -16,11 +16,7 @@ early.stop()
             .then((argvArg) => {
                 plugins.beautylog.figletSync('NPMTS')
                 plugins.beautylog.info('npmts version: ' + npmtsProjectInfo.version)
-                try {
+                    promisechain.run(argvArg).catch((err) => { console.log(err) })
-                    promisechain(argvArg)
-                } catch (err) {
-                    console.log(err)
-                }
             })
 
         npmtsCli.addVersion(npmtsProjectInfo.version)

ts/npmts.assets.ts

@@ -1,10 +1,11 @@
-import 'typings-global'
 import plugins = require('./npmts.plugins')
 import paths = require('./npmts.paths')
+
+import * as q from 'q'
 import {npmtsOra} from './npmts.promisechain'
 
 export var run = function(configArg){
-    let done = plugins.Q.defer()
+    let done = q.defer()
     let config = configArg
     npmtsOra.text('now looking at ' + 'required assets'.yellow)
     if (config.cli === true) {

ts/npmts.check.ts

@@ -1,13 +1,16 @@
 import * as plugins from './npmts.plugins'
 import * as paths from './npmts.paths'
-import { npmtsOra } from './npmts.promisechain'
 
+import * as q from 'q'
+
+import { npmtsOra } from './npmts.promisechain'
 import {ProjectinfoNpm} from 'projectinfo'
 
 export let projectInfo: ProjectinfoNpm
 
 let checkProjectTypings = (configArg) => {
-    let done = plugins.Q.defer()
+    let done = q.defer()
+    npmtsOra.text('Check Module: Check Project Typings...')
     projectInfo =  new ProjectinfoNpm(paths.cwd)
     if (typeof projectInfo.packageJson.typings === 'undefined') {
         plugins.beautylog.error(`please add typings field to package.json`)
@@ -33,8 +36,9 @@ const depcheckOptions = {
 }
 
 let checkDependencies = (configArg) => {
-    let done = plugins.Q.defer()
+    let done = q.defer()
-    let depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+    npmtsOra.text('Check Module: Check Dependencies...')
+    let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [ // folder with these names will be ignored
             'test',
             'dist',
@@ -47,29 +51,30 @@ let checkDependencies = (configArg) => {
     })
     plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
         for (let item of unused.dependencies) {
-            plugins.beautylog.warn(`Watch out: unused dependency ${item.red}`)
+            plugins.beautylog.warn(`Watch out: unused dependency "${item}"`)
-        };
+        }
-        for (let item of unused.missing) {
+        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 of unused.invalidFiles) {
+        for (let item in unused.invalidFiles) {
             plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`)
         };
-        for (let item of unused.invalidDirs) {
+        for (let item in unused.invalidDirs) {
             plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`)
-        };
+        }
         done.resolve(configArg)
     })
     return done.promise
 }
 
 let checkDevDependencies = (configArg) => {
-    let done = plugins.Q.defer()
+    let done = q.defer()
-    let depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+    npmtsOra.text('Check Module: Check devDependencies...')
+    let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [ // folder with these names will be ignored
             'ts',
             'dist',
@@ -83,18 +88,18 @@ let checkDevDependencies = (configArg) => {
     plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
         for (let item of unused.devDependencies) {
             plugins.beautylog.log(`unused devDependency ${item.red}`)
-        };
+        }
-        for (let item of unused.missing) {
+        for (let item in unused.missing) {
             plugins.beautylog.error(`unused devDependency ${item.red}`)
-        };
+        }
         if (unused.missing.length > 0) {
             plugins.beautylog.info('exiting due to missing dependencies in package.json')
             process.exit(1)
         }
-        for (let item of unused.invalidFiles) {
+        for (let item in unused.invalidFiles) {
             plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`)
         }
-        for (let item of unused.invalidDirs) {
+        for (let item in unused.invalidDirs) {
             plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`)
         }
         done.resolve(configArg)
@@ -103,18 +108,20 @@ let checkDevDependencies = (configArg) => {
 }
 
 let checkNodeVersion = (configArg) => {
-    let done = plugins.Q.defer()
+    let done = q.defer()
+    npmtsOra.text('checking node version')
     done.resolve(configArg)
     return done.promise
 }
 
 export let run = (configArg) => {
-    let done = plugins.Q.defer()
+    let done = q.defer()
-    npmtsOra.text('running project checks...')
+    npmtsOra.text('Check Module: ...')
     checkProjectTypings(configArg)
         .then(checkDependencies)
         .then(checkDevDependencies)
         .then(checkNodeVersion)
         .then(done.resolve)
+        .catch((err) => { console.log(err) })
     return done.promise
 }

ts/npmts.clean.ts

@@ -1,24 +1,45 @@
-import 'typings-global'
 import plugins = require('./npmts.plugins')
 import paths = require('./npmts.paths')
-import {npmtsOra} from './npmts.promisechain'
 
-let removeDist = function(){
+import * as q from 'q'
+
+import { npmtsOra } from './npmts.promisechain'
+
+/**
+ * removes the  dist directory which will be entirely rebuild
+ */
+let removeDist = function () {
     npmtsOra.text('cleaning dist folder')
     return plugins.smartfile.fs.remove(paths.distDir)
 }
 
-let removePages = function(){
+/**
+ * remove .d.ts files from testDirctory
+ */
+let removeTestDeclarations = function () {
+    let done = q.defer()
+    plugins.smartfile.fs.listFileTree('./test/', '**/*.d.ts').then(fileArray => {
+        let fileArrayToRemove = plugins.smartpath.transform.toAbsolute(fileArray, process.cwd() + '//test/')
+        plugins.smartfile.fs.removeManySync(fileArrayToRemove)
+        done.resolve()
+    })
+}
+
+/**
+ * remove old pages
+ */
+let removePages = function () {
     npmtsOra.text('cleaning pages folder')
     return plugins.smartfile.fs.remove(paths.pagesDir)
 }
 
-export let run = function(configArg){
+export let run = function (configArg) {
     npmtsOra.text('cleaning up from previous builds...')
-    let done = plugins.Q.defer()
+    let done = q.defer()
     removeDist()
+        .then(removeTestDeclarations)
         .then(removePages)
-        .then(function(){
+        .then(function () {
             plugins.beautylog.ok('Cleaned up from previous builds!')
             done.resolve(configArg)
         })

ts/npmts.compile.helpers.ts

@@ -1,15 +0,0 @@
-import plugins = require('./npmts.plugins')
-import paths = require('./npmts.paths')
-
-let outputPathIsDir = function (tsArrayArg,keyArg) {
-        return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, tsArrayArg[keyArg]))
-}
-
-export let checkOutputPath = function(tsArrayArg,keyArg){
-    if (!outputPathIsDir(tsArrayArg,keyArg)) {
-        plugins.beautylog.warn('Skipping ' + keyArg + ' because ' + tsArrayArg[keyArg] + ' it is no directory!')
-        return false
-    } else {
-        return true
-    };
-}

ts/npmts.compile.ts

@@ -1,68 +1,23 @@
-import 'typings-global'
 import plugins = require('./npmts.plugins')
 import paths = require('./npmts.paths')
-import helpers = require('./npmts.compile.helpers')
+
+import * as q from 'q'
+
 import {npmtsOra} from './npmts.promisechain'
 
-let promiseArray = []
-let compileTs = (tsFileArrayArg: string[],tsOptionsArg = {}) => {
-    let done = plugins.Q.defer()
-
-    let compilerOptionsDefault = {
-        declaration: true,
-        module: 'CommonJS',
-        target: 'ES6'
-    }
-
-    /**
-     * merges default ts options with those found in npmts.json
-     */
-    let compilerOptions = function (keyArg: string) {
-        let tsOptionsCombined = plugins.lodashObject.merge(compilerOptionsDefault, tsOptionsArg)
-        let compilerOptions: plugins.tsn.CompilerOptions = {
-            declaration: tsOptionsCombined.declaration,
-            module: plugins.tsn.ModuleKind[tsOptionsCombined.module],
-            target: plugins.tsn.ScriptTarget[tsOptionsCombined.target],
-            exclude: 'node_modules/**/*'
-        }
-        return compilerOptions
-    }
-    for (let keyArg in tsFileArrayArg) {
-        plugins.beautylog.info(`TypeScript assignment: transpile from ${keyArg.blue} to ${tsFileArrayArg[keyArg].blue}`)
-        if (helpers.checkOutputPath(tsFileArrayArg,keyArg)) {
-            let filesReadPromise = plugins.smartfile.fs.listFileTree(process.cwd(),keyArg)
-                .then((filesToConvertArg) => {
-                    let filesToConvertAbsolute = plugins.smartpath.transform.toAbsolute(filesToConvertArg,process.cwd())
-                    let destDir = plugins.smartpath.transform.toAbsolute(tsFileArrayArg[keyArg],process.cwd())
-                    let filesCompiledPromise = plugins.tsn.compile(
-                        filesToConvertAbsolute,
-                        destDir,
-                        compilerOptions(keyArg)
-                    )
-                    promiseArray.push(filesCompiledPromise)
-                })
-            promiseArray.push(filesReadPromise)
-        }
-    };
-    plugins.Q.all(promiseArray)
-        .then(done.resolve)
-    return done.promise
-}
-
 export let run = function (configArg) {
-    let done = plugins.Q.defer()
+    let done = q.defer()
     let config = configArg
     npmtsOra.text('now compiling ' + 'TypeScript'.yellow)
-
+    plugins.tsn.compileGlobStringObject(config.ts,config.tsOptions,paths.cwd)
-    compileTs(config.ts,config.tsOptions)
         .then(() => {
             plugins.beautylog.ok('compiled main TypeScript!')
             plugins.beautylog.log('now compiling tests!')
-            return compileTs(config.testTs)
+            return plugins.tsn.compileGlobStringObject(config.testTs,config.tsOptions,paths.cwd)
         })
         .then(function () {
             plugins.beautylog.ok('compiled all TypeScript!')
             done.resolve(config)
-        })
+        }).catch(err => { console.log(err) })
     return done.promise
 }

ts/npmts.options.ts

@@ -1,6 +1,8 @@
-import 'typings-global'
 import plugins = require('./npmts.plugins')
 import paths = require('./npmts.paths')
+
+import * as q from 'q'
+
 import { npmtsOra } from './npmts.promisechain'
 
 export type npmtsMode = 'default' | 'custom'
@@ -13,12 +15,13 @@ export interface INpmtsConfig {
     test: boolean,
     testTs: any,
     ts: any,
-    tsOptions: any
+    tsOptions: any,
+    watch: boolean
 
 };
 
 export var run = function (argvArg) {
-    let done = plugins.Q.defer()
+    let done = q.defer()
     let defaultConfig: INpmtsConfig = {
         argv: undefined,
         coverageTreshold: 70,
@@ -27,16 +30,18 @@ export var run = function (argvArg) {
         test: true,
         testTs: {},
         ts: {},
-        tsOptions: {}
+        tsOptions: {},
+        watch: false
     }
 
     // mix with configfile
-    npmtsOra.text('looking for npmextra.json')
+    npmtsOra.text('running npmextra')
-    let config: INpmtsConfig = plugins.npmextra.dataFor({
+
-        toolName: 'npmts',
+    let localNpmextra = new plugins.npmextra.Npmextra(paths.cwd)
-        defaultSettings: defaultConfig,
+    let config: INpmtsConfig = localNpmextra.dataFor<INpmtsConfig>(
-        cwd: paths.cwd
+        'npmts',
-    })
+        defaultConfig
+    )
 
     // add argv
     config.argv = argvArg
@@ -56,10 +61,10 @@ export var run = function (argvArg) {
     // handle default mode
     if (config.mode === 'default') {
         config.ts = {
-            ['./ts/**/*.ts']: './dist/'
+            './ts/**/*.ts': './dist/'
         }
         config.testTs = {
-            ['./test/test.ts']: './test/'
+            './test/**/*.ts': './test/'
         }
     };
 
@@ -70,6 +75,9 @@ export var run = function (argvArg) {
     if (config.argv.nodocs) {
         config.docs = false
     };
+    if (config.argv.watch) {
+        config.watch = true
+    };
 
     plugins.beautylog.ok('build options are ready!')
     done.resolve(config)

ts/npmts.paths.ts

@@ -1,4 +1,3 @@
-import 'typings-global'
 import plugins = require('./npmts.plugins')
 
 // NPMTS Paths

ts/npmts.plugins.ts

@@ -1,8 +1,8 @@
 import 'typings-global'
-export import beautylog = require('beautylog')
+import * as beautylog from 'beautylog'
-export let depcheck = require('depcheck')
+let depcheck = require('depcheck')
-export import gulp = require('gulp')
+import * as gulp from 'gulp'
-export let g = {
+let g = {
     babel: require('gulp-babel'),
     istanbul: require('gulp-istanbul'),
     gFunction: require('gulp-function'),
@@ -11,17 +11,39 @@ export let g = {
     sourcemaps: require('gulp-sourcemaps'),
     typedoc: require('gulp-typedoc')
 }
-export import lodashObject = require('lodash')
+import * as lodash from 'lodash'
-export import npmextra = require('npmextra')
+import * as npmextra from 'npmextra'
-export import projectinfo = require('projectinfo')
+import * as projectinfo from 'projectinfo'
-export import path = require('path')
+import * as path from 'path'
-export import Q = require('q')
+import * as shelljs from 'shelljs'
-export import shelljs = require('shelljs')
+import * as smartchok from 'smartchok'
-export import smartcli = require('smartcli')
+import * as smartcli from 'smartcli'
-export import smartcov = require('smartcov')
+import * as smartcov from 'smartcov'
-export import smartenv = require('smartenv')
+import * as smartenv from 'smartenv'
-export import smartfile = require('smartfile')
+import * as smartfile from 'smartfile'
-export import smartpath = require('smartpath')
+import * as smartpath from 'smartpath'
-export import smartstring = require('smartstring')
+import * as smartstream from 'smartstream'
+import * as smartstring from 'smartstring'
 export let sourceMapSupport = require('source-map-support').install() // display errors correctly during testing
-export import tsn = require('tsn')
+import * as tsn from 'tsn'
+
+export {
+    beautylog,
+    depcheck,
+    gulp,
+    g,
+    lodash,
+    npmextra,
+    projectinfo,
+    path,
+    shelljs,
+    smartchok,
+    smartcli,
+    smartcov,
+    smartenv,
+    smartfile,
+    smartpath,
+    smartstream,
+    smartstring,
+    tsn
+}

ts/npmts.promisechain.ts

@@ -1,19 +1,21 @@
-import 'typings-global'
 import plugins = require('./npmts.plugins')
 import {Ora} from 'beautylog'
 
+import * as q from 'q'
+
 export let npmtsOra = new Ora('setting up TaskChain','cyan')
 
-import NpmtsAssets = require('./npmts.assets')
+import * as NpmtsAssets from './npmts.assets'
-import NpmtsCheck = require('./npmts.check')
+import * as NpmtsCheck from './npmts.check'
-import NpmtsClean = require('./npmts.clean')
+import * as NpmtsClean from './npmts.clean'
-import NpmtsCompile = require('./npmts.compile')
+import * as NpmtsCompile from './npmts.compile'
-import NpmtsTypeDoc = require('./npmts.typedoc')
+import * as NpmtsTypeDoc from './npmts.typedoc'
-import NpmtsOptions = require('./npmts.options')
+import * as NpmtsOptions from './npmts.options'
-import NpmtsTests = require('./npmts.tests')
+import * as NpmtsTests from './npmts.tests'
+import * as NpmtsWatch from './npmts.watch'
 
-export let promisechain = function(argvArg){
+export let run = function(argvArg){
-    let done = plugins.Q.defer()
+    let done = q.defer()
     npmtsOra.start()
     NpmtsOptions.run(argvArg)
         .then(NpmtsClean.run)
@@ -22,6 +24,7 @@ export let promisechain = function(argvArg){
         .then(NpmtsAssets.run)
         .then(NpmtsTypeDoc.run)
         .then(NpmtsTests.run)
+        .then(NpmtsWatch.run)
         .then(function(configArg){
             let shipString = '' +
                 '\n' +
@@ -43,7 +46,7 @@ export let promisechain = function(argvArg){
             } else {
                 plugins.beautylog.success('Done!')
             }
-            done.resolve()
+            done.resolve(configArg)
         })
         return done.promise
 }

ts/npmts.tests.ts

@@ -1,16 +1,19 @@
-import 'typings-global'
 import plugins = require('./npmts.plugins')
 import paths = require('./npmts.paths')
+
+import * as q from 'q'
+
 import { npmtsOra } from './npmts.promisechain'
+import { INpmtsConfig } from './npmts.options'
 
 /**
- *
+ * runs mocha
- * @returns {*}
+ * @returns INpmtsConfig
  */
-let mocha = function (configArg) {
+let mocha = function (configArg: INpmtsConfig) {
     npmtsOra.text('Instrumentalizing and testing transpiled JS')
     npmtsOra.end() // end npmtsOra for tests.
-    let done = plugins.Q.defer()
+    let done = q.defer()
     plugins.gulp.src([plugins.path.join(paths.cwd, 'dist/*.js')])
         .pipe(plugins.g.sourcemaps.init())
         .pipe(plugins.g.babel({
@@ -23,31 +26,35 @@ let mocha = function (configArg) {
         .pipe(plugins.g.sourcemaps.write())
         .pipe(plugins.g.injectModules())
         .on('finish', function () {
-            plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.js')])
+            let localSmartstream = new plugins.smartstream.Smartstream([
-                .pipe(plugins.g.babel({
+                plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.js')]),
+                plugins.g.babel({
                     presets: [
                         require.resolve('babel-preset-es2015')
                     ]
-                }))
+                }),
-                .pipe(plugins.g.injectModules())
+                plugins.g.injectModules(),
-                .pipe(plugins.g.mocha())
+                plugins.g.mocha(),
-                .pipe(plugins.g.istanbul.writeReports({
+                plugins.g.istanbul.writeReports({
                     dir: plugins.path.join(paths.cwd, './coverage'),
                     reporters: ['lcovonly', 'json', 'text', 'text-summary']
-                }))
+                })
-                .pipe(plugins.g.gFunction(
+            ])
-                    function () {
+            localSmartstream.run()
-                        plugins.beautylog.ok('Tested!')
+                .then(() => { done.resolve(configArg) }, (err) => {
+                    plugins.beautylog.error('Tests failed!')
+                    if (configArg.watch) {
                         done.resolve(configArg)
-                    },
+                    } else {
-                    'atEnd'
+                        process.exit(1)
-                ))
+                    }
+                })
         })
     return done.promise
 }
 
-let coverage = function (configArg) {
+let coverage = function (configArg: INpmtsConfig) {
-    let done = plugins.Q.defer()
+    let done = q.defer()
     plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, 'lcov.info'), 2)
         .then(function (percentageArg) {
             if (percentageArg >= configArg.coverageTreshold) {
@@ -63,15 +70,15 @@ let coverage = function (configArg) {
                     + `${configArg.coverageTreshold.toString()}%`
                 )
                 plugins.beautylog.error('exiting due to coverage failure')
-                process.exit(1)
+                if (!configArg.watch) { process.exit(1) }
             }
             done.resolve(configArg)
         })
     return done.promise
 }
 
-export let run = function (configArg) {
+export let run = function (configArg: INpmtsConfig) {
-    let done = plugins.Q.defer()
+    let done = q.defer()
     let config = configArg
     if (config.test === true) {
         npmtsOra.text('now starting tests')

ts/npmts.typedoc.ts

@@ -1,12 +1,13 @@
-import 'typings-global'
 import plugins = require('./npmts.plugins')
 import paths = require('./npmts.paths')
 import { npmtsOra } from './npmts.promisechain'
 
+import * as q from 'q'
+
 import { projectInfo } from './npmts.check'
 
 let genTypeDoc = function (configArg) {
-    let done = plugins.Q.defer()
+    let done = q.defer()
     npmtsOra.text('now generating ' + 'TypeDoc documentation'.yellow)
     plugins.beautylog.log('TypeDoc Output:')
     plugins.gulp.src(plugins.path.join(paths.tsDir, '**/*.ts'))
@@ -32,7 +33,7 @@ let genTypeDoc = function (configArg) {
 }
 
 export let run = function (configArg) {
-    let done = plugins.Q.defer()
+    let done = q.defer()
     if (configArg.docs) {
         genTypeDoc(configArg)
             .then(() => {

ts/npmts.watch.ts

@@ -0,0 +1,32 @@
+import * as plugins from './npmts.plugins'
+import * as promisechain from './npmts.promisechain'
+
+import * as q from 'q'
+
+import { INpmtsConfig } from './npmts.options'
+
+let npmtsSmartchok: plugins.smartchok.Smartchok = null
+export let run = (configArg: INpmtsConfig) => {
+    let done = q.defer()
+    if (configArg.watch && npmtsSmartchok === null) {
+        let pathsToWatch: string[] = []
+        for (let key in configArg.ts) {
+            pathsToWatch.push(key)
+        }
+        for (let key in configArg.testTs) {
+            pathsToWatch.push(key)
+        }
+        npmtsSmartchok = new plugins.smartchok.Smartchok(pathsToWatch)
+        npmtsSmartchok.getObservableFor('change').then((changeObservableArg) => {
+            plugins.beautylog.info('now watching...')
+            changeObservableArg.subscribe(() => {
+                promisechain.run(configArg)
+            })
+        })
+        npmtsSmartchok.start()
+        done.resolve(configArg)
+    } else {
+        done.resolve(configArg)
+    }
+    return done.promise
+}

tsconfig.json

@@ -2,7 +2,12 @@
     "compilerOptions": {
         "declaration": true,
         "module": "commonjs",
-        "target": "ES5",
+        "target": "ES6",
         "outDir": "./dist/"
-    }
+    },
+    "exclude": [
+        "./node_modules",
+        "./test",
+        "./dist"
+    ]
 }