5.4.7

README.md

@@ -1,19 +1,19 @@
 # npmts
-Write npm modules with TypeScript without hassle.
+Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.
 
 ## Status
 [![build status](https://gitlab.com/pushrocks/npmts/badges/master/build.svg)](https://gitlab.com/pushrocks/npmts/commits/master)
 [![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)
-[![codecov.io](https://codecov.io/github/pushrocks/npmts/coverage.svg?branch=master)](https://codecov.io/github/pushrocks/npmts?branch=master)
+[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
 
 ## What is NPMTS?
 NPMTS is your friend when it comes to write, test, publish and document NPM modules written in TypeScript.
 By default NPMTS will **bundle declaration files**. As a result npm module **code completion in editors like Visual Studio Code** works.
 
 There is a docker image available that includes npmts to make CI a breeze:  
-[hosttoday/ht-docker-npmg on Dockerhub](https://hub.docker.com/r/hosttoday/ht-docker-npmg/)
+[hosttoday/ht-docker-node:npmts on Dockerhub](https://hub.docker.com/r/hosttoday/ht-docker-node/)
 
 ### Install
 First install npmts globally, then install the npmts-g locally.
@@ -36,49 +36,47 @@ Then add it to your package.json's script section to trigger a build:
 
 ### Default task execution order
 
-1. Check config in ./npmts.json
-1. Clean up from any previous builds (old js files)
-1. Install typings
-1. Transpile TypeScript with **inline sourcemaps** and **declaration files** 
-1. Create JsDoc Documentation
-1. Instrumentalize created JavaScript files with istanbul
-1. Run Tests
-1. Create Coverage report
+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. **Documentation:** Create TypeDoc Documentation from TypeScript files
+1. **Test:** Babelify ES6 to ES5 on the fly, instrumentalize ES5 JavaScript with istanbul and run tests with Mocha.
 
-#### npmts.json
-the npmts.json is the main config file. You can use it to customize the behaviour of NPMTS.
+### npmextra.json
+the npmts section in npmextra.json can be used to configure npmts.
 
 ```json
 {
-  "mode":"default",
-  "ts":{
-    "./customdir/*.ts":"./"
-  },
-  "tsOptions":{
-    "declaration":false,
-    "target":"ES6"
-  },
-  "cli":true
+  "npmts":{
+    "mode":"default",
+    "ts":{
+      "./customdir/*.ts":"./"
+    },
+    "tsOptions":{
+      "declaration":false,
+      "target":"ES6"
+    },
+    "cli":true
+  }
 }
 ```
 
 | key | default value | description |
 | --- | --- | --- |
-| `"codecov"` | `true` | if true, coverage data will be uploaded to codecov when running on travis |
-| `"docs"` | `{"publish":"false"}` | `{"publish":true, destination:"github"}` lets you control what happens with your module documentation |
-| `"mode"` | `"default"` | "default" will do some defualt stuff, "custom" only does what you specify |
+| `"mode"` | `"default"` | "default" will do some default stuff, "custom" only does what you specify |
+| `"ts"` | `{"./ts/*.ts":"./","./test/test.ts":"./test/"}` | allows you to define multiple ts portions |
 | `"tsOptions"` | `{"target":"ES5", "declaration":"true"}` | specify options for tsc |
-| `"typings"` | `["./ts/typings.json"]` | allows you to specify multiple locations for typings.json to install. This is needed for modules that do not yet bundle typings |
 | `"cli"` | "false" | some modules are designed to be used from cli. If set to true NPMTS will create a cli.js that wires you dist files up for cli use. |
 
-#### TypeScript
+### TypeScript
 by default npmts looks for `./ts/*.ts` and `./test/test.ts` that will compile to
 `./dist/*.js` and `./test/test.js`
 
 Use commonjs module system for wiring up files.
 
-#### Declaration files
-**npmts** also creates an `./dist/index.d.ts` declaration file by default.
+### Declaration files
+**npmts** also creates declaration files like `./dist/index.d.ts` by default.
 You can reference it in your package.json like this.
 
 ```json
@@ -90,30 +88,33 @@ This is in line with the latest TypeScript best practices.
 You can then import plugins via the TypeScript `import` Syntax
 and tsc will pick up the declaration file automatically.
 
+## Some notes:
 #### Typings for third party modules that do not bundle declaration files
-NPMTS does no longer supports typings.json. Instead use the new TypeScript 2.x approach to typings using the @types/ npm scope.
+NPMTS no longer supports typings.json. Instead use the new TypeScript 2.x approach to typings using the @types/ npm scope.
 
 #### Instrumentalize Code
 npmts instrumentalizes (using istanbul) the created JavaScript code to create a coverage report.
 
 #### Tests
-When Typings have been installed, TypeScript + Declaration files have been transpiled and the resulting JS has been instrumentalized,
-npmts looks for `.test/test.ts` which will be transpiled to test.js and run with mocha. 
-
 Any errors will be shown with reference to their originating source in TypeScript
 thanks to autogenerated source maps.
 
 ## Example Usage in modules:
-* [gulp-typings](https://www.npmjs.com/package/gulp-typings)
-* [gulp-browser](https://www.npmjs.com/package/gulp-typings)
+* [gulp-browser](https://www.npmjs.com/package/gulp-browser)
 
 > We will add more options over time.
 
 ## 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/npmtspage) to create a webpage from coverage reports and JsDocs for the module
+* 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 [npmdocker](https://www.npmjs.com/package/npmdocker) for running tests consistently with docker.
+
+## 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/)

dist/npmts.assets.js

@@ -8,11 +8,12 @@ exports.run = function (configArg) {
     var config = configArg;
     npmts_promisechain_1.npmtsOra.text("now looking at " + "required assets".yellow);
     if (config.cli == true) {
-        plugins.smartfile.fs.copy(plugins.path.join(paths.npmtsAssetsDir, "cli.js"), paths.distDir);
+        plugins.smartfile.fs.copySync(plugins.path.join(paths.npmtsAssetsDir, "cli.js"), plugins.path.join(paths.distDir, "cli.js"));
         plugins.beautylog.ok("installed CLI assets!");
         done.resolve(config);
     }
     else {
+        plugins.beautylog.ok("No additional assets required!");
         done.resolve(config);
     }
     return done.promise;

dist/npmts.check.d.ts

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

dist/npmts.check.js

@@ -0,0 +1,128 @@
+"use strict";
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+var npmts_promisechain_1 = require("./npmts.promisechain");
+var checkProjectTypings = function (configArg) {
+    var done = plugins.Q.defer();
+    var cwdProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.cwd);
+    if (typeof cwdProjectInfo.packageJson.typings == "undefined") {
+        plugins.beautylog.error("please add typings field to package.json");
+        process.exit(1);
+    }
+    ;
+    done.resolve(configArg);
+    return done.promise;
+};
+var depcheckOptions = {
+    ignoreBinPackage: false,
+    parsers: {
+        '*.ts': plugins.depcheck.parser.typescript,
+    },
+    detectors: [
+        plugins.depcheck.detector.requireCallExpression,
+        plugins.depcheck.detector.importDeclaration
+    ],
+    specials: [
+        plugins.depcheck.special.eslint,
+        plugins.depcheck.special.webpack
+    ],
+};
+var checkDependencies = function (configArg) {
+    var done = plugins.Q.defer();
+    var depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+        ignoreDirs: [
+            'test',
+            'dist',
+            'bower_components'
+        ],
+        ignoreMatches: [
+            "@types/*",
+            "babel-preset-*"
+        ]
+    });
+    plugins.depcheck(paths.cwd, depcheckOptionsMerged, function (unused) {
+        for (var _i = 0, _a = unused.dependencies; _i < _a.length; _i++) {
+            var item = _a[_i];
+            plugins.beautylog.warn("Watch out: unused dependency " + item.red);
+        }
+        ;
+        for (var _b = 0, _c = unused.missing; _b < _c.length; _b++) {
+            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++) {
+            var item = _e[_d];
+            plugins.beautylog.warn("Watch out: could not parse file " + item.red);
+        }
+        ;
+        for (var _f = 0, _g = unused.invalidDirs; _f < _g.length; _f++) {
+            var item = _g[_f];
+            plugins.beautylog.warn("Watch out: could not parse directory " + item.red);
+        }
+        ;
+        done.resolve(configArg);
+    });
+    return done.promise;
+};
+var checkDevDependencies = function (configArg) {
+    var done = plugins.Q.defer();
+    var depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+        ignoreDirs: [
+            'ts',
+            'dist',
+            'bower_components'
+        ],
+        ignoreMatches: [
+            "@types/*",
+            "babel-preset-*"
+        ]
+    });
+    plugins.depcheck(paths.cwd, depcheckOptionsMerged, function (unused) {
+        for (var _i = 0, _a = unused.devDependencies; _i < _a.length; _i++) {
+            var item = _a[_i];
+            plugins.beautylog.log("unused devDependency " + item.red);
+        }
+        ;
+        for (var _b = 0, _c = unused.missing; _b < _c.length; _b++) {
+            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++) {
+            var item = _e[_d];
+            plugins.beautylog.warn("Watch out: could not parse file " + item.red);
+        }
+        ;
+        for (var _f = 0, _g = unused.invalidDirs; _f < _g.length; _f++) {
+            var item = _g[_f];
+            plugins.beautylog.warn("Watch out: could not parse directory " + item.red);
+        }
+        ;
+        done.resolve(configArg);
+    });
+    return done.promise;
+};
+var checkNodeVersion = function (configArg) {
+    var done = plugins.Q.defer();
+    done.resolve(configArg);
+    return done.promise;
+};
+exports.run = function (configArg) {
+    var done = plugins.Q.defer();
+    npmts_promisechain_1.npmtsOra.text("running project checks..."),
+        checkProjectTypings(configArg)
+            .then(checkDependencies)
+            .then(checkDevDependencies)
+            .then(checkNodeVersion)
+            .then(done.resolve);
+    return done.promise;
+};

dist/npmts.cli.d.ts

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

dist/npmts.cli.js

@@ -1,2 +0,0 @@
-"use strict";
-require("typings-global");

dist/npmts.compile.js

@@ -7,16 +7,22 @@ var promiseArray = [];
 var compileTs = function (tsFileArrayArg, tsOptionsArg) {
     if (tsOptionsArg === void 0) { tsOptionsArg = {}; }
     var done = plugins.Q.defer();
-    var tsOptionsDefault = {
+    var compilerOptionsDefault = {
         declaration: true,
-        target: "ES5",
-        module: "commonjs"
+        module: "CommonJS",
+        target: "ES6"
     };
     /**
      * merges default ts options with those found in npmts.json
      */
-    var tsOptions = function (keyArg) {
-        return plugins.lodashObject.assign(tsOptionsDefault, tsOptionsArg);
+    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]
+        };
+        return compilerOptions;
     };
     var _loop_1 = function(keyArg) {
         plugins.beautylog.info("TypeScript assignment: transpile from " + keyArg.blue + " to " + tsFileArrayArg[keyArg].blue);
@@ -25,7 +31,7 @@ var compileTs = function (tsFileArrayArg, tsOptionsArg) {
                 .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);
+                var filesCompiledPromise = plugins.tsn.compile(filesToConvertAbsolute, destDir, compilerOptions(keyArg));
                 promiseArray.push(filesCompiledPromise);
             });
             promiseArray.push(filesReadPromise);

dist/npmts.configfile.js

@@ -2,33 +2,39 @@
 require("typings-global");
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
+var npmts_promisechain_1 = require("./npmts.promisechain");
 exports.run = function (argvArg) {
     var done = plugins.Q.defer();
-    var config = {};
-    var configPath = plugins.path.join(paths.cwd, "npmts.json");
+    npmts_promisechain_1.npmtsOra.text("looking for npmextra.json");
+    var defaultConfig = {
+        mode: "default",
+        notest: false,
+        nodocs: false
+    };
     if (argvArg.notest) {
-        config.notest = true;
-    }
-    if (plugins.smartfile.fs.fileExistsSync(configPath)) {
-        plugins.beautylog.info("npmts.json".blue + " config file found!");
-        config = plugins.lodashObject.assign(config, plugins.smartfile.fs.toObjectSync(configPath));
-        switch (config.mode) {
-            case "default":
-            case "custom":
-                plugins.beautylog.ok("mode is " + config.mode.yellow);
-                done.resolve(config);
-                break;
-            default:
-                plugins.beautylog.error("mode " + config.mode.yellow + " not recognised!".red);
-                process.exit(1);
-        }
-        ;
-    }
-    else {
-        plugins.beautylog.log("no config file found: so mode is " + "default".yellow);
-        config.mode = "default";
-        done.resolve(config);
+        defaultConfig.notest = true;
     }
     ;
+    if (argvArg.nodocs) {
+        defaultConfig.nodocs = true;
+    }
+    ;
+    var config = plugins.npmextra.dataFor({
+        toolName: "npmts",
+        defaultSettings: defaultConfig,
+        cwd: paths.cwd
+    });
+    switch (config.mode) {
+        case "default":
+        case "custom":
+            plugins.beautylog.ok("mode is " + config.mode.yellow);
+            done.resolve(config);
+            break;
+        default:
+            plugins.beautylog.error("mode " + config.mode.yellow + " not recognised!".red);
+            process.exit(1);
+    }
+    ;
+    done.resolve(config);
     return done.promise;
 };

dist/npmts.jsdoc.js

@@ -1,28 +0,0 @@
-"use strict";
-require("typings-global");
-var plugins = require("./npmts.plugins");
-var paths = require("./npmts.paths");
-var npmts_promisechain_1 = require("./npmts.promisechain");
-var genJsdoc = function (configArg) {
-    var done = plugins.Q.defer();
-    npmts_promisechain_1.npmtsOra.text("now generating " + "JsDoc documentation".yellow);
-    plugins.gulp.src([
-        plugins.path.join(paths.cwd, "README.md"),
-        plugins.path.join(paths.distDir, "**/*.js")
-    ])
-        .pipe(plugins.g.jsdoc3({
-        opts: {
-            destination: paths.docsDir
-        }
-    }, function () {
-        plugins.beautylog.ok("JsDoc documentation has been generated!");
-        done.resolve(configArg);
-    }));
-    return done.promise;
-};
-exports.run = function (configArg) {
-    var done = plugins.Q.defer();
-    genJsdoc(configArg)
-        .then(done.resolve);
-    return done.promise;
-};

dist/npmts.options.d.ts

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

dist/npmts.options.js

@@ -2,9 +2,6 @@
 require("typings-global");
 var plugins = require("./npmts.plugins");
 var npmts_promisechain_1 = require("./npmts.promisechain");
-exports.isCi = function () {
-    return plugins.smartci.check.isCi();
-};
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;

dist/npmts.plugins.d.ts

@@ -1,23 +1,24 @@
 import "typings-global";
 export import beautylog = require("beautylog");
-export declare let gulp: any;
+export declare let depcheck: any;
+export import gulp = require("gulp");
 export declare let g: {
-    gFunction: any;
+    babel: any;
     istanbul: any;
-    jsdoc3: any;
+    gFunction: any;
+    injectModules: any;
     mocha: any;
-    replace: any;
     sourcemaps: any;
+    typedoc: any;
 };
-export declare let lodashObject: any;
-export declare let merge2: any;
+export import lodashObject = require('lodash');
+export import npmextra = require("npmextra");
 export import projectinfo = require("projectinfo");
 export import path = require("path");
 export import Q = require("q");
 export import shelljs = require("shelljs");
-export declare let smartci: any;
 export import smartcli = require("smartcli");
-export declare let smartcov: any;
+export import smartcov = require("smartcov");
 export import smartenv = require("smartenv");
 export import smartfile = require("smartfile");
 export import smartpath = require("smartpath");

dist/npmts.plugins.js

@@ -1,22 +1,23 @@
 "use strict";
 require("typings-global");
 exports.beautylog = require("beautylog");
+exports.depcheck = require("depcheck");
 exports.gulp = require("gulp");
 exports.g = {
-    gFunction: require("gulp-function"),
+    babel: require("gulp-babel"),
     istanbul: require("gulp-istanbul"),
-    jsdoc3: require("gulp-jsdoc3"),
+    gFunction: require("gulp-function"),
+    injectModules: require("gulp-inject-modules"),
     mocha: require("gulp-mocha"),
-    replace: require("gulp-replace"),
-    sourcemaps: require("gulp-sourcemaps")
+    sourcemaps: require("gulp-sourcemaps"),
+    typedoc: require("gulp-typedoc")
 };
-exports.lodashObject = require('lodash/fp/object');
-exports.merge2 = require("merge2");
+exports.lodashObject = require('lodash');
+exports.npmextra = require("npmextra");
 exports.projectinfo = require("projectinfo");
 exports.path = require("path");
 exports.Q = require("q");
 exports.shelljs = require("shelljs");
-exports.smartci = require("smartci");
 exports.smartcli = require("smartcli");
 exports.smartcov = require("smartcov");
 exports.smartenv = require("smartenv");

dist/npmts.promisechain.js

@@ -3,10 +3,11 @@ require("typings-global");
 var plugins = require("./npmts.plugins");
 exports.npmtsOra = new plugins.beautylog.Ora("setting up TaskChain", "cyan");
 var NpmtsAssets = require("./npmts.assets");
+var NpmtsCheck = require("./npmts.check");
 var NpmtsClean = require("./npmts.clean");
 var NpmtsCompile = require("./npmts.compile");
 var NpmtsConfigFile = require("./npmts.configfile");
-var NpmtsJsdoc = require("./npmts.jsdoc");
+var NpmtsTypeDoc = require("./npmts.typedoc");
 var NpmtsOptions = require("./npmts.options");
 var NpmtsTests = require("./npmts.tests");
 exports.promisechain = function (argvArg) {
@@ -15,9 +16,10 @@ exports.promisechain = function (argvArg) {
     NpmtsConfigFile.run(argvArg)
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)
+        .then(NpmtsCheck.run)
         .then(NpmtsCompile.run)
         .then(NpmtsAssets.run)
-        .then(NpmtsJsdoc.run)
+        .then(NpmtsTypeDoc.run)
         .then(NpmtsTests.run)
         .then(function (configArg) {
         var shipString = "" +

dist/npmts.tests.js

@@ -7,47 +7,49 @@ var npmts_promisechain_1 = require("./npmts.promisechain");
  *
  * @returns {*}
  */
-var istanbul = function (configArg) {
-    npmts_promisechain_1.npmtsOra.text("Instrumentalizing transpiled JS...");
+var 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();
     var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "dist/*.js")])
         .pipe(plugins.g.sourcemaps.init())
-        .pipe(plugins.g.istanbul()) // Covering files
+        .pipe(plugins.g.babel({
+        presets: [
+            require.resolve("babel-preset-es2015")
+        ]
+    }))
+        .pipe(plugins.g.istanbul({}))
         .pipe(plugins.g.sourcemaps.write())
-        .pipe(plugins.g.istanbul.hookRequire()) // Force `require` to return covered files
-        .pipe(plugins.g.gFunction(function () {
-        plugins.beautylog.ok("JS has been instrumentalized to get test code coverage!");
-        done.resolve(configArg);
-    }, "atEnd"));
-    return done.promise;
-};
-/**
- *
- * @returns {*}
- */
-var mocha = function (configArg) {
-    var done = plugins.Q.defer();
-    npmts_promisechain_1.npmtsOra.end(); // end npmtsOra for tests.
-    var stream = plugins.gulp.src(["./test/test.js"])
-        .pipe(plugins.g.mocha())
-        .pipe(plugins.g.istanbul.writeReports()) // Creating the reports after tests ran
-        .pipe(plugins.g.gFunction(function () {
-        plugins.beautylog.ok("Tests have passed!");
-        done.resolve(configArg);
-    }, "atEnd"));
+        .pipe(plugins.g.injectModules())
+        .on("finish", function () {
+        plugins.gulp.src([plugins.path.join(paths.cwd, "test/test.js")])
+            .pipe(plugins.g.babel({
+            presets: [
+                require.resolve("babel-preset-es2015")
+            ]
+        }))
+            .pipe(plugins.g.injectModules())
+            .pipe(plugins.g.mocha())
+            .pipe(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!");
+            done.resolve(configArg);
+        }, "atEnd"));
+    });
     return done.promise;
 };
 var coverage = function (configArg) {
     var done = plugins.Q.defer();
-    plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, "lcov.info"))
+    plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, "lcov.info"), 2)
         .then(function (percentageArg) {
         if (percentageArg >= configArg.coverageTreshold) {
-            plugins.beautylog.ok("your coverage of " + percentageArg.toString().blue + "% ".blue + "exceeds your treshold of " +
-                configArg.coverageTreshold.toString().blue + "%".blue);
+            plugins.beautylog.ok(percentageArg.toString() + "% coverage exceeds your treshold of " + configArg.coverageTreshold.toString() + "%");
         }
         else {
-            plugins.beautylog.warn("your coverage of " + percentageArg + "% " + "fails your treshold of " +
-                configArg.coverageTreshold + "%");
+            plugins.beautylog.warn(percentageArg.toString() + "% coverage fails your treshold of " + configArg.coverageTreshold.toString() + "%");
             plugins.beautylog.error("exiting due to coverage failure");
             process.exit(1);
         }
@@ -63,8 +65,7 @@ exports.run = function (configArg) {
         plugins.beautylog.log("-------------------------------------------------------\n" +
             "*************************** TESTS: ***************************\n" +
             "--------------------------------------------------------------");
-        istanbul(config)
-            .then(mocha)
+        mocha(config)
             .then(coverage)
             .then(function () {
             done.resolve(config);

dist/npmts.typedoc.js

@@ -0,0 +1,41 @@
+"use strict";
+require("typings-global");
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+var npmts_promisechain_1 = require("./npmts.promisechain");
+var genTypeDoc = function (configArg) {
+    var done = plugins.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"))
+        .pipe(plugins.g.typedoc({
+        // TypeScript options (see typescript docs) 
+        module: "commonjs",
+        target: "es6",
+        includeDeclarations: true,
+        // Output options (see typedoc docs) 
+        out: paths.docsDir,
+        json: plugins.path.join(paths.docsDir, "file.json"),
+        // TypeDoc options (see typedoc docs) 
+        name: "my-project",
+        //theme: "default",
+        ignoreCompilerErrors: true,
+        version: true,
+    }))
+        .pipe(plugins.g.gFunction(done.resolve, "atEnd"));
+    return done.promise;
+};
+exports.run = function (configArg) {
+    var done = plugins.Q.defer();
+    if (configArg.nodocs) {
+        done.resolve(configArg);
+    }
+    else {
+        genTypeDoc(configArg)
+            .then(function () {
+            done.resolve(configArg);
+        });
+    }
+    ;
+    return done.promise;
+};

package.json

@@ -1,18 +1,19 @@
 {
   "name": "npmts",
-  "version": "5.3.9",
-  "description": "write npm modules with TypeScript",
+  "version": "5.4.7",
+  "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)",
+    "test": "(npm run compile && 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/ )",
     "setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)",
-    "check": "(cd test && node ../dist/index.js)",
+    "check": "(cd test && npm install && node ../dist/index.js)",
     "checkVersion": "(cd test/ && node ../dist/index.js -v)",
-    "checkNoTest": "(cd test && node ../dist/index.js --notest)"
+    "checkNoTest": "(cd test && node ../dist/index.js --notest)",
+    "checkNoDocs": "(cd test && node ../dist/index.js --nodocs)"
   },
   "repository": {
     "type": "git",
@@ -29,34 +30,36 @@
   },
   "homepage": "https://gitlab.com/pushrocks/npmts#readme",
   "dependencies": {
-    "@types/minimatch": "^2.0.22-alpha",
-    "@types/q": "0.0.21-alpha",
-    "@types/shelljs": "^0.3.21-alpha",
-    "beautylog": "5.0.12",
+    "@types/gulp": "^3.8.28",
+    "@types/minimatch": "^2.0.28",
+    "@types/q": "^0.0.27",
+    "@types/shelljs": "^0.3.27",
+    "babel-preset-es2015": "^6.9.0",
+    "beautylog": "5.0.18",
+    "depcheck": "^0.6.4",
     "early": "^2.0.13",
     "gulp": "3.9.1",
-    "gulp-concat": "^2.6.0",
+    "gulp-babel": "^6.1.2",
     "gulp-function": "^1.3.6",
-    "gulp-if": "^2.0.1",
+    "gulp-inject-modules": "^1.0.0",
     "gulp-istanbul": "^1.0.0",
-    "gulp-jsdoc3": "^0.3.0",
     "gulp-mocha": "^2.2.0",
-    "gulp-replace": "^0.5.4",
     "gulp-sourcemaps": "^1.6.0",
-    "lodash": "^4.13.1",
-    "merge2": "1.0.2",
+    "gulp-typedoc": "^2.0.0",
+    "lodash": "^4.14.0",
+    "npmextra": "^1.0.8",
     "projectinfo": "1.0.3",
     "q": "^1.4.1",
-    "shelljs": "^0.7.0",
-    "smartci": "0.0.1",
+    "shelljs": "^0.7.3",
     "smartcli": "1.0.4",
-    "smartcov": "0.0.6",
+    "smartcov": "0.0.9",
     "smartenv": "1.2.5",
-    "smartfile": "4.0.10",
+    "smartfile": "4.0.12",
     "smartpath": "3.2.2",
-    "smartstring": "^2.0.10",
-    "source-map-support": "^0.4.1",
-    "tsn": "^1.0.5",
+    "smartstring": "^2.0.15",
+    "source-map-support": "^0.4.2",
+    "tsn": "^1.0.10",
+    "typedoc": "^0.4.4",
     "typescript": "^2.0.0-dev.20160630",
     "typings-global": "*"
   },

ts/npmts.assets.ts

@@ -8,10 +8,14 @@ export var run = function(configArg){
     let config = configArg;
     npmtsOra.text("now looking at " + "required assets".yellow);
     if(config.cli == true){
-        plugins.smartfile.fs.copy(plugins.path.join(paths.npmtsAssetsDir,"cli.js"),paths.distDir);
+        plugins.smartfile.fs.copySync(
+            plugins.path.join(paths.npmtsAssetsDir,"cli.js"),
+            plugins.path.join(paths.distDir,"cli.js")
+        );
         plugins.beautylog.ok("installed CLI assets!");
         done.resolve(config);
     } else {
+        plugins.beautylog.ok("No additional assets required!")
         done.resolve(config);
     }
     return done.promise;

ts/npmts.check.ts

@@ -0,0 +1,117 @@
+import * as plugins from "./npmts.plugins";
+import * as paths from "./npmts.paths";
+import { npmtsOra } from "./npmts.promisechain";
+
+let checkProjectTypings = (configArg) => {
+    let done = plugins.Q.defer();
+    let cwdProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.cwd);
+    if(typeof cwdProjectInfo.packageJson.typings == "undefined"){
+        plugins.beautylog.error(`please add typings field to package.json`);
+        process.exit(1);
+    };
+    done.resolve(configArg);
+    return done.promise;
+};
+
+const depcheckOptions = {
+    ignoreBinPackage: false, // ignore the packages with bin entry
+    parsers: { // the target parsers
+        '*.ts': plugins.depcheck.parser.typescript,
+    },
+    detectors: [ // the target detectors
+        plugins.depcheck.detector.requireCallExpression,
+        plugins.depcheck.detector.importDeclaration
+    ],
+    specials: [ // the target special parsers
+        plugins.depcheck.special.eslint,
+        plugins.depcheck.special.webpack
+    ],
+};
+
+let checkDependencies = (configArg) => {
+    let done = plugins.Q.defer();
+    let depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+        ignoreDirs: [ // folder with these names will be ignored
+            'test',
+            'dist',
+            'bower_components'
+        ],
+        ignoreMatches: [ // ignore dependencies that matches these globs
+            "@types/*",
+            "babel-preset-*"
+        ]
+    })
+    plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
+        for (let item of unused.dependencies) {
+            plugins.beautylog.warn(`Watch out: unused dependency ${item.red}`);
+        };
+        for (let item of 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) {
+            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
+        };
+        for (let item of 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 depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+        ignoreDirs: [ // folder with these names will be ignored
+            'ts',
+            'dist',
+            'bower_components'
+        ],
+        ignoreMatches: [ // ignore dependencies that matches these globs
+            "@types/*",
+            "babel-preset-*"
+        ]
+    })
+    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) {
+            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) {
+            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
+        };
+        for (let item of unused.invalidDirs) {
+            plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`);
+        };
+        done.resolve(configArg);
+    });
+    return done.promise;
+};
+
+let checkNodeVersion = (configArg) => {
+    let done = plugins.Q.defer();
+
+    done.resolve(configArg);
+    return done.promise;
+}
+
+export let run = (configArg) => {
+    let done = plugins.Q.defer();
+    npmtsOra.text("running project checks..."),
+        checkProjectTypings(configArg)
+            .then(checkDependencies)
+            .then(checkDevDependencies)
+            .then(checkNodeVersion)
+            .then(done.resolve);
+    return done.promise;
+}

ts/npmts.cli.ts

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

ts/npmts.compile.ts

@@ -8,17 +8,23 @@ let promiseArray = [];
 let compileTs = (tsFileArrayArg:string[],tsOptionsArg = {}) => {
     let done = plugins.Q.defer();
 
-    let tsOptionsDefault = {
+    let compilerOptionsDefault = {
         declaration: true,
-        target: "ES5",
-        module: "commonjs"
+        module: "CommonJS",
+        target: "ES6"
     };
     
     /**
      * merges default ts options with those found in npmts.json
      */
-    let tsOptions = function (keyArg:string) {
-        return plugins.lodashObject.assign(tsOptionsDefault, tsOptionsArg)
+    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]
+        };
+        return compilerOptions;
     };
     for (let keyArg in tsFileArrayArg) {
         plugins.beautylog.info(`TypeScript assignment: transpile from ${keyArg.blue} to ${tsFileArrayArg[keyArg].blue}`);
@@ -29,7 +35,8 @@ let compileTs = (tsFileArrayArg:string[],tsOptionsArg = {}) => {
                     let destDir = plugins.smartpath.transform.toAbsolute(tsFileArrayArg[keyArg],process.cwd());
                     let filesCompiledPromise = plugins.tsn.compile(
                         filesToConvertAbsolute,
-                        destDir
+                        destDir,
+                        compilerOptions(keyArg)
                     );
                     promiseArray.push(filesCompiledPromise);
                 });

ts/npmts.configfile.ts

@@ -1,33 +1,36 @@
 import "typings-global";
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
+import {npmtsOra} from "./npmts.promisechain";
 export var run = function(argvArg){
-    var done = plugins.Q.defer();
-    var config:any = {};
-    var configPath = plugins.path.join(paths.cwd,"npmts.json");
-    if(argvArg.notest){
-        config.notest = true;
-    }
-    if(plugins.smartfile.fs.fileExistsSync(configPath)){
-        plugins.beautylog.info("npmts.json".blue + " config file found!");
-        config = plugins.lodashObject.assign(
-            config,
-            plugins.smartfile.fs.toObjectSync(configPath)
-        );
-        switch (config.mode){
-            case "default":
-            case "custom":
-                plugins.beautylog.ok("mode is " + config.mode.yellow);
-                done.resolve(config);
-                break;
-            default:
-                plugins.beautylog.error("mode " + config.mode.yellow + " not recognised!".red);
-                process.exit(1);
-        };
-    } else {
-        plugins.beautylog.log("no config file found: so mode is " + "default".yellow);
-        config.mode = "default";
-        done.resolve(config);
+    let done = plugins.Q.defer();
+    npmtsOra.text("looking for npmextra.json");
+    let defaultConfig = {
+        mode: "default",
+        notest:false,
+        nodocs:false
     };
+    if(argvArg.notest){
+        defaultConfig.notest = true;
+    };
+    if(argvArg.nodocs){
+        defaultConfig.nodocs = true;
+    };
+    let config = plugins.npmextra.dataFor({
+        toolName:"npmts",
+        defaultSettings:defaultConfig,
+        cwd:paths.cwd
+    });
+    switch (config.mode){
+        case "default":
+        case "custom":
+            plugins.beautylog.ok("mode is " + config.mode.yellow);
+            done.resolve(config);
+            break;
+        default:
+            plugins.beautylog.error("mode " + config.mode.yellow + " not recognised!".red);
+            process.exit(1);
+    };
+    done.resolve(config);
     return done.promise;
 };

ts/npmts.jsdoc.ts

@@ -1,30 +0,0 @@
-import "typings-global";
-import plugins = require("./npmts.plugins");
-import paths = require("./npmts.paths");
-import {npmtsOra} from "./npmts.promisechain";
-
-let genJsdoc = function(configArg){
-    let done = plugins.Q.defer();
-    npmtsOra.text("now generating " + "JsDoc documentation".yellow);
-    plugins.gulp.src([
-            plugins.path.join(paths.cwd,"README.md"),
-            plugins.path.join(paths.distDir,"**/*.js")
-        ])
-        .pipe(plugins.g.jsdoc3({
-            opts: {
-                destination: paths.docsDir
-            }
-        }, function(){
-            plugins.beautylog.ok("JsDoc documentation has been generated!");
-            done.resolve(configArg)
-        }));
-    return done.promise;
-};
-
-
-export let run = function(configArg){
-    let done = plugins.Q.defer();
-    genJsdoc(configArg)
-        .then(done.resolve);
-    return done.promise;
-};

ts/npmts.options.ts

@@ -2,10 +2,6 @@ import "typings-global";
 import plugins = require("./npmts.plugins");
 import {npmtsOra} from "./npmts.promisechain";
 
-export let isCi = function(){
-    return plugins.smartci.check.isCi();
-};
-
 export var run = function(configArg){
     var done = plugins.Q.defer();
     var config = configArg;

ts/npmts.plugins.ts

@@ -1,23 +1,24 @@
 import "typings-global";
 export import beautylog = require("beautylog");
-export let gulp = require("gulp");
+export let depcheck = require("depcheck");
+export import gulp = require("gulp");
 export let g = {
-    gFunction: require("gulp-function"),
+    babel: require("gulp-babel"),
     istanbul: require("gulp-istanbul"),
-    jsdoc3: require("gulp-jsdoc3"),
+    gFunction: require("gulp-function"),
+    injectModules: require("gulp-inject-modules"),
     mocha: require("gulp-mocha"),
-    replace: require("gulp-replace"),
-    sourcemaps: require("gulp-sourcemaps")
+    sourcemaps: require("gulp-sourcemaps"),
+    typedoc: require("gulp-typedoc")
 };
-export let lodashObject = require('lodash/fp/object');
-export let merge2 = require("merge2");
+export import lodashObject = require('lodash');
+export import npmextra = require("npmextra");
 export import projectinfo = require("projectinfo");
 export import path = require("path");
 export import Q = require("q");
 export import shelljs = require("shelljs");
-export let smartci = require("smartci");
 export import smartcli = require("smartcli");
-export let smartcov = require("smartcov");
+export import smartcov = require("smartcov");
 export import smartenv = require("smartenv");
 export import smartfile = require("smartfile");
 export import smartpath = require("smartpath");

ts/npmts.promisechain.ts

@@ -5,10 +5,11 @@ import {Ora} from "beautylog"
 export let npmtsOra = new plugins.beautylog.Ora("setting up TaskChain","cyan");
 
 import NpmtsAssets = require("./npmts.assets");
+import NpmtsCheck = require("./npmts.check");
 import NpmtsClean = require("./npmts.clean");
 import NpmtsCompile = require("./npmts.compile");
 import NpmtsConfigFile = require("./npmts.configfile");
-import NpmtsJsdoc = require("./npmts.jsdoc");
+import NpmtsTypeDoc = require("./npmts.typedoc");
 import NpmtsOptions = require("./npmts.options");
 import NpmtsTests = require("./npmts.tests");
 
@@ -18,9 +19,10 @@ export let promisechain = function(argvArg){
     NpmtsConfigFile.run(argvArg)
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)
+        .then(NpmtsCheck.run)
         .then(NpmtsCompile.run)
         .then(NpmtsAssets.run)
-        .then(NpmtsJsdoc.run)
+        .then(NpmtsTypeDoc.run)
         .then(NpmtsTests.run)
         .then(function(configArg){
             let shipString = "" +

ts/npmts.tests.ts

@@ -7,51 +7,53 @@ import {npmtsOra} from "./npmts.promisechain";
  *
  * @returns {*}
  */
-let istanbul = function (configArg) {
-    npmtsOra.text("Instrumentalizing transpiled JS...");
+let mocha = function (configArg) {
+    npmtsOra.text("Instrumentalizing and testing transpiled JS");
+    npmtsOra.end(); // end npmtsOra for tests.
     let done = plugins.Q.defer();
     var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"dist/*.js")])
         .pipe(plugins.g.sourcemaps.init())
-        .pipe(plugins.g.istanbul()) // Covering files
+        .pipe(plugins.g.babel({
+            presets: [
+                require.resolve("babel-preset-es2015")
+            ]
+        }))
+        .pipe(plugins.g.istanbul({
+        }))
         .pipe(plugins.g.sourcemaps.write())
-        .pipe(plugins.g.istanbul.hookRequire()) // Force `require` to return covered files
-        .pipe(plugins.g.gFunction(function(){
-            plugins.beautylog.ok("JS has been instrumentalized to get test code coverage!");
-            done.resolve(configArg);
-        },"atEnd"));
-    return done.promise;
-};
-
-/**
- *
- * @returns {*}
- */
-let mocha = function (configArg) {
-    let done = plugins.Q.defer();
-    npmtsOra.end(); // end npmtsOra for tests.
-    let stream = plugins.gulp.src(["./test/test.js"])
-        .pipe(plugins.g.mocha())
-        .pipe(plugins.g.istanbul.writeReports()) // Creating the reports after tests ran
-        .pipe(plugins.g.gFunction(function(){
-            plugins.beautylog.ok("Tests have passed!");
-            done.resolve(configArg);
-        },"atEnd"));
+        .pipe(plugins.g.injectModules())
+        .on("finish",function(){
+            plugins.gulp.src([plugins.path.join(paths.cwd,"test/test.js")])
+            .pipe(plugins.g.babel({
+                presets: [
+                    require.resolve("babel-preset-es2015")
+                ]
+            }))
+            .pipe(plugins.g.injectModules())
+            .pipe(plugins.g.mocha())
+            .pipe(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!");
+                done.resolve(configArg);
+            },"atEnd"));
+        });
     return done.promise;
 };
 
 let coverage = function(configArg){
     let done = plugins.Q.defer();
-    plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir,"lcov.info"))
+    plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir,"lcov.info"),2)
         .then(function(percentageArg){
             if (percentageArg >= configArg.coverageTreshold){
                 plugins.beautylog.ok(
-                    "your coverage of " + percentageArg.toString().blue + "% ".blue + "exceeds your treshold of " +
-                    configArg.coverageTreshold.toString().blue + "%".blue
+                    `${percentageArg.toString()}% coverage exceeds your treshold of ${configArg.coverageTreshold.toString()}%`
                 );
             } else {
                 plugins.beautylog.warn(
-                    "your coverage of " + percentageArg + "% " + "fails your treshold of " +
-                    configArg.coverageTreshold + "%"
+                    `${percentageArg.toString()}% coverage fails your treshold of ${configArg.coverageTreshold.toString()}%`
                 );
                 plugins.beautylog.error("exiting due to coverage failure");
                 process.exit(1);
@@ -72,8 +74,7 @@ export let run = function(configArg) {
             "--------------------------------------------------------------"
         );
 
-        istanbul(config)
-            .then(mocha)
+        mocha(config)
             .then(coverage)
             .then(() => {
                 done.resolve(config);

ts/npmts.typedoc.ts

@@ -0,0 +1,44 @@
+import "typings-global";
+import plugins = require("./npmts.plugins");
+import paths = require("./npmts.paths");
+import { npmtsOra } from "./npmts.promisechain";
+
+let genTypeDoc = function (configArg) {
+    let done = plugins.Q.defer();
+    npmtsOra.text("now generating " + "TypeDoc documentation".yellow);
+    plugins.beautylog.log("TypeDoc Output:");
+    plugins.gulp.src(plugins.path.join(paths.tsDir, "**/*.ts"))
+        .pipe(plugins.g.typedoc({
+            // TypeScript options (see typescript docs) 
+            module: "commonjs",
+            target: "es6",
+            includeDeclarations: true,
+
+            // Output options (see typedoc docs) 
+            out: paths.docsDir,
+            json: plugins.path.join(paths.docsDir, "file.json"),
+
+            // TypeDoc options (see typedoc docs) 
+            name: "my-project",
+
+            //theme: "default",
+            ignoreCompilerErrors: true,
+            version: true,
+        }))
+        .pipe(plugins.g.gFunction(done.resolve, "atEnd"));
+    return done.promise;
+};
+
+
+export let run = function (configArg) {
+    let done = plugins.Q.defer();
+    if (configArg.nodocs) {
+        done.resolve(configArg);
+    } else {
+        genTypeDoc(configArg)
+            .then(() => {
+                done.resolve(configArg);
+            });
+    };
+    return done.promise;
+};