improve exceptions

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

@@ -7,11 +7,9 @@ import com.infendro.cli.command.context.ContextParser
 import com.infendro.cli.command.help.DefaultHelpRenderer
 import com.infendro.cli.command.help.HelpRenderer
 import com.infendro.cli.command.option.Option
-import com.infendro.cli.exception.build.*
+import com.infendro.cli.error.build.*
 import com.infendro.cli.parser.*
 import com.infendro.cli.util.Regex
-import com.infendro.cli.util.Regex.ARGUMENT
-import com.infendro.cli.util.Regex.OPTION
 import kotlin.reflect.KProperty
 
 sealed class Command private constructor(
@@ -205,15 +203,11 @@ sealed class Command private constructor(
                     argument.required && last.optional -> throw InvalidArgumentOrder()
                 }
             }
-            if (!argument.name.matches(ARGUMENT)) throw InvalidArgument(argument.name)
         }
 
         private fun validateOption(option: Option<*>) {
             for (name in option.names) {
-                when {
+                if (options.any { name in it.names }) throw DuplicateOption(name)
-                    !name.matches(OPTION) -> throw InvalidOption(name)
-                    options.any { name in it.names } -> throw DuplicateOption(name)
-                }
             }
         }
 
@@ -222,7 +216,7 @@ sealed class Command private constructor(
         }
 
         private fun validateRenderer() {
-            if (_renderer != null) throw Exception() //TODO
+            if (_renderer != null) throw DuplicateRenderer()
         }
 
         private fun validate() {

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

@@ -1,7 +1,9 @@
 package com.infendro.cli.command.argument
 
-import com.infendro.cli.exception.build.InvalidRange
+import com.infendro.cli.error.build.InvalidArgument
+import com.infendro.cli.error.build.InvalidRange
 import com.infendro.cli.parser.Parser
+import com.infendro.cli.util.Regex.ARGUMENT
 
 sealed class Argument<T : Any>(
     val parser: Parser<T>,
@@ -10,7 +12,10 @@ sealed class Argument<T : Any>(
     val max: Int?,
 ) {
     init {
-        if (min !in 0..count || max == 0) throw InvalidRange()
+        when {
+            !name.matches(ARGUMENT) -> throw InvalidArgument(name)
+            min !in 0..count || max == 0 -> throw InvalidRange()
+        }
     }
 
     val required: Boolean

src/commonMain/kotlin/com/infendro/cli/command/context/ContextParser.kt

@@ -1,7 +1,7 @@
 package com.infendro.cli.command.context
 
 import com.infendro.cli.command.Command
-import com.infendro.cli.exception.run.*
+import com.infendro.cli.error.run.*
 import com.infendro.cli.parser.Parser
 
 internal class ContextParser(
@@ -19,13 +19,13 @@ internal class ContextParser(
 
         data class Failure(
             val command: Command,
-            val error: RuntimeError,
+            val error: RunError,
         ) : Result()
     }
 
     private fun success(context: Context) = Result.Success(context)
     private fun help(command: Command) = Result.Help(command)
-    private fun failure(command: Command, exception: RuntimeError) = Result.Failure(command, exception)
+    private fun failure(command: Command, exception: RunError) = Result.Failure(command, exception)
 
     private var index = 0
     private val current: String

src/commonMain/kotlin/com/infendro/cli/command/help/DefaultHelpRenderer.kt

@@ -75,7 +75,11 @@ object DefaultHelpRenderer : HelpRenderer {
     private fun StringBuilder.commands(commands: List<Command>) {
         appendLine("Commands:")
         for (command in commands) {
-            appendLine("  * ${command.name}")
+            val name = when {
+                command is Command.Fallback<*> -> "<${command.name}>"
+                else -> command.name
+            }
+            appendLine("  * $name")
         }
     }
 

src/commonMain/kotlin/com/infendro/cli/command/option/Option.kt

@@ -1,8 +1,10 @@
 package com.infendro.cli.command.option
 
-import com.infendro.cli.exception.build.InvalidRange
+import com.infendro.cli.error.build.InvalidOption
-import com.infendro.cli.exception.build.MissingOptionName
+import com.infendro.cli.error.build.InvalidRange
+import com.infendro.cli.error.build.MissingOptionName
 import com.infendro.cli.parser.Parser
+import com.infendro.cli.util.Regex.OPTION
 
 sealed class Option<T : Any>(
     val parser: Parser<T>,
@@ -33,6 +35,7 @@ sealed class Option<T : Any>(
     init {
         when {
             names.isEmpty() -> throw MissingOptionName()
+            names.any { !it.matches(OPTION) } -> throw InvalidOption(name)
             min !in 0..count || max == 0 -> throw InvalidRange()
         }
     }

src/commonMain/kotlin/com/infendro/cli/command/option/OptionFactory.kt

@@ -8,7 +8,7 @@ object OptionFactory {
     fun long(vararg names: String) = option(LongParser, *names)
     fun float(vararg names: String) = option(FloatParser, *names)
     fun double(vararg names: String) = option(DoubleParser, *names)
-    fun boolean(vararg names: String) = option(BooleanParser, true, *names)
+    fun boolean(vararg names: String) = option(BooleanParser, fallback = true, *names)
 
     inline fun <reified T : Enum<T>> enum(vararg names: String) = option(enumParser<T>(), *names)
 }

src/commonMain/kotlin/com/infendro/cli/error/build/BuildException.kt

@@ -0,0 +1,3 @@
+package com.infendro.cli.error.build
+
+abstract class BuildException : Error()

src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateCommand.kt

@@ -0,0 +1,8 @@
+package com.infendro.cli.error.build
+
+class DuplicateCommand(
+    val command: String,
+) : BuildException() {
+    override val message: String
+        get() = """duplicate command "$command""""
+}

src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateExecute.kt

@@ -0,0 +1,6 @@
+package com.infendro.cli.error.build
+
+class DuplicateExecute : BuildException() {
+    override val message: String
+        get() = """duplicate execute block"""
+}

src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateOption.kt

@@ -0,0 +1,8 @@
+package com.infendro.cli.error.build
+
+class DuplicateOption(
+    val name: String,
+) : BuildException() {
+    override val message: String
+        get() = """duplicate option "$name""""
+}

src/commonMain/kotlin/com/infendro/cli/error/build/DuplicateRenderer.kt

@@ -0,0 +1,6 @@
+package com.infendro.cli.error.build
+
+class DuplicateRenderer : BuildException() {
+    override val message: String
+        get() = """duplicate renderer"""
+}

src/commonMain/kotlin/com/infendro/cli/error/build/InvalidArgument.kt

@@ -0,0 +1,8 @@
+package com.infendro.cli.error.build
+
+class InvalidArgument(
+    val name: String,
+) : BuildException() {
+    override val message: String
+        get() = """invalid argument name "$name""""
+}

src/commonMain/kotlin/com/infendro/cli/error/build/InvalidArgumentOrder.kt

@@ -0,0 +1,6 @@
+package com.infendro.cli.error.build
+
+class InvalidArgumentOrder : BuildException() {
+    override val message: String
+        get() = """invalid argument order"""
+}

src/commonMain/kotlin/com/infendro/cli/error/build/InvalidCommand.kt

@@ -0,0 +1,8 @@
+package com.infendro.cli.error.build
+
+class InvalidCommand(
+    val name: String,
+) : BuildException() {
+    override val message: String
+        get() = """invalid command name "$name""""
+}

src/commonMain/kotlin/com/infendro/cli/error/build/InvalidCommandOrder.kt

@@ -0,0 +1,6 @@
+package com.infendro.cli.error.build
+
+class InvalidCommandOrder : BuildException() {
+    override val message: String
+        get() = """invalid command order"""
+}

src/commonMain/kotlin/com/infendro/cli/error/build/InvalidFallback.kt

@@ -0,0 +1,6 @@
+package com.infendro.cli.error.build
+
+class InvalidFallback : BuildException() {
+    override val message: String
+        get() = """invalid fallback"""
+}

src/commonMain/kotlin/com/infendro/cli/error/build/InvalidOption.kt

@@ -0,0 +1,8 @@
+package com.infendro.cli.error.build
+
+class InvalidOption(
+    val name: String,
+) : BuildException() {
+    override val message: String
+        get() = """invalid option name "$name""""
+}

src/commonMain/kotlin/com/infendro/cli/error/build/InvalidRange.kt

@@ -0,0 +1,6 @@
+package com.infendro.cli.error.build
+
+class InvalidRange : BuildException() {
+    override val message: String
+        get() = """invalid range"""
+}

src/commonMain/kotlin/com/infendro/cli/error/build/MissingOptionName.kt

@@ -0,0 +1,6 @@
+package com.infendro.cli.error.build
+
+class MissingOptionName : BuildException() {
+    override val message: String
+        get() = """missing option name"""
+}

src/commonMain/kotlin/com/infendro/cli/error/run/InvalidArgumentCount.kt

@@ -1,11 +1,11 @@
-package com.infendro.cli.exception.run
+package com.infendro.cli.error.run
 
 import com.infendro.cli.command.argument.Argument
 
 class InvalidArgumentCount(
     val argument: Argument<*>,
     val count: Int,
-) : RuntimeError() {
+) : RunError() {
     override val message: String
         get() {
             val expected = when {

src/commonMain/kotlin/com/infendro/cli/error/run/InvalidOptionCount.kt

@@ -1,11 +1,11 @@
-package com.infendro.cli.exception.run
+package com.infendro.cli.error.run
 
 import com.infendro.cli.command.option.Option
 
 class InvalidOptionCount(
     val option: Option<*>,
     val count: Int,
-) : RuntimeError() {
+) : RunError() {
     override val message: String
         get() {
             val expected = when {

src/commonMain/kotlin/com/infendro/cli/error/run/InvalidValue.kt

@@ -1,11 +1,11 @@
-package com.infendro.cli.exception.run
+package com.infendro.cli.error.run
 
 import kotlin.reflect.KClass
 
 class InvalidValue(
     val value: String,
     val type: KClass<*>,
-) : RuntimeError() {
+) : RunError() {
     override val message: String
         get() = """"$value" cannot be converted to ${type.simpleName ?: "Unknown"}"""
 }

src/commonMain/kotlin/com/infendro/cli/error/run/MalformedOption.kt

@@ -1,8 +1,8 @@
-package com.infendro.cli.exception.run
+package com.infendro.cli.error.run
 
 class MalformedOption(
     val option: String,
-) : RuntimeError() {
+) : RunError() {
     override val message: String
         get() = """malformed option "$option""""
 }

src/commonMain/kotlin/com/infendro/cli/error/run/MissingOptionValue.kt

@@ -1,10 +1,10 @@
-package com.infendro.cli.exception.run
+package com.infendro.cli.error.run
 
 import com.infendro.cli.command.option.Option
 
 class MissingOptionValue(
     val option: Option<*>,
-) : RuntimeError() {
+) : RunError() {
     override val message: String
         get() = """no value provided for option "${option.name}""""
 }

src/commonMain/kotlin/com/infendro/cli/error/run/RunError.kt

@@ -0,0 +1,5 @@
+package com.infendro.cli.error.run
+
+abstract class RunError {
+    abstract val message: String
+}

src/commonMain/kotlin/com/infendro/cli/error/run/UnexpectedArgument.kt

@@ -0,0 +1,6 @@
+package com.infendro.cli.error.run
+
+class UnexpectedArgument : RunError() {
+    override val message: String
+        get() = """unexpected argument"""
+}

src/commonMain/kotlin/com/infendro/cli/error/run/UnknownCommand.kt

@@ -1,8 +1,8 @@
-package com.infendro.cli.exception.run
+package com.infendro.cli.error.run
 
 class UnknownCommand(
     val command: String,
-) : RuntimeError() {
+) : RunError() {
     override val message: String
         get() = """unknown command "$command""""
 }

src/commonMain/kotlin/com/infendro/cli/error/run/UnknownOption.kt

@@ -1,8 +1,8 @@
-package com.infendro.cli.exception.run
+package com.infendro.cli.error.run
 
 class UnknownOption(
     val option: String,
-) : RuntimeError() {
+) : RunError() {
     override val message: String
         get() = """unknown option "$option""""
 }

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

@@ -1,3 +0,0 @@
-package com.infendro.cli.exception.build
-
-abstract class CliException : Exception()

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

@@ -1,5 +0,0 @@
-package com.infendro.cli.exception.build
-
-class DuplicateCommand(
-    val command: String,
-) : CliException()

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

@@ -1,3 +0,0 @@
-package com.infendro.cli.exception.build
-
-class DuplicateExecute : CliException()

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

@@ -1,5 +0,0 @@
-package com.infendro.cli.exception.build
-
-class DuplicateOption(
-    val name: String,
-) : CliException()

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

@@ -1,5 +0,0 @@
-package com.infendro.cli.exception.build
-
-class InvalidArgument(
-    val name: String,
-) : CliException()

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

@@ -1,3 +0,0 @@
-package com.infendro.cli.exception.build
-
-class InvalidArgumentOrder : CliException()

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

@@ -1,5 +0,0 @@
-package com.infendro.cli.exception.build
-
-class InvalidCommand(
-    val name: String,
-) : CliException()

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

@@ -1,3 +0,0 @@
-package com.infendro.cli.exception.build
-
-class InvalidCommandOrder : CliException()

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

@@ -1,3 +0,0 @@
-package com.infendro.cli.exception.build
-
-class InvalidFallback : CliException()

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

@@ -1,5 +0,0 @@
-package com.infendro.cli.exception.build
-
-class InvalidOption(
-    val name: String,
-) : CliException()

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

@@ -1,3 +0,0 @@
-package com.infendro.cli.exception.build
-
-class InvalidRange : CliException()

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

@@ -1,3 +0,0 @@
-package com.infendro.cli.exception.build
-
-class MissingOptionName : CliException()

src/commonMain/kotlin/com/infendro/cli/exception/run/RuntimeError.kt

@@ -1,5 +0,0 @@
-package com.infendro.cli.exception.run
-
-abstract class RuntimeError {
-    abstract val message: String
-}

src/commonMain/kotlin/com/infendro/cli/exception/run/UnexpectedArgument.kt

@@ -1,6 +0,0 @@
-package com.infendro.cli.exception.run
-
-class UnexpectedArgument : RuntimeError() {
-    override val message: String
-        get() = """unexpected argument"""
-}

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

@@ -1,7 +1,7 @@
 package com.infendro.cli.parser
 
-import com.infendro.cli.exception.run.InvalidValue
+import com.infendro.cli.error.run.InvalidValue
-import com.infendro.cli.exception.run.RuntimeError
+import com.infendro.cli.error.run.RunError
 import kotlin.reflect.KClass
 
 abstract class Parser<T : Any>(
@@ -13,7 +13,7 @@ abstract class Parser<T : Any>(
         ) : Result<T>()
 
         data class Failure<T : Any>(
-            val error: RuntimeError,
+            val error: RunError,
         ) : Result<T>()
     }