pattern-lab · bmuenzenmeyer · Aug 16, 2016 · Aug 16, 2016 · Aug 16, 2016 · Aug 16, 2016
diff --git a/core/lib/pattern_assembler.js b/core/lib/pattern_assembler.js
@@ -45,7 +45,9 @@ var pattern_assembler = function () {
         return patternlab.patterns[i];
       }
     }
-    console.error('Could not find pattern with partial ' + partialName);
+    if (patternlab.config.debug) {
+      console.error('Could not find pattern with partial ' + partialName);
+    }
     return undefined;
   }
 
@@ -92,7 +94,7 @@ var pattern_assembler = function () {
   function addPattern(pattern, patternlab) {
 
     //add the link to the global object
-    patternlab.data.link[pattern.patternPartial] = '/patterns/' + pattern.patternLink;
+    patternlab.data.link[pattern.patternPartial] = '/patterns/' + pattern.patternLink.replace('.html', patternlab.config.outputFileSuffixes.rendered + '.html');
 
     //only push to array if the array doesn't contain this pattern
     var isNew = true;
@@ -219,7 +221,7 @@ var pattern_assembler = function () {
           subTypePattern.isPattern = false;
           subTypePattern.engine = null;
 
-          addSubtypePattern(subTypePattern, patternlab)
+          addSubtypePattern(subTypePattern, patternlab);
           return subTypePattern;
         }
       } catch (err) {
@@ -410,21 +412,45 @@ var pattern_assembler = function () {
   }
 
   function parseDataLinksHelper(patternlab, obj, key) {
-    var linkRE, dataObjAsString, linkMatches, expandedLink;
+    var linkRE, dataObjAsString, linkMatches;
 
+    //check for link.patternPartial
     linkRE = /link\.[A-z0-9-_]+/g;
+
+    //stringify the passed in object
     dataObjAsString = JSON5.stringify(obj);
+    if (!dataObjAsString) { return obj; }
+
+    //find matches
     linkMatches = dataObjAsString.match(linkRE);
 
     if (linkMatches) {
       for (var i = 0; i < linkMatches.length; i++) {
-        expandedLink = encodeURI(patternlab.data.link[linkMatches[i].split('.')[1]]);
-        if (expandedLink) {
-          expandedLink = expandedLink.replace('\\', '/');
-          if (patternlab.config.debug) {
-            console.log('expanded data link from ' + linkMatches[i] + ' to ' + expandedLink + ' inside ' + key);
+        var dataLink = linkMatches[i];
+        if (dataLink && dataLink.split('.').length >= 2) {
+
+          //get the partial the link refers to
+          var linkPatternPartial = dataLink.split('.')[1];
+          var pattern = getPartial(linkPatternPartial, patternlab);
+          if (pattern !== undefined) {
+
+            //get the full built link and replace it
+            var fullLink = patternlab.data.link[linkPatternPartial];
+            if (fullLink) {
+              fullLink = path.normalize(fullLink).replace(/\\/g, '/');
+              if (patternlab.config.debug) {
+                console.log('expanded data link from ' + dataLink + ' to ' + fullLink + ' inside ' + key);
+              }
+
+              //also make sure our global replace didn't mess up a protocol
+              fullLink = fullLink.replace(/:\//g, '://');
+              dataObjAsString = dataObjAsString.replace(dataLink, fullLink);
+            }
+          } else {
+            if (patternlab.config.debug) {
+              console.log('pattern not found for', dataLink, 'inside', key);
+            }
           }
-          dataObjAsString = dataObjAsString.replace(linkMatches[i], expandedLink);
         }
       }
     }
@@ -449,7 +475,7 @@ var pattern_assembler = function () {
 
     //loop through all patterns
     for (var i = 0; i < patternlab.patterns.length; i++) {
-      patternlab.patterns[i].jsonFileData = parseDataLinksHelper(patternlab, patternlab.patterns[i].jsonFileData, patternlab.patterns[i].partial);
+      patternlab.patterns[i].jsonFileData = parseDataLinksHelper(patternlab, patternlab.patterns[i].jsonFileData, patternlab.patterns[i].patternPartial);
     }
   }
 

diff --git a/core/lib/patternlab.js b/core/lib/patternlab.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v2.4.0 - 2016 
+ * patternlab-node - v2.4.1 - 2016 
  * 
  * Brian Muenzenmeyer, Geoff Pursell, and the web community.
  * Licensed under the MIT license. 
@@ -169,7 +169,7 @@ var patternlab_engine = function (config) {
   }
 
   function loadStarterKit(starterkitName, clean) {
-    var starterkit_manager = new sm(patternlab);
+    var starterkit_manager = new sm(patternlab.config);
     starterkit_manager.load_starterkit(starterkitName, clean);
   }
 

diff --git a/core/lib/ui_builder.js b/core/lib/ui_builder.js
@@ -240,12 +240,19 @@ var ui_builder = function () {
    * @returns {{patternPartial: string, patternName: (*|string), patternState: string, patternSrcPath: string, patternPath: string}}
      */
   function createPatternSubTypeItem(pattern) {
+    var patternPath = '';
+    if (pattern.isFlatPattern) {
+      patternPath = pattern.flatPatternPath + '-' + pattern.fileName + '/' + pattern.flatPatternPath + '-' + pattern.fileName + '.html';
+    } else {
+      patternPath = pattern.flatPatternPath + '/' + pattern.flatPatternPath + '.html';
+    }
+
     return {
       patternPartial: pattern.patternPartial,
       patternName: pattern.patternName,
       patternState: pattern.patternState,
-      patternSrcPath: encodeURI(pattern.subdir + pattern.filename),
-      patternPath: encodeURI(pattern.flatPatternPath + '/' + pattern.flatPatternPath + '.html')
+      patternSrcPath: encodeURI(pattern.subdir + '/' + pattern.fileName),
+      patternPath: patternPath
     }
   }
 
@@ -299,7 +306,6 @@ var ui_builder = function () {
         patternType.patternItems.push({
           patternPartial: 'viewall-' + pattern.patternGroup + '-all',
           patternName: 'View All',
-          patternSrcPath: encodeURI(pattern.patternType + '/index.html'),
           patternPath: encodeURI(pattern.patternType + '/index.html')
         });
       }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "patternlab-node",
   "description": "Pattern Lab is a collection of tools to help you create atomic design systems. This is the node command line interface (CLI).",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "main": "./core/lib/patternlab.js",
   "dependencies": {
     "diveSync": "^0.3.0",

diff --git a/test/lineage_hunter_tests.js b/test/lineage_hunter_tests.js
@@ -28,6 +28,9 @@ function createBasePatternLabObject() {
       source: {
         patterns: patterns_dir
       }
+    },
+    outputFileSuffixes: {
+      rendered: ''
     }
   };
   pl.data = {};
@@ -111,7 +114,12 @@ exports['lineage hunter '] = {
           "lineageR": [],
           "lineageRIndex": []
         }
-      ]
+      ],
+      config: {
+        outputFileSuffixes: {
+          rendered: ''
+        }
+      }
     };
 
     var lineage_hunter = new lh();

diff --git a/test/list_item_hunter_tests.js b/test/list_item_hunter_tests.js
@@ -65,7 +65,10 @@
           "source": {
             "patterns": "./test/files/_patterns"
           }
-        }
+        },
+        "outputFileSuffixes": {
+          "rendered": ''
+        }        
       },
       "partials" : {},
       "patterns" : []

diff --git a/test/pattern_assembler_tests.js b/test/pattern_assembler_tests.js
@@ -20,6 +20,7 @@
 			var patternlab = {};
 			patternlab.config = fs.readJSONSync('./patternlab-config.json');
 			patternlab.config.paths.source.patterns = patterns_dir;
+			patternlab.config.outputFileSuffixes = {rendered : ''};
 
 			//patternlab.data = fs.readJSONSync(path.resolve(patternlab.config.paths.source.data, 'data.json'));
       patternlab.data = {};
@@ -73,6 +74,9 @@
 					source: {
 						patterns: patterns_dir
 					}
+				},
+				outputFileSuffixes: {
+					rendered : ''
 				}
 			};
 			pl.data = {};
