README.md

@@ -21,46 +21,47 @@ repositories {
 }
 
 dependencies {
-    implementation("com.infendro:cli:1.3.1")
+    implementation("com.infendro:cli:1.4.0")
 }
 ```
 
 ## Usage
 
 ```kotlin
-fun main(args: Array<String>) {
+fun main(args: Array<String>) = cli {
-    // declare root command
+    execute {
-    cli {
+        // define execution of command (e.g., display help)
+    }
+
+    // declare command "greet"
+    command("greet") {
+        // declare arguments
+        val speakersArg = Argument.strings().register()
+
+        // declare options
+        val greetingOpt = Option.stringOrElse("greeting", "greet", "g", other = "Hello").register()
+        val nameOpt = Option.stringOrNull("name", "n").register()
+
         execute {
-            // execution of root command (e.g., display help)
+            // retrieve the arguments and options
+            val speakers by speakersArg
+            val greeting by greetingOpt
+            val name by nameOpt
+
+            println("${speakers.joinToString()}: $greeting ${name ?: "World"}!")
         }
 
-        // declare command "test"
+        // declare more commands...
-        command("test") {
+    }
-            // declare arguments
-            val greetingArg = stringOrElse("greeting", "greet", "g", other = "Hello")
-            val nameArg = stringOrNull("name", "n")
 
-            execute {
+    // declare fallback command
-                // retrieve the arguments
+    command { valueCmd ->
-                val greeting by greetingArg
+        execute {
-                val name by nameArg
+            // retrieve the value used for the fallback command
+            val value by valueCmd
 
-                println("$greeting ${name ?: "World"}!")
+            println("""command "$value" executed!""")
-            }
-
-            // declare more commands...
         }
-
+    }
-        // declare wildcard command
+}.run(args)
-        command { wildcard ->
-            execute {
-                // retrieve the value used for the wildcard command
-                val value by wildcard
-
-                println("command $value executed!")
-            }
-        }
-    }.run(args)
-}
 ```

build.gradle.kts

@@ -2,7 +2,7 @@ import com.infendro.plugin.infendro
 import com.infendro.plugin.token
 
 group = "com.infendro"
-version = "1.3.1"
+version = "1.4.0"
 
 plugins {
     alias(libs.plugins.infendro)

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

@@ -10,8 +10,8 @@ import com.infendro.cli.util.Regex.OPTION
 class Command private constructor(
     val name: String?,
     val commands: List<Command>,
-    val options: List<Option<*>>,
     val arguments: List<Argument<*>>,
+    val options: List<Option<*>>,
     internal val execute: Context.() -> Unit,
 ) {
     val fallback: Boolean
@@ -97,7 +97,7 @@ class Command private constructor(
             if (!::_execute.isInitialized)
                 _execute = {}
 
-            return Command(name, commands, options, arguments, _execute)
+            return Command(name, commands, arguments, options, _execute)
         }
     }