major refactor

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.1.20"
+kotlin = "2.2.10"
 
 [plugins]
 multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -203,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -211,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,22 +59,22 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

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

@@ -1,16 +1,30 @@
 package com.infendro.cli
 
 import com.infendro.cli.argument.Argument.*
+import com.infendro.cli.command.Command
 import kotlin.reflect.KProperty
 
 class Execution(
-    val arguments: List<Argument>,
+    val commands: List<Cmd>,
+    val arguments: List<Arg>,
 ) {
-    class Argument(
+    class Cmd(
+        val name: String,
+    )
+
+    class Arg(
         val name: String,
         val value: String?,
     )
 
+    operator fun Command.Key.getValue(
+        thisRef: Any?,
+        property: KProperty<*>,
+    ): String {
+        return commands[index]
+            .name
+    }
+
     operator fun <T> Single<T>.getValue(
         thisRef: Any?,
         property: KProperty<*>,

src/commonMain/kotlin/com/infendro/cli/Main.kt

@@ -1,45 +0,0 @@
-package com.infendro.cli
-
-import com.infendro.cli.ARG.NAME
-import com.infendro.cli.ARG.B
-import com.infendro.cli.ARG.C
-import com.infendro.cli.ARG.D
-import com.infendro.cli.ARG.E
-import com.infendro.cli.ARG.F
-import com.infendro.cli.argument.*
-
-object ARG {
-    val NAME = stringOrNull("a")
-    val B = stringOrElse("b", "x")
-    val C = ints("c", min = 2, max = 3)
-    val D = strings("d")
-    val E = booleanOrElse("e", true)
-    val F = booleanOrNull("f")
-}
-
-fun main(args: Array<String>) {
-    cli {
-        val G = boolean("g")
-        arguments(NAME, B, C, D, E, F)
-
-        execute {
-            val name by NAME
-            val b by B
-            val c by C
-            val d by D
-            val e by E
-            val f by F
-            val g by G
-
-            println(g)
-        }
-    }.run(
-        arrayOf(
-            "--a=woah",
-            "--c=0",
-            "--c=0",
-//        "--f=false",
-            "--g",
-        )
-    )
-}

src/commonMain/kotlin/com/infendro/cli/argument/Argument.kt

@@ -42,4 +42,10 @@ sealed class Argument<T> {
 
         abstract val parser: Parser<T>
     }
+
+    interface Parser<T> {
+        fun parse(
+            text: String?,
+        ): T
+    }
 }

src/commonMain/kotlin/com/infendro/cli/argument/Boolean.kt

@@ -1,8 +1,8 @@
 package com.infendro.cli.argument
 
-import com.infendro.cli.Command
+import com.infendro.cli.command.Command
 
-private object BooleanParser : Parser<Boolean> {
+private object BooleanParser : Argument.Parser<Boolean> {
     override fun parse(
         text: String?,
     ): Boolean {

src/commonMain/kotlin/com/infendro/cli/argument/Int.kt

@@ -1,8 +1,8 @@
 package com.infendro.cli.argument
 
-import com.infendro.cli.Command
+import com.infendro.cli.command.Command
 
-private object IntParser : Parser<Int> {
+private object IntParser : Argument.Parser<Int> {
     override fun parse(
         text: String?,
     ): Int {

src/commonMain/kotlin/com/infendro/cli/argument/Parser.kt

@@ -1,7 +0,0 @@
-package com.infendro.cli.argument
-
-interface Parser<T> {
-    fun parse(
-        text: String?,
-    ): T
-}

src/commonMain/kotlin/com/infendro/cli/argument/String.kt

@@ -1,8 +1,8 @@
 package com.infendro.cli.argument
 
-import com.infendro.cli.Command
+import com.infendro.cli.command.Command
 
-private object StringParser : Parser<String> {
+private object StringParser : Argument.Parser<String> {
     override fun parse(
         text: String?,
     ): String {

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

@@ -1,21 +1,26 @@
-package com.infendro.cli
+package com.infendro.cli.command
 
-import com.infendro.cli.Regex.ARGUMENT
-import com.infendro.cli.Regex.ARGUMENT_NAME
-import com.infendro.cli.Regex.COMMAND_NAME
+import com.infendro.cli.Execution
 import com.infendro.cli.argument.Argument
 import com.infendro.cli.exception.build.*
 import com.infendro.cli.exception.run.ArgumentCountException
 import com.infendro.cli.exception.run.InvalidArgumentException
 import com.infendro.cli.exception.run.UnknownArgumentException
 import com.infendro.cli.exception.run.UnknownCommandException
+import com.infendro.cli.util.Regex.ARGUMENT
+import com.infendro.cli.util.Regex.ARGUMENT_NAME
+import com.infendro.cli.util.Regex.COMMAND_NAME
 
 class Command private constructor(
-    private val name: String,
+    private val index: Int,
+    private val name: String?,
     private val commands: List<Command>,
     private val arguments: List<Argument<*>>,
     private val block: Execution.() -> Unit,
 ) {
+    private val nextIndex: Int
+        get() = index + 1
+
     fun run(
         args: Array<String>,
     ) {
@@ -24,11 +29,11 @@ class Command private constructor(
             .find { (_, value) -> value.startsWith("--") }
             ?.index ?: args.size
 
-        val c = args.slice(0..<index)
-        val a = args.slice(index..<args.size)
+        val cmd = args.slice(0..<index)
+        val arg = args.slice(index..<args.size)
 
         try {
-            run(c, a)
+            run(cmd, arg)
         } catch (e: UnknownCommandException) {
             println("""unknown command "${e.command}"""")
         } catch (e: InvalidArgumentException) {
@@ -45,33 +50,35 @@ class Command private constructor(
     }
 
     private fun run(
-        cmd: List<String>, args: List<String>,
+        cmd: List<String>,
+        arg: List<String>,
     ) {
-        if (cmd.isEmpty()) {
-            val arguments = parseArguments(args)
-            execute(arguments)
+        if (index == cmd.lastIndex) {
+            Execution(
+                parseCmd(cmd),
+                parseArg(arg),
+            ).block()
         } else {
-            val command = commands.find { it.name == cmd[0] }
-                ?: throw UnknownCommandException(cmd[0])
-            command.run(cmd.drop(1), args)
+            val command = commands.firstOrNull() { it.name == cmd[nextIndex] || it.name == null }
+                ?: throw UnknownCommandException(cmd[nextIndex])
+            command.run(cmd, arg)
         }
     }
 
-    private fun execute(
-        arguments: List<Execution.Argument>,
-    ) {
-        val execution = Execution(arguments)
-        execution.block()
+    private fun parseCmd(
+        cmd: List<String>,
+    ): List<Execution.Cmd> {
+        return cmd.map { Execution.Cmd(it) }
     }
 
-    private fun parseArguments(
-        args: List<String>,
-    ): List<Execution.Argument> {
-        val result = mutableListOf<Execution.Argument>()
+    private fun parseArg(
+        arg: List<String>,
+    ): List<Execution.Arg> {
+        val result = mutableListOf<Execution.Arg>()
 
-        for (arg in args) {
-            val match = ARGUMENT.matchEntire(arg)
-                ?: throw InvalidArgumentException(arg)
+        for (argument in arg) {
+            val match = ARGUMENT.matchEntire(argument)
+                ?: throw InvalidArgumentException(argument)
 
             val name = match.groups["name"]!!.value
             val value = match.groups["value"]?.value
@@ -79,7 +86,7 @@ class Command private constructor(
             if (arguments.none { it.name == name })
                 throw UnknownArgumentException(name)
 
-            result += Execution.Argument(name, value)
+            result += Execution.Arg(name, value)
         }
 
         arguments
@@ -92,26 +99,31 @@ class Command private constructor(
         return result
     }
 
-    class Builder(
-        private val name: String = "",
+    class Builder internal constructor(
+        private val index: Int,
+        private val name: String?,
     ) {
         private val commands = mutableListOf<Command>()
         private val arguments = mutableListOf<Argument<*>>()
         private lateinit var block: Execution.() -> Unit
 
+        private val nextIndex: Int
+            get() = index + 1
+
         fun command(
-            name: String,
-            block: Builder.() -> Unit,
+            name: String? = null,
+            block: Builder.(Key) -> Unit,
         ) {
-            if (!COMMAND_NAME.matches(name))
+            if (name != null && !COMMAND_NAME.matches(name))
                 throw IllegalCommandNameException(name)
 
             if (commands.any { it.name == name })
                 throw DuplicateCommandException(name)
 
-            val builder = Builder(name)
-            builder.block()
+            val builder = Builder(nextIndex, name)
+            builder.block(Key(nextIndex))
             val command = builder.build()
+
             commands.add(command)
         }
 
@@ -148,15 +160,19 @@ class Command private constructor(
             if (!this::block.isInitialized)
                 throw NoExecuteException()
 
-            return Command(name, commands, arguments, block)
+            return Command(index, name, commands, arguments, block)
         }
     }
+
+    class Key(
+        internal val index: Int,
+    )
 }
 
 fun cli(
     block: Command.Builder.() -> Unit,
 ): Command {
-    val builder = Command.Builder()
+    val builder = Command.Builder(-1, null)
     builder.block()
     return builder.build()
 }

src/commonMain/kotlin/com/infendro/cli/exception/build/DuplicateCommandException.kt

@@ -1,5 +1,5 @@
 package com.infendro.cli.exception.build
 
 class DuplicateCommandException(
-    val command: String,
+    val command: String?,
 ) : Exception()

src/commonMain/kotlin/com/infendro/cli/util/Regex.kt

@@ -1,4 +1,4 @@
-package com.infendro.cli
+package com.infendro.cli.util
 
 internal object Regex {
     val COMMAND_NAME = """[a-z]+(?:-[a-z]+)*""".toRegex()