Fix ctx var output in imported macros. gh-363

lib/tags/import.js

@@ -22,12 +22,23 @@ var utils = require('../utils');
  */
 exports.compile = function (compiler, args) {
   var ctx = args.pop(),
-    out = '_ctx.' + ctx + ' = {};\n' +
-      '(function (_ctx) {\n' +
-      '  var _output = "";\n';
+    out = '_ctx.' + ctx + ' = {};\n  var _output = "";\n',
+    replacements = utils.map(args, function (arg) {
+      return {
+        ex: new RegExp('_ctx.' + arg.name, 'g'),
+        re: '_ctx.' + ctx + '.' + arg.name
+      };
+    });
 
-  out += args.join('');
-  out += '}(_ctx.' + ctx + '));\n';
+  // Replace all occurrences of all macros in this file with
+  // proper namespaced definitions and calls
+  utils.each(args, function (arg) {
+    var c = arg.compiled;
+    utils.each(replacements, function (re) {
+      c = c.replace(re.ex, re.re);
+    });
+    out += c;
+  });
 
   return out;
 };
@@ -52,7 +63,7 @@ exports.parse = function (str, line, parser, types, stack, opts) {
         }
         macroName = token.args[0];
         out += token.compile(compiler, token.args, token.content, [], compileOpts) + '\n';
-        self.out.push(out);
+        self.out.push({compiled: out, name: macroName});
       });
       return;
     }

tests/cases/import.expectation.html

@@ -18,3 +18,7 @@
 Salsa: Medium
 
 
+
+
+Tacos
+

tests/cases/import.test.html

@@ -6,3 +6,5 @@
 {% endblock %}
 
 {{ macros.nested('Medium') }}
+
+{{ macros.global_ctx() }}

tests/cases/macros.html

@@ -17,3 +17,7 @@
 {% macro nested(salsa) %}
 {{ tacos('Pork', salsa) }}
 {% endmacro %}
+
+{% macro global_ctx() %}
+{{ first }}
+{% endmacro %}