Add <proc.context_map> tag (#109)

* add proc.context_map tag

* format fixes

* cleanup

* fix

* rename to param

Author: davight

src/main/java/com/denizenscript/denizencore/tags/core/ProcedureScriptTagBase.java

@@ -1,90 +1,90 @@
 package com.denizenscript.denizencore.tags.core;
 
-import com.denizenscript.denizencore.objects.core.DurationTag;
+import com.denizenscript.denizencore.objects.ObjectTag;
+import com.denizenscript.denizencore.objects.core.*;
 import com.denizenscript.denizencore.scripts.queues.ScriptQueue;
-import com.denizenscript.denizencore.tags.TagRunnable;
-import com.denizenscript.denizencore.objects.core.ListTag;
-import com.denizenscript.denizencore.objects.core.ScriptTag;
 import com.denizenscript.denizencore.scripts.containers.core.ProcedureScriptContainer;
-import com.denizenscript.denizencore.tags.Attribute;
-import com.denizenscript.denizencore.tags.ReplaceableTagEvent;
-import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.denizenscript.denizencore.utilities.ScriptUtilities;
-import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizencore.tags.TagManager;
+import com.denizenscript.denizencore.utilities.text.StringHolder;
+
+import java.util.Map;
 
 public class ProcedureScriptTagBase {
 
     public ProcedureScriptTagBase() {
-        TagManager.registerTagHandler(new TagRunnable.RootForm() {
-            @Override
-            public void run(ReplaceableTagEvent event) {
-                procedureTag(event);
-            }
-        }, "proc");
-    }
-
-    public void procedureTag(ReplaceableTagEvent event) {
 
         // <--[tag]
         // @attribute <proc[<procedure_script_name>]>
         // @returns ObjectTag
         // @description
         // Returns the 'determine' result of a procedure script.
         // -->
-        if (!event.matches("proc")) {
-            return;
-        }
-
-        Attribute attribute = event.getAttributes();
-        ScriptTag script;
-        String path = null;
-        if (attribute.hasParam()) {
-            if (attribute.getParam().indexOf('.') > 0) {
-                String[] split = attribute.getParam().split("\\.", 2);
+        TagManager.registerTagHandler(ObjectTag.class, ElementTag.class, "proc", (attribute, param) -> {
+            ScriptTag script;
+            String path = null;
+            if (param.asString().indexOf('.') > 0) {
+                String[] split = param.asString().split("\\.", 2);
                 path = split[1];
                 script = ScriptTag.valueOf(split[0], attribute.context);
             }
             else {
-                script = attribute.paramAsType(ScriptTag.class);
+                script = param.asType(ScriptTag.class, attribute.context);
             }
-        }
-        else {
-            Debug.echoError("Invalid procedure script tag!");
-            return;
-        }
-        if (script == null) {
-            attribute.echoError("Missing script for procedure script tag '" + attribute.getParam() + "'!");
-            return;
-        }
-        if (!(script.getContainer() instanceof ProcedureScriptContainer)) {
-            attribute.echoError("Chosen script is not a procedure script!");
-            return;
-        }
-        ListTag definitions = null;
+            if (script == null) {
+                attribute.echoError("Missing script for procedure script tag '" + param.asString() + "'!");
+                return null;
+            }
+            if (!(script.getContainer() instanceof ProcedureScriptContainer)) {
+                attribute.echoError("Chosen script is not a procedure script!");
+                return null;
+            }
+            ListTag definitions = null;
+            MapTag mappedDefinitions;
+
+            // <--[tag]
+            // @attribute <proc[<procedure_script_name>].context[<object>|...]>
+            // @returns ObjectTag
+            // @description
+            // Returns the 'determine' result of a procedure script with the given context.
+            // -->
+            if (attribute.startsWith("context", 2)) {
+                mappedDefinitions = null;
+                definitions = attribute.contextAsType(2, ListTag.class);
+                attribute.fulfill(1);
+            }
+
+            // <--[tag]
+            // @attribute <proc[<procedure_script_name>].context_map[<map>]>
+            // @returns ObjectTag
+            // @description
+            // Returns the 'determine' result of a procedure script with the given context.
+            // -->
+            else if (attribute.startsWith("context_map", 2)) {
+                mappedDefinitions = attribute.contextAsType(2, MapTag.class);
+                attribute.fulfill(1);
+            }
+            else {
+                mappedDefinitions = null;
+            }
+            ScriptQueue queue = ScriptUtilities.createAndStartQueue(script.getContainer(), path, attribute.context.getScriptEntryData(), null, (q) -> {
+                if (mappedDefinitions != null) {
+                    for (Map.Entry<StringHolder, ObjectTag> val : mappedDefinitions.entrySet()) {
+                        q.addDefinition(val.getKey().str, val.getValue());
+                    }
+                }
+                q.procedural = true;
+            }, new DurationTag(0), null, definitions, script.getContainer());
+            if (queue == null) {
+                attribute.echoError("Procedure queue start failed.");
+                return null;
+            }
+            if (queue.determinations == null || queue.determinations.isEmpty()) {
+                attribute.echoError("Procedure call did not determine any value.");
+                return null;
+            }
+            return queue.determinations.getObject(0);
+        });
 
-        // <--[tag]
-        // @attribute <proc[<procedure_script_name>].context[<object>|...]>
-        // @returns ObjectTag
-        // @description
-        // Returns the 'determine' result of a procedure script with the given context.
-        // -->
-        if (attribute.startsWith("context", 2)) {
-            definitions = attribute.contextAsType(2, ListTag.class);
-            attribute.fulfill(1);
-        }
-        ScriptQueue queue = ScriptUtilities.createAndStartQueue(script.getContainer(), path, attribute.context.getScriptEntryData(), null, (q) -> {
-            q.procedural = true;
-        }, new DurationTag(0), null, definitions, script.getContainer());
-        if (queue == null) {
-            attribute.echoError("Procedure queue start failed.");
-            return;
-        }
-        attribute.fulfill(1);
-        if (queue.determinations == null || queue.determinations.size() == 0) {
-            attribute.echoError("Procedure call did not determine any value.");
-            return;
-        }
-        event.setReplacedObject(CoreUtilities.autoAttribTyped(queue.determinations.getObject(0), attribute));
     }
 }