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

fix variable extraction

Browse Source
This commit is contained in:
Philipp Kunz
2017-05-03 09:56:40 +02:00
parent 059111e071
commit e1d9098eaa
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ts/smarthbs.variables.ts
View File

@@ -18,12 +18,19 @@ export let findVarsInHbsString = async (hbsStringArg: string) => {
let tripleCurlyMatches = hbsString.match(tripleCurlyRegex)
if (tripleCurlyMatches) {
hbsString = hbsString.replace(tripleCurlyRegex, '[[[replaced]]]')
varNameArray = plugins.lodash.concat(varNameArray, tripleCurlyMatches)
}
let doubleCurlyMatches = hbsString.match(doubleCurlyRegex)
varNameArray = plugins.lodash.concat(varNameArray, tripleCurlyMatches, doubleCurlyMatches)
.map((x) => {
return x.match(nameInCurlsRegex)[ 0 ]
})
if (doubleCurlyMatches) {
varNameArray = plugins.lodash.concat(varNameArray, doubleCurlyMatches)
}
// make sure we are clean from curly brackets
varNameArray = varNameArray.map((x) => {
return x.match(nameInCurlsRegex)[ 0 ]
})
// make sure are uniq
varNameArray = plugins.lodash.uniq(varNameArray)
return varNameArray
}