fix a bad merge

Author: bmuenzenmeyer

builder/parameter_hunter.js

@@ -18,17 +18,122 @@ var parameter_hunter = function () {
     style_modifier_hunter = new smh(),
     pattern_assembler = new pa();
 
+  function paramToJson(pString) {
+    var paramStringWellFormed = '';
+    var paramStringTmp;
+    var colonPos;
+    var delimitPos;
+    var quotePos;
+    var paramString = pString;
+
+    do {
+
+      //if param key is wrapped in single quotes, replace with double quotes.
+      paramString = paramString.replace(/(^\s*[\{|\,]\s*)'([^']+)'(\s*\:)/, '$1"$2"$3');
+
+      //if params key is not wrapped in any quotes, wrap in double quotes.
+      paramString = paramString.replace(/(^\s*[\{|\,]\s*)([^\s"'\:]+)(\s*\:)/, '$1"$2"$3');
+
+      //move param key to paramStringWellFormed var.
+      colonPos = paramString.indexOf(':');
+
+      //except to prevent infinite loops.
+      if (colonPos === -1) {
+        colonPos = paramString.length - 1;
+      }
+      else {
+        colonPos += 1;
+      }
+      paramStringWellFormed += paramString.substring(0, colonPos);
+      paramString = paramString.substring(colonPos, paramString.length).trim();
+
+      //if param value is wrapped in single quotes, replace with double quotes.
+      if (paramString[0] === '\'') {
+        quotePos = paramString.search(/[^\\]'/);
+
+        //except for unclosed quotes to prevent infinite loops.
+        if (quotePos === -1) {
+          quotePos = paramString.length - 1;
+        }
+        else {
+          quotePos += 2;
+        }
+
+        //prepare param value for move to paramStringWellFormed var.
+        paramStringTmp = paramString.substring(0, quotePos);
+
+        //unescape any escaped single quotes.
+        paramStringTmp = paramStringTmp.replace(/\\'/g, '\'');
+
+        //escape any double quotes.
+        paramStringTmp = paramStringTmp.replace(/"/g, '\\"');
+
+        //replace the delimiting single quotes with double quotes.
+        paramStringTmp = paramStringTmp.replace(/^'/, '"');
+        paramStringTmp = paramStringTmp.replace(/'$/, '"');
+
+        //move param key to paramStringWellFormed var.
+        paramStringWellFormed += paramStringTmp;
+        paramString = paramString.substring(quotePos, paramString.length).trim();
+      }
+
+      //if param value is wrapped in double quotes, just move to paramStringWellFormed var.
+      else if (paramString[0] === '"') {
+        quotePos = paramString.search(/[^\\]"/);
+
+        //except for unclosed quotes to prevent infinite loops.
+        if (quotePos === -1) {
+          quotePos = paramString.length - 1;
+        }
+        else {
+          quotePos += 2;
+        }
+
+        //move param key to paramStringWellFormed var.
+        paramStringWellFormed += paramString.substring(0, quotePos);
+        paramString = paramString.substring(quotePos, paramString.length).trim();
+      }
+
+      //if param value is not wrapped in quotes, move everthing up to the delimiting comma to paramStringWellFormed var.
+      else {
+        delimitPos = paramString.indexOf(',');
+
+        //except to prevent infinite loops.
+        if (delimitPos === -1) {
+          delimitPos = paramString.length - 1;
+        }
+        else {
+          delimitPos += 1;
+        }
+        paramStringWellFormed += paramString.substring(0, delimitPos);
+        paramString = paramString.substring(delimitPos, paramString.length).trim();
+      }
+
+      //break at the end.
+      if (paramString.length === 1) {
+        paramStringWellFormed += paramString.trim();
+        paramString = '';
+        break;
+      }
+
+    } while (paramString);
+
+    return paramStringWellFormed;
+  }
+
   function findparameters(pattern, patternlab) {
+
     if (pattern.parameteredPartials && pattern.parameteredPartials.length > 0) {
-      //compile this partial immediately, essentially consuming it.
 
+      //compile this partial immeadiately, essentially consuming it.
       pattern.parameteredPartials.forEach(function (pMatch) {
         //find the partial's name and retrieve it
         var partialName = pMatch.match(/([\w\-\.\/~]+)/g)[0];
         var partialPattern = pattern_assembler.get_pattern_by_key(partialName, patternlab);
 
         //if we retrieved a pattern we should make sure that its extendedTemplate is reset. looks to fix #190
         partialPattern.extendedTemplate = partialPattern.template;
+
         if (patternlab.config.debug) {
           console.log('found patternParameters for ' + partialName);
         }
@@ -37,15 +142,7 @@ var parameter_hunter = function () {
         var leftParen = pMatch.indexOf('(');
         var rightParen = pMatch.indexOf(')');
         var paramString = '{' + pMatch.substring(leftParen + 1, rightParen) + '}';
-
-        //if param keys are wrapped in single quotes, replace with double quotes.
-        var paramStringWellFormed = paramString.replace(/(')([^']+)(')(\s*\:)/g, '"$2"$4');
-
-        //if params keys are not wrapped in any quotes, wrap in double quotes.
-        paramStringWellFormed = paramStringWellFormed.replace(/([\{|,]\s*)([^\s"'\:]+)(\s*\:)/g, '$1"$2"$3');
-
-        //if param values are wrapped in single quotes, replace with double quotes.
-        paramStringWellFormed = paramStringWellFormed.replace(/(\:\s*)(')([^']+)(')/g, '$1"$3"');
+        var paramStringWellFormed = paramToJson(paramString);
 
         var paramData = {};
         var globalData = {};

builder/pattern_assembler.js

@@ -303,8 +303,7 @@ var pattern_assembler = function () {
 
   function mergeData(obj1, obj2) {
     if (typeof obj2 === 'undefined') {
-      //noinspection Eslint
-      obj2 = {};
+      obj2 = {}; //eslint-disable-line no-param-reassign
     }
 
     for (var p in obj1) { //eslint-disable-line guard-for-in