6.1.9

add ES2015.iterable

See merge request !1

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 q = require("smartq");
-const npmts_log_1 = require("../npmts.log");
+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" />
+export declare let run: (configArg: any) => Promise<{}>;
-import * as q from 'q';
-export declare var run: (configArg: any) => q.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" />
+export declare let run: (configArg: any) => Promise<{}>;
-import * as q from 'q';
-export declare let run: (configArg: any) => q.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" />
+export declare let run: (configArg: any) => Promise<{}>;
-import * as q from 'q';
-export declare let run: (configArg: any) => q.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,7 +2,7 @@
 /* ------------------------------------------
  * This module creates TypeScript documentation
  * -------------------------------------------- */
-const q = require("q");
+const q = require("smartq");
 exports.run = function (configArg) {
     let done = q.defer();
     done.resolve(configArg);

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

@@ -12,15 +12,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
  * -------------------------------------------- */
 const plugins = require("./mod02.plugins");
 const paths = require("../npmts.paths");
-const q = require("q");
+const q = require("smartq");
-const npmts_log_1 = require("../npmts.log");
 /**
  * runs mocha
  * @returns INpmtsConfig
  */
 let mocha = function (configArg) {
-    npmts_log_1.npmtsOra.text('Instrumentalizing and testing transpiled JS');
+    plugins.beautylog.ora.text('Instrumentalizing and testing transpiled JS');
-    npmts_log_1.npmtsOra.end(); // end npmtsOra for tests.
+    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, './ts/**/*.ts')]),
@@ -29,13 +28,12 @@ let mocha = function (configArg) {
             target: 'ES5',
             emitDecoratorMetadata: true,
             experimentalDecorators: true,
-            lib: ['es2015.promise', 'es5']
+            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);
-            console.log(file.path);
         })),
         plugins.gulpInjectModules(),
         plugins.through2.obj((file, enc, cb) => {
@@ -49,7 +47,8 @@ let mocha = function (configArg) {
         plugins.gulpTypeScript({
             target: 'ES5',
             emitDecoratorMetadata: true,
-            experimentalDecorators: true
+            experimentalDecorators: true,
+            lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
         }),
         plugins.gulpInjectModules(),
         plugins.gulpMocha(),
@@ -103,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' +
             '--------------------------------------------------------------');
@@ -114,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/npmts.cli.d.ts

@@ -1,3 +1 @@
-/// <reference types="q" />
+export declare let run: () => Promise<{}>;
-import * as q from 'q';
-export declare let run: () => q.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,5 +1,3 @@
-/// <reference types="q" />
-import * as q from 'q';
 export declare type npmtsMode = 'default' | 'custom';
 export interface INpmtsConfig {
     argv: any;
@@ -11,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,8 +1,7 @@
 "use strict";
 const plugins = require("./npmts.plugins");
 const paths = require("./npmts.paths");
-const q = require("q");
+const q = require("smartq");
-const npmts_log_1 = require("./npmts.log");
 ;
 exports.run = function (argvArg) {
     let done = q.defer();
@@ -17,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

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");

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "6.1.1",
+  "version": "6.1.9",
   "description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.",
   "main": "dist/index.js",
   "bin": {
@@ -39,10 +39,8 @@
     "@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",
-    "beautylog": "6.0.0",
+    "beautylog": "6.1.0",
     "depcheck": "^0.6.7",
     "early": "^2.0.35",
     "gulp": "3.9.1",
@@ -55,20 +53,19 @@
     "lodash": "^4.17.4",
     "npmextra": "^2.0.3",
     "projectinfo": "3.0.1",
-    "q": "^1.4.1",
-    "shelljs": "^0.7.6",
     "smartchok": "^1.0.4",
     "smartcli": "2.0.1",
     "smartcov": "1.0.0",
     "smartenv": "2.0.0",
-    "smartfile": "4.1.2",
+    "smartfile": "4.1.4",
     "smartpath": "3.2.7",
+    "smartq": "^1.0.4",
     "smartstream": "^1.0.5",
     "smartstring": "^2.0.22",
     "smartsystem": "^1.0.12",
-    "source-map-support": "^0.4.8",
+    "source-map-support": "^0.4.10",
     "through2": "^2.0.3",
-    "tsn": "^2.0.14",
+    "tsn": "^2.0.15",
     "typescript": "next",
     "typings-global": "^1.0.14"
   },

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...')
+    plugins.beautylog.ora.text('Check Module: Check Project Typings...')
-    projectInfo =  new ProjectinfoNpm(paths.cwd)
+    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,10 +1,9 @@
 /* ------------------------------------------
  * 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'

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,8 +13,8 @@ import { INpmtsConfig } from '../npmts.config'
  * @returns INpmtsConfig
  */
 let mocha = function (configArg: INpmtsConfig) {
-    npmtsOra.text('Instrumentalizing and testing transpiled JS')
+    plugins.beautylog.ora.text('Instrumentalizing and testing transpiled JS')
-    npmtsOra.end() // end npmtsOra for tests.
+    plugins.beautylog.ora.end() // end plugins.beautylog.ora for tests.
     let done = q.defer()
 
     let coverageSmartstream = new plugins.smartstream.Smartstream([
@@ -25,14 +24,13 @@ let mocha = function (configArg: INpmtsConfig) {
             target: 'ES5',
             emitDecoratorMetadata: true,
             experimentalDecorators: true,
-            lib: ['es2015.promise','es5']
+            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)
-            console.log(file.path)
         }),
         plugins.gulpInjectModules(),
         plugins.through2.obj(
@@ -50,7 +48,8 @@ let mocha = function (configArg: INpmtsConfig) {
         plugins.gulpTypeScript({
             target: 'ES5',
             emitDecoratorMetadata: true,
-            experimentalDecorators: true
+            experimentalDecorators: true,
+            lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
         }),
         plugins.gulpInjectModules(),
         plugins.gulpMocha(),
@@ -108,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' +
@@ -121,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/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,9 +1,7 @@
 import plugins = require('./npmts.plugins')
 import paths = require('./npmts.paths')
 
-import * as q from 'q'
+import * as q from 'smartq'
-
-import { npmtsOra } from './npmts.log'
 
 export type npmtsMode = 'default' | 'custom'
 
@@ -19,7 +17,7 @@ export interface INpmtsConfig {
 
 };
 
-export var run = function (argvArg) {
+export let run = function (argvArg) {
     let done = q.defer()
     let defaultConfig: INpmtsConfig = {
         argv: undefined,
@@ -33,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>(

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'