Fixes #372

Author: zachleat

src/Engines/Nunjucks.js

@@ -1,6 +1,5 @@
 const NunjucksLib = require("nunjucks");
 const TemplateEngine = require("./TemplateEngine");
-const config = require("../Config");
 
 class Nunjucks extends TemplateEngine {
   constructor(name, inputDir) {
@@ -69,18 +68,25 @@ class Nunjucks extends TemplateEngine {
         this.tags = [shortcodeName];
 
         this.parse = function(parser, nodes, lexer) {
-          var tok = parser.nextToken();
+          let args;
+          let tok = parser.nextToken();
 
-          var args = parser.parseSignature(null, true);
-          parser.advanceAfterBlockEnd(tok.value);
+          args = parser.parseSignature(true, true);
+
+          // Nunjucks bug with non-paired custom tags bug still exists even
+          // though this issue is closed. Works fine for paired.
+          // https://github.com/mozilla/nunjucks/issues/158
+          if (args.children.length === 0) {
+            args.addChild(new nodes.Literal(0, 0, ""));
+          }
 
+          parser.advanceAfterBlockEnd(tok.value);
           return new nodes.CallExtensionAsync(this, "run", args);
         };
 
         this.run = function(...args) {
           let callback = args.pop();
           let [context, ...argArray] = args;
-
           let ret = new nunjucksEngine.runtime.SafeString(
             shortcodeFn(...argArray)
           );
@@ -98,7 +104,7 @@ class Nunjucks extends TemplateEngine {
         this.parse = function(parser, nodes, lexer) {
           var tok = parser.nextToken();
 
-          var args = parser.parseSignature(null, true);
+          var args = parser.parseSignature(true, true);
           parser.advanceAfterBlockEnd(tok.value);
 
           var body = parser.parseUntilBlocks("end" + shortcodeName);
@@ -111,7 +117,6 @@ class Nunjucks extends TemplateEngine {
           let callback = args.pop();
           let body = args.pop();
           let [context, ...argArray] = args;
-
           let ret = new nunjucksEngine.runtime.SafeString(
             shortcodeFn(body(), ...argArray)
           );

test/TemplateRenderNunjucksTest.js

@@ -80,6 +80,15 @@ test("Nunjucks Render: with Library Override", async t => {
   t.is(await fn({ name: "Zach" }), "<p>Zach</p>");
 });
 
+test("Nunjucks Shortcode without args", async t => {
+  let tr = new TemplateRender("njk", "./test/stubs/");
+  tr.engine.addShortcode("postfixWithZach", function() {
+    return "Zach";
+  });
+
+  t.is(await tr.render("{% postfixWithZach %}", {}), "Zach");
+});
+
 test("Nunjucks Shortcode", async t => {
   let tr = new TemplateRender("njk", "./test/stubs/");
   tr.engine.addShortcode("postfixWithZach", function(str) {
@@ -119,6 +128,18 @@ test("Nunjucks Paired Shortcode", async t => {
   );
 });
 
+test("Nunjucks Paired Shortcode without args", async t => {
+  let tr = new TemplateRender("njk", "./test/stubs/");
+  tr.engine.addPairedShortcode("postfixWithZach", function(content) {
+    return content + "Zach";
+  });
+
+  t.is(
+    await tr.render("{% postfixWithZach %}Content{% endpostfixWithZach %}", {}),
+    "ContentZach"
+  );
+});
+
 test("Nunjucks Paired Shortcode with Tag Inside", async t => {
   let tr = new TemplateRender("njk", "./test/stubs/");
   tr.engine.addPairedShortcode("postfixWithZach", function(content, str) {