3.3.2

.gitignore

@@ -2,7 +2,12 @@
 .c9/
 node_modules/
 test/**/node_modules/
+test/assets/docs/
 test/**/typings/
 test/**/coverage/
 ts/*.js
-ts/*.js.map
+ts/*.js.map
+ts/typings/
+docs/
+
+.DS_Store

.npmignore

@@ -2,5 +2,6 @@
 support
 compile
 test/
+docs/
 examples
 .gitignore

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
-  - "4.2.4"
+- 4.3.1
+- stable
 deploy:
   provider: npm
   email: npm@lossless.digital
@@ -9,3 +10,6 @@ deploy:
   on:
     tags: true
     repo: pushrocks/npmts
+env:
+  global:
+    secure: kPKBMnEKoC+K5dXpl11NhuK3LSp0c0fRO60Akj3QeQBjUWnVAcF0Ht30c31y0lnJaMEzXhmUIKdR7RQnlmw5be4TYGINzY7FD3Dcv7o+HO1ZQrkpMWSu46jF6ZJer9moGjZ8e0rX8wZyB9SqsXYlwWRzqvxfOVxQfTvU3BEnJKHbhq+R5JMJ8dwLBPNTJKMWKq85KNsjo3ap0BjxdBUoRLzvrn31VOPH30BkvmLGc5YiIz5QmITll/T2wmQKYTNT2qDlEJ729B8pYa3eNlCNi89AxsLDGCmEoJAVrPsyw5g+gAyBqZ1GRULy83UJbELUq7cse3MRLMSwCAm4f0INRAuqcyiKYJ4+LHd0NwKrFQ/dQ0pvyBTbbEjNemXaakkWH7S6F03UvF+u+tiQ7C97XH0CRsseGlm36zCkAClEhtWVWA4U0Q5c6zqRAAOYOI0xquXalRKPTJe7fCYewp2eqmlp8drt8MxancyKI/ynXNoR5vGFzDTSRoPjTlaYQPmbiH4+Nd5+6Qoj94PEIqghebIPDQo3C7vWts4WGccux5b2q524UgB63hjJQA6+GQOo1q4RibouS6WScn8/tW/ZOEP+sNhDfkeiZUIjye+Q3PyzonGHefgSQ8wBbsc8LOX0cKUcEFWr14nhdQ9ZeW+hrSSF04TbM4zGJPGcKhmT2UU=

README.md

@@ -30,7 +30,7 @@ Then use it in package.json's script section to trigger a build:
 **Execution order of tasks**
 
 1. Install typings
-2. Compile TypeScript
+2. Transpile TypeScript with inline sourcemaps
 3. Create Declaration Files
 4. Instrumentalize created JavaScript files with istanbul
 5. Run Tests
@@ -43,8 +43,10 @@ Then use it in package.json's script section to trigger a build:
 You can then reference the ./ts/typings/main.d.ts file in your TypeScript code.
 
 #### TypeScript
-by default npmts looks for `./ts/index.ts` and `./ts/test.ts` that will compile to
-`./index.js` and `./test.js`
+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 `index.d.ts` declaration file by default.
@@ -62,6 +64,8 @@ npmts instrumentalizes the created JavaScript code to create a coverage report.
 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. 
 
+Any errors will be shown with reference to their originating source in TypeScript.
+
 When requiring the module from other TypeScript files,
 the TypeScript Compiler will use the declaration file to resolve typings.
 

assets/cli.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+var index = require("./index.js");

assets/node-shebang.js

@@ -0,0 +1 @@
+#!/usr/bin/env node

compile/compile.js

@@ -4,31 +4,45 @@ var plugins = {
     gulp: require("gulp"),
     g:{
         typescript: require("gulp-typescript"),
-        header: require("gulp-header")
+        typings:require("gulp-typings")
     },
-    mergeStream: require("merge2")
-
+    mergeStream: require("merge2"),
+    path: require("path")
 };
 
+paths = {
+    packageBase: plugins.path.resolve(
+        plugins.path.join(__dirname,"../")
+    )
+};
 
 plugins.beautylog.log('now compiling NPMTS');
 
-plugins.gulp.task('indexTS', function() {
-    var tsResult = plugins.gulp.src('../ts/index.ts')
-        .pipe(plugins.g.typescript({
-            out:"index.js",
-            declaration:true
-        }));
-
-    return plugins.mergeStream([
-        tsResult.dts.pipe(plugins.gulp.dest('../')),
-        tsResult.js
-            .pipe(plugins.g.header('#!/usr/bin/env node\n\n'))
-            .pipe(plugins.gulp.dest('../'))
-    ]);
+plugins.gulp.task("typings",function(){
+    var stream = plugins.gulp.src(plugins.path.join(paths.packageBase,"ts/typings.json"))
+        .pipe(plugins.g.typings());
+    return stream;
 });
 
-plugins.gulp.task('default',['indexTS'], function() {
+plugins.gulp.task("TS",["typings"], function() {
+    var stream = plugins.gulp.src([
+            plugins.path.join(paths.packageBase,'ts/**/*.ts'),
+            "!" + plugins.path.join(paths.packageBase,'ts/typings/**/*.d.ts')
+        ])
+        .pipe(plugins.g.typescript({
+            target:"ES5",
+            module:"commonjs"
+        }))
+        .pipe(plugins.gulp.dest(plugins.path.join(paths.packageBase, 'dist/')));
+    return stream;
+});
+
+plugins.gulp.task("CLI",function(){
+    var stream = plugins.gulp.src(plugins.path.join(paths.packageBase,"assets/cli.js"))
+        .pipe(plugins.gulp.dest(plugins.path.join(paths.packageBase, 'dist/')))
+});
+
+plugins.gulp.task('default',['TS',"CLI"], function() {
 	plugins.beautylog.success('Typescript compiled');
 });
 

dist/cli.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+var index = require("./index.js");

dist/index.js

@@ -0,0 +1,6 @@
+/// <reference path="./typings/main.d.ts" />
+console.log("**** starting NPMTS ****");
+var plugins = require("./npmts.plugins");
+var promisechain = require("./npmts.promisechain");
+plugins.beautylog.figletSync("NPMTS");
+promisechain.run();

dist/npmts.cli.js

@@ -0,0 +1 @@
+/// <reference path="./typings/main.d.ts" /> 

dist/npmts.compile.js

@@ -0,0 +1,89 @@
+/// <reference path="./typings/main.d.ts" />
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+exports.run = function (configArg) {
+    var done = plugins.Q.defer();
+    var config = configArg;
+    plugins.beautylog.log("now running custom tasks");
+    var moduleStream = plugins.merge2({ end: false });
+    /* -------------------------------------------------
+     * ----------- first install typings ---------------
+     * ----------------------------------------------- */
+    var typingsDone = plugins.Q.defer();
+    var typingsCounter = 0;
+    var typingsCounterAdvance = function () {
+        typingsCounter++;
+        if (typeof config.typings[typingsCounter] != "undefined") {
+            installTypings();
+        }
+        else {
+            plugins.beautylog.success("custom typings installed successfully");
+            typingsDone.resolve();
+        }
+    };
+    var installTypings = function () {
+        plugins.beautylog.log("now installing " + "typings.json".yellow + " from " + config.typings[typingsCounter].blue);
+        plugins.typings.install({ production: false, cwd: plugins.path.join(paths.cwd, config.typings[typingsCounter]) })
+            .then(function () {
+            typingsCounterAdvance();
+        }, function () {
+            plugins.beautylog.error("something went wrong: Check if path is correct: " + config.typings[typingsCounter].blue);
+            typingsCounterAdvance();
+        });
+    };
+    installTypings();
+    /* -------------------------------------------------
+     * ----------- second compile TS -------------------
+     * ----------------------------------------------- */
+    typingsDone.promise.then(function () {
+        for (var key in config.ts) {
+            plugins.beautylog.log("now compiling" + key.blue);
+            var outputPathIsDir;
+            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"
+            }))
+                .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
+                .pipe(plugins.gulp.dest(outputDir));
+            moduleStream.add(stream);
+        }
+        moduleStream.on("queueDrain", function () {
+            plugins.beautylog.success("custom TypeScript installed successfully");
+            moduleStream.on("finish", function () {
+                done.resolve(config);
+            });
+            moduleStream.end();
+        });
+    });
+    return done.promise;
+};

