5.1.4

README-dev.md

@@ -1 +0,0 @@
-# README-dev

README.md

@@ -6,9 +6,14 @@ Write npm modules with TypeScript without hassle.
 [![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)
-[![Coverage Status](https://coveralls.io/repos/github/pushrocks/npmts/badge.svg?branch=master)](https://coveralls.io/github/pushrocks/npmts?branch=master)
+[![codecov.io](https://codecov.io/github/pushrocks/npmts/coverage.svg?branch=master)](https://codecov.io/github/pushrocks/npmts?branch=master)
 
-## How to use npmts
+## 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/)
 
 ### Install
 First install npmts as dev dependency:
@@ -25,22 +30,65 @@ Then use it in package.json's script section to trigger a build:
 }
 ```
 
-### Default behaviour
+### Default task execution order
-
-**Execution order of tasks**
 
+1. Check config in ./npmts.json
+1. Clean up from any previous builds (old js files)
 1. Install typings
-2. Transpile TypeScript with inline sourcemaps
+1. Transpile TypeScript with inline sourcemaps
-3. Create Declaration Files
+1. Create Declaration Files
-4. Instrumentalize created JavaScript files with istanbul
+1. Create JsDoc Documentation
-5. Run Tests
+1. Instrumentalize created JavaScript files with istanbul
-6. Create Coverage report
+1. Run Tests
-7. Upload Coverage reports to travis (must be activated, only triggers on travis)
+1. Create Coverage report
+1. Upload Coverage reports to codecov.io (Tests must pass, codecov.io must be activated, by default only triggers on travis)
+1. Upload JsDoc Documentation to gh-pages branch on GitHub. (Tests must pass, requires GitHub Token)
 
+#### npmts.json
+the npmts.json is the main config file. You can use it to customize the behaviour of NPMTS.
+
+```json
+{
+  "mode":"default",
+  "codecov":true,
+  "ts":{
+    "./customdir/*.ts":"./"
+  },
+  "docs": {
+    "publish":true,
+    "destination":"github"
+  },
+  "tsOptions":{
+    "declaration":false,
+    "target":"ES6"
+  },
+  "typings":[
+    "./ts/typings.json",
+    "./subts1/typings.json",
+    "./subts2/typings.json",
+    "./customdir/typings.json"
+  ],
+  "typingsInclude":"auto",
+  "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 |
+| `"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. |
 
 #### Typings
 **npmts** looks for `./ts/typings.json` by default and installs any defined typings to `.ts/typings/`.
-You can then reference the ./ts/typings/main.d.ts file in your TypeScript code.
+
+> Note: You can reference the typings files in any of your TypeScript code with a  
+`/// <reference path="/some/path/main.d.ts">`  
+We are currently working on a "typingsInclude" option, that will autoload any typings during compilation.
+tsconfig is NOT supported, since it would render this module useless
 
 #### TypeScript
 by default npmts looks for `./ts/*.ts` and `./test/test.ts` that will compile to
@@ -49,49 +97,37 @@ by default npmts looks for `./ts/*.ts` and `./test/test.ts` that will compile to
 Use commonjs module system for wiring up files.
 
 #### Declaration files
-**npmts** also creates an `index.d.ts` declaration file by default.
+**npmts** also creates an `./dist/index.d.ts` declaration file by default.
-You can reference it in your package.json like this:
+You can reference it in your package.json like this.
 
 ```json
-"main": "index.js",
+"main": "dist/index.js",
-"typings": "./index.d.ts",
+"typings": ".dist/index.d.ts",
 ```
 
+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.
+
+> Note: If you don't want declaration files, set tsOptions.declaration to false in npmts.json
+
 #### Instrumentalize Code
-npmts instrumentalizes the created JavaScript code to create a coverage report.
+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 runs `.test/test.js` with mocha. 
+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.
+Any errors will be shown with reference to their originating source in TypeScript
+thanks to autogenerated source maps.
 
-When requiring the module from other TypeScript files,
+## Example Usage in modules:
-the TypeScript Compiler will use the declaration file to resolve typings.
+* [gulp-typings](https://www.npmjs.com/package/gulp-typings)
+* [gulp-browser](https://www.npmjs.com/package/gulp-typings)
 
+> We will add more options over time.
 
+## About the authors:
+[![Project Phase](https://mediaserve.lossless.digital/lossless.com/img/createdby_github.svg)](https://lossless.com/)
 
-### Custom behaviour
+[![PayPal](https://img.shields.io/badge/Support%20us-PayPal-blue.svg)](https://paypal.me/lossless)
-Custom behaviour can be achieved through a config file at the root of your package.
-The file must be named **npmts.json**
-
-```json
-{
-  "mode":"custom",
-  "ts":{
-    "./customdir/custom.ts":"./customcompiled.js"
-  },
-  "typings":[
-    "./customdir"
-  ]
-}
-```
-
-* **mode** can be "default" or "custom"
-* **ts** You can list as many TypeScript files as you like. The key represents the source TypeScript file, the value the output file.
-* **typings** is an array of all direcories that have a typings.json present. Uses the new typings tool from npm.
-
-
-## Readme for Devs
-There is a [README-dev.md](README-dev.md) in the repo.
-This is only of interest for you when looking to contribute to, improve or build upon this package.

dist/npmts.clean.js

@@ -3,10 +3,11 @@
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
 exports.run = function (configArg) {
-    plugins.beautylog.log("now cleaning up from previous builds");
+    plugins.beautylog.log("now cleaning up from previous builds...");
     var done = plugins.Q.defer();
     plugins.smartfile.fsaction.remove(paths.distDir)
         .then(function () {
+        plugins.beautylog.ok("Cleaned up!");
         done.resolve(configArg);
     });
     return done.promise;

dist/npmts.compile.helpers.js

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

dist/npmts.compile.js

@@ -2,6 +2,35 @@
 /// <reference path="./typings/main.d.ts" />
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
+var helpers = require("./npmts.compile.helpers");
+/**
+ * handles definition to make them fit for modular use
+ */
+var definitionHandler = function (configArg) {
+    plugins.beautylog.log("now making declaration files ready");
+    var done = plugins.Q.defer();
+    var configTsLenght = Object.keys(configArg.ts).length;
+    if (configTsLenght == 0) {
+        plugins.beautylog.warn("No declaration files found... Are you sure you don't want them?");
+        done.resolve(configArg); //if there are no definition files, resolve...
+    }
+    var localCounter = 0;
+    for (var key in configArg.ts) {
+        var distPath = configArg.ts[key];
+        var stream = plugins.gulp.src(plugins.path.join(distPath, "**/*.d.ts"))
+            .pipe(plugins.g.replace(plugins.smartstring.typescript.regexReferencePath, ""))
+            .pipe(plugins.gulp.dest(distPath))
+            .pipe(plugins.g.gFunction(function () {
+            localCounter++;
+            if (localCounter == configTsLenght) {
+                plugins.beautylog.ok("declaration files ready!!!");
+                done.resolve(configArg);
+            }
+            ;
+        }, "atEnd"));
+    }
+    return done.promise;
+};
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
@@ -10,53 +39,40 @@ exports.run = function (configArg) {
     /* -------------------------------------------------
      * ----------- compile TypeScript --------------------------
      * ----------------------------------------------- */
-    for (var key in config.ts) {
+    var tsOptionsDefault = {
-        var outputPathIsDir;
+        declaration: true,
-        try {
-            if (plugins.fs.statSync(plugins.path.join(paths.cwd, config.ts[key])).isDirectory()) {
-                outputPathIsDir = true;
-            }
-        }
-        catch (err) {
-            outputPathIsDir = false;
-        }
-        //do some evaluation of the environment
-        var outputNameSpecified = (!outputPathIsDir
-            && (plugins.path.extname(config.ts[key]) == ".js"));
-        var outputName = (function () {
-            if (outputNameSpecified) {
-                return plugins.path.basename(config.ts[key]);
-            }
-            else {
-                return undefined;
-            }
-        })();
-        var outputDir = (function () {
-            if (outputNameSpecified) {
-                return plugins.path.dirname(plugins.path.join(paths.cwd, config.ts[key]));
-            }
-            else {
-                return plugins.path.join(paths.cwd, config.ts[key]);
-            }
-        })();
-        var stream = plugins.gulp.src([plugins.path.join(paths.cwd, key), "!**/typings/**"])
-            .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
-            .pipe(plugins.g.typescript({
-            out: outputName,
         target: "ES5",
         module: "commonjs"
-        }))
+    };
+    /**
+     * merges default ts options with those found in npmts.json
+     */
+    var tsOptions = function (keyArg) {
+        return plugins.lodashObject.assign(tsOptionsDefault, config.tsOptions);
+    };
+    for (var keyArg in config.ts) {
+        if (helpers.checkOutputPath(config, keyArg)) {
+            var tsStream = plugins.gulp.src([plugins.path.join(paths.cwd, keyArg), "!**/typings/**"])
+                .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
+                .pipe(plugins.g.typescript(tsOptions(keyArg)));
+            var jsStream = tsStream.js
                 .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
-            .pipe(plugins.gulp.dest(outputDir));
+                .pipe(plugins.gulp.dest(config.ts[keyArg]));
-        moduleStream.add(stream);
+            var declarationStream = tsStream.dts
+                .pipe(plugins.gulp.dest(config.ts[keyArg]));
+            moduleStream.add(tsStream, jsStream, declarationStream);
+        }
     }
     moduleStream.on("queueDrain", function () {
-        plugins.beautylog.ok("TypeScript has been compiled!");
         moduleStream.on("finish", function () {
+            plugins.beautylog.ok("TypeScript has been compiled!");
+            definitionHandler(config)
+                .then(function () {
                 done.resolve(config);
             });
+        });
         moduleStream.end();
     });
-    /*==================== END TYPESCRIPT =====================*/
+    /*==================== END TS Compilation =====================*/
     return done.promise;
 };

dist/npmts.configfile.js

@@ -12,7 +12,7 @@ exports.run = function () {
         switch (config.mode) {
             case "default":
             case "custom":
-                plugins.beautylog.log("mode is " + config.mode.yellow);
+                plugins.beautylog.ok("mode is " + config.mode.yellow);
                 done.resolve(config);
                 break;
             default:

dist/npmts.options.js

@@ -1,6 +1,9 @@
 "use strict";
 /// <reference path="./typings/main.d.ts" />
 var plugins = require("./npmts.plugins");
+exports.isCi = function () {
+    return plugins.smartci.check.isCi();
+};
 exports.isRelease = function () {
     return plugins.smartci.check.isCi()
         && plugins.smartci.check.isTaggedCommit();
@@ -12,7 +15,7 @@ exports.doPublish = function () {
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
-    plugins.beautylog.log("now determining build options");
+    plugins.beautylog.log("now determining build options...");
     //handle default mode
     if (config.mode == "default") {
         config.typings = [
@@ -25,18 +28,22 @@ exports.run = function (configArg) {
         );
         config.test = ["./index.js"];
     }
+    //check if config.tsOptions is available
+    config.tsOptions ? void (0) : config.tsOptions = {};
     // handle state of current build
     exports.isRelease() ? plugins.beautylog.info("All right: This is a RELEASE build!")
         : plugins.beautylog.info("NOT A RELEASE build!");
-    exports.isRelease() && exports.doPublish() ? plugins.beautylog.info("All right: This is the first subBuild, so this one publishes coverage and docs when tests succeed!")
+    exports.isRelease() && exports.doPublish() ? plugins.beautylog.info("All right: This is the first subBuild, so this one publishes COVERAGE + DOCS when tests succeed!")
         : plugins.beautylog.info("We are not publishing anything!");
     // handle coveralls
-    config.coveralls ? void (0) : config.coveralls = false;
+    config.codecov ? void (0) : config.codecov = true;
-    exports.doPublish() ? void (0) : config.coveralls = false;
+    exports.isCi() ? void (0) : config.codecov = false;
+    config.coverageTreshold ? void (0) : config.coverageTreshold = 70;
     // handle docs
     config.docs ? void (0) : config.docs = {};
     config.docs.publish ? void (0) : config.docs.publish = false;
     exports.doPublish() ? void (0) : config.docs.publish = false;
+    plugins.beautylog.ok("build options are ready!");
     done.resolve(config);
     return done.promise;
     var _a;

dist/npmts.paths.js

@@ -8,6 +8,7 @@ paths.tsDir = plugins.path.join(paths.cwd, "ts/");
 paths.distDir = plugins.path.join(paths.cwd, "dist/");
 paths.docsDir = plugins.path.join(paths.cwd, "docs/");
 paths.testDir = plugins.path.join(paths.cwd, "test/");
+paths.coverageDir = plugins.path.join(paths.cwd, "coverage/");
 paths.npmtsAssetsDir = plugins.path.join(__dirname, "../assets/");
 //Files
 paths.indexTS = plugins.path.join(paths.cwd, "ts/index.ts");

dist/npmts.plugins.js

@@ -4,23 +4,27 @@ exports.beautylog = require("beautylog");
 exports.fs = require("fs-extra");
 exports.gulp = require("gulp");
 exports.g = {
-    coveralls: require("gulp-coveralls"),
+    codecov: require("gulp-codecov"),
     gFunction: require("gulp-function"),
     istanbul: require("gulp-istanbul"),
     jsdoc3: require("gulp-jsdoc3"),
     mocha: require("gulp-mocha"),
+    replace: require("gulp-replace"),
     sourcemaps: require("gulp-sourcemaps"),
     typescript: require("gulp-typescript"),
     typings: require("gulp-typings")
 };
+exports.lodashObject = require('lodash/fp/object');
 exports.merge2 = require("merge2");
 exports.projectinfo = require("projectinfo");
-exports.sourceMapSupport = require("source-map-support").install();
 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");
 exports.smartfile = require("smartfile");
 exports.smartpath = require("smartpath");
+exports.smartstring = require("smartstring");
+exports.sourceMapSupport = require("source-map-support").install(); // this is required to display errors correctly during testing

dist/npmts.publish.js

@@ -7,7 +7,7 @@ exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
     var promiseArray = [];
-    config.coveralls ? promiseArray.push(NpmtsTests.publishCoverage(configArg)) : void (0);
+    config.codecov ? promiseArray.push(NpmtsTests.publishCoverage(configArg)) : void (0);
     config.docs.publish ? promiseArray.push(NpmtsJsdoc.publishDocs(configArg)) : void (0);
     promiseArray.length === 0 ? plugins.beautylog.info("Did not publish anything!") : void (0);
     plugins.Q.all(promiseArray).then(done.resolve);

dist/npmts.tests.js

@@ -4,40 +4,74 @@ var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
 exports.publishCoverage = function (configArg) {
     var done = plugins.Q.defer();
-    plugins.beautylog.log("now uploading coverage data to coveralls");
+    plugins.beautylog.log("now uploading coverage data to codecov.io");
     var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "./coverage/lcov.info")])
-        .pipe(plugins.g.coveralls())
+        .pipe(plugins.g.codecov())
         .pipe(plugins.g.gFunction(function () {
-        plugins.beautylog.ok("Coverage data has been uploaded to Coveralls!");
+        plugins.beautylog.ok("Coverage data has been uploaded to codecov.io!");
         done.resolve(configArg);
     }, "atEnd"));
     return done.promise;
 };
+/**
+ *
+ * @returns {*}
+ */
+var istanbul = function (configArg) {
+    var done = plugins.Q.defer();
+    var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "dist/*.js")])
+        .pipe(plugins.g.istanbul()) // Covering files
+        .pipe(plugins.g.istanbul.hookRequire()) // Force `require` to return covered files
+        .pipe(plugins.g.gFunction(function () {
+        done.resolve(configArg);
+    }, "atEnd"));
+    return done.promise;
+};
+/**
+ *
+ * @returns {*}
+ */
+var mocha = function (configArg) {
+    var done = plugins.Q.defer();
+    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"));
+    return done.promise;
+};
+var coverage = function (configArg) {
+    var done = plugins.Q.defer();
+    plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, "lcov.info"))
+        .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);
+        }
+        else {
+            plugins.beautylog.warn("your coverage of " + percentageArg + "% " + "fails your treshold of " +
+                configArg.coverageTreshold + "%");
+            plugins.beautylog.error("exiting due to coverage failure");
+            process.exit(1);
+        }
+        done.resolve(configArg);
+    });
+    return done.promise;
+};
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
-    var istanbul = function () {
-        var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "dist/*.js")])
-            .pipe(plugins.g.istanbul())
-            .pipe(plugins.g.istanbul.hookRequire());
-        return stream;
-    };
-    var mocha = function () {
-        var stream = plugins.gulp.src(["./test/test.js"])
-            .pipe(plugins.g.mocha())
-            .pipe(plugins.g.istanbul.writeReports())
-            .pipe(plugins.g.istanbul.enforceThresholds({ thresholds: { global: 30 } }));
-        return stream;
-    };
     plugins.beautylog.log("now starting tests");
-    console.log("--------------------------------------------------\n" +
+    console.log("--------------------------------------------------------------\n" +
-        "*******************  TESTS: **********************\n" +
+        "***************************" +
-        "--------------------------------------------------");
+        " TESTS: ".blue +
-    istanbul().on("finish", function () {
+        "***************************\n" +
-        mocha().on("finish", function () {
+        "--------------------------------------------------------------");
-            plugins.beautylog.ok("Tests have passed!");
+    istanbul(config)
-            done.resolve(config);
+        .then(mocha)
-        });
+        .then(coverage)
-    });
+        .then(done.resolve);
     return done.promise;
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "3.6.7",
+  "version": "5.1.4",
   "description": "write npm modules with TypeScript",
   "main": "dist/index.js",
   "bin": {
@@ -25,28 +25,32 @@
   },
   "homepage": "https://github.com/pushrocks/npmts#readme",
   "dependencies": {
-    "beautylog": "3.1.2",
+    "beautylog": "4.1.2",
-    "fs-extra": "^0.26.7",
+    "fs-extra": "^0.30.0",
     "gulp": "3.9.1",
+    "gulp-codecov": "^2.0.1",
     "gulp-concat": "^2.6.0",
-    "gulp-coveralls": "^0.1.4",
+    "gulp-function": "^1.3.1",
-    "gulp-function": "^1.1.1",
     "gulp-if": "^2.0.0",
-    "gulp-istanbul": "^0.10.3",
+    "gulp-istanbul": "^0.10.4",
     "gulp-jsdoc3": "^0.2.1",
     "gulp-mocha": "^2.2.0",
-    "gulp-sourcemaps": "^1.6.0",
+    "gulp-replace": "^0.5.4",
-    "gulp-typescript": "2.12.1",
+    "gulp-sourcemaps": "^2.0.0-alpha",
-    "gulp-typings": "1.3.0",
+    "gulp-typescript": "2.13.0",
-    "merge2": "1.0.1",
+    "gulp-typings": "1.3.5",
+    "lodash": "^4.11.1",
+    "merge2": "1.0.2",
     "projectinfo": "1.0.1",
     "q": "^1.4.1",
-    "shelljs": "^0.6.0",
+    "shelljs": "^0.7.0",
     "smartci": "0.0.1",
     "smartcli": "0.0.11",
-    "smartenv": "1.2.0",
+    "smartcov": "0.0.6",
-    "smartfile": "2.2.0",
+    "smartenv": "1.2.2",
-    "smartpath": "3.0.1",
+    "smartfile": "3.0.5",
+    "smartpath": "3.2.0",
+    "smartstring": "^1.0.2",
     "source-map-support": "^0.4.0"
   },
   "devDependencies": {}

test/assets/dist/index.d.ts

@@ -0,0 +1,3 @@
+declare let testplugin: {
+    logSomething: () => void;
+};

test/assets/dist/index.js

@@ -6,4 +6,4 @@ var testplugin = {
 };
 module.exports = testplugin;
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0QztBQUM1QyxJQUFJLFVBQVUsR0FBRztJQUNiLFlBQVksRUFBRTtRQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQztJQUMxQyxDQUFDO0NBQ0osQ0FBQztBQUNGLE1BQU0sQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxudmFyIHRlc3RwbHVnaW4gPSB7XG4gICAgbG9nU29tZXRoaW5nOiBmdW5jdGlvbigpe1xuICAgICAgICBjb25zb2xlLmxvZyhcIm9ubHkgZnVuY3Rpb24gZXhlY3V0ZWRcIik7XG4gICAgfVxufTtcbm1vZHVsZS5leHBvcnRzID0gdGVzdHBsdWdpbjsiXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0QztBQUM1QyxJQUFJLFVBQVUsR0FBRztJQUNiLFlBQVksRUFBRTtRQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQztJQUMxQyxDQUFDO0NBQ0osQ0FBQztBQUNGLE1BQU0sQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxubGV0IHRlc3RwbHVnaW4gPSB7XG4gICAgbG9nU29tZXRoaW5nOiBmdW5jdGlvbigpe1xuICAgICAgICBjb25zb2xlLmxvZyhcIm9ubHkgZnVuY3Rpb24gZXhlY3V0ZWRcIik7XG4gICAgfVxufTtcbm1vZHVsZS5leHBvcnRzID0gdGVzdHBsdWdpbjsiXX0=

test/assets/npmts.json

@@ -3,13 +3,16 @@
   "ts":{
     "./customdir/*.ts":"./"
   },
+  "tsOptions":{
+    "target":"ES5"
+  },
   "typings":[
     "./ts/typings.json",
     "./subts1/typings.json",
     "./subts2/typings.json",
     "./customdir/typings.json"
   ],
-  "coveralls":true,
+  "codecov":true,
   "docs": {
     "publish":true
   },

test/assets/test/test.d.ts

@@ -1,2 +1 @@
-/// <reference path="../ts/typings/main.d.ts" />
 declare var testplugin: any;

test/assets/test/test.js

@@ -8,4 +8,4 @@ describe("testplugins", function () {
     });
 });
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsZ0RBQWdEO0FBQ2hELElBQUksVUFBVSxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0FBQzdDLFFBQVEsQ0FBQyxhQUFhLEVBQUM7SUFDbkIsUUFBUSxDQUFDLGVBQWUsRUFBQztRQUNyQixFQUFFLENBQUMsc0JBQXNCLEVBQUM7WUFDdEIsVUFBVSxDQUFDLFlBQVksRUFBRSxDQUFBO1FBQzdCLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4uL3RzL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cbnZhciB0ZXN0cGx1Z2luID0gcmVxdWlyZShcIi4uL2Rpc3QvaW5kZXguanNcIik7XG5kZXNjcmliZShcInRlc3RwbHVnaW5zXCIsZnVuY3Rpb24oKXtcbiAgICBkZXNjcmliZShcIi5sb2dTb21ldGhpbmdcIixmdW5jdGlvbigpe1xuICAgICAgICBpdChcInNob3VsZCBsb2cgc29tZXRoaW5nXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgICAgIHRlc3RwbHVnaW4ubG9nU29tZXRoaW5nKClcbiAgICAgICAgfSk7XG4gICAgfSk7XG59KTsiXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsZ0RBQWdEO0FBQ2hELElBQUksVUFBVSxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0FBQzdDLFFBQVEsQ0FBQyxhQUFhLEVBQUM7SUFDbkIsUUFBUSxDQUFDLGVBQWUsRUFBQztRQUNyQixFQUFFLENBQUMsc0JBQXNCLEVBQUM7WUFDdEIsVUFBVSxDQUFDLFlBQVksRUFBRSxDQUFBO1FBQzdCLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4uL3RzL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cbnZhciB0ZXN0cGx1Z2luID0gcmVxdWlyZShcIi4uL2Rpc3QvaW5kZXguanNcIik7XG5kZXNjcmliZShcInRlc3RwbHVnaW5zXCIsZnVuY3Rpb24oKXtcbiAgICBkZXNjcmliZShcIi5sb2dTb21ldGhpbmdcIixmdW5jdGlvbigpe1xuICAgICAgICBpdChcInNob3VsZCBsb2cgc29tZXRoaW5nXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgICAgIHRlc3RwbHVnaW4ubG9nU29tZXRoaW5nKClcbiAgICAgICAgfSk7XG4gICAgfSk7XG59KTsiXX0=

test/assets/ts/index.ts

@@ -1,5 +1,5 @@
 /// <reference path="./typings/main.d.ts" />
-var testplugin = {
+let testplugin = {
     logSomething: function(){
         console.log("only function executed");
     }

ts/npmts.clean.ts

@@ -3,10 +3,11 @@ import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
 
 export let run = function(configArg){
-    plugins.beautylog.log("now cleaning up from previous builds");
+    plugins.beautylog.log("now cleaning up from previous builds...");
     let done = plugins.Q.defer();
     plugins.smartfile.fsaction.remove(paths.distDir)
         .then(function(){
+            plugins.beautylog.ok("Cleaned up!");
             done.resolve(configArg);
         });
     return done.promise;

ts/npmts.compile.helpers.ts

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

ts/npmts.compile.ts

@@ -1,67 +1,88 @@
 /// <reference path="./typings/main.d.ts" />
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
-export var run = function(configArg){
+
-    var done = plugins.Q.defer();
+import helpers = require("./npmts.compile.helpers");
-    var config = configArg;
+
+/**
+ * handles definition to make them fit for modular use
+ */
+let definitionHandler = function(configArg){
+    plugins.beautylog.log("now making declaration files ready");
+    let done = plugins.Q.defer();
+    let configTsLenght = Object.keys(configArg.ts).length;
+    if(configTsLenght == 0) {
+        plugins.beautylog.warn("No declaration files found... Are you sure you don't want them?");
+        done.resolve(configArg); //if there are no definition files, resolve...
+    }
+    let localCounter = 0;
+    for (let key in configArg.ts){
+        let distPath = configArg.ts[key];
+        let stream = plugins.gulp.src(plugins.path.join(distPath,"**/*.d.ts"))
+            .pipe(plugins.g.replace(plugins.smartstring.typescript.regexReferencePath,""))
+            .pipe(plugins.gulp.dest(distPath))
+            .pipe(plugins.g.gFunction(function(){
+                localCounter++
+                if(localCounter == configTsLenght){
+                    plugins.beautylog.ok("declaration files ready!!!");
+                    done.resolve(configArg)
+                };
+            },"atEnd"));
+        
+    }
+    return done.promise;
+}
+
+
+export let run = function (configArg) {
+    let done = plugins.Q.defer();
+    let config = configArg;
     plugins.beautylog.log("now compiling " + "TypeScript".yellow);
-    var moduleStream = plugins.merge2({end: false});
+    let moduleStream = plugins.merge2({ end: false });
 
     /* -------------------------------------------------
      * ----------- compile TypeScript --------------------------
      * ----------------------------------------------- */
-    for (var key in config.ts) {
-        var outputPathIsDir:boolean;
-        try {
-            if(plugins.fs.statSync(plugins.path.join(paths.cwd,config.ts[key])).isDirectory()){
-                outputPathIsDir = true;
-            }
-        }
-        catch(err) {
-            outputPathIsDir = false;
-        }
-        //do some evaluation of the environment
-        var outputNameSpecified:boolean = (
-            !outputPathIsDir
-            && (plugins.path.extname(config.ts[key]) == ".js")
-        );
-        var outputName = (function(){
-            if(outputNameSpecified){
-                return plugins.path.basename(config.ts[key])
-            } else {
-                return undefined
-            }
-        })();
-        var outputDir = (function(){
-            if(outputNameSpecified){
-                return plugins.path.dirname(
-                    plugins.path.join(paths.cwd,config.ts[key])
-                )
-            } else {
-                return plugins.path.join(paths.cwd,config.ts[key])
-            }
-        })();
 
-        var stream = plugins.gulp.src([plugins.path.join(paths.cwd,key),"!**/typings/**"])
+    let tsOptionsDefault = {
-            .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
+        declaration: true,
-            .pipe(plugins.g.typescript({
-                out: outputName,
         target: "ES5",
         module: "commonjs"
-            }))
+    };
+    
+    /**
+     * merges default ts options with those found in npmts.json
+     */
+    let tsOptions = function (keyArg:string) {
+        return plugins.lodashObject.assign(tsOptionsDefault, config.tsOptions)
+    };
+
+    for (let keyArg in config.ts) {
+        if (helpers.checkOutputPath(config,keyArg)) {
+            let tsStream = plugins.gulp.src([plugins.path.join(paths.cwd, keyArg), "!**/typings/**"])
+                .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
+                .pipe(plugins.g.typescript(tsOptions(keyArg)));
+            
+            let jsStream = tsStream.js
                 .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
-            //.pipe(plugins.g.header('#!/usr/bin/env node\n\n'))
+                .pipe(plugins.gulp.dest(config.ts[keyArg]));
-            .pipe(plugins.gulp.dest(outputDir));
+            let declarationStream = tsStream.dts
-        moduleStream.add(stream);
+                .pipe(plugins.gulp.dest(config.ts[keyArg])); 
+            moduleStream.add(tsStream,jsStream,declarationStream);
         }
+    }
+
     moduleStream.on("queueDrain", function () {
-        plugins.beautylog.ok("TypeScript has been compiled!");
         moduleStream.on("finish", function () {
+            plugins.beautylog.ok("TypeScript has been compiled!");
+            definitionHandler(config)
+                .then(function(){
                     done.resolve(config);
                 });
+        });
         moduleStream.end();
     });
-    /*==================== END TYPESCRIPT =====================*/
+    /*==================== END TS Compilation =====================*/
 
 
 

ts/npmts.configfile.ts

@@ -11,7 +11,7 @@ export var run = function(){
         switch (config.mode){
             case "default":
             case "custom":
-                plugins.beautylog.log("mode is " + config.mode.yellow);
+                plugins.beautylog.ok("mode is " + config.mode.yellow);
                 done.resolve(config);
                 break;
             default:

ts/npmts.options.ts

@@ -1,6 +1,10 @@
 /// <reference path="./typings/main.d.ts" />
 import plugins = require("./npmts.plugins");
 
+export let isCi = function(){
+    return plugins.smartci.check.isCi();
+};
+
 export let isRelease = function():boolean {
     return plugins.smartci.check.isCi()
         && plugins.smartci.check.isTaggedCommit();
@@ -15,7 +19,7 @@ export var run = function(configArg){
     var done = plugins.Q.defer();
     var config = configArg;
 
-    plugins.beautylog.log("now determining build options");
+    plugins.beautylog.log("now determining build options...");
 
     //handle default mode
     if (config.mode == "default"){
@@ -29,22 +33,28 @@ export var run = function(configArg){
         config.test = ["./index.js"];
     }
     
+    //check if config.tsOptions is available
+    config.tsOptions ? void(0) : config.tsOptions = {};
+
     // handle state of current build
 
     isRelease() ? plugins.beautylog.info("All right: This is a RELEASE build!")
         : plugins.beautylog.info("NOT A RELEASE build!");
-    isRelease() && doPublish() ? plugins.beautylog.info("All right: This is the first subBuild, so this one publishes coverage and docs when tests succeed!")
+    isRelease() && doPublish() ? plugins.beautylog.info("All right: This is the first subBuild, so this one publishes COVERAGE + DOCS when tests succeed!")
         : plugins.beautylog.info("We are not publishing anything!");
 
     // handle coveralls
-    config.coveralls ? void(0) : config.coveralls = false;
+    config.codecov ? void(0) : config.codecov = true;
-    doPublish() ? void(0) : config.coveralls = false;
+    isCi() ? void(0) : config.codecov = false;
+
+    config.coverageTreshold ? void(0) : config.coverageTreshold = 70;
 
     // handle docs
     config.docs ? void(0) : config.docs = {};
     config.docs.publish ? void(0) : config.docs.publish = false;
     doPublish() ? void(0) : config.docs.publish = false;
 
+    plugins.beautylog.ok("build options are ready!");
     done.resolve(config);
     return done.promise;
 };

ts/npmts.paths.ts

@@ -8,6 +8,7 @@ paths.tsDir = plugins.path.join(paths.cwd,"ts/");
 paths.distDir = plugins.path.join(paths.cwd,"dist/");
 paths.docsDir = plugins.path.join(paths.cwd,"docs/");
 paths.testDir = plugins.path.join(paths.cwd,"test/");
+paths.coverageDir = plugins.path.join(paths.cwd,"coverage/");
 
 paths.npmtsAssetsDir = plugins.path.join(__dirname,"../assets/");
 

ts/npmts.plugins.ts

@@ -3,24 +3,28 @@ export let beautylog = require("beautylog");
 export let fs = require("fs-extra");
 export let gulp = require("gulp");
 export let g = {
-    coveralls: require("gulp-coveralls"),
+    codecov: require("gulp-codecov"),
     gFunction: require("gulp-function"),
     istanbul: require("gulp-istanbul"),
     jsdoc3: require("gulp-jsdoc3"),
     mocha: require("gulp-mocha"),
+    replace: require("gulp-replace"),
     sourcemaps: require("gulp-sourcemaps"),
     typescript: require("gulp-typescript"),
     typings: require("gulp-typings")
 
 };
+export let lodashObject = require('lodash/fp/object');
 export let merge2 = require("merge2");
 export let projectinfo = require("projectinfo");
-export let sourceMapSupport = require("source-map-support").install();
 export let path = require("path");
 export let Q = require("q");
 export let shelljs = require("shelljs");
 export let smartci = require("smartci");
 export let smartcli = require("smartcli");
+export let smartcov = require("smartcov");
 export let smartenv = require("smartenv");
 export let smartfile = require("smartfile");
 export let smartpath = require("smartpath");
+export let smartstring = require("smartstring");
+export let sourceMapSupport = require("source-map-support").install(); // this is required to display errors correctly during testing

ts/npmts.publish.ts

@@ -8,9 +8,8 @@ import NpmtsJsdoc = require("./npmts.jsdoc");
 export let run = function(configArg){
     let done = plugins.Q.defer();
     let config = configArg;
-
     let promiseArray = [];
-    config.coveralls ? promiseArray.push(NpmtsTests.publishCoverage(configArg)) : void(0);
+    config.codecov ? promiseArray.push(NpmtsTests.publishCoverage(configArg)) : void(0);
     config.docs.publish ? promiseArray.push(NpmtsJsdoc.publishDocs(configArg)) : void(0);
     promiseArray.length === 0 ? plugins.beautylog.info("Did not publish anything!") : void(0);
 

ts/npmts.tests.ts

@@ -4,49 +4,85 @@ import paths = require("./npmts.paths");
 
 export let publishCoverage = function(configArg){
     let done = plugins.Q.defer();
-    plugins.beautylog.log("now uploading coverage data to coveralls");
+    plugins.beautylog.log("now uploading coverage data to codecov.io");
     var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"./coverage/lcov.info")])
-        .pipe(plugins.g.coveralls())
+        .pipe(plugins.g.codecov())
         .pipe(plugins.g.gFunction(function(){
-            plugins.beautylog.ok("Coverage data has been uploaded to Coveralls!");
+            plugins.beautylog.ok("Coverage data has been uploaded to codecov.io!");
             done.resolve(configArg);
         },"atEnd"));
     return done.promise;
 };
 
-export var run = function(configArg) {
+/**
-    var done = plugins.Q.defer();
+ *
-    var config = configArg;
+ * @returns {*}
-    var istanbul = function () {
+ */
+let istanbul = function (configArg) {
+    let done = plugins.Q.defer();
     var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"dist/*.js")])
-            // Covering files
+        .pipe(plugins.g.istanbul()) // Covering files
-            .pipe(plugins.g.istanbul())
+        .pipe(plugins.g.istanbul.hookRequire()) // Force `require` to return covered files
-            // Force `require` to return covered files
+        .pipe(plugins.g.gFunction(function(){
-            .pipe(plugins.g.istanbul.hookRequire());
+            done.resolve(configArg);
-        return stream;
+        },"atEnd"));
+    return done.promise;
 };
 
-    var mocha = function () {
+/**
-        var stream = plugins.gulp.src(["./test/test.js"])
+ *
+ * @returns {*}
+ */
+let mocha = function (configArg) {
+    let done = plugins.Q.defer();
+    let stream = plugins.gulp.src(["./test/test.js"])
         .pipe(plugins.g.mocha())
-            // Creating the reports after tests ran
+        .pipe(plugins.g.istanbul.writeReports()) // Creating the reports after tests ran
-            .pipe(plugins.g.istanbul.writeReports())
+        .pipe(plugins.g.gFunction(function(){
-            // Enforce a coverage of at least 90%
+            plugins.beautylog.ok("Tests have passed!");
-            .pipe(plugins.g.istanbul.enforceThresholds({ thresholds: { global: 30 } }));
+            done.resolve(configArg);
-        return stream;
+        },"atEnd"));
+    return done.promise;
 };
 
-    plugins.beautylog.log("now starting tests");
+let coverage = function(configArg){
-    console.log(
+    let done = plugins.Q.defer();
-        "--------------------------------------------------\n" +
+    plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir,"lcov.info"))
-        "*******************  TESTS: **********************\n" +
+        .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
                 );
-    istanbul().on("finish",function(){
+            } else {
-        mocha().on("finish",function(){
+                plugins.beautylog.warn(
-            plugins.beautylog.ok("Tests have passed!");
+                    "your coverage of " + percentageArg + "% " + "fails your treshold of " +
-            done.resolve(config);
+                    configArg.coverageTreshold + "%"
-        })
+                );
+                plugins.beautylog.error("exiting due to coverage failure");
+                process.exit(1);
+            }
+            done.resolve(configArg);
         });
     return done.promise;
 };
+
+export let run = function(configArg) {
+    let done = plugins.Q.defer();
+    let config = configArg;
+
+    plugins.beautylog.log("now starting tests");
+    console.log(
+        "--------------------------------------------------------------\n" +
+        "***************************" +
+        " TESTS: ".blue +
+        "***************************\n" +
+        "--------------------------------------------------------------"
+    );
+
+    istanbul(config)
+        .then(mocha)
+        .then(coverage)
+        .then(done.resolve);
+    return done.promise;
+};

ts/typings.json

@@ -1,7 +1,8 @@
 {
   "ambientDependencies": {
-    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777",
     "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts#09e37435ffb2c56a6f908081194a74756f24f99d",
+    "istanbul": "registry:dt/istanbul#0.4.0+20160316155526",
+    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777",
     "vinyl": "github:DefinitelyTyped/DefinitelyTyped/vinyl/vinyl.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777"
   }
 }