Implement .collectWithParameters() and .collectAllParameters()

handlebars/src/main/java/com/github/jknack/handlebars/Template.java

@@ -17,6 +17,9 @@
  */
 package com.github.jknack.handlebars;
 
+import com.github.jknack.handlebars.internal.Param;
+import com.github.jknack.handlebars.internal.TagWithParams;
+
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Collections;
@@ -102,10 +105,18 @@ public List<String> collect(final TagType... tagType) {
       return Collections.emptyList();
     }
 
+    @Override
+    public List<TagWithParams> collectWithParameters(final TagType... tagType) {
+      return Collections.emptyList();
+    }
+
     @Override
     public List<String> collectReferenceParameters() {
       return Collections.emptyList();
     }
+
+    @Override
+    public List<Param> collectAllParameters() { return Collections.emptyList(); }
   };
 
   /**
@@ -204,6 +215,33 @@ public List<String> collectReferenceParameters() {
    */
   List<String> collect(TagType... tagType);
 
+  /**
+   * Collect all the tag names under the given tagType and their parameters.
+   * <p>
+   * Usage:
+   * </p>
+   *
+   * <pre>
+   * {{hello}}
+   * {{var 1}}
+   * {{{tripleVar}}}
+   * </pre>
+   * <p>
+   * <code>collectWithParameters(TagType.VAR)</code> returns <code>[TagWithParams(hello, [], TagType.VAR), TagWithParams(var, [1], TagType.VAR)]</code>
+   * </p>
+   * <p>
+   * <code>collect(TagType.TRIPLE_VAR)</code> returns <code>[TagWithParams(tripleVar, [], TagType.TRIPLE_VAR)]</code>
+   * </p>
+   * <p>
+   * <code>collect(TagType.VAR, TagType.TRIPLE_VAR)</code> returns
+   * <code>[TagWithParams(hello, [], TagType.VAR), TagWithParams(var, [1], TagType.VAR), TagWithParams(tripleVar, [], TagType.TRIPLE_VAR)]</code>
+   * </p>
+   *
+   * @param tagType The tag type. Required.
+   * @return A list of TagWithParams.
+   */
+  List<TagWithParams> collectWithParameters(TagType... tagType);
+
   /**
    * Collects all the parameters which are also variables.
    * <p>
@@ -222,6 +260,24 @@ public List<String> collectReferenceParameters() {
    */
   List<String> collectReferenceParameters();
 
+  /**
+   * Collects all the parameters.
+   * <p>
+   * Usage:
+   * </p>
+   *
+   * <pre>
+   * {{#if v1}}{{/if}}
+   * {{#each v2 "test"}}{{/each}}
+   * </pre>
+   * <p>
+   * <code>collectAllParameters()</code> returns <code>[v1, v2]</code>
+   * </p>
+   *
+   * @return A list of Param.
+   */
+  List<Param> collectAllParameters();
+
   /**
    * @return The template file's name.
    */

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

@@ -349,6 +349,16 @@ public List<String> collect(final TagType... tagType) {
     return new ArrayList<>(tagNames);
   }
 
+  @Override
+  public List<TagWithParams> collectWithParameters(final TagType... tagType) {
+    isTrue(tagType.length > 0, "At least one tag type is required.");
+    List<TagWithParams> tagsWithParams = new ArrayList<>();
+    for (TagType tt : tagType) {
+      collectWithParameters(tagsWithParams, tt);
+    }
+    return new ArrayList<>(tagsWithParams);
+  }
+
   /**
    * Child classes might want to check if they apply to the tagtype and append them self to the
    * result list.
@@ -359,19 +369,39 @@ public List<String> collect(final TagType... tagType) {
   protected void collect(final Collection<String> result, final TagType tagType) {
   }
 
+  /**
+   * @param result The result list of TagWithParams.
+   * @param tagType The matching tagtype.
+   */
+  protected void collectWithParameters(final Collection<TagWithParams> result, final TagType tagType) {
+  }
+
   @Override
   public List<String> collectReferenceParameters() {
     Set<String> paramNames = new LinkedHashSet<>();
     collectReferenceParameters(paramNames);
     return new ArrayList<>(paramNames);
   }
 
+  @Override
+  public List<Param> collectAllParameters() {
+    Set<Param> params = new LinkedHashSet<>();
+    collectAllParameters(params);
+    return new ArrayList<>(params);
+  }
+
   /**
    * @param result The result list to add new parameters to.
    */
   protected void collectReferenceParameters(final Collection<String> result) {
   }
 
