From 2b501910931227aaeaa9f52bfa6d625e07e78870 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Mon, 1 May 2017 16:57:53 +0200 Subject: [PATCH] add extended variable checking --- dist/index.d.ts | 1 + dist/index.js | 3 +- dist/smarthbs.partials.d.ts | 2 +- dist/smarthbs.plugins.d.ts | 5 +- dist/smarthbs.plugins.js | 8 +- dist/smarthbs.variables.d.ts | 11 ++ dist/smarthbs.variables.js | 68 ++++++++ package.json | 10 +- test/test.d.ts | 1 - test/test.js | 17 -- test/test.ts | 42 +++-- ts/index.ts | 1 + ts/smarthbs.helpers.ts | 1 + ts/smarthbs.partials.ts | 2 +- ts/smarthbs.plugins.ts | 8 +- ts/smarthbs.variables.ts | 61 ++++++++ yarn.lock | 292 ++++++++++++++++++++++++++--------- 17 files changed, 415 insertions(+), 118 deletions(-) create mode 100644 dist/smarthbs.variables.d.ts create mode 100644 dist/smarthbs.variables.js delete mode 100644 test/test.d.ts delete mode 100644 test/test.js create mode 100644 ts/smarthbs.variables.ts diff --git a/dist/index.d.ts b/dist/index.d.ts index 12fc22b..0085959 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -5,3 +5,4 @@ export * from './smarthbs.compile'; import './smarthbs.helpers'; export * from './smarthbs.partials'; export * from './smarthbs.template'; +export * from './smarthbs.variables'; diff --git a/dist/index.js b/dist/index.js index a0bfbbb..d802930 100644 --- a/dist/index.js +++ b/dist/index.js @@ -9,4 +9,5 @@ __export(require("./smarthbs.compile")); require("./smarthbs.helpers"); __export(require("./smarthbs.partials")); __export(require("./smarthbs.template")); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDhDQUE2QztBQUdsQyxRQUFBLFVBQVUsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFBO0FBQzFDLHdDQUFrQztBQUNsQyw4QkFBMkI7QUFDM0IseUNBQW1DO0FBQ25DLHlDQUFtQyJ9 \ No newline at end of file +__export(require("./smarthbs.variables")); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDhDQUE2QztBQUdsQyxRQUFBLFVBQVUsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFBO0FBQzFDLHdDQUFrQztBQUNsQyw4QkFBMkI7QUFDM0IseUNBQW1DO0FBQ25DLHlDQUFtQztBQUNuQywwQ0FBb0MifQ== \ No newline at end of file diff --git a/dist/smarthbs.partials.d.ts b/dist/smarthbs.partials.d.ts index dacef7e..05cd4ef 100644 --- a/dist/smarthbs.partials.d.ts +++ b/dist/smarthbs.partials.d.ts @@ -1,4 +1,4 @@ /** * registers a directory of partials to make them available within handlebars compilation */ -export declare let registerPartialDir: (dirPathArg: string) => Promise<{}>; +export declare let registerPartialDir: (dirPathArg: string) => Promise; diff --git a/dist/smarthbs.plugins.d.ts b/dist/smarthbs.plugins.d.ts index 5e4d0e1..371b468 100644 --- a/dist/smarthbs.plugins.d.ts +++ b/dist/smarthbs.plugins.d.ts @@ -1,6 +1,7 @@ import 'typings-global'; import * as handlebars from 'handlebars'; +import * as lodash from 'lodash'; +import * as path from 'path'; import * as smartfile from 'smartfile'; import * as smartq from 'smartq'; -import * as path from 'path'; -export { handlebars, smartfile, smartq, path }; +export { handlebars, lodash, path, smartfile, smartq }; diff --git a/dist/smarthbs.plugins.js b/dist/smarthbs.plugins.js index 55d4515..a398d54 100644 --- a/dist/smarthbs.plugins.js +++ b/dist/smarthbs.plugins.js @@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true }); require("typings-global"); const handlebars = require("handlebars"); exports.handlebars = handlebars; +const lodash = require("lodash"); +exports.lodash = lodash; +const path = require("path"); +exports.path = path; const smartfile = require("smartfile"); exports.smartfile = smartfile; const smartq = require("smartq"); exports.smartq = smartq; -const path = require("path"); -exports.path = path; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRoYnMucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0aGJzLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwwQkFBdUI7QUFDdkIseUNBQXdDO0FBTXRDLGdDQUFVO0FBTFosdUNBQXNDO0FBTXBDLDhCQUFTO0FBTFgsaUNBQWdDO0FBTTlCLHdCQUFNO0FBTFIsNkJBQTRCO0FBTTFCLG9CQUFJIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRoYnMucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0aGJzLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwwQkFBdUI7QUFDdkIseUNBQXdDO0FBT3RDLGdDQUFVO0FBTlosaUNBQWdDO0FBTzlCLHdCQUFNO0FBTlIsNkJBQTRCO0FBTzFCLG9CQUFJO0FBTk4sdUNBQXNDO0FBT3BDLDhCQUFTO0FBTlgsaUNBQWdDO0FBTzlCLHdCQUFNIn0= \ No newline at end of file diff --git a/dist/smarthbs.variables.d.ts b/dist/smarthbs.variables.d.ts new file mode 100644 index 0000000..06b90fa --- /dev/null +++ b/dist/smarthbs.variables.d.ts @@ -0,0 +1,11 @@ +/** + * finds all variables in a handlebars template + * @param hbsStringArg + */ +export declare let findVarsInHbsString: (hbsStringArg: string) => Promise; +/** + * checks if supplied variables satisfy an handlebars template + * @param hbsStringArg + * @param varObjectArg + */ +export declare let checkVarsSatisfaction: (hbsStringArg: string, varObjectArg: any) => Promise; diff --git a/dist/smarthbs.variables.js b/dist/smarthbs.variables.js new file mode 100644 index 0000000..600c112 --- /dev/null +++ b/dist/smarthbs.variables.js @@ -0,0 +1,68 @@ +"use strict"; +// This file contains code that makes it easy to search handlebar templates for variables. +// Why? To get a clue if you are missing some. +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +const plugins = require("./smarthbs.plugins"); +// the curly regex objects +let tripleCurlyRegex = /{{{\s*[\w\.]+\s*}}}/g; +let doubleCurlyRegex = /{{\s*[\w\.]+\s*}}/g; +let nameInCurlsRegex = /[\w\.]+/; +/** + * finds all variables in a handlebars template + * @param hbsStringArg + */ +exports.findVarsInHbsString = (hbsStringArg) => __awaiter(this, void 0, void 0, function* () { + let hbsString = hbsStringArg; // make sure we have a new string object that we may destroy + let varNameArray = []; + let tripleCurlyMatches = hbsString.match(tripleCurlyRegex); + hbsString = hbsString.replace(tripleCurlyRegex, '[[[replaced]]]'); + let doubleCurlyMatches = hbsString.match(doubleCurlyRegex); + hbsString = hbsString.replace(doubleCurlyRegex, '[[[replaced]]]'); + varNameArray = plugins.lodash.concat(varNameArray, tripleCurlyMatches, doubleCurlyMatches) + .map((x) => { + return x.match(nameInCurlsRegex)[0]; + }); + varNameArray = plugins.lodash.uniq(varNameArray); + return varNameArray; +}); +/** + * checks if supplied variables satisfy an handlebars template + * @param hbsStringArg + * @param varObjectArg + */ +exports.checkVarsSatisfaction = (hbsStringArg, varObjectArg) => __awaiter(this, void 0, void 0, function* () { + // required vars as combined deep string with . notation + let requiredVarStrings = yield exports.findVarsInHbsString(hbsStringArg); + // comparison objects + let suppliedVarsObject = varObjectArg; + let missingVarsObject = []; + // building the + for (let stringVar of requiredVarStrings) { + let splittedVars = stringVar.split('.'); + let requiredPointer = suppliedVarsObject; + for (let i = 0; i < splittedVars.length; i++) { + let splitVar = splittedVars[i]; + let varAvailable = (requiredPointer[splitVar] !== undefined); + if (varAvailable && splittedVars.length === (i + 1)) { + // ok + } + else if (varAvailable) { + requiredPointer = requiredPointer[splitVar]; + } + else { + missingVarsObject.push(stringVar); + i = splittedVars.length; + } + } + } + return missingVarsObject; +}); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRoYnMudmFyaWFibGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRoYnMudmFyaWFibGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwwRkFBMEY7QUFDMUYsOENBQThDOzs7Ozs7Ozs7O0FBRTlDLDhDQUE2QztBQUU3QywwQkFBMEI7QUFDMUIsSUFBSSxnQkFBZ0IsR0FBRyxzQkFBc0IsQ0FBQTtBQUM3QyxJQUFJLGdCQUFnQixHQUFHLG9CQUFvQixDQUFBO0FBQzNDLElBQUksZ0JBQWdCLEdBQUcsU0FBUyxDQUFBO0FBRWhDOzs7R0FHRztBQUNRLFFBQUEsbUJBQW1CLEdBQUcsQ0FBTyxZQUFvQjtJQUMxRCxJQUFJLFNBQVMsR0FBRyxZQUFZLENBQUEsQ0FBQyw0REFBNEQ7SUFDekYsSUFBSSxZQUFZLEdBQWEsRUFBRSxDQUFBO0lBQy9CLElBQUksa0JBQWtCLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFBO0lBQzFELFNBQVMsR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLGdCQUFnQixFQUFFLGdCQUFnQixDQUFDLENBQUE7SUFDakUsSUFBSSxrQkFBa0IsR0FBRyxTQUFTLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLENBQUE7SUFDMUQsU0FBUyxHQUFHLFNBQVMsQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQTtJQUNqRSxZQUFZLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLGtCQUFrQixFQUFFLGtCQUFrQixDQUFDO1NBQ3ZGLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDTCxNQUFNLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFFLENBQUMsQ0FBRSxDQUFBO0lBQ3ZDLENBQUMsQ0FBQyxDQUFBO0lBQ0osWUFBWSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQ2hELE1BQU0sQ0FBQyxZQUFZLENBQUE7QUFDckIsQ0FBQyxDQUFBLENBQUE7QUFFRDs7OztHQUlHO0FBQ1EsUUFBQSxxQkFBcUIsR0FBRyxDQUFPLFlBQW9CLEVBQUUsWUFBaUI7SUFDL0Usd0RBQXdEO0lBQ3hELElBQUksa0JBQWtCLEdBQUcsTUFBTSwyQkFBbUIsQ0FBQyxZQUFZLENBQUMsQ0FBQTtJQUVoRSxxQkFBcUI7SUFDckIsSUFBSSxrQkFBa0IsR0FBRyxZQUFZLENBQUE7SUFDckMsSUFBSSxpQkFBaUIsR0FBYSxFQUFFLENBQUE7SUFFcEMsZ0JBQWdCO0lBQ2hCLEdBQUcsQ0FBQyxDQUFDLElBQUksU0FBUyxJQUFJLGtCQUFrQixDQUFDLENBQUMsQ0FBQztRQUN6QyxJQUFJLFlBQVksR0FBRyxTQUFTLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ3ZDLElBQUksZUFBZSxHQUFHLGtCQUFrQixDQUFBO1FBQ3hDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsWUFBWSxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQzdDLElBQUksUUFBUSxHQUFHLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUM5QixJQUFJLFlBQVksR0FBRyxDQUFDLGVBQWUsQ0FBQyxRQUFRLENBQUMsS0FBSyxTQUFTLENBQUMsQ0FBQTtZQUM1RCxFQUFFLENBQUMsQ0FBQyxZQUFZLElBQUksWUFBWSxDQUFDLE1BQU0sS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3BELEtBQUs7WUFDUCxDQUFDO1lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUM7Z0JBQ3hCLGVBQWUsR0FBRyxlQUFlLENBQUMsUUFBUSxDQUFDLENBQUE7WUFDN0MsQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNOLGlCQUFpQixDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQTtnQkFDakMsQ0FBQyxHQUFHLFlBQVksQ0FBQyxNQUFNLENBQUE7WUFDekIsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0lBQ0QsTUFBTSxDQUFDLGlCQUFpQixDQUFBO0FBQzFCLENBQUMsQ0FBQSxDQUFBIn0= \ No newline at end of file diff --git a/package.json b/package.json index b23325b..6793fa0 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,14 @@ "homepage": "https://gitlab.com/pkunz/smarthbs#README", "dependencies": { "@types/handlebars": "^4.0.32", - "handlebars": "^4.0.6", - "smartfile": "^4.1.8", + "@types/lodash": "^4.14.63", + "handlebars": "^4.0.7", + "lodash": "^4.17.4", + "smartfile": "^4.2.4", "smartq": "^1.1.1", - "typings-global": "^1.0.14" + "typings-global": "^1.0.16" }, "devDependencies": { - "typings-test": "^1.0.3" + "tapbundle": "^1.0.10" } } diff --git a/test/test.d.ts b/test/test.d.ts deleted file mode 100644 index 2fd432a..0000000 --- a/test/test.d.ts +++ /dev/null @@ -1 +0,0 @@ -import 'typings-test'; diff --git a/test/test.js b/test/test.js deleted file mode 100644 index a6c7900..0000000 --- a/test/test.js +++ /dev/null @@ -1,17 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -require("typings-test"); -const smarthbs = require("../dist/index"); -const path = require("path"); -let testHbsDir = path.join(__dirname, 'hbs_testfiles'); -let testPartialDir = path.join(testHbsDir, 'partials'); -let testResultDir = path.join(__dirname, 'testresult'); -describe('smarthbs', function () { - it('should create partials', function () { - smarthbs.registerPartialDir(testPartialDir); - }); - it('should compile a directory', function () { - smarthbs.compileDirectory(testHbsDir, testResultDir, 'data.json'); - }); -}); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3QkFBcUI7QUFDckIsMENBQXlDO0FBQ3pDLDZCQUE0QjtBQUU1QixJQUFJLFVBQVUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxlQUFlLENBQUMsQ0FBQTtBQUN0RCxJQUFJLGNBQWMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxVQUFVLENBQUMsQ0FBQTtBQUN0RCxJQUFJLGFBQWEsR0FBRyxJQUFJLENBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxZQUFZLENBQUMsQ0FBQTtBQUN2RCxRQUFRLENBQUMsVUFBVSxFQUFFO0lBRWpCLEVBQUUsQ0FBQyx3QkFBd0IsRUFBRTtRQUN6QixRQUFRLENBQUMsa0JBQWtCLENBQUMsY0FBYyxDQUFDLENBQUE7SUFDL0MsQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsNEJBQTRCLEVBQUU7UUFDN0IsUUFBUSxDQUFDLGdCQUFnQixDQUFDLFVBQVUsRUFBRSxhQUFhLEVBQUUsV0FBVyxDQUFDLENBQUE7SUFDckUsQ0FBQyxDQUFDLENBQUE7QUFFTixDQUFDLENBQUMsQ0FBQSJ9 \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index 262b99a..408d4b7 100644 --- a/test/test.ts +++ b/test/test.ts @@ -1,18 +1,38 @@ -import 'typings-test' +import { expect, tap } from 'tapbundle' import * as smarthbs from '../dist/index' import * as path from 'path' let testHbsDir = path.join(__dirname, 'hbs_testfiles') let testPartialDir = path.join(testHbsDir, 'partials') -let testResultDir = path .join(__dirname, 'testresult') -describe('smarthbs', function() { - - it('should create partials', function(){ - smarthbs.registerPartialDir(testPartialDir) - }) +let testResultDir = path.join(__dirname, 'testresult') +tap.test('smarthbs -> should create partials', async () => { + await smarthbs.registerPartialDir(testPartialDir) +}) - it('should compile a directory', function() { - smarthbs.compileDirectory(testHbsDir, testResultDir, 'data.json') - }) +tap.test('smarthbs -> should compile a directory', async () => { + smarthbs.compileDirectory(testHbsDir, testResultDir, 'data.json') +}) -}) \ No newline at end of file +tap.test('', async () => { + let templateString = '{{{firstVar}}} {{secondVar}}' + let templateVars = await smarthbs.findVarsInHbsString(templateString) + expect(templateVars).to.include('firstVar') + expect(templateVars).to.include('secondVar') +}) + +tap.test('', async () => { + let templateString = '{{{firstVar}}} {{secondVar}} {{thirdVar}} {{fourthVar}} {{fourthVar.someKey}} {{fourthVar.otherKey.nextKey}}' + let missingVars = await smarthbs.checkVarsSatisfaction(templateString, { + firstVar: 'hi', + secondVar: 'hello', + fourthVar: { + otherKey: { + nextKey: 'wow' + } + } + }) + expect(missingVars).to.contain('thirdVar', 'fourthVar.someKey') + expect(missingVars).to.not.contain('secondVar', 'fourthVar.otherKey.nextKey') +}) + +tap.start() diff --git a/ts/index.ts b/ts/index.ts index e3377ac..bf5b1cc 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -6,3 +6,4 @@ export * from './smarthbs.compile' import './smarthbs.helpers' export * from './smarthbs.partials' export * from './smarthbs.template' +export * from './smarthbs.variables' diff --git a/ts/smarthbs.helpers.ts b/ts/smarthbs.helpers.ts index 3ac5573..2c3d6aa 100644 --- a/ts/smarthbs.helpers.ts +++ b/ts/smarthbs.helpers.ts @@ -5,3 +5,4 @@ plugins.handlebars.registerHelper('__compile', (evaluationString, evaluationCont return template(evaluationContext) }) + diff --git a/ts/smarthbs.partials.ts b/ts/smarthbs.partials.ts index 527097a..4a55900 100644 --- a/ts/smarthbs.partials.ts +++ b/ts/smarthbs.partials.ts @@ -3,7 +3,7 @@ import * as plugins from './smarthbs.plugins' /** * registers a directory of partials to make them available within handlebars compilation */ -export let registerPartialDir = (dirPathArg: string) => { +export let registerPartialDir = (dirPathArg: string): Promise => { let done = plugins.smartq.defer() plugins.smartfile.fs.listFileTree(dirPathArg, '**/*.hbs').then(hbsFileArrayArg => { for (let hbsFilePath of hbsFileArrayArg) { diff --git a/ts/smarthbs.plugins.ts b/ts/smarthbs.plugins.ts index a8ba1ac..18826a9 100644 --- a/ts/smarthbs.plugins.ts +++ b/ts/smarthbs.plugins.ts @@ -1,12 +1,14 @@ import 'typings-global' import * as handlebars from 'handlebars' +import * as lodash from 'lodash' +import * as path from 'path' import * as smartfile from 'smartfile' import * as smartq from 'smartq' -import * as path from 'path' export { handlebars, + lodash, + path, smartfile, - smartq, - path + smartq } diff --git a/ts/smarthbs.variables.ts b/ts/smarthbs.variables.ts new file mode 100644 index 0000000..30dd243 --- /dev/null +++ b/ts/smarthbs.variables.ts @@ -0,0 +1,61 @@ +// This file contains code that makes it easy to search handlebar templates for variables. +// Why? To get a clue if you are missing some. + +import * as plugins from './smarthbs.plugins' + +// the curly regex objects +let tripleCurlyRegex = /{{{\s*[\w\.]+\s*}}}/g +let doubleCurlyRegex = /{{\s*[\w\.]+\s*}}/g +let nameInCurlsRegex = /[\w\.]+/ + +/** + * finds all variables in a handlebars template + * @param hbsStringArg + */ +export let findVarsInHbsString = async (hbsStringArg: string) => { + let hbsString = hbsStringArg // make sure we have a new string object that we may destroy + let varNameArray: string[] = [] + let tripleCurlyMatches = hbsString.match(tripleCurlyRegex) + hbsString = hbsString.replace(tripleCurlyRegex, '[[[replaced]]]') + let doubleCurlyMatches = hbsString.match(doubleCurlyRegex) + hbsString = hbsString.replace(doubleCurlyRegex, '[[[replaced]]]') + varNameArray = plugins.lodash.concat(varNameArray, tripleCurlyMatches, doubleCurlyMatches) + .map((x) => { + return x.match(nameInCurlsRegex)[ 0 ] + }) + varNameArray = plugins.lodash.uniq(varNameArray) + return varNameArray +} + +/** + * checks if supplied variables satisfy an handlebars template + * @param hbsStringArg + * @param varObjectArg + */ +export let checkVarsSatisfaction = async (hbsStringArg: string, varObjectArg: any) => { + // required vars as combined deep string with . notation + let requiredVarStrings = await findVarsInHbsString(hbsStringArg) + + // comparison objects + let suppliedVarsObject = varObjectArg + let missingVarsObject: string[] = [] + + // building the + for (let stringVar of requiredVarStrings) { + let splittedVars = stringVar.split('.') + let requiredPointer = suppliedVarsObject + for (let i = 0; i < splittedVars.length; i++) { + let splitVar = splittedVars[i] + let varAvailable = (requiredPointer[splitVar] !== undefined) + if (varAvailable && splittedVars.length === (i + 1)) { + // ok + } else if (varAvailable) { + requiredPointer = requiredPointer[splitVar] + } else { + missingVarsObject.push(stringVar) + i = splittedVars.length + } + } + } + return missingVarsObject +} diff --git a/yarn.lock b/yarn.lock index a714b97..2eb29c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,9 +2,26 @@ # yarn lockfile v1 -"@types/fs-extra@0.x.x": - version "0.0.37" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-0.0.37.tgz#195f11bcd9a1b97d9e412c6b66899b545471a1f7" +"@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.30" + resolved "https://registry.yarnpkg.com/@types/chai-string/-/chai-string-1.1.30.tgz#4d8744b31a5a2295fc01c981ed1e2d4c8a070f0a" + dependencies: + "@types/chai" "*" + +"@types/chai@*", "@types/chai@^3.4.35": + version "3.5.2" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-3.5.2.tgz#c11cd2817d3a401b7ba0f5a420f35c56139b1c1e" + +"@types/fs-extra@2.x.x": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-2.1.0.tgz#8b350239c0455d92b8d3c626edac193860ff395f" dependencies: "@types/node" "*" @@ -12,13 +29,17 @@ version "4.0.32" resolved "https://registry.yarnpkg.com/@types/handlebars/-/handlebars-4.0.32.tgz#637e8d945a9354aab47df7125005490fe9f8e592" -"@types/mocha@^2.2.31": - version "2.2.39" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.39.tgz#f68d63db8b69c38e9558b4073525cf96c4f7a829" +"@types/lodash@^4.14.63": + version "4.14.63" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.63.tgz#5ac475f55bfdc62bc88c4239dbc482f2f3bead93" "@types/node@*": - version "7.0.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.5.tgz#96a0f0a618b7b606f1ec547403c00650210bfbb7" + version "7.0.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.14.tgz#1470fa002a113316ac9d9ad163fc738c7a0de2a4" + +"@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/vinyl@^2.0.0": version "2.0.0" @@ -38,32 +59,47 @@ amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" +ansi-256-colors@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ansi-256-colors/-/ansi-256-colors-1.1.0.tgz#910de50efcc7c09e3d82f2f87abd6b700c18818a" + argparse@^1.0.7: version "1.0.9" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86" dependencies: sprintf-js "~1.0.2" +assertion-error@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c" + async@^1.4.0: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" -async@~0.2.6: - version "0.2.10" - resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" - balanced-match@^0.4.1: version "0.4.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" +beautycolor@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/beautycolor/-/beautycolor-1.0.7.tgz#a4715738ac4c8221371e9cbeb5a6cc6d11ecbf7c" + dependencies: + ansi-256-colors "^1.1.0" + typings-global "^1.0.14" + +bindings@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11" + brace-expansion@^1.0.0: - version "1.1.6" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9" + version "1.1.7" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59" dependencies: balanced-match "^0.4.1" concat-map "0.0.1" -buffer-shims@^1.0.0: +buffer-shims@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" @@ -78,6 +114,28 @@ 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.3.0" + resolved "https://registry.yarnpkg.com/chai-string/-/chai-string-1.3.0.tgz#df6139f294391b1035be5606f60a843b3a5041e7" + +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" + +check-error@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" + cliui@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" @@ -118,6 +176,20 @@ decamelize@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" +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" + +early@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/early/-/early-2.1.1.tgz#841e23254ea5dc54d8afaeee82f5ab65c00ee23c" + dependencies: + beautycolor "^1.0.7" + smartq "^1.1.1" + typings-global "^1.0.16" + esprima@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" @@ -128,12 +200,13 @@ first-chunk-stream@^2.0.0: dependencies: readable-stream "^2.0.2" -fs-extra@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.0.0.tgz#337352bded4a0b714f3eb84de8cea765e9d37600" +fs-extra@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.0.tgz#244e0c4b0b8818f54040ec049d8a2bddc1202861" dependencies: graceful-fs "^4.1.2" - jsonfile "^2.1.0" + jsonfile "^3.0.0" + universalify "^0.1.0" fs.realpath@^1.0.0: version "1.0.0" @@ -154,9 +227,9 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" -handlebars@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.6.tgz#2ce4484850537f9c97a8026d5399b935c4ed4ed7" +handlebars@^4.0.7: + version "4.0.7" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.7.tgz#e97325aeb8ea0b9e12b9c4dd73c4c312ad0ede59" dependencies: async "^1.4.0" optimist "^0.6.1" @@ -182,12 +255,12 @@ inherits@2, inherits@^2.0.1, inherits@~2.0.1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" interpret@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c" + version "1.0.3" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90" -is-buffer@^1.0.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b" +is-buffer@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc" is-stream@^1.1.0: version "1.1.0" @@ -201,43 +274,75 @@ isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" -js-yaml@^3.8.2: - version "3.8.2" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721" +js-yaml@^3.8.3: + version "3.8.3" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766" dependencies: argparse "^1.0.7" esprima "^3.1.1" -jsonfile@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" +jsonfile@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.0.tgz#92e7c7444e5ffd5fa32e6a9ae8b85034df8347d0" optionalDependencies: graceful-fs "^4.1.6" kind-of@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47" + version "3.2.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.0.tgz#b58abe4d5c044ad33726a8c1525b48cf891bff07" dependencies: - is-buffer "^1.0.2" + is-buffer "^1.1.5" lazy-cache@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" +leakage@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/leakage/-/leakage-0.2.0.tgz#9e7a8cc1d241d8c8427e348769e192e172fd8733" + dependencies: + left-pad "^1.1.3" + memwatch-next "^0.3.0" + minimist "^1.2.0" + pretty-bytes "^4.0.2" + +left-pad@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a" + +lodash@^4.17.4: + version "4.17.4" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" + longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" +memwatch-next@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/memwatch-next/-/memwatch-next-0.3.0.tgz#2111050f9a906e0aa2d72a4ec0f0089c78726f8f" + dependencies: + bindings "^1.2.1" + nan "^2.3.2" + minimatch@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" dependencies: brace-expansion "^1.0.0" +minimist@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" + minimist@~0.0.1: version "0.0.10" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" +nan@^2.3.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45" + once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -267,20 +372,24 @@ pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" +pretty-bytes@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9" + process-nextick-args@^1.0.6, process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" readable-stream@^2.0.2, readable-stream@^2.1.5: - version "2.2.3" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.3.tgz#9cf49463985df016c8ae8813097a9293a9b33729" + version "2.2.9" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8" dependencies: - buffer-shims "^1.0.0" + buffer-shims "~1.0.0" core-util-is "~1.0.0" inherits "~2.0.1" isarray "~1.0.0" process-nextick-args "~1.0.6" - string_decoder "~0.10.x" + string_decoder "~1.0.0" util-deprecate "~1.0.1" rechoir@^0.6.2: @@ -306,8 +415,8 @@ require-reload@0.2.2: resolved "https://registry.yarnpkg.com/require-reload/-/require-reload-0.2.2.tgz#29a7591846caf91b6e8a3cda991683f95f8d7d42" resolve@^1.1.6: - version "1.3.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.1.tgz#5d0a1632609b6b00a22284293db1d5d973676314" + version "1.3.3" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5" dependencies: path-parse "^1.0.5" @@ -321,29 +430,46 @@ semver@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" -shelljs@^0.7.4: - version "0.7.6" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad" +shelljs@^0.7.7: + version "0.7.7" + resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1" dependencies: glob "^7.0.0" interpret "^1.0.0" rechoir "^0.6.2" -smartfile@^4.1.8: - version "4.1.8" - resolved "https://registry.yarnpkg.com/smartfile/-/smartfile-4.1.8.tgz#4f568537de0cd1174ce3086036ac9df26f860330" +smartchai@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/smartchai/-/smartchai-1.0.3.tgz#de6d010bb8b5aef24cb70b31a5f5334e8c41b72f" dependencies: - "@types/fs-extra" "0.x.x" + "@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" + +smartdelay@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/smartdelay/-/smartdelay-1.0.1.tgz#687f8bcc09d7c62c9c5a8a1771c1aba3aff54156" + dependencies: + typings-global "^1.0.14" + +smartfile@^4.2.4: + version "4.2.4" + resolved "https://registry.yarnpkg.com/smartfile/-/smartfile-4.2.4.tgz#5b53324f3d7f0b3fb2dffb134b32808da89b4dee" + dependencies: + "@types/fs-extra" "2.x.x" "@types/vinyl" "^2.0.0" - fs-extra "^2.0.0" + fs-extra "^3.0.0" glob "^7.1.1" - js-yaml "^3.8.2" + js-yaml "^3.8.3" require-reload "0.2.2" smartpath "^3.2.8" smartq "^1.1.1" smartrequest "^1.0.4" - typings-global "^1.0.14" - vinyl "^2.0.1" + typings-global "^1.0.16" + vinyl "^2.0.2" vinyl-file "^3.0.0" smartpath@^3.2.8: @@ -381,9 +507,11 @@ sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" +string_decoder@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667" + dependencies: + buffer-shims "~1.0.0" strip-bom-buf@^1.0.0: version "1.0.0" @@ -404,6 +532,17 @@ strip-bom@^2.0.0: dependencies: is-utf8 "^0.2.0" +tapbundle@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/tapbundle/-/tapbundle-1.0.10.tgz#36fd40036f6b5b738cbb9b5fc400df4c4031bc26" + dependencies: + early "^2.1.1" + leakage "^0.2.0" + smartchai "^1.0.3" + smartdelay "^1.0.1" + smartq "^1.1.1" + typings-global "^1.0.16" + through2@^2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" @@ -411,37 +550,42 @@ through2@^2.0.1: readable-stream "^2.1.5" xtend "~4.0.1" +type-detect@0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822" + +type-detect@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2" + typed-promisify@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/typed-promisify/-/typed-promisify-0.3.0.tgz#1ba0af5e444c87d8047406f18ce49092a1191853" -typings-global@*, typings-global@^1.0.14: - version "1.0.14" - resolved "https://registry.yarnpkg.com/typings-global/-/typings-global-1.0.14.tgz#ab682720a03d6b9278869fb5c30c30d7dc61d12c" +typings-global@^1.0.14, typings-global@^1.0.16: + version "1.0.16" + resolved "https://registry.yarnpkg.com/typings-global/-/typings-global-1.0.16.tgz#489b71781af24268750c2899316400a5e482961f" dependencies: semver "^5.3.0" - shelljs "^0.7.4" - -typings-test@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/typings-test/-/typings-test-1.0.3.tgz#fbab895eb3f0c44842e73db059f65946b971e369" - dependencies: - "@types/mocha" "^2.2.31" - typings-global "*" + shelljs "^0.7.7" uglify-js@^2.6: - version "2.7.5" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8" + version "2.8.22" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.22.tgz#d54934778a8da14903fa29a326fb24c0ab51a1a0" dependencies: - async "~0.2.6" source-map "~0.5.1" - uglify-to-browserify "~1.0.0" yargs "~3.10.0" + optionalDependencies: + uglify-to-browserify "~1.0.0" uglify-to-browserify@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" +universalify@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.0.tgz#9eb1c4651debcc670cc94f1a75762332bb967778" + util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -456,9 +600,9 @@ vinyl-file@^3.0.0: strip-bom-stream "^2.0.0" vinyl "^2.0.1" -vinyl@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.1.tgz#1c3b4931e7ac4c1efee743f3b91a74c094407bb6" +vinyl@^2.0.1, vinyl@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.2.tgz#0a3713d8d4e9221c58f10ca16c0116c9e25eda7c" dependencies: clone "^1.0.0" clone-buffer "^1.0.0"