push.rocks/smarthbs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix case when no tripple curly vars are present

Browse Source
This commit is contained in:
Philipp Kunz
2017-05-02 00:19:52 +02:00
parent cacb7eff6c
commit 32941d5949
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ts/smarthbs.variables.ts
View File

@ -16,9 +16,10 @@ 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]]]')
if (tripleCurlyMatches.length > 0) {
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 ]
@ -46,12 +47,12 @@ export let checkVarsSatisfaction = async (hbsStringArg: string, varObjectArg: an
let splittedVars = stringVar.split('.')
let requiredPointer = suppliedVarsObject
for (let i = 0; i < splittedVars.length; i++) {
let splitVar = splittedVars[i]
let varAvailable = (requiredPointer[splitVar] !== undefined)
let splitVar = splittedVars[ i ]
let varAvailable = (requiredPointer[ splitVar ] !== undefined)
if (varAvailable && splittedVars.length === (i + 1)) {
// ok
} else if (varAvailable) {
requiredPointer = requiredPointer[splitVar]
requiredPointer = requiredPointer[ splitVar ]
} else {
missingVarsObject.push(stringVar)
i = splittedVars.length