5.4.2

dist/npmts.check.d.ts

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

dist/npmts.check.js

@@ -0,0 +1,129 @@
+"use strict";
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+var npmts_promisechain_1 = require("./npmts.promisechain");
+var checkProjectTypings = function (configArg) {
+    var done = plugins.Q.defer();
+    var cwdProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.cwd);
+    if (typeof cwdProjectInfo.packageJson.typings == "undefined") {
+        plugins.beautylog.error("please add typings field to package.json");
+        process.exit(1);
+    }
+    ;
+    done.resolve(configArg);
+    return done.promise;
+};
+var depcheckOptions = {
+    ignoreBinPackage: false,
+    parsers: {
+        '*.ts': plugins.depcheck.parser.typescript,
+    },
+    detectors: [
+        plugins.depcheck.detector.requireCallExpression,
+        plugins.depcheck.detector.importDeclaration
+    ],
+    specials: [
+        plugins.depcheck.special.eslint,
+        plugins.depcheck.special.webpack
+    ],
+};
+var checkDependencies = function (configArg) {
+    var done = plugins.Q.defer();
+    var depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+        ignoreDirs: [
+            'test',
+            'dist',
+            'bower_components'
+        ],
+        ignoreMatches: [
+            "@types/*",
+            "babel-preset-*"
+        ]
+    });
+    plugins.depcheck(paths.cwd, depcheckOptionsMerged, function (unused) {
+        for (var _i = 0, _a = unused.dependencies; _i < _a.length; _i++) {
+            var item = _a[_i];
+            plugins.beautylog.warn("Watch out: unused dependency " + item.red);
+        }
+        ;
+        for (var _b = 0, _c = unused.missing; _b < _c.length; _b++) {
+            var item = _c[_b];
+            plugins.beautylog.error("unused devDependency " + item.red);
+        }
+        ;
+        if (unused.missing.length > 0) {
+            plugins.beautylog.info("exiting due to missing dependencies in package.json");
+            process.exit(1);
+        }
+        for (var _d = 0, _e = unused.using; _d < _e.length; _d++) {
+            var item = _e[_d];
+            console.log(item);
+        }
+        ;
+        for (var _f = 0, _g = unused.invalidFiles; _f < _g.length; _f++) {
+            var item = _g[_f];
+            plugins.beautylog.warn("Watch out: could not parse file " + item.red);
+        }
+        ;
+        for (var _h = 0, _j = unused.invalidDirs; _h < _j.length; _h++) {
+            var item = _j[_h];
+            plugins.beautylog.warn("Watch out: could not parse directory " + item.red);
+        }
+        ;
+        done.resolve(configArg);
+    });
+    return done.promise;
+};
+var checkDevDependencies = function (configArg) {
+    var done = plugins.Q.defer();
+    var depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+        ignoreDirs: [
+            'ts',
+            'dist',
+            'bower_components'
+        ],
+        ignoreMatches: [
+            "@types/*",
+            "babel-preset-*"
+        ]
+    });
+    plugins.depcheck(paths.cwd, depcheckOptionsMerged, function (unused) {
+        for (var _i = 0, _a = unused.devDependencies; _i < _a.length; _i++) {
+            var item = _a[_i];
+            plugins.beautylog.log("unused devDependency " + item.red);
+        }
+        ;
+        for (var _b = 0, _c = unused.using; _b < _c.length; _b++) {
+            var item = _c[_b];
+            console.log(item);
+        }
+        ;
+        for (var _d = 0, _e = unused.invalidFiles; _d < _e.length; _d++) {
+            var item = _e[_d];
+            plugins.beautylog.warn("Watch out: could not parse file " + item.red);
+        }
+        ;
+        for (var _f = 0, _g = unused.invalidDirs; _f < _g.length; _f++) {
+            var item = _g[_f];
+            plugins.beautylog.warn("Watch out: could not parse directory " + item.red);
+        }
+        ;
+        done.resolve(configArg);
+    });
+    return done.promise;
+};
+var checkNodeVersion = function (configArg) {
+    var done = plugins.Q.defer();
+    done.resolve(configArg);
+    return done.promise;
+};
+exports.run = function (configArg) {
+    var done = plugins.Q.defer();
+    npmts_promisechain_1.npmtsOra.text("running project checks..."),
+        checkProjectTypings(configArg)
+            .then(checkDependencies)
+            .then(checkDevDependencies)
+            .then(checkNodeVersion)
+            .then(done.resolve);
+    return done.promise;
+};

dist/npmts.compile.js

