Merge pull request #239 from kylewelsby/master

bugfix: #171 pattern links inside base data object

Author: Brian Muenzenmeyer

builder/pattern_assembler.js

@@ -340,33 +340,36 @@
         return o;
     }
 
+    function parseDataLinksHelper (patternlab, obj, key) {
+      var linkRE, dataObjAsString, linkMatches, expandedLink;
+
+      linkRE = /link\.[A-z0-9-_]+/g
+      dataObjAsString = JSON.stringify(obj);
+      linkMatches = dataObjAsString.match(linkRE)
+
+      if(linkMatches) {
+        for (var i = 0; i < linkMatches.length; i++) {
+          expandedLink = patternlab.data.link[linkMatches[i].split('.')[1]];
+          if (expandedLink) {
+            if(patternlab.config.debug){
+              console.log('expanded data link from ' + linkMatches[i] + ' to ' + expandedLink + ' inside ' + key);
+            }
+            dataObjAsString = dataObjAsString.replace(linkMatches[i], expandedLink);
+          }
+        }
+      }
+      return JSON.parse(dataObjAsString)
+    }
     //look for pattern links included in data files.
     //these will be in the form of link.* WITHOUT {{}}, which would still be there from direct pattern inclusion
-    function parseDataLinks(patternlab){
+    function parseDataLinks(patternlab) {
+      //look for link.* such as link.pages-blog as a value
+
+      patternlab.data = parseDataLinksHelper(patternlab, patternlab.data, 'data.json')
 
       //loop through all patterns
-      for (var i = 0; i < patternlab.patterns.length; i++){
-        var pattern = patternlab.patterns[i];
-        //look for link.* such as link.pages-blog as a value
-        var linkRE = /link.[A-z0-9-_]+/g;
-        //convert to string for easier searching
-        var dataObjAsString = JSON.stringify(pattern.jsonFileData);
-        var linkMatches = dataObjAsString.match(linkRE);
-
-        //if no matches found, escape current loop iteration
-        if(linkMatches === null) { continue; }
-
-        for(var i = 0; i < linkMatches.length; i++){
-          //for each match, find the expanded link within the already constructed patternlab.data.link object
-          var expandedLink = patternlab.data.link[linkMatches[i].split('.')[1]];
-          if(patternlab.config.debug){
-            console.log('expanded data link from ' + linkMatches[i] + ' to ' + expandedLink + ' inside ' + pattern.key);
-          }
-          //replace value with expandedLink on the pattern
-          dataObjAsString = dataObjAsString.replace(linkMatches[i], expandedLink);
-        }
-        //write back to data on the pattern
-        pattern.jsonFileData = JSON.parse(dataObjAsString);
+      for (var i = 0; i < patternlab.patterns.length; i++) {
+        patternlab.patterns[i].jsonFileData = parseDataLinksHelper(patternlab, patternlab.patterns[i].jsonFileData, patternlab.patterns[i].key)
       }
     }
 

builder/patternlab.js

@@ -93,10 +93,6 @@ var patternlab_engine = function (config) {
         pattern_assembler.process_pattern_iterative(path.resolve(file), patternlab);
     });
 
-    //now that all the main patterns are known, look for any links that might be within data and expand them
-    //we need to do this before expanding patterns & partials into extendedTemplates, otherwise we could lose the data -> partial reference
-    pattern_assembler.parse_data_links(patternlab);
-
     //diveSync again to recursively include partials, filling out the
     //extendedTemplate property of the patternlab.patterns elements
     diveSync(patterns_dir, {
@@ -119,6 +115,10 @@ var patternlab_engine = function (config) {
       });
 
 
+    //now that all the main patterns are known, look for any links that might be within data and expand them
+    //we need to do this before expanding patterns & partials into extendedTemplates, otherwise we could lose the data -> partial reference
+    pattern_assembler.parse_data_links(patternlab);
+
     //delete the contents of config.patterns.public before writing
     if(deletePatternDir){
       fs.emptyDirSync(paths.public.patterns);

test/pattern_assembler_tests.js

@@ -654,6 +654,11 @@
 			patternlab.data.link['twitter-dave'] = 'https://twitter.com/dmolsen';
 			patternlab.data.link['twitter-brian'] = 'https://twitter.com/bmuenzenmeyer';
 
+			patternlab.data.brad = { url: "link.twitter-brad" }
+			patternlab.data.dave = {	url: "link.twitter-dave" }
+			patternlab.data.brian = {	url: "link.twitter-brian" }
+
+
 			var pattern;
 			for(var i = 0; i < patternlab.patterns.length; i++){
 				if(patternlab.patterns[i].key === 'test-nav'){
@@ -673,6 +678,10 @@
 			test.equals(pattern.jsonFileData.brad.url, "https://twitter.com/brad_frost");
 			test.equals(pattern.jsonFileData.dave.url, "https://twitter.com/dmolsen");
 			test.equals(pattern.jsonFileData.brian.url, "https://twitter.com/bmuenzenmeyer");
+
+			test.equals(patternlab.data.brad.url, "https://twitter.com/brad_frost");
+			test.equals(patternlab.data.dave.url, "https://twitter.com/dmolsen");
+			test.equals(patternlab.data.brian.url, "https://twitter.com/bmuenzenmeyer");
 			test.done();
 		},
 		'get_pattern_by_key - returns the fuzzy result when no others found' : function(test){