grab bag polish

-removed an unused dependency
-partial support for subtype documentation - not displaying on styleguide page yet
-be more forgiving about annotations parsing of js

Author: bmuenzenmeyer

core/lib/annotation_exporter.js

@@ -26,9 +26,7 @@ var annotations_exporter = function (pl) {
 
     //parse as JSON by removing the old wrapping js syntax. comments and the trailing semi-colon
     oldAnnotations = oldAnnotations.replace('var comments = ', '');
-    if (oldAnnotations.trim().substr(oldAnnotations.length - 1)  === ';') {
-      oldAnnotations = oldAnnotations.trim().slice(0, -1);
-    }
+    oldAnnotations = oldAnnotations.replace('};', '}');
 
     try {
       var oldAnnotationsJSON = JSON5.parse(oldAnnotations);

core/lib/object_factory.js

@@ -65,9 +65,10 @@ Pattern.prototype = {
   // render method on oPatterns; this acts as a proxy for the PatternEngine's
   // render function
   render: function (data, partials) {
-    if (this.engine){
+    if (this.engine) {
       return this.engine.renderPattern(this, data || this.jsonFileData, partials);
     }
+    return null;
   },
 
   registerPartial: function () {

core/lib/pattern_assembler.js

@@ -116,11 +116,12 @@ var pattern_assembler = function () {
       // do global registration
 
 
-      if(pattern.isPattern){
+      if (pattern.isPattern) {
         patternlab.partials[pattern.patternPartial] = pattern.extendedTemplate || pattern.template;
+
         // do plugin-specific registration
         pattern.registerPartial();
-      } else{
+      } else {
         patternlab.partials[pattern.patternPartial] = pattern.patternDesc;
       }
 
@@ -129,8 +130,7 @@ var pattern_assembler = function () {
     }
   }
 
-  function addSubstypePattern(subtypePattern, patternlab) {
-    console.log('adding ', subtypePattern.patternPartial, 'to subtypePatterns');
+  function addSubtypePattern(subtypePattern, patternlab) {
     patternlab.subtypePatterns[subtypePattern.patternPartial] = subtypePattern;
   }
 
@@ -203,8 +203,8 @@ var pattern_assembler = function () {
 
     //check if the found file is a top-level markdown file
     var fileObject = path.parse(relPath);
-    if(fileObject.ext === '.md'){
-      try{
+    if (fileObject.ext === '.md') {
+      try {
         var proposedDirectory = path.resolve(patternlab.config.paths.source.patterns, fileObject.dir, fileObject.name);
         var proposedDirectoryStats = fs.statSync(proposedDirectory);
         if (proposedDirectoryStats.isDirectory()) {
@@ -218,7 +218,7 @@ var pattern_assembler = function () {
           subTypePattern.isPattern = false;
           subTypePattern.engine = null;
 
-          addSubstypePattern(subTypePattern, patternlab)
+          addSubtypePattern(subTypePattern, patternlab)
           return subTypePattern;
         }
       } catch (err) {
@@ -470,7 +470,7 @@ var pattern_assembler = function () {
     addPattern: function (pattern, patternlab) {
       addPattern(pattern, patternlab);
     },
-    addSubtypePattern: function(subtypePattern, patternlab){
+    addSubtypePattern: function (subtypePattern, patternlab) {
       addSubtypePattern(subtypePattern, patternlab);
     },
     renderPattern: function (template, data, partials) {

core/lib/patternlab.js

@@ -1,10 +1,10 @@
-/*
- * patternlab-node - v2.1.1 - 2016
- *
+/* 
+ * patternlab-node - v2.2.0 - 2016 
+ * 
  * Brian Muenzenmeyer, Geoff Pursell, and the web community.
- * Licensed under the MIT license.
- *
- * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice.
+ * Licensed under the MIT license. 
+ * 
+ * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice. 
  *
  */
 
@@ -73,7 +73,6 @@ var patternlab_engine = function (config) {
     pe = require('./pattern_exporter'),
     lh = require('./lineage_hunter'),
     buildFrontEnd = require('./ui_builder'),
-    he = require('html-entities').AllHtmlEntities,
     plutils = require('./utilities'),
     sm = require('./starterkit_manager'),
     patternlab = {};
@@ -214,7 +213,6 @@ var patternlab_engine = function (config) {
     setCacheBust();
 
     var pattern_assembler = new pa(),
-      entity_encoder = new he(),
       pattern_exporter = new pe(),
       lineage_hunter = new lh(),
       patterns_dir = paths.source.patterns;
@@ -277,7 +275,7 @@ var patternlab_engine = function (config) {
     //render all patterns last, so lineageR works
     patternlab.patterns.forEach(function (pattern) {
 
-      if(!pattern.isPattern) {
+      if (!pattern.isPattern) {
         return false;
       }
 
@@ -356,6 +354,8 @@ var patternlab_engine = function (config) {
 
       //write the encoded version too
       fs.outputFileSync(paths.public.patterns + pattern.patternLink.replace('.html', '.markup-only.html'), pattern.patternPartialCode);
+
+      return true;
     });
 
     //export patterns if necessary

core/lib/ui_builder.js

@@ -268,7 +268,7 @@ function buildFooterHTML(patternlab, patternPartial) {
 function insertPatternSubtypeDocumentationPattern(patternlab, patterns, patternPartial) {
   //attempt to find a subtype pattern before rendering
   var subtypePattern = patternlab.subtypePatterns[patternPartial];
-  if(subtypePattern) {
+  if (subtypePattern) {
     patterns.unshift(subtypePattern);
   } else {
     var stubbedSubtypePattern = Pattern.createEmpty({
@@ -285,11 +285,11 @@ function insertPatternSubtypeDocumentationPattern(patternlab, patterns, patternP
 
 function buildViewAllHTML(patternlab, patterns, patternPartial) {
 
-  patterns = insertPatternSubtypeDocumentationPattern(patternlab, patterns, patternPartial)
+  var patternsPlusSubtpe = insertPatternSubtypeDocumentationPattern(patternlab, patterns, patternPartial);
 
   var viewAllHTML = pattern_assembler.renderPattern(patternlab.viewAll,
     {
-      partials: patterns,
+      partials: patternsPlusSubtpe,
       patternPartial: patternPartial,
       cacheBuster: patternlab.cacheBuster
     }, {
@@ -299,7 +299,7 @@ function buildViewAllHTML(patternlab, patterns, patternPartial) {
   return viewAllHTML;
 }
 
-function buildViewAllPages(mainPageHeadHtml, patternlab, patterns) {
+function buildViewAllPages(mainPageHeadHtml, patternlab) {
   var paths = patternlab.config.paths;
   var prevSubdir = '';
   var prevGroup = '';
@@ -410,7 +410,7 @@ function buildViewAllPages(mainPageHeadHtml, patternlab, patterns) {
       var viewAllHTML = buildViewAllHTML(patternlab, viewAllPatterns, patternPartial);
 
       fs.outputFileSync(paths.public.patterns + pattern.flatPatternPath + '/index.html', mainPageHeadHtml + viewAllHTML + footerHTML);
-}
+    }
   }
 }
 

package.json

@@ -1,13 +1,12 @@
 {
   "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.1.1",
+  "version": "2.2.0",
   "main": "./core/lib/patternlab.js",
   "dependencies": {
     "diveSync": "^0.3.0",
     "fs-extra": "^0.30.0",
     "glob": "^7.0.0",
-    "html-entities": "^1.2.0",
     "json5": "^0.5.0",
     "lodash": "~4.13.1",
     "markdown-it": "^6.0.1",