@@ -7,16 +7,22 @@ var promiseArray = [];
 var compileTs = function (tsFileArrayArg, tsOptionsArg) {
     if (tsOptionsArg === void 0) { tsOptionsArg = {}; }
     var done = plugins.Q.defer();
-    var tsOptionsDefault = {
+    var compilerOptionsDefault = {
         declaration: true,
-        target: "ES6",
+        module: "CommonJS",
-        module: "commonjs"
+        target: "ES6"
     };
     /**
      * merges default ts options with those found in npmts.json
      */
-    var tsOptions = function (keyArg) {
+    var compilerOptions = function (keyArg) {
-        return plugins.lodashObject.assign(tsOptionsDefault, tsOptionsArg);
+        var tsOptionsCombined = plugins.lodashObject.merge(compilerOptionsDefault, tsOptionsArg);
+        var compilerOptions = {
+            declaration: tsOptionsCombined.declaration,
+            module: plugins.tsn.ModuleKind[tsOptionsCombined.module],
+            target: plugins.tsn.ScriptTarget[tsOptionsCombined.target]
+        };
+        return compilerOptions;
     };
     var _loop_1 = function(keyArg) {
         plugins.beautylog.info("TypeScript assignment: transpile from " + keyArg.blue + " to " + tsFileArrayArg[keyArg].blue);
@@ -25,7 +31,7 @@ var compileTs = function (tsFileArrayArg, tsOptionsArg) {
                 .then(function (filesToConvertArg) {
                 var filesToConvertAbsolute = plugins.smartpath.transform.toAbsolute(filesToConvertArg, process.cwd());
                 var destDir = plugins.smartpath.transform.toAbsolute(tsFileArrayArg[keyArg], process.cwd());
-                var filesCompiledPromise = plugins.tsn.compile(filesToConvertAbsolute, destDir);
+                var filesCompiledPromise = plugins.tsn.compile(filesToConvertAbsolute, destDir, compilerOptions(keyArg));
                 promiseArray.push(filesCompiledPromise);
             });
             promiseArray.push(filesReadPromise);

dist/npmts.options.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="q" />
 import "typings-global";
 import plugins = require("./npmts.plugins");
-export declare let isCi: () => any;
 export declare var run: (configArg: any) => plugins.Q.Promise<{}>;

dist/npmts.options.js

@@ -2,9 +2,6 @@
 require("typings-global");
 var plugins = require("./npmts.plugins");
 var npmts_promisechain_1 = require("./npmts.promisechain");
-exports.isCi = function () {
-    return plugins.smartci.check.isCi();
-};
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;

dist/npmts.plugins.d.ts

@@ -1,23 +1,22 @@
 import "typings-global";
 export import beautylog = require("beautylog");
-export declare let gulp: any;
+export declare let depcheck: any;
+export import gulp = require("gulp");
 export declare let g: {
     babel: any;
     istanbul: any;
     gFunction: any;
     injectModules: any;
     mocha: any;
-    replace: any;
     sourcemaps: any;
     typedoc: any;
 };
-export declare let lodashObject: any;
+export import lodashObject = require('lodash');
 export import npmextra = require("npmextra");
 export import projectinfo = require("projectinfo");
 export import path = require("path");
 export import Q = require("q");
 export import shelljs = require("shelljs");
-export declare let smartci: any;
 export import smartcli = require("smartcli");
 export import smartcov = require("smartcov");
 export import smartenv = require("smartenv");

dist/npmts.plugins.js

@@ -1,6 +1,7 @@
 "use strict";
 require("typings-global");
 exports.beautylog = require("beautylog");
+exports.depcheck = require("depcheck");
 exports.gulp = require("gulp");
 exports.g = {
     babel: require("gulp-babel"),
@@ -8,17 +9,15 @@ exports.g = {
     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")
 };
-exports.lodashObject = require('lodash/fp/object');
+exports.lodashObject = require('lodash');
 exports.npmextra = require("npmextra");
 exports.projectinfo = require("projectinfo");
 exports.path = require("path");
 exports.Q = require("q");
 exports.shelljs = require("shelljs");
-exports.smartci = require("smartci");
 exports.smartcli = require("smartcli");
 exports.smartcov = require("smartcov");
 exports.smartenv = require("smartenv");

dist/npmts.promisechain.js

@@ -3,6 +3,7 @@ require("typings-global");
 var plugins = require("./npmts.plugins");
 exports.npmtsOra = new plugins.beautylog.Ora("setting up TaskChain", "cyan");
 var NpmtsAssets = require("./npmts.assets");
+var NpmtsCheck = require("./npmts.check");
 var NpmtsClean = require("./npmts.clean");
 var NpmtsCompile = require("./npmts.compile");
 var NpmtsConfigFile = require("./npmts.configfile");
@@ -15,6 +16,7 @@ exports.promisechain = function (argvArg) {
     NpmtsConfigFile.run(argvArg)
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)
+        .then(NpmtsCheck.run)
         .then(NpmtsCompile.run)
         .then(NpmtsAssets.run)
         .then(NpmtsTypeDoc.run)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "5.3.27",
+  "version": "5.4.2",
   "description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.",
   "main": "dist/index.js",
   "bin": {
@@ -29,29 +29,27 @@
   },
   "homepage": "https://gitlab.com/pushrocks/npmts#readme",
   "dependencies": {
+    "@types/gulp": "^3.8.28",
     "@types/minimatch": "^2.0.28",
     "@types/q": "^0.0.27",
     "@types/shelljs": "^0.3.27",
     "babel-preset-es2015": "^6.9.0",
-    "beautylog": "5.0.14",
+    "beautylog": "5.0.18",
+    "depcheck": "^0.6.4",
     "early": "^2.0.13",
     "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-mocha": "^2.2.0",
-    "gulp-replace": "^0.5.4",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-typedoc": "^2.0.0",
-    "lodash": "^4.13.1",
+    "lodash": "^4.14.0",
     "npmextra": "^1.0.8",
     "projectinfo": "1.0.3",
     "q": "^1.4.1",
-    "shelljs": "^0.7.1",
+    "shelljs": "^0.7.3",
-    "smartci": "0.0.1",
     "smartcli": "1.0.4",
     "smartcov": "0.0.9",
     "smartenv": "1.2.5",
@@ -59,7 +57,7 @@
     "smartpath": "3.2.2",
     "smartstring": "^2.0.15",
     "source-map-support": "^0.4.2",
-    "tsn": "^1.0.7",
+    "tsn": "^1.0.10",
     "typedoc": "^0.4.4",
     "typescript": "^2.0.0-dev.20160630",
     "typings-global": "*"

ts/npmts.check.ts

@@ -0,0 +1,116 @@
+import * as plugins from "./npmts.plugins";
+import * as paths from "./npmts.paths";
+import { npmtsOra } from "./npmts.promisechain";
+
+let checkProjectTypings = (configArg) => {
+    let done = plugins.Q.defer();
+    let cwdProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.cwd);
+    if(typeof cwdProjectInfo.packageJson.typings == "undefined"){
+        plugins.beautylog.error(`please add typings field to package.json`);
+        process.exit(1);
+    };
+    done.resolve(configArg);
+    return done.promise;
+};
+
+const depcheckOptions = {
+    ignoreBinPackage: false, // ignore the packages with bin entry
+    parsers: { // the target parsers
+        '*.ts': plugins.depcheck.parser.typescript,
+    },
+    detectors: [ // the target detectors
+        plugins.depcheck.detector.requireCallExpression,
+        plugins.depcheck.detector.importDeclaration
+    ],
+    specials: [ // the target special parsers
+        plugins.depcheck.special.eslint,
+        plugins.depcheck.special.webpack
+    ],
+};
+
+let checkDependencies = (configArg) => {
+    let done = plugins.Q.defer();
+    let depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+        ignoreDirs: [ // folder with these names will be ignored
+            'test',
+            'dist',
+            'bower_components'
+        ],
+        ignoreMatches: [ // ignore dependencies that matches these globs
+            "@types/*",
+            "babel-preset-*"
+        ]
+    })
+    plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
+        for (let item of unused.dependencies) {
+            plugins.beautylog.warn(`Watch out: unused dependency ${item.red}`);
+        };
+        for (let item of unused.missing) {
+            plugins.beautylog.error(`unused devDependency ${item.red}`);
+        };
+        if (unused.missing.length > 0) {
+            plugins.beautylog.info("exiting due to missing dependencies in package.json");
+            process.exit(1);
+        }
+        for (let item of unused.using) {
+            console.log(item);
+        };
+        for (let item of unused.invalidFiles) {
+            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
+        };
+        for (let item of unused.invalidDirs) {
+            plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`);
+        };
+        done.resolve(configArg);
+    });
+    return done.promise;
+};
+
+let checkDevDependencies = (configArg) => {
+    let done = plugins.Q.defer();
+    let depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, {
+        ignoreDirs: [ // folder with these names will be ignored
+            'ts',
+            'dist',
+            'bower_components'
+        ],
+        ignoreMatches: [ // ignore dependencies that matches these globs
+            "@types/*",
+            "babel-preset-*"
+        ]
+    })
+    plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
+        for (let item of unused.devDependencies) {
+            plugins.beautylog.log(`unused devDependency ${item.red}`);
+        };
+        for (let item of unused.using) {
+            console.log(item);
+        };
+        for (let item of unused.invalidFiles) {
+            plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
+        };
+        for (let item of unused.invalidDirs) {
+            plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`);
+        };
+        done.resolve(configArg);
+    });
+    return done.promise;
+};
+
+let checkNodeVersion = (configArg) => {
+    let done = plugins.Q.defer();
+
+    done.resolve(configArg);
+    return done.promise;
+}
+
+export let run = (configArg) => {
+    let done = plugins.Q.defer();
+    npmtsOra.text("running project checks..."),
+        checkProjectTypings(configArg)
+            .then(checkDependencies)
+            .then(checkDevDependencies)
+            .then(checkNodeVersion)
+            .then(done.resolve);
+    return done.promise;
+}

ts/npmts.compile.ts

@@ -8,17 +8,23 @@ let promiseArray = [];
 let compileTs = (tsFileArrayArg:string[],tsOptionsArg = {}) => {
     let done = plugins.Q.defer();
 
-    let tsOptionsDefault = {
+    let compilerOptionsDefault = {
         declaration: true,
-        target: "ES6",
+        module: "CommonJS",
-        module: "commonjs"
+        target: "ES6"
     };
     
     /**
      * merges default ts options with those found in npmts.json
      */
-    let tsOptions = function (keyArg:string) {
+    let compilerOptions = function (keyArg:string) {
-        return plugins.lodashObject.assign(tsOptionsDefault, tsOptionsArg)
+        let tsOptionsCombined = plugins.lodashObject.merge(compilerOptionsDefault, tsOptionsArg);
+        let compilerOptions:plugins.tsn.CompilerOptions = {
+            declaration: tsOptionsCombined.declaration,
+            module: plugins.tsn.ModuleKind[tsOptionsCombined.module],
+            target: plugins.tsn.ScriptTarget[tsOptionsCombined.target]
+        };
+        return compilerOptions;
     };
     for (let keyArg in tsFileArrayArg) {
         plugins.beautylog.info(`TypeScript assignment: transpile from ${keyArg.blue} to ${tsFileArrayArg[keyArg].blue}`);
@@ -29,7 +35,8 @@ let compileTs = (tsFileArrayArg:string[],tsOptionsArg = {}) => {
                     let destDir = plugins.smartpath.transform.toAbsolute(tsFileArrayArg[keyArg],process.cwd());
                     let filesCompiledPromise = plugins.tsn.compile(
                         filesToConvertAbsolute,
-                        destDir
+                        destDir,
+                        compilerOptions(keyArg)
                     );
                     promiseArray.push(filesCompiledPromise);
                 });

ts/npmts.options.ts

@@ -2,10 +2,6 @@ import "typings-global";
 import plugins = require("./npmts.plugins");
 import {npmtsOra} from "./npmts.promisechain";
 
-export let isCi = function(){
-    return plugins.smartci.check.isCi();
-};
-
 export var run = function(configArg){
     var done = plugins.Q.defer();
     var config = configArg;

ts/npmts.plugins.ts

@@ -1,23 +1,22 @@
 import "typings-global";
 export import beautylog = require("beautylog");
-export let gulp = require("gulp");
+export let depcheck = require("depcheck");
+export import gulp = require("gulp");
 export let g = {
     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")
 };
-export let lodashObject = require('lodash/fp/object');
+export import lodashObject = require('lodash');
 export import npmextra = require("npmextra");
 export import projectinfo = require("projectinfo");
 export import path = require("path");
 export import Q = require("q");
 export import shelljs = require("shelljs");
-export let smartci = require("smartci");
 export import smartcli = require("smartcli");
 export import smartcov = require("smartcov");
 export import smartenv = require("smartenv");

ts/npmts.promisechain.ts

@@ -5,6 +5,7 @@ import {Ora} from "beautylog"
 export let npmtsOra = new plugins.beautylog.Ora("setting up TaskChain","cyan");
 
 import NpmtsAssets = require("./npmts.assets");
+import NpmtsCheck = require("./npmts.check");
 import NpmtsClean = require("./npmts.clean");
 import NpmtsCompile = require("./npmts.compile");
 import NpmtsConfigFile = require("./npmts.configfile");
@@ -18,6 +19,7 @@ export let promisechain = function(argvArg){
     NpmtsConfigFile.run(argvArg)
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)
+        .then(NpmtsCheck.run)
         .then(NpmtsCompile.run)
         .then(NpmtsAssets.run)
         .then(NpmtsTypeDoc.run)