Replace common util functions in core

Replace plutils.mergeData with _.merge in core/lib/pseudopattern_hunter.js

Replace plutils.mergeData with _.merge in core/lib/list_item_hunter.js

Replace plutils.mergeData with _.merge in core/lib/patternlab.js

Replace plutils.isObjectEmpty with _.empty in core/lib/pattern_assembler.js

Replace plutils.shuffle with _.shuffle in core/lib/pattern_assembler.js

Replace util.emptyDirectory with fs.emptyDirSync in core/lib/starterkit_manager.js

Author: raphaelokon

core/lib/list_item_hunter.js

@@ -2,9 +2,9 @@
 
 const list_item_hunter = function () {
   const extend = require('util')._extend;
+  const _ = require('lodash');
   const pa = require('./pattern_assembler');
   const smh = require('./style_modifier_hunter');
-  const plutils = require('./utilities');
   const jsonCopy = require('./json_copy');
   const Pattern = require('./object_factory').Pattern;
 
@@ -47,7 +47,7 @@ const list_item_hunter = function () {
           console.log(err);
         }
 
-        listData = plutils.mergeData(listData, pattern.listitems);
+        listData = _.merge(listData, pattern.listitems);
         listData = pattern_assembler.parse_data_links_specific(patternlab, listData, 'listitems.json + any pattern listitems.json');
 
         //iterate over each copied block, rendering its contents along with pattenlab.listitems[i]
@@ -68,8 +68,8 @@ const list_item_hunter = function () {
             console.log(err);
           }
 
-          let 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
+          let allData = _.merge(globalData, localData);
+          allData = _.merge(allData, itemData !== undefined ? itemData[i] : {}); //itemData could be undefined if the listblock contains no partial, just markup
           allData.link = extend({}, patternlab.data.link);
 
           //check for partials within the repeated block

core/lib/parameter_hunter.js

@@ -2,10 +2,10 @@
 
 const parameter_hunter = function () {
   const extend = require('util')._extend;
+  const _ = require('lodash');
   const jsonCopy = require('./json_copy');
   const pa = require('./pattern_assembler');
   const smh = require('./style_modifier_hunter');
-  const plutils = require('./utilities');
   const style_modifier_hunter = new smh();
   const pattern_assembler = new pa();
 
@@ -267,8 +267,8 @@ const parameter_hunter = function () {
           console.log(err);
         }
 
-        let allData = plutils.mergeData(globalData, localData);
-        allData = plutils.mergeData(allData, paramData);
+        let allData = _.merge(globalData, localData);
+        allData = _.merge(allData, paramData);
 
         //if partial has style modifier data, replace the styleModifier value
         if (pattern.stylePartials && pattern.stylePartials.length > 0) {

core/lib/pattern_assembler.js

@@ -62,7 +62,7 @@ const pattern_assembler = function () {
         list.push(container.listitems[item]);
       }
     }
-    container.listItemArray = plutils.shuffle(list);
+    container.listItemArray = _.shuffle(list);
 
     for (var i = 1; i <= container.listItemArray.length; i++) {
       var tempItems = [];
@@ -149,7 +149,7 @@ const pattern_assembler = function () {
       var markdownFileContents = fs.readFileSync(markdownFileName, 'utf8');
 
       var markdownObject = markdown_parser.parse(markdownFileContents);
-      if (!plutils.isObjectEmpty(markdownObject)) {
+      if (!_.empty(markdownObject)) {
         //set keys and markdown itself
         currentPattern.patternDescExists = true;
         currentPattern.patternDesc = markdownObject.markdown;

core/lib/patternlab.js

@@ -401,7 +401,7 @@ const patternlab_engine = function (config) {
       console.log('There was an error parsing JSON for ' + pattern.relPath);
       console.log(err);
     }
-    allData = plutils.mergeData(allData, pattern.jsonFileData);
+    allData = _.merge(allData, pattern.jsonFileData);
     allData.cacheBuster = patternlab.cacheBuster;
 
     //re-rendering the headHTML each time allows pattern-specific data to influence the head of the pattern
@@ -452,7 +452,7 @@ const patternlab_engine = function (config) {
       console.log('There was an error parsing JSON for ' + pattern.relPath);
       console.log(err);
     }
-    allFooterData = plutils.mergeData(allFooterData, pattern.jsonFileData);
+    allFooterData = _.merge(allFooterData, pattern.jsonFileData);
     allFooterData.patternLabFoot = footerPartial;
 
     const footerHTML = pattern_assembler.renderPattern(patternlab.userFoot, allFooterData);

core/lib/pseudopattern_hunter.js

@@ -3,9 +3,9 @@
 const ch = require('./changes_hunter');
 const glob = require('glob');
 const fs = require('fs-extra');
+const _ = require('lodash');
 const lh = require('./lineage_hunter');
 const Pattern = require('./object_factory').Pattern;
-const plutils = require('./utilities');
 const path = require('path');
 const lineage_hunter = new lh();
 const changes_hunter = new ch();
@@ -43,7 +43,7 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function (currentPattern, p
       }
 
       //extend any existing data with variant data
-      variantFileData = plutils.mergeData(currentPattern.jsonFileData, variantFileData);
+      variantFileData = _.merge(currentPattern.jsonFileData, variantFileData);
 
       let variantName = pseudoPatterns[i].substring(pseudoPatterns[i].indexOf('~') + 1).split('.')[0];
       let variantFilePath = path.join(currentPattern.subdir, currentPattern.fileName + '~' + variantName + '.json');
@@ -89,7 +89,7 @@ pseudopattern_hunter.prototype.find_pseudopatterns = function (currentPattern, p
       }
 
       //extend any existing data with variant data
-      variantFileData = plutils.mergeData(currentPattern.jsonFileData, variantFileData);
+      variantFileData = _.merge(currentPattern.jsonFileData, variantFileData);
 
       variantName = pseudoPatterns[i].substring(pseudoPatterns[i].indexOf('~') + 1).split('.')[0];
       variantFilePath = path.join(currentPattern.subdir, currentPattern.fileName + '~' + variantName + '.json');

core/lib/starterkit_manager.js

@@ -31,7 +31,7 @@ const starterkit_manager = function (config) {
 
         if (clean) {
           console.log('Deleting contents of', paths.source.root, 'prior to starterkit load.');
-          util.emptyDirectory(paths.source.root);
+          fs.emptyDirSync(paths.source.root);
         } else {
           console.log('Overwriting contents of', paths.source.root, 'during starterkit load.');
         }