Merge pull request #87 from posthtml/milestone-1.4.3

Milestone 1.4.3

Author: Scrum

lib/index.js

@@ -152,7 +152,9 @@ module.exports = function postHTMLExpressions (options) {
   unescapeDelimitersReplace = new RegExp(`@${delimitersSettings[0].text[0]}`, 'g')
 
   // kick off the parsing
-  return walk.bind(null, { locals: options.locals })
+  return function (tree) {
+    return clearRawTag(walk({ locals: options.locals }, tree))
+  }
 }
 
 function walk (opts, nodes) {
@@ -170,8 +172,6 @@ function walk (opts, nodes) {
 
     // don't parse ignoredTag
     if (node.tag === ignored) {
-      node.tag = false
-
       m.push(node)
 
       return m
@@ -396,3 +396,22 @@ function walk (opts, nodes) {
     return m
   }, [])
 }
+
+
+function clearRawTag(tree) {
+
+  return tree.reduce((m, node) => {
+    if (node.content) {
+      node.content = clearRawTag(node.content)
+    }
+
+    if (node.tag === ignored) {
+      node.tag = false
+    }
+
+    m.push(node)
+
+    return m
+  }, [])
+
+}

test/expect/raw_in_condition.html

@@ -0,0 +1,5 @@
+
+    {{ foo }}
+
+<p class="{{ dynamicClass }}">bar</p>
+

test/expect/raw_in_switch.html

@@ -0,0 +1,5 @@
+Hello from Earth, {{ username }}
+
+
+
+    Hello from Moscow, {{ username }}

test/fixtures/raw_in_condition.html

@@ -0,0 +1,7 @@
+<if condition="foo === 'bar'">
+  <raw>
+    {{ foo }}
+  </raw>
+</if>
+<p class="@{{ dynamicClass }}">{{ foo }}</p>
+

test/fixtures/raw_in_switch.html

@@ -0,0 +1,17 @@
+<switch expression="country">
+  <case n="'russia'">
+    <p>Hello, from Russia!</p>
+  </case>
+  <default>
+    <raw>Hello from Earth, {{ username }}</raw>
+  </default>
+</switch>
+
+<switch expression="city">
+  <case n="'moscow'">
+    <raw>Hello from Moscow, {{ username }}</raw>
+  </case>
+  <default>
+    <p>Hello, from Earth!</p>
+  </default>
+</switch>

test/test-core.js

@@ -78,6 +78,10 @@ test('Raw output', (t) => {
   return process(t, 'raw', { locals: { foo: 'bar' } })
 })
 
+test('Raw output - inside condition', (t) => {
+  return process(t, 'raw_in_condition', { locals: { foo: 'bar' } })
+})
+
 test('Raw output - custom tag', (t) => {
   return process(t, 'raw_custom', { ignoredTag: 'verbatim', locals: { foo: 'bar' } })
 })

test/test-switch.js

@@ -90,3 +90,9 @@ test('Switch - bad flow', (t) => {
     t.is(err.message, 'the "switch" tag can contain only "case" tags and one "default" tag')
   })
 })
+
+test('Switch - raw tag', (t) => {
+  return Promise.all([
+    process(t, 'raw_in_switch', { locals: { country: 'germany', city: 'moscow' } })
+  ])
+})