small refactor

src/commonMain/kotlin/com/infendro/cli/command/Command.kt

@@ -1,6 +1,5 @@
 package com.infendro.cli.command
 
-import com.infendro.cli.command.Execution
 import com.infendro.cli.argument.Argument
 import com.infendro.cli.exception.build.*
 import com.infendro.cli.exception.run.ArgumentCountException
@@ -24,8 +23,7 @@ class Command private constructor(
     fun run(
         args: Array<String>,
     ) {
-        val index = args
+        val index = args.withIndex()
-            .withIndex()
             .find { (_, value) -> value.startsWith("--") }
             ?.index ?: args.size
 
@@ -89,12 +87,11 @@ class Command private constructor(
             result += Execution.Arg(name, value)
         }
 
-        arguments
+        arguments.forEach { argument ->
-            .forEach { argument ->
+            val count = result.count { it.name == argument.name }
-                val count = result.count { it.name == argument.name }
+            if (count !in argument.min..argument.max)
-                if (count !in argument.min..argument.max)
+                throw ArgumentCountException(argument.name, argument.min, argument.max)
-                    throw ArgumentCountException(argument.name, argument.min, argument.max)
+        }
-            }
 
         return result
     }
@@ -164,7 +161,7 @@ class Command private constructor(
         }
     }
 
-    class Key(
+    class Key internal constructor(
         internal val index: Int,
     )
 }

src/commonMain/kotlin/com/infendro/cli/command/Execution.kt

@@ -19,45 +19,29 @@ class Execution(
     operator fun Command.Key.getValue(
         thisRef: Any?,
         property: KProperty<*>,
-    ): String {
+    ): String = commands[index].name
-        return commands[index]
-            .name
-    }
 
     operator fun <T> Argument.Single<T>.getValue(
         thisRef: Any?,
         property: KProperty<*>,
-    ): T {
+    ): T = arguments.single { it.name == name }
-        return arguments
+        .let { parser.parse(it.value) }
-            .single { it.name == name }
-            .let { parser.parse(it.value) }
-    }
 
     operator fun <T> Argument.SingleOrElse<T>.getValue(
         thisRef: Any?,
         property: KProperty<*>,
-    ): T {
+    ): T = arguments.singleOrNull { it.name == name }
-        return arguments
+        ?.let { parser.parse(it.value) } ?: other
-            .singleOrNull { it.name == name }
-            ?.let { parser.parse(it.value) }
-            ?: other
-    }
 
     operator fun <T> Argument.SingleOrNull<T>.getValue(
         thisRef: Any?,
         property: KProperty<*>,
-    ): T? {
+    ): T? = arguments.singleOrNull { it.name == name }
-        return arguments
+        ?.let { parser.parse(it.value) }
-            .singleOrNull { it.name == name }
-            ?.let { parser.parse(it.value) }
-    }
 
     operator fun <T> Argument.Multiple<T>.getValue(
         thisRef: Any?,
         property: KProperty<*>,
-    ): List<T> {
+    ): List<T> = arguments.filter { it.name == name }
-        return arguments
+        .map { parser.parse(it.value) }
-            .filter { it.name == name }
-            .map { parser.parse(it.value) }
-    }
 }