Fix warnings for typeof globalThis and empty exports in namespaces

ScalablyTyped · Apr 22, 2020 · 3a3d094 · 3a3d094
1 parent f513340
commit 3a3d094
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/ts/src/main/scala/org/scalablytyped/converter/internal/ts/modules/ReplaceExports.scala b/ts/src/main/scala/org/scalablytyped/converter/internal/ts/modules/ReplaceExports.scala
@@ -49,6 +49,8 @@ class ReplaceExports(loopDetector: LoopDetector) extends TreeTransformationScope
             case other =>
               scope.logger.fatal(s"Unexpected $other")
           }
+        case TsExport(NoComments, _, ExportType.Named, TsExporteeNames(Empty, None)) =>
+          Empty
         case e: TsExport =>
           scope.fatalMaybe(s"Dropping unexpected export in namespace $e")
           Empty

diff --git a/...rc/main/scala/org/scalablytyped/converter/internal/ts/transforms/ResolveTypeQueries.scala b/...rc/main/scala/org/scalablytyped/converter/internal/ts/transforms/ResolveTypeQueries.scala
@@ -6,6 +6,8 @@ import org.scalablytyped.converter.internal.ts.TsTreeScope.LoopDetector
 import org.scalablytyped.converter.internal.ts.modules.{DeriveCopy, ReplaceExports}
 
 object ResolveTypeQueries extends TransformLeaveMembers with TransformLeaveClassMembers {
+  val GlobalThis = TsQIdent.of("globalThis")
+
   def newClassMembersLeaving(scope: TsTreeScope, tree: HasClassMembers): IArray[TsMember] =
     tree.members.flatMap {
       case target @ TsMemberProperty(
@@ -192,6 +194,9 @@ object ResolveTypeQueries extends TransformLeaveMembers with TransformLeaveClass
 
       case Right(loopDetector) =>
         target.expr match {
+          case GlobalThis =>
+            TsTypeRef.any.copy(comments = Comments(Comment("/* globalThis */ ")))
+
           case wanted if TsQIdent.Primitive(wanted) => TsTypeRef(NoComments, wanted, Empty)
           case wanted =>
             val found = scope