more tests

Author: Jeff Escalante

.editorconfig

@@ -8,5 +8,5 @@ indent_style = space
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.md]
+[*.{md,html}]
 trim_trailing_whitespace = false

lib/index.js

@@ -3,9 +3,10 @@ const merge = require('lodash.merge')
 const cloneDeep = require('lodash.clonedeep')
 const parseAndReplace = require('./expression_parser')
 
-let delimiters, unescapeDelimiters, delimiterRegex, unescapeDelimiterRegex, conditionals, loops
+let delimiters, unescapeDelimiters, delimiterRegex, unescapeDelimiterRegex, conditionals, loops, options
 
-module.exports = function PostHTMLExpressions (options = {}) {
+module.exports = function PostHTMLExpressions (_options = {}) {
+  options = _options
   // set up delimiter options and detection
   delimiters = options.delimiters || ['{{', '}}']
   unescapeDelimiters = options.unescapeDelimiters || ['{{{', '}}}']
@@ -146,11 +147,11 @@ function walk (opts, nodes) {
       // run the loop, different types of loops for arrays and objects
       if (Array.isArray(target)) {
         for (let index = 0; index < target.length; index++) {
-          m.push(executeLoop(loopParams.keys, target[index], index, node, opts))
+          m.push(executeLoop(loopParams.keys, target[index], index, node))
         }
       } else {
         for (let key in target) {
-          m.push(executeLoop(loopParams.keys, target[key], key, node, opts))
+          m.push(executeLoop(loopParams.keys, target[key], key, node))
         }
       }
 
@@ -240,15 +241,15 @@ function parseLoopStatement (input) {
  * Creates a set of local variables within the loop, and evaluates all nodes
  * within the loop, returning their contents
  */
-function executeLoop (loopParams, p1, p2, node, opts) {
+function executeLoop (loopParams, p1, p2, node) {
   // two loop locals are allowed
   // - for arrays it's the current value and the index
   // - for objects, it's the value and the key
   const scopedLocals = {}
   scopedLocals[loopParams[0]] = p1
   if (loopParams[1]) scopedLocals[loopParams[1]] = p2
   // merge nondestructively into existing locals
-  const scopedOptions = merge(opts, { locals: scopedLocals })
+  const scopedOptions = merge(cloneDeep(options), { locals: scopedLocals })
   // walk through the contents and run replacements with modified options
   // we need to clone the node because the normal operation modifies
   // the node directly

test/fixtures/loop_conflict.expected.html

@@ -0,0 +1,9 @@
+<p>bar</p>
+
+  <p>0: 1</p>
+
+  <p>1: 2</p>
+
+  <p>2: 3</p>
+
+<p>bar</p>

test/fixtures/loop_conflict.html

@@ -0,0 +1,5 @@
+<p>{{item}}</p>
+<each loop='item, index in items'>
+  <p>{{index}}: {{item}}</p>
+</each>
+<p>{{item}}</p>

test/fixtures/loop_locals.expected.html

@@ -0,0 +1,9 @@
+<p>x</p>
+
+  <p>0, 1, bar</p>
+
+  <p>1, 2, bar</p>
+
+  <p>2, 3, bar</p>
+
+<p>x</p>

test/fixtures/loop_locals.html

@@ -0,0 +1,5 @@
+<p>x</p>
+<each loop='item, index in items'>
+  <p>{{index}}, {{item}}, {{ foo }}</p>
+</each>
+<p>x</p>

test/fixtures/loop_nested.expected.html

@@ -0,0 +1,21 @@
+<p>x</p>
+
+  <p>c1: [1,2,3]</p>
+  
+    <p>1</p>
+  
+    <p>2</p>
+  
+    <p>3</p>
+  
+
+  <p>c2: [4,5,6]</p>
+  
+    <p>4</p>
+  
+    <p>5</p>
+  
+    <p>6</p>
+  
+
+<p>x</p>

test/fixtures/loop_nested.html

@@ -0,0 +1,8 @@
+<p>x</p>
+<each loop='item_category, key in items'>
+  <p>{{ key }}: {{ JSON.stringify(item_category) }}</p>
+  <each loop='item in item_category'>
+    <p>{{ item }}</p>
+  </each>
+</each>
+<p>x</p>

test/index.js

@@ -72,12 +72,28 @@ test('loop', (t) => {
 })
 
 test('loop object', (t) => {
-  return matchExpected(t, 'loop_object', { locals: { items: { a: 'b', c: 'd' } } })
+  return matchExpected(t, 'loop_object', {
+    locals: { items: { a: 'b', c: 'd' } }
+  })
 })
 
-test.todo('loop with other locals included')
-test.todo('loop with conflicting locals')
-test.todo('nested loops')
+test('loop with other locals included', (t) => {
+  return matchExpected(t, 'loop_locals', {
+    locals: { items: [1, 2, 3], foo: 'bar' }
+  })
+})
+
+test('loop with conflicting locals', (t) => {
+  return matchExpected(t, 'loop_conflict', {
+    locals: { items: [1, 2, 3], item: 'bar' }
+  })
+})
+
+test('nested loops', (t) => {
+  return matchExpected(t, 'loop_nested', {
+    locals: { items: { c1: [1, 2, 3], c2: [4, 5, 6] } }
+  })
+})
 
 //
 // Utility