dist/npmts.configfile.js

@@ -0,0 +1,29 @@
+/// <reference path="./typings/main.d.ts" />
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+exports.run = function () {
+    var done = plugins.Q.defer();
+    var config = {};
+    var configPath = plugins.path.join(paths.cwd, "npmts.json");
+    if (plugins.smartfile.checks.fileExistsSync(configPath)) {
+        plugins.beautylog.info("npmts.json".blue + " config file found!");
+        config = plugins.smartfile.readFileToObject(configPath);
+        switch (config.mode) {
+            case "default":
+            case "custom":
+                plugins.beautylog.log("mode is " + config.mode.yellow);
+                done.resolve(config);
+                break;
+            default:
+                plugins.beautylog.error("mode " + config.mode.yellow + " not recognised!".red);
+        }
+        ;
+    }
+    else {
+        plugins.beautylog.log("no config file found: so mode is " + "default".yellow);
+        config.mode = "default";
+        done.resolve(config);
+    }
+    ;
+    return done.promise;
+};

dist/npmts.jsdoc.js

@@ -0,0 +1,59 @@
+/// <reference path="./typings/main.d.ts" />
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+var genJsdoc = function (configArg) {
+    var done = plugins.Q.defer();
+    plugins.beautylog.log("now generating " + "JsDoc documentation".blue);
+    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 () {
+        done.resolve(configArg);
+    }));
+    return done.promise;
+};
+var publishDocs = function (configArg) {
+    var done = plugins.Q.defer();
+    var gitUrl = plugins.projectinfo.npm(paths.cwd, {
+        gitAccessToken: process.env.GITHUB_TOKEN
+    }).git.httpsUrl;
+    var deployScript = ""
+        + "cd " + paths.docsDir + " "
+        + "&& git init " + "> /dev/null 2>&1 "
+        + "&& git config user.name \"TRAVIS CI\" " + "> /dev/null 2>&1 "
+        + "&& git config user.email \"travis@shipzone.io\" " + "> /dev/null 2>&1 "
+        + "&& git add . " + "> /dev/null 2>&1 "
+        + "&& git commit -m \"Deploy to GitHub Pages\" " + "> /dev/null 2>&1 "
+        + "&& git push --force --quiet "
+        + "\"" + gitUrl + "\" "
+        + "master:gh-pages " + "> /dev/null 2>&1";
+    if (plugins.smartenv.getEnv().isTravis && configArg.docs && configArg.docs.publish) {
+        plugins.beautylog.log("now publishing docs to GitHub");
+        if (!plugins.shelljs.which('git')) {
+            plugins.beautylog.error('Git is not installed');
+            plugins.shelljs.exit(1);
+        }
+        else if (plugins.shelljs.exec(deployScript).code !== 0) {
+            plugins.beautylog.error('Error: Git failed');
+            plugins.shelljs.exit(1);
+        }
+        plugins.beautylog.success("Docs have been deployed to GitHub");
+        done.resolve(configArg);
+    }
+    else {
+        done.resolve(configArg);
+    }
+    return done.promise;
+};
+exports.run = function (configArg) {
+    var done = plugins.Q.defer();
+    genJsdoc(configArg)
+        .then(publishDocs)
+        .then(done.resolve);
+    return done.promise;
+};

dist/npmts.options.js

@@ -0,0 +1,26 @@
+/// <reference path="./typings/main.d.ts" />
+var plugins = require("./npmts.plugins");
+exports.run = function (configArg) {
+    var done = plugins.Q.defer();
+    var config = configArg;
+    if (typeof config.coveralls === "undefined") {
+        config.coveralls = false;
+    }
+    if (config.mode == "default") {
+        config.typings = [
+            "./ts/"
+        ];
+        config.ts = (_a = {},
+            _a["./ts/**/*.ts"] = "./dist/",
+            _a["./test/test.ts"] = "./test/",
+            _a
+        );
+        config.test = ["./index.js"];
+        done.resolve(config);
+    }
+    else {
+        done.resolve(config);
+    }
+    return done.promise;
+    var _a;
+};

dist/npmts.paths.js

@@ -0,0 +1,13 @@
+/// <reference path="./typings/main.d.ts" />
+var plugins = require("./npmts.plugins");
+var paths = {};
+paths.cwd = plugins.smartcli.get.cwd().path;
+//Directories
+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/");
+//Files
+paths.indexTS = plugins.path.join(paths.cwd, "ts/index.ts");
+paths.testTS = plugins.path.join(paths.cwd, "ts/test.ts");
+module.exports = paths;

dist/npmts.plugins.js

@@ -0,0 +1,26 @@
+/// <reference path="./typings/main.d.ts" />
+var plugins = {
+    beautylog: require("beautylog"),
+    fs: require("fs-extra"),
+    gulp: require("gulp"),
+    g: {
+        coveralls: require("gulp-coveralls"),
+        gFunction: require("gulp-function"),
+        istanbul: require("gulp-istanbul"),
+        jsdoc3: require("gulp-jsdoc3"),
+        mocha: require("gulp-mocha"),
+        sourcemaps: require("gulp-sourcemaps"),
+        typescript: require("gulp-typescript")
+    },
+    merge2: require("merge2"),
+    projectinfo: require("projectinfo"),
+    sourceMapSupport: require("source-map-support").install(),
+    path: require("path"),
+    Q: require("q"),
+    shelljs: require("shelljs"),
+    smartcli: require("smartcli"),
+    smartenv: require("smartenv"),
+    smartfile: require("smartfile"),
+    typings: require("typings")
+};
+module.exports = plugins;

dist/npmts.promisechain.js

@@ -0,0 +1,15 @@
+/// <reference path="./typings/main.d.ts" />
+var NpmtsConfigFile = require("./npmts.configfile");
+var NpmtsOptions = require("./npmts.options");
+var NpmtsCompile = require("./npmts.compile");
+var NpmtsJsdoc = require("./npmts.jsdoc");
+var NpmtsTests = require("./npmts.tests");
+exports.run = function () {
+    var promisechain;
+    NpmtsConfigFile.run()
+        .then(NpmtsOptions.run)
+        .then(NpmtsCompile.run)
+        .then(NpmtsJsdoc.run)
+        .then(NpmtsTests.run);
+    return promisechain;
+};

dist/npmts.tests.js

@@ -0,0 +1,39 @@
+/// <reference path="./typings/main.d.ts" />
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+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;
+    };
+    var coveralls = function () {
+        plugins.beautylog.log("now uploading coverage data to coveralls");
+        var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "./coverage/lcov.info")])
+            .pipe(plugins.g.coveralls());
+        return stream;
+    };
+    istanbul().on("finish", function () {
+        mocha().on("finish", function () {
+            if (plugins.smartenv.getEnv().isTravis && config.coveralls) {
+                coveralls().on("finish", function () {
+                    done.resolve(config);
+                });
+            }
+            else {
+                done.resolve(config);
+            }
+        });
+    });
+    return done.promise;
+};

index.d.ts