@@ -113,6 +117,9 @@
 					source: {
 						patterns: patterns_dir
 					}
+				},
+				outputFileSuffixes: {
+					rendered : ''
 				}
 			};
 			pl.data = {};
@@ -154,6 +161,9 @@
 					source: {
 						patterns: patterns_dir
 					}
+				},
+				outputFileSuffixes: {
+					rendered : ''
 				}
 			};
 			pl.data = {};
@@ -193,6 +203,9 @@
 					source: {
 						patterns: patterns_dir
 					}
+				},
+				outputFileSuffixes: {
+					rendered : ''
 				}
 			};
 			pl.data = {};
@@ -233,6 +246,9 @@
 					source: {
 						patterns: patterns_dir
 					}
+				},
+				outputFileSuffixes: {
+					rendered : ''
 				}
 			};
 			pl.data = {};
@@ -274,6 +290,9 @@
 					source: {
 						patterns: patterns_dir
 					}
+				},
+				outputFileSuffixes: {
+					rendered : ''
 				}
 			};
 			pl.data = {};
@@ -356,6 +375,7 @@
 			//THIS IS BAD
 			patternlab.config = fs.readJSONSync('./patternlab-config.json');
 			patternlab.config.paths.source.patterns = patterns_dir;
+			patternlab.config.outputFileSuffixes = { rendered : '' };
       patternlab.data = {};
       patternlab.listitems = {};
       patternlab.header = {};
