7.1.8

See merge request !6

dist/mod00/mod00.check.d.ts

@@ -1,3 +1,4 @@
 import { ProjectinfoNpm } from 'projectinfo';
+import { INpmtsConfig } from '../npmts.config';
 export declare let projectInfo: ProjectinfoNpm;
-export declare let run: (configArg: any) => Promise<{}>;
+export declare let run: (configArg: INpmtsConfig) => Promise<INpmtsConfig>;

dist/mod00/mod00.check.js

@@ -1,4 +1,12 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const q = require("smartq");
 const projectinfo_1 = require("projectinfo");
@@ -107,14 +115,17 @@ let checkNodeVersion = (configArg) => {
     done.resolve(configArg);
     return done.promise;
 };
-exports.run = (configArg) => {
+exports.run = (configArg) => __awaiter(this, void 0, void 0, function* () {
-    let done = q.defer();
     plugins.beautylog.ora.text('Check Module: ...');
-    checkProjectTypings(configArg)
+    if (configArg.checkDependencies) {
-        .then(checkDependencies)
+        configArg = yield checkProjectTypings(configArg);
-        .then(checkDevDependencies)
+        configArg = yield checkDependencies(configArg);
-        .then(checkNodeVersion)
+        configArg = yield checkDevDependencies(configArg);
-        .then(done.resolve)
+        configArg = yield checkNodeVersion(configArg);
-        .catch((err) => { console.log(err); });
+        return configArg;
-    return done.promise;
+    }
-};
+    else {
+        configArg = yield checkProjectTypings(configArg);
+        return configArg;
+    }
+});

dist/mod00/mod00.clean.js

@@ -10,17 +10,6 @@ let removeDist = function () {
     plugins.beautylog.ora.text('cleaning dist folder');
     return plugins.smartfile.fs.remove(paths.distDir);
 };