+  /**
+   * @param result The result list of Params to add new Params to.
+   */
+  protected void collectAllParameters(final Collection<Param> result) {
+  }
+
   @Override
   public String toJavaScript() {
       if (javaScript == null) {

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

@@ -387,6 +387,17 @@ public List<String> collect(final TagType... tagType) {
     return new ArrayList<>(tagNames);
   }
 
+  @Override
+  public List<TagWithParams> collectWithParameters(final TagType... tagType) {
+    List<TagWithParams> tagNames = new ArrayList<TagWithParams>();
+    if (body != null) {
+      tagNames.addAll(body.collectWithParameters(tagType));
+    }
+    tagNames.addAll(inverse.collectWithParameters(tagType));
+    tagNames.addAll(super.collectWithParameters(tagType));
+    return new ArrayList<TagWithParams>(tagNames);
+  }
+
   @Override
   protected void collect(final Collection<String> result, final TagType tagType) {
     if (tagType == this.tagType) {
@@ -395,6 +406,14 @@ protected void collect(final Collection<String> result, final TagType tagType) {
     super.collect(result, tagType);
   }
 
+  @Override
+  protected void collectWithParameters(final Collection<TagWithParams> result, final TagType tagType) {
+    if (tagType == this.tagType) {
+      result.add(new TagWithParams(name, collectAllParameters(), tagType));
+    }
+    super.collectWithParameters(result, tagType);
+  }
+
   @Override
   public List<String> collectReferenceParameters() {
     Set<String> paramNames = new LinkedHashSet<>();
@@ -405,4 +424,15 @@ public List<String> collectReferenceParameters() {
     paramNames.addAll(super.collectReferenceParameters());
     return new ArrayList<>(paramNames);
   }
+
+  @Override
+  public List<Param> collectAllParameters() {
+    Set<Param> paramNames = new LinkedHashSet<>();
+    if (body != null) {
+      paramNames.addAll(body.collectAllParameters());
+    }
+    paramNames.addAll(inverse.collectAllParameters());
+    paramNames.addAll(super.collectAllParameters());
+    return new ArrayList<>(paramNames);
+  }
 }

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

@@ -188,6 +188,16 @@ public List<String> collect(final TagType... tagType) {
     return template.collect(tagType);
   }
 
+  @Override
+  public List<Param> collectAllParameters() {
+    return template.collectAllParameters();
+  }
+
+  @Override
+  public List<TagWithParams> collectWithParameters(final TagType... tagType) {
+    return template.collectWithParameters(tagType);
+  }
+
   @Override
   public List<String> collectReferenceParameters() {
     return template.collectReferenceParameters();

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

@@ -263,6 +263,15 @@ protected void collect(final Collection<String> result, final TagType tagType) {
     }
   }
 
+  @Override
+  protected void collectWithParameters(final Collection<TagWithParams> result, final TagType tagType) {
+    for (Object param : this.params) {
+      if (param instanceof VarParam) {
+        ((VarParam) param).fn.collectWithParameters(result, tagType);
+      }
+    }
+  }
+
   @Override
   protected void collectReferenceParameters(final Collection<String> result) {
     for (Object param : params) {
@@ -279,4 +288,16 @@ protected void collectReferenceParameters(final Collection<String> result) {
     }
   }
 
+  @Override
+  protected void collectAllParameters(final Collection<Param> result) {
+    for (Param param : params) {
+      if (param instanceof VarParam) {
+        ((VarParam) param).fn.collectAllParameters(result);
+      } else {
+        result.add(param);
+      }
+    }
+    result.addAll(hash.values());
+  }
+
 }

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

@@ -0,0 +1,24 @@
+package com.github.jknack.handlebars.internal;
+import com.github.jknack.handlebars.TagType;
+
+import java.util.List;
+
+public class TagWithParams {
+    private String tag;
+    private List<Param> params;
+    private TagType tagType;
+
+    TagWithParams(String tag, List<Param> params, TagType tagType) {
+        this.tag = tag;
+        this.params = params;
+        this.tagType = tagType;
+    }
+
+    public String getTag() {
+        return tag;
+    }
+    public List<Param> getParams() {
+        return params;
+    }
+    public TagType getTagType() { return tagType; }
+}

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

@@ -133,6 +133,15 @@ public List<String> collect(final TagType... tagType) {
     return new ArrayList<>(tagNames);
   }
 
+  @Override
+  public List<TagWithParams> collectWithParameters(final TagType... tagType) {
+    List<TagWithParams> tagNames = new ArrayList<>();
+    for (Template node : nodes) {
+      tagNames.addAll(node.collectWithParameters(tagType));
+    }
+    return new ArrayList<>(tagNames);
+  }
+
   @Override
   public List<String> collectReferenceParameters() {
     Set<String> paramNames = new LinkedHashSet<>();
@@ -142,6 +151,15 @@ public List<String> collectReferenceParameters() {
     return new ArrayList<>(paramNames);
   }
 
+  @Override
+  public List<Param> collectAllParameters() {
+    List<Param> paramNames = new ArrayList<>();
+    for (Template node : nodes) {
+      paramNames.addAll(node.collectAllParameters());
+    }
+    return new ArrayList<>(paramNames);
+  }
+
   @Override
   public String toString() {
     return nodes.toString();

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

@@ -230,6 +230,14 @@ protected void collect(final Collection<String> result, final TagType tagType) {
     super.collect(result, tagType);
   }
 
+  @Override
+  protected void collectWithParameters(final Collection<TagWithParams> result, final TagType tagType) {
+    if (this.type == tagType) {
+      result.add(new TagWithParams(name, collectAllParameters(), tagType));
+    }
+    super.collectWithParameters(result, tagType);
+  }
+
   /**
    * Format and escape a var (if need it).
    *