@@ -364,7 +384,17 @@
       //patternlab.listitems = fs.readJSONSync(path.resolve(patternlab.config.paths.source.data, 'listitems.json'));
 		  //patternlab.header = fs.readFileSync(path.resolve(patternlab.config.paths.source.patternlabFiles, 'templates/pattern-header-footer/header.html'), 'utf8');
 		  //patternlab.footer = fs.readFileSync(path.resolve(patternlab.config.paths.source.patternlabFiles, 'templates/pattern-header-footer/footer.html'), 'utf8');
-			patternlab.patterns = [];
+			patternlab.patterns = [
+				{
+					patternPartial: 'twitter-brad'
+				},
+				{
+					patternPartial: 'twitter-dave'
+				},
+				{
+					patternPartial: 'twitter-brian'
+				}
+			];
 			patternlab.data.link = {};
 			patternlab.partials = {};
 
@@ -454,6 +484,7 @@
 			patternlab.partials = {};
 			patternlab.data = {link: {}};
       patternlab.config = { debug: false };
+			patternlab.config.outputFileSuffixes = {rendered : ''};
 
 			var pattern = new Pattern('00-test/01-bar.mustache');
 			pattern.extendedTemplate = 'barExtended';
@@ -476,6 +507,7 @@
 			patternlab.partials = {};
 			patternlab.data = {link: {}};
       patternlab.config = { debug: false };
+			patternlab.config.outputFileSuffixes = {rendered : ''};
 
 			var pattern = new Pattern('00-test/01-bar.mustache');
 			pattern.extendedTemplate = undefined;

diff --git a/test/pseudopattern_hunter_tests.js b/test/pseudopattern_hunter_tests.js
@@ -26,6 +26,7 @@ exports['pseudopattern_hunter'] = {
     pl.patterns = [];
     pl.partials = {};
     pl.config.patternStates = {};
+    pl.config.outputFileSuffixes = { rendered: ''}
 
     var atomPattern = new Pattern('00-test/03-styled-atom.mustache');
     atomPattern.template = fs.readFileSync(patterns_dir + '00-test/03-styled-atom.mustache', 'utf8');