From 8896d3ef76adeb52312c0ab2ecf2f42bcc0a3817 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Tue, 28 Nov 2017 17:33:55 +0100 Subject: [PATCH] refactor --- dist/{mod00 => mod_compile}/index.d.ts | 0 dist/{mod00 => mod_compile}/index.js | 10 +- .../mod.assets.d.ts} | 0 .../mod.assets.js} | 6 +- .../mod.check.d.ts} | 0 .../mod.check.js} | 4 +- .../mod.clean.d.ts} | 0 .../mod.clean.js} | 2 +- .../mod.compile.d.ts} | 0 .../mod.compile.js} | 2 +- .../mod.plugins.d.ts} | 0 .../mod.plugins.js} | 0 dist/{mod01 => mod_docs}/index.d.ts | 0 dist/{mod01 => mod_docs}/index.js | 0 .../mod.plugins.d.ts} | 0 .../mod.plugins.js} | 0 dist/{mod02 => mod_test}/index.d.ts | 0 dist/{mod02 => mod_test}/index.js | 2 +- .../mod.plugins.d.ts} | 0 .../mod.plugins.js} | 0 dist/npmts.cli.js | 18 +- dist/npmts.mods.d.ts | 12 +- dist/npmts.mods.js | 6 +- package.json | 5 +- ts/mod00/index.ts | 27 -- ts/mod00/mod00.assets.ts | 24 -- ts/mod_compile/index.ts | 27 ++ ts/mod_compile/mod.assets.ts | 24 ++ .../mod.check.ts} | 6 +- .../mod.clean.ts} | 2 +- .../mod.compile.ts} | 2 +- .../mod.plugins.ts} | 0 ts/{mod01 => mod_docs}/index.ts | 8 +- .../mod.plugins.ts} | 0 ts/{mod02 => mod_test}/index.ts | 2 +- .../mod.plugins.ts} | 0 ts/npmts.cli.ts | 18 +- ts/npmts.mods.ts | 12 +- yarn.lock | 397 ++++++------------ 39 files changed, 244 insertions(+), 372 deletions(-) rename dist/{mod00 => mod_compile}/index.d.ts (100%) rename dist/{mod00 => mod_compile}/index.js (74%) rename dist/{mod00/mod00.assets.d.ts => mod_compile/mod.assets.d.ts} (100%) rename dist/{mod00/mod00.assets.js => mod_compile/mod.assets.js} (83%) rename dist/{mod00/mod00.check.d.ts => mod_compile/mod.check.d.ts} (100%) rename dist/{mod00/mod00.check.js => mod_compile/mod.check.js} (98%) rename dist/{mod00/mod00.clean.d.ts => mod_compile/mod.clean.d.ts} (100%) rename dist/{mod00/mod00.clean.js => mod_compile/mod.clean.js} (95%) rename dist/{mod00/mod00.compile.d.ts => mod_compile/mod.compile.d.ts} (100%) rename dist/{mod00/mod00.compile.js => mod_compile/mod.compile.js} (92%) rename dist/{mod00/mod00.plugins.d.ts => mod_compile/mod.plugins.d.ts} (100%) rename dist/{mod00/mod00.plugins.js => mod_compile/mod.plugins.js} (100%) rename dist/{mod01 => mod_docs}/index.d.ts (100%) rename dist/{mod01 => mod_docs}/index.js (100%) rename dist/{mod01/mod01.plugins.d.ts => mod_docs/mod.plugins.d.ts} (100%) rename dist/{mod01/mod01.plugins.js => mod_docs/mod.plugins.js} (100%) rename dist/{mod02 => mod_test}/index.d.ts (100%) rename dist/{mod02 => mod_test}/index.js (99%) rename dist/{mod02/mod02.plugins.d.ts => mod_test/mod.plugins.d.ts} (100%) rename dist/{mod02/mod02.plugins.js => mod_test/mod.plugins.js} (100%) delete mode 100644 ts/mod00/index.ts delete mode 100644 ts/mod00/mod00.assets.ts create mode 100644 ts/mod_compile/index.ts create mode 100644 ts/mod_compile/mod.assets.ts rename ts/{mod00/mod00.check.ts => mod_compile/mod.check.ts} (98%) rename ts/{mod00/mod00.clean.ts => mod_compile/mod.clean.ts} (94%) rename ts/{mod00/mod00.compile.ts => mod_compile/mod.compile.ts} (91%) rename ts/{mod00/mod00.plugins.ts => mod_compile/mod.plugins.ts} (100%) rename ts/{mod01 => mod_docs}/index.ts (70%) rename ts/{mod01/mod01.plugins.ts => mod_docs/mod.plugins.ts} (100%) rename ts/{mod02 => mod_test}/index.ts (98%) rename ts/{mod02/mod02.plugins.ts => mod_test/mod.plugins.ts} (100%) diff --git a/dist/mod00/index.d.ts b/dist/mod_compile/index.d.ts similarity index 100% rename from dist/mod00/index.d.ts rename to dist/mod_compile/index.d.ts diff --git a/dist/mod00/index.js b/dist/mod_compile/index.js similarity index 74% rename from dist/mod00/index.js rename to dist/mod_compile/index.js index 8dbf088..e63cd7e 100644 --- a/dist/mod00/index.js +++ b/dist/mod_compile/index.js @@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); * Note: Test files are only compiled in memory * -------------------------------------------- */ const q = require("smartq"); -const plugins = require("./mod00.plugins"); -const NpmtsAssets = require("./mod00.assets"); -const NpmtsCheck = require("./mod00.check"); -const NpmtsClean = require("./mod00.clean"); -const NpmtsCompile = require("./mod00.compile"); +const plugins = require("./mod.plugins"); +const NpmtsAssets = require("./mod.assets"); +const NpmtsCheck = require("./mod.check"); +const NpmtsClean = require("./mod.clean"); +const NpmtsCompile = require("./mod.compile"); exports.run = function (configArg) { let done = q.defer(); plugins.beautylog.ora.text('starting TypeScript Compilation'); diff --git a/dist/mod00/mod00.assets.d.ts b/dist/mod_compile/mod.assets.d.ts similarity index 100% rename from dist/mod00/mod00.assets.d.ts rename to dist/mod_compile/mod.assets.d.ts diff --git a/dist/mod00/mod00.assets.js b/dist/mod_compile/mod.assets.js similarity index 83% rename from dist/mod00/mod00.assets.js rename to dist/mod_compile/mod.assets.js index a2dfcc8..8f0f3a3 100644 --- a/dist/mod00/mod00.assets.js +++ b/dist/mod_compile/mod.assets.js @@ -2,14 +2,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); const q = require("smartq"); const paths = require("../npmts.paths"); -const plugins = require("./mod00.plugins"); -const mod00_check_1 = require("../mod00/mod00.check"); +const plugins = require("./mod.plugins"); +const mod_check_1 = require("../mod_compile/mod.check"); exports.run = function (configArg) { let done = q.defer(); let config = configArg; plugins.beautylog.ora.text('now looking at ' + 'required assets'); if (config.cli === true) { - let mainJsPath = mod00_check_1.projectInfo.packageJson.main; + let mainJsPath = mod_check_1.projectInfo.packageJson.main; let cliJsString = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir, 'cli.js')); cliJsString = cliJsString.replace('{{pathToIndex}}', mainJsPath); plugins.smartfile.memory.toFsSync(cliJsString, plugins.path.join(paths.distDir, 'cli.js')); diff --git a/dist/mod00/mod00.check.d.ts b/dist/mod_compile/mod.check.d.ts similarity index 100% rename from dist/mod00/mod00.check.d.ts rename to dist/mod_compile/mod.check.d.ts diff --git a/dist/mod00/mod00.check.js b/dist/mod_compile/mod.check.js similarity index 98% rename from dist/mod00/mod00.check.js rename to dist/mod_compile/mod.check.js index d707642..827708b 100644 --- a/dist/mod00/mod00.check.js +++ b/dist/mod_compile/mod.check.js @@ -11,7 +11,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const q = require("smartq"); const projectinfo_1 = require("projectinfo"); const paths = require("../npmts.paths"); -const plugins = require("./mod00.plugins"); +const plugins = require("./mod.plugins"); let checkProjectTypings = (configArg) => { let done = q.defer(); plugins.beautylog.ora.text('Check Module: Check Project Typings...'); @@ -20,7 +20,6 @@ let checkProjectTypings = (configArg) => { plugins.beautylog.error(`please add typings field to package.json`); process.exit(1); } - ; done.resolve(configArg); return done.promise; }; @@ -66,7 +65,6 @@ let checkDependencies = (configArg) => { for (let item in unused.invalidFiles) { plugins.beautylog.warn(`Watch out: could not parse file ${item}`); } - ; for (let item in unused.invalidDirs) { plugins.beautylog.warn(`Watch out: could not parse directory ${item}`); } diff --git a/dist/mod00/mod00.clean.d.ts b/dist/mod_compile/mod.clean.d.ts similarity index 100% rename from dist/mod00/mod00.clean.d.ts rename to dist/mod_compile/mod.clean.d.ts diff --git a/dist/mod00/mod00.clean.js b/dist/mod_compile/mod.clean.js similarity index 95% rename from dist/mod00/mod00.clean.js rename to dist/mod_compile/mod.clean.js index 1f57379..0fbac3e 100644 --- a/dist/mod00/mod00.clean.js +++ b/dist/mod_compile/mod.clean.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const q = require("smartq"); const paths = require("../npmts.paths"); -const plugins = require("./mod00.plugins"); +const plugins = require("./mod.plugins"); /** * removes the dist directory which will be entirely rebuild */ diff --git a/dist/mod00/mod00.compile.d.ts b/dist/mod_compile/mod.compile.d.ts similarity index 100% rename from dist/mod00/mod00.compile.d.ts rename to dist/mod_compile/mod.compile.d.ts diff --git a/dist/mod00/mod00.compile.js b/dist/mod_compile/mod.compile.js similarity index 92% rename from dist/mod00/mod00.compile.js rename to dist/mod_compile/mod.compile.js index 31cf5f3..790eba7 100644 --- a/dist/mod00/mod00.compile.js +++ b/dist/mod_compile/mod.compile.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const q = require("smartq"); const paths = require("../npmts.paths"); -const plugins = require("./mod00.plugins"); +const plugins = require("./mod.plugins"); exports.run = function (configArg) { let done = q.defer(); let config = configArg; diff --git a/dist/mod00/mod00.plugins.d.ts b/dist/mod_compile/mod.plugins.d.ts similarity index 100% rename from dist/mod00/mod00.plugins.d.ts rename to dist/mod_compile/mod.plugins.d.ts diff --git a/dist/mod00/mod00.plugins.js b/dist/mod_compile/mod.plugins.js similarity index 100% rename from dist/mod00/mod00.plugins.js rename to dist/mod_compile/mod.plugins.js diff --git a/dist/mod01/index.d.ts b/dist/mod_docs/index.d.ts similarity index 100% rename from dist/mod01/index.d.ts rename to dist/mod_docs/index.d.ts diff --git a/dist/mod01/index.js b/dist/mod_docs/index.js similarity index 100% rename from dist/mod01/index.js rename to dist/mod_docs/index.js diff --git a/dist/mod01/mod01.plugins.d.ts b/dist/mod_docs/mod.plugins.d.ts similarity index 100% rename from dist/mod01/mod01.plugins.d.ts rename to dist/mod_docs/mod.plugins.d.ts diff --git a/dist/mod01/mod01.plugins.js b/dist/mod_docs/mod.plugins.js similarity index 100% rename from dist/mod01/mod01.plugins.js rename to dist/mod_docs/mod.plugins.js diff --git a/dist/mod02/index.d.ts b/dist/mod_test/index.d.ts similarity index 100% rename from dist/mod02/index.d.ts rename to dist/mod_test/index.d.ts diff --git a/dist/mod02/index.js b/dist/mod_test/index.js similarity index 99% rename from dist/mod02/index.js rename to dist/mod_test/index.js index ca679d2..f80247f 100644 --- a/dist/mod02/index.js +++ b/dist/mod_test/index.js @@ -11,7 +11,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); /* ------------------------------------------ * This module tests the compiled TypeScript files * -------------------------------------------- */ -const plugins = require("./mod02.plugins"); +const plugins = require("./mod.plugins"); const paths = require("../npmts.paths"); const q = require("smartq"); let testTypeScriptConfig = { diff --git a/dist/mod02/mod02.plugins.d.ts b/dist/mod_test/mod.plugins.d.ts similarity index 100% rename from dist/mod02/mod02.plugins.d.ts rename to dist/mod_test/mod.plugins.d.ts diff --git a/dist/mod02/mod02.plugins.js b/dist/mod_test/mod.plugins.js similarity index 100% rename from dist/mod02/mod02.plugins.js rename to dist/mod_test/mod.plugins.js diff --git a/dist/npmts.cli.js b/dist/npmts.cli.js index 13b6798..52e27e4 100644 --- a/dist/npmts.cli.js +++ b/dist/npmts.cli.js @@ -58,15 +58,15 @@ exports.run = () => __awaiter(this, void 0, void 0, function* () { .then((configArg) => { let done = q.defer(); plugins.beautylog.ora.start('loading additional modules...'); - NpmtsMods.mod00.load() - .then((mod00) => { - return mod00.run(configArg); + NpmtsMods.modCompile.load() + .then((modCompile) => { + return modCompile.run(configArg); }) .then(configArg => { let done = q.defer(); - NpmtsMods.mod01.load() - .then(mod01 => { - return mod01.run(configArg); + NpmtsMods.modDocs.load() + .then(modDocs => { + return modDocs.run(configArg); }) .then(configArg => { done.resolve(configArg); @@ -75,9 +75,9 @@ exports.run = () => __awaiter(this, void 0, void 0, function* () { }) .then(configArg => { let done = q.defer(); - NpmtsMods.mod02.load() - .then(mod02 => { - return mod02.run(configArg); + NpmtsMods.modTest.load() + .then(modTest => { + return modTest.run(configArg); }) .then(configArg => { done.resolve(configArg); diff --git a/dist/npmts.mods.d.ts b/dist/npmts.mods.d.ts index 9fa8bba..ab03330 100644 --- a/dist/npmts.mods.d.ts +++ b/dist/npmts.mods.d.ts @@ -1,7 +1,7 @@ import { LazyModule } from 'smartsystem'; -import * as _mod00 from './mod00/index'; -import * as _mod01 from './mod01/index'; -import * as _mod02 from './mod02/index'; -export declare let mod00: LazyModule; -export declare let mod01: LazyModule; -export declare let mod02: LazyModule; +import * as _modCompile from './mod_compile/index'; +import * as _modDocs from './mod_docs/index'; +import * as _modTest from './mod_test/index'; +export declare let modCompile: LazyModule; +export declare let modDocs: LazyModule; +export declare let modTest: LazyModule; diff --git a/dist/npmts.mods.js b/dist/npmts.mods.js index f583aca..6491ec9 100644 --- a/dist/npmts.mods.js +++ b/dist/npmts.mods.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const smartsystem_1 = require("smartsystem"); -exports.mod00 = new smartsystem_1.LazyModule('./mod00/index', __dirname); -exports.mod01 = new smartsystem_1.LazyModule('./mod01/index', __dirname); -exports.mod02 = new smartsystem_1.LazyModule('./mod02/index', __dirname); +exports.modCompile = new smartsystem_1.LazyModule('./mod_compile/index', __dirname); +exports.modDocs = new smartsystem_1.LazyModule('./mod_docs/index', __dirname); +exports.modTest = new smartsystem_1.LazyModule('./mod_test/index', __dirname); diff --git a/package.json b/package.json index ec62dee..9416dac 100644 --- a/package.json +++ b/package.json @@ -59,11 +59,10 @@ "smartstring": "^2.0.28", "smartsystem": "^2.0.2", "smartupdate": "^1.0.13", - "tapbuffer": "^1.0.29", + "tapbuffer": "^1.0.31", "through2": "^2.0.3", "tsn": "^2.0.15", - "typescript": "^2.6.1", - "typings-global": "^1.0.23" + "typescript": "^2.6.2" }, "devDependencies": {} } diff --git a/ts/mod00/index.ts b/ts/mod00/index.ts deleted file mode 100644 index 7d1a0ae..0000000 --- a/ts/mod00/index.ts +++ /dev/null @@ -1,27 +0,0 @@ -/* ------------------------------------------ - * This module compiles the module's TypeScript files - * Note: Test files are only compiled in memory - * -------------------------------------------- */ -import * as q from 'smartq' - -import { INpmtsConfig } from '../npmts.config' - -import * as plugins from './mod00.plugins' - -import * as NpmtsAssets from './mod00.assets' -import * as NpmtsCheck from './mod00.check' -import * as NpmtsClean from './mod00.clean' -import * as NpmtsCompile from './mod00.compile' - -export let run = function(configArg: INpmtsConfig): Promise { - let done = q.defer() - plugins.beautylog.ora.text('starting TypeScript Compilation') - NpmtsClean.run(configArg) - .then(NpmtsCheck.run) - .then(NpmtsCompile.run) - .then(NpmtsAssets.run) - .then(function(){ - done.resolve(configArg) - }) - return done.promise -} diff --git a/ts/mod00/mod00.assets.ts b/ts/mod00/mod00.assets.ts deleted file mode 100644 index 346e785..0000000 --- a/ts/mod00/mod00.assets.ts +++ /dev/null @@ -1,24 +0,0 @@ -import * as q from 'smartq' - -import paths = require('../npmts.paths') - -import plugins = require('./mod00.plugins') -import { projectInfo } from '../mod00/mod00.check' - -export let run = function(configArg){ - let done = q.defer() - let config = configArg - plugins.beautylog.ora.text('now looking at ' + 'required assets') - if (config.cli === true) { - let mainJsPath = projectInfo.packageJson.main - let cliJsString: string = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir,'cli.js')) - cliJsString = cliJsString.replace('{{pathToIndex}}',mainJsPath) - plugins.smartfile.memory.toFsSync(cliJsString, plugins.path.join(paths.distDir,'cli.js')) - plugins.beautylog.ok('installed CLI assets!') - done.resolve(config) - } else { - plugins.beautylog.ok('No additional assets required!') - done.resolve(config) - } - return done.promise -} diff --git a/ts/mod_compile/index.ts b/ts/mod_compile/index.ts new file mode 100644 index 0000000..52a27f1 --- /dev/null +++ b/ts/mod_compile/index.ts @@ -0,0 +1,27 @@ +/* ------------------------------------------ + * This module compiles the module's TypeScript files + * Note: Test files are only compiled in memory + * -------------------------------------------- */ +import * as q from 'smartq' + +import { INpmtsConfig } from '../npmts.config' + +import * as plugins from './mod.plugins' + +import * as NpmtsAssets from './mod.assets' +import * as NpmtsCheck from './mod.check' +import * as NpmtsClean from './mod.clean' +import * as NpmtsCompile from './mod.compile' + +export let run = function (configArg: INpmtsConfig): Promise { + let done = q.defer() + plugins.beautylog.ora.text('starting TypeScript Compilation') + NpmtsClean.run(configArg) + .then(NpmtsCheck.run) + .then(NpmtsCompile.run) + .then(NpmtsAssets.run) + .then(function () { + done.resolve(configArg) + }) + return done.promise +} diff --git a/ts/mod_compile/mod.assets.ts b/ts/mod_compile/mod.assets.ts new file mode 100644 index 0000000..6d40330 --- /dev/null +++ b/ts/mod_compile/mod.assets.ts @@ -0,0 +1,24 @@ +import * as q from 'smartq' + +import paths = require('../npmts.paths') + +import plugins = require('./mod.plugins') +import { projectInfo } from '../mod_compile/mod.check' + +export let run = function (configArg) { + let done = q.defer() + let config = configArg + plugins.beautylog.ora.text('now looking at ' + 'required assets') + if (config.cli === true) { + let mainJsPath = projectInfo.packageJson.main + let cliJsString: string = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir, 'cli.js')) + cliJsString = cliJsString.replace('{{pathToIndex}}', mainJsPath) + plugins.smartfile.memory.toFsSync(cliJsString, plugins.path.join(paths.distDir, 'cli.js')) + plugins.beautylog.ok('installed CLI assets!') + done.resolve(config) + } else { + plugins.beautylog.ok('No additional assets required!') + done.resolve(config) + } + return done.promise +} diff --git a/ts/mod00/mod00.check.ts b/ts/mod_compile/mod.check.ts similarity index 98% rename from ts/mod00/mod00.check.ts rename to ts/mod_compile/mod.check.ts index a39f441..32b1e1f 100644 --- a/ts/mod00/mod00.check.ts +++ b/ts/mod_compile/mod.check.ts @@ -6,7 +6,7 @@ import { INpmtsConfig } from '../npmts.config' import * as paths from '../npmts.paths' -import * as plugins from './mod00.plugins' +import * as plugins from './mod.plugins' export let projectInfo: ProjectinfoNpm @@ -17,7 +17,7 @@ let checkProjectTypings = (configArg: INpmtsConfig) => { if (typeof projectInfo.packageJson.typings === 'undefined') { plugins.beautylog.error(`please add typings field to package.json`) process.exit(1) - }; + } done.resolve(configArg) return done.promise } @@ -64,7 +64,7 @@ let checkDependencies = (configArg: INpmtsConfig) => { } for (let item in unused.invalidFiles) { plugins.beautylog.warn(`Watch out: could not parse file ${item}`) - }; + } for (let item in unused.invalidDirs) { plugins.beautylog.warn(`Watch out: could not parse directory ${item}`) } diff --git a/ts/mod00/mod00.clean.ts b/ts/mod_compile/mod.clean.ts similarity index 94% rename from ts/mod00/mod00.clean.ts rename to ts/mod_compile/mod.clean.ts index d577fa9..b24f650 100644 --- a/ts/mod00/mod00.clean.ts +++ b/ts/mod_compile/mod.clean.ts @@ -1,7 +1,7 @@ import * as q from 'smartq' import paths = require('../npmts.paths') -import plugins = require('./mod00.plugins') +import plugins = require('./mod.plugins') /** * removes the dist directory which will be entirely rebuild diff --git a/ts/mod00/mod00.compile.ts b/ts/mod_compile/mod.compile.ts similarity index 91% rename from ts/mod00/mod00.compile.ts rename to ts/mod_compile/mod.compile.ts index f7eebac..abaf402 100644 --- a/ts/mod00/mod00.compile.ts +++ b/ts/mod_compile/mod.compile.ts @@ -2,7 +2,7 @@ import * as q from 'smartq' import * as paths from '../npmts.paths' -import * as plugins from './mod00.plugins' +import * as plugins from './mod.plugins' export let run = function (configArg) { let done = q.defer() diff --git a/ts/mod00/mod00.plugins.ts b/ts/mod_compile/mod.plugins.ts similarity index 100% rename from ts/mod00/mod00.plugins.ts rename to ts/mod_compile/mod.plugins.ts diff --git a/ts/mod01/index.ts b/ts/mod_docs/index.ts similarity index 70% rename from ts/mod01/index.ts rename to ts/mod_docs/index.ts index fa6a9a5..69c2dc7 100644 --- a/ts/mod01/index.ts +++ b/ts/mod_docs/index.ts @@ -6,10 +6,10 @@ import * as q from 'smartq' import * as paths from '../npmts.paths' import { INpmtsConfig } from '../npmts.config' -import * as plugins from './mod01.plugins' +import * as plugins from './mod.plugins' export let run = function (configArg: INpmtsConfig) { - let done = q.defer() - done.resolve(configArg) - return done.promise + let done = q.defer() + done.resolve(configArg) + return done.promise } diff --git a/ts/mod01/mod01.plugins.ts b/ts/mod_docs/mod.plugins.ts similarity index 100% rename from ts/mod01/mod01.plugins.ts rename to ts/mod_docs/mod.plugins.ts diff --git a/ts/mod02/index.ts b/ts/mod_test/index.ts similarity index 98% rename from ts/mod02/index.ts rename to ts/mod_test/index.ts index 335b5f1..24350a1 100644 --- a/ts/mod02/index.ts +++ b/ts/mod_test/index.ts @@ -1,7 +1,7 @@ /* ------------------------------------------ * This module tests the compiled TypeScript files * -------------------------------------------- */ -import plugins = require('./mod02.plugins') +import plugins = require('./mod.plugins') import paths = require('../npmts.paths') import * as q from 'smartq' diff --git a/ts/mod02/mod02.plugins.ts b/ts/mod_test/mod.plugins.ts similarity index 100% rename from ts/mod02/mod02.plugins.ts rename to ts/mod_test/mod.plugins.ts diff --git a/ts/npmts.cli.ts b/ts/npmts.cli.ts index 437ff92..c70a04c 100644 --- a/ts/npmts.cli.ts +++ b/ts/npmts.cli.ts @@ -53,15 +53,15 @@ export let run = async () => { .then((configArg: NpmtsConfig.INpmtsConfig) => { let done = q.defer() plugins.beautylog.ora.start('loading additional modules...') - NpmtsMods.mod00.load() - .then((mod00) => { - return mod00.run(configArg) + NpmtsMods.modCompile.load() + .then((modCompile) => { + return modCompile.run(configArg) }) .then(configArg => { let done = q.defer() - NpmtsMods.mod01.load() - .then(mod01 => { - return mod01.run(configArg) + NpmtsMods.modDocs.load() + .then(modDocs => { + return modDocs.run(configArg) }) .then(configArg => { done.resolve(configArg) @@ -70,9 +70,9 @@ export let run = async () => { }) .then(configArg => { let done = q.defer() - NpmtsMods.mod02.load() - .then(mod02 => { - return mod02.run(configArg) + NpmtsMods.modTest.load() + .then(modTest => { + return modTest.run(configArg) }) .then(configArg => { done.resolve(configArg) diff --git a/ts/npmts.mods.ts b/ts/npmts.mods.ts index b6db6a5..9cb7dc6 100644 --- a/ts/npmts.mods.ts +++ b/ts/npmts.mods.ts @@ -2,10 +2,10 @@ import * as plugins from './npmts.plugins' import { LazyModule } from 'smartsystem' -import * as _mod00 from './mod00/index' -import * as _mod01 from './mod01/index' -import * as _mod02 from './mod02/index' +import * as _modCompile from './mod_compile/index' +import * as _modDocs from './mod_docs/index' +import * as _modTest from './mod_test/index' -export let mod00 = new LazyModule('./mod00/index',__dirname) -export let mod01 = new LazyModule('./mod01/index',__dirname) -export let mod02 = new LazyModule('./mod02/index',__dirname) +export let modCompile = new LazyModule('./mod_compile/index',__dirname) +export let modDocs = new LazyModule('./mod_docs/index',__dirname) +export let modTest = new LazyModule('./mod_test/index',__dirname) diff --git a/yarn.lock b/yarn.lock index 440e599..e82f13a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19,27 +19,6 @@ normalize-path "^2.0.1" through2 "^2.0.3" -"@types/chai-as-promised@0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-0.0.29.tgz#43d52892aa998e185a3de3e2477edb8573be1d77" - dependencies: - "@types/chai" "*" - "@types/promises-a-plus" "*" - -"@types/chai-string@^1.1.30": - version "1.1.31" - resolved "https://registry.yarnpkg.com/@types/chai-string/-/chai-string-1.1.31.tgz#a22f75d713f69da8c5cf34f8bc808a62cd249405" - dependencies: - "@types/chai" "*" - -"@types/chai@*": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.0.4.tgz#fe86315d9a66827feeb16f73bc954688ec950e18" - -"@types/chai@^3.4.35": - version "3.5.2" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-3.5.2.tgz#c11cd2817d3a401b7ba0f5a420f35c56139b1c1e" - "@types/chokidar@^1.7.0": version "1.7.3" resolved "https://registry.yarnpkg.com/@types/chokidar/-/chokidar-1.7.3.tgz#ca87a53aa596c01eb93237ab4055edf71dcb9ca6" @@ -51,18 +30,11 @@ resolved "https://registry.yarnpkg.com/@types/cron/-/cron-1.2.1.tgz#95c1e432d6106ca34c92f0743638bc786c073faa" "@types/fs-extra@4.x.x": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-4.0.2.tgz#7b9b1bbf85962cbe029b5a83c9b530d7c75af3ba" + version "4.0.5" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-4.0.5.tgz#8aa6033c0e87c653b09a6711686916864b48ec9e" dependencies: "@types/node" "*" -"@types/glob@*": - version "5.0.32" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.32.tgz#aec5cfe987c72f099fdb1184452986aa506d5e8f" - dependencies: - "@types/minimatch" "*" - "@types/node" "*" - "@types/gulp-sourcemaps@0.0.32": version "0.0.32" resolved "https://registry.yarnpkg.com/@types/gulp-sourcemaps/-/gulp-sourcemaps-0.0.32.tgz#e79ee617e0cb15729874be4533fe59c07793a175" @@ -73,27 +45,23 @@ version "0.4.29" resolved "https://registry.yarnpkg.com/@types/istanbul/-/istanbul-0.4.29.tgz#29c8cbb747ac57280965545dc58514ba0dbb99af" -"@types/lodash@4.x.x", "@types/lodash@^4.14.50", "@types/lodash@^4.14.55", "@types/lodash@^4.14.64", "@types/lodash@^4.14.68", "@types/lodash@^4.14.74": - version "4.14.74" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.74.tgz#ac3bd8db988e7f7038e5d22bd76a7ba13f876168" +"@types/lodash@4.x.x", "@types/lodash@^4.14.50", "@types/lodash@^4.14.55", "@types/lodash@^4.14.64", "@types/lodash@^4.14.68", "@types/lodash@^4.14.74", "@types/lodash@^4.14.85": + version "4.14.85" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.85.tgz#a16fbf942422f6eca5622b6910492c496c35069b" -"@types/minimatch@*", "@types/minimatch@3.x.x", "@types/minimatch@^3.0.1": +"@types/minimatch@3.x.x", "@types/minimatch@^3.0.1": version "3.0.1" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.1.tgz#b683eb60be358304ef146f5775db4c0e3696a550" "@types/node@*", "@types/node@^8.0.10": - version "8.0.30" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.30.tgz#aa3c42946fc6357737eb215349fe728b38679d05" + version "8.0.53" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.53.tgz#396b35af826fa66aad472c8cb7b8d5e277f4e6d8" "@types/open@^0.0.29": version "0.0.29" resolved "https://registry.yarnpkg.com/@types/open/-/open-0.0.29.tgz#3de910012674909db14d608d1fde44ffa7a9ecea" -"@types/promises-a-plus@*": - version "0.0.27" - resolved "https://registry.yarnpkg.com/@types/promises-a-plus/-/promises-a-plus-0.0.27.tgz#c64651134614c84b8f5d7114ce8901d36a609780" - -"@types/q@1.0.5", "@types/q@1.x.x": +"@types/q@1.0.5": version "1.0.5" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.0.5.tgz#02b9d43a1a8e7503d15ed2fecb15ebb18c519b1d" @@ -101,13 +69,6 @@ version "5.4.0" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.4.0.tgz#f3658535af7f1f502acd6da7daf405ffeb1f7ee4" -"@types/shelljs@^0.7.4": - version "0.7.4" - resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.4.tgz#137b5f31306eaff4de120ffe5b9d74b297809cfc" - dependencies: - "@types/glob" "*" - "@types/node" "*" - "@types/source-map-support@^0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@types/source-map-support/-/source-map-support-0.4.0.tgz#a62a1866614af68c888173c001481f242aaf148b" @@ -135,8 +96,8 @@ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-8.0.2.tgz#0f9c7b236e2d78cd8f4b6502de15d0728aa29385" abbrev@1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" abbrev@1.0.x: version "1.0.9" @@ -147,8 +108,8 @@ acorn@4.X: resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" acorn@^5.0.3: - version "5.1.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.2.tgz#911cb53e036807cf0fa778dc5d370fbd864246d7" + version "5.2.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7" ajv@^4.9.1: version "4.11.8" @@ -247,10 +208,6 @@ assert-plus@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" -assertion-error@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c" - async-each@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" @@ -340,7 +297,7 @@ beautycolor@^1.0.11, beautycolor@^1.0.7, beautycolor@^1.0.9: ansi-256-colors "^1.1.0" typings-global "^1.0.14" -beautylog@6.1.10, beautylog@^6.0.0, beautylog@^6.0.1, beautylog@^6.1.10, beautylog@^6.1.5: +beautylog@6.1.10, beautylog@^6.0.1, beautylog@^6.1.10, beautylog@^6.1.5: version "6.1.10" resolved "https://registry.yarnpkg.com/beautylog/-/beautylog-6.1.10.tgz#9c27e566937684cb689f9372d98cfa5415d50b72" dependencies: @@ -358,8 +315,8 @@ beeper@^1.0.0: resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" binary-extensions@^1.0.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0" + version "1.11.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" block-stream@*: version "0.0.9" @@ -422,24 +379,6 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chai-as-promised@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-6.0.0.tgz#1a02a433a6f24dafac63b9c96fa1684db1aa8da6" - dependencies: - check-error "^1.0.2" - -chai-string@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/chai-string/-/chai-string-1.4.0.tgz#359140c051d36a4e4b1a5fc6b910152f438a8d49" - -chai@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247" - dependencies: - assertion-error "^1.0.1" - deep-eql "^0.1.3" - type-detect "^1.0.0" - chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -450,10 +389,6 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -check-error@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" - chokidar@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" @@ -480,8 +415,8 @@ cli-cursor@^2.1.0: restore-cursor "^2.0.0" cli-spinners@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.0.1.tgz#2675321c100f195b02877ac499e9911fa34b9783" + version "1.1.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06" cliui@^2.1.0: version "2.1.0" @@ -512,8 +447,8 @@ clone-stats@^1.0.0: resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" clone@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149" + version "1.0.3" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f" clone@^2.1.1: version "2.1.1" @@ -558,8 +493,8 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" convert-source-map@1.X, convert-source-map@^1.1.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5" + version "1.5.1" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" core-js@^2.4.0: version "2.5.1" @@ -639,18 +574,18 @@ dateformat@^2.0.0: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" debug-fabulous@>=0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-0.1.1.tgz#1b970878c9fa4fbd1c88306eab323c830c58f1d6" + version "0.2.1" + resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-0.2.1.tgz#57e1164ba0e9ad6d9a65f20075ff3c2bd6bde0dc" dependencies: - debug "2.3.0" - memoizee "^0.4.5" - object-assign "4.1.0" + debug "3.X" + memoizee "0.4.X" + object-assign "4.X" -debug@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.0.tgz#3912dc55d7167fc3af17d2b85c13f93deaedaa43" +debug@3.X: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" dependencies: - ms "0.7.2" + ms "2.0.0" debug@^2.1.3, debug@^2.2.0, debug@^2.6.8: version "2.6.9" @@ -666,12 +601,6 @@ decimal.js@7.2.3: version "7.2.3" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-7.2.3.tgz#6434c3b8a8c375780062fc633d0d2bbdb264cc78" -deep-eql@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2" - dependencies: - type-detect "0.1.1" - deep-extend@~0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" @@ -719,6 +648,10 @@ deps-regex@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/deps-regex/-/deps-regex-0.1.4.tgz#518667b7691460a5e7e0a341be76eb7ce8090184" +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + detect-newline@2.X: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" @@ -769,8 +702,8 @@ error-ex@^1.2.0: is-arrayish "^0.2.1" es-abstract@^1.5.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.8.2.tgz#25103263dc4decbda60e0c737ca32313518027ee" + version "1.10.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864" dependencies: es-to-primitive "^1.1.1" function-bind "^1.1.1" @@ -786,22 +719,22 @@ es-to-primitive@^1.1.1: is-date-object "^1.0.1" is-symbol "^1.0.1" -es5-ext@^0.10.14, es5-ext@^0.10.30, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2: - version "0.10.30" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.30.tgz#7141a16836697dbabfaaaeee41495ce29f52c939" +es5-ext@^0.10.14, es5-ext@^0.10.30, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2: + version "0.10.37" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3" dependencies: - es6-iterator "2" - es6-symbol "~3.1" + es6-iterator "~2.0.1" + es6-symbol "~3.1.1" -es6-iterator@2, es6-iterator@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512" +es6-iterator@^2.0.1, es6-iterator@~2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" dependencies: d "1" - es5-ext "^0.10.14" - es6-symbol "^3.1" + es5-ext "^0.10.35" + es6-symbol "^3.1.1" -es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1: +es6-symbol@^3.1.1, es6-symbol@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" dependencies: @@ -1016,11 +949,11 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4" + version "1.1.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" dependencies: nan "^2.3.0" - node-pre-gyp "^0.6.36" + node-pre-gyp "^0.6.39" fstream-ignore@^1.0.5: version "1.0.5" @@ -1240,8 +1173,8 @@ gulplog@^1.0.0: glogg "^1.0.0" handlebars@^4.0.1: - version "4.0.10" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.10.tgz#3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f" + version "4.0.11" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc" dependencies: async "^1.4.0" optimist "^0.6.1" @@ -1335,12 +1268,12 @@ inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" ini@~1.3.0: - version "1.3.4" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" + version "1.3.5" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" interpret@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0" + version "1.1.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" invariant@^2.2.2: version "2.2.2" @@ -1363,8 +1296,8 @@ is-binary-path@^1.0.0: binary-extensions "^1.0.0" is-buffer@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc" + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" is-builtin-module@^1.0.0: version "1.0.0" @@ -1525,7 +1458,7 @@ javascript-natural-sort@0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" -js-base64@^2.1.9, js-base64@^2.3.2: +js-base64@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf" @@ -1622,21 +1555,7 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -lik@^1.0.32, lik@^1.0.38: - version "1.0.42" - resolved "https://registry.yarnpkg.com/lik/-/lik-1.0.42.tgz#e77604fac257c1b3552779c443de08c09b6e5332" - dependencies: - "@types/lodash" "^4.14.74" - "@types/minimatch" "3.x.x" - "@types/q" "1.x.x" - lodash "^4.17.4" - minimatch "^3.0.4" - q "^1.5.0" - rxjs "^5.4.3" - smartq "^1.1.6" - typings-global "^1.0.20" - -lik@^1.0.42: +lik@^1.0.32, lik@^1.0.38, lik@^1.0.42: version "1.0.43" resolved "https://registry.yarnpkg.com/lik/-/lik-1.0.43.tgz#e81709290fb85ff61dabfa008791ba9ffed0c666" dependencies: @@ -1806,8 +1725,8 @@ map-obj@^1.0.0, map-obj@^1.0.1: resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" mathjs@^3.10.3: - version "3.16.3" - resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-3.16.3.tgz#74f21d553d4cb1a82b480541ae1fcb0bd0f6f0aa" + version "3.17.0" + resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-3.17.0.tgz#9569d278874546175c9d0497d7417eb88fb61503" dependencies: complex.js "2.0.4" decimal.js "7.2.3" @@ -1815,7 +1734,7 @@ mathjs@^3.10.3: javascript-natural-sort "0.7.1" seed-random "2.2.0" tiny-emitter "2.0.0" - typed-function "0.10.5" + typed-function "0.10.6" mem@^1.1.0: version "1.1.0" @@ -1823,7 +1742,7 @@ mem@^1.1.0: dependencies: mimic-fn "^1.0.0" -memoizee@^0.4.5: +memoizee@0.4.X: version "0.4.11" resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.11.tgz#bde9817663c9e40fdb2a4ea1c367296087ae8c8f" dependencies: @@ -1914,18 +1833,14 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: minimist "0.0.8" moment-timezone@^0.5.x: - version "0.5.13" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.13.tgz#99ce5c7d827262eb0f1f702044177f60745d7b90" + version "0.5.14" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.14.tgz#4eb38ff9538b80108ba467a458f3ed4268ccfcb1" dependencies: moment ">= 2.9.0" "moment@>= 2.9.0", moment@^2.18.1: - version "2.18.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" - -ms@0.7.2: - version "0.7.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765" + version "2.19.2" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.2.tgz#8a7f774c95a64550b4c7ebd496683908f9419dbe" ms@2.0.0: version "2.0.0" @@ -1938,8 +1853,8 @@ multipipe@^0.1.2: duplexer2 "0.0.2" nan@^2.3.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" + version "2.8.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" native-promise-only@^0.8.1: version "0.8.1" @@ -1949,10 +1864,11 @@ next-tick@1: version "1.0.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" -node-pre-gyp@^0.6.36: - version "0.6.38" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz#e92a20f83416415bb4086f6d1fb78b3da73d113d" +node-pre-gyp@^0.6.39: + version "0.6.39" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" dependencies: + detect-libc "^1.0.2" hawk "3.1.3" mkdirp "^0.5.1" nopt "^4.0.1" @@ -2031,18 +1947,14 @@ oauth-sign@~0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" -object-assign@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0" +object-assign@4.X, object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" object-assign@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" -object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - object-keys@^1.0.8: version "1.0.11" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d" @@ -2253,8 +2165,8 @@ punycode@^1.3.2, punycode@^1.4.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" q@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1" + version "1.5.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" qs@~6.4.0: version "6.4.0" @@ -2268,8 +2180,8 @@ randomatic@^1.1.3, randomatic@^1.1.7: kind-of "^4.0.0" rc@^1.1.7: - version "1.2.1" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95" + version "1.2.2" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077" dependencies: deep-extend "~0.4.0" ini "~1.3.0" @@ -2468,8 +2380,8 @@ resolve@1.1.x: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" resolve@^1.1.6: - version "1.4.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.4.0.tgz#a75be01c53da25d934a98ebd0e4c4a7312f92a86" + version "1.5.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" dependencies: path-parse "^1.0.5" @@ -2486,15 +2398,15 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.3.3, rimraf@^2.5.1, rimraf@^2.6.1: +rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1, rimraf@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: glob "^7.0.5" rxjs@^5.4.1, rxjs@^5.4.2, rxjs@^5.4.3: - version "5.4.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.3.tgz#0758cddee6033d68e0fd53676f0f3596ce3d483f" + version "5.5.2" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.2.tgz#28d403f0071121967f18ad665563255d54236ac3" dependencies: symbol-observable "^1.0.1" @@ -2548,17 +2460,6 @@ smartanalytics@^2.0.9: smartrequest "^1.0.4" typings-global "^1.0.14" -smartchai@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/smartchai/-/smartchai-1.0.3.tgz#de6d010bb8b5aef24cb70b31a5f5334e8c41b72f" - dependencies: - "@types/chai" "^3.4.35" - "@types/chai-as-promised" "0.0.29" - "@types/chai-string" "^1.1.30" - chai "^3.5.0" - chai-as-promised "^6.0.0" - chai-string "^1.3.0" - smartchok@^1.0.11: version "1.0.11" resolved "https://registry.yarnpkg.com/smartchok/-/smartchok-1.0.11.tgz#30d5913d0de70a85f7e873b010c8b3afed48653e" @@ -2596,8 +2497,8 @@ smartcov@^1.0.2: typings-global "^1.0.14" smartdelay@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/smartdelay/-/smartdelay-1.0.3.tgz#5fd44dad77262d110702f0293efa80c072cfb579" + version "1.0.4" + resolved "https://registry.yarnpkg.com/smartdelay/-/smartdelay-1.0.4.tgz#791c1a4ee6770494064c10b1d2d2b8e6f3105b82" dependencies: smartq "^1.1.1" typings-global "^1.0.16" @@ -2625,7 +2526,7 @@ smartevent@^1.0.1: smartq "^1.1.1" typings-global "^1.0.16" -smartfile@^4.1.4, smartfile@^4.2.15, smartfile@^4.2.17, smartfile@^4.2.20, smartfile@^4.2.26: +smartfile@^4.1.4, smartfile@^4.2.15, smartfile@^4.2.20, smartfile@^4.2.26: version "4.2.26" resolved "https://registry.yarnpkg.com/smartfile/-/smartfile-4.2.26.tgz#800f08b1089e153b7fd8e0ba165da465a071d407" dependencies: @@ -2663,18 +2564,15 @@ smartinject@^1.0.15: through2 "^2.0.3" typings-global "^1.0.20" -smartipc@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/smartipc/-/smartipc-1.0.9.tgz#c981eb562179ee4cf807070ecdf8cb58e8f3c76e" +smartipc@^1.0.11, smartipc@^1.0.9: + version "1.0.11" + resolved "https://registry.yarnpkg.com/smartipc/-/smartipc-1.0.11.tgz#047afc926de683a83285191d0c3e7bd68b83dff7" dependencies: - "@types/lodash" "^4.14.50" - beautylog "^6.0.0" - lodash "^4.17.4" - smartchai "^1.0.3" - smartq "^1.1.0" - spawn-wrap "^1.3.4" - threads "^0.7.2" - typings-global "^1.0.14" + "@types/lodash" "^4.14.85" + smartq "^1.1.6" + spawn-wrap "^1.4.1" + threads "^0.8.1" + typings-global "^1.0.23" smartlodash@^1.0.1: version "1.0.1" @@ -2718,7 +2616,7 @@ smartpath@^3.2.7, smartpath@^3.2.8: home "^1.0.1" typings-global "^1.0.14" -smartq@^1.0.4, smartq@^1.1.0, smartq@^1.1.1, smartq@^1.1.6: +smartq@^1.0.4, smartq@^1.1.1, smartq@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/smartq/-/smartq-1.1.6.tgz#0c1ff4336d95e95b4f1fdd8ccd7e2c5a323b8412" dependencies: @@ -2732,15 +2630,14 @@ smartrequest@^1.0.4, smartrequest@^1.0.6: smartq "^1.1.1" typings-global "^1.0.17" -smartshell@^1.0.13, smartshell@^1.0.6: - version "1.0.18" - resolved "https://registry.yarnpkg.com/smartshell/-/smartshell-1.0.18.tgz#b84ccc65cedf3a875bf676cec78ee07f4b4aa9e5" +smartshell@^1.0.19, smartshell@^1.0.6: + version "1.0.19" + resolved "https://registry.yarnpkg.com/smartshell/-/smartshell-1.0.19.tgz#459c7a9fab8a25007848ffc711b7a817dd6ffc00" dependencies: - "@types/shelljs" "^0.7.4" "@types/which" "^1.0.28" shelljs "^0.7.8" smartq "^1.1.6" - typings-global "^1.0.20" + typings-global "^1.0.23" which "^1.3.0" smartstream@^1.0.10, smartstream@^1.0.8: @@ -2752,14 +2649,7 @@ smartstream@^1.0.10, smartstream@^1.0.8: through2 "^2.0.3" typings-global "^1.0.19" -smartstring@^2.0.24: - version "2.0.24" - resolved "https://registry.yarnpkg.com/smartstring/-/smartstring-2.0.24.tgz#dc1c5efb738c10a2d7daeea3d800ad2ecc65a26c" - dependencies: - js-base64 "^2.1.9" - typings-global "^1.0.14" - -smartstring@^2.0.28: +smartstring@^2.0.24, smartstring@^2.0.28: version "2.0.28" resolved "https://registry.yarnpkg.com/smartstring/-/smartstring-2.0.28.tgz#384b808dc3780eff0031ce7925c1b1668abbcad5" dependencies: @@ -2832,9 +2722,9 @@ source-map-url@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9" -source-map@0.X, source-map@>=0.5.6, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" +source-map@0.X, source-map@>=0.5.6: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" source-map@^0.1.38: version "0.1.43" @@ -2848,6 +2738,10 @@ source-map@^0.4.4: dependencies: amdefine ">=0.0.4" +source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + source-map@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" @@ -2858,16 +2752,16 @@ sparkles@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3" -spawn-wrap@^1.3.4: - version "1.3.8" - resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.3.8.tgz#fa2a79b990cbb0bb0018dca6748d88367b19ec31" +spawn-wrap@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.1.tgz#36156a4826cd633766eb22325a9424eed6728a43" dependencies: foreground-child "^1.5.6" mkdirp "^0.5.0" os-homedir "^1.0.1" - rimraf "^2.3.3" + rimraf "^2.6.2" signal-exit "^3.0.2" - which "^1.2.4" + which "^1.3.0" spdx-correct@~1.0.0: version "1.0.2" @@ -3040,9 +2934,9 @@ tap-parser@^5.1.0: optionalDependencies: readable-stream "^2" -tapbuffer@^1.0.29: - version "1.0.29" - resolved "https://registry.yarnpkg.com/tapbuffer/-/tapbuffer-1.0.29.tgz#dbff08197a889912ea5be68ad9bfa37b6ca98dd1" +tapbuffer@^1.0.31: + version "1.0.31" + resolved "https://registry.yarnpkg.com/tapbuffer/-/tapbuffer-1.0.31.tgz#8001c497674ab88952ae0297bea492cb45ae931e" dependencies: "@types/istanbul" "^0.4.29" beautylog "^6.1.10" @@ -3050,17 +2944,17 @@ tapbuffer@^1.0.29: istanbul "^0.4.5" remap-istanbul "^0.9.5" smarterror "^1.0.3" - smartfile "^4.2.17" + smartfile "^4.2.26" smartinject "^1.0.15" - smartipc "^1.0.9" + smartipc "^1.0.11" smartq "^1.1.6" - smartshell "^1.0.13" + smartshell "^1.0.19" tap-mocha-reporter "^3.0.6" - typings-global "^1.0.20" + typings-global "^1.0.23" tar-pack@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984" + version "3.4.1" + resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" dependencies: debug "^2.2.0" fstream "^1.0.10" @@ -3094,9 +2988,9 @@ taskbuffer@^1.0.22: smartq "^1.1.6" typings-global "^1.0.19" -threads@^0.7.2: - version "0.7.3" - resolved "https://registry.yarnpkg.com/threads/-/threads-0.7.3.tgz#ebd03093a3ed830185b916606fa46f932249b24d" +threads@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/threads/-/threads-0.8.1.tgz#e340115b5947316d2f7ee3123c4c2c5bf9c76d72" dependencies: eventemitter3 "^2.0.2" native-promise-only "^0.8.1" @@ -3193,34 +3087,15 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-detect@0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822" +typed-function@0.10.6: + version "0.10.6" + resolved "https://registry.yarnpkg.com/typed-function/-/typed-function-0.10.6.tgz#314aa0ea72bd586de5920095559683e20b01688b" -type-detect@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2" +typescript@^2.1.5, typescript@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" -typed-function@0.10.5: - version "0.10.5" - resolved "https://registry.yarnpkg.com/typed-function/-/typed-function-0.10.5.tgz#2e0f18abd065219fab694a446a65c6d1981832c0" - -typescript@^2.1.5: - version "2.5.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.2.tgz#038a95f7d9bbb420b1bf35ba31d4c5c1dd3ffe34" - -typescript@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.1.tgz#ef39cdea27abac0b500242d6726ab90e0c846631" - -typings-global@^1.0.14, typings-global@^1.0.16, typings-global@^1.0.17, typings-global@^1.0.19, typings-global@^1.0.20: - version "1.0.20" - resolved "https://registry.yarnpkg.com/typings-global/-/typings-global-1.0.20.tgz#3da769c54db538247c5d877d1d9e97eb2ec981ff" - dependencies: - semver "^5.3.0" - smartshell "^1.0.6" - -typings-global@^1.0.23: +typings-global@^1.0.14, typings-global@^1.0.16, typings-global@^1.0.17, typings-global@^1.0.19, typings-global@^1.0.20, typings-global@^1.0.23: version "1.0.23" resolved "https://registry.yarnpkg.com/typings-global/-/typings-global-1.0.23.tgz#cdd085803049dd07d95b2e1475243c6b2db378ab" dependencies: @@ -3367,7 +3242,7 @@ which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@^1.1.1, which@^1.2.4, which@^1.2.9, which@^1.3.0: +which@^1.1.1, which@^1.2.9, which@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" dependencies: