feat(pattern_assembler): Further separate files

Author: bmuenzenmeyer

core/lib/decompose.js

@@ -9,6 +9,7 @@ const smh = require('./style_modifier_hunter');
 const addPattern = require('./addPattern');
 const jsonCopy = require('./json_copy');
 const getPartial = require('./get');
+const processRecursive = require('./processRecursive');
 
 const lineage_hunter = new lh();
 const list_item_hunter = new lih();
@@ -39,7 +40,7 @@ function expandPartials(foundPatternPartials, patternlab, currentPattern) {
       }
 
       //recurse through nested partials to fill out this extended template.
-      pattern_assembler.processPatternRecursive(partialPath, patternlab);
+      processRecursive(partialPath, patternlab);
 
       //complete assembly of extended template
       //create a copy of the partial so as to not pollute it after the getPartial call.

core/lib/pattern_assembler.js

@@ -2,17 +2,17 @@
 
 const path = require('path');
 const _ = require('lodash');
+
 const Pattern = require('./object_factory').Pattern;
 const CompileState = require('./object_factory').CompileState;
-const pph = require('./pseudopattern_hunter');
 const mp = require('./markdown_parser');
 const logger = require('./log');
 const patternEngines = require('./pattern_engines');
 const ch = require('./changes_hunter');
 const da = require('./data_loader');
 const addPattern = require('./addPattern');
-const decompose = require('./decompose');
 const parseLink = require('./parseLink');
+
 const markdown_parser = new mp();
 const changes_hunter = new ch();
 const dataLoader = new da();
@@ -224,42 +224,6 @@ const pattern_assembler = function () {
     return currentPattern;
   }
 
-  // This is now solely for analysis; loading of the pattern file is
-  // above, in loadPatternIterative()
-  function processPatternIterative(pattern, patternlab) {
-    //look for a pseudo pattern by checking if there is a file
-    //containing same name, with ~ in it, ending in .json
-    return pph.find_pseudopatterns(pattern, patternlab).then(() => {
-      //find any stylemodifiers that may be in the current pattern
-      pattern.stylePartials = pattern.findPartialsWithStyleModifiers();
-
-      //find any pattern parameters that may be in the current pattern
-      pattern.parameteredPartials = pattern.findPartialsWithPatternParameters();
-      return pattern;
-    }).catch(logger.reportError('There was an error in processPatternIterative():'));
-  }
-
-  function processPatternRecursive(file, patternlab) {
-
-    //find current pattern in patternlab object using var file as a partial
-    var currentPattern, i;
-
-    for (i = 0; i < patternlab.patterns.length; i++) {
-      if (patternlab.patterns[i].relPath === file) {
-        currentPattern = patternlab.patterns[i];
-      }
-    }
-
-    //return if processing an ignored file
-    if (typeof currentPattern === 'undefined') { return Promise.resolve(); }
-
-    //we are processing a markdown only pattern
-    if (currentPattern.engine === null) { return Promise.resolve(); }
-
-    //call our helper method to actually unravel the pattern with any partials
-    return decompose(currentPattern, patternlab);
-  }
-
   /**
    * Finds patterns that were modified and need to be rebuilt. For clean patterns load the already
    * rendered markup.
@@ -331,12 +295,6 @@ const pattern_assembler = function () {
     load_pattern_iterative: function (file, patternlab) {
       return loadPatternIterative(file, patternlab);
     },
-    process_pattern_iterative: function (pattern, patternlab) {
-      return processPatternIterative(pattern, patternlab);
-    },
-    process_pattern_recursive: function (file, patternlab, additionalData) {
-      return processPatternRecursive(file, patternlab, additionalData);
-    },
     combine_listItems: function (patternlab) {
       buildListItems(patternlab);
     },

core/lib/patternlab.js

@@ -12,6 +12,8 @@ const packageInfo = require('../../package.json');
 const dataLoader = require('./data_loader')();
 const decompose = require('./decompose');
 const logger = require('./log');
+const processIterative = require('./processIterative');
+const processRecursive = require('./processRecursive');
 const jsonCopy = require('./json_copy');
 const render = require('./render');
 const pa = require('./pattern_assembler');
@@ -514,7 +516,7 @@ module.exports = class PatternLab {
     });
     return promiseAllPatternFiles.then(() => {
       return Promise.all(this.patterns.map((pattern) => {
-        return pattern_assembler.process_pattern_iterative(pattern, self);
+        return processIterative(pattern, self);
       }));
     });
   }
@@ -529,7 +531,7 @@ module.exports = class PatternLab {
           logger.info(err);
           return;
         }
-        pattern_assembler.process_pattern_recursive(path.relative(patterns_dir, file), self);
+        processRecursive(path.relative(patterns_dir, file), self);
       }
     );
   }

core/lib/processIterative.js

@@ -0,0 +1,20 @@
+"use strict";
+
+const logger = require('./log');
+const pph = require('./pseudopattern_hunter');
+
+// This is now solely for analysis; loading of the pattern file is
+// above, in loadPatternIterative()
+module.exports = function (pattern, patternlab) {
+
+  //look for a pseudo pattern by checking if there is a file
+  //containing same name, with ~ in it, ending in .json
+  return pph.find_pseudopatterns(pattern, patternlab).then(() => {
+    //find any stylemodifiers that may be in the current pattern
+    pattern.stylePartials = pattern.findPartialsWithStyleModifiers();
+
+    //find any pattern parameters that may be in the current pattern
+    pattern.parameteredPartials = pattern.findPartialsWithPatternParameters();
+    return Promise.resolve(pattern);
+  }).catch(logger.reportError('There was an error in processPatternIterative():'));
+};

core/lib/processRecursive.js

@@ -0,0 +1,23 @@
+"use strict";
+
+const decompose = require('./decompose');
+
+module.exports = function (file, patternlab) {
+  //find current pattern in patternlab object using var file as a partial
+  var currentPattern, i;
+
+  for (i = 0; i < patternlab.patterns.length; i++) {
+    if (patternlab.patterns[i].relPath === file) {
+      currentPattern = patternlab.patterns[i];
+    }
+  }
+
+  //return if processing an ignored file
+  if (typeof currentPattern === 'undefined') { return Promise.resolve(); }
+
+  //we are processing a markdown only pattern
+  if (currentPattern.engine === null) { return Promise.resolve(); }
+
+  //call our helper method to actually unravel the pattern with any partials
+  return decompose(currentPattern, patternlab);
+};