Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Run tests
run: ./mill -i __.publishArtifacts + __.test
run: ./mill -i -k __.publishArtifacts + __.test
check-binary-compatibility:
runs-on: ubuntu-latest
steps:
Expand All @@ -38,7 +38,7 @@ jobs:
distribution: 'temurin'
java-version: 8
- name: Check Binary Compatibility
run: ./mill -i __.mimaReportBinaryIssues
run: ./mill -i -k __.mimaReportBinaryIssues

publish-sonatype:
if: github.repository == 'com-lihaoyi/mainargs' && startsWith(github.ref, 'refs/tags/')
Expand Down
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0.11.3
0.11.6

36 changes: 28 additions & 8 deletions mainargs/src/Invoker.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,24 @@ object Invoker {
cep: TokensReader.Class[T],
args: Seq[String],
allowPositional: Boolean,
allowRepeats: Boolean
allowRepeats: Boolean,
): Result[T] = construct(cep, args, allowPositional, allowRepeats, Util.nullNameMapper)

def construct[T](
cep: TokensReader.Class[T],
args: Seq[String],
allowPositional: Boolean,
allowRepeats: Boolean,
nameMapper: String => Option[String]
): Result[T] = {
TokenGrouping
.groupArgs(
args,
cep.main.flattenedArgSigs,
allowPositional,
allowRepeats,
cep.main.argSigs0.exists(_.reader.isLeftover)
cep.main.argSigs0.exists(_.reader.isLeftover),
nameMapper
)
.flatMap((group: TokenGrouping[Any]) => invoke(cep.companion(), cep.main, group))
}
Expand Down Expand Up @@ -82,7 +91,15 @@ object Invoker {
mains: MethodMains[B],
args: Seq[String],
allowPositional: Boolean,
allowRepeats: Boolean
allowRepeats: Boolean): Either[Result.Failure.Early, (MainData[Any, B], Result[Any])] = {
runMains(mains, args, allowPositional, allowRepeats, Util.nullNameMapper)
}
def runMains[B](
mains: MethodMains[B],
args: Seq[String],
allowPositional: Boolean,
allowRepeats: Boolean,
nameMapper: String => Option[String]
): Either[Result.Failure.Early, (MainData[Any, B], Result[Any])] = {
def groupArgs(main: MainData[Any, B], argsList: Seq[String]) = {
def invokeLocal(group: TokenGrouping[Any]) =
Expand All @@ -98,7 +115,8 @@ object Invoker {
main.argSigs0.exists {
case x: ArgSig => x.reader.isLeftover
case _ => false
}
},
nameMapper
)
.flatMap(invokeLocal)
)
Expand All @@ -108,14 +126,16 @@ object Invoker {
case Seq(main) => groupArgs(main, args)
case multiple =>
args.toList match {
case List() => Left(Result.Failure.Early.SubcommandNotSpecified(multiple.map(_.name)))
case List() => Left(Result.Failure.Early.SubcommandNotSpecified(multiple.map(_.name(nameMapper))))
case head :: tail =>
if (head.startsWith("-")) {
Left(Result.Failure.Early.SubcommandSelectionDashes(head))
} else {
multiple.find(_.name == head) match {
case None =>
Left(Result.Failure.Early.UnableToFindSubcommand(multiple.map(_.name), head))
multiple.find{ m =>
val name = m.name(nameMapper)
name == head || (m.mainName.isEmpty && m.defaultName == head)
} match {
case None => Left(Result.Failure.Early.UnableToFindSubcommand(multiple.map(_.name(nameMapper)), head))
case Some(main) => groupArgs(main, tail)
}
}
Expand Down
Loading