Pushing Tracker to the end

guardrail-dev · Feb 8, 2022 · f65e284 · f65e284
1 parent a79a629
commit f65e284
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/modules/core/src/main/scala/dev/guardrail/SwaggerUtil.scala b/modules/core/src/main/scala/dev/guardrail/SwaggerUtil.scala
@@ -62,7 +62,12 @@ object SwaggerUtil {
                   formattedClsName <- formatTypeName(clsName)
                   typeName         <- pureTypeName(formattedClsName)
                   widenedTypeName  <- widenTypeName(typeName)
-                  parentSimpleRef = comp.downField("allOf", _.getAllOf).map(_.headOption).flatDownField("$ref", _.get$ref).unwrapTracker.map(_.split("/").last)
+                  parentSimpleRef = comp
+                    .downField("allOf", _.getAllOf)
+                    .indexedDistribute
+                    .headOption
+                    .flatMap(_.downField("$ref", _.get$ref).indexedDistribute)
+                    .map(_.unwrapTracker.split("/").last)
                   parentTerm <- parentSimpleRef.traverse(n => pureTermName(n))
                   resolvedType = core.Resolved[L](widenedTypeName, parentTerm, None, None, None): core.ResolvedType[L]
                 } yield (clsName, resolvedType)