5.3.16

dist/npmts.cli.d.ts

@@ -1 +0,0 @@
-import "typings-global";

dist/npmts.cli.js

@@ -1,2 +0,0 @@
-"use strict";
-require("typings-global");

dist/npmts.compile.js

@@ -9,7 +9,7 @@ var compileTs = function (tsFileArrayArg, tsOptionsArg) {
     var done = plugins.Q.defer();
     var tsOptionsDefault = {
         declaration: true,
-        target: "ES5",
+        target: "ES6",
         module: "commonjs"
     };
     /**

dist/npmts.plugins.d.ts

@@ -2,13 +2,16 @@ import "typings-global";
 export import beautylog = require("beautylog");
 export declare let gulp: any;
 export declare let g: {
-    gFunction: any;
+    babel: any;
     istanbul: any;
+    gFunction: any;
+    injectModules: any;
     mocha: any;
     replace: any;
     sourcemaps: any;
     typedoc: any;
 };
+import "babel-preset-es2015";
 export declare let lodashObject: any;
 export declare let merge2: any;
 export import projectinfo = require("projectinfo");

dist/npmts.plugins.js

@@ -3,13 +3,16 @@ require("typings-global");
 exports.beautylog = require("beautylog");
 exports.gulp = require("gulp");
 exports.g = {
-    gFunction: require("gulp-function"),
+    babel: require("gulp-babel"),
     istanbul: require("gulp-istanbul"),
+    gFunction: require("gulp-function"),
+    injectModules: require("gulp-inject-modules"),
     mocha: require("gulp-mocha"),
     replace: require("gulp-replace"),
     sourcemaps: require("gulp-sourcemaps"),
     typedoc: require("gulp-typedoc")
 };
+require("babel-preset-es2015");
 exports.lodashObject = require('lodash/fp/object');
 exports.merge2 = require("merge2");
 exports.projectinfo = require("projectinfo");

dist/npmts.tests.js

@@ -7,34 +7,31 @@ var npmts_promisechain_1 = require("./npmts.promisechain");
  *
  * @returns {*}
  */
-var istanbul = function (configArg) {
+var mocha = function (configArg) {
-    npmts_promisechain_1.npmtsOra.text("Instrumentalizing transpiled JS...");
+    npmts_promisechain_1.npmtsOra.text("Instrumentalizing and testing transpiled JS");
+    npmts_promisechain_1.npmtsOra.end(); // end npmtsOra for tests.
     var done = plugins.Q.defer();
     var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "dist/*.js")])
         .pipe(plugins.g.sourcemaps.init())
-        .pipe(plugins.g.istanbul()) // Covering files
+        .pipe(plugins.g.babel({
+        presets: ['es2015']
+    }))
+        .pipe(plugins.g.istanbul())
         .pipe(plugins.g.sourcemaps.write())