@@ -1,59 +0,0 @@
-/// <reference path="../ts/typings/main.d.ts" />
-declare module NpmtsPlugins {
-    var init: () => {
-        beautylog: any;
-        fs: any;
-        gulp: any;
-        g: {
-            coveralls: any;
-            header: any;
-            istanbul: any;
-            mocha: any;
-            typescript: any;
-        };
-        mergeStream: any;
-        path: any;
-        q: any;
-        smartcli: any;
-        smartfile: any;
-        typings: any;
-    };
-}
-declare module NpmtsPaths {
-    var init: () => any;
-}
-declare module NpmtsConfigFile {
-    var run: () => any;
-}
-declare module NpmtsOptions {
-    var run: (configArg: any) => any;
-}
-declare module NpmtsCompile {
-    var run: (configArg: any) => any;
-}
-declare module NpmtsTests {
-    var run: (configArg: any) => any;
-}
-declare module NpmtsPromisechain {
-    var init: () => any;
-}
-declare var plugins: {
-    beautylog: any;
-    fs: any;
-    gulp: any;
-    g: {
-        coveralls: any;
-        header: any;
-        istanbul: any;
-        mocha: any;
-        typescript: any;
-    };
-    mergeStream: any;
-    path: any;
-    q: any;
-    smartcli: any;
-    smartfile: any;
-    typings: any;
-};
-declare var paths: any;
-declare var promisechain: any;

index.js

@@ -1,257 +0,0 @@
-#!/usr/bin/env node
-
-/// <reference path="./index.ts" />
-var NpmtsPlugins;
-(function (NpmtsPlugins) {
-    NpmtsPlugins.init = function () {
-        var plugins = {
-            beautylog: require("beautylog"),
-            fs: require("fs-extra"),
-            gulp: require("gulp"),
-            g: {
-                coveralls: require("gulp-coveralls"),
-                header: require("gulp-header"),
-                istanbul: require("gulp-istanbul"),
-                mocha: require("gulp-mocha"),
-                typescript: require("gulp-typescript")
-            },
-            mergeStream: require("merge2"),
-            path: require("path"),
-            q: require("q"),
-            smartcli: require("smartcli"),
-            smartfile: require("smartfile"),
-            typings: require("typings")
-        };
-        return plugins;
-    };
-})(NpmtsPlugins || (NpmtsPlugins = {}));
-/// <reference path="./index.ts" /> 
-/// <reference path="./index.ts" />
-var NpmtsPaths;
-(function (NpmtsPaths) {
-    NpmtsPaths.init = function () {
-        var paths = {};
-        paths.cwd = plugins.smartcli.get.cwd().path;
-        paths.tsDir = plugins.path.join(paths.cwd, "ts/");
-        paths.indexTS = plugins.path.join(paths.cwd, "ts/index.ts");
-        paths.testTS = plugins.path.join(paths.cwd, "ts/test.ts");
-        paths.testDir = plugins.path.join(paths.cwd, "test/");
-        return paths;
-    };
-})(NpmtsPaths || (NpmtsPaths = {}));
-/// <reference path="./index.ts" />
-var NpmtsConfigFile;
-(function (NpmtsConfigFile) {
-    NpmtsConfigFile.run = function () {
-        var done = plugins.q.defer();
-        var config = {};
-        var configPath = plugins.path.join(paths.cwd, "npmts.json");
-        if (plugins.smartfile.checks.fileExistsSync(configPath)) {
-            plugins.beautylog.info("npmts.json".blue + " config file found!");
-            config = plugins.smartfile.readFileToObject(configPath);
-            switch (config.mode) {
-                case "default":
-                case "custom":
-                    plugins.beautylog.log("mode is " + config.mode.yellow);
-                    done.resolve(config);
-                    break;
-                default:
-                    plugins.beautylog.error("mode " + config.mode.yellow + " not recognised!".red);
-            }
-            ;
-        }
-        else {
-            plugins.beautylog.log("no config file found: so mode is " + "default".yellow);
-            config.mode = "default";
-            done.resolve(config);
-        }
-        ;
-        return done.promise;
-    };
-})(NpmtsConfigFile || (NpmtsConfigFile = {}));
-/// <reference path="./index.ts" />
-var NpmtsOptions;
-(function (NpmtsOptions) {
-    NpmtsOptions.run = function (configArg) {
-        var done = plugins.q.defer();
-        var config = configArg;
-        if (typeof config.coveralls === "undefined") {
-            config.coveralls = false;
-        }
-        if (config.mode == "default") {
-            config.typings = [
-                "./ts/"
-            ];
-            config.ts = (_a = {},
-                _a["./ts/index.ts"] = "./index.js",
-                _a["./ts/test.ts"] = "./test/test.js",
-                _a
-            );
-            config.test = ["./index.js"];
-            done.resolve(config);
-        }
-        else {
-            done.resolve(config);
-        }
-        return done.promise;
-        var _a;
-    };
-})(NpmtsOptions || (NpmtsOptions = {}));
-/// <reference path="./index.ts" />
-var NpmtsCompile;
-(function (NpmtsCompile) {
-    NpmtsCompile.run = function (configArg) {
-        var done = plugins.q.defer();
-        var config = configArg;
-        plugins.beautylog.log("now running custom tasks");
-        var moduleStream = plugins.mergeStream({ end: false });
-        /* -------------------------------------------------
-         * ----------- first install typings ---------------
-         * ----------------------------------------------- */
-        var typingsDone = plugins.q.defer();
-        var typingsCounter = 0;
-        var typingsCounterAdvance = function () {
-            typingsCounter++;
-            if (typeof config.typings[typingsCounter] != "undefined") {
-                installTypings();
-            }
-            else {
-                plugins.beautylog.success("custom typings installed successfully");
-                typingsDone.resolve();
-            }
-        };
-        var installTypings = function () {
-            plugins.beautylog.log("now installing " + "typings.json".yellow + " from " + config.typings[typingsCounter].blue);
-            plugins.typings.install({ production: false, cwd: plugins.path.join(paths.cwd, config.typings[typingsCounter]) })
-                .then(function () {
-                typingsCounterAdvance();
-            }, function () {
-                plugins.beautylog.error("something went wrong: Check if path is correct: " + config.typings[typingsCounter].blue);
-                typingsCounterAdvance();
-            });
-        };
-        installTypings();
-        /* -------------------------------------------------
-         * ----------- second compile TS -------------------
-         * ----------------------------------------------- */
-        typingsDone.promise.then(function () {
-            for (var key in config.ts) {
-                plugins.beautylog.log("now compiling" + key.blue);
-                var outputPathIsDir;
-                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 tsStream = plugins.gulp.src(plugins.path.join(paths.cwd, key))
-                    .pipe(plugins.g.typescript({
-                    out: outputName,
-                    declaration: true,
-                    target: "ES5"
-                }));
-                var stream = plugins.mergeStream([
-                    tsStream.dts.pipe(plugins.gulp.dest(outputDir)),
-                    tsStream.js
-                        .pipe(plugins.g.header('#!/usr/bin/env node\n\n'))
-                        .pipe(plugins.gulp.dest(outputDir))
-                ]);
-                moduleStream.add(stream);
-            }
-            moduleStream.on("queueDrain", function () {
-                plugins.beautylog.success("custom TypeScript installed successfully");
-                moduleStream.on("finish", function () {
-                    done.resolve(config);
-                });
-                moduleStream.end();
-            });
-        });
-        return done.promise;
-    };
-})(NpmtsCompile || (NpmtsCompile = {}));
-/// <reference path="./index.ts" />
-var NpmtsTests;
-(function (NpmtsTests) {
-    NpmtsTests.run = function (configArg) {
-        var done = plugins.q.defer();
-        var config = configArg;
-        var istanbul = function () {
-            var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "index.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;
-        };
-        var coveralls = function () {
-            var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "./coverage/lcov.info")])
-                .pipe(plugins.g.coveralls());
-            return stream;
-        };
-        istanbul().on("finish", function () {
-            mocha().on("finish", function () {
-                if (process.env.TRAVIS && config.coveralls) {
-                    coveralls().on("finish", function () {
-                        done.resolve(config);
-                    });
-                }
-                else {
-                    done.resolve(config);
-                }
-            });
-        });
-        return done.promise;
-    };
-})(NpmtsTests || (NpmtsTests = {}));
-/// <reference path="./index.ts" />
-var NpmtsPromisechain;
-(function (NpmtsPromisechain) {
-    NpmtsPromisechain.init = function () {
-        var promisechain;
-        NpmtsConfigFile.run()
-            .then(NpmtsOptions.run)
-            .then(NpmtsCompile.run)
-            .then(NpmtsTests.run);
-        return promisechain;
-    };
-})(NpmtsPromisechain || (NpmtsPromisechain = {}));
-/// <reference path="./typings/main.d.ts" />
-/// <reference path="./npmts.plugins.ts" />
-/// <reference path="./npmts.cli.ts" />
-/// <reference path="./npmts.paths.ts" />
-/// <reference path="./npmts.configfile.ts" />
-/// <reference path="./npmts.options.ts" />
-/// <reference path="./npmts.compile.ts" />
-/// <reference path="./npmts.tests.ts" />
-/// <reference path="./npmts.promisechain.ts" />
-console.log("**** starting NPMTS ****");
-var plugins = NpmtsPlugins.init();
-plugins.beautylog.figletSync("NPMTS");
-var paths = NpmtsPaths.init();
-var promisechain = NpmtsPromisechain.init();

