5.4.43

README.md

@@ -32,11 +32,11 @@ This works on your machine and in CI. There is a prebuild docker image available
 [hosttoday/ht-docker-node:npmts on Dockerhub](https://hub.docker.com/r/hosttoday/ht-docker-node/)
 
 For further information read the docs:
-1. [Intro](https://pushrocks.gitlab.io/npmts/gitbook/index.html)
+1. [Intro](https://pushrocks.gitlab.io/npmts/index.html)
-2. [Install](https://pushrocks.gitlab.io/npmts/gitbook/install.html)
+2. [Install](https://pushrocks.gitlab.io/npmts/install.html)
-3. [Default Behaviour](https://pushrocks.gitlab.io/npmts/gitbook/default.html)
+3. [Default Behaviour](https://pushrocks.gitlab.io/npmts/default.html)
-4. [Configuration](https://pushrocks.gitlab.io/npmts/gitbook/config.html)
+4. [Configuration](https://pushrocks.gitlab.io/npmts/config.html)
-5. [Examples](https://pushrocks.gitlab.io/npmts/gitbook/examples.html)
+5. [Examples](https://pushrocks.gitlab.io/npmts/examples.html)
-6. [Info](https://pushrocks.gitlab.io/npmts/gitbook/info.html) 
+6. [Info](https://pushrocks.gitlab.io/npmts/info.html)
 
 [![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)

dist/npmts.clean.js

@@ -3,10 +3,27 @@ require("typings-global");
 const plugins = require("./npmts.plugins");
 const paths = require("./npmts.paths");
 const npmts_promisechain_1 = require("./npmts.promisechain");
+/**
+ * removes the  dist directory which will be entirely rebuild
+ */
 let removeDist = function () {
     npmts_promisechain_1.npmtsOra.text('cleaning dist folder');
     return plugins.smartfile.fs.remove(paths.distDir);
 };
+/**
+ * remove .d.ts files from testDirctory
+ */
+let removeTestDeclarations = function () {
+    let done = plugins.q.defer();
+    plugins.smartfile.fs.listFileTree('./test/', '**/*.d.ts').then(fileArray => {
+        let fileArrayToRemove = plugins.smartpath.transform.toAbsolute(fileArray, process.cwd() + '//test/');
+        plugins.smartfile.fs.removeManySync(fileArrayToRemove);
+        done.resolve();
+    });
+};
+/**
+ * remove old pages
+ */
 let removePages = function () {
     npmts_promisechain_1.npmtsOra.text('cleaning pages folder');
     return plugins.smartfile.fs.remove(paths.pagesDir);
@@ -15,6 +32,7 @@ exports.run = function (configArg) {
     npmts_promisechain_1.npmtsOra.text('cleaning up from previous builds...');
     let done = plugins.q.defer();
     removeDist()
+        .then(removeTestDeclarations)
         .then(removePages)
         .then(function () {
         plugins.beautylog.ok('Cleaned up from previous builds!');

dist/npmts.compile.js

@@ -11,11 +11,11 @@ exports.run = function (configArg) {
         .then(() => {
         plugins.beautylog.ok('compiled main TypeScript!');
         plugins.beautylog.log('now compiling tests!');
-        return plugins.tsn.compileGlobStringObject(config.testTs);
+        return plugins.tsn.compileGlobStringObject(config.testTs, config.tsOptions, paths.cwd);
     })
         .then(function () {
         plugins.beautylog.ok('compiled all TypeScript!');
         done.resolve(config);
-    });
+    }).catch(err => { console.log(err); });
     return done.promise;
 };

dist/npmts.options.js

@@ -38,10 +38,10 @@ exports.run = function (argvArg) {
     // handle default mode
     if (config.mode === 'default') {
         config.ts = {
-            ['./ts/**/*.ts']: './dist/'
+            './ts/**/*.ts': './dist/'
         };
         config.testTs = {
-            ['./test/test.ts']: './test/'
+            './test/**/*.ts': './test/'
         };
     }
     ;

dist/npmts.tests.js

@@ -39,7 +39,6 @@ let mocha = function (configArg) {
         localSmartstream.run()
             .then(() => { done.resolve(configArg); }, (err) => {
             plugins.beautylog.error('Tests failed!');
-            configArg.watch = true;
             if (configArg.watch) {
                 done.resolve(configArg);
             }

gitbook/book.json

@@ -1,15 +0,0 @@
-{
-    "structure": {
-        "readme": "index.md"
-    },
-    "plugins": [
-        "tonic",
-        "edit-link"
-    ],
-    "pluginsConfig": {
-        "edit-link": {
-            "base": "https://gitlab.com/pushrocks/npmts/edit/master/docs/",
-            "label": "Edit on GitLab"
-        }
-    }
-}

gitbook/index.md

@@ -1,42 +0,0 @@
-# npmts
-Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.
-
-## Availabililty
-[![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/gitbook)
-
-## Status for master
-[![build status](https://gitlab.com/pushrocks/npmts/badges/master/build.svg)](https://gitlab.com/pushrocks/npmts/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/npmts/badges/master/coverage.svg)](https://gitlab.com/pushrocks/npmts/commits/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)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
-
-## Introduction
-NPMTS is your friend when writing, testing, publishing and documenting npm modules written in TypeScript.
-
-npmts will
-    
-1. check your dependencies and package.json
-1. transpile your code with tsc,
-1. document your code with typedoc,
-1. test your code with mocha
-1. create coverage with istanbul
-
-This works on your machine and in CI. There is a prebuild docker image available that includes npmts to make CI a breeze:  
-[hosttoday/ht-docker-node:npmts on Dockerhub](https://hub.docker.com/r/hosttoday/ht-docker-node/)
-
-For further information read the docs:
-    * [1. Intro](https://pushrocks.gitlab.io/npmts/gitbook/index.md)
-    * [2. Install](https://pushrocks.gitlab.io/npmts/gitbook/install.md)
-    * [3. Default Behaviour](https://pushrocks.gitlab.io/npmts/gitbook/default.md)
-    * [4. Configuration](https://pushrocks.gitlab.io/npmts/gitbook/config.md)
-    * [5. Examples](https://pushrocks.gitlab.io/npmts/gitbook/examples.md)
-    * [6. Info](https://pushrocks.gitlab.io/npmts/gitbook/info.md) 
-
-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "5.4.40",
+  "version": "5.4.43",
   "description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.",
   "main": "dist/index.js",
   "bin": {
@@ -38,7 +38,7 @@
     "@types/minimatch": "^2.0.29",
     "@types/q": "^0.x.x",
     "@types/shelljs": "^0.3.31",
-    "babel-preset-es2015": "^6.14.0",
+    "babel-preset-es2015": "^6.16.0",
     "beautylog": "5.0.23",
     "depcheck": "^0.6.4",
     "early": "^2.0.35",
@@ -50,7 +50,7 @@
     "gulp-mocha": "^3.0.1",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-typedoc": "^2.0.0",
-    "lodash": "^4.16.1",
+    "lodash": "^4.16.2",
     "npmextra": "^2.0.3",
     "projectinfo": "1.0.3",
     "q": "^1.4.1",
@@ -59,12 +59,12 @@
     "smartcli": "1.0.9",
     "smartcov": "1.0.0",
     "smartenv": "1.2.5",
-    "smartfile": "4.0.21",
+    "smartfile": "4.0.22",
     "smartpath": "3.2.2",
     "smartstream": "^1.0.5",
     "smartstring": "^2.0.17",
-    "source-map-support": "^0.4.2",
+    "source-map-support": "^0.4.3",
-    "tsn": "^2.0.3",
+    "tsn": "^2.0.4",
     "typedoc": "^0.4.5",
     "typescript": "next",
     "typings-global": "^1.0.14"

ts/npmts.clean.ts

@@ -1,24 +1,43 @@
 import 'typings-global'
 import plugins = require('./npmts.plugins')
 import paths = require('./npmts.paths')
-import {npmtsOra} from './npmts.promisechain'
+import { npmtsOra } from './npmts.promisechain'
 
-let removeDist = function(){
+/**
+ * removes the  dist directory which will be entirely rebuild
+ */
+let removeDist = function () {
     npmtsOra.text('cleaning dist folder')
     return plugins.smartfile.fs.remove(paths.distDir)
 }
 
-let removePages = function(){
+/**
+ * remove .d.ts files from testDirctory
+ */
+let removeTestDeclarations = function () {
+    let done = plugins.q.defer()
+    plugins.smartfile.fs.listFileTree('./test/', '**/*.d.ts').then(fileArray => {
+        let fileArrayToRemove = plugins.smartpath.transform.toAbsolute(fileArray, process.cwd() + '//test/')
+        plugins.smartfile.fs.removeManySync(fileArrayToRemove)
+        done.resolve()
+    })
+}
+
+/**
+ * remove old pages
+ */
+let removePages = function () {
     npmtsOra.text('cleaning pages folder')
     return plugins.smartfile.fs.remove(paths.pagesDir)
 }
 
-export let run = function(configArg){
+export let run = function (configArg) {
     npmtsOra.text('cleaning up from previous builds...')
     let done = plugins.q.defer()
     removeDist()
+        .then(removeTestDeclarations)
         .then(removePages)
-        .then(function(){
+        .then(function () {
             plugins.beautylog.ok('Cleaned up from previous builds!')
             done.resolve(configArg)
         })

ts/npmts.compile.ts

@@ -11,11 +11,11 @@ export let run = function (configArg) {
         .then(() => {
             plugins.beautylog.ok('compiled main TypeScript!')
             plugins.beautylog.log('now compiling tests!')
-            return plugins.tsn.compileGlobStringObject(config.testTs)
+            return plugins.tsn.compileGlobStringObject(config.testTs,config.tsOptions,paths.cwd)
         })
         .then(function () {
             plugins.beautylog.ok('compiled all TypeScript!')
             done.resolve(config)
-        })
+        }).catch(err => { console.log(err) })
     return done.promise
 }

ts/npmts.options.ts

@@ -59,10 +59,10 @@ export var run = function (argvArg) {
     // handle default mode
     if (config.mode === 'default') {
         config.ts = {
-            ['./ts/**/*.ts']: './dist/'
+            './ts/**/*.ts': './dist/'
         }
         config.testTs = {
-            ['./test/test.ts']: './test/'
+            './test/**/*.ts': './test/'
         }
     };