parse arguments in a way valid for invocable

Author: burdoto

src/main/java/org/comroid/commands/impl/CommandManager.java

@@ -10,7 +10,6 @@
 import org.comroid.api.Polyfill;
 import org.comroid.api.attr.Aliased;
 import org.comroid.api.data.seri.adp.JSON;
-import org.comroid.api.data.seri.type.ValueType;
 import org.comroid.api.func.util.Invocable;
 import org.comroid.api.java.Activator;
 import org.comroid.api.java.ReflectionHelper;
@@ -37,14 +36,11 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -188,28 +184,26 @@ public final Stream<AutoFillOption> autoComplete(
 
             validatePermitted(usage, call);
 
-            // sort arguments
-            var parameters = call.getParameters();
-            var paramIndex = new int[]{ 0 };
-
-            // decide arg handling type
-            var argStringSource = (hasCapability(CommandCapability.NAMED_ARGS)
-                                   ? (Function<String, Stream<org.comroid.commands.node.Parameter>>) key -> parameters.stream()
-                    .filter(p -> p.getName().equals(key))
-                                   : (Function<String, Stream<org.comroid.commands.node.Parameter>>) $ -> parameters.stream()
-                                           .sorted(Comparator.comparingInt(org.comroid.commands.node.Parameter::getIndex))
-                                           .skip(paramIndex[0])).andThen(src -> src.map(usage.getArgumentStrings()::get));
-
-            // parse args
-            var useArgs = parameters.stream().map(param -> {
-                var vt = ValueType.of(param.getParam().getType());
-                return argStringSource.apply(param.getName())
-                        .filter(Objects::nonNull)
-                        .findAny()
-                        .map(vt::parse)
-                        .or(() -> usage.getContext().stream().filter(vt.getTargetClass()::isInstance).findAny())
-                        .orElse(null);
-            }).toArray();
+            var adapters = call.adaptParameters();
+            var useArgs  = new Object[adapters.length];
+
+            for (var i = 0; i < adapters.length; i++) {
+                var adapter          = adapters[i];
+                var commandParameter = adapter.commandParameter();
+
+                if (commandParameter != null) {
+                    // parse user argument
+                    var str = usage.getArgumentStrings().get(commandParameter);
+                    useArgs[i] = adapter.type().parse(str);
+                } else {
+                    // find contextual argument
+                    useArgs[i] = usage.getContext()
+                            .stream()
+                            .filter(adapter.type().getTargetClass()::isInstance)
+                            .findAny()
+                            .orElse(null);
+                }
+            }
 
             // execute method
             result = response = call.getCallable().invoke(call.getTarget(), useArgs);

src/main/java/org/comroid/commands/node/Call.java

@@ -3,6 +3,7 @@
 import lombok.Singular;
 import lombok.Value;
 import lombok.experimental.SuperBuilder;
+import org.comroid.api.data.seri.type.ValueType;
 import org.comroid.api.func.ext.Wrap;
 import org.comroid.api.func.util.Invocable;
 import org.jetbrains.annotations.NotNull;
@@ -27,7 +28,7 @@ public String getAlternateName() {
     }
 
     @Override
-    public @Nullable org.comroid.commands.node.Call asCall() {
+    public org.comroid.commands.node.Call asCall() {
         return this;
     }
 
@@ -40,4 +41,22 @@ public Stream<Parameter> nodes() {
     public Wrap<AnnotatedElement> element() {
         return callable::accessor;
     }
+
+    public ParameterAdapter[] adaptParameters() {
+        var javaParameters = method.getParameters();
+        var adapters       = new ParameterAdapter[javaParameters.length];
+
+        for (var i = 0; i < javaParameters.length; i++) {
+            var javaParam      = javaParameters[i];
+            var cmdParamResult = parameters.stream().filter(p -> p.getParam().equals(javaParam)).findAny();
+            adapters[i] = new ParameterAdapter(ValueType.of(javaParam.getType()),
+                    javaParam,
+                    cmdParamResult.orElse(null));
+        }
+        return adapters;
+    }
+
+    public record ParameterAdapter(
+            ValueType<?> type, java.lang.reflect.Parameter javaParameter, @Nullable Parameter commandParameter
+    ) {}
 }