Merge pull request #5934 from Baaaaaz/feature/5906-new-json-html-functions

json.toHtmlTable function

Author: cwisniew

src/main/java/net/rptools/maptool/client/functions/json/JSONMacroFunctions.java

@@ -57,6 +57,9 @@ public class JSONMacroFunctions extends AbstractFunction {
   /** Class used for Json Object related functions */
   private final JsonObjectFunctions jsonObjectFunctions;
 
+  /** Class used for Json Html related functions */
+  private final JsonHtmlFunctions jsonHtmlFunctions;
+
   /** The default delimiter to use for MT String lists. */
   private static final String DEFAULT_STRING_LIST_DELIM = ",";
 
@@ -134,11 +137,13 @@ private JSONMacroFunctions() {
         "json.isSubset",
         "json.removeFirst",
         "json.rolls",
-        "json.objrolls");
+        "json.objrolls",
+        "json.toHtmlTable");
 
     typeConversion = new JsonMTSTypeConversion();
     jsonArrayFunctions = new JsonArrayFunctions(typeConversion);
     jsonObjectFunctions = new JsonObjectFunctions(typeConversion);
+    jsonHtmlFunctions = new JsonHtmlFunctions(typeConversion);
   }
 
   @Override
@@ -528,6 +533,24 @@ public Object childEvaluate(
             return jsonObjRolls(names, stats, rollString);
           }
         }
+      case "json.toHtmlTable":
+        {
+          FunctionUtil.experimentalWarning(parser, resolver, functionName);
+          FunctionUtil.checkNumberParam(functionName, args, 1, 2);
+
+          FunctionUtil.blockUntrustedMacro(functionName);
+          JsonElement json = FunctionUtil.paramConvertedToJson(functionName, args, 0);
+
+          // 2nd arg options, 3rd arg options delimiter
+          JsonObject options = new JsonObject();
+          if (args.size() > 1) {
+            options =
+                FunctionUtil.jsonWithLowerCaseKeys(
+                    FunctionUtil.paramAsJsonObject(functionName, args, 1));
+          }
+
+          return jsonHtmlFunctions.jsonToHtmlTable(functionName, json, options);
+        }
     }
     throw new ParserException(I18N.getText("macro.function.general.unknownFunction", functionName));
   }