now compiling Tests seperately

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

@@ -12,7 +12,7 @@ let definitionHandler = function(configArg){
     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?");
+        plugins.beautylog.warn("No TS file and thus no definitions found!");
         done.resolve(configArg); //if there are no definition files, resolve...
     }
     let localCounter = 0;
@@ -33,17 +33,10 @@ let definitionHandler = function(configArg){
     return done.promise;
 }
 
-
-export let run = function (configArg) {
+let compileTs = (tsFileArrayArg,tsOptionsArg = {}) => {
     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,
         target: "ES5",
@@ -54,34 +47,45 @@ 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)) {
+    for (let keyArg in tsFileArrayArg) {
+        if (helpers.checkOutputPath(tsFileArrayArg,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]));
+                .pipe(plugins.gulp.dest(tsFileArrayArg[keyArg]));
             let declarationStream = tsStream.dts
-                .pipe(plugins.gulp.dest(config.ts[keyArg])); 
+                .pipe(plugins.gulp.dest(tsFileArrayArg[keyArg])); 
             moduleStream.add(tsStream,jsStream,declarationStream);
         }
     }
+    moduleStream.on("queueDrain",() => {
+        done.resolve();
+    })
+    return done.promise;
+}
 
-    moduleStream.on("queueDrain", function () {
-        moduleStream.on("finish", function () {
+
+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(() => {
+            compileTs(config.tsTest);
+        })
+        .then(function () {
             plugins.beautylog.ok("compiled TypeScript!");
             definitionHandler(config)
-                .then(function(){
-                    done.resolve(config);
-                });
+            .then(function(){
+                done.resolve(config);
+            });
         });
-        moduleStream.end();
-    });
     /*==================== END TS Compilation =====================*/
 
 

ts/npmts.options.ts

@@ -33,7 +33,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"];