5.3.5

.gitignore

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

README.md

@@ -37,8 +37,7 @@ Then add it to your 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. Transpile TypeScript with **inline sourcemaps** and **declaration files** 
-1. Create Declaration Files
 1. Create JsDoc Documentation
 1. Instrumentalize created JavaScript files with istanbul
 1. Run Tests

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/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.js

@@ -1,41 +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");
-/**
+var promiseArray = [];
- * handles definition to make them fit for modular use
- */
-var definitionHandler = function (configArg) {
-    npmts_promisechain_1.npmtsOra.text("now making declaration files ready");
-    var done = plugins.Q.defer();
-    var configTsLenght = Object.keys(configArg.ts).length;
-    if (configTsLenght == 0) {
-        plugins.beautylog.warn("No TS file and thus no definitions found!");
-        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;
-};
 var compileTs = function (tsFileArrayArg, tsOptionsArg) {
     if (tsOptionsArg === void 0) { tsOptionsArg = {}; }
     var done = plugins.Q.defer();
-    var moduleStream = plugins.merge2({ end: false });
     var tsOptionsDefault = {
         declaration: true,
         target: "ES5",
@@ -47,22 +18,25 @@ var compileTs = function (tsFileArrayArg, tsOptionsArg) {
     var tsOptions = function (keyArg) {
         return plugins.lodashObject.assign(tsOptionsDefault, tsOptionsArg);
     };
-    for (var keyArg in tsFileArrayArg) {
+    var _loop_1 = function(keyArg) {
+        plugins.beautylog.info("TypeScript assignment: transpile from " + keyArg.blue + " to " + tsFileArrayArg[keyArg].blue);
         if (helpers.checkOutputPath(tsFileArrayArg, keyArg)) {
-            var tsStream = plugins.gulp.src([plugins.path.join(paths.cwd, keyArg), "!**/typings/**"])
+            var filesReadPromise = plugins.smartfile.fs.listFileTree(process.cwd(), keyArg)
-                .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
+                .then(function (filesToConvertArg) {
-                .pipe(plugins.g.typescript(tsOptions(keyArg)));
+                var filesToConvertAbsolute = plugins.smartpath.transform.toAbsolute(filesToConvertArg, process.cwd());
-            var jsStream = tsStream.js
+                var destDir = plugins.smartpath.transform.toAbsolute(tsFileArrayArg[keyArg], process.cwd());
-                .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
+                var filesCompiledPromise = plugins.tsn.compile(filesToConvertAbsolute, destDir);
-                .pipe(plugins.gulp.dest(tsFileArrayArg[keyArg]));
+                promiseArray.push(filesCompiledPromise);
-            var declarationStream = tsStream.dts
-                .pipe(plugins.gulp.dest(tsFileArrayArg[keyArg]));
-            moduleStream.add(tsStream, jsStream, declarationStream);
-        }
-    }
-    moduleStream.on("queueDrain", function () {
-        done.resolve();
             });
+            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) {
@@ -71,15 +45,13 @@ exports.run = function (configArg) {
     npmts_promisechain_1.npmtsOra.text("now compiling " + "TypeScript".yellow);
     compileTs(config.ts, config.tsOptions)
         .then(function () {
-        compileTs(config.testTs);
+        plugins.beautylog.ok("compiled main TypeScript!");
+        plugins.beautylog.log("now compiling tests!");
+        return compileTs(config.testTs);
     })
         .then(function () {
-        plugins.beautylog.ok("compiled TypeScript!");
+        plugins.beautylog.ok("compiled all TypeScript!");
-        definitionHandler(config)
-            .then(function () {
         done.resolve(config);
     });
-    });
-    /*==================== END TS Compilation =====================*/
     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

@@ -9,9 +9,9 @@ exports.run = function (argvArg) {
     if (argvArg.notest) {
         config.notest = true;
     }
-    if (plugins.smartfile.checks.fileExistsSync(configPath)) {
+    if (plugins.smartfile.fs.fileExistsSync(configPath)) {
         plugins.beautylog.info("npmts.json".blue + " config file found!");
-        config = plugins.lodashObject.assign(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.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.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.plugins.d.ts

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

@@ -6,7 +6,6 @@ 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 NpmtsTests = require("./npmts.tests");
@@ -16,7 +15,6 @@ exports.promisechain = function (argvArg) {
     NpmtsConfigFile.run(argvArg)
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)
-        .then(NpmtsInstall.run)
         .then(NpmtsCompile.run)
         .then(NpmtsAssets.run)
         .then(NpmtsJsdoc.run)

dist/npmts.publish.js

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

package.json

@@ -1,17 +1,19 @@
 {
   "name": "npmts",
-  "version": "5.3.4",
+  "version": "5.3.5",
   "description": "write npm modules with TypeScript",
   "main": "dist/index.js",
   "bin": {
     "npmts": "dist/cli.js"
   },
   "scripts": {
-    "test": "(npm run compile && npm run check && npm run checkVersion && npm run checkNoTest)",
+    "test": "(npm run compile && npm run setupCheck && npm run check && npm run checkVersion && npm run checkNoTest)",
-    "check": "(cd ./test/assets && node ../../dist/index.js)",
+    "compile": "(rm -rf test/ && rm -r dist/ && mkdir dist/ && tsc && cp assets/cli.js dist/ )",
-    "checkVersion": "cd ./test/assets && node ../../dist/index.js -v",
+    "setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)",
-    "checkNoTest": "cd ./test/assets && node ../../dist/index.js --notest",
+    "check": "(cd test && node ../dist/index.js)",
-    "compile": "(cd compile && node compile.js)"
+    "checkVersion": "(cd test/ && node ../dist/index.js -v)",
+    "checkNoTest": "(cd test && node ../dist/index.js --notest)",
+    "install": "(mkdir test/)"
   },
   "repository": {
     "type": "git",
@@ -28,9 +30,11 @@
   },
   "homepage": "https://gitlab.com/pushrocks/npmts#readme",
   "dependencies": {
-    "beautylog": "5.0.11",
+    "@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",
-    "fs-extra": "^0.30.0",
     "gulp": "3.9.1",
     "gulp-concat": "^2.6.0",
     "gulp-function": "^1.3.6",
@@ -39,22 +43,21 @@
     "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.6",
-    "gulp-typings": "2.0.0",
     "lodash": "^4.13.1",
     "merge2": "1.0.2",
     "projectinfo": "1.0.3",
     "q": "^1.4.1",
     "shelljs": "^0.7.0",
     "smartci": "0.0.1",
-    "smartcli": "1.0.2",
+    "smartcli": "1.0.4",
     "smartcov": "0.0.6",
     "smartenv": "1.2.5",
-    "smartfile": "3.0.10",
+    "smartfile": "4.0.9",
     "smartpath": "3.2.2",
-    "smartstring": "^2.0.6",
+    "smartstring": "^2.0.10",
-    "source-map-support": "^0.4.0",
+    "source-map-support": "^0.4.1",
+    "tsn": "^1.0.3",
+    "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,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDZDQUE2QztBQUM3QyxJQUFJLFVBQVUsR0FBRztJQUNiLFlBQVksRUFBRTtRQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQztJQUMxQyxDQUFDO0NBQ0osQ0FBQztBQUNGLE1BQU0sQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9pbmRleC5kLnRzXCIgLz5cbmxldCB0ZXN0cGx1Z2luID0ge1xuICAgIGxvZ1NvbWV0aGluZzogZnVuY3Rpb24oKXtcbiAgICAgICAgY29uc29sZS5sb2coXCJvbmx5IGZ1bmN0aW9uIGV4ZWN1dGVkXCIpO1xuICAgIH1cbn07XG5tb2R1bGUuZXhwb3J0cyA9IHRlc3RwbHVnaW47Il19

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,2 +0,0 @@
-/// <reference path="../ts/typings/index.d.ts" />
-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+XG52YXIgdGVzdHBsdWdpbiA9IHJlcXVpcmUoXCIuLi9kaXN0L2luZGV4LmpzXCIpO1xuZGVzY3JpYmUoXCJ0ZXN0cGx1Z2luc1wiLGZ1bmN0aW9uKCl7XG4gICAgZGVzY3JpYmUoXCIubG9nU29tZXRoaW5nXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgaXQoXCJzaG91bGQgbG9nIHNvbWV0aGluZ1wiLGZ1bmN0aW9uKCl7XG4gICAgICAgICAgICB0ZXN0cGx1Z2luLmxvZ1NvbWV0aGluZygpXG4gICAgICAgIH0pO1xuICAgIH0pO1xufSk7Il19

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/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.ts

@@ -4,38 +4,9 @@ import paths = require("./npmts.paths");
 import helpers = require("./npmts.compile.helpers");
 import {npmtsOra} from "./npmts.promisechain";
 
-/**
+let promiseArray = [];
- * handles definition to make them fit for modular use
+let compileTs = (tsFileArrayArg:string[],tsOptionsArg = {}) => {
- */
-let definitionHandler = function(configArg){
-    npmtsOra.text("now making declaration files ready");
     let done = plugins.Q.defer();
-    let configTsLenght = Object.keys(configArg.ts).length;
-    if(configTsLenght == 0) {
-        plugins.beautylog.warn("No TS file and thus no definitions found!");
-        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;
-}
-
-let compileTs = (tsFileArrayArg,tsOptionsArg = {}) => {
-    let done = plugins.Q.defer();
-    let moduleStream = plugins.merge2({ end: false });
 
     let tsOptionsDefault = {
         declaration: true,
@@ -50,22 +21,23 @@ let compileTs = (tsFileArrayArg,tsOptionsArg = {}) => {
         return plugins.lodashObject.assign(tsOptionsDefault, tsOptionsArg)
     };
     for (let keyArg in tsFileArrayArg) {
+        plugins.beautylog.info(`TypeScript assignment: transpile from ${keyArg.blue} to ${tsFileArrayArg[keyArg].blue}`);
         if (helpers.checkOutputPath(tsFileArrayArg,keyArg)) {
-            let tsStream = plugins.gulp.src([plugins.path.join(paths.cwd, keyArg), "!**/typings/**"])
+            let filesReadPromise = plugins.smartfile.fs.listFileTree(process.cwd(),keyArg)
-                .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
+                .then((filesToConvertArg) => {
-                .pipe(plugins.g.typescript(tsOptions(keyArg)));
+                    let filesToConvertAbsolute = plugins.smartpath.transform.toAbsolute(filesToConvertArg,process.cwd());
-            
+                    let destDir = plugins.smartpath.transform.toAbsolute(tsFileArrayArg[keyArg],process.cwd());
-            let jsStream = tsStream.js
+                    let filesCompiledPromise = plugins.tsn.compile(
-                .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
+                        filesToConvertAbsolute,
-                .pipe(plugins.gulp.dest(tsFileArrayArg[keyArg]));
+                        destDir
-            let declarationStream = tsStream.dts
+                    );
-                .pipe(plugins.gulp.dest(tsFileArrayArg[keyArg])); 
+                    promiseArray.push(filesCompiledPromise);
-            moduleStream.add(tsStream,jsStream,declarationStream);
+                });
+            promiseArray.push(filesReadPromise);
         }
-    }
+    };
-    moduleStream.on("queueDrain",() => {
+    plugins.Q.all(promiseArray)
-        done.resolve();
+        .then(done.resolve);
-    })
     return done.promise;
 }
 
@@ -77,18 +49,13 @@ export let run = function (configArg) {
     
     compileTs(config.ts,config.tsOptions)
         .then(() => {
-            compileTs(config.testTs);
+            plugins.beautylog.ok("compiled main TypeScript!");
+            plugins.beautylog.log("now compiling tests!");
+            return compileTs(config.testTs);
         })
         .then(function () {
-            plugins.beautylog.ok("compiled TypeScript!");
+            plugins.beautylog.ok("compiled all TypeScript!");
-            definitionHandler(config)
-            .then(function(){
             done.resolve(config);
         });
-        });
-    /*==================== END TS Compilation =====================*/
-
-
-
     return done.promise;
 };

ts/npmts.configfile.ts

@@ -8,11 +8,11 @@ export var run = function(argvArg){
     if(argvArg.notest){
         config.notest = true;
     }
-    if(plugins.smartfile.checks.fileExistsSync(configPath)){
+    if(plugins.smartfile.fs.fileExistsSync(configPath)){
         plugins.beautylog.info("npmts.json".blue + " config file found!");
         config = plugins.lodashObject.assign(
             config,
-            plugins.smartfile.local.toObjectSync(configPath)
+            plugins.smartfile.fs.toObjectSync(configPath)
         );
         switch (config.mode){
             case "default":

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.plugins.ts

@@ -1,24 +1,19 @@
 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"),
     istanbul: require("gulp-istanbul"),
     jsdoc3: require("gulp-jsdoc3"),
     mocha: require("gulp-mocha"),
-    replace: require("gulp-replace"),
+    replace: require("gulp-replace")
-    sourcemaps: require("gulp-sourcemaps"),
-    typescript: require("gulp-typescript"),
-    typings: require("gulp-typings")
-
 };
 export let lodashObject = require('lodash/fp/object');
 export let merge2 = require("merge2");
 export import projectinfo = require("projectinfo");
-export let path = require("path");
+export import path = require("path");
-export let Q = require("q");
+export import Q = require("q");
-export let shelljs = require("shelljs");
+export import shelljs = require("shelljs");
 export let smartci = require("smartci");
 export import smartcli = require("smartcli");
 export let smartcov = require("smartcov");
@@ -27,3 +22,4 @@ 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 import tsn = require("tsn");

ts/npmts.promisechain.ts

@@ -1,5 +1,6 @@
 import "typings-global";
 import plugins = require("./npmts.plugins");
+import {Ora} from "beautylog"
 
 export let npmtsOra = new plugins.beautylog.Ora("setting up TaskChain","cyan");
 
@@ -7,7 +8,6 @@ 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 NpmtsTests = require("./npmts.tests");
@@ -18,7 +18,6 @@ export let promisechain = function(argvArg){
     NpmtsConfigFile.run(argvArg)
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)
-        .then(NpmtsInstall.run)
         .then(NpmtsCompile.run)
         .then(NpmtsAssets.run)
         .then(NpmtsJsdoc.run)

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/"
+    }
+}