AMD precompile resolves partials inconsistent with Java implementation fix #550

Author: jknack

handlebars-maven-plugin/src/test/resources/issue234.expected.js

@@ -6,9 +6,9 @@ define('a.hbs', ['handlebars'], function(Handlebars) {
     + "!";
 },"useData":true});
   var templates = Handlebars.templates = Handlebars.templates || {};
-  templates['a.hbs'] = template;
+  templates['a'] = template;
   var partials = Handlebars.partials = Handlebars.partials || {};
-  partials['a.hbs'] = template;
+  partials['a'] = template;
   return template;
 });
 
@@ -20,9 +20,9 @@ define('c.hbs', ['handlebars'], function(Handlebars) {
     + "!";
 },"useData":true});
   var templates = Handlebars.templates = Handlebars.templates || {};
-  templates['c.hbs'] = template;
+  templates['c'] = template;
   var partials = Handlebars.partials = Handlebars.partials || {};
-  partials['c.hbs'] = template;
+  partials['c'] = template;
   return template;
 });
 

handlebars/src/main/java/com/github/jknack/handlebars/helper/PrecompileHelper.java

@@ -74,6 +74,12 @@ public void tail(final StringBuilder buffer) {
         buffer.append("  return template;\n");
         buffer.append("});");
       }
+
+      @Override public void registerTemplate(final StringBuilder buffer, final String name,
+          final String function) {
+        String templateName = name.substring(0, name.lastIndexOf('.'));
+        super.registerTemplate(buffer, templateName, function);
+      }
     },
 
     /**
@@ -114,7 +120,7 @@ public void tail(final StringBuilder buffer) {
     public void registerTemplate(final StringBuilder buffer, final String name,
         final String function) {
       buffer.append("\n  var template = Handlebars.template(").append(function).append(");\n");
-      String[] namespaces = {"templates", "partials" };
+      String[] namespaces = {"templates", "partials"};
       String separator = ";\n";
       for (String namespace : namespaces) {
         buffer.append("  var ").append(namespace).append(" = Handlebars.").append(namespace)
@@ -137,7 +143,7 @@ public CharSequence wrap(final String name, final String function) {
       registerTemplate(buffer, name, function);
       tail(buffer);
       return buffer;
-    };
+    }
 
     /**
      * Find the a wrap strategy.

handlebars/src/test/java/com/github/jknack/handlebars/issues/Issue550.java

@@ -0,0 +1,49 @@
+package com.github.jknack.handlebars.issues;
+
+import com.github.jknack.handlebars.v4Test;
+import org.junit.Test;
+
+import java.io.IOException;
+
+public class Issue550 extends v4Test {
+  @Test
+  public void precompileAMDShouldNotAddSuffixToTemplatePartialHash() throws IOException {
+    shouldCompileTo("{{precompile 'foo' wrapper='amd'}}{{precompile 'bar' wrapper='amd'}}",
+        $("partials", $(
+            "foo", "<div>Some repeated pattern {{#each listItem}} {{> bar}} {{/each}} </div>",
+            "bar", "<div>{{text}}</div>")),
+        "define('foo.hbs', ['handlebars'], function(Handlebars) {\n"
+            + "  var template = Handlebars.template({\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n"
+            + "    var stack1;\n"
+            + "\n"
+            + "  return \"<div>Some repeated pattern \"\n"
+            + "    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.listItem : depth0),{\"name\":\"each\",\"hash\":{},\"fn\":container.program(1, data, 0),\"inverse\":container.noop,\"data\":data})) != null ? stack1 : \"\")\n"
+            + "    + \" </div>\";\n"
+            + "},\"1\":function(container,depth0,helpers,partials,data) {\n"
+            + "    var stack1;\n"
+            + "\n"
+            + "  return \" \"\n"
+            + "    + ((stack1 = container.invokePartial(partials.bar,depth0,{\"name\":\"bar\",\"data\":data,\"helpers\":helpers,\"partials\":partials,\"decorators\":container.decorators})) != null ? stack1 : \"\")\n"
+            + "    + \" \";\n"
+            + "},\"usePartial\":true,\"useData\":true});\n"
+            + "  var templates = Handlebars.templates = Handlebars.templates || {};\n"
+            + "  templates['foo'] = template;\n"
+            + "  var partials = Handlebars.partials = Handlebars.partials || {};\n"
+            + "  partials['foo'] = template;\n"
+            + "  return template;\n"
+            + "});define('bar.hbs', ['handlebars'], function(Handlebars) {\n"
+            + "  var template = Handlebars.template({\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n"
+            + "    var helper;\n"
+            + "\n"
+            + "  return \"<div>\"\n"
+            + "    + container.escapeExpression(((helper = (helper = helpers.text || (depth0 != null ? depth0.text : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === \"function\" ? helper.call(depth0 != null ? depth0 : {},{\"name\":\"text\",\"hash\":{},\"data\":data}) : helper)))\n"
+            + "    + \"</div>\";\n"
+            + "},\"useData\":true});\n"
+            + "  var templates = Handlebars.templates = Handlebars.templates || {};\n"
+            + "  templates['bar'] = template;\n"
+            + "  var partials = Handlebars.partials = Handlebars.partials || {};\n"
+            + "  partials['bar'] = template;\n"
+            + "  return template;\n"
+            + "});");
+  }
+}

handlebars/src/test/resources/amd.precompiled.js

@@ -5,8 +5,8 @@ define('input.hbs', ['handlebars'], function(Handlebars) {
     + "!";
 },"useData":true});
   var templates = Handlebars.templates = Handlebars.templates || {};
-  templates['input.hbs'] = template;
+  templates['input'] = template;
   var partials = Handlebars.partials = Handlebars.partials || {};
-  partials['input.hbs'] = template;
+  partials['input'] = template;
   return template;
 });