Merge pull request #17 from ambassify/bug/support-for-key-value

[for] add support for key, value iteration

src/index.js

@@ -425,6 +425,17 @@ function matchToken(config = {}, str, state = TEXT, offset = 0, skip = 0, parent
  tok.closing = false;
  return tok;
 
+ /**
+ * Iterating over keys and values using a for loop allows
+ * for two arguments separated by a comma.
+ *
+ * Example: {% for key, value in array %}
+ */
+ } else if (isType(state, TAG_CONTROL) && cur == ',' && tok.name == 'for' && tok.children.length == 1) {
+ // jump over comma, next argument will be picked up by regular arguments clause
+ i++;
+ continue;
+
  /**
  * The sequence following the name of a control tag should be the
  * arguments to the tag.

test/control.js

@@ -49,4 +49,19 @@ describe('toAST', () => {
 
  })
 
+ it('should handle for loop iterating both keys and values', () => {
+ const ast = toAST(`
+ {% for key, value in array %}
+ Hello Test
+ {% endfor %}
+ `);
+
+ assert.equal(take(ast, 1, 'name'), 'for');
+ assert.equal(take(ast, 1, 0, 0, 'name'), 'key');
+ assert.equal(take(ast, 1, 1, 0, 'name'), 'value');
+ assert.equal(take(ast, 1, 1, 1, 'value'), 'in');
+ assert.equal(take(ast, 1, 1, 2, 0, 'name'), 'array');
+ assert.equal(take(ast, 1, 2, 'type'), 'BLOCK');
+ });
+
 });