-/**
- * remove .d.ts files from testDirctory
- */
-let removeTestDeclarations = function () {
-    let done = 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
  */
@@ -32,7 +21,6 @@ exports.run = function (configArg) {
     plugins.beautylog.ora.text('cleaning up from previous builds...');
     let done = q.defer();
     removeDist()
-        .then(removeTestDeclarations)
         .then(removePages)
         .then(function () {
         plugins.beautylog.ok('Cleaned up from previous builds!');

dist/mod02/index.js

@@ -24,6 +24,7 @@ let tap = function (configArg) {
      * the TabBuffer for npmts
      */
     let npmtsTapBuffer = new plugins.tapbuffer.TabBuffer();
+    npmtsTapBuffer.setConfig(configArg.testConfig);
     /**
      * handle the testable files
      */
@@ -36,10 +37,10 @@ let tap = function (configArg) {
             experimentalDecorators: true,
             lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
         }),
-        plugins.gulpSourcemaps.write(),
         plugins.gulpFunction.forEach((file) => __awaiter(this, void 0, void 0, function* () {
             file.path = file.path.replace(paths.tsDir, paths.distDir);
         })),
+        plugins.gulpSourcemaps.write(),
         npmtsTapBuffer.pipeTestableFiles(),
         plugins.smartstream.cleanPipe()
     ]);
@@ -48,12 +49,14 @@ let tap = function (configArg) {
      */
     let testFilesSmartstream = new plugins.smartstream.Smartstream([
         plugins.smartgulp.src([plugins.path.join(paths.cwd, 'test/*.ts')]),
+        plugins.gulpSourcemaps.init(),
         plugins.gulpTypeScript({
             target: 'ES5',
             emitDecoratorMetadata: true,
             experimentalDecorators: true,
             lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
         }),
+        plugins.gulpSourcemaps.write(),
         npmtsTapBuffer.pipeTestFiles(),
         plugins.smartstream.cleanPipe()
     ]);
@@ -107,11 +110,19 @@ exports.run = function (configArg) {
         plugins.beautylog.ora.text('now starting tests');
         plugins.beautylog.ora.end();
         plugins.beautylog.log('ready for tapbuffer:');
-        tap(config)
+        if (configArg.coverage) {
-            .then(handleCoverageData)
+            tap(config)
-            .then(() => {
+                .then(handleCoverageData)
-            done.resolve(config);
+                .then(() => {
-        }).catch(err => { console.log(err); });
+                done.resolve(config);
+            }).catch(err => { console.log(err); });
+        }
+        else {
+            tap(config)
+                .then(() => {
+                done.resolve(config);
+            }).catch(err => { console.log(err); });
+        }
     }
     else {
         plugins.beautylog.ora.end();

dist/npmts.config.d.ts

@@ -1,10 +1,19 @@
-export declare type npmtsMode = 'default' | 'custom';
+/**
+ * specifies the different modes available
+ * default -> uses default options no matterm what
+ * merge -> uses merged default + custom options
+ * custom -> only uses specified options
+ */
+export declare type npmtsMode = 'default' | 'custom' | 'merge';
 export interface INpmtsConfig {
     argv: any;
+    coverage: boolean;
     coverageTreshold: number;
+    checkDependencies: boolean;
     mode: npmtsMode;
     test: boolean;
     testTs: any;
+    testConfig: any;
     ts: any;
     tsOptions: any;
     watch: boolean;

dist/npmts.config.js

@@ -3,15 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmts.plugins");
 const paths = require("./npmts.paths");
 const q = require("smartq");
-;
 exports.run = function (argvArg) {
     let done = q.defer();
     let defaultConfig = {
         argv: undefined,
+        coverage: true,
         coverageTreshold: 70,
+        checkDependencies: true,
         mode: 'default',
         test: true,
         testTs: {},
+        testConfig: {
+            parallel: true
+        },
         ts: {},
         tsOptions: {},
         watch: false,
@@ -27,16 +31,16 @@ exports.run = function (argvArg) {
     switch (config.mode) {
         case 'default':
         case 'custom':
+        case 'merge':
             plugins.beautylog.ok('mode is ' + config.mode);
             done.resolve(config);
             break;
         default:
-            plugins.beautylog.error(`mode not recognised!`);
+            plugins.beautylog.error(`mode not recognised! Can be default or custom`);
             process.exit(1);
     }
-    ;
     // handle default mode
-    if (config.mode === 'default') {
+    if (config.mode === 'default' || config.mode === 'merge') {
         config.ts = {
             './ts/**/*.ts': './dist/'
         };
@@ -44,16 +48,19 @@ exports.run = function (argvArg) {
             './test/**/*.ts': './test/'
         };
     }
-    ;
     // mix with commandline
     if (config.argv.notest) {
         config.test = false;
     }
-    ;
+    if (config.argv.nocoverage) {
+        config.coverage = false;
+    }
+    if (config.argv.nochecks) {
+        config.checkDependencies = false;
+    }
     if (config.argv.watch) {
         config.watch = true;
     }
-    ;
     plugins.beautylog.ok('build options are ready!');
     done.resolve(config);
     return done.promise;

dist/npmts.plugins.d.ts

@@ -7,11 +7,11 @@ import * as projectinfo from 'projectinfo';
 import * as path from 'path';
 import * as smartanalytics from 'smartanalytics';
 import * as smartcli from 'smartcli';
+import * as smarterror from 'smarterror';
 import * as smartfile from 'smartfile';
 import * as smartpath from 'smartpath';
 import * as smartstream from 'smartstream';
 import * as smartstring from 'smartstring';
 import * as smartsystem from 'smartsystem';
 import * as through2 from 'through2';
-export declare let sourceMapSupport: any;
+export { beautylog, depcheck, lodash, npmextra, projectinfo, path, smartanalytics, smartcli, smarterror, smartfile, smartpath, smartstream, smartstring, smartsystem, through2 };
-export { beautylog, depcheck, lodash, npmextra, projectinfo, path, smartanalytics, smartcli, smartfile, smartpath, smartstream, smartstring, smartsystem, through2 };

dist/npmts.plugins.js

@@ -17,6 +17,8 @@ const smartanalytics = require("smartanalytics");
 exports.smartanalytics = smartanalytics;
 const smartcli = require("smartcli");
 exports.smartcli = smartcli;
+const smarterror = require("smarterror");
+exports.smarterror = smarterror;
 const smartfile = require("smartfile");
 exports.smartfile = smartfile;
 const smartpath = require("smartpath");
@@ -29,4 +31,3 @@ const smartsystem = require("smartsystem");
 exports.smartsystem = smartsystem;
 const through2 = require("through2");
 exports.through2 = through2;
-exports.sourceMapSupport = require('source-map-support').install(); // display errors correctly during testing

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "7.0.18",
+  "version": "7.1.8",
   "description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.",
   "main": "dist/index.js",
   "bin": {
@@ -34,35 +34,36 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmts#readme",
   "dependencies": {
-    "@types/gulp-sourcemaps": "0.0.30",
+    "@types/gulp-sourcemaps": "0.0.31",
     "@types/minimatch": "^2.0.29",
-    "@types/through2": "^2.0.32",
+    "@types/node": "^8.0.1",
-    "beautylog": "6.1.10",
+    "@types/through2": "^2.0.33",
+    "beautylog": "^6.1.10",
     "depcheck": "^0.6.7",
     "early": "^2.1.1",
     "gulp-function": "^2.2.9",
     "gulp-sourcemaps": "^2.6.0",
-    "gulp-typescript": "^3.1.6",
+    "gulp-typescript": "^3.1.7",
     "lodash": "^4.17.4",
     "npmextra": "^2.0.5",
     "projectinfo": "^3.0.2",
     "smartanalytics": "^1.0.6",
     "smartchok": "^1.0.8",
-    "smartcli": "^2.0.6",
+    "smartcli": "^2.0.7",
     "smartcov": "^1.0.2",
-    "smartfile": "^4.2.7",
+    "smarterror": "^1.0.3",
-    "smartgulp": "^1.0.5",
+    "smartfile": "^4.2.17",
+    "smartgulp": "^1.0.6",
     "smartpath": "^3.2.8",
     "smartq": "^1.1.1",
     "smartstream": "^1.0.8",
     "smartstring": "^2.0.24",
-    "smartsystem": "^1.0.12",
+    "smartsystem": "^1.0.17",
-    "source-map-support": "^0.4.15",
+    "tapbuffer": "^1.0.15",
-    "tapbuffer": "^1.0.11",
     "through2": "^2.0.3",
     "tsn": "^2.0.15",
-    "typescript": "^2.3.2",
+    "typescript": "^2.4.0",
-    "typings-global": "^1.0.16"
+    "typings-global": "^1.0.17"
   },
   "devDependencies": {}
 }

ts/mod00/mod00.check.ts

@@ -1,14 +1,17 @@
 import * as q from 'smartq'
 import { ProjectinfoNpm } from 'projectinfo'
 
+// interfaces
+import { INpmtsConfig } from '../npmts.config'
+
 import * as paths from '../npmts.paths'
 
 import * as plugins from './mod00.plugins'
 
 export let projectInfo: ProjectinfoNpm
 
-let checkProjectTypings = (configArg) => {
+let checkProjectTypings = (configArg: INpmtsConfig) => {
-  let done = q.defer()
+  let done = q.defer<INpmtsConfig>()
   plugins.beautylog.ora.text('Check Module: Check Project Typings...')
   projectInfo = new ProjectinfoNpm(paths.cwd)
   if (typeof projectInfo.packageJson.typings === 'undefined') {
@@ -34,8 +37,8 @@ const depcheckOptions = {
   ]
 }
 
-let checkDependencies = (configArg) => {
+let checkDependencies = (configArg: INpmtsConfig) => {
-  let done = q.defer()
+  let done = q.defer<INpmtsConfig>()
   plugins.beautylog.ora.text('Check Module: Check Dependencies...')
   let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
     ignoreDirs: [ // folder with these names will be ignored
@@ -70,8 +73,8 @@ let checkDependencies = (configArg) => {
   return done.promise
 }
 
-let checkDevDependencies = (configArg) => {
+let checkDevDependencies = (configArg: INpmtsConfig) => {
-  let done = q.defer()
+  let done = q.defer<INpmtsConfig>()
   plugins.beautylog.ora.text('Check Module: Check devDependencies...')
   let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
     ignoreDirs: [ // folder with these names will be ignored
@@ -106,21 +109,24 @@ let checkDevDependencies = (configArg) => {
   return done.promise
 }
 
-let checkNodeVersion = (configArg) => {
+let checkNodeVersion = (configArg: INpmtsConfig) => {
-  let done = q.defer()
+  let done = q.defer<INpmtsConfig>()
   plugins.beautylog.ora.text('checking node version')
   done.resolve(configArg)
   return done.promise
 }
 
-export let run = (configArg) => {
+export let run = async (configArg: INpmtsConfig) => {
-  let done = q.defer()
   plugins.beautylog.ora.text('Check Module: ...')
-  checkProjectTypings(configArg)
+
-    .then(checkDependencies)
+  if (configArg.checkDependencies) {
-    .then(checkDevDependencies)
+    configArg = await checkProjectTypings(configArg)
-    .then(checkNodeVersion)
+    configArg = await checkDependencies(configArg)
-    .then(done.resolve)
+    configArg = await checkDevDependencies(configArg)
-    .catch((err) => { console.log(err) })
+    configArg = await checkNodeVersion(configArg)
-  return done.promise
+    return configArg
+  } else {
+    configArg = await checkProjectTypings(configArg)
+    return configArg
+  }
 }

ts/mod00/mod00.clean.ts

@@ -7,39 +7,26 @@ import plugins = require('./mod00.plugins')
  * removes the  dist directory which will be entirely rebuild
  */
 let removeDist = function () {
-    plugins.beautylog.ora.text('cleaning dist folder')
+  plugins.beautylog.ora.text('cleaning dist folder')
-    return plugins.smartfile.fs.remove(paths.distDir)
+  return plugins.smartfile.fs.remove(paths.distDir)
-}
-
-/**
- * remove .d.ts files from testDirctory
- */
-let removeTestDeclarations = function () {
-    let done = 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 () {
-    plugins.beautylog.ora.text('cleaning pages folder')
+  plugins.beautylog.ora.text('cleaning pages folder')
-    return plugins.smartfile.fs.remove(paths.pagesDir)
+  return plugins.smartfile.fs.remove(paths.pagesDir)
 }
 
 export let run = function (configArg) {
-    plugins.beautylog.ora.text('cleaning up from previous builds...')
+  plugins.beautylog.ora.text('cleaning up from previous builds...')
-    let done = q.defer()
+  let done = q.defer()
-    removeDist()
+  removeDist()
-        .then(removeTestDeclarations)
+    .then(removePages)
-        .then(removePages)
+    .then(function () {
-        .then(function () {
+      plugins.beautylog.ok('Cleaned up from previous builds!')
-            plugins.beautylog.ok('Cleaned up from previous builds!')
+      done.resolve(configArg)
-            done.resolve(configArg)
+    })
-        })
+  return done.promise
-    return done.promise
 }

ts/mod02/index.ts

@@ -20,6 +20,8 @@ let tap = function (configArg: INpmtsConfig) {
    */
   let npmtsTapBuffer = new plugins.tapbuffer.TabBuffer()
 
+  npmtsTapBuffer.setConfig(configArg.testConfig)
+
   /**
    * handle the testable files
    */
@@ -32,10 +34,10 @@ let tap = function (configArg: INpmtsConfig) {
       experimentalDecorators: true,
       lib: [ 'DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable' ]
     }),
-    plugins.gulpSourcemaps.write(),
     plugins.gulpFunction.forEach(async file => {
       file.path = file.path.replace(paths.tsDir, paths.distDir)
     }),
+    plugins.gulpSourcemaps.write(),
     npmtsTapBuffer.pipeTestableFiles(),
     plugins.smartstream.cleanPipe()
   ])
@@ -45,12 +47,14 @@ let tap = function (configArg: INpmtsConfig) {
    */
   let testFilesSmartstream = new plugins.smartstream.Smartstream([
     plugins.smartgulp.src([ plugins.path.join(paths.cwd, 'test/*.ts') ]),
+    plugins.gulpSourcemaps.init(),
     plugins.gulpTypeScript({
       target: 'ES5',
       emitDecoratorMetadata: true,
       experimentalDecorators: true,
       lib: [ 'DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable' ]
     }),
+    plugins.gulpSourcemaps.write(),
     npmtsTapBuffer.pipeTestFiles(),
     plugins.smartstream.cleanPipe()
   ])
@@ -112,12 +116,19 @@ export let run = function (configArg: INpmtsConfig) {
     plugins.beautylog.ora.text('now starting tests')
     plugins.beautylog.ora.end()
     plugins.beautylog.log('ready for tapbuffer:')
+    if (configArg.coverage) {
+      tap(config)
+        .then(handleCoverageData)
+        .then(() => {
+          done.resolve(config)
+        }).catch(err => { console.log(err) })
+    } else {
+      tap(config)
+        .then(() => {
+          done.resolve(config)
+        }).catch(err => { console.log(err) })
+    }
 
-    tap(config)
-      .then(handleCoverageData)
-      .then(() => {
-        done.resolve(config)
-      }).catch(err => { console.log(err) })
   } else {
     plugins.beautylog.ora.end()
     done.resolve(config)

ts/npmts.config.ts

@@ -3,31 +3,45 @@ import paths = require('./npmts.paths')
 
 import * as q from 'smartq'
 
-export type npmtsMode = 'default' | 'custom'
+/**
+ * specifies the different modes available
+ * default -> uses default options no matterm what
+ * merge -> uses merged default + custom options
+ * custom -> only uses specified options
+ */
+export type npmtsMode = 'default' | 'custom' | 'merge'
 
 export interface INpmtsConfig {
-  argv: any,
+  argv: any
-  coverageTreshold: number,
+  coverage: boolean
-  mode: npmtsMode,
+  coverageTreshold: number
-  test: boolean,
+  checkDependencies: boolean
-  testTs: any,
+  mode: npmtsMode
-  ts: any,
+  test: boolean
-  tsOptions: any,
+  testTs: any
+  testConfig: any
+  ts: any
+  tsOptions: any
   watch: boolean
   runData: {
-    coverageLcovInfo?: string,
+    coverageLcovInfo?: string
     coverageResult?: number
   }
-};
+}
 
 export let run = function (argvArg) {
   let done = q.defer()
   let defaultConfig: INpmtsConfig = {
     argv: undefined,
+    coverage: true,
     coverageTreshold: 70,
+    checkDependencies: true,
     mode: 'default',
     test: true,
     testTs: {},
+    testConfig: {
+      parallel: true
+    },
     ts: {},
     tsOptions: {},
     watch: false,
@@ -50,31 +64,41 @@ export let run = function (argvArg) {
   switch (config.mode) {
     case 'default':
     case 'custom':
+    case 'merge':
       plugins.beautylog.ok('mode is ' + config.mode)
       done.resolve(config)
       break
     default:
-      plugins.beautylog.error(`mode not recognised!`)
+      plugins.beautylog.error(`mode not recognised! Can be default or custom`)
       process.exit(1)
-  };
+  }
 
   // handle default mode
-  if (config.mode === 'default') {
+  if (config.mode === 'default' || config.mode === 'merge') {
     config.ts = {
       './ts/**/*.ts': './dist/'
     }
     config.testTs = {
       './test/**/*.ts': './test/'
     }
-  };
+  }
 
   // mix with commandline
   if (config.argv.notest) {
     config.test = false
-  };
+  }
+
+  if (config.argv.nocoverage) {
+    config.coverage = false
+  }
+
+  if (config.argv.nochecks) {
+    config.checkDependencies = false
+  }
+
   if (config.argv.watch) {
     config.watch = true
-  };
+  }
 
   plugins.beautylog.ok('build options are ready!')
   done.resolve(config)

ts/npmts.plugins.ts

@@ -8,13 +8,13 @@ import * as projectinfo from 'projectinfo'
 import * as path from 'path'
 import * as smartanalytics from 'smartanalytics'
 import * as smartcli from 'smartcli'
+import * as smarterror from 'smarterror'
 import * as smartfile from 'smartfile'
 import * as smartpath from 'smartpath'
 import * as smartstream from 'smartstream'
 import * as smartstring from 'smartstring'
 import * as smartsystem from 'smartsystem'
 import * as through2 from 'through2'
-export let sourceMapSupport = require('source-map-support').install() // display errors correctly during testing
 
 export {
     beautylog,
@@ -25,6 +25,7 @@ export {
     path,
     smartanalytics,
     smartcli,
+    smarterror,
     smartfile,
     smartpath,
     smartstream,