Merge pull request #259 from e2tha-e/replacing-eval-with-JSON.parse

Replacing eval with json.parse

Author: Brian Muenzenmeyer

builder/parameter_hunter.js

@@ -35,16 +35,28 @@
 						console.log('found patternParameters for ' + partialName);
 					}
 
-					//strip out the additional data and eval
+					//strip out the additional data, convert string to JSON.
 					var leftParen = pMatch.indexOf('(');
 					var rightParen = pMatch.indexOf(')');
-					var paramString =  '({' + pMatch.substring(leftParen + 1, rightParen) + '})';
-
-					//do no evil. there is no good way to do this that I can think of without using a split, which then makes commas and colons special characters and unusable within the pattern params
-					var paramData = eval(paramString);
-
-					var globalData = JSON.parse(JSON.stringify(patternlab.data));
-					var localData = JSON.parse(JSON.stringify(pattern.jsonFileData || {}));
+					var paramString = '{' + pMatch.substring(leftParen + 1, rightParen) + '}';
+					//if param keys are wrapped in single quotes, replace with double quotes.
+					var paramStringWellFormed = paramString.replace(/(')([^']+)(')(\s*\:)/gm, '"$2"$4');
+					//if params keys are not wrapped in any quotes, wrap in double quotes.
+					var paramStringWellFormed = paramStringWellFormed.replace(/([\{|,]\s*)([^\:\s]+)(\s*\:)/gm, '$1"$2"$3');
+					//if param values are wrapped in single quotes, replace with double quotes.
+					var paramStringWellFormed = paramStringWellFormed.replace(/(\:\s*)(')([^']+)(')/gm, '$1"$3"');
+
+					var paramData = {};
+					var globalData = {};
+					var localData = {};
+
+					try {
+						paramData = JSON.parse(paramStringWellFormed);
+						globalData = JSON.parse(JSON.stringify(patternlab.data));
+						localData = JSON.parse(JSON.stringify(pattern.jsonFileData || {}));
+					} catch(e){
+						console.log(e);
+					}
 
 					var allData = pattern_assembler.merge_data(globalData, localData);
 					allData = pattern_assembler.merge_data(allData, paramData);