6.1.12

add ES2015.iterable

See merge request !1

CHANGELOG

@@ -1,7 +1,5 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
-v 6.0.0 (unreleased)
-    - handle bithound
+v 6.0.0 (released)
+    - remove TypeDoc, please look at npmpage
     - check package.json
-    - check .gitlab-ci-yml
-    - check appveyor.yml

README.md

@@ -2,19 +2,19 @@
 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/)
+[![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmts)
+[![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://gitlab.com/gitzone/npmts)
+[![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzonetools/npmts)
+[![docs](https://gitzone.gitlab.io/assets/repo-button-docs.svg)](https://gitzone.gitlab.io/npmts/)
 
 ## 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)
+[![build status](https://gitlab.com/gitzone/npmts/badges/master/build.svg)](https://gitlab.com/gitzone/npmts/commits/master)
+[![coverage report](https://gitlab.com/gitzone/npmts/badges/master/coverage.svg)](https://gitlab.com/gitzone/npmts/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/npmts.svg)](https://www.npmjs.com/package/npmts)
 [![docker pulls](https://img.shields.io/docker/pulls/hosttoday/ht-docker-node.svg)](https://hub.docker.com/r/hosttoday/ht-docker-node/)
-[![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)
+[![Dependency Status](https://david-dm.org/gitzone/npmts.svg)](https://david-dm.org/gitzone/npmts)
+[![bitHound Dependencies](https://www.bithound.io/github/gitzone/npmts/badges/dependencies.svg)](https://www.bithound.io/github/gitzone/npmts/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/gitzone/npmts/badges/code.svg)](https://www.bithound.io/github/gitzone/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/)
@@ -24,21 +24,16 @@ NPMTS is your friend when writing, testing, publishing and documenting npm modul
 
 npmts will
     
-1. check your dependencies and package.json
+1. check your dependencies and package.json (unused, missing, updates, security)
 1. transpile your code with tsc,
-1. document your code with typedoc,
-1. test your code with mocha
-1. create coverage with istanbul
+1. test your code with mocha (supports the fancy stuff like Promises, Generators, async/await, sourcemaps)
+1. create coverage with istanbul (supports tracing of the originating TypeScript)
 
 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/index.html)
-2. [Install](https://pushrocks.gitlab.io/npmts/install.html)
-3. [Default Behaviour](https://pushrocks.gitlab.io/npmts/default.html)
-4. [Configuration](https://pushrocks.gitlab.io/npmts/config.html)
-5. [Examples](https://pushrocks.gitlab.io/npmts/examples.html)
-6. [Info](https://pushrocks.gitlab.io/npmts/info.html)
+For further information read the linked docs at the top of this README.
 
-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
+> MIT licensed | **©** 2016 - 2017 [Lossless GmbH](https://lossless.gmbh)
+
+[![npm](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone)

dist/mod00/index.d.ts

@@ -1,4 +1,2 @@
-/// <reference types="q" />
-import * as q from 'q';
 import { INpmtsConfig } from '../npmts.config';
-export declare let run: (configArg: INpmtsConfig) => q.Promise<INpmtsConfig>;
+export declare let run: (configArg: INpmtsConfig) => Promise<INpmtsConfig>;

dist/mod00/index.js

@@ -2,15 +2,15 @@
 /* ------------------------------------------
  * This module compiles TypeScript files
  * -------------------------------------------- */
-const q = require("q");
-const npmts_log_1 = require("../npmts.log");
+const q = require("smartq");
+const plugins = require("./mod00.plugins");
 const NpmtsAssets = require("./mod00.assets");
 const NpmtsCheck = require("./mod00.check");
 const NpmtsClean = require("./mod00.clean");
 const NpmtsCompile = require("./mod00.compile");
 exports.run = function (configArg) {
     let done = q.defer();
-    npmts_log_1.npmtsOra.text('starting TypeScript Compilation');
+    plugins.beautylog.ora.text('starting TypeScript Compilation');
     NpmtsClean.run(configArg)
         .then(NpmtsCheck.run)
         .then(NpmtsCompile.run)

dist/mod00/mod00.assets.d.ts

@@ -1,3 +1 @@
-/// <reference types="q" />
-import * as q from 'q';
-export declare var run: (configArg: any) => q.Promise<{}>;
+export declare let run: (configArg: any) => Promise<{}>;

dist/mod00/mod00.assets.js

@@ -1,13 +1,12 @@
 "use strict";
-const q = require("q");
+const q = require("smartq");
 const paths = require("../npmts.paths");
-const npmts_log_1 = require("../npmts.log");
 const plugins = require("./mod00.plugins");
 const mod00_check_1 = require("../mod00/mod00.check");
 exports.run = function (configArg) {
     let done = q.defer();
     let config = configArg;
-    npmts_log_1.npmtsOra.text('now looking at ' + 'required assets'.yellow);
+    plugins.beautylog.ora.text('now looking at ' + 'required assets'.yellow);
     if (config.cli === true) {
         let mainJsPath = mod00_check_1.projectInfo.packageJson.main;
         let cliJsString = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir, 'cli.js'));

dist/mod00/mod00.check.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="q" />
-import * as q from 'q';
 import { ProjectinfoNpm } from 'projectinfo';
 export declare let projectInfo: ProjectinfoNpm;
-export declare let run: (configArg: any) => q.Promise<{}>;
+export declare let run: (configArg: any) => Promise<{}>;

dist/mod00/mod00.check.js

@@ -1,12 +1,11 @@
 "use strict";
-const q = require("q");
+const q = require("smartq");
 const projectinfo_1 = require("projectinfo");
 const paths = require("../npmts.paths");
-const npmts_log_1 = require("../npmts.log");
 const plugins = require("./mod00.plugins");
 let checkProjectTypings = (configArg) => {
     let done = q.defer();
-    npmts_log_1.npmtsOra.text('Check Module: Check Project Typings...');
+    plugins.beautylog.ora.text('Check Module: Check Project Typings...');
     exports.projectInfo = new projectinfo_1.ProjectinfoNpm(paths.cwd);
     if (typeof exports.projectInfo.packageJson.typings === 'undefined') {
         plugins.beautylog.error(`please add typings field to package.json`);
@@ -32,7 +31,7 @@ const depcheckOptions = {
 };
 let checkDependencies = (configArg) => {
     let done = q.defer();
-    npmts_log_1.npmtsOra.text('Check Module: Check Dependencies...');
+    plugins.beautylog.ora.text('Check Module: Check Dependencies...');
     let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [
             'test',
@@ -68,7 +67,7 @@ let checkDependencies = (configArg) => {
 };
 let checkDevDependencies = (configArg) => {
     let done = q.defer();
-    npmts_log_1.npmtsOra.text('Check Module: Check devDependencies...');
+    plugins.beautylog.ora.text('Check Module: Check devDependencies...');
     let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [
             'ts',
@@ -103,13 +102,13 @@ let checkDevDependencies = (configArg) => {
 };
 let checkNodeVersion = (configArg) => {
     let done = q.defer();
-    npmts_log_1.npmtsOra.text('checking node version');
+    plugins.beautylog.ora.text('checking node version');
     done.resolve(configArg);
     return done.promise;
 };
 exports.run = (configArg) => {
     let done = q.defer();
-    npmts_log_1.npmtsOra.text('Check Module: ...');
+    plugins.beautylog.ora.text('Check Module: ...');
     checkProjectTypings(configArg)
         .then(checkDependencies)
         .then(checkDevDependencies)

dist/mod00/mod00.clean.d.ts

@@ -1,3 +1 @@
-/// <reference types="q" />
-import * as q from 'q';
-export declare let run: (configArg: any) => q.Promise<{}>;
+export declare let run: (configArg: any) => Promise<{}>;

dist/mod00/mod00.clean.js

@@ -1,13 +1,12 @@
 "use strict";
-const q = require("q");
+const q = require("smartq");
 const paths = require("../npmts.paths");
-const npmts_log_1 = require("../npmts.log");
 const plugins = require("./mod00.plugins");
 /**
  * removes the  dist directory which will be entirely rebuild
  */
 let removeDist = function () {
-    npmts_log_1.npmtsOra.text('cleaning dist folder');
+    plugins.beautylog.ora.text('cleaning dist folder');
     return plugins.smartfile.fs.remove(paths.distDir);
 };
 /**
@@ -25,11 +24,11 @@ let removeTestDeclarations = function () {
  * remove old pages
  */
 let removePages = function () {
-    npmts_log_1.npmtsOra.text('cleaning pages folder');
+    plugins.beautylog.ora.text('cleaning pages folder');
     return plugins.smartfile.fs.remove(paths.pagesDir);
 };
 exports.run = function (configArg) {
-    npmts_log_1.npmtsOra.text('cleaning up from previous builds...');
+    plugins.beautylog.ora.text('cleaning up from previous builds...');
     let done = q.defer();
     removeDist()
         .then(removeTestDeclarations)

dist/mod00/mod00.compile.d.ts

@@ -1,3 +1 @@
-/// <reference types="q" />
-import * as q from 'q';
-export declare let run: (configArg: any) => q.Promise<{}>;
+export declare let run: (configArg: any) => Promise<{}>;

dist/mod00/mod00.compile.js

@@ -1,12 +1,11 @@
 "use strict";
-const q = require("q");
+const q = require("smartq");
 const paths = require("../npmts.paths");
-const npmts_log_1 = require("../npmts.log");
 const plugins = require("./mod00.plugins");
 exports.run = function (configArg) {
     let done = q.defer();
     let config = configArg;
-    npmts_log_1.npmtsOra.text('now compiling ' + 'TypeScript'.yellow);
+    plugins.beautylog.ora.text('now compiling ' + 'TypeScript'.yellow);
     plugins.tsn.compileGlobStringObject(config.ts, config.tsOptions, paths.cwd)
         .then(() => {
         plugins.beautylog.ok('compiled main TypeScript!');

dist/mod00/mod00.plugins.d.ts

@@ -1,6 +1,5 @@
 export * from '../npmts.plugins';
 import * as tsn from 'tsn';
-import * as shelljs from 'shelljs';
 import * as smartchok from 'smartchok';
 import * as smartstream from 'smartstream';
-export { tsn, shelljs, smartchok, smartstream };
+export { tsn, smartchok, smartstream };

dist/mod00/mod00.plugins.js

@@ -5,8 +5,6 @@ function __export(m) {
 __export(require("../npmts.plugins"));
 const tsn = require("tsn");
 exports.tsn = tsn;
-const shelljs = require("shelljs");
-exports.shelljs = shelljs;
 const smartchok = require("smartchok");
 exports.smartchok = smartchok;
 const smartstream = require("smartstream");

dist/mod01/index.d.ts

@@ -1,4 +1,2 @@
-/// <reference types="q" />
-import * as q from 'q';
 import { INpmtsConfig } from '../npmts.config';
-export declare let run: (configArg: INpmtsConfig) => q.Promise<INpmtsConfig>;
+export declare let run: (configArg: INpmtsConfig) => Promise<INpmtsConfig>;

dist/mod01/index.js

@@ -2,53 +2,9 @@
 /* ------------------------------------------
  * This module creates TypeScript documentation
  * -------------------------------------------- */
-const q = require("q");
-const paths = require("../npmts.paths");
-const npmts_log_1 = require("../npmts.log");
-const plugins = require("./mod01.plugins");
-const mod00_check_1 = require("../mod00/mod00.check");
-let genTypeDoc = function (configArg) {
-    let done = q.defer();
-    npmts_log_1.npmtsOra.text('now generating ' + 'TypeDoc documentation'.yellow);
-    plugins.beautylog.log('TypeDoc Output:');
-    let localSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src(plugins.path.join(paths.tsDir, '**/*.ts')),
-        plugins.gulpTypedoc({
-            // TypeScript options (see typescript docs) 
-            module: 'commonjs',
-            target: 'es6',
-            includeDeclarations: true,
-            // Output options (see typedoc docs) 
-            out: paths.pagesApiDir,
-            json: plugins.path.join(paths.pagesApiDir, 'file.json'),
-            // TypeDoc options (see typedoc docs) 
-            name: mod00_check_1.projectInfo.name,
-            readme: plugins.path.join(paths.cwd, 'README.md'),
-            // theme: "default",
-            version: true
-        })
-    ]);
-    localSmartstream.run().then(() => {
-        plugins.beautylog.ok('TypeDoc documentation generated!');
-        done.resolve(configArg);
-    }, (err) => {
-        plugins.beautylog.warn('TypeDoc documentation generation failed!');
-        console.log(err);
-        done.resolve(configArg);
-    });
-    return done.promise;
-};
+const q = require("smartq");
 exports.run = function (configArg) {
     let done = q.defer();
-    if (configArg.docs) {
-        genTypeDoc(configArg)
-            .then(() => {
-            done.resolve(configArg);
-        });
-    }
-    else {
-        done.resolve(configArg);
-    }
-    ;
+    done.resolve(configArg);
     return done.promise;
 };

dist/mod01/mod01.plugins.d.ts

@@ -1,4 +1 @@
 export * from '../npmts.plugins';
-import * as gulp from 'gulp';
-declare let gulpTypedoc: any;
-export { gulp, gulpTypedoc };

dist/mod01/mod01.plugins.js

@@ -3,7 +3,3 @@ function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
 __export(require("../npmts.plugins"));
-const gulp = require("gulp");
-exports.gulp = gulp;
-let gulpTypedoc = require('gulp-typedoc');
-exports.gulpTypedoc = gulpTypedoc;

dist/mod02/index.d.ts

@@ -1,4 +1,2 @@
-/// <reference types="q" />
-import * as q from 'q';
 import { INpmtsConfig } from '../npmts.config';
-export declare let run: (configArg: INpmtsConfig) => q.Promise<INpmtsConfig>;
+export declare let run: (configArg: INpmtsConfig) => Promise<INpmtsConfig>;

dist/mod02/index.js

@@ -1,29 +1,40 @@
 "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());
+    });
+};
 /* ------------------------------------------
  * This module tests the compiled TypeScript files
  * -------------------------------------------- */
 const plugins = require("./mod02.plugins");
 const paths = require("../npmts.paths");
-const q = require("q");
-const npmts_log_1 = require("../npmts.log");
+const q = require("smartq");
 /**
  * runs mocha
  * @returns INpmtsConfig
  */
 let mocha = function (configArg) {
-    npmts_log_1.npmtsOra.text('Instrumentalizing and testing transpiled JS');
-    npmts_log_1.npmtsOra.end(); // end npmtsOra for tests.
+    plugins.beautylog.ora.text('Instrumentalizing and testing transpiled JS');
+    plugins.beautylog.ora.end(); // end plugins.beautylog.ora for tests.
     let done = q.defer();
     let coverageSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, './dist/**/*.js')]),
+        plugins.gulp.src([plugins.path.join(paths.cwd, './ts/**/*.ts')]),
         plugins.gulpSourcemaps.init(),
-        plugins.gulpBabel({
-            presets: [
-                require.resolve('babel-preset-es2015')
-            ]
+        plugins.gulpTypeScript({
+            target: 'ES5',
+            emitDecoratorMetadata: true,
+            experimentalDecorators: true,
+            lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
         }),
         plugins.gulpIstanbul({}),
         plugins.gulpSourcemaps.write(),
+        plugins.gulpFunction.forEach((file) => __awaiter(this, void 0, void 0, function* () {
+            file.path = file.path.replace(paths.tsDir, paths.distDir);
+        })),
         plugins.gulpInjectModules(),
         plugins.through2.obj((file, enc, cb) => {
             cb();
@@ -32,11 +43,12 @@ let mocha = function (configArg) {
         })
     ]);
     let localSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.js')]),
-        plugins.gulpBabel({
-            presets: [
-                require.resolve('babel-preset-es2015')
-            ]
+        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.ts')]),
+        plugins.gulpTypeScript({
+            target: 'ES5',
+            emitDecoratorMetadata: true,
+            experimentalDecorators: true,
+            lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
         }),
         plugins.gulpInjectModules(),
         plugins.gulpMocha(),
@@ -90,7 +102,7 @@ exports.run = function (configArg) {
     let done = q.defer();
     let config = configArg;
     if (config.test === true) {
-        npmts_log_1.npmtsOra.text('now starting tests');
+        plugins.beautylog.ora.text('now starting tests');
         plugins.beautylog.log('------------------------------------------------------\n' +
             '*************************** TESTS: ***************************\n' +
             '--------------------------------------------------------------');
@@ -101,7 +113,7 @@ exports.run = function (configArg) {
         }).catch(err => { console.log(err); });
     }
     else {
-        npmts_log_1.npmtsOra.end();
+        plugins.beautylog.ora.end();
         done.resolve(config);
     }
     return done.promise;

dist/mod02/mod02.plugins.d.ts

@@ -1,9 +1,9 @@
 export * from '../npmts.plugins';
 import * as gulp from 'gulp';
-import * as gulpBabel from 'gulp-babel';
-import * as gulpIstanbul from 'gulp-istanbul';
 import * as gulpFunction from 'gulp-function';
+import * as gulpIstanbul from 'gulp-istanbul';
 declare let gulpInjectModules: any;
 import * as gulpMocha from 'gulp-mocha';
 import * as gulpSourcemaps from 'gulp-sourcemaps';
-export { gulp, gulpBabel, gulpIstanbul, gulpFunction, gulpInjectModules, gulpMocha, gulpSourcemaps };
+import * as gulpTypeScript from 'gulp-typescript';
+export { gulp, gulpFunction, gulpIstanbul, gulpInjectModules, gulpMocha, gulpSourcemaps, gulpTypeScript };

dist/mod02/mod02.plugins.js

@@ -5,15 +5,15 @@ function __export(m) {
 __export(require("../npmts.plugins"));
 const gulp = require("gulp");
 exports.gulp = gulp;
-const gulpBabel = require("gulp-babel");
-exports.gulpBabel = gulpBabel;
-const gulpIstanbul = require("gulp-istanbul");
-exports.gulpIstanbul = gulpIstanbul;
 const gulpFunction = require("gulp-function");
 exports.gulpFunction = gulpFunction;
+const gulpIstanbul = require("gulp-istanbul");
+exports.gulpIstanbul = gulpIstanbul;
 let gulpInjectModules = require('gulp-inject-modules');
 exports.gulpInjectModules = gulpInjectModules;
 const gulpMocha = require("gulp-mocha");
 exports.gulpMocha = gulpMocha;
 const gulpSourcemaps = require("gulp-sourcemaps");
 exports.gulpSourcemaps = gulpSourcemaps;
+const gulpTypeScript = require("gulp-typescript");
+exports.gulpTypeScript = gulpTypeScript;

dist/npmts.cli.d.ts

@@ -1,3 +1 @@
-/// <reference types="q" />
-import * as q from 'q';
-export declare let run: () => q.Promise<{}>;
+export declare let run: () => Promise<{}>;

dist/npmts.cli.js

@@ -1,12 +1,11 @@
 "use strict";
-const q = require("q");
+const q = require("smartq");
 const plugins = require("./npmts.plugins");
 const paths = require("./npmts.paths");
 const NpmtsConfig = require("./npmts.config");
 const NpmtsMods = require("./npmts.mods");
 const NpmtsWatch = require("./npmts.watch");
 const NpmtsShip = require("./npmts.ship");
-const npmts_log_1 = require("./npmts.log");
 exports.run = () => {
     let done = q.defer();
     let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot);
@@ -19,7 +18,7 @@ exports.run = () => {
     })
         .then((configArg) => {
         let done = q.defer();
-        npmts_log_1.npmtsOra.start('loading additional modules...');
+        plugins.beautylog.ora.start('loading additional modules...');
         NpmtsMods.mod00.load()
             .then((mod00) => {
             return mod00.run(configArg);

dist/npmts.config.d.ts

@@ -1,10 +1,7 @@
-/// <reference types="q" />
-import * as q from 'q';
 export declare type npmtsMode = 'default' | 'custom';
 export interface INpmtsConfig {
     argv: any;
     coverageTreshold: number;
-    docs: boolean;
     mode: npmtsMode;
     test: boolean;
     testTs: any;
@@ -12,4 +9,4 @@ export interface INpmtsConfig {
     tsOptions: any;
     watch: boolean;
 }
-export declare var run: (argvArg: any) => q.Promise<{}>;
+export declare let run: (argvArg: any) => Promise<{}>;

dist/npmts.config.js

@@ -1,15 +1,13 @@
 "use strict";
 const plugins = require("./npmts.plugins");
 const paths = require("./npmts.paths");
-const q = require("q");
-const npmts_log_1 = require("./npmts.log");
+const q = require("smartq");
 ;
 exports.run = function (argvArg) {
     let done = q.defer();
     let defaultConfig = {
         argv: undefined,
         coverageTreshold: 70,
-        docs: true,
         mode: 'default',
         test: true,
         testTs: {},
@@ -18,7 +16,7 @@ exports.run = function (argvArg) {
         watch: false
     };
     // mix with configfile
-    npmts_log_1.npmtsOra.text('running npmextra');
+    plugins.beautylog.ora.text('running npmextra');
     let localNpmextra = new plugins.npmextra.Npmextra(paths.cwd);
     let config = localNpmextra.dataFor('npmts', defaultConfig);
     // add argv
@@ -50,10 +48,6 @@ exports.run = function (argvArg) {
         config.test = false;
     }
     ;
-    if (config.argv.nodocs) {
-        config.docs = false;
-    }
-    ;
     if (config.argv.watch) {
         config.watch = true;
     }

dist/npmts.log.d.ts

@@ -1,2 +0,0 @@
-import { Ora } from 'beautylog';
-export declare let npmtsOra: Ora;

dist/npmts.log.js

@@ -1,3 +0,0 @@
-"use strict";
-const beautylog_1 = require("beautylog");
-exports.npmtsOra = new beautylog_1.Ora('setting up TaskChain', 'cyan');

dist/npmts.ship.js

@@ -1,5 +1,5 @@
 "use strict";
-const q = require("q");
+const q = require("smartq");
 const plugins = require("./npmts.plugins");
 exports.run = (configArg) => {
     let done = q.defer();

dist/npmts.watch.d.ts

@@ -1,4 +1,2 @@
-/// <reference types="q" />
-import * as q from 'q';
 import { INpmtsConfig } from './npmts.config';
-export declare let run: (configArg: INpmtsConfig) => q.Promise<{}>;
+export declare let run: (configArg: INpmtsConfig) => Promise<{}>;

dist/npmts.watch.js

@@ -1,5 +1,5 @@
 "use strict";
-const q = require("q");
+const q = require("smartq");
 const smartchok = require("smartchok");
 const plugins = require("./npmts.plugins");
 const cli = require("./npmts.cli");

docs/config.md

@@ -20,7 +20,6 @@ with default behaviour.
 ```json
 {
   "mode":"custom",
-  "docs":false,
   "test":true,
   "npmts":{
     "ts":{
@@ -38,7 +37,6 @@ with default behaviour.
 | key | default value | description |
 | --- | --- | --- |
 | `"mode"` | `"default"` | "default" will do default stuff and override , "custom" only does what you specify |
-| `"docs"` | `true` | create docs for your module |
 | `"test"` | `true` | test your module |
 | `"ts"` | `{"./ts/*.ts":"./","./test/test.ts":"./test/"}` | allows you to define multiple ts portions |
 | `"tsOptions"` | `{"target":"ES5", "declaration":"true"}` | specify options for tsc |
@@ -63,11 +61,6 @@ This is in line with the latest TypeScript best practices.
 You can then import plugins via the TypeScript `import` Syntax
 and tsc will pick up the declaration file automatically.
 
-### TypeDoc
-By default TypeDoc will create docs for your module in `./pages/api/` directory.
-> Note: Use [npmpage](https://www.npmjs.com/package/npmpage) to build a website for the module.
-It also allows you to integrate api docs with a gitbook located in `./docs/` 
-
 ## Some notes:
 #### Typings for third party modules that do not bundle declaration files
 NPMTS no longer supports typings.json. Instead use the new TypeScript 2.x approach to typings using the @types/ npm scope.

docs/default.md

@@ -4,5 +4,4 @@
 1. **Clean:** Clean up from any previous builds (old js files)
 1. **Check:** Check project for typings declaration in package.json, unused dependencies and missing dependencies
 1. **Transpile:** Transpile TypeScript with **inline sourcemaps** and **declaration files** to ES target
-1. **Documentation:** Create TypeDoc Documentation from TypeScript files
 1. **Test:** Babelify ES6 to ES5 on the fly, instrumentalize ES5 JavaScript with istanbul and run tests with Mocha.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "5.5.12",
+  "version": "6.1.12",
   "description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.",
   "main": "dist/index.js",
   "bin": {
@@ -21,7 +21,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://gitlab.com/pushrocks/npmts.git"
+    "url": "git+https://gitlab.com/gitzone/npmts.git"
   },
   "keywords": [
     "TypeScript",
@@ -30,54 +30,44 @@
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://gitlab.com/pushrocks/npmts/issues"
+    "url": "https://gitlab.com/gitzone/npmts/issues"
   },
-  "homepage": "https://gitlab.com/pushrocks/npmts#readme",
+  "homepage": "https://gitlab.com/gitzone/npmts#readme",
   "dependencies": {
     "@types/gulp": "^3.8.32",
-    "@types/gulp-babel": "^6.1.29",
     "@types/gulp-istanbul": "^0.9.30",
     "@types/gulp-mocha": "0.0.29",
     "@types/gulp-sourcemaps": "0.0.29",
     "@types/minimatch": "^2.0.29",
-    "@types/q": "^0.x.x",
-    "@types/shelljs": "^0.3.33",
     "@types/through2": "^2.0.32",
-    "babel-preset-es2015": "^6.18.0",
-    "beautylog": "6.0.0",
-    "depcheck": "^0.6.5",
+    "beautylog": "6.1.1",
+    "depcheck": "^0.6.7",
     "early": "^2.0.35",
     "gulp": "3.9.1",
-    "gulp-babel": "^6.1.2",
-    "gulp-function": "^2.2.2",
+    "gulp-function": "^2.2.3",
     "gulp-inject-modules": "^1.0.0",
     "gulp-istanbul": "^1.1.1",
     "gulp-mocha": "^3.0.1",
-    "gulp-sourcemaps": "^2.2.0",
-    "gulp-typedoc": "^2.0.0",
-    "lodash": "^4.17.2",
+    "gulp-sourcemaps": "^2.4.0",
+    "gulp-typescript": "^3.1.4",
+    "lodash": "^4.17.4",
     "npmextra": "^2.0.3",
-    "projectinfo": "1.0.4",
-    "q": "^1.4.1",
-    "shelljs": "^0.7.5",
+    "projectinfo": "3.0.1",
     "smartchok": "^1.0.4",
-    "smartcli": "1.0.15",
+    "smartcli": "2.0.1",
     "smartcov": "1.0.0",
     "smartenv": "2.0.0",
-    "smartfile": "4.1.0",
-    "smartpath": "3.2.5",
+    "smartfile": "4.1.4",
+    "smartpath": "3.2.7",
+    "smartq": "^1.1.0",
     "smartstream": "^1.0.5",
     "smartstring": "^2.0.22",
-    "smartsystem": "^1.0.9",
-    "source-map-support": "^0.4.6",
-    "through2": "^2.0.1",
-    "tsn": "^2.0.13",
-    "typedoc": "^0.5.1",
-    "typescript": "next",
+    "smartsystem": "^1.0.12",
+    "source-map-support": "^0.4.11",
+    "through2": "^2.0.3",
+    "tsn": "^2.0.15",
+    "typescript": "^2.1.5",
     "typings-global": "^1.0.14"
   },
-  "devDependencies": {
-    "@types/should": "^8.1.30",
-    "should": "^11.1.1"
-  }
+  "devDependencies": {}
 }

ts/mod00/index.ts

@@ -1,9 +1,8 @@
 /* ------------------------------------------
  * This module compiles TypeScript files
  * -------------------------------------------- */
-import * as q from 'q'
+import * as q from 'smartq'
 
-import { npmtsOra } from '../npmts.log'
 import { INpmtsConfig } from '../npmts.config'
 
 import * as plugins from './mod00.plugins'
@@ -13,9 +12,9 @@ import * as NpmtsCheck from './mod00.check'
 import * as NpmtsClean from './mod00.clean'
 import * as NpmtsCompile from './mod00.compile'
 
-export let run = function(configArg: INpmtsConfig): q.Promise<INpmtsConfig> {
+export let run = function(configArg: INpmtsConfig): Promise<INpmtsConfig> {
     let done = q.defer<INpmtsConfig>()
-    npmtsOra.text('starting TypeScript Compilation')
+    plugins.beautylog.ora.text('starting TypeScript Compilation')
     NpmtsClean.run(configArg)
         .then(NpmtsCheck.run)
         .then(NpmtsCompile.run)

ts/mod00/mod00.assets.ts

@@ -1,15 +1,14 @@
-import * as q from 'q'
+import * as q from 'smartq'
 
 import paths = require('../npmts.paths')
-import { npmtsOra } from '../npmts.log'
 
 import plugins = require('./mod00.plugins')
 import { projectInfo } from '../mod00/mod00.check'
 
-export var run = function(configArg){
+export let run = function(configArg){
     let done = q.defer()
     let config = configArg
-    npmtsOra.text('now looking at ' + 'required assets'.yellow)
+    plugins.beautylog.ora.text('now looking at ' + 'required assets'.yellow)
     if (config.cli === true) {
         let mainJsPath = projectInfo.packageJson.main
         let cliJsString: string = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir,'cli.js'))

ts/mod00/mod00.check.ts

@@ -1,8 +1,7 @@
-import * as q from 'q'
+import * as q from 'smartq'
 import { ProjectinfoNpm } from 'projectinfo'
 
 import * as paths from '../npmts.paths'
-import { npmtsOra } from '../npmts.log'
 
 import * as plugins from './mod00.plugins'
 
@@ -10,8 +9,8 @@ export let projectInfo: ProjectinfoNpm
 
 let checkProjectTypings = (configArg) => {
     let done = q.defer()
-    npmtsOra.text('Check Module: Check Project Typings...')
-    projectInfo =  new ProjectinfoNpm(paths.cwd)
+    plugins.beautylog.ora.text('Check Module: Check Project Typings...')
+    projectInfo = new ProjectinfoNpm(paths.cwd)
     if (typeof projectInfo.packageJson.typings === 'undefined') {
         plugins.beautylog.error(`please add typings field to package.json`)
         process.exit(1)
@@ -37,7 +36,7 @@ const depcheckOptions = {
 
 let checkDependencies = (configArg) => {
     let done = q.defer()
-    npmtsOra.text('Check Module: Check Dependencies...')
+    plugins.beautylog.ora.text('Check Module: Check Dependencies...')
     let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [ // folder with these names will be ignored
             'test',
@@ -73,7 +72,7 @@ let checkDependencies = (configArg) => {
 
 let checkDevDependencies = (configArg) => {
     let done = q.defer()
-    npmtsOra.text('Check Module: Check devDependencies...')
+    plugins.beautylog.ora.text('Check Module: Check devDependencies...')
     let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
         ignoreDirs: [ // folder with these names will be ignored
             'ts',
@@ -109,14 +108,14 @@ let checkDevDependencies = (configArg) => {
 
 let checkNodeVersion = (configArg) => {
     let done = q.defer()
-    npmtsOra.text('checking node version')
+    plugins.beautylog.ora.text('checking node version')
     done.resolve(configArg)
     return done.promise
 }
 
 export let run = (configArg) => {
     let done = q.defer()
-    npmtsOra.text('Check Module: ...')
+    plugins.beautylog.ora.text('Check Module: ...')
     checkProjectTypings(configArg)
         .then(checkDependencies)
         .then(checkDevDependencies)

ts/mod00/mod00.clean.ts

@@ -1,15 +1,13 @@
-import * as q from 'q'
+import * as q from 'smartq'
 import paths = require('../npmts.paths')
 
-import { npmtsOra } from '../npmts.log'
-
 import plugins = require('./mod00.plugins')
 
 /**
  * removes the  dist directory which will be entirely rebuild
  */
 let removeDist = function () {
-    npmtsOra.text('cleaning dist folder')
+    plugins.beautylog.ora.text('cleaning dist folder')
     return plugins.smartfile.fs.remove(paths.distDir)
 }
 
@@ -29,12 +27,12 @@ let removeTestDeclarations = function () {
  * remove old pages
  */
 let removePages = function () {
-    npmtsOra.text('cleaning pages folder')
+    plugins.beautylog.ora.text('cleaning pages folder')
     return plugins.smartfile.fs.remove(paths.pagesDir)
 }
 
 export let run = function (configArg) {
-    npmtsOra.text('cleaning up from previous builds...')
+    plugins.beautylog.ora.text('cleaning up from previous builds...')
     let done = q.defer()
     removeDist()
         .then(removeTestDeclarations)

ts/mod00/mod00.compile.ts

@@ -1,14 +1,13 @@
-import * as q from 'q'
+import * as q from 'smartq'
 
 import * as paths from '../npmts.paths'
-import { npmtsOra } from '../npmts.log'
 
 import * as plugins from './mod00.plugins'
 
 export let run = function (configArg) {
     let done = q.defer()
     let config = configArg
-    npmtsOra.text('now compiling ' + 'TypeScript'.yellow)
+    plugins.beautylog.ora.text('now compiling ' + 'TypeScript'.yellow)
     plugins.tsn.compileGlobStringObject(config.ts,config.tsOptions,paths.cwd)
         .then(() => {
             plugins.beautylog.ok('compiled main TypeScript!')

ts/mod00/mod00.plugins.ts

@@ -1,13 +1,11 @@
 export * from '../npmts.plugins'
 
 import * as tsn from 'tsn'
-import * as shelljs from 'shelljs'
 import * as smartchok from 'smartchok'
 import * as smartstream from 'smartstream'
 
 export {
     tsn,
-    shelljs,
     smartchok,
     smartstream
 }

ts/mod01/index.ts

@@ -1,63 +1,15 @@
 /* ------------------------------------------
  * This module creates TypeScript documentation
  * -------------------------------------------- */
-import * as q from 'q'
+import * as q from 'smartq'
 
 import * as paths from '../npmts.paths'
-import { npmtsOra } from '../npmts.log'
 import { INpmtsConfig } from '../npmts.config'
 
 import * as plugins from './mod01.plugins'
 
-
-import { projectInfo } from '../mod00/mod00.check'
-
-let genTypeDoc = function (configArg: INpmtsConfig) {
-    let done = q.defer()
-    npmtsOra.text('now generating ' + 'TypeDoc documentation'.yellow)
-    plugins.beautylog.log('TypeDoc Output:')
-    let localSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src(plugins.path.join(paths.tsDir, '**/*.ts')),
-        plugins.gulpTypedoc({
-            // TypeScript options (see typescript docs) 
-            module: 'commonjs',
-            target: 'es6',
-            includeDeclarations: true,
-
-            // Output options (see typedoc docs) 
-            out: paths.pagesApiDir,
-            json: plugins.path.join(paths.pagesApiDir, 'file.json'),
-
-            // TypeDoc options (see typedoc docs) 
-            name: projectInfo.name,
-            readme: plugins.path.join(paths.cwd, 'README.md'),
-            // theme: "default",
-            version: true
-        })
-    ])
-    localSmartstream.run().then(
-        () => {
-            plugins.beautylog.ok('TypeDoc documentation generated!')
-            done.resolve(configArg)
-        },
-        (err) => {
-            plugins.beautylog.warn('TypeDoc documentation generation failed!')
-            console.log(err)
-            done.resolve(configArg)
-        }
-    )
-    return done.promise
-}
-
 export let run = function (configArg: INpmtsConfig) {
     let done = q.defer<INpmtsConfig>()
-    if (configArg.docs) {
-        genTypeDoc(configArg)
-            .then(() => {
-                done.resolve(configArg)
-            })
-    } else {
-        done.resolve(configArg)
-    };
+    done.resolve(configArg)
     return done.promise
 }

ts/mod01/mod01.plugins.ts

@@ -1,9 +1,2 @@
 export * from '../npmts.plugins'
 
-import * as gulp from 'gulp'
-let gulpTypedoc = require('gulp-typedoc')
-
-export {
-    gulp,
-    gulpTypedoc
-}

ts/mod02/index.ts

@@ -4,9 +4,8 @@
 import plugins = require('./mod02.plugins')
 import paths = require('../npmts.paths')
 
-import * as q from 'q'
+import * as q from 'smartq'
 
-import { npmtsOra } from '../npmts.log'
 import { INpmtsConfig } from '../npmts.config'
 
 /**
@@ -14,21 +13,25 @@ import { INpmtsConfig } from '../npmts.config'
  * @returns INpmtsConfig
  */
 let mocha = function (configArg: INpmtsConfig) {
-    npmtsOra.text('Instrumentalizing and testing transpiled JS')
-    npmtsOra.end() // end npmtsOra for tests.
+    plugins.beautylog.ora.text('Instrumentalizing and testing transpiled JS')
+    plugins.beautylog.ora.end() // end plugins.beautylog.ora for tests.
     let done = q.defer()
 
     let coverageSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, './dist/**/*.js')]),
+        plugins.gulp.src([plugins.path.join(paths.cwd, './ts/**/*.ts')]),
         plugins.gulpSourcemaps.init(),
-        plugins.gulpBabel({
-            presets: [
-                require.resolve('babel-preset-es2015')
-            ]
+        plugins.gulpTypeScript({
+            target: 'ES5',
+            emitDecoratorMetadata: true,
+            experimentalDecorators: true,
+            lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
         }),
         plugins.gulpIstanbul({
         }),
         plugins.gulpSourcemaps.write(),
+        plugins.gulpFunction.forEach(async file => {
+            file.path = file.path.replace(paths.tsDir, paths.distDir)
+        }),
         plugins.gulpInjectModules(),
         plugins.through2.obj(
             (file, enc, cb) => {
@@ -41,11 +44,12 @@ let mocha = function (configArg: INpmtsConfig) {
     ])
 
     let localSmartstream = new plugins.smartstream.Smartstream([
-        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.js')]),
-        plugins.gulpBabel({
-            presets: [
-                require.resolve('babel-preset-es2015')
-            ]
+        plugins.gulp.src([plugins.path.join(paths.cwd, 'test/test.ts')]),
+        plugins.gulpTypeScript({
+            target: 'ES5',
+            emitDecoratorMetadata: true,
+            experimentalDecorators: true,
+            lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
         }),
         plugins.gulpInjectModules(),
         plugins.gulpMocha(),
@@ -103,7 +107,7 @@ export let run = function (configArg: INpmtsConfig) {
     let done = q.defer<INpmtsConfig>()
     let config = configArg
     if (config.test === true) {
-        npmtsOra.text('now starting tests')
+        plugins.beautylog.ora.text('now starting tests')
         plugins.beautylog.log(
             '------------------------------------------------------\n' +
             '*************************** TESTS: ***************************\n' +
@@ -116,7 +120,7 @@ export let run = function (configArg: INpmtsConfig) {
                 done.resolve(config)
             }).catch(err => { console.log(err) })
     } else {
-        npmtsOra.end()
+        plugins.beautylog.ora.end()
         done.resolve(config)
     }
     return done.promise

ts/mod02/mod02.plugins.ts

@@ -1,19 +1,19 @@
 export * from '../npmts.plugins'
 
 import * as gulp from 'gulp'
-import * as gulpBabel from 'gulp-babel'
-import * as gulpIstanbul from 'gulp-istanbul'
 import * as gulpFunction from 'gulp-function'
+import * as gulpIstanbul from 'gulp-istanbul'
 let gulpInjectModules = require('gulp-inject-modules')
 import * as gulpMocha from 'gulp-mocha'
 import * as gulpSourcemaps from 'gulp-sourcemaps'
+import * as gulpTypeScript from 'gulp-typescript'
 
 export {
     gulp,
-    gulpBabel,
-    gulpIstanbul,
     gulpFunction,
+    gulpIstanbul,
     gulpInjectModules,
     gulpMocha,
-    gulpSourcemaps
+    gulpSourcemaps,
+    gulpTypeScript
 }

ts/npmts.cli.ts

@@ -1,4 +1,4 @@
-import * as q from 'q'
+import * as q from 'smartq'
 
 import * as plugins from './npmts.plugins'
 import * as paths from './npmts.paths'
@@ -7,8 +7,6 @@ import * as NpmtsMods from './npmts.mods'
 import * as NpmtsWatch from './npmts.watch'
 import * as NpmtsShip from './npmts.ship'
 
-import { npmtsOra } from './npmts.log'
-
 export let run = () => {
     let done = q.defer()
     let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot)
@@ -21,7 +19,7 @@ export let run = () => {
         })
         .then((configArg: NpmtsConfig.INpmtsConfig) => {
             let done = q.defer()
-            npmtsOra.start('loading additional modules...')
+            plugins.beautylog.ora.start('loading additional modules...')
             NpmtsMods.mod00.load()
                 .then((mod00) => {
                     return mod00.run(configArg)

ts/npmts.config.ts

@@ -1,16 +1,13 @@
 import plugins = require('./npmts.plugins')
 import paths = require('./npmts.paths')
 
-import * as q from 'q'
-
-import { npmtsOra } from './npmts.log'
+import * as q from 'smartq'
 
 export type npmtsMode = 'default' | 'custom'
 
 export interface INpmtsConfig {
     argv: any,
     coverageTreshold: number,
-    docs: boolean,
     mode: npmtsMode,
     test: boolean,
     testTs: any,
@@ -20,12 +17,11 @@ export interface INpmtsConfig {
 
 };
 
-export var run = function (argvArg) {
+export let run = function (argvArg) {
     let done = q.defer()
     let defaultConfig: INpmtsConfig = {
         argv: undefined,
         coverageTreshold: 70,
-        docs: true,
         mode: 'default',
         test: true,
         testTs: {},
@@ -35,7 +31,7 @@ export var run = function (argvArg) {
     }
 
     // mix with configfile
-    npmtsOra.text('running npmextra')
+    plugins.beautylog.ora.text('running npmextra')
 
     let localNpmextra = new plugins.npmextra.Npmextra(paths.cwd)
     let config: INpmtsConfig = localNpmextra.dataFor<INpmtsConfig>(
@@ -72,9 +68,6 @@ export var run = function (argvArg) {
     if (config.argv.notest) {
         config.test = false
     };
-    if (config.argv.nodocs) {
-        config.docs = false
-    };
     if (config.argv.watch) {
         config.watch = true
     };

ts/npmts.log.ts

@@ -1,2 +0,0 @@
-import {Ora} from 'beautylog'
-export let npmtsOra = new Ora('setting up TaskChain','cyan')

ts/npmts.ship.ts

@@ -1,4 +1,4 @@
-import * as q from 'q'
+import * as q from 'smartq'
 
 import * as plugins from './npmts.plugins'
 

ts/npmts.watch.ts

@@ -1,4 +1,4 @@
-import * as q from 'q'
+import * as q from 'smartq'
 import * as smartchok from 'smartchok'
 
 import * as plugins from './npmts.plugins'