Fix macro changing context in loop

src/twig.logic.js

@@ -1006,7 +1006,8 @@ module.exports = function (Twig) {
  state.macros[token.macroName] = function (...args) {
  // Pass global context and other macros
  const macroContext = {
- ...context,
+ // Use current state context because state context includes current loop variables as well
+ ...state.context,
  _self: state.macros
  };
  // Save arguments

test/templates/macro-context-loop.twig

@@ -0,0 +1,6 @@
+{% macro make_me_smile(name, slang) %}{{ slang }} {{ name }}{% endmacro %}
+{% import _self as greet %}
+{% for greeting in greetings %}
+{{ greet.make_me_smile('Twigjs', greeting) }}
+{{ greeting }}
+{% endfor %}

test/test.macro.js

@@ -64,6 +64,16 @@ describe('Twig.js Macro ->', function () {
  twig({ref: 'import-macro-context-self'}).render({greetings: 'Howdy'}).trim().should.equal('Howdy Twigjs');
  });
 
+ it('it should run wrapped macro in loop without mutating state context', function () {
+ twig({
+ id: 'import-macro-context-loop',
+ path: 'test/templates/macro-context-loop.twig',
+ async: false
+ });
+ // Load the template
+ twig({ref: 'import-macro-context-loop'}).render({greetings: ['Howdy', 'Hey']}).trim().should.equal('Howdy Twigjs\nHowdy\nHey Twigjs\nHey');
+ });
+
  it('it should run wrapped macro with default value for a parameter and self reference', function () {
  twig({
  id: 'import-macro-defaults-self',