precompile / embedded requires helper registration fix #527

Author: jknack

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

@@ -17,14 +17,14 @@
  */
 package com.github.jknack.handlebars.helper;
 
+import com.github.jknack.handlebars.io.TemplateSource;
 import static org.apache.commons.lang3.Validate.notEmpty;
 
 import java.io.IOException;
 
 import com.github.jknack.handlebars.Handlebars;
 import com.github.jknack.handlebars.Helper;
 import com.github.jknack.handlebars.Options;
-import com.github.jknack.handlebars.Template;
 
 /**
  * Given:
@@ -96,11 +96,11 @@ public Object apply(final String path, final Options options)
     String suffix = options.handlebars.getLoader().getSuffix();
     String defaultId = (path + suffix).replace('/', '-').replace('.', '-');
     String id = options.param(0, defaultId);
-    Template template = options.handlebars.compile(path);
+    TemplateSource source = options.handlebars.getLoader().sourceAt(path);
     StringBuilder script = new StringBuilder();
     script.append("<script id=\"").append(id)
         .append("\" type=\"text/x-handlebars\">\n");
-    script.append(template.text()).append("\n");
+    script.append(source.content(options.handlebars.getCharset())).append("\n");
     script.append("</script>");
     return new Handlebars.SafeString(script);
   }

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

@@ -17,6 +17,8 @@
  */
 package com.github.jknack.handlebars.helper;
 
+import com.github.jknack.handlebars.internal.JSEngine;
+import com.github.jknack.handlebars.io.TemplateSource;
 import static org.apache.commons.lang3.Validate.notEmpty;
 import static org.apache.commons.lang3.Validate.notNull;
 
@@ -27,7 +29,6 @@
 import com.github.jknack.handlebars.Handlebars;
 import com.github.jknack.handlebars.Helper;
 import com.github.jknack.handlebars.Options;
-import com.github.jknack.handlebars.Template;
 
 /**
  * Precompile a template to JavaScript using handlebars.js.
@@ -194,8 +195,10 @@ public Object apply(final String path, final Options options)
     if (wrapper == JsWrapper.AMD) {
       name += handlebars.getLoader().getSuffix();
     }
-    Template template = handlebars.compile(path);
-    String precompiled = template.toJavaScript();
+    TemplateSource source = handlebars.getLoader().sourceAt(path);
+    String precompiled = JSEngine.RHINO
+        .toJavaScript(handlebars.handlebarsJsFile(), source.filename(),
+            source.content(handlebars.getCharset()));
     return new Handlebars.SafeString(wrapper.wrap(name, precompiled));
   }
 

handlebars/src/main/java/com/github/jknack/handlebars/internal/JSEngine.java

@@ -34,23 +34,28 @@
  * @author edgar
  *
  */
-enum JSEngine {
+public enum JSEngine {
 
   /**
    * The default JS Engine.
    */
   RHINO {
     @Override
     public String toJavaScript(final String hbslocation, final Template template) {
+      return toJavaScript(hbslocation, template.filename(), template.text());
+    }
+
+    @Override public String toJavaScript(final String hbslocation, final String filename,
+        final String template) {
       Context ctx = null;
       try {
         ctx = newContext();
 
         Scriptable scope = newScope(hbslocation, ctx);
-        scope.put("template", scope, template.text());
+        scope.put("template", scope, template);
 
         String js = "Handlebars.precompile(template);";
-        Object precompiled = ctx.evaluateString(scope, js, template.toString(), 1,
+        Object precompiled = ctx.evaluateString(scope, js, filename, 1,
             null);
 
         return (String) precompiled;
@@ -127,4 +132,15 @@ private String handlebarsScript(final String location) {
    * @return A pre-compiled JavaScript version of this template.
    */
   public abstract String toJavaScript(String hbslocation, Template template);
+
+  /**
+   * Convert a template text to JavaScript template (a.k.a precompiled template). Compilation is
+   * done by handlebars.js and a JS Engine (usually Rhino).
+   *
+   * @param hbslocation Location of the handlebars.js file.
+   * @param filename Template file name.
+   * @param template The template to convert.
+   * @return A pre-compiled JavaScript version of this template.
+   */
+  public abstract String toJavaScript(String hbslocation, String filename, String template);
 }

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

@@ -0,0 +1,32 @@
+package com.github.jknack.handlebars.issues;
+
+import com.github.jknack.handlebars.v4Test;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class Issue527 extends v4Test {
+
+  @Test
+  public void precompileShouldNotCompileTemplate() throws Exception {
+    shouldCompileTo("{{precompile \"client_side\"}}",
+        $("partials", $("client_side", "{{myhelper \"something\"}}")),
+        "(function() {\n"
+            + "  var template = Handlebars.template({\"compiler\":[7,\">= 4.0.0\"],\"main\":function(container,depth0,helpers,partials,data) {\n"
+            + "    return container.escapeExpression((helpers.myhelper || (depth0 && depth0.myhelper) || helpers.helperMissing).call(depth0 != null ? depth0 : {},\"something\",{\"name\":\"myhelper\",\"hash\":{},\"data\":data}));\n"
+            + "},\"useData\":true});\n"
+            + "  var templates = Handlebars.templates = Handlebars.templates || {};\n"
+            + "  templates['client_side'] = template;\n"
+            + "  var partials = Handlebars.partials = Handlebars.partials || {};\n"
+            + "  partials['client_side'] = template;\n"
+            + "})();");
+  }
+
+  @Test
+  public void embeddedShouldNotCompileTemplate() throws Exception {
+    shouldCompileTo("{{embedded \"client_side\"}}",
+        $("partials", $("client_side", "{{myhelper \"something\"}}")),
+        "<script id=\"client_side-hbs\" type=\"text/x-handlebars\">\n"
+            + "{{myhelper \"something\"}}\n"
+            + "</script>");
+  }
+}