Mustache specs - whitespace compliance

mustache.js

@@ -181,6 +181,7 @@
   Writer.prototype.clearCache = function () {
     this._cache = {};
     this._partialCache = {};
+    this._partials = {};
   };
 
   Writer.prototype.compile = function (template, tags) {
@@ -194,18 +195,27 @@
     return fn;
   };
 
-  Writer.prototype.compilePartial = function (name, template, tags) {
+  Writer.prototype.compilePartial = function (name, template, tags, indentation) {
+    // A standalone partial should be indented with the whitespace before the
+    // partial on the same row. We keep track on instances of the same partial
+    // with different indentations by prefixing its name with the indentation in
+    // the partial cache.
+    var cacheName = (indentation || '') + name;
+    if (indentation)
+      template = template.replace(/^(?=.)/gm, indentation);
     var fn = this.compile(template, tags);
-    this._partialCache[name] = fn;
+    this._partialCache[cacheName] = fn;
     return fn;
   };
 
-  Writer.prototype.getPartial = function (name) {
-    if (!(name in this._partialCache) && this._loadPartial) {
-      this.compilePartial(name, this._loadPartial(name));
+  Writer.prototype.getPartial = function (name, indentation) {
+    var cacheName = (indentation || '') + name;
+    if (!(cacheName in this._partialCache)) {
+      var partial = this._loadPartial ? this._loadPartial(name) : this._partials[name];
+      if (partial) this.compilePartial(name, partial, null, indentation);
     }
 
-    return this._partialCache[name];
+    return this._partialCache[cacheName];
   };
 
   Writer.prototype.compileTokens = function (tokens, template) {
@@ -217,6 +227,7 @@
         } else {
           for (var name in partials) {
             self.compilePartial(name, partials[name]);
+            self._partials[name] = partials[name];
           }
         }
       }
@@ -277,7 +288,8 @@
 
         break;
       case '>':
-        value = writer.getPartial(tokenValue);
+        // indentation for standalone partial in token[4]
+        value = writer.getPartial(tokenValue, token[4]);
         if (typeof value === 'function') buffer += value(context);
         break;
       case '&':
@@ -381,6 +393,7 @@
     var sections = [];     // Stack to hold section tokens
     var tokens = [];       // Buffer to hold the tokens
     var spaces = [];       // Indices of whitespace tokens on the current line
+    var whitespace = '';   // Whitespace characters at the same line before a tag
     var hasTag = false;    // Is there a {{tag}} on the current line?
     var nonSpace = false;  // Is there a non-space char on the current line?
 
@@ -397,6 +410,7 @@
 
       hasTag = false;
       nonSpace = false;
+      whitespace = '';
     }
 
     var start, type, value, chr, token;
@@ -411,6 +425,7 @@
 
           if (isWhitespace(chr)) {
             spaces.push(tokens.length);
+            whitespace += chr;
           } else {
             nonSpace = true;
           }
@@ -423,6 +438,9 @@
         }
       }
 
+      // The following tag is not standalone
+      if (whitespace && nonSpace) whitespace = '';
+
       // Match the opening tag.
       if (!scanner.scan(tagRes[0])) break;
       hasTag = true;
@@ -449,6 +467,10 @@
       if (!scanner.scan(tagRes[1])) throw new Error('Unclosed tag at ' + scanner.pos);
 
       token = [type, value, start, scanner.pos];
+
+      // Store whitespaces before standalone partials
+      if (type === '>' && whitespace) token[4] = whitespace;
+
       tokens.push(token);
 
       if (type === '#' || type === '^') {
@@ -466,7 +488,12 @@
         if (tags.length !== 2) throw new Error('Invalid tags at ' + start + ': ' + tags.join(', '));
         tagRes = escapeTags(tags);
       }
+      whitespace = '';
     }
+    // Standalone tags should not require a newline to follow them
+    // therefore we strip spaces from the last line if it is a standalone tag,
+    // even if it might not be followed by a newline
+    stripSpace();
 
     // Make sure there are no open sections when we're done.
     var openSection = sections.pop();

test/mustache-spec-test.js

@@ -5,23 +5,6 @@ var path = require('path');
 var specsDir = path.join(__dirname, 'spec/specs');
 
 var skipTests = {
-  comments: [
-    'Standalone Without Newline'
-  ],
-  delimiters: [
-    'Standalone Without Newline'
-  ],
-  inverted: [
-    'Standalone Without Newline'
-  ],
-  partials: [
-    'Standalone Without Previous Line',
-    'Standalone Without Newline',
-    'Standalone Indentation'
-  ],
-  sections: [
-    'Standalone Without Newline'
-  ],
   '~lambdas': [
     'Interpolation',
     'Interpolation - Expansion',