From 1d431792a52813891de0631e9fbbd6fe3d8b12da Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Sun, 18 Sep 2016 13:08:31 +0200 Subject: [PATCH] upgrade to newest tsn --- dist/npmts.check.js | 4 +-- dist/npmts.compile.helpers.d.ts | 1 - dist/npmts.compile.helpers.js | 16 ----------- dist/npmts.compile.js | 47 ++----------------------------- dist/npmts.plugins.d.ts | 2 +- dist/npmts.plugins.js | 2 +- package.json | 8 +++--- ts/npmts.check.ts | 4 +-- ts/npmts.compile.helpers.ts | 15 ---------- ts/npmts.compile.ts | 49 ++------------------------------- ts/npmts.options.ts | 2 +- ts/npmts.plugins.ts | 2 +- 12 files changed, 17 insertions(+), 135 deletions(-) delete mode 100644 dist/npmts.compile.helpers.d.ts delete mode 100644 dist/npmts.compile.helpers.js delete mode 100644 ts/npmts.compile.helpers.ts diff --git a/dist/npmts.check.js b/dist/npmts.check.js index 13dfe11..1eee4d3 100644 --- a/dist/npmts.check.js +++ b/dist/npmts.check.js @@ -30,7 +30,7 @@ var depcheckOptions = { }; var checkDependencies = function (configArg) { var done = plugins.Q.defer(); - var depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, { + var depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, { ignoreDirs: [ 'test', 'dist', @@ -72,7 +72,7 @@ var checkDependencies = function (configArg) { }; var checkDevDependencies = function (configArg) { var done = plugins.Q.defer(); - var depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, { + var depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, { ignoreDirs: [ 'ts', 'dist', diff --git a/dist/npmts.compile.helpers.d.ts b/dist/npmts.compile.helpers.d.ts deleted file mode 100644 index 176e31f..0000000 --- a/dist/npmts.compile.helpers.d.ts +++ /dev/null @@ -1 +0,0 @@ -export declare let checkOutputPath: (tsArrayArg: any, keyArg: any) => boolean; diff --git a/dist/npmts.compile.helpers.js b/dist/npmts.compile.helpers.js deleted file mode 100644 index 322295a..0000000 --- a/dist/npmts.compile.helpers.js +++ /dev/null @@ -1,16 +0,0 @@ -"use strict"; -var plugins = require("./npmts.plugins"); -var paths = require("./npmts.paths"); -var outputPathIsDir = function (tsArrayArg, keyArg) { - return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, tsArrayArg[keyArg])); -}; -exports.checkOutputPath = function (tsArrayArg, keyArg) { - if (!outputPathIsDir(tsArrayArg, keyArg)) { - plugins.beautylog.warn('Skipping ' + keyArg + ' because ' + tsArrayArg[keyArg] + ' it is no directory!'); - return false; - } - else { - return true; - } - ; -}; diff --git a/dist/npmts.compile.js b/dist/npmts.compile.js index c8d098f..01d775f 100644 --- a/dist/npmts.compile.js +++ b/dist/npmts.compile.js @@ -1,58 +1,17 @@ "use strict"; require("typings-global"); var plugins = require("./npmts.plugins"); -var helpers = require("./npmts.compile.helpers"); +var paths = require("./npmts.paths"); var npmts_promisechain_1 = require("./npmts.promisechain"); -var promiseArray = []; -var compileTs = function (tsFileArrayArg, tsOptionsArg) { - if (tsOptionsArg === void 0) { tsOptionsArg = {}; } - var done = plugins.Q.defer(); - var compilerOptionsDefault = { - declaration: true, - module: 'CommonJS', - target: 'ES6' - }; - /** - * merges default ts options with those found in npmts.json - */ - 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], - exclude: 'node_modules/**/*' - }; - return compilerOptions; - }; - var _loop_1 = function (keyArg) { - plugins.beautylog.info("TypeScript assignment: transpile from " + keyArg.blue + " to " + tsFileArrayArg[keyArg].blue); - if (helpers.checkOutputPath(tsFileArrayArg, keyArg)) { - plugins.smartfile.fs.listFileTree(process.cwd(), keyArg) - .then(function (filesToConvertArg) { - var filesToConvertAbsolute = plugins.smartpath.transform.toAbsolute(filesToConvertArg, process.cwd()); - var destDir = plugins.smartpath.transform.toAbsolute(tsFileArrayArg[keyArg], process.cwd()); - return plugins.tsn.compile(filesToConvertAbsolute, destDir, compilerOptions(keyArg)); - }) - .then(function () { - done.resolve(); - }); - } - }; - for (var keyArg in tsFileArrayArg) { - _loop_1(keyArg); - } - return done.promise; -}; exports.run = function (configArg) { var done = plugins.Q.defer(); var config = configArg; npmts_promisechain_1.npmtsOra.text('now compiling ' + 'TypeScript'.yellow); - compileTs(config.ts, config.tsOptions) + plugins.tsn.compileGlobStringObject(config.ts, config.tsOptions, paths.cwd) .then(function () { plugins.beautylog.ok('compiled main TypeScript!'); plugins.beautylog.log('now compiling tests!'); - return compileTs(config.testTs); + return plugins.tsn.compileGlobStringObject(config.testTs); }) .then(function () { plugins.beautylog.ok('compiled all TypeScript!'); diff --git a/dist/npmts.plugins.d.ts b/dist/npmts.plugins.d.ts index 0323933..2e7802e 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 import lodashObject = require('lodash'); +export import lodash = 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 761cd71..a5f630e 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"); +exports.lodash = require("lodash"); exports.npmextra = require("npmextra"); exports.projectinfo = require("projectinfo"); exports.path = require("path"); diff --git a/package.json b/package.json index 578dc7b..71b1713 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "babel-preset-es2015": "^6.14.0", "beautylog": "5.0.23", "depcheck": "^0.6.4", - "early": "^2.0.26", + "early": "^2.0.28", "gulp": "3.9.1", "gulp-babel": "^6.1.2", "gulp-function": "^1.3.6", @@ -49,18 +49,18 @@ "gulp-sourcemaps": "^1.6.0", "gulp-typedoc": "^2.0.0", "lodash": "^4.15.0", - "npmextra": "^1.0.9", + "npmextra": "^1.0.11", "projectinfo": "1.0.3", "q": "^1.4.1", "shelljs": "^0.7.4", "smartcli": "1.0.9", "smartcov": "1.0.0", "smartenv": "1.2.5", - "smartfile": "4.0.15", + "smartfile": "4.0.18", "smartpath": "3.2.2", "smartstring": "^2.0.17", "source-map-support": "^0.4.2", - "tsn": "^1.0.13", + "tsn": "^2.0.3", "typedoc": "^0.4.5", "typescript": "next", "typings-global": "^1.0.14" diff --git a/ts/npmts.check.ts b/ts/npmts.check.ts index f10ffa4..80678c8 100644 --- a/ts/npmts.check.ts +++ b/ts/npmts.check.ts @@ -34,7 +34,7 @@ const depcheckOptions = { let checkDependencies = (configArg) => { let done = plugins.Q.defer() - let depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, { + let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, { ignoreDirs: [ // folder with these names will be ignored 'test', 'dist', @@ -69,7 +69,7 @@ let checkDependencies = (configArg) => { let checkDevDependencies = (configArg) => { let done = plugins.Q.defer() - let depcheckOptionsMerged = plugins.lodashObject.merge(depcheckOptions, { + let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, { ignoreDirs: [ // folder with these names will be ignored 'ts', 'dist', diff --git a/ts/npmts.compile.helpers.ts b/ts/npmts.compile.helpers.ts deleted file mode 100644 index d6919bb..0000000 --- a/ts/npmts.compile.helpers.ts +++ /dev/null @@ -1,15 +0,0 @@ -import plugins = require('./npmts.plugins') -import paths = require('./npmts.paths') - -let outputPathIsDir = function (tsArrayArg,keyArg) { - return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, tsArrayArg[keyArg])) -} - -export let checkOutputPath = function(tsArrayArg,keyArg){ - if (!outputPathIsDir(tsArrayArg,keyArg)) { - plugins.beautylog.warn('Skipping ' + keyArg + ' because ' + tsArrayArg[keyArg] + ' it is no directory!') - return false - } else { - return true - }; -} diff --git a/ts/npmts.compile.ts b/ts/npmts.compile.ts index b48c7d2..6a5fecf 100644 --- a/ts/npmts.compile.ts +++ b/ts/npmts.compile.ts @@ -1,62 +1,17 @@ import 'typings-global' import plugins = require('./npmts.plugins') import paths = require('./npmts.paths') -import helpers = require('./npmts.compile.helpers') import {npmtsOra} from './npmts.promisechain' -let compileTs = (tsFileArrayArg: string[],tsOptionsArg = {}) => { - let done = plugins.Q.defer() - - let compilerOptionsDefault = { - declaration: true, - module: 'CommonJS', - target: 'ES6' - } - - /** - * merges default ts options with those found in npmts.json - */ - 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], - exclude: 'node_modules/**/*' - } - return compilerOptions - } - for (let keyArg in tsFileArrayArg) { - plugins.beautylog.info(`TypeScript assignment: transpile from ${keyArg.blue} to ${tsFileArrayArg[keyArg].blue}`) - if (helpers.checkOutputPath(tsFileArrayArg,keyArg)) { - plugins.smartfile.fs.listFileTree(process.cwd(),keyArg) - .then((filesToConvertArg: string[]) => { - let filesToConvertAbsolute = plugins.smartpath.transform.toAbsolute(filesToConvertArg,process.cwd()) - let destDir = plugins.smartpath.transform.toAbsolute(tsFileArrayArg[keyArg],process.cwd()) - return plugins.tsn.compile( - filesToConvertAbsolute, - destDir, - compilerOptions(keyArg) - ) - }) - .then(() => { - done.resolve() - }) - } - } - return done.promise -} - export let run = function (configArg) { let done = plugins.Q.defer() let config = configArg npmtsOra.text('now compiling ' + 'TypeScript'.yellow) - - compileTs(config.ts,config.tsOptions) + plugins.tsn.compileGlobStringObject(config.ts,config.tsOptions,paths.cwd) .then(() => { plugins.beautylog.ok('compiled main TypeScript!') plugins.beautylog.log('now compiling tests!') - return compileTs(config.testTs) + return plugins.tsn.compileGlobStringObject(config.testTs) }) .then(function () { plugins.beautylog.ok('compiled all TypeScript!') diff --git a/ts/npmts.options.ts b/ts/npmts.options.ts index 7d7a926..eecf224 100644 --- a/ts/npmts.options.ts +++ b/ts/npmts.options.ts @@ -32,7 +32,7 @@ export var run = function (argvArg) { // mix with configfile npmtsOra.text('looking for npmextra.json') - let config: INpmtsConfig = plugins.npmextra.dataFor({ + let config: INpmtsConfig = plugins.npmextra.dataFor({ toolName: 'npmts', defaultSettings: defaultConfig, cwd: paths.cwd diff --git a/ts/npmts.plugins.ts b/ts/npmts.plugins.ts index 0d809a7..2539265 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 import lodashObject = require('lodash') +export import lodash = require('lodash') export import npmextra = require('npmextra') export import projectinfo = require('projectinfo') export import path = require('path')