6.1.7

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,7 +2,7 @@
 /* ------------------------------------------
  * This module compiles TypeScript files
  * -------------------------------------------- */
-const q = require("q");
+const q = require("smartq");
 const npmts_log_1 = require("../npmts.log");
 const NpmtsAssets = require("./mod00.assets");
 const NpmtsCheck = require("./mod00.check");

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,5 +1,5 @@
 "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");

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,5 +1,5 @@
 "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");

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,5 +1,5 @@
 "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");

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,5 +1,5 @@
 "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");

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

@@ -1,10 +1,18 @@
 "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 q = require("smartq");
 const npmts_log_1 = require("../npmts.log");
 /**
  * runs mocha
@@ -15,15 +23,19 @@ let mocha = function (configArg) {
     npmts_log_1.npmtsOra.end(); // end npmtsOra 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 +44,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(),

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,5 +1,5 @@
 "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");

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,7 +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) {

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.0.0",
+  "version": "6.1.7",
   "description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.",
   "main": "dist/index.js",
   "bin": {
@@ -35,42 +35,37 @@
   "homepage": "https://gitlab.com/pushrocks/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",
+    "beautylog": "6.0.5",
     "depcheck": "^0.6.7",
     "early": "^2.0.35",
     "gulp": "3.9.1",
-    "gulp-babel": "^6.1.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.4.0",
+    "gulp-typescript": "^3.1.4",
     "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,7 +1,7 @@
 /* ------------------------------------------
  * 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'
@@ -13,7 +13,7 @@ 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')
     NpmtsClean.run(configArg)

ts/mod00/mod00.assets.ts

@@ -1,4 +1,4 @@
-import * as q from 'q'
+import * as q from 'smartq'
 
 import paths = require('../npmts.paths')
 import { npmtsOra } from '../npmts.log'
@@ -6,7 +6,7 @@ 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)

ts/mod00/mod00.check.ts

@@ -1,4 +1,4 @@
-import * as q from 'q'
+import * as q from 'smartq'
 import { ProjectinfoNpm } from 'projectinfo'
 
 import * as paths from '../npmts.paths'
@@ -11,7 +11,7 @@ export let projectInfo: ProjectinfoNpm
 let checkProjectTypings = (configArg) => {
     let done = q.defer()
     npmtsOra.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)

ts/mod00/mod00.clean.ts

@@ -1,4 +1,4 @@
-import * as q from 'q'
+import * as q from 'smartq'
 import paths = require('../npmts.paths')
 
 import { npmtsOra } from '../npmts.log'

ts/mod00/mod00.compile.ts

@@ -1,4 +1,4 @@
-import * as q from 'q'
+import * as q from 'smartq'
 
 import * as paths from '../npmts.paths'
 import { npmtsOra } from '../npmts.log'

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,7 +1,7 @@
 /* ------------------------------------------
  * 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'

ts/mod02/index.ts

@@ -4,7 +4,7 @@
 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'
@@ -19,16 +19,20 @@ let mocha = function (configArg: INpmtsConfig) {
     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 +45,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(),

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'

ts/npmts.config.ts

@@ -1,7 +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'
 
@@ -19,7 +19,7 @@ export interface INpmtsConfig {
 
 };
 
-export var run = function (argvArg) {
+export let run = function (argvArg) {
     let done = q.defer()
     let defaultConfig: INpmtsConfig = {
         argv: undefined,

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'