Refactor all text entities to be text nodes

Previously we had several ways text was stored:

* As a property on a Tag node
* As multiple nodes in a Text node
* As multiple Text nodes in a Block node

We have decided upon simplifying the Text node to just being a piece of text.

Multiple lines of text become multiple Text nodes in a Block.

There is no more text property in the Tag node.

And pretty printing for Text blocks is also supported now.

lib/compiler.js

@@ -117,6 +117,23 @@ Compiler.prototype = {
     }
   },
 
+  /**
+   * Buffer an indent based on the current `indent` property and an additional
+   * `offset`.
+   *
+   * @param {Number} offset
+   * @param {Boolean} newline (defaults to true)
+   * @api public
+   */
+
+  prettyIndent: function (offset, newline) {
+    offset = offset || 0;
+    (newline === false) ? newline = '' : newline = '\\n';
+    this.buffer(newline + Array(this.indents + offset).join('  '));
+    if (this.parentIndents)
+      this.buf.push("buf.push.apply(buf, __indent);");
+  },
+
   /**
    * Visit `node`.
    *
@@ -155,8 +172,7 @@ Compiler.prototype = {
    */
 
   visitNode: function(node){
-    var name = node.constructor.name
-      || node.constructor.toString().match(/function ([^(\s]+)()/)[1];
+    var name = node.getType();
     return this['visit' + name](node);
   },
 
@@ -214,8 +230,23 @@ Compiler.prototype = {
 
   visitBlock: function(block){
     var len = block.nodes.length;
+
+    // Pretty print multi-line text
+    if (this.pp && len > 1 && !this.escape
+        && block.nodes[0].getType() === 'Text'
+        && block.nodes[1].getType() === 'Text')
+      this.prettyIndent(1);
+
     for (var i = 0; i < len; ++i) {
+      // Pretty print text
+      if (this.pp && i > 0 && !this.escape && block.nodes[0].getType() === 'Text')
+        this.prettyIndent(1, false)
+
       this.visit(block.nodes[i]);
+      // Multiple text nodes are separated by newlines
+      if (block.nodes[i+1] && block.nodes[i].getType() === 'Text'
+          && block.nodes[i+1].getType() === 'Text')
+        this.buffer('\\n');
     }
   },
 
@@ -283,9 +314,7 @@ Compiler.prototype = {
 
     // pretty print
     if (this.pp && inlineTags.indexOf(name) == -1) {
-      this.buffer('\\n' + Array(this.indents).join('  '));
-      if (this.parentIndents)
-        this.buf.push("buf.push.apply(buf, __indent);");
+      this.prettyIndent();
     }
 
     if (~selfClosing.indexOf(name) && !this.xml) {
@@ -304,15 +333,12 @@ Compiler.prototype = {
         this.buffer('<' + name + '>');
       }
       if (tag.code) this.visitCode(tag.code);
-      if (tag.text) this.buffer(utils.text(tag.text.nodes[0].trimLeft()));
       this.escape = 'pre' == tag.name;
       this.visit(tag.block);
 
       // pretty print
-      if (this.pp && !~inlineTags.indexOf(name) && !tag.textOnly && !tag.isText()) {
-        this.buffer('\\n' + Array(this.indents).join('  '));
-        if (this.parentIndents)
-          this.buf.push("buf.push.apply(buf, __indent);");
+      if (this.pp && !~inlineTags.indexOf(name) && !tag.isText()) {
+        this.prettyIndent();
       }
 
       this.buffer('</' + name + '>');
@@ -356,10 +382,9 @@ Compiler.prototype = {
    */
 
   visitText: function(text){
-    text = utils.text(text.nodes.join('\\n'));
+    text = utils.text(text.val);
     if (this.escape) text = escape(text);
     this.buffer(text);
-    this.buffer('\\n');
   },
 
   /**
@@ -372,9 +397,7 @@ Compiler.prototype = {
   visitComment: function(comment){
     if (!comment.buffer) return;
     if (this.pp) {
-      this.buffer('\\n' + Array(this.indents + 1).join('  '));
-      if (this.parentIndents)
-          this.buf.push("buf.push.apply(buf, __indent);");
+      this.prettyIndent(1);
     }
     this.buffer('<!--' + utils.escape(comment.val) + '-->');
   },
@@ -515,4 +538,4 @@ function escape(html){
     .replace(/</g, '&lt;')
     .replace(/>/g, '&gt;')
     .replace(/"/g, '&quot;');
-}
+}

lib/lexer.js

@@ -171,9 +171,9 @@ Lexer.prototype = {
 
   blank: function() {
     var captures;
-    if (this.pipeless) return;
     if (captures = /^\n *\n/.exec(this.input)) {
       this.consume(captures[0].length - 1);
+      if (this.pipeless) return this.tok('text', '');
       return this.next();
     }
   },
@@ -250,7 +250,7 @@ Lexer.prototype = {
    */
 
   text: function() {
-    return this.scan(/^(?:\| ?)?([^\n]+)/, 'text');
+    return this.scan(/^(?:\| ?| ?)?([^\n]+)/, 'text');
   },
 
   /**

lib/nodes/node.js

@@ -11,4 +11,9 @@
  * @api public
  */
 
-var Node = module.exports = function Node(){};
+var Node = module.exports = function Node(){};
+
+Node.prototype.getType = function () {
+  return this.constructor.name
+      || node.constructor.toString().match(/function ([^(\s]+)()/)[1];
+}

lib/nodes/tag.js

@@ -88,5 +88,7 @@ Tag.prototype.getAttribute = function(name){
  */
 
 Tag.prototype.isText = function(){
-  return !this.block.nodes.length;
+  return this.block.nodes.length === 0
+    || (this.block.nodes.length === 1
+        && this.block.nodes[0].getType() === 'Text');
 };

lib/nodes/text.js

@@ -19,24 +19,12 @@ var Node = require('./node');
  */
 
 var Text = module.exports = function Text(line) {
-  this.nodes = [];
-  if ('string' == typeof line) this.push(line);
+  this.val = '';
+  if ('string' == typeof line) this.val = line;
 };
 
 /**
  * Inherit from `Node`.
  */
 
 Text.prototype.__proto__ = Node.prototype;
-
-/**
- * Push the given `node.`
- *
- * @param {Node} node
- * @return {Number}
- * @api public
- */
-
-Text.prototype.push = function(node){
-  return this.nodes.push(node);
-};

lib/parser.js

@@ -504,8 +504,8 @@ Parser.prototype = {
    */
 
   parseTextBlock: function(){
-    var text = new nodes.Text;
-    text.line = this.line();
+    var block = new nodes.Block;
+    block.line = this.line();
     var spaces = this.expect('indent').val;
     if (null == this._spaces) this._spaces = spaces;
     var indent = Array(spaces - this._spaces + 1).join(' ');
@@ -516,17 +516,19 @@ Parser.prototype = {
           break;
         case 'indent':
           this.parseTextBlock().nodes.forEach(function(node){
-            text.push(node);
+            block.push(node);
           });
           break;
         default:
-          text.push(indent + this.advance().val);
+          var text = new nodes.Text(indent + this.advance().val);
+          text.line = this.line();
+          block.push(text);
       }
     }
 
     if (spaces == this._spaces) this._spaces = null;
     this.expect('outdent');
-    return text;
+    return block;
   },
 
   /**
@@ -603,7 +605,7 @@ Parser.prototype = {
     // (text | code | ':')?
     switch (this.peek().type) {
       case 'text':
-        tag.text = this.parseText();
+        tag.block.push(this.parseText());
         break;
       case 'code':
         tag.code = this.parseCode();