package.json

@@ -1,14 +1,13 @@
 {
   "name": "npmts",
-  "version": "2.3.2",
+  "version": "3.3.2",
   "description": "write npm modules with TypeScript",
-  "main": "index.js",
-  "typings": "./index.d.ts",
+  "main": "dist/index.js",
   "bin": {
-    "npmts": "./index.js"
+    "npmts": "dist/cli.js"
   },
   "scripts": {
-    "test": "(cd compile && node compile.js) && (cd test/assets && node ../../index.js)",
+    "test": "(cd compile && node compile.js) && (cd test/assets && node ../../dist/index.js)",
     "release": "(git add -A && git commit -m 'update' && git push origin master && npm version patch && npm publish)"
   },
   "repository": {
@@ -26,19 +25,30 @@
   },
   "homepage": "https://github.com/pushrocks/npmts#readme",
   "dependencies": {
-    "beautylog": "2.1.1",
+    "beautylog": "3.1.2",
     "fs-extra": "^0.26.5",
     "gulp": "3.9.1",
+    "gulp-concat": "^2.6.0",
     "gulp-coveralls": "^0.1.4",
-    "gulp-header": "^1.7.1",
+    "gulp-function": "^1.1.1",
+    "gulp-if": "^2.0.0",
     "gulp-istanbul": "^0.10.3",
+    "gulp-jsdoc3": "^0.2.0",
     "gulp-mocha": "^2.2.0",
+    "gulp-sourcemaps": "^1.6.0",
     "gulp-typescript": "2.11.0",
-    "gulp-typings": "0.0.0",
+    "gulp-typings": "1.1.0",
     "merge2": "1.0.1",
+    "projectinfo": "1.0.1",
     "q": "^1.4.1",
+    "shelljs": "^0.6.0",
     "smartcli": "0.0.11",
+    "smartenv": "1.1.0",
     "smartfile": "0.0.11",
+    "source-map-support": "^0.4.0",
     "typings": "^0.6.8"
+  },
+  "devDependencies": {
+    "gulp-typings": "^1.1.0"
   }
 }

test/assets/dist/index.js

@@ -0,0 +1,9 @@
+/// <reference path="./typings/main.d.ts" />
+var testplugin = {
+    logSomething: function () {
+        console.log("only function executed");
+    }
+};
+module.exports = testplugin;
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0QztBQUM1QyxJQUFJLFVBQVUsR0FBRztJQUNiLFlBQVksRUFBRTtRQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQztJQUMxQyxDQUFDO0NBQ0osQ0FBQztBQUNGLE1BQU0sQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxudmFyIHRlc3RwbHVnaW4gPSB7XG4gICAgbG9nU29tZXRoaW5nOiBmdW5jdGlvbigpe1xuICAgICAgICBjb25zb2xlLmxvZyhcIm9ubHkgZnVuY3Rpb24gZXhlY3V0ZWRcIik7XG4gICAgfVxufTtcbm1vZHVsZS5leHBvcnRzID0gdGVzdHBsdWdpbjsiXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=

test/assets/index.d.ts

@@ -1,4 +0,0 @@
-/// <reference path="ts/typings/main.d.ts" />
-declare var testplugin: {
-    logSomething: () => void;
-};

test/assets/index.js

@@ -1,9 +0,0 @@
-#!/usr/bin/env node
-
-/// <reference path="./typings/main.d.ts" />
-var testplugin = {
-    logSomething: function () {
-        console.log("only function executed");
-    }
-};
-module.exports = testplugin;

test/assets/npmts.json

@@ -9,5 +9,8 @@
     "./subts2/",
     "./customdir"
   ],
-  "coveralls":true
+  "coveralls":true,
+  "docs": {
+    "publish":true
+  }
 }

test/assets/package.json

@@ -1,13 +1,16 @@
 {
-  "name": "test",
-  "version": "1.0.0",
+  "name": "testpackage",
+  "version": "2.0.0",
   "description": "",
   "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/pushrocks/npmts.git"
+  },
   "scripts": {
     "test": "(npmts)"
   },
   "author": "",
   "license": "ISC",
-  "dependencies": {
-  }
+  "dependencies": {}
 }

test/assets/test/test.d.ts

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

test/assets/test/test.js

@@ -1,8 +1,6 @@
-#!/usr/bin/env node
-
-/// <reference path="./typings/main.d.ts" />
+/// <reference path="../ts/typings/main.d.ts" />
 console.log("**** starting test ****");
