5.4.35

README.md

@@ -5,7 +5,7 @@ Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.
 [![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmts)
 [![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/npmts)
 [![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/npmts)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/npmts/docs)
+[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/npmts/gitbook)
 
 ## Status for master
 [![build status](https://gitlab.com/pushrocks/npmts/badges/master/build.svg)](https://gitlab.com/pushrocks/npmts/commits/master)

dist/index.js

@@ -1,13 +1,13 @@
 "use strict";
-require('typings-global');
+require("typings-global");
 /* ================================================== *
     Starting NPMTS main process.
  * ================================================== */
-var early = require('early');
+var early = require("early");
 early.start('NPMTS');
-var plugins = require('./npmts.plugins');
-var paths = require('./npmts.paths');
-var npmts_promisechain_1 = require('./npmts.promisechain');
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+var npmts_promisechain_1 = require("./npmts.promisechain");
 early.stop()
     .then(function () {
     var npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot);

dist/npmts.assets.js

@@ -1,8 +1,8 @@
 "use strict";
-require('typings-global');
-var plugins = require('./npmts.plugins');
-var paths = require('./npmts.paths');
-var npmts_promisechain_1 = require('./npmts.promisechain');
+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 done = plugins.Q.defer();
     var config = configArg;

dist/npmts.check.js

@@ -1,8 +1,8 @@
 "use strict";
-var plugins = require('./npmts.plugins');
-var paths = require('./npmts.paths');
-var npmts_promisechain_1 = require('./npmts.promisechain');
-var projectinfo_1 = require('projectinfo');
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+var npmts_promisechain_1 = require("./npmts.promisechain");
+var projectinfo_1 = require("projectinfo");
 var checkProjectTypings = function (configArg) {
     var done = plugins.Q.defer();
     exports.projectInfo = new projectinfo_1.ProjectinfoNpm(paths.cwd);
@@ -30,7 +30,7 @@ var depcheckOptions = {
 };
 var checkDependencies = function (configArg) {
     var done = plugins.Q.defer();
-    var depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+    var depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [
             'test',
             'dist',
@@ -72,7 +72,7 @@ var checkDependencies = function (configArg) {
 };
 var checkDevDependencies = function (configArg) {
     var done = plugins.Q.defer();
-    var depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+    var depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [
             'ts',
             'dist',

dist/npmts.clean.js

@@ -1,8 +1,8 @@
 "use strict";
-require('typings-global');
-var plugins = require('./npmts.plugins');
-var paths = require('./npmts.paths');
-var npmts_promisechain_1 = require('./npmts.promisechain');
+require("typings-global");
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+var npmts_promisechain_1 = require("./npmts.promisechain");
 var removeDist = function () {
     npmts_promisechain_1.npmtsOra.text('cleaning dist folder');
     return plugins.smartfile.fs.remove(paths.distDir);

dist/npmts.compile.helpers.d.ts

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

dist/npmts.compile.helpers.js

@@ -1,16 +0,0 @@
-"use strict";
-var plugins = require('./npmts.plugins');
-var paths = require('./npmts.paths');
-var outputPathIsDir = function (tsArrayArg, keyArg) {
-    return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, tsArrayArg[keyArg]));
-};
-exports.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;
-    }
-    ;
-};

dist/npmts.compile.js

@@ -1,60 +1,17 @@
 "use strict";
-require('typings-global');
-var plugins = require('./npmts.plugins');
-var helpers = require('./npmts.compile.helpers');
-var npmts_promisechain_1 = require('./npmts.promisechain');
-var promiseArray = [];
-var compileTs = function (tsFileArrayArg, tsOptionsArg) {
-    if (tsOptionsArg === void 0) { tsOptionsArg = {}; }
-    var done = plugins.Q.defer();
-    var compilerOptionsDefault = {
-        declaration: true,
-        module: 'CommonJS',
-        target: 'ES6'
-    };
-    /**
-     * merges default ts options with those found in npmts.json
-     */
-    var compilerOptions = function (keyArg) {
-        var tsOptionsCombined = plugins.lodashObject.merge(compilerOptionsDefault, tsOptionsArg);
-        var compilerOptions = {
-            declaration: tsOptionsCombined.declaration,
-            module: plugins.tsn.ModuleKind[tsOptionsCombined.module],
-            target: plugins.tsn.ScriptTarget[tsOptionsCombined.target],
-            exclude: 'node_modules/**/*'
-        };
-        return compilerOptions;
-    };
-    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, compilerOptions(keyArg));
-                promiseArray.push(filesCompiledPromise);
-            });
-            promiseArray.push(filesReadPromise);
-        }
-    };
-    for (var keyArg in tsFileArrayArg) {
-        _loop_1(keyArg);
-    }
-    ;
-    plugins.Q.all(promiseArray)
-        .then(done.resolve);
-    return done.promise;
-};
+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 done = plugins.Q.defer();
     var config = configArg;
     npmts_promisechain_1.npmtsOra.text('now compiling ' + 'TypeScript'.yellow);
-    compileTs(config.ts, config.tsOptions)
+    plugins.tsn.compileGlobStringObject(config.ts, config.tsOptions, paths.cwd)
         .then(function () {
         plugins.beautylog.ok('compiled main TypeScript!');
         plugins.beautylog.log('now compiling tests!');
-        return compileTs(config.testTs);
+        return plugins.tsn.compileGlobStringObject(config.testTs);
     })
         .then(function () {
         plugins.beautylog.ok('compiled all TypeScript!');

dist/npmts.options.js

@@ -1,8 +1,8 @@
 "use strict";
-require('typings-global');
-var plugins = require('./npmts.plugins');
-var paths = require('./npmts.paths');
-var npmts_promisechain_1 = require('./npmts.promisechain');
+require("typings-global");
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+var npmts_promisechain_1 = require("./npmts.promisechain");
 ;
 exports.run = function (argvArg) {
     var done = plugins.Q.defer();
@@ -41,12 +41,10 @@ exports.run = function (argvArg) {
     if (config.mode === 'default') {
         config.ts = (_a = {},
             _a['./ts/**/*.ts'] = './dist/',
-            _a
-        );
+            _a);
         config.testTs = (_b = {},
             _b['./test/test.ts'] = './test/',
-            _b
-        );
+            _b);
     }
     ;
     // mix with commandline

dist/npmts.paths.js

@@ -1,6 +1,6 @@
 "use strict";
-require('typings-global');
-var plugins = require('./npmts.plugins');
+require("typings-global");
+var plugins = require("./npmts.plugins");
 // NPMTS Paths
 exports.npmtsPackageRoot = plugins.path.join(__dirname, '../');
 // Project paths

dist/npmts.plugins.d.ts

@@ -11,7 +11,7 @@ export declare let g: {
     sourcemaps: any;
     typedoc: any;
 };
-export import lodashObject = require('lodash');
+export import lodash = require('lodash');
 export import npmextra = require('npmextra');
 export import projectinfo = require('projectinfo');
 export import path = require('path');

dist/npmts.plugins.js

@@ -1,8 +1,8 @@
 "use strict";
-require('typings-global');
-exports.beautylog = require('beautylog');
+require("typings-global");
+exports.beautylog = require("beautylog");
 exports.depcheck = require('depcheck');
-exports.gulp = require('gulp');
+exports.gulp = require("gulp");
 exports.g = {
     babel: require('gulp-babel'),
     istanbul: require('gulp-istanbul'),
@@ -12,17 +12,17 @@ exports.g = {
     sourcemaps: require('gulp-sourcemaps'),
     typedoc: require('gulp-typedoc')
 };
-exports.lodashObject = require('lodash');
-exports.npmextra = require('npmextra');
-exports.projectinfo = require('projectinfo');
-exports.path = require('path');
-exports.Q = require('q');
-exports.shelljs = require('shelljs');
-exports.smartcli = require('smartcli');
-exports.smartcov = require('smartcov');
-exports.smartenv = require('smartenv');
-exports.smartfile = require('smartfile');
-exports.smartpath = require('smartpath');
-exports.smartstring = require('smartstring');
+exports.lodash = require("lodash");
+exports.npmextra = require("npmextra");
+exports.projectinfo = require("projectinfo");
+exports.path = require("path");
+exports.Q = require("q");
+exports.shelljs = require("shelljs");
+exports.smartcli = require("smartcli");
+exports.smartcov = require("smartcov");
+exports.smartenv = require("smartenv");
+exports.smartfile = require("smartfile");
+exports.smartpath = require("smartpath");
+exports.smartstring = require("smartstring");
 exports.sourceMapSupport = require('source-map-support').install(); // display errors correctly during testing
-exports.tsn = require('tsn');
+exports.tsn = require("tsn");

dist/npmts.promisechain.js

@@ -1,15 +1,15 @@
 "use strict";
-require('typings-global');
-var plugins = require('./npmts.plugins');
-var beautylog_1 = require('beautylog');
+require("typings-global");
+var plugins = require("./npmts.plugins");
+var beautylog_1 = require("beautylog");
 exports.npmtsOra = new beautylog_1.Ora('setting up TaskChain', 'cyan');
-var NpmtsAssets = require('./npmts.assets');
-var NpmtsCheck = require('./npmts.check');
-var NpmtsClean = require('./npmts.clean');
-var NpmtsCompile = require('./npmts.compile');
-var NpmtsTypeDoc = require('./npmts.typedoc');
-var NpmtsOptions = require('./npmts.options');
-var NpmtsTests = require('./npmts.tests');
+var NpmtsAssets = require("./npmts.assets");
+var NpmtsCheck = require("./npmts.check");
+var NpmtsClean = require("./npmts.clean");
+var NpmtsCompile = require("./npmts.compile");
+var NpmtsTypeDoc = require("./npmts.typedoc");
+var NpmtsOptions = require("./npmts.options");
+var NpmtsTests = require("./npmts.tests");
 exports.promisechain = function (argvArg) {
     var done = plugins.Q.defer();
     exports.npmtsOra.start();

dist/npmts.tests.js

@@ -1,8 +1,8 @@
 "use strict";
-require('typings-global');
-var plugins = require('./npmts.plugins');
-var paths = require('./npmts.paths');
-var npmts_promisechain_1 = require('./npmts.promisechain');
+require("typings-global");
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+var npmts_promisechain_1 = require("./npmts.promisechain");
 /**
  *
  * @returns {*}
@@ -46,12 +46,12 @@ var coverage = function (configArg) {
     plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, 'lcov.info'), 2)
         .then(function (percentageArg) {
         if (percentageArg >= configArg.coverageTreshold) {
-            plugins.beautylog.ok((percentageArg.toString() + "% ")
+            plugins.beautylog.ok(percentageArg.toString() + "% "
                 + "coverage exceeds your treshold of "
                 + (configArg.coverageTreshold.toString() + "%"));
         }
         else {
-            plugins.beautylog.warn((percentageArg.toString() + "% ")
+            plugins.beautylog.warn(percentageArg.toString() + "% "
                 + "coverage fails your treshold of "
                 + (configArg.coverageTreshold.toString() + "%"));
             plugins.beautylog.error('exiting due to coverage failure');

dist/npmts.typedoc.js

@@ -1,9 +1,9 @@
 "use strict";
-require('typings-global');
-var plugins = require('./npmts.plugins');
-var paths = require('./npmts.paths');
-var npmts_promisechain_1 = require('./npmts.promisechain');
-var npmts_check_1 = require('./npmts.check');
+require("typings-global");
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+var npmts_promisechain_1 = require("./npmts.promisechain");
+var npmts_check_1 = require("./npmts.check");
 var genTypeDoc = function (configArg) {
     var done = plugins.Q.defer();
     npmts_promisechain_1.npmtsOra.text('now generating ' + 'TypeDoc documentation'.yellow);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "5.4.30",
+  "version": "5.4.35",
   "description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.",
   "main": "dist/index.js",
   "bin": {
@@ -37,9 +37,9 @@
     "@types/q": "^0.x.x",
     "@types/shelljs": "^0.3.30",
     "babel-preset-es2015": "^6.14.0",
-    "beautylog": "5.0.22",
+    "beautylog": "5.0.23",
     "depcheck": "^0.6.4",
-    "early": "^2.0.26",
+    "early": "^2.0.28",
     "gulp": "3.9.1",
     "gulp-babel": "^6.1.2",
     "gulp-function": "^1.3.6",
@@ -49,18 +49,18 @@
     "gulp-sourcemaps": "^1.6.0",
     "gulp-typedoc": "^2.0.0",
     "lodash": "^4.15.0",
-    "npmextra": "^1.0.9",
+    "npmextra": "^1.0.11",
     "projectinfo": "1.0.3",
     "q": "^1.4.1",
     "shelljs": "^0.7.4",
-    "smartcli": "1.0.5",
+    "smartcli": "1.0.9",
     "smartcov": "1.0.0",
     "smartenv": "1.2.5",
-    "smartfile": "4.0.15",
+    "smartfile": "4.0.18",
     "smartpath": "3.2.2",
     "smartstring": "^2.0.17",
     "source-map-support": "^0.4.2",
-    "tsn": "^1.0.12",
+    "tsn": "^2.0.3",
     "typedoc": "^0.4.5",
     "typescript": "next",
     "typings-global": "^1.0.14"

ts/npmts.check.ts

@@ -34,7 +34,7 @@ const depcheckOptions = {
 
 let checkDependencies = (configArg) => {
     let done = plugins.Q.defer()
-    let depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+    let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [ // folder with these names will be ignored
             'test',
             'dist',
@@ -69,7 +69,7 @@ let checkDependencies = (configArg) => {
 
 let checkDevDependencies = (configArg) => {
     let done = plugins.Q.defer()
-    let depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+    let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [ // folder with these names will be ignored
             'ts',
             'dist',

ts/npmts.compile.helpers.ts

@@ -1,15 +0,0 @@
-import plugins = require('./npmts.plugins')
-import paths = require('./npmts.paths')
-
-let outputPathIsDir = function (tsArrayArg,keyArg) {
-        return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, tsArrayArg[keyArg]))
-}
-
-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

@@ -1,64 +1,17 @@
 import 'typings-global'
 import plugins = require('./npmts.plugins')
 import paths = require('./npmts.paths')
-import helpers = require('./npmts.compile.helpers')
 import {npmtsOra} from './npmts.promisechain'
 
-let promiseArray = []
-let compileTs = (tsFileArrayArg: string[],tsOptionsArg = {}) => {
-    let done = plugins.Q.defer()
-
-    let compilerOptionsDefault = {
-        declaration: true,
-        module: 'CommonJS',
-        target: 'ES6'
-    }
-
-    /**
-     * merges default ts options with those found in npmts.json
-     */
-    let compilerOptions = function (keyArg: string) {
-        let tsOptionsCombined = plugins.lodashObject.merge(compilerOptionsDefault, tsOptionsArg)
-        let compilerOptions: plugins.tsn.CompilerOptions = {
-            declaration: tsOptionsCombined.declaration,
-            module: plugins.tsn.ModuleKind[tsOptionsCombined.module],
-            target: plugins.tsn.ScriptTarget[tsOptionsCombined.target],
-            exclude: 'node_modules/**/*'
-        }
-        return compilerOptions
-    }
-    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,
-                        compilerOptions(keyArg)
-                    )
-                    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)
+    plugins.tsn.compileGlobStringObject(config.ts,config.tsOptions,paths.cwd)
         .then(() => {
             plugins.beautylog.ok('compiled main TypeScript!')
             plugins.beautylog.log('now compiling tests!')
-            return compileTs(config.testTs)
+            return plugins.tsn.compileGlobStringObject(config.testTs)
         })
         .then(function () {
             plugins.beautylog.ok('compiled all TypeScript!')

ts/npmts.options.ts

@@ -32,7 +32,7 @@ export var run = function (argvArg) {
 
     // mix with configfile
     npmtsOra.text('looking for npmextra.json')
-    let config: INpmtsConfig = plugins.npmextra.dataFor({
+    let config: INpmtsConfig = plugins.npmextra.dataFor<INpmtsConfig>({
         toolName: 'npmts',
         defaultSettings: defaultConfig,
         cwd: paths.cwd

ts/npmts.plugins.ts

@@ -11,7 +11,7 @@ export let g = {
     sourcemaps: require('gulp-sourcemaps'),
     typedoc: require('gulp-typedoc')
 }
-export import lodashObject = require('lodash')
+export import lodash = require('lodash')
 export import npmextra = require('npmextra')
 export import projectinfo = require('projectinfo')
 export import path = require('path')