Shift template compilation to registerPartial()

Author: geoffp

lib/engine_underscore.js

@@ -52,21 +52,20 @@ function addParentContext(data, currentContext) {
 
 _.mixin({
   renderNamedPartial: function (partialKey, data, currentContext) {
-    var partialString = partialRegistry[partialKey];
-    if (typeof partialString !== 'string') { throw `Pattern ${partialKey} not found.`; }
+    var compiledPartial = partialRegistry[partialKey];
+    if (typeof compiledPartial !== 'function') { throw `Pattern ${partialKey} not found.`; }
 
-    return _.renderPartial(partialString, data, currentContext);
+    return _.renderPartial(compiledPartial, data, currentContext);
   },
-  renderPartial: function (partial, dataIn, currentContext) {
+  renderPartial: function (compiledPartial, dataIn, currentContext) {
     var data = dataIn || {};
-    var compiled;
+
     if (dataIn && currentContext &&
         dataIn instanceof Object && currentContext instanceof Object) {
       data = addParentContext(data, currentContext);
     }
-    compiled = _.template(partial);
 
-    return compiled(data);
+    return compiledPartial(data);
   },
   /* eslint-disable no-eval, no-unused-vars */
   getPath: function (pathString, currentContext, debug) {
@@ -102,9 +101,9 @@ var engine_underscore = {
     var compiled;
 
     try {
-      compiled = _.template(pattern.extendedTemplate);
+      compiled = partialRegistry[pattern.patternPartial];
     } catch (e) {
-      console.log(`Error compiling underscore template ${pattern.patternName}:`, pattern.extendedTemplate, e);
+      console.log(`Error looking up underscore template ${pattern.patternName}:`, pattern.extendedTemplate, e);
     }
 
     // This try-catch is necessary because references to undefined variables
@@ -134,7 +133,15 @@ var engine_underscore = {
   },
 
   registerPartial: function (pattern) {
-    partialRegistry[pattern.patternPartial] = pattern.template;
+    var compiled;
+
+    try {
+      var templateString = pattern.extendedTemplate || pattern.template;
+      compiled = _.template(templateString);
+    } catch (e) {
+      console.log(`Error compiling underscore template ${pattern.patternName}:`, pattern.extendedTemplate, e);
+    }
+    partialRegistry[pattern.patternPartial] = compiled;
   },
 
   // find and return any {{> template-name }} within pattern