-        .pipe(plugins.g.istanbul.hookRequire()) // Force `require` to return covered files
+        .pipe(plugins.g.injectModules())
-        .pipe(plugins.g.gFunction(function () {
+        .on("finish", function () {
-        plugins.beautylog.ok("JS has been instrumentalized to get test code coverage!");
+        plugins.gulp.src([plugins.path.join(paths.cwd, "test/test.js")])
-        done.resolve(configArg);
+            .pipe(plugins.g.babel({
-    }, "atEnd"));
+            presets: ['es2015']
-    return done.promise;
+        }))
-};
+            .pipe(plugins.g.injectModules())
-/**
+            .pipe(plugins.g.mocha())
- *
+            .pipe(plugins.g.istanbul.writeReports())
- * @returns {*}
+            .pipe(plugins.g.gFunction(function () {
- */
+            plugins.beautylog.ok("Tested!");
-var mocha = function (configArg) {
+            done.resolve(configArg);
-    var done = plugins.Q.defer();
+        }, "atEnd"));
-    npmts_promisechain_1.npmtsOra.end(); // end npmtsOra for tests.
+    });
-    var stream = plugins.gulp.src(["./test/test.js"])
-        .pipe(plugins.g.mocha())
-        .pipe(plugins.g.istanbul.writeReports()) // Creating the reports after tests ran
-        .pipe(plugins.g.gFunction(function () {
-        plugins.beautylog.ok("Tests have passed!");
-        done.resolve(configArg);
-    }, "atEnd"));
     return done.promise;
 };
 var coverage = function (configArg) {
@@ -63,8 +60,7 @@ exports.run = function (configArg) {
         plugins.beautylog.log("-------------------------------------------------------\n" +
             "*************************** TESTS: ***************************\n" +
             "--------------------------------------------------------------");
-        istanbul(config)
+        mocha(config)
-            .then(mocha)
             .then(coverage)
             .then(function () {
             done.resolve(config);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "5.3.13",
+  "version": "5.3.16",
   "description": "write npm modules with TypeScript",
   "main": "dist/index.js",
   "bin": {
@@ -34,19 +34,18 @@
     "@types/shelljs": "*",
     "beautylog": "5.0.14",
     "early": "^2.0.13",
-    "esdoc": "^0.4.7",
     "gulp": "3.9.1",
+    "gulp-babel": "^6.1.2",
     "gulp-concat": "^2.6.0",
     "gulp-function": "^1.3.6",
     "gulp-if": "^2.0.1",
+    "gulp-inject-modules": "^1.0.0",
     "gulp-istanbul": "^1.0.0",
-    "gulp-jsdoc3": "^0.3.0",
     "gulp-mocha": "^2.2.0",
     "gulp-replace": "^0.5.4",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-typedoc": "^2.0.0",
     "lodash": "^4.13.1",
-    "merge2": "1.0.2",
     "projectinfo": "1.0.3",
     "q": "^1.4.1",
     "shelljs": "^0.7.0",

ts/npmts.cli.ts

@@ -1 +0,0 @@
-import "typings-global";

ts/npmts.compile.ts

@@ -10,7 +10,7 @@ let compileTs = (tsFileArrayArg:string[],tsOptionsArg = {}) => {
 
     let tsOptionsDefault = {
         declaration: true,
-        target: "ES5",
+        target: "ES6",
         module: "commonjs"
     };
     

ts/npmts.plugins.ts

@@ -2,13 +2,16 @@ import "typings-global";
 export import beautylog = require("beautylog");
 export let gulp = require("gulp");
 export let g = {
-    gFunction: require("gulp-function"),
+    babel: require("gulp-babel"),
     istanbul: require("gulp-istanbul"),
+    gFunction: require("gulp-function"),
+    injectModules: require("gulp-inject-modules"),
     mocha: require("gulp-mocha"),
     replace: require("gulp-replace"),
     sourcemaps: require("gulp-sourcemaps"),
     typedoc: require("gulp-typedoc")
 };
+import "babel-preset-es2015";
 export let lodashObject = require('lodash/fp/object');
 export let merge2 = require("merge2");
 export import projectinfo = require("projectinfo");

ts/npmts.tests.ts

@@ -7,35 +7,31 @@ import {npmtsOra} from "./npmts.promisechain";
  *
  * @returns {*}
  */
-let istanbul = function (configArg) {
+let mocha = function (configArg) {
-    npmtsOra.text("Instrumentalizing transpiled JS...");
+    npmtsOra.text("Instrumentalizing and testing transpiled JS");
+    npmtsOra.end(); // end npmtsOra for tests.
     let done = plugins.Q.defer();
     var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"dist/*.js")])
         .pipe(plugins.g.sourcemaps.init())
-        .pipe(plugins.g.istanbul()) // Covering files
+        .pipe(plugins.g.babel({
+            presets: ['es2015']
+        }))
+        .pipe(plugins.g.istanbul())
         .pipe(plugins.g.sourcemaps.write())
-        .pipe(plugins.g.istanbul.hookRequire()) // Force `require` to return covered files
+        .pipe(plugins.g.injectModules())
-        .pipe(plugins.g.gFunction(function(){
+        .on("finish",function(){
-            plugins.beautylog.ok("JS has been instrumentalized to get test code coverage!");
+            plugins.gulp.src([plugins.path.join(paths.cwd,"test/test.js")])
-            done.resolve(configArg);
+            .pipe(plugins.g.babel({
-        },"atEnd"));
+                presets: ['es2015']
-    return done.promise;
+            }))
-};
+            .pipe(plugins.g.injectModules())
-
+            .pipe(plugins.g.mocha())
-/**
+            .pipe(plugins.g.istanbul.writeReports())
- *
+            .pipe(plugins.g.gFunction(function(){
- * @returns {*}
+                plugins.beautylog.ok("Tested!");
- */
+                done.resolve(configArg);
-let mocha = function (configArg) {
+            },"atEnd"));
-    let done = plugins.Q.defer();
+        });
-    npmtsOra.end(); // end npmtsOra for tests.
-    let stream = plugins.gulp.src(["./test/test.js"])
-        .pipe(plugins.g.mocha())
-        .pipe(plugins.g.istanbul.writeReports()) // Creating the reports after tests ran
-        .pipe(plugins.g.gFunction(function(){
-            plugins.beautylog.ok("Tests have passed!");
-            done.resolve(configArg);
-        },"atEnd"));
     return done.promise;
 };
 
@@ -72,8 +68,7 @@ export let run = function(configArg) {
             "--------------------------------------------------------------"
         );
 
-        istanbul(config)
+        mocha(config)
-            .then(mocha)
             .then(coverage)
             .then(() => {
                 done.resolve(config);