5.3.9

.gitignore

@@ -1,13 +1,4 @@
-.idea/
-.c9/
 node_modules/
-test/assets/**/node_modules/
-test/assets/**/docs/
-test/assets/**/typings/
-test/assets/**/coverage/
-ts/*.js
-ts/*.js.map
-ts/typings/
+test/
 docs/
-
 .DS_Store

.gitlab-ci.yml

@@ -1,10 +1,19 @@
-image: hosttoday/ht-docker-node:latest
+image: hosttoday/ht-docker-node:npmts
 
 stages:
 - test
 - release
+- trigger
 - page
 
+testLEGACY:
+  stage: test
+  script:
+    - npmci test legacy
+  tags:
+    - docker
+  allow_failure: true
+
 testLTS:
   stage: test
   script:
@@ -27,17 +36,12 @@ release:
     - tags
   tags:
     - docker
-    
-pages:
-  stage: page
+
+trigger:
+  stage: trigger
   script:
-  - npmci test lts
-  - mkdir .public
-  - cp -r test/assets/docs/ .public
-  - cp -r test/assets/coverage/ .public
-  - mv .public public
-  artifacts:
-    paths:
-    - public
+    - npmci trigger
   only:
-  - master
+    - tags
+  tags:
+    - docker

README.md

@@ -3,7 +3,6 @@ Write npm modules with TypeScript without hassle.
 
 ## Status
 [![build status](https://gitlab.com/pushrocks/npmts/badges/master/build.svg)](https://gitlab.com/pushrocks/npmts/commits/master)
-[![Build status](https://ci.appveyor.com/api/projects/status/22fuqa0uv21rcjh4/branch/master?svg=true)](https://ci.appveyor.com/project/philkunz/npmts/branch/master)
 [![Dependency Status](https://david-dm.org/pushrocks/npmts.svg)](https://david-dm.org/pushrocks/npmts)
 [![bitHound Dependencies](https://www.bithound.io/github/pushrocks/npmts/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/npmts/master/dependencies/npm)
 [![bitHound Code](https://www.bithound.io/github/pushrocks/npmts/badges/code.svg)](https://www.bithound.io/github/pushrocks/npmts)
@@ -17,17 +16,21 @@ 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:
+First install npmts globally, then install the npmts-g locally.
+
+> **npmts-g* checks if the global version of npmts suffices the modules requirements.
+If not it installs npmts locally in the right version during npm install. 
 
 ```sh
-npm install npmts --save-dev
+npm install npmts -g # installs npmts globally
+npm install npmts-g --save-dev # installs npmts-g checking tool as devDependency
 ```
 
-Then use it in package.json's script section to trigger a build:
+Then add it to your package.json's script section to trigger a build:
 
 ```json
 "scripts": {
-    "test": "npmts"
+    "test": "(npmts)"
 }
 ```
 
@@ -36,14 +39,11 @@ Then use it in package.json's script section to trigger a build:
 1. Check config in ./npmts.json
 1. Clean up from any previous builds (old js files)
 1. Install typings
-1. Transpile TypeScript with inline sourcemaps
-1. Create Declaration Files
+1. Transpile TypeScript with **inline sourcemaps** and **declaration files** 
 1. Create JsDoc Documentation
 1. Instrumentalize created JavaScript files with istanbul
 1. Run Tests
 1. Create Coverage report
-1. 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.
@@ -51,28 +51,13 @@ the npmts.json is the main config file. You can use it to customize the behaviou
 ```json
 {
   "mode":"default",
-  "codecov":{
-    "publish":true,
-    "token":"sometoken"
-  },
   "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
 }
 ```
@@ -86,14 +71,6 @@ the npmts.json is the main config file. You can use it to customize the behaviou
 | `"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/`.
-
-> 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
 `./dist/*.js` and `./test/test.js`
@@ -113,7 +90,8 @@ 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
+#### Typings for third party modules that do not bundle declaration files
+NPMTS does no longer supports typings.json. Instead use the new TypeScript 2.x approach to typings using the @types/ npm scope.
 
 #### Instrumentalize Code
 npmts instrumentalizes (using istanbul) the created JavaScript code to create a coverage report.
@@ -131,6 +109,12 @@ thanks to autogenerated source maps.
 
 > We will add more options over time.
 
+## Tips and tricks:
+
+* Use [npmts-g](https://www.npmjs.com/package/npmts-g) to use globally installed npmts and install npmts locally if no global npmts is available.
+* Use [npmpage](https://www.npmjs.com/package/npmtspage) to create a webpage from coverage reports and JsDocs for the module
+* Use [hosttoday/ht-docker-node:npmts](https://hub.docker.com/r/hosttoday/ht-docker-node/) for speedy CI builds
+
 ## About the authors:
 [![Project Phase](https://mediaserve.lossless.digital/lossless.com/img/createdby_github.svg)](https://lossless.com/)
 

assets/node-shebang.js

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

compile/compile.js

@@ -1,49 +0,0 @@
-// import gulp
-var plugins = {
-    beautylog: require("beautylog"),
-    gulp: require("gulp"),
-    g:{
-        typescript: require("gulp-typescript"),
-        typings:require("gulp-typings")
-    },
-    mergeStream: require("merge2"),
-    path: require("path")
-};
-
-paths = {
-    packageBase: plugins.path.resolve(
-        plugins.path.join(__dirname,"../")
-    )
-};
-
-plugins.beautylog.log('now compiling NPMTS');
-
-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("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');
-});
-
-plugins.gulp.start.apply(plugins.gulp, ['default']);

dist/index.d.ts

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

dist/index.js

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

dist/npmts.assets.d.ts

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

dist/npmts.assets.js

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

dist/npmts.clean.d.ts

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

dist/npmts.clean.js

@@ -5,7 +5,7 @@ var paths = require("./npmts.paths");
 var npmts_promisechain_1 = require("./npmts.promisechain");
 var removeDist = function () {
     npmts_promisechain_1.npmtsOra.text("cleaning " + "dist".yellow + " folder");
-    return plugins.smartfile.fsaction.remove(paths.distDir);
+    return plugins.smartfile.fs.remove(paths.distDir);
 };
 var removeTypings = function () {
     var done = plugins.Q.defer();

dist/npmts.cli.d.ts

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

dist/npmts.compile.d.ts

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

dist/npmts.compile.helpers.d.ts

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

dist/npmts.compile.helpers.js

@@ -1,12 +1,12 @@
 "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]));
+var outputPathIsDir = function (tsArrayArg, keyArg) {
+    return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, tsArrayArg[keyArg]));
 };
-exports.checkOutputPath = function (configArg, keyArg) {
-    if (!outputPathIsDir(configArg, keyArg)) {
-        plugins.beautylog.warn("Skipping " + keyArg + " because " + configArg.ts[keyArg] + " it is no directory!");
+exports.checkOutputPath = function (tsArrayArg, keyArg) {
+    if (!outputPathIsDir(tsArrayArg, keyArg)) {
+        plugins.beautylog.warn("Skipping " + keyArg + " because " + tsArrayArg[keyArg] + " it is no directory!");
         return false;
     }
     else {

dist/npmts.compile.js

@@ -1,45 +1,12 @@
 "use strict";
 require("typings-global");
 var plugins = require("./npmts.plugins");
-var paths = require("./npmts.paths");
 var helpers = require("./npmts.compile.helpers");
 var npmts_promisechain_1 = require("./npmts.promisechain");
-/**
- * handles definition to make them fit for modular use
- */
-var definitionHandler = function (configArg) {
-    npmts_promisechain_1.npmtsOra.text("now making declaration files ready");
+var promiseArray = [];
+var compileTs = function (tsFileArrayArg, tsOptionsArg) {
+    if (tsOptionsArg === void 0) { tsOptionsArg = {}; }
     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("made declaration files ready!");
-                done.resolve(configArg);
-            }
-            ;
-        }, "atEnd"));
-    }
-    return done.promise;
-};
-exports.run = function (configArg) {
-    var done = plugins.Q.defer();
-    var config = configArg;
-    npmts_promisechain_1.npmtsOra.text("now compiling " + "TypeScript".yellow);
-    var moduleStream = plugins.merge2({ end: false });
-    /* -------------------------------------------------
-     * ----------- compile TypeScript --------------------------
-     * ----------------------------------------------- */
     var tsOptionsDefault = {
         declaration: true,
         target: "ES5",
@@ -49,31 +16,42 @@ exports.run = function (configArg) {
      * merges default ts options with those found in npmts.json
      */
     var tsOptions = function (keyArg) {
-        return plugins.lodashObject.assign(tsOptionsDefault, config.tsOptions);
+        return plugins.lodashObject.assign(tsOptionsDefault, tsOptionsArg);
     };
-    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(config.ts[keyArg]));
-            var declarationStream = tsStream.dts
-                .pipe(plugins.gulp.dest(config.ts[keyArg]));
-            moduleStream.add(tsStream, jsStream, declarationStream);
-        }
-    }
-    moduleStream.on("queueDrain", function () {
-        moduleStream.on("finish", function () {
-            plugins.beautylog.ok("compiled TypeScript!");
-            definitionHandler(config)
-                .then(function () {
-                done.resolve(config);
+    var _loop_1 = function(keyArg) {
+        plugins.beautylog.info("TypeScript assignment: transpile from " + keyArg.blue + " to " + tsFileArrayArg[keyArg].blue);
+        if (helpers.checkOutputPath(tsFileArrayArg, keyArg)) {
+            var filesReadPromise = plugins.smartfile.fs.listFileTree(process.cwd(), keyArg)
+                .then(function (filesToConvertArg) {
+                var filesToConvertAbsolute = plugins.smartpath.transform.toAbsolute(filesToConvertArg, process.cwd());
+                var destDir = plugins.smartpath.transform.toAbsolute(tsFileArrayArg[keyArg], process.cwd());
+                var filesCompiledPromise = plugins.tsn.compile(filesToConvertAbsolute, destDir);
+                promiseArray.push(filesCompiledPromise);
             });
-        });
-        moduleStream.end();
-    });
-    /*==================== END TS Compilation =====================*/
+            promiseArray.push(filesReadPromise);
+        }
+    };
+    for (var keyArg in tsFileArrayArg) {
+        _loop_1(keyArg);
+    }
+    ;
+    plugins.Q.all(promiseArray)
+        .then(done.resolve);
+    return done.promise;
+};
+exports.run = function (configArg) {
+    var done = plugins.Q.defer();
+    var config = configArg;
+    npmts_promisechain_1.npmtsOra.text("now compiling " + "TypeScript".yellow);
+    compileTs(config.ts, config.tsOptions)
+        .then(function () {
+        plugins.beautylog.ok("compiled main TypeScript!");
+        plugins.beautylog.log("now compiling tests!");
+        return compileTs(config.testTs);
+    })
+        .then(function () {
+        plugins.beautylog.ok("compiled all TypeScript!");
+        done.resolve(config);
+    });
     return done.promise;
 };

dist/npmts.configfile.d.ts

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

dist/npmts.configfile.js

@@ -2,13 +2,16 @@
 require("typings-global");
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
-exports.run = function () {
+exports.run = function (argvArg) {
     var done = plugins.Q.defer();
     var config = {};
     var configPath = plugins.path.join(paths.cwd, "npmts.json");
-    if (plugins.smartfile.checks.fileExistsSync(configPath)) {
+    if (argvArg.notest) {
+        config.notest = true;
+    }
+    if (plugins.smartfile.fs.fileExistsSync(configPath)) {
         plugins.beautylog.info("npmts.json".blue + " config file found!");
-        config = plugins.smartfile.local.toObjectSync(configPath);
+        config = plugins.lodashObject.assign(config, plugins.smartfile.fs.toObjectSync(configPath));
         switch (config.mode) {
             case "default":
             case "custom":

dist/npmts.install.js

@@ -1,21 +0,0 @@
-"use strict";
-require("typings-global");
-var plugins = require("./npmts.plugins");
-var paths = require("./npmts.paths");
-var npmts_promisechain_1 = require("./npmts.promisechain");
-exports.run = function (configArg) {
-    var config = configArg;
-    var done = plugins.Q.defer();
-    /* -------------------------------------------------
-     * ----------- install typings ---------------
-     * ----------------------------------------------- */
-    npmts_promisechain_1.npmtsOra.text("now installing " + "typings".yellow);
-    var absoluteTypingsArray = plugins.smartpath.transform.toAbsolute(config.typings, paths.cwd);
-    plugins.gulp.src(absoluteTypingsArray)
-        .pipe(plugins.g.typings())
-        .pipe(plugins.g.gFunction(function () {
-        plugins.beautylog.ok("typings installed!");
-        done.resolve(config);
-    }, "atEnd"));
-    return done.promise;
-};

dist/npmts.jsdoc.d.ts

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

dist/npmts.jsdoc.js

@@ -20,34 +20,6 @@ var genJsdoc = function (configArg) {
     }));
     return done.promise;
 };
-exports.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";
-    plugins.beautylog.log("now publishing JsDoc documentation 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('Git failed!');
-        plugins.shelljs.exit(1);
-    }
-    plugins.beautylog.ok("JsDoc documentation has been deployed to GitHub!");
-    done.resolve(configArg);
-    return done.promise;
-};
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     genJsdoc(configArg)

dist/npmts.options.d.ts

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

dist/npmts.options.js

@@ -5,19 +5,6 @@ var npmts_promisechain_1 = require("./npmts.promisechain");
 exports.isCi = function () {
     return plugins.smartci.check.isCi();
 };
-exports.isRelease = function () {
-    return plugins.smartci.check.isCi()
-        && plugins.smartci.check.isTaggedCommit();
-};
-exports.doPublish = function () {
-    try {
-        return exports.isRelease()
-            && plugins.smartci.get.subJobNumber() == 1;
-    }
-    catch (err) {
-        return false;
-    }
-};
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
@@ -29,25 +16,21 @@ exports.run = function (configArg) {
         ];
         config.ts = (_a = {},
             _a["./ts/**/*.ts"] = "./dist/",
-            _a["./test/test.ts"] = "./test/",
             _a
         );
+        config.testTs = (_b = {},
+            _b["./test/test.ts"] = "./test/",
+            _b
+        );
         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 + DOCS when tests succeed!")
-        : plugins.beautylog.info("We are not publishing anything!");
     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;
+    var _a, _b;
 };

dist/npmts.paths.d.ts

@@ -0,0 +1,12 @@
+import "typings-global";
+export declare let npmtsPackageRoot: string;
+export declare let cwd: string;
+export declare let tsDir: string;
+export declare let distDir: string;
+export declare let docsDir: string;
+export declare let testDir: string;
+export declare let typingsDir: string;
+export declare let coverageDir: string;
+export declare let npmtsAssetsDir: string;
+export declare let indexTS: string;
+export declare let testTS: string;

dist/npmts.paths.js

@@ -1,7 +1,10 @@
 "use strict";
 require("typings-global");
 var plugins = require("./npmts.plugins");
-exports.cwd = plugins.smartcli.get.cwd().path;
+//Npmts Paths
+exports.npmtsPackageRoot = plugins.path.join(__dirname, "../");
+//Project paths
+exports.cwd = process.cwd();
 //Directories
 exports.tsDir = plugins.path.join(exports.cwd, "ts/");
 exports.distDir = plugins.path.join(exports.cwd, "dist/");

dist/npmts.plugins.d.ts

@@ -0,0 +1,26 @@
+import "typings-global";
+export import beautylog = require("beautylog");
+export declare let gulp: any;
+export declare let g: {
+    gFunction: any;
+    istanbul: any;
+    jsdoc3: any;
+    mocha: any;
+    replace: any;
+    sourcemaps: any;
+};
+export declare let lodashObject: any;
+export declare let merge2: any;
+export import projectinfo = require("projectinfo");
+export import path = require("path");
+export import Q = require("q");
+export import shelljs = require("shelljs");
+export declare let smartci: any;
+export import smartcli = require("smartcli");
+export declare let smartcov: any;
+export import smartenv = require("smartenv");
+export import smartfile = require("smartfile");
+export import smartpath = require("smartpath");
+export import smartstring = require("smartstring");
+export declare let sourceMapSupport: any;
+export import tsn = require("tsn");

dist/npmts.plugins.js

@@ -1,7 +1,6 @@
 "use strict";
 require("typings-global");
 exports.beautylog = require("beautylog");
-exports.fs = require("fs-extra");
 exports.gulp = require("gulp");
 exports.g = {
     gFunction: require("gulp-function"),
@@ -9,9 +8,7 @@ exports.g = {
     jsdoc3: require("gulp-jsdoc3"),
     mocha: require("gulp-mocha"),
     replace: require("gulp-replace"),
-    sourcemaps: require("gulp-sourcemaps"),
-    typescript: require("gulp-typescript"),
-    typings: require("gulp-typings")
+    sourcemaps: require("gulp-sourcemaps")
 };
 exports.lodashObject = require('lodash/fp/object');
 exports.merge2 = require("merge2");
@@ -27,3 +24,4 @@ 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
+exports.tsn = require("tsn");

dist/npmts.promisechain.d.ts

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

dist/npmts.promisechain.js

@@ -2,27 +2,23 @@
 require("typings-global");
 var plugins = require("./npmts.plugins");
 exports.npmtsOra = new plugins.beautylog.Ora("setting up TaskChain", "cyan");
-exports.npmtsOra.start();
 var NpmtsAssets = require("./npmts.assets");
 var NpmtsClean = require("./npmts.clean");
 var NpmtsCompile = require("./npmts.compile");
 var NpmtsConfigFile = require("./npmts.configfile");
-var NpmtsInstall = require("./npmts.install");
 var NpmtsJsdoc = require("./npmts.jsdoc");
 var NpmtsOptions = require("./npmts.options");
-var NpmtsPublish = require("./npmts.publish");
 var NpmtsTests = require("./npmts.tests");
-exports.promisechain = function () {
+exports.promisechain = function (argvArg) {
     var done = plugins.Q.defer();
-    NpmtsConfigFile.run()
+    exports.npmtsOra.start();
+    NpmtsConfigFile.run(argvArg)
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)
-        .then(NpmtsInstall.run)
         .then(NpmtsCompile.run)
         .then(NpmtsAssets.run)
         .then(NpmtsJsdoc.run)
         .then(NpmtsTests.run)
-        .then(NpmtsPublish.run)
         .then(function (configArg) {
         var shipString = "" +
             "\n" +

dist/npmts.publish.js

@@ -1,13 +0,0 @@
-"use strict";
-require("typings-global");
-var plugins = require("./npmts.plugins");
-var NpmtsJsdoc = require("./npmts.jsdoc");
-exports.run = function (configArg) {
-    var done = plugins.Q.defer();
-    var config = configArg;
-    var promiseArray = [];
-    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);
-    return done.promise;
-};

dist/npmts.tests.d.ts

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

dist/npmts.tests.js

@@ -11,7 +11,9 @@ var istanbul = function (configArg) {
     npmts_promisechain_1.npmtsOra.text("Instrumentalizing transpiled JS...");
     var done = plugins.Q.defer();
     var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "dist/*.js")])
+        .pipe(plugins.g.sourcemaps.init())
         .pipe(plugins.g.istanbul()) // Covering files
+        .pipe(plugins.g.sourcemaps.write())
         .pipe(plugins.g.istanbul.hookRequire()) // Force `require` to return covered files
         .pipe(plugins.g.gFunction(function () {
         plugins.beautylog.ok("JS has been instrumentalized to get test code coverage!");
@@ -56,13 +58,21 @@ var coverage = function (configArg) {
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
-    npmts_promisechain_1.npmtsOra.text("now starting tests");
-    plugins.beautylog.log("-------------------------------------------------------\n" +
-        "*************************** TESTS: ***************************\n" +
-        "--------------------------------------------------------------");
-    istanbul(config)
-        .then(mocha)
-        .then(coverage)
-        .then(done.resolve);
+    if (config.notest != true) {
+        npmts_promisechain_1.npmtsOra.text("now starting tests");
+        plugins.beautylog.log("-------------------------------------------------------\n" +
+            "*************************** TESTS: ***************************\n" +
+            "--------------------------------------------------------------");
+        istanbul(config)
+            .then(mocha)
+            .then(coverage)
+            .then(function () {
+            done.resolve(config);
+        });
+    }
+    else {
+        npmts_promisechain_1.npmtsOra.end();
+        done.resolve(config);
+    }
     return done.promise;
 };

package.json

@@ -1,15 +1,18 @@
 {
   "name": "npmts",
-  "version": "5.2.0",
+  "version": "5.3.9",
   "description": "write npm modules with TypeScript",
   "main": "dist/index.js",
   "bin": {
     "npmts": "dist/cli.js"
   },
   "scripts": {
-    "test": "(npm run compile && npm run check)",
-    "check": "(cd ./test/assets && node ../../dist/index.js)",
-    "compile": "(cd compile && node compile.js)"
+    "test": "(npm run compile && npm run setupCheck && npm run check && npm run checkVersion && npm run checkNoTest)",
+    "compile": "(rm -rf test/ && rm -r dist/ && mkdir dist/ && tsc && cp assets/cli.js dist/ )",
+    "setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)",
+    "check": "(cd test && node ../dist/index.js)",
+    "checkVersion": "(cd test/ && node ../dist/index.js -v)",
+    "checkNoTest": "(cd test && node ../dist/index.js --notest)"
   },
   "repository": {
     "type": "git",
@@ -26,33 +29,35 @@
   },
   "homepage": "https://gitlab.com/pushrocks/npmts#readme",
   "dependencies": {
-    "beautylog": "5.0.6",
-    "early": "^2.0.1",
-    "fs-extra": "^0.30.0",
+    "@types/minimatch": "^2.0.22-alpha",
+    "@types/q": "0.0.21-alpha",
+    "@types/shelljs": "^0.3.21-alpha",
+    "beautylog": "5.0.12",
+    "early": "^2.0.13",
     "gulp": "3.9.1",
     "gulp-concat": "^2.6.0",
-    "gulp-function": "^1.3.1",
+    "gulp-function": "^1.3.6",
     "gulp-if": "^2.0.1",
-    "gulp-istanbul": "^0.10.4",
-    "gulp-jsdoc3": "^0.2.1",
+    "gulp-istanbul": "^1.0.0",
+    "gulp-jsdoc3": "^0.3.0",
     "gulp-mocha": "^2.2.0",
     "gulp-replace": "^0.5.4",
-    "gulp-sourcemaps": "^2.0.0-alpha",
-    "gulp-typescript": "2.13.4",
-    "gulp-typings": "2.0.0",
+    "gulp-sourcemaps": "^1.6.0",
     "lodash": "^4.13.1",
     "merge2": "1.0.2",
-    "projectinfo": "1.0.1",
+    "projectinfo": "1.0.3",
     "q": "^1.4.1",
     "shelljs": "^0.7.0",
     "smartci": "0.0.1",
-    "smartcli": "0.0.11",
+    "smartcli": "1.0.4",
     "smartcov": "0.0.6",
     "smartenv": "1.2.5",
-    "smartfile": "3.0.10",
-    "smartpath": "3.2.1",
-    "smartstring": "^2.0.1",
-    "source-map-support": "^0.4.0",
+    "smartfile": "4.0.10",
+    "smartpath": "3.2.2",
+    "smartstring": "^2.0.10",
+    "source-map-support": "^0.4.1",
+    "tsn": "^1.0.5",
+    "typescript": "^2.0.0-dev.20160630",
     "typings-global": "*"
   },
   "devDependencies": {}

test/assets/custom.js

@@ -1,3 +0,0 @@
-var hello = "hello";
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImN1c3RvbS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxJQUFJLEtBQUssR0FBRyxPQUFPLENBQUMiLCJmaWxlIjoiY3VzdG9tLmpzIiwic291cmNlc0NvbnRlbnQiOlsidmFyIGhlbGxvID0gXCJoZWxsb1wiOyJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==

test/assets/customdir/custom.js

@@ -1,2 +0,0 @@
-var hello = "hello";
-//# sourceMappingURL=custom.js.map

test/assets/customdir/custom.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"custom.js","sourceRoot":"","sources":["custom.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,OAAO,CAAC"}

test/assets/customdir/custom.ts

@@ -1 +0,0 @@
-var hello = "hello";

test/assets/customdir/tsfile1.js

@@ -1,2 +0,0 @@
-var something = "something";
-//# sourceMappingURL=tsfile1.js.map

test/assets/customdir/tsfile1.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tsfile1.js","sourceRoot":"","sources":["tsfile1.ts"],"names":[],"mappings":"AAAA,IAAI,SAAS,GAAG,WAAW,CAAC"}

test/assets/customdir/tsfile1.ts

@@ -1 +0,0 @@
-var something = "something";

test/assets/customdir/typings.json

@@ -1,7 +0,0 @@
-{
-  "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/dist/index.d.ts

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

test/assets/dist/index.js

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

test/assets/npmts.json

@@ -1,19 +0,0 @@
-{
-  "mode":"default",
-  "ts":{
-    "./customdir/*.ts":"./"
-  },
-  "tsOptions":{
-    "target":"ES5"
-  },
-  "typings":[
-    "./ts/typings.json",
-    "./subts1/typings.json",
-    "./subts2/typings.json",
-    "./customdir/typings.json"
-  ],
-  "docs": {
-    "publish":true
-  },
-  "cli":true
-}

test/assets/package.json

@@ -1,16 +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": {}
-}

test/assets/subts1/typings.json

@@ -1,7 +0,0 @@
-{
-  "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/test/test.d.ts

@@ -1 +0,0 @@
-declare var testplugin: any;

test/assets/test/test.js

@@ -1,11 +0,0 @@
-/// <reference path="../ts/typings/index.d.ts" />
-var testplugin = require("../dist/index.js");
-describe("testplugins", function () {
-    describe(".logSomething", function () {
-        it("should log something", function () {
-            testplugin.logSomething();
-        });
-    });
-});
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsaURBQWlEO0FBQ2pELElBQUksVUFBVSxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0FBQzdDLFFBQVEsQ0FBQyxhQUFhLEVBQUM7SUFDbkIsUUFBUSxDQUFDLGVBQWUsRUFBQztRQUNyQixFQUFFLENBQUMsc0JBQXNCLEVBQUM7WUFDdEIsVUFBVSxDQUFDLFlBQVksRUFBRSxDQUFBO1FBQzdCLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4uL3RzL3R5cGluZ3MvaW5kZXguZC50c1wiIC8+XHJcbnZhciB0ZXN0cGx1Z2luID0gcmVxdWlyZShcIi4uL2Rpc3QvaW5kZXguanNcIik7XHJcbmRlc2NyaWJlKFwidGVzdHBsdWdpbnNcIixmdW5jdGlvbigpe1xyXG4gICAgZGVzY3JpYmUoXCIubG9nU29tZXRoaW5nXCIsZnVuY3Rpb24oKXtcclxuICAgICAgICBpdChcInNob3VsZCBsb2cgc29tZXRoaW5nXCIsZnVuY3Rpb24oKXtcclxuICAgICAgICAgICAgdGVzdHBsdWdpbi5sb2dTb21ldGhpbmcoKVxyXG4gICAgICAgIH0pO1xyXG4gICAgfSk7XHJcbn0pOyJdfQ==

test/assets/test/test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,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,9 +0,0 @@
-/// <reference path="../ts/typings/index.d.ts" />
-var testplugin = require("../dist/index.js");
-describe("testplugins",function(){
-    describe(".logSomething",function(){
-        it("should log something",function(){
-            testplugin.logSomething()
-        });
-    });
-});

test/assets/test/typings.json

@@ -1,8 +0,0 @@
-{
-  "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/index.ts

@@ -1,7 +0,0 @@
-/// <reference path="./typings/index.d.ts" />
-let testplugin = {
-    logSomething: function(){
-        console.log("only function executed");
-    }
-};
-module.exports = testplugin;

test/assets/ts/typings.json

@@ -1,8 +0,0 @@
-{
-  "globalDependencies": {
-    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts",
-    "mocha": "github:Bartvds/tsd-deftools/typings/DefinitelyTyped/mocha/mocha.d.ts",
-    "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts",
-    "vinyl": "github:DefinitelyTyped/DefinitelyTyped/vinyl/vinyl.d.ts"
-  }
-}

test/assets/tsfile1.js

@@ -1,3 +0,0 @@
-var something = "something";
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRzZmlsZTEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBSSxTQUFTLEdBQUcsV0FBVyxDQUFDIiwiZmlsZSI6InRzZmlsZTEuanMiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgc29tZXRoaW5nID0gXCJzb21ldGhpbmdcIjsiXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=

ts/index.ts

@@ -1,16 +1,30 @@
 import "typings-global";
+
+/* ================================================== *
+    Starting NPMTS main process.
+ * ================================================== */
 import * as early from "early";
 early.start("NPMTS");
 import * as plugins from "./npmts.plugins"
+import * as paths from "./npmts.paths";
 import {promisechain} from "./npmts.promisechain";
-early.stop();
+early.stop()
+    .then(() => {
+        let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot);
 
-plugins.beautylog.figletSync("NPMTS");
-
-try {
-    promisechain();
-}
-catch(err){
-    console.log(err);
-}
+        let npmtsCli = new plugins.smartcli.Smartcli();
+        npmtsCli.standardTask()
+            .then((argvArg) => {
+                plugins.beautylog.figletSync("NPMTS");
+                plugins.beautylog.info("npmts version: " + npmtsProjectInfo.version);
+                try {
+                    promisechain(argvArg);
+                }
+                catch(err){
+                    console.log(err);
+                }
+            });
 
+        npmtsCli.addVersion(npmtsProjectInfo.version);
+        npmtsCli.startParse();
+    });

ts/npmts.assets.ts

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

ts/npmts.clean.ts

@@ -5,7 +5,7 @@ import {npmtsOra} from "./npmts.promisechain";
 
 let removeDist = function(){
     npmtsOra.text("cleaning " + "dist".yellow + " folder");
-    return plugins.smartfile.fsaction.remove(paths.distDir);
+    return plugins.smartfile.fs.remove(paths.distDir);
 };
 
 let removeTypings = function(){

ts/npmts.compile.helpers.ts

@@ -1,13 +1,13 @@
 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]));
+let outputPathIsDir = function (tsArrayArg,keyArg) {
+        return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, tsArrayArg[keyArg]));
 };
 
-export let checkOutputPath = function(configArg,keyArg){
-    if(!outputPathIsDir(configArg,keyArg)) {
-        plugins.beautylog.warn("Skipping " + keyArg + " because " + configArg.ts[keyArg] + " it is no directory!")
+export let checkOutputPath = function(tsArrayArg,keyArg){
+    if(!outputPathIsDir(tsArrayArg,keyArg)) {
+        plugins.beautylog.warn("Skipping " + keyArg + " because " + tsArrayArg[keyArg] + " it is no directory!")
         return false
     } else {
         return true;

ts/npmts.compile.ts

@@ -4,45 +4,9 @@ import paths = require("./npmts.paths");
 import helpers = require("./npmts.compile.helpers");
 import {npmtsOra} from "./npmts.promisechain";
 
-/**
- * handles definition to make them fit for modular use
- */
-let definitionHandler = function(configArg){
-    npmtsOra.text("now making declaration files ready");
+let promiseArray = [];
+let compileTs = (tsFileArrayArg:string[],tsOptionsArg = {}) => {
     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("made declaration files ready!");
-                    done.resolve(configArg)
-                };
-            },"atEnd"));
-        
-    }
-    return done.promise;
-}
-
-
-export let run = function (configArg) {
-    let done = plugins.Q.defer();
-    let config = configArg;
-    npmtsOra.text("now compiling " + "TypeScript".yellow);
-    let moduleStream = plugins.merge2({ end: false });
-
-    /* -------------------------------------------------
-     * ----------- compile TypeScript --------------------------
-     * ----------------------------------------------- */
 
     let tsOptionsDefault = {
         declaration: true,
@@ -54,37 +18,44 @@ export let run = function (configArg) {
      * merges default ts options with those found in npmts.json
      */
     let tsOptions = function (keyArg:string) {
-        return plugins.lodashObject.assign(tsOptionsDefault, config.tsOptions)
+        return plugins.lodashObject.assign(tsOptionsDefault, tsOptionsArg)
     };
-
-    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.gulp.dest(config.ts[keyArg]));
-            let declarationStream = tsStream.dts
-                .pipe(plugins.gulp.dest(config.ts[keyArg])); 
-            moduleStream.add(tsStream,jsStream,declarationStream);
-        }
-    }
-
-    moduleStream.on("queueDrain", function () {
-        moduleStream.on("finish", function () {
-            plugins.beautylog.ok("compiled TypeScript!");
-            definitionHandler(config)
-                .then(function(){
-                    done.resolve(config);
+    for (let keyArg in tsFileArrayArg) {
+        plugins.beautylog.info(`TypeScript assignment: transpile from ${keyArg.blue} to ${tsFileArrayArg[keyArg].blue}`);
+        if (helpers.checkOutputPath(tsFileArrayArg,keyArg)) {
+            let filesReadPromise = plugins.smartfile.fs.listFileTree(process.cwd(),keyArg)
+                .then((filesToConvertArg) => {
+                    let filesToConvertAbsolute = plugins.smartpath.transform.toAbsolute(filesToConvertArg,process.cwd());
+                    let destDir = plugins.smartpath.transform.toAbsolute(tsFileArrayArg[keyArg],process.cwd());
+                    let filesCompiledPromise = plugins.tsn.compile(
+                        filesToConvertAbsolute,
+                        destDir
+                    );
+                    promiseArray.push(filesCompiledPromise);
                 });
+            promiseArray.push(filesReadPromise);
+        }
+    };
+    plugins.Q.all(promiseArray)
+        .then(done.resolve);
+    return done.promise;
+}
+
+
+export let run = function (configArg) {
+    let done = plugins.Q.defer();
+    let config = configArg;
+    npmtsOra.text("now compiling " + "TypeScript".yellow);
+    
+    compileTs(config.ts,config.tsOptions)
+        .then(() => {
+            plugins.beautylog.ok("compiled main TypeScript!");
+            plugins.beautylog.log("now compiling tests!");
+            return compileTs(config.testTs);
+        })
+        .then(function () {
+            plugins.beautylog.ok("compiled all TypeScript!");
+            done.resolve(config);
         });
-        moduleStream.end();
-    });
-    /*==================== END TS Compilation =====================*/
-
-
-
     return done.promise;
 };

ts/npmts.configfile.ts

@@ -1,13 +1,19 @@
 import "typings-global";
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
-export var run = function(){
+export var run = function(argvArg){
     var done = plugins.Q.defer();
     var config:any = {};
     var configPath = plugins.path.join(paths.cwd,"npmts.json");
-    if(plugins.smartfile.checks.fileExistsSync(configPath)){
+    if(argvArg.notest){
+        config.notest = true;
+    }
+    if(plugins.smartfile.fs.fileExistsSync(configPath)){
         plugins.beautylog.info("npmts.json".blue + " config file found!");
-        config = plugins.smartfile.local.toObjectSync(configPath);
+        config = plugins.lodashObject.assign(
+            config,
+            plugins.smartfile.fs.toObjectSync(configPath)
+        );
         switch (config.mode){
             case "default":
             case "custom":

ts/npmts.install.ts

@@ -1,21 +0,0 @@
-import "typings-global";
-import plugins = require("./npmts.plugins");
-import paths = require("./npmts.paths");
-import {npmtsOra} from "./npmts.promisechain";
-
-export var run = function(configArg){
-    var config = configArg;
-    var done = plugins.Q.defer();
-    /* -------------------------------------------------
-     * ----------- install typings ---------------
-     * ----------------------------------------------- */
-    npmtsOra.text("now installing " + "typings".yellow);
-    var absoluteTypingsArray = plugins.smartpath.transform.toAbsolute(config.typings,paths.cwd);
-    plugins.gulp.src(absoluteTypingsArray)
-        .pipe(plugins.g.typings())
-        .pipe(plugins.g.gFunction(function(){
-            plugins.beautylog.ok("typings installed!");
-            done.resolve(config);
-        },"atEnd"));
-    return done.promise;
-};

ts/npmts.jsdoc.ts

@@ -21,41 +21,6 @@ let genJsdoc = function(configArg){
     return done.promise;
 };
 
-export let publishDocs = function(configArg){
-    let done = plugins.Q.defer();
-    let gitUrl = plugins.projectinfo.npm(
-        paths.cwd,
-        {
-            gitAccessToken:process.env.GITHUB_TOKEN
-        }
-    ).git.httpsUrl;
-
-    let 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";
-
-
-    plugins.beautylog.log("now publishing JsDoc documentation 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('Git failed!');
-        plugins.shelljs.exit(1);
-    }
-    plugins.beautylog.ok("JsDoc documentation has been deployed to GitHub!");
-    done.resolve(configArg);
-
-    return done.promise;
-};
-
 
 export let run = function(configArg){
     let done = plugins.Q.defer();

ts/npmts.options.ts

@@ -6,21 +6,6 @@ export let isCi = function(){
     return plugins.smartci.check.isCi();
 };
 
-export let isRelease = function():boolean {
-    return plugins.smartci.check.isCi()
-        && plugins.smartci.check.isTaggedCommit();
-};
-
-export let doPublish = function():boolean {
-    try {
-        return isRelease()
-            && plugins.smartci.get.subJobNumber() == 1;
-    }
-    catch (err){
-        return false;
-    }  
-};
-
 export var run = function(configArg){
     var done = plugins.Q.defer();
     var config = configArg;
@@ -33,7 +18,9 @@ export var run = function(configArg){
             "./ts/typings.json"
         ];
         config.ts = {
-            ["./ts/**/*.ts"]: "./dist/",
+            ["./ts/**/*.ts"]: "./dist/"
+        };
+        config.testTs = {
             ["./test/test.ts"]: "./test/"
         };
         config.test = ["./index.js"];
@@ -42,21 +29,12 @@ export var run = function(configArg){
     //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 + DOCS when tests succeed!")
-        : plugins.beautylog.info("We are not publishing anything!");
-
     
 
     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);

ts/npmts.paths.ts

@@ -1,7 +1,12 @@
 import "typings-global";
 import plugins = require("./npmts.plugins");
 
-export let cwd = plugins.smartcli.get.cwd().path;
+//Npmts Paths
+export let npmtsPackageRoot = plugins.path.join(__dirname,"../");
+
+
+//Project paths
+export let cwd = process.cwd();
 
 //Directories
 export let tsDir = plugins.path.join(cwd,"ts/");

ts/npmts.plugins.ts

@@ -1,6 +1,5 @@
 import "typings-global";
 export import beautylog = require("beautylog");
-export let fs = require("fs-extra");
 export let gulp = require("gulp");
 export let g = {
     gFunction: require("gulp-function"),
@@ -8,22 +7,20 @@ export let g = {
     jsdoc3: require("gulp-jsdoc3"),
     mocha: require("gulp-mocha"),
     replace: require("gulp-replace"),
-    sourcemaps: require("gulp-sourcemaps"),
-    typescript: require("gulp-typescript"),
-    typings: require("gulp-typings")
-
+    sourcemaps: require("gulp-sourcemaps")
 };
 export let lodashObject = require('lodash/fp/object');
 export let merge2 = require("merge2");
-export let projectinfo = require("projectinfo");
-export let path = require("path");
-export let Q = require("q");
-export let shelljs = require("shelljs");
+export import projectinfo = require("projectinfo");
+export import path = require("path");
+export import Q = require("q");
+export import shelljs = require("shelljs");
 export let smartci = require("smartci");
-export let smartcli = require("smartcli");
+export import smartcli = require("smartcli");
 export let smartcov = require("smartcov");
-export let smartenv = require("smartenv");
-export let smartfile = require("smartfile");
+export import smartenv = require("smartenv");
+export import smartfile = require("smartfile");
 export import smartpath = require("smartpath");
 export import smartstring = require("smartstring");
-export let sourceMapSupport = require("source-map-support").install(); // this is required to display errors correctly during testing
+export let sourceMapSupport = require("source-map-support").install(); // this is required to display errors correctly during testing
+export import tsn = require("tsn");

ts/npmts.promisechain.ts

@@ -1,30 +1,27 @@
 import "typings-global";
 import plugins = require("./npmts.plugins");
+import {Ora} from "beautylog"
 
 export let npmtsOra = new plugins.beautylog.Ora("setting up TaskChain","cyan");
-npmtsOra.start();
 
 import NpmtsAssets = require("./npmts.assets");
 import NpmtsClean = require("./npmts.clean");
 import NpmtsCompile = require("./npmts.compile");
 import NpmtsConfigFile = require("./npmts.configfile");
-import NpmtsInstall = require("./npmts.install");
 import NpmtsJsdoc = require("./npmts.jsdoc");
 import NpmtsOptions = require("./npmts.options");
-import NpmtsPublish = require("./npmts.publish");
 import NpmtsTests = require("./npmts.tests");
 
-export let promisechain = function(){
+export let promisechain = function(argvArg){
     let done = plugins.Q.defer();
-    NpmtsConfigFile.run()
+    npmtsOra.start();
+    NpmtsConfigFile.run(argvArg)
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)
-        .then(NpmtsInstall.run)
         .then(NpmtsCompile.run)
         .then(NpmtsAssets.run)
         .then(NpmtsJsdoc.run)
         .then(NpmtsTests.run)
-        .then(NpmtsPublish.run)
         .then(function(configArg){
             let shipString = "" +
                 "\n" +

ts/npmts.publish.ts

@@ -1,15 +0,0 @@
-import "typings-global";
-import plugins = require("./npmts.plugins");
-import paths = require("./npmts.paths");
-import NpmtsJsdoc = require("./npmts.jsdoc");
-
-export let run = function(configArg){
-    let done = plugins.Q.defer();
-    let config = configArg;
-    let promiseArray = [];
-    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);
-    return done.promise;
-};

ts/npmts.tests.ts

@@ -11,7 +11,9 @@ let istanbul = function (configArg) {
     npmtsOra.text("Instrumentalizing transpiled JS...");
     let done = plugins.Q.defer();
     var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"dist/*.js")])
+        .pipe(plugins.g.sourcemaps.init())
         .pipe(plugins.g.istanbul()) // Covering files
+        .pipe(plugins.g.sourcemaps.write())
         .pipe(plugins.g.istanbul.hookRequire()) // Force `require` to return covered files
         .pipe(plugins.g.gFunction(function(){
             plugins.beautylog.ok("JS has been instrumentalized to get test code coverage!");
@@ -62,17 +64,23 @@ let coverage = function(configArg){
 export let run = function(configArg) {
     let done = plugins.Q.defer();
     let config = configArg;
+    if(config.notest != true){
+        npmtsOra.text("now starting tests");
+        plugins.beautylog.log(
+            "-------------------------------------------------------\n" +
+            "*************************** TESTS: ***************************\n" +
+            "--------------------------------------------------------------"
+        );
 
-    npmtsOra.text("now starting tests");
-    plugins.beautylog.log(
-        "-------------------------------------------------------\n" +
-        "*************************** TESTS: ***************************\n" +
-        "--------------------------------------------------------------"
-    );
-
-    istanbul(config)
-        .then(mocha)
-        .then(coverage)
-        .then(done.resolve);
+        istanbul(config)
+            .then(mocha)
+            .then(coverage)
+            .then(() => {
+                done.resolve(config);
+            });
+    } else {
+        npmtsOra.end();
+        done.resolve(config);
+    }
     return done.promise;
 };

ts/typings.json

@@ -1,8 +0,0 @@
-{
-  "globalDependencies": {
-    "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"
-  }
-}

tsconfig.json

@@ -0,0 +1,8 @@
+{
+    "compilerOptions": {
+        "declaration": true,
+        "module": "commonjs",
+        "target": "ES5",
+        "outDir": "./dist/"
+    }
+}