fix: whiteSpace Ctrl with compliance to shopify/liquid, working on #17

.gitignore

@@ -38,3 +38,4 @@ jspm_packages
 
 # vim
 .*.swp
+package-lock.json

README.md

@@ -96,7 +96,7 @@ Otherwise, undefined variables will cause an exception. Defaults to `false`.
 
 * `trim_left` is similiar to `trim_right`, whereas the `\n` is exclusive. Defaults to `false`. See [Whitespace Control][whitespace control] for details.
 
-* `greedy` is used to specify whether `trim_left`/`trim_right` is greedy. When set to `true`, all successive blank characters including `\n` will be trimed regardless of line breaks. Defaults to `false`.
+* `greedy` is used to specify whether `trim_left`/`trim_right` is greedy. When set to `true`, all successive blank characters including `\n` will be trimed regardless of line breaks. Defaults to `true`.
 
 ## Use with Express.js
 

src/tokenizer.js

@@ -4,92 +4,116 @@ const _ = require('./util/underscore.js')
 const assert = require('../src/util/assert.js')
 
 function parse (html, filepath, options) {
-  assert(_.isString(html), 'illegal input type')
+  assert(_.isString(html), 'illegal input')
 
-  html = whiteSpaceCtrl(html, options)
-
-  var tokens = []
-  var syntax = /({%-?([\s\S]*?)-?%})|({{-?([\s\S]*?)-?}})/g
-  var result, htmlFragment, token
+  var rLiquid = /({%-?([\s\S]*?)-?%})|({{-?([\s\S]*?)-?}})/g
+  var currIndent = 0
+  var lineNumber = LineNumber()
   var lastMatchEnd = 0
-  var lastMatchBegin = -1
-  var parsedLinesCount = 0
+  var tokens = []
 
-  while ((result = syntax.exec(html)) !== null) {
-    // passed html fragments
-    if (result.index > lastMatchEnd) {
-      htmlFragment = html.slice(lastMatchEnd, result.index)
-      tokens.push({
-        type: 'html',
-        raw: htmlFragment,
-        value: htmlFragment
-      })
+  for (var match; (match = rLiquid.exec(html)); lastMatchEnd = rLiquid.lastIndex) {
+    if (match.index > lastMatchEnd) {
+      tokens.push(parseHTMLToken(lastMatchEnd, match.index))
     }
-    if (result[1]) {
-      // tag appeared
-      token = factory('tag', 1, result)
+    tokens.push(match[1] ? parseTagToken(match) : parseOutputToken(match))
+  }
+  if (html.length > lastMatchEnd) {
+    tokens.push(parseHTMLToken(lastMatchEnd, html.length))
+  }
+  whiteSpaceCtrl(tokens, options)
+  return tokens
 
-      var match = token.value.match(lexical.tagLine)
-      if (!match) {
-        throw new TokenizationError(`illegal tag syntax`, token)
-      }
-      token.name = match[1]
-      token.args = match[2]
-
-      // get last line indentation
-      var lineStart = (htmlFragment || '').split('\n')
-      token.indent = lineStart[lineStart.length - 1].length
-
-      tokens.push(token)
-    } else {
-      // output
-      token = factory('output', 3, result)
-      tokens.push(token)
-    }
-    lastMatchEnd = syntax.lastIndex
+  function parseOutputToken (match) {
+    var token = factory('output', 3, match)
+    token.trim_left = (match[3].slice(0, 3) === '{{-')
+    token.trim_right = (match[3].slice(-3) === '-}}')
+    return token
   }
 
-  // remaining html
-  if (html.length > lastMatchEnd) {
-    htmlFragment = html.slice(lastMatchEnd, html.length)
-    tokens.push({
+  function parseTagToken (result) {
+    var token = factory('tag', 1, result)
+    var match = token.value.match(lexical.tagLine)
+    if (!match) {
+      throw new TokenizationError(`illegal tag syntax`, token)
+    }
+
+    return _.assign(token, {
+      name: match[1],
+      args: match[2],
+      trim_left: (result[1].slice(0, 3) === '{%-'),
+      trim_right: (result[1].slice(-3) === '-%}'),
+      indent: currIndent
+    })
+  }
+
+  function parseHTMLToken (begin, end) {
+    var htmlFragment = html.slice(begin, end)
+    currIndent = _.last((htmlFragment || '').split('\n')).length
+
+    return {
       type: 'html',
       raw: htmlFragment,
       value: htmlFragment
-    })
+    }
   }
-  return tokens
 
   function factory (type, offset, match) {
     return {
       type: type,
       raw: match[offset],
       value: match[offset + 1].trim(),
-      line: getLineNum(match),
+      line: lineNumber.get(match),
       input: html,
       file: filepath
     }
   }
+}
 
-  function getLineNum (match) {
-    var lines = match.input.slice(lastMatchBegin + 1, match.index).split('\n')
-    parsedLinesCount += lines.length - 1
-    lastMatchBegin = match.index
-    return parsedLinesCount + 1
+function LineNumber () {
+  var parsedLinesCount = 0
+  var lastMatchBegin = -1
+
+  return {
+    get: function (match) {
+      var lines = match.input.slice(lastMatchBegin + 1, match.index).split('\n')
+      parsedLinesCount += lines.length - 1
+      lastMatchBegin = match.index
+      return parsedLinesCount + 1
+    }
   }
 }
 
-function whiteSpaceCtrl (html, options) {
-  options = options || {}
-  if (options.trim_left) {
-    html = html.replace(/({[{%])-?/g, '$1-')
-  }
-  if (options.trim_right) {
-    html = html.replace(/-?([%}]})/g, '-$1')
-  }
-  var rLeft = options.greedy ? /\s+({[{%]-)/g : /[\t\r ]*({[{%]-)/g
-  var rRight = options.greedy ? /(-[%}]})\s+/g : /(-[%}]})[\t\r ]*\n?/g
-  return html.replace(rLeft, '$1').replace(rRight, '$1')
+function whiteSpaceCtrl (tokens, options) {
+  options = _.assign({ greedy: true }, options)
+  var inRaw = false
+
+  tokens.forEach((token, i) => {
+    if (!inRaw && (token.trim_left || options.trim_left)) {
+      trimLeft(tokens[i - 1], options.greedy)
+    }
+
+    if (token.type === 'tag' && token.name === 'raw') inRaw = true
+    if (token.type === 'tag' && token.name === 'endraw') inRaw = false
+
+    if (!inRaw && (token.trim_right || options.trim_right)) {
+      trimRight(tokens[i + 1], options.greedy)
+    }
+  })
+}
+
+function trimLeft (token, greedy) {
+  if (!token || token.type !== 'html') return
+
+  var rLeft = greedy ? /\s+$/g : /[\t\r ]*$/g
+  token.value = token.value.replace(rLeft, '')
+}
+
+function trimRight (token, greedy) {
+  if (!token || token.type !== 'html') return
+
+  var rRight = greedy ? /^\s+/g : /^[\t\r ]*\n?/g
+  token.value = token.value.replace(rRight, '')
 }
 
 exports.parse = parse

src/util/underscore.js

@@ -70,11 +70,8 @@ function _assignBinary (dst, src) {
   return dst
 }
 
-function echo (prefix) {
-  return v => {
-    console.log('[' + prefix + ']', v)
-    return v
-  }
+function last (arr) {
+  return arr[arr.length - 1]
 }
 
 function uniq (arr) {
@@ -123,16 +120,18 @@ function range (start, stop, step) {
   return arr
 }
 
+// lang
 exports.isString = isString
 exports.isObject = isObject
 exports.isArray = isArray
 exports.isNil = isNil
 exports.isError = isError
 
+// array
 exports.range = range
+exports.last = last
 
+// object
 exports.forOwn = forOwn
 exports.assign = assign
 exports.uniq = uniq
-
-exports.echo = echo

tags/index.js

@@ -1,16 +1,16 @@
-module.exports = function(engine){
-    require("./assign.js")(engine);
-    require("./capture.js")(engine);
-    require("./case.js")(engine);
-    require("./comment.js")(engine);
-    require("./cycle.js")(engine);
-    require("./decrement.js")(engine);
-    require("./for.js")(engine);
-    require("./if.js")(engine);
-    require("./include.js")(engine);
-    require("./increment.js")(engine);
-    require("./layout.js")(engine);
-    require("./raw.js")(engine);
-    require("./tablerow.js")(engine);
-    require("./unless.js")(engine);
-};
+module.exports = function (engine) {
+  require('./assign.js')(engine)
+  require('./capture.js')(engine)
+  require('./case.js')(engine)
+  require('./comment.js')(engine)
+  require('./cycle.js')(engine)
+  require('./decrement.js')(engine)
+  require('./for.js')(engine)
+  require('./if.js')(engine)
+  require('./include.js')(engine)
+  require('./increment.js')(engine)
+  require('./layout.js')(engine)
+  require('./raw.js')(engine)
+  require('./tablerow.js')(engine)
+  require('./unless.js')(engine)
+}

tags/raw.js

@@ -7,13 +7,13 @@ module.exports = function (liquid) {
 
       var stream = liquid.parser.parseStream(remainTokens)
       stream
-                .on('token', token => {
-                  if (token.name === 'endraw') stream.stop()
-                  else this.tokens.push(token)
-                })
-                .on('end', x => {
-                  throw new Error(`tag ${tagToken.raw} not closed`)
-                })
+        .on('token', token => {
+          if (token.name === 'endraw') stream.stop()
+          else this.tokens.push(token)
+        })
+        .on('end', x => {
+          throw new Error(`tag ${tagToken.raw} not closed`)
+        })
       stream.start()
     },
     render: function (scope, hash) {

test/liquid.js

@@ -186,7 +186,7 @@ describe('liquid', function () {
         trim_left: true
       })
       return expect(engine.parseAndRender(' \n \t{%if true%}foo{%endif%} '))
-        .to.eventually.equal(' \nfoo ')
+        .to.eventually.equal('foo ')
     })
     it('should trim_right for tags when trim_right=true', function () {
       engine = Liquid({
@@ -210,9 +210,9 @@ describe('liquid', function () {
         '  Wow, {{ username }}, you have a long name!',
         '{%- else -%}',
         '  Hello there!',
-        '{%- endif -%}\n'
+        '{%- endif -%}'
       ].join('\n')
-      var dst = '  Wow, John G. Chalmers-Smith, you have a long name!\n'
+      var dst = 'Wow, John G. Chalmers-Smith, you have a long name!'
       return expect(engine.parseAndRender(src)).to.eventually.equal(dst)
     })
     it('should not trim when not specified', function () {
@@ -223,9 +223,9 @@ describe('liquid', function () {
         '  Wow, {{ username }}, you have a long name!',
         '{% else %}',
         '  Hello there!',
-        '{% endif %}\n'
+        '{% endif %}'
       ].join('\n')
-      var dst = '\n\n  Wow, John G. Chalmers-Smith, you have a long name!\n\n'
+      var dst = '\n\n  Wow, John G. Chalmers-Smith, you have a long name!\n'
       return expect(engine.parseAndRender(src)).to.eventually.equal(dst)
     })
   })

test/tags/if.js

@@ -12,37 +12,37 @@ describe('tags/if', function () {
     emptyArray: []
   }
 
-  it('should support if 1', function () {
+  it('should throw if not closed', function () {
     var src = '{% if false%}yes'
     return expect(liquid.parseAndRender(src, ctx))
       .to.be.rejectedWith(/tag {% if false%} not closed/)
   })
-  it('should support if 2', function () {
+  it('should treat Array truthy', function () {
     var src = '{%if emptyArray%}a{%endif%}'
     return expect(liquid.parseAndRender(src, ctx))
       .to.eventually.equal('a')
   })
-  it('should support if 3', function () {
+  it('should support ==', function () {
     var src = '{% if 2==3 %}yes{%else%}no{%endif%}'
     return expect(liquid.parseAndRender(src, ctx))
       .to.eventually.equal('no')
   })
-  it('should support if 4', function () {
+  it('should support >=', function () {
     var src = '{% if 1>=2 and one<two %}a{%endif%}'
     return expect(liquid.parseAndRender(src, ctx))
       .to.eventually.equal('')
   })
-  it('should support if 5', function () {
+  it('should support !=', function () {
     var src = '{% if one!=two %}yes{%else%}no{%endif%}'
     return expect(liquid.parseAndRender(src, ctx))
       .to.eventually.equal('yes')
   })
-  it('should support if 6', function () {
+  it('should support boolean', function () {
     var src = '{% if false %}1{%elsif true%}2{%else%}3{%endif%}'
     return expect(liquid.parseAndRender(src, ctx))
       .to.eventually.equal('2')
   })
-  it('should support if 7', function () {
+  it('should support nested', function () {
     var src = '{%if false%}{%if true%}{%else%}a{%endif%}{%endif%}'
     return expect(liquid.parseAndRender(src, ctx))
       .to.eventually.equal('')

test/tokenizer.js

@@ -1,6 +1,5 @@
 const chai = require('chai')
 const parse = require('../src/tokenizer.js').parse
-const whiteSpaceCtrl = require('../src/tokenizer.js').whiteSpaceCtrl
 const expect = chai.expect
 
 describe('tokenizer', function () {
@@ -16,7 +15,7 @@ describe('tokenizer', function () {
     it('should throw when non-string passed in', function () {
       expect(function () {
         parse({})
-      }).to.throw('illegal input type')
+      }).to.throw('illegal input')
     })
     it('should handle tag syntax', function () {
       var html = '<p>{% for p in a[1]%}</p>'
@@ -70,90 +69,4 @@ describe('tokenizer', function () {
       expect(tokens[0].raw).to.equal('{{foo\n|date:\n"%Y-%m-%d"\n}}')
     })
   })
-  describe('whitespace control', function () {
-    it('should not strip by default (tag)', function () {
-      expect(whiteSpaceCtrl('\n {%foo%} \n')).to.equal('\n {%foo%} \n')
-    })
-    it('should strip all blank characters before and after (tag)', function () {
-      expect(whiteSpaceCtrl(' \t\r{%-foo-%} \t\n')).to.equal('{%-foo-%}')
-    })
-    it('should not trim previous/next lines (tag)', function () {
-      expect(whiteSpaceCtrl(' \t\n {%-foo-%}')).to.equal(' \t\n{%-foo-%}')
-      expect(whiteSpaceCtrl('{%-foo-%} \n \tfoo')).to.equal('{%-foo-%} \tfoo')
-    })
-    it('should trim exactly one trailing CR (tag)', function () {
-      expect(whiteSpaceCtrl('{%-foo-%} \n\n')).to.equal('{%-foo-%}\n')
-    })
-    it('should trim exactly one trailing CR (tag)', function () {
-      expect(whiteSpaceCtrl('{%-foo-%} \n\n')).to.equal('{%-foo-%}\n')
-    })
-    it('should trim all leading/trailing blanks when options.greedy set (tag)', function () {
-      expect(whiteSpaceCtrl(' \n \n\t\r{%-foo-%}\n \n', {
-        greedy: true
-      })).to.equal('{%-foo-%}')
-    })
-    it('should strip whitespaces when set trim_left (tag)', function () {
-      expect(whiteSpaceCtrl('\n  {%foo%} \n', {
-        trim_left: true
-      })).to.equal('\n{%-foo%} \n')
-    })
-    it('should strip whitespaces when set trim_right (tag)', function () {
-      expect(whiteSpaceCtrl('\n  {%foo%} \n', {
-        trim_right: true
-      })).to.equal('\n  {%foo-%}')
-    })
-    it('markup should has priority over options (tag)', function () {
-      expect(whiteSpaceCtrl('\n  {%-foo%} \n', {
-        trim_left: false
-      })).to.equal('\n{%-foo%} \n')
-    })
-    it('should support a mix of markup and options (tag)', function () {
-      expect(whiteSpaceCtrl('  {%-foo%} \n', {
-        trim_left: true,
-        trim_right: true
-      })).to.equal('{%-foo-%}')
-    })
-    it('should not strip by default (value)', function () {
-      expect(whiteSpaceCtrl('\n {{foo}} \n')).to.equal('\n {{foo}} \n')
-    })
-    it('should strip all blank characters before and after (value)', function () {
-      expect(whiteSpaceCtrl(' \t\r{{-foo-}} \t\n')).to.equal('{{-foo-}}')
-    })
-    it('should not trim previous/next lines (value)', function () {
-      expect(whiteSpaceCtrl(' \t\n {{-foo-}}')).to.equal(' \t\n{{-foo-}}')
-      expect(whiteSpaceCtrl('{{-foo-}} \n \tfoo')).to.equal('{{-foo-}} \tfoo')
-    })
-    it('should trim exactly one trailing CR (value)', function () {
-      expect(whiteSpaceCtrl('{{-foo-}} \n\n')).to.equal('{{-foo-}}\n')
-    })
-    it('should trim exactly one trailing CR (value)', function () {
-      expect(whiteSpaceCtrl('{{-foo-}} \n\n')).to.equal('{{-foo-}}\n')
-    })
-    it('should trim all leading/trailing blanks when options.greedy set (value)', function () {
-      expect(whiteSpaceCtrl(' \n \n\t\r{{-foo-}}\n \n', {
-        greedy: true
-      })).to.equal('{{-foo-}}')
-    })
-    it('should strip whitespaces when set trim_left (value)', function () {
-      expect(whiteSpaceCtrl('\n  {{foo}} \n', {
-        trim_left: true
-      })).to.equal('\n{{-foo}} \n')
-    })
-    it('should strip whitespaces when set trim_right (value)', function () {
-      expect(whiteSpaceCtrl('\n  {{foo}} \n', {
-        trim_right: true
-      })).to.equal('\n  {{foo-}}')
-    })
-    it('markup should has priority over options (value)', function () {
-      expect(whiteSpaceCtrl('\n  {{-foo}} \n', {
-        trim_left: false
-      })).to.equal('\n{{-foo}} \n')
-    })
-    it('should support a mix of markup and options (value)', function () {
-      expect(whiteSpaceCtrl('  {{-foo}} \n', {
-        trim_left: true,
-        trim_right: true
-      })).to.equal('{{-foo-}}')
-    })
-  })
 })

test/util/underscore.js

@@ -62,16 +62,6 @@ describe('util/underscore', function () {
       expect(spy).to.have.been.calledOnce
     })
   })
-  describe('.echo()', function () {
-    it('should be transparent', function () {
-      expect(_.echo('foo')('bar')).to.equal('bar')
-    })
-    it('should log the arguments', function () {
-      var log = sinon.spy(console, 'log')
-      _.echo('foo')('bar')
-      expect(log).to.have.been.calledWith('[foo]', 'bar')
-    })
-  })
   describe('.range()', function () {
     it('should return a range of integers', function () {
       expect(_.range(3, 5)).to.deep.equal([3, 4])

test/whitespace-control.js

@@ -0,0 +1,448 @@
+const chai = require('chai')
+const expect = chai.expect
+const Liquid = require('..')
+const liquid = new Liquid()
+chai.use(require('chai-as-promised'))
+
+const cases = [
+  {
+    text: `
+      <div>
+        <p>
+          {{ 'John' }}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>
+          John
+        </p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+
+
+          {{- 'John' -}}
+
+
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>John</p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+
+
+          {%- if true -%}
+          yes
+          {%- endif -%}
+
+
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>yes</p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {% if true %}
+          yes
+          {% endif %}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>
+          
+          yes
+          
+        </p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {% if false %}
+          no
+          {% endif %}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>
+          
+        </p>
+      </div>
+    `
+  }, {
+    text: '<p>{{- \'John\' -}}</p>',
+    expected: '<p>John</p>'
+  }, {
+    text: '<p>{%- if true -%}yes{%- endif -%}</p>',
+    expected: '<p>yes</p>'
+  }, {
+    text: '<p>{%- if false -%}no{%- endif -%}</p>',
+    expected: '<p></p>'
+  }, {
+    text: '<p> {%- if true %} yes {% endif -%} </p>',
+    expected: '<p> yes </p>'
+  }, {
+    text: '<p> {%- if false %} no {% endif -%} </p>',
+    expected: '<p></p>'
+  }, {
+    text: '<p> {% if true -%} yes {%- endif %} </p>',
+    expected: '<p> yes </p>'
+  }, {
+    text: '<p> {% if false -%} no {%- endif %} </p>',
+    expected: '<p>  </p>'
+  }, {
+    text: '<p> {% if true -%} yes {% endif -%} </p>',
+    expected: '<p> yes </p>'
+  }, {
+    text: '<p> {% if false -%} no {% endif -%} </p>',
+    expected: '<p> </p>'
+  }, {
+    text: '<p> {%- if true %} yes {%- endif %} </p>',
+    expected: '<p> yes </p>'
+  }, {
+    text: '<p> {%- if false %} no {%- endif %} </p>',
+    expected: '<p> </p>'
+  }, {
+    text: `
+      <div>
+        <p>
+          {{- 'John' }}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>John
+        </p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {%- if true %}
+          yes
+          {%- endif %}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>
+          yes
+        </p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {%- if false %}
+          no
+          {%- endif %}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>
+        </p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {{ 'John' -}}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>
+          John</p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {% if true -%}
+          yes
+          {% endif -%}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>
+          yes
+          </p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {% if false -%}
+          no
+          {% endif -%}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>
+          </p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {%- if true %}
+          yes
+          {% endif -%}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>
+          yes
+          </p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {%- if false %}
+          no
+          {% endif -%}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p></p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {% if true -%}
+          yes
+          {%- endif %}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>
+          yes
+        </p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {% if false -%}
+          no
+          {%- endif %}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>
+          
+        </p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {{- 'John' -}}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>John</p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {%- if true -%}
+          yes
+          {%- endif -%}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>yes</p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {%- if false -%}
+          no
+          {%- endif -%}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p></p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {{- 'John' -}},
+          {{- '30' -}}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>John,30</p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {%- if true -%}
+          yes
+          {%- endif -%}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>yes</p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {%- if false -%}
+          no
+          {%- endif -%}
+        </p>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p></p>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        <p>
+          {{- 'John' -}}
+          {{- '30' -}}
+        </p>
+        <b>
+          {{ 'John' -}}
+          {{- '30' }}
+        </b>
+        <i>
+          {{- 'John' }}
+          {{ '30' -}}
+        </i>
+      </div>
+    `,
+    expected: `
+      <div>
+        <p>John30</p>
+        <b>
+          John30
+        </b>
+        <i>John
+          30</i>
+      </div>
+    `
+  }, {
+    text: `
+      <div>
+        {%- if true -%}
+          {%- if true -%}
+            <p>
+              {{- 'John' -}}
+            </p>
+          {%- endif -%}
+        {%- endif -%}
+      </div>
+    `,
+    expected: `
+      <div><p>John</p></div>
+    `
+  }, {
+    text: `
+      <div>
+        {% raw %}
+          {%- if true -%}
+            <p>
+              {{- 'John' -}}
+            </p>
+          {%- endif -%}
+        {% endraw %}
+      </div>
+    `,
+    expected: `
+      <div>
+        
+          {%- if true -%}
+            <p>
+              {{- 'John' -}}
+            </p>
+          {%- endif -%}
+        
+      </div>
+    `
+  }
+]
+
+describe('Whitespace Control', function () {
+  cases.forEach(item => it(
+    item.text,
+    () => expect(liquid.parseAndRender(item.text)).to.eventually.equal(item.expected)
+  ))
+})