FollowAliases: Recover from more circular things by catching `StackOv…

…erflowError`
ScalablyTyped · Oct 13, 2023 · ae10c35 · ae10c35
1 parent 51dc956
commit ae10c35
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/ts/src/main/scala/org/scalablytyped/converter/internal/ts/FollowAliases.scala b/ts/src/main/scala/org/scalablytyped/converter/internal/ts/FollowAliases.scala
@@ -2,17 +2,15 @@ package org.scalablytyped.converter.internal
 package ts
 
 object FollowAliases {
-  def apply(scope: TsTreeScope, skipValidation: Boolean = false)(tpe: TsType): TsType = {
-    tpe match {
+  def apply(scope: TsTreeScope, skipValidation: Boolean = false)(tpe: TsType): TsType =
+    try tpe match {
       case typeRef: TsTypeRef =>
         scope
           .lookupType(typeRef.name, skipValidation)
           .collectFirst {
             case ta: TsDeclTypeAlias =>
               val next = FillInTParams(ta, typeRef.tparams).alias
-              // this is a consequence of interface augmentation. see for instance `Locals` in express
-              if (next == tpe) TsTypeRef.any.copy(comments = Comments(Comment.warning(s"circular ${TsTypeFormatter(tpe)}")))
-              else apply(scope, skipValidation)(next)
+              apply(scope, skipValidation)(next)
             /* see through thin interfaces which might be translated into type aliases */
             case i @ TsDeclInterface(_, _, _, _, IArray.exactlyOne(_), Empty, _) =>
               apply(scope, skipValidation)(FillInTParams(i, typeRef.tparams).inheritance.head)
@@ -23,8 +21,12 @@ object FollowAliases {
       case TsTypeUnion(types) =>
         TsTypeUnion.simplified(types.map(FollowAliases(scope, skipValidation)))
       case other => other
+    } catch {
+      case _: StackOverflowError =>
+        val formatted = TsTypeFormatter(tpe)
+        scope.logger.error(s"Recovered from SOE while following type alias $formatted")
+        TsTypeRef.any.copy(comments = Comments(Comment.warning(s"circular $formatted")))
     }
-  }
 
   def typeRef(scope: TsTreeScope)(tr: TsTypeRef): TsTypeRef =
     scope