@@ -26,11 +26,15 @@ object Ubidoc {
26
26
allEntities <- readAllEntities(lookupDir)
27
27
tables <- config.tables.traverseError(toTable(_, allEntities))
28
28
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
+ )
30
35
tables <- tables.traverseError(entitiesToRows(_, lookupDir, allEntities))
31
36
} yield tables.foreach(serialize(_, targetDir))
32
37
result match {
33
- case Left (l @ LeftoverEntities (_)) => logger.warn(l.toString)
34
38
case Left (err) => throw UbidocException (err)
35
39
case Right (()) => logger.success(" Tables generated" )
36
40
}
@@ -40,13 +44,16 @@ object Ubidoc {
40
44
allEntities : Set [BaseEntity ],
41
45
considered : Set [BaseEntity ],
42
46
ignored : Set [BaseEntity ],
47
+ logger : ManagedLogger ,
43
48
): Either [Error , Unit ] = {
44
49
val consideredAndIgnored = considered.intersect(ignored)
45
50
val leftovers = allEntities.diff(considered).diff(ignored)
46
51
if (consideredAndIgnored.nonEmpty)
47
52
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 ]
50
57
}
51
58
52
59
}
0 commit comments