-var testplugin = require("../index.js");
+var testplugin = require("../dist/index.js");
 describe("testplugins", function () {
     describe(".logSomething", function () {
         it("should log something", function () {
@@ -10,3 +8,5 @@ describe("testplugins", function () {
         });
     });
 });
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsZ0RBQWdEO0FBQ2hELE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUMsQ0FBQztBQUN2QyxJQUFJLFVBQVUsR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FBQztBQUM3QyxRQUFRLENBQUMsYUFBYSxFQUFDO0lBQ25CLFFBQVEsQ0FBQyxlQUFlLEVBQUM7UUFDckIsRUFBRSxDQUFDLHNCQUFzQixFQUFDO1lBQ3RCLFVBQVUsQ0FBQyxZQUFZLEVBQUUsQ0FBQTtRQUM3QixDQUFDLENBQUMsQ0FBQztJQUNQLENBQUMsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyxDQUFDLENBQUMiLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuLi90cy90eXBpbmdzL21haW4uZC50c1wiIC8+XG5jb25zb2xlLmxvZyhcIioqKiogc3RhcnRpbmcgdGVzdCAqKioqXCIpO1xudmFyIHRlc3RwbHVnaW4gPSByZXF1aXJlKFwiLi4vZGlzdC9pbmRleC5qc1wiKTtcbmRlc2NyaWJlKFwidGVzdHBsdWdpbnNcIixmdW5jdGlvbigpe1xuICAgIGRlc2NyaWJlKFwiLmxvZ1NvbWV0aGluZ1wiLGZ1bmN0aW9uKCl7XG4gICAgICAgIGl0KFwic2hvdWxkIGxvZyBzb21ldGhpbmdcIixmdW5jdGlvbigpe1xuICAgICAgICAgICAgdGVzdHBsdWdpbi5sb2dTb21ldGhpbmcoKVxuICAgICAgICB9KTtcbiAgICB9KTtcbn0pOyJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==

test/assets/test/test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;AACvC,IAAI,UAAU,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC7C,QAAQ,CAAC,aAAa,EAAC;IACnB,QAAQ,CAAC,eAAe,EAAC;QACrB,EAAE,CAAC,sBAAsB,EAAC;YACtB,UAAU,CAAC,YAAY,EAAE,CAAA;QAC7B,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

test/assets/test/test.ts

@@ -1,6 +1,6 @@
-/// <reference path="./typings/main.d.ts" />
+/// <reference path="../ts/typings/main.d.ts" />
 console.log("**** starting test ****");
-var testplugin = require("../index.js");
+var testplugin = require("../dist/index.js");
 describe("testplugins",function(){
     describe(".logSomething",function(){
         it("should log something",function(){

test/assets/test/typings.json

@@ -0,0 +1,8 @@
+{
+  "ambientDependencies": {
+    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777",
+
+    "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts#09e37435ffb2c56a6f908081194a74756f24f99d",
+    "vinyl": "github:DefinitelyTyped/DefinitelyTyped/vinyl/vinyl.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777"
+  }
+}

test/assets/ts/test.js

@@ -1,11 +0,0 @@
-/// <reference path="./typings/main.d.ts" />
-console.log("**** starting test ****");
-var testplugin = require("../index.js");
-describe("testplugins", function () {
-    describe(".logSomething", function () {
-        it("should log something", function () {
-            testplugin.logSomething();
-        });
-    });
-});
-//# sourceMappingURL=test.js.map

test/assets/ts/test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;AACvC,IAAI,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACxC,QAAQ,CAAC,aAAa,EAAC;IACnB,QAAQ,CAAC,eAAe,EAAC;QACrB,EAAE,CAAC,sBAAsB,EAAC;YACtB,UAAU,CAAC,YAAY,EAAE,CAAA;QAC7B,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

test/assets/tsfile1.d.ts

@@ -1 +0,0 @@
-declare var something: string;

test/assets/tsfile1.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-var something = "something";

ts/index.ts

@@ -1,14 +1,6 @@
 /// <reference path="./typings/main.d.ts" />
-/// <reference path="./npmts.plugins.ts" />
-/// <reference path="./npmts.cli.ts" />
-/// <reference path="./npmts.paths.ts" />
-/// <reference path="./npmts.configfile.ts" />
-/// <reference path="./npmts.options.ts" />
-/// <reference path="./npmts.compile.ts" />
-/// <reference path="./npmts.tests.ts" />
-/// <reference path="./npmts.promisechain.ts" />
 console.log("**** starting NPMTS ****");
-var plugins = NpmtsPlugins.init();
+import plugins = require("./npmts.plugins");
+import promisechain = require("./npmts.promisechain");
 plugins.beautylog.figletSync("NPMTS");
-var paths = NpmtsPaths.init();
-var promisechain = NpmtsPromisechain.init();
+promisechain.run();

ts/npmts.cli.ts

@@ -1 +1 @@
-/// <reference path="./index.ts" />
+/// <reference path="./typings/main.d.ts" />

ts/npmts.compile.ts

@@ -1,94 +1,92 @@
-/// <reference path="./index.ts" />
-module NpmtsCompile {
-    export var run = function(configArg){
-        var done = plugins.q.defer();
-        var config = configArg;
-        plugins.beautylog.log("now running custom tasks");
-        var moduleStream = plugins.mergeStream({end: false});
-        /* -------------------------------------------------
-         * ----------- first install typings ---------------
-         * ----------------------------------------------- */
-        var typingsDone = plugins.q.defer();
-        var typingsCounter:number = 0;
-        var typingsCounterAdvance = function(){
-            typingsCounter++;
-            if(typeof config.typings[typingsCounter] != "undefined"){
-                installTypings();
-            } else {
-                plugins.beautylog.success("custom typings installed successfully");
-                typingsDone.resolve();
-            }
-        };
-        var installTypings = function() {
-            plugins.beautylog.log("now installing " + "typings.json".yellow + " from " + config.typings[typingsCounter].blue);
-            plugins.typings.install({production: false, cwd: plugins.path.join(paths.cwd,config.typings[typingsCounter])})
-                .then(function(){
-                    typingsCounterAdvance();
-                },function(){
-                    plugins.beautylog.error("something went wrong: Check if path is correct: " + config.typings[typingsCounter].blue);
-                    typingsCounterAdvance();
-                });
-        };
-        installTypings();
-        /* -------------------------------------------------
-         * ----------- second compile TS -------------------
-         * ----------------------------------------------- */
-        typingsDone.promise.then(function(){
-            for (var key in config.ts) {
-                plugins.beautylog.log("now compiling" + key.blue);
-                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 tsStream = plugins.gulp.src(plugins.path.join(paths.cwd,key))
-                    .pipe(plugins.g.typescript({
-                        out: outputName,
-                        declaration: true,
-                        target: "ES5"
-                    }));
-                var stream = plugins.mergeStream([
-                    tsStream.dts.pipe(plugins.gulp.dest(outputDir)),
-                    tsStream.js
-                        .pipe(plugins.g.header('#!/usr/bin/env node\n\n'))
-                        .pipe(plugins.gulp.dest(outputDir))
-                ]);
-                moduleStream.add(stream);
-            }
-            moduleStream.on("queueDrain",function(){
-                plugins.beautylog.success("custom TypeScript installed successfully");
-                moduleStream.on("finish",function(){
-                    done.resolve(config);
-                });
-                moduleStream.end();
+/// <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();
+    var config = configArg;
+    plugins.beautylog.log("now running custom tasks");
+    var moduleStream = plugins.merge2({end: false});
+    /* -------------------------------------------------
+     * ----------- first install typings ---------------
+     * ----------------------------------------------- */
+    var typingsDone = plugins.Q.defer();
+    var typingsCounter:number = 0;
+    var typingsCounterAdvance = function(){
+        typingsCounter++;
+        if(typeof config.typings[typingsCounter] != "undefined"){
+            installTypings();
+        } else {
+            plugins.beautylog.success("custom typings installed successfully");
+            typingsDone.resolve();
+        }
+    };
+    var installTypings = function() {
+        plugins.beautylog.log("now installing " + "typings.json".yellow + " from " + config.typings[typingsCounter].blue);
+        plugins.typings.install({production: false, cwd: plugins.path.join(paths.cwd,config.typings[typingsCounter])})
+            .then(function(){
+                typingsCounterAdvance();
+            },function(){
+                plugins.beautylog.error("something went wrong: Check if path is correct: " + config.typings[typingsCounter].blue);
+                typingsCounterAdvance();
             });
+    };
+    installTypings();
+    /* -------------------------------------------------
+     * ----------- second compile TS -------------------
+     * ----------------------------------------------- */
+    typingsDone.promise.then(function(){
+        for (var key in config.ts) {
+            plugins.beautylog.log("now compiling" + key.blue);
+            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/**"])
+                .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
+                .pipe(plugins.g.typescript({
+                    out: outputName,
+                    target: "ES5",
+                    module: "commonjs"
+                }))
+                .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(outputDir));
+            moduleStream.add(stream);
+        }
+        moduleStream.on("queueDrain",function(){
+            plugins.beautylog.success("custom TypeScript installed successfully");
+            moduleStream.on("finish",function(){
+                done.resolve(config);
+            });
+            moduleStream.end();
         });
-        return done.promise;
-    }
-}
+    });
+    return done.promise;
+};

ts/npmts.configfile.ts

@@ -1,26 +1,26 @@
-/// <reference path="./index.ts" />
-module NpmtsConfigFile {
-    export var run = function(){
-        var done = plugins.q.defer();
-        var config:any = {};
-        var configPath = plugins.path.join(paths.cwd,"npmts.json");
-        if(plugins.smartfile.checks.fileExistsSync(configPath)){
-            plugins.beautylog.info("npmts.json".blue + " config file found!");
-            config = plugins.smartfile.readFileToObject(configPath);
-            switch (config.mode){
-                case "default":
-                case "custom":
-                    plugins.beautylog.log("mode is " + config.mode.yellow);
-                    done.resolve(config);
-                    break;
-                default:
-                    plugins.beautylog.error("mode " + config.mode.yellow + " not recognised!".red);
-            };
-        } else {
-            plugins.beautylog.log("no config file found: so mode is " + "default".yellow);
-            config.mode = "default";
-            done.resolve(config);
+/// <reference path="./typings/main.d.ts" />
+import plugins = require("./npmts.plugins");
+import paths = require("./npmts.paths");
+export var run = function(){
+    var done = plugins.Q.defer();
+    var config:any = {};
+    var configPath = plugins.path.join(paths.cwd,"npmts.json");
+    if(plugins.smartfile.checks.fileExistsSync(configPath)){
+        plugins.beautylog.info("npmts.json".blue + " config file found!");
+        config = plugins.smartfile.readFileToObject(configPath);
+        switch (config.mode){
+            case "default":
+            case "custom":
+                plugins.beautylog.log("mode is " + config.mode.yellow);
+                done.resolve(config);
+                break;
+            default:
+                plugins.beautylog.error("mode " + config.mode.yellow + " not recognised!".red);
         };
-        return done.promise;
-    }
-}
+    } else {
+        plugins.beautylog.log("no config file found: so mode is " + "default".yellow);
+        config.mode = "default";
+        done.resolve(config);
+    };
+    return done.promise;
+};

ts/npmts.jsdoc.ts

@@ -0,0 +1,66 @@
+/// <reference path="./typings/main.d.ts" />
+import plugins = require("./npmts.plugins");
+import paths = require("./npmts.paths");
+
+var genJsdoc = function(configArg){
+    var done = plugins.Q.defer();
+    plugins.beautylog.log("now generating " + "JsDoc documentation".blue);
+    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(){
+            done.resolve(configArg)
+        }));
+    return done.promise;
+};
+
+var publishDocs = function(configArg){
+    var done = plugins.Q.defer();
+    var gitUrl = plugins.projectinfo.npm(
+        paths.cwd,
+        {
+            gitAccessToken:process.env.GITHUB_TOKEN
+        }
+    ).git.httpsUrl;
+
+    var deployScript = ""
+        + "cd " + paths.docsDir + " "
+        + "&& git init " + "> /dev/null 2>&1 "
+        + "&& git config user.name \"TRAVIS CI\" " + "> /dev/null 2>&1 "
+        + "&& git config user.email \"travis@shipzone.io\" " + "> /dev/null 2>&1 "
+        + "&& git add . " + "> /dev/null 2>&1 "
+        + "&& git commit -m \"Deploy to GitHub Pages\" " + "> /dev/null 2>&1 "
+        + "&& git push --force --quiet "
+        + "\"" + gitUrl + "\" "
+        + "master:gh-pages " + "> /dev/null 2>&1";
+
+    if(plugins.smartenv.getEnv().isTravis && configArg.docs && configArg.docs.publish){
+        plugins.beautylog.log("now publishing docs to GitHub");
+        if (!plugins.shelljs.which('git')) {
+            plugins.beautylog.error('Git is not installed');
+            plugins.shelljs.exit(1);
+        } else if (plugins.shelljs.exec(deployScript).code !== 0) {
+            plugins.beautylog.error('Error: Git failed');
+            plugins.shelljs.exit(1);
+        }
+        plugins.beautylog.success("Docs have been deployed to GitHub");
+        done.resolve(configArg);
+    } else {
+        done.resolve(configArg);
+    }
+    return done.promise;
+};
+
+
+export var run = function(configArg){
+    var done = plugins.Q.defer();
+    genJsdoc(configArg)
+        .then(publishDocs)
+        .then(done.resolve);
+    return done.promise;
+};

ts/npmts.options.ts

@@ -1,24 +1,23 @@
-/// <reference path="./index.ts" />
-module NpmtsOptions {
-    export var run = function(configArg){
-        var done = plugins.q.defer();
-        var config = configArg;
-        if (typeof config.coveralls === "undefined"){
-            config.coveralls = false;
-        }
-        if (config.mode == "default"){
-            config.typings = [
-                "./ts/"
-            ];
-            config.ts = {
-                ["./ts/index.ts"]: "./index.js",
-                ["./ts/test.ts"]: "./test/test.js"
-            };
-            config.test = ["./index.js"];
-            done.resolve(config);
-        } else {
-            done.resolve(config);
-        }
-        return done.promise;
+/// <reference path="./typings/main.d.ts" />
+import plugins = require("./npmts.plugins");
+export var run = function(configArg){
+    var done = plugins.Q.defer();
+    var config = configArg;
+    if (typeof config.coveralls === "undefined"){
+        config.coveralls = false;
     }
-}
+    if (config.mode == "default"){
+        config.typings = [
+            "./ts/"
+        ];
+        config.ts = {
+            ["./ts/**/*.ts"]: "./dist/",
+            ["./test/test.ts"]: "./test/"
+        };
+        config.test = ["./index.js"];
+        done.resolve(config);
+    } else {
+        done.resolve(config);
+    }
+    return done.promise;
+};

ts/npmts.paths.ts

@@ -1,12 +1,16 @@
-/// <reference path="./index.ts" />
-module NpmtsPaths {
-    export var init = function() {
-        var paths:any = {};
-        paths.cwd = plugins.smartcli.get.cwd().path;
-        paths.tsDir = plugins.path.join(paths.cwd,"ts/");
-        paths.indexTS = plugins.path.join(paths.cwd,"ts/index.ts");
-        paths.testTS = plugins.path.join(paths.cwd,"ts/test.ts");
-        paths.testDir = plugins.path.join(paths.cwd,"test/");
-        return paths;
-    }
-}
+/// <reference path="./typings/main.d.ts" />
+import plugins = require("./npmts.plugins");
+var paths:any = {};
+paths.cwd = plugins.smartcli.get.cwd().path;
+
+//Directories
+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/");
+
+//Files
+paths.indexTS = plugins.path.join(paths.cwd,"ts/index.ts");
+paths.testTS = plugins.path.join(paths.cwd,"ts/test.ts");
+
+export = paths;

ts/npmts.plugins.ts

@@ -1,25 +1,27 @@
-/// <reference path="./index.ts" />
-module NpmtsPlugins {
-    export var init = function() {
-        var plugins = {
-            beautylog: require("beautylog"),
-            fs: require("fs-extra"),
-            gulp: require("gulp"),
-            g: {
-                coveralls: require("gulp-coveralls"),
-                header: require("gulp-header"),
-                istanbul: require("gulp-istanbul"),
-                mocha: require("gulp-mocha"),
-                typescript: require("gulp-typescript")
+/// <reference path="./typings/main.d.ts" />
+var plugins = {
+    beautylog: require("beautylog"),
+    fs: require("fs-extra"),
+    gulp: require("gulp"),
+    g: {
+        coveralls: require("gulp-coveralls"),
+        gFunction: require("gulp-function"),
+        istanbul: require("gulp-istanbul"),
+        jsdoc3: require("gulp-jsdoc3"),
+        mocha: require("gulp-mocha"),
+        sourcemaps: require("gulp-sourcemaps"),
+        typescript: require("gulp-typescript")
 
-            },
-            mergeStream: require("merge2"),
-            path: require("path"),
-            q:require("q"),
-            smartcli: require("smartcli"),
-            smartfile: require("smartfile"),
-            typings: require("typings")
-        };
-        return plugins;
-    }
-}
+    },
+    merge2: require("merge2"),
+    projectinfo: require("projectinfo"),
+    sourceMapSupport:require("source-map-support").install(),
+    path: require("path"),
+    Q:require("q"),
+    shelljs: require("shelljs"),
+    smartcli: require("smartcli"),
+    smartenv: require("smartenv"),
+    smartfile: require("smartfile"),
+    typings: require("typings")
+};
+export = plugins;

ts/npmts.promisechain.ts

@@ -1,11 +1,15 @@
-/// <reference path="./index.ts" />
-module NpmtsPromisechain {
-    export var init = function(){
-        var promisechain;
-        NpmtsConfigFile.run()
-            .then(NpmtsOptions.run)
-            .then(NpmtsCompile.run)
-            .then(NpmtsTests.run);
-        return promisechain;
-    }
-}
+/// <reference path="./typings/main.d.ts" />
+import NpmtsConfigFile = require("./npmts.configfile");
+import NpmtsOptions = require("./npmts.options");
+import NpmtsCompile = require("./npmts.compile");
+import NpmtsJsdoc = require("./npmts.jsdoc");
+import NpmtsTests = require("./npmts.tests");
+export var run = function(){
+    var promisechain;
+    NpmtsConfigFile.run()
+        .then(NpmtsOptions.run)
+        .then(NpmtsCompile.run)
+        .then(NpmtsJsdoc.run)
+        .then(NpmtsTests.run);
+    return promisechain;
+};

ts/npmts.tests.ts

@@ -1,44 +1,45 @@
-/// <reference path="./index.ts" />
-module NpmtsTests {
-    export var run = function(configArg) {
-        var done = plugins.q.defer();
-        var config = configArg;
-        var istanbul = function () {
-            var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"index.js")])
-                // Covering files
-                .pipe(plugins.g.istanbul())
-                // Force `require` to return covered files
-                .pipe(plugins.g.istanbul.hookRequire());
-            return stream;
-        };
+/// <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();
+    var config = configArg;
+    var istanbul = function () {
+        var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"dist/*.js")])
+            // Covering files
+            .pipe(plugins.g.istanbul())
+            // Force `require` to return covered files
+            .pipe(plugins.g.istanbul.hookRequire());
+        return stream;
+    };
 
-        var mocha = function () {
-            var stream = plugins.gulp.src(["./test/test.js"])
-                .pipe(plugins.g.mocha())
-                // Creating the reports after tests ran
-                .pipe(plugins.g.istanbul.writeReports())
-                // Enforce a coverage of at least 90%
-                .pipe(plugins.g.istanbul.enforceThresholds({ thresholds: { global: 30 } }));
-            return stream;
-        };
+    var mocha = function () {
+        var stream = plugins.gulp.src(["./test/test.js"])
+            .pipe(plugins.g.mocha())
+            // Creating the reports after tests ran
+            .pipe(plugins.g.istanbul.writeReports())
+            // Enforce a coverage of at least 90%
+            .pipe(plugins.g.istanbul.enforceThresholds({ thresholds: { global: 30 } }));
+        return stream;
+    };
 
-        var coveralls = function(){
-            var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"./coverage/lcov.info")])
-                .pipe(plugins.g.coveralls());
-            return stream;
-        };
+    var coveralls = function(){
+        plugins.beautylog.log("now uploading coverage data to coveralls");
+        var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"./coverage/lcov.info")])
+            .pipe(plugins.g.coveralls());
+        return stream;
+    };
 
-        istanbul().on("finish",function(){
-            mocha().on("finish",function(){
-                if(process.env.TRAVIS && config.coveralls){
-                    coveralls().on("finish",function(){
-                        done.resolve(config);
-                    })
-                } else {
+    istanbul().on("finish",function(){
+        mocha().on("finish",function(){
+            if(plugins.smartenv.getEnv().isTravis && config.coveralls){
+                coveralls().on("finish",function(){
                     done.resolve(config);
-                }
-            })
-        });
-        return done.promise;
-    }
-}
+                })
+            } else {
+                done.resolve(config);
+            }
+        })
+    });
+    return done.promise;
+};

ts/typings/browser.d.ts

@@ -1,3 +0,0 @@
-/// <reference path="browser/ambient/colors/colors.d.ts" />
-/// <reference path="browser/ambient/node/node.d.ts" />
-/// <reference path="browser/ambient/vinyl/vinyl.d.ts" />

ts/typings/browser/ambient/colors/colors.d.ts

@@ -1,125 +0,0 @@
-// Compiled using typings@0.6.3
-// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/09e37435ffb2c56a6f908081194a74756f24f99d/colors/colors.d.ts
-// Type definitions for Colors.js 0.6.0-1
-// Project: https://github.com/Marak/colors.js
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare module "colors" {
-    interface Color {
-        (text: string): string;
-
-        black: Color;
-        red: Color;
-        green: Color;
-        yellow: Color;
-        blue: Color;
-        magenta: Color;
-        cyan: Color;
-        white: Color;
-        gray: Color;
-        grey: Color;
-
-        bgBlack: Color;
-        bgRed: Color;
-        bgGreen: Color;
-        bgYellow: Color;
-        bgBlue: Color;
-        bgMagenta: Color;
-        bgCyan: Color;
-        bgWhite: Color;
-
-        reset: Color;
-        bold: Color;
-        dim: Color;
-        italic: Color;
-        underline: Color;
-        inverse: Color;
-        hidden: Color;
-        strikethrough: Color;
-
-        rainbow: Color;
-        zebra: Color;
-        america: Color;
-        trap: Color;
-        random: Color;
-    }
-
-    module e {
-        export function setTheme(theme:any): void;
-
-        export var black: Color;
-        export var red: Color;
-        export var green: Color;
-        export var yellow: Color;
-        export var blue: Color;
-        export var magenta: Color;
-        export var cyan: Color;
-        export var white: Color;
-        export var gray: Color;
-        export var grey: Color;
-
-        export var bgBlack: Color;
-        export var bgRed: Color;
-        export var bgGreen: Color;
-        export var bgYellow: Color;
-        export var bgBlue: Color;
-        export var bgMagenta: Color;
-        export var bgCyan: Color;
-        export var bgWhite: Color;
-
-        export var reset: Color;
-        export var bold: Color;
-        export var dim: Color;
-        export var italic: Color;
-        export var underline: Color;
-        export var inverse: Color;
-        export var hidden: Color;
-        export var strikethrough: Color;
-
-        export var rainbow: Color;
-        export var zebra: Color;
-        export var america: Color;
-        export var trap: Color;
-        export var random: Color;
-    }
-
-    export = e;
-}
-
-interface String {
-    black: string;
-    red: string;
-    green: string;
-    yellow: string;
-    blue: string;
-    magenta: string;
-    cyan: string;
-    white: string;
-    gray: string;
-    grey: string;
-
-    bgBlack: string;
-    bgRed: string;
-    bgGreen: string;
-    bgYellow: string;
-    bgBlue: string;
-    bgMagenta: string;
-    bgCyan: string;
-    bgWhite: string;
-
-    reset: string;
-    bold: string;
-    dim: string;
-    italic: string;
-    underline: string;
-    inverse: string;
-    hidden: string;
-    strikethrough: string;
-
-    rainbow: string;
-    zebra: string;
-    america: string;
-    trap: string;
-    random: string;
-}

ts/typings/browser/ambient/vinyl/vinyl.d.ts

@@ -1,110 +0,0 @@
-// Compiled using typings@0.6.3
-// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/78d36dd49b6b55b9fdfe61776a12bf05c8b07777/vinyl/vinyl.d.ts
-// Type definitions for vinyl 0.4.3
-// Project: https://github.com/wearefractal/vinyl
-// Definitions by: vvakame <https://github.com/vvakame/>, jedmao <https://github.com/jedmao>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-
-declare module 'vinyl' {
-
-	import fs = require('fs');
-
-	/**
-	* A virtual file format.
-	*/
-	class File {
-		constructor(options?: {
-			/**
-			* Default: process.cwd()
-			*/
-			cwd?: string;
-			/**
-			* Used for relative pathing. Typically where a glob starts.
-			*/
-			base?: string;
-			/**
-			* Full path to the file.
-			*/
-			path?: string;
-			/**
-			* Path history. Has no effect if options.path is passed.
-			*/
-			history?: string[];
-			/**
-			* The result of an fs.stat call. See fs.Stats for more information.
-			*/
-			stat?: fs.Stats;
-			/**
-			* File contents.
-			* Type: Buffer, Stream, or null
-			*/
-			contents?: Buffer | NodeJS.ReadWriteStream;
-		});
-
-		/**
-		* Default: process.cwd()
-		*/
-		public cwd: string;
-		/**
-		* Used for relative pathing. Typically where a glob starts.
-		*/
-		public base: string;
-		/**
-		* Full path to the file.
-		*/
-		public path: string;
-		public stat: fs.Stats;
-		/**
-		* Type: Buffer|Stream|null (Default: null)
-		*/
-		public contents: Buffer | NodeJS.ReadableStream;
-		/**
-		* Returns path.relative for the file base and file path.
-		* Example:
-		*  var file = new File({
-		*    cwd: "/",
-		*    base: "/test/",
-		*    path: "/test/file.js"
-		*  });
-		*  console.log(file.relative); // file.js
-		*/
-		public relative: string;
-
-		public isBuffer(): boolean;
-
-		public isStream(): boolean;
-
-		public isNull(): boolean;
-
-		public isDirectory(): boolean;
-
-		/**
-		* Returns a new File object with all attributes cloned. Custom attributes are deep-cloned.
-		*/
-		public clone(opts?: { contents?: boolean }): File;
-
-		/**
-		* If file.contents is a Buffer, it will write it to the stream.
-		* If file.contents is a Stream, it will pipe it to the stream.
-		* If file.contents is null, it will do nothing.
-		*/
-		public pipe<T extends NodeJS.ReadWriteStream>(
-			stream: T,
-			opts?: {
-				/**
-				* If false, the destination stream will not be ended (same as node core).
-				*/
-				end?: boolean;
-			}
-		): T;
-
-		/**
-		* Returns a pretty String interpretation of the File. Useful for console.log.
-		*/
-		public inspect(): string;
-	}
-
-	export = File;
-
-}

ts/typings/main.d.ts

@@ -1,3 +0,0 @@
-/// <reference path="main/ambient/colors/colors.d.ts" />
-/// <reference path="main/ambient/node/node.d.ts" />
-/// <reference path="main/ambient/vinyl/vinyl.d.ts" />

ts/typings/main/ambient/colors/colors.d.ts

@@ -1,125 +0,0 @@
-// Compiled using typings@0.6.3
-// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/09e37435ffb2c56a6f908081194a74756f24f99d/colors/colors.d.ts
-// Type definitions for Colors.js 0.6.0-1
-// Project: https://github.com/Marak/colors.js
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare module "colors" {
-    interface Color {
-        (text: string): string;
-
-        black: Color;
-        red: Color;
-        green: Color;
-        yellow: Color;
-        blue: Color;
-        magenta: Color;
-        cyan: Color;
-        white: Color;
-        gray: Color;
-        grey: Color;
-
-        bgBlack: Color;
-        bgRed: Color;
-        bgGreen: Color;
-        bgYellow: Color;
-        bgBlue: Color;
-        bgMagenta: Color;
-        bgCyan: Color;
-        bgWhite: Color;
-
-        reset: Color;
-        bold: Color;
-        dim: Color;
-        italic: Color;
-        underline: Color;
-        inverse: Color;
-        hidden: Color;
-        strikethrough: Color;
-
-        rainbow: Color;
-        zebra: Color;
-        america: Color;
-        trap: Color;
-        random: Color;
-    }
-
-    module e {
-        export function setTheme(theme:any): void;
-
-        export var black: Color;
-        export var red: Color;
-        export var green: Color;
-        export var yellow: Color;
-        export var blue: Color;
-        export var magenta: Color;
-        export var cyan: Color;
-        export var white: Color;
-        export var gray: Color;
-        export var grey: Color;
-
-        export var bgBlack: Color;
-        export var bgRed: Color;
-        export var bgGreen: Color;
-        export var bgYellow: Color;
-        export var bgBlue: Color;
-        export var bgMagenta: Color;
-        export var bgCyan: Color;
-        export var bgWhite: Color;
-
-        export var reset: Color;
-        export var bold: Color;
-        export var dim: Color;
-        export var italic: Color;
-        export var underline: Color;
-        export var inverse: Color;
-        export var hidden: Color;
-        export var strikethrough: Color;
-
-        export var rainbow: Color;
-        export var zebra: Color;
-        export var america: Color;
-        export var trap: Color;
-        export var random: Color;
-    }
-
-    export = e;
-}
-
-interface String {
-    black: string;
-    red: string;
-    green: string;
-    yellow: string;
-    blue: string;
-    magenta: string;
-    cyan: string;
-    white: string;
-    gray: string;
-    grey: string;
-
-    bgBlack: string;
-    bgRed: string;
-    bgGreen: string;
-    bgYellow: string;
-    bgBlue: string;
-    bgMagenta: string;
-    bgCyan: string;
-    bgWhite: string;
-
-    reset: string;
-    bold: string;
-    dim: string;
-    italic: string;
-    underline: string;
-    inverse: string;
-    hidden: string;
-    strikethrough: string;
-
-    rainbow: string;
-    zebra: string;
-    america: string;
-    trap: string;
-    random: string;
-}

ts/typings/main/ambient/vinyl/vinyl.d.ts

@@ -1,110 +0,0 @@
-// Compiled using typings@0.6.3
-// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/78d36dd49b6b55b9fdfe61776a12bf05c8b07777/vinyl/vinyl.d.ts
-// Type definitions for vinyl 0.4.3
-// Project: https://github.com/wearefractal/vinyl
-// Definitions by: vvakame <https://github.com/vvakame/>, jedmao <https://github.com/jedmao>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-
-declare module 'vinyl' {
-
-	import fs = require('fs');
-
-	/**
-	* A virtual file format.
-	*/
-	class File {
-		constructor(options?: {
-			/**
-			* Default: process.cwd()
-			*/
-			cwd?: string;
-			/**
-			* Used for relative pathing. Typically where a glob starts.
-			*/
-			base?: string;
-			/**
-			* Full path to the file.
-			*/
-			path?: string;
-			/**
-			* Path history. Has no effect if options.path is passed.
-			*/
-			history?: string[];
-			/**
-			* The result of an fs.stat call. See fs.Stats for more information.
-			*/
-			stat?: fs.Stats;
-			/**
-			* File contents.
-			* Type: Buffer, Stream, or null
-			*/
-			contents?: Buffer | NodeJS.ReadWriteStream;
-		});
-
-		/**
-		* Default: process.cwd()
-		*/
-		public cwd: string;
-		/**
-		* Used for relative pathing. Typically where a glob starts.
-		*/
-		public base: string;
-		/**
-		* Full path to the file.
-		*/
-		public path: string;
-		public stat: fs.Stats;
-		/**
-		* Type: Buffer|Stream|null (Default: null)
-		*/
-		public contents: Buffer | NodeJS.ReadableStream;
-		/**
-		* Returns path.relative for the file base and file path.
-		* Example:
-		*  var file = new File({
-		*    cwd: "/",
-		*    base: "/test/",
-		*    path: "/test/file.js"
-		*  });
-		*  console.log(file.relative); // file.js
-		*/
-		public relative: string;
-
-		public isBuffer(): boolean;
-
-		public isStream(): boolean;
-
-		public isNull(): boolean;
-
-		public isDirectory(): boolean;
-
-		/**
-		* Returns a new File object with all attributes cloned. Custom attributes are deep-cloned.
-		*/
-		public clone(opts?: { contents?: boolean }): File;
-
-		/**
-		* If file.contents is a Buffer, it will write it to the stream.
-		* If file.contents is a Stream, it will pipe it to the stream.
-		* If file.contents is null, it will do nothing.
-		*/
-		public pipe<T extends NodeJS.ReadWriteStream>(
-			stream: T,
-			opts?: {
-				/**
-				* If false, the destination stream will not be ended (same as node core).
-				*/
-				end?: boolean;
-			}
-		): T;
-
-		/**
-		* Returns a pretty String interpretation of the File. Useful for console.log.
-		*/
-		public inspect(): string;
-	}
-
-	export = File;
-
-}