implement optional variable argument/option ranges, refactor exception handling

adapt required/optional argument handling
implement bounded/unbounded variable argument handling
This commit is contained in:
2026-01-06 22:47:21 +01:00
parent 8e491751f5
commit 4e9b358ef8
49 changed files with 315 additions and 231 deletions

View File

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

View File

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

View File

@@ -0,0 +1,5 @@
package com.infendro.cli.exception.build
import com.infendro.cli.exception.CliException
abstract class BuildException : CliException()

View File

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

View File

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

View File

@@ -1,3 +1,3 @@
package com.infendro.cli.exception.build
class CommandOrderException : Exception()
class DuplicateExecute : BuildException()

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,8 +0,0 @@
package com.infendro.cli.exception.run
class DuplicateOptionException(
val option: String,
) : CliException() {
override val message: String
get() = """duplicate option "$option""""
}

View File

@@ -1,5 +0,0 @@
package com.infendro.cli.exception.run
class ExecuteException(
override val message: String,
) : CliException()

View File

@@ -0,0 +1,18 @@
package com.infendro.cli.exception.run
import com.infendro.cli.command.Argument
class InvalidArgumentCount(
val argument: Argument<*>,
val count: Int,
) : RunException() {
override val message: String
get() {
val expected = when {
argument.min == argument.max -> "${argument.min}"
argument.unbounded -> "at least ${argument.min}"
else -> "${argument.min} to ${argument.max}"
}
return """invalid number of values for argument "${argument.name}": expected $expected but found $count"""
}
}

View File

@@ -0,0 +1,18 @@
package com.infendro.cli.exception.run
import com.infendro.cli.command.Option
class InvalidOptionCount(
val option: Option<*>,
val count: Int,
) : RunException() {
override val message: String
get() {
val expected = when {
option.min == option.max -> "${option.min}"
option.unbounded -> "at least ${option.min}"
else -> "${option.min} to ${option.max}"
}
return """invalid number of values passed for option "${option.name}": expected $expected but found $count"""
}
}

View File

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

View File

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

View File

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

View File

@@ -1,8 +0,0 @@
package com.infendro.cli.exception.run
class MissingOptionException(
val option: String,
) : CliException() {
override val message: String
get() = """missing option "$option""""
}

View File

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

View File

@@ -1,8 +0,0 @@
package com.infendro.cli.exception.run
class MissingOptionValueException(
val option: String,
) : CliException() {
override val message: String
get() = """no value provided for option "$option""""
}

View File

@@ -1,9 +0,0 @@
package com.infendro.cli.exception.run
class ParseException(
val text: String?,
val type: String,
) : CliException() {
override val message: String
get() = """"$text" cannot be converted to $type"""
}

View File

@@ -0,0 +1,5 @@
package com.infendro.cli.exception.run
import com.infendro.cli.exception.CliException
abstract class RunException : CliException()

View File

@@ -1,6 +0,0 @@
package com.infendro.cli.exception.run
class TooManyArgumentsException : CliException() {
override val message: String
get() = """too many arguments"""
}

View File

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

View File

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

View File

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