diff --git a/dist/npmts.compile.js b/dist/npmts.compile.js index d988dc3..8ea4e7c 100644 --- a/dist/npmts.compile.js +++ b/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) { - return plugins.lodashObject.assign(tsOptionsDefault, tsOptionsArg); + var compilerOptions = function (keyArg) { + 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); diff --git a/dist/npmts.plugins.d.ts b/dist/npmts.plugins.d.ts index 7c3925d..1405048 100644 --- a/dist/npmts.plugins.d.ts +++ b/dist/npmts.plugins.d.ts @@ -11,7 +11,7 @@ export declare let g: { 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"); diff --git a/dist/npmts.plugins.js b/dist/npmts.plugins.js index ea7fa84..76da322 100644 --- a/dist/npmts.plugins.js +++ b/dist/npmts.plugins.js @@ -12,7 +12,7 @@ exports.g = { 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"); diff --git a/package.json b/package.json index f3dace5..2a32859 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@types/q": "^0.0.27", "@types/shelljs": "^0.3.27", "babel-preset-es2015": "^6.9.0", - "beautylog": "5.0.14", + "beautylog": "5.0.18", "early": "^2.0.13", "gulp": "3.9.1", "gulp-babel": "^6.1.2", @@ -46,11 +46,11 @@ "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.2", "smartci": "0.0.1", "smartcli": "1.0.4", "smartcov": "0.0.9", @@ -59,7 +59,7 @@ "smartpath": "3.2.2", "smartstring": "^2.0.15", "source-map-support": "^0.4.2", - "tsn": "^1.0.7", + "tsn": "^1.0.9", "typedoc": "^0.4.4", "typescript": "^2.0.0-dev.20160630", "typings-global": "*" diff --git a/ts/npmts.compile.ts b/ts/npmts.compile.ts index 7979793..0fa7337 100644 --- a/ts/npmts.compile.ts +++ b/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) { - return plugins.lodashObject.assign(tsOptionsDefault, tsOptionsArg) + let compilerOptions = function (keyArg:string) { + 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); }); diff --git a/ts/npmts.plugins.ts b/ts/npmts.plugins.ts index 02a0246..2e58e42 100644 --- a/ts/npmts.plugins.ts +++ b/ts/npmts.plugins.ts @@ -11,7 +11,7 @@ export let g = { 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");