Merge branch 'dev-2.0-core' into load-engines

Author: geoffp

core/lib/annotation_exporter.js

@@ -0,0 +1,42 @@
+"use strict";
+
+var annotations_exporter = function (pl) {
+  var path = require('path'),
+    fs = require('fs-extra'),
+    JSON5 = require('json5'),
+    paths = pl.config.paths;
+
+  // HELPER FUNCTIONS
+  function parseAnnotationsJS() {
+    //attempt to read the file
+    try {
+      var oldAnnotations = fs.readFileSync(path.resolve(paths.source.annotations, 'annotations.js'), 'utf8');
+    } catch (ex) {
+      console.log(ex, 'This may be expected.');
+    }
+
+    //parse as JSON by removing the old wrapping js syntax. comments and the trailing semi-colon
+    oldAnnotations = oldAnnotations.replace('var comments = ', '');
+    try {
+      var oldAnnotationsJSON = JSON5.parse(oldAnnotations.trim().slice(0, -1));
+    } catch (ex) {
+      console.log('There was an error parsing JSON for ' + paths.source.annotations + 'annotations.js');
+      console.log(ex);
+    }
+    return oldAnnotationsJSON;
+  }
+
+  function gatherAnnotations() {
+    //todo: merge markdown too https://github.com/pattern-lab/patternlab-php-core/blob/c2c4bc6a8bda2b2f9c08b197669ebc94c025e7c6/src/PatternLab/Annotations.php
+    return parseAnnotationsJS();
+  }
+
+  return {
+    gather: function () {
+      return gatherAnnotations();
+    }
+  };
+
+};
+
+module.exports = annotations_exporter;

core/lib/lineage_hunter.js

@@ -1,5 +1,5 @@
 /*
- * patternlab-node - v1.2.0 - 2016
+ * patternlab-node - v1.3.0 - 2016
  *
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
@@ -106,12 +106,13 @@ var lineage_hunter = function () {
             var lineageRPattern = pattern_assembler.findPartial(pattern.lineageRIndex[j], patternlab);
 
             //only set patternState if pattern.patternState "is less than" the lineageRPattern.patternstate
+            //or if lineageRPattern.patternstate (the consuming pattern) does not have a state
             //this makes patternlab apply the lowest common ancestor denominator
-            if (patternlab.config.patternStateCascade.indexOf(pattern.patternState)
-              < patternlab.config.patternStateCascade.indexOf(lineageRPattern.patternState)) {
+            if (lineageRPattern.patternState === '' || (patternlab.config.patternStateCascade.indexOf(pattern.patternState)
+              < patternlab.config.patternStateCascade.indexOf(lineageRPattern.patternState))) {
 
               if (patternlab.config.debug) {
-                console.log('Found a lower common denominator pattern state: ' + pattern.patternState + ' on ' + pattern.patternPartial + '. Setting reverse lineage pattern ' + lineageRPattern.patternPartial + ' from ' + lineageRPattern.patternState);
+                console.log('Found a lower common denominator pattern state: ' + pattern.patternState + ' on ' + pattern.key + '. Setting reverse lineage pattern ' + lineageRPattern.patternPartial + ' from ' + (lineageRPattern.patternState === '' ? '<<blank>>' : lineageRPattern.patternState));
               }
 
               lineageRPattern.patternState = pattern.patternState;

core/lib/list_item_hunter.js

@@ -1,5 +1,5 @@
 /*
- * patternlab-node - v1.2.1 - 2016
+ * patternlab-node - v1.3.0 - 2016
  *
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.
@@ -13,6 +13,7 @@
 var list_item_hunter = function () {
 
   var extend = require('util')._extend,
+    JSON5 = require('json5'),
     pa = require('./pattern_assembler'),
     smh = require('./style_modifier_hunter'),
     plutils = require('./utilities'),
@@ -49,7 +50,13 @@ var list_item_hunter = function () {
         }
 
         //check for a local listitems.json file
-        var listData = JSON.parse(JSON.stringify(patternlab.listitems));
+        var listData;
+        try {
+          listData = JSON5.parse(JSON5.stringify(patternlab.listitems));
+        } catch (err) {
+          console.log('There was an error parsing JSON for ' + pattern.abspath);
+          console.log(err);
+        }
         listData = plutils.mergeData(listData, pattern.listitems);
 
         //iterate over each copied block, rendering its contents along with pattenlab.listitems[i]
@@ -60,8 +67,15 @@ var list_item_hunter = function () {
 
           //combine listItem data with pattern data with global data
           var itemData = listData['' + items.indexOf(loopNumberString)]; //this is a property like "2"
-          var globalData = JSON.parse(JSON.stringify(patternlab.data));
-          var localData = JSON.parse(JSON.stringify(pattern.jsonFileData));
+          var globalData;
+          var localData;
+          try {
+            globalData = JSON5.parse(JSON5.stringify(patternlab.data));
+            localData = JSON5.parse(JSON5.stringify(pattern.jsonFileData));
+          } catch (err) {
+            console.log('There was an error parsing JSON for ' + pattern.abspath);
+            console.log(err);
+          }
 
           var allData = plutils.mergeData(globalData, localData);
           allData = plutils.mergeData(allData, itemData !== undefined ? itemData[i] : {}); //itemData could be undefined if the listblock contains no partial, just markup
@@ -78,8 +92,14 @@ var list_item_hunter = function () {
               var partialName = foundPartials[j].match(/([\w\-\.\/~]+)/g)[0];
               var partialPattern = pattern_assembler.findPartial(partialName, patternlab);
 
-              //create a copy of the partial so as to not pollute it after the findPartial call.
-              var cleanPartialPattern = JSON.parse(JSON.stringify(partialPattern));
+              //create a copy of the partial so as to not pollute it after the get_pattern_by_key call.
+              var cleanPartialPattern;
+              try {
+                cleanPartialPattern = JSON5.parse(JSON5.stringify(partialPattern));
+              } catch (err) {
+                console.log('There was an error parsing JSON for ' + pattern.abspath);
+                console.log(err);
+              }
 
               //if partial has style modifier data, replace the styleModifier value
               if (foundPartials[j].indexOf(':') > -1) {

core/lib/media_hunter.js

@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v1.2.1 - 2016 
+ * patternlab-node - v1.3.0 - 2016 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 

core/lib/object_factory.js

@@ -1,5 +1,5 @@
 /*
- * patternlab-node - v1.2.1 - 2016
+ * patternlab-node - v1.3.0 - 2016
  *
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license.