Skip to content

Commit a00fead

Browse files
giacomocavalierinicolasfara
authored andcommitted
fix: fix behaviour in case of leftover entities
1 parent 1332abb commit a00fead

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

src/main/scala/dev/atedeg/Ubidoc.scala

+11-4
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,15 @@ object Ubidoc {
2626
allEntities <- readAllEntities(lookupDir)
2727
tables <- config.tables.traverseError(toTable(_, allEntities))
2828
consideredEntities = tables.flatMap(_.rows).toSet
29-
_ <- checkConsistency(allEntities.map(_.toBaseEntity), consideredEntities.map(_.toBaseEntity), config.ignored)
29+
_ <- checkConsistency(
30+
allEntities.map(_.toBaseEntity),
31+
consideredEntities.map(_.toBaseEntity),
32+
config.ignored,
33+
logger,
34+
)
3035
tables <- tables.traverseError(entitiesToRows(_, lookupDir, allEntities))
3136
} yield tables.foreach(serialize(_, targetDir))
3237
result match {
33-
case Left(l @ LeftoverEntities(_)) => logger.warn(l.toString)
3438
case Left(err) => throw UbidocException(err)
3539
case Right(()) => logger.success("Tables generated")
3640
}
@@ -40,13 +44,16 @@ object Ubidoc {
4044
allEntities: Set[BaseEntity],
4145
considered: Set[BaseEntity],
4246
ignored: Set[BaseEntity],
47+
logger: ManagedLogger,
4348
): Either[Error, Unit] = {
4449
val consideredAndIgnored = considered.intersect(ignored)
4550
val leftovers = allEntities.diff(considered).diff(ignored)
4651
if (consideredAndIgnored.nonEmpty)
4752
OverlappingIgnoredAndConsidered(consideredAndIgnored).asLeft[Unit]
48-
else if (leftovers.nonEmpty) LeftoverEntities(leftovers).asLeft[Unit]
49-
else ().asRight[Error]
53+
else if (leftovers.nonEmpty) {
54+
logger.warn(LeftoverEntities(leftovers).toString)
55+
().asRight[Error]
56+
} else ().asRight[Error]
5057
}
5158

5259
}

0 commit comments

Comments
 (0)