Generalize type references to classes to point to the parent class as long as name and type parameters are the same.

Author: oyvindberg

importer-portable/src/main/scala/org/scalablytyped/converter/internal/importer/Phase2ToScalaJs.scala

@@ -76,6 +76,7 @@ class Phase2ToScalaJs(
               Adapter(scope)((tree, s) => S.UnionToInheritance(s, tree, scalaName, willBeExternalTypes)), // after FakeLiterals
               S.LimitUnionLength.visitPackageTree(scope), // after UnionToInheritance
               (S.AvoidMacroParadiseBug >> new S.RemoveMultipleInheritance(new ParentsResolver)).visitPackageTree(scope),
+              S.GeneralizeTypeRefs.visitPackageTree(scope), // after RemoveMultipleInheritance
               S.CombineOverloads.visitPackageTree(scope), //must have stable types, so FakeLiterals run before
               new S.FilterMemberOverrides(new ParentsResolver).visitPackageTree(scope), //
               new S.InferMemberOverrides(new ParentsResolver)

scalajs/src/main/scala/org/scalablytyped/converter/internal/scalajs/transforms/GeneralizeTypeRefs.scala

@@ -0,0 +1,59 @@
+package org.scalablytyped.converter.internal
+package scalajs
+package transforms
+
+/**
+ * So far we've been pretty pedantic in the handling of things like re-exported types.
+ * ```typescript
+ * declare module "libfoo/impl/foo" {
+ * export class Foo {}
+ * }
+ * declare module "libfoo" {
+ * export import {Foo} from "libfoo/impl/foo";
+ * export class Bar {
+ * constructor(foo: Foo) {}
+ * }
+ * }
+ * ```
+ *
+ * In most cases `Bar` has pointed to `libfoo.Foo` so far, while the intention was really something compatible with `libfoo/impl/foo.Foo`
+ *
+ * In the name of pragmatism, assert that if a class has a parent with the same name and type parameters, accept that in the place of the child class.
+ *
+ * Also, only do this for types in input position
+ */
+object GeneralizeTypeRefs extends TreeTransformation {
+  override def leaveTypeRef(scope: TreeScope)(tr: TypeRef): TypeRef =
+    if (shouldGeneralize(scope)) generalize(scope)(tr).copy(comments = tr.comments) else tr
+
+  def shouldGeneralize(scope: TreeScope): Boolean =
+    scope.stack.filterNot(_.isInstanceOf[TypeRef]) match {
+      case (_: MethodTree) :: _ => false // return type
+      case (_: ClassTree) :: _ => false // parent
+      case _ => true
+    }
+
+  def generalize(scope: TreeScope)(tr: TypeRef): TypeRef =
+    if (scope.isAbstract(tr)) tr
+    else
+      FollowAliases(scope)(tr) match {
+        case dealiasedTr if dealiasedTr.name === tr.name && dealiasedTr.targs.length === tr.targs.length =>
+          scope
+            ._lookup(dealiasedTr.typeName.parts)
+            .collectFirst {
+              case (cls: ClassTree, newScope) if cls.tparams.length === tr.targs.length =>
+                val newCls = FillInTParams(cls, newScope, dealiasedTr.targs, Empty)
+                newCls.parents match {
+                  case IArray.exactlyOne(p) if p.name === tr.name =>
+                    // commit at this point
+                    generalize(newScope)(p)
+                  case _ =>
+                    tr
+                }
+              case _ => tr
+            }
+            .getOrElse(tr)
+
+        case _ => tr
+      }
+}

tests/aws-sdk/check/a/aws-sdk/build.sbt

@@ -1,6 +1,6 @@
 organization := "org.scalablytyped"
 name := "aws-sdk"
-version := "2.247.1-ea5354"
+version := "2.247.1-659d53"
 scalaVersion := "2.13.3"
 enablePlugins(ScalaJSPlugin)
 libraryDependencies ++= Seq(

tests/aws-sdk/check/a/aws-sdk/src/main/scala/typings/awsSdk/allMod.scala

@@ -21,14 +21,14 @@ object allMod extends js.Object {
   object DynamoDB extends js.Object {
     @js.native
     class Converter ()
-      extends typings.awsSdk.dynamodbMod.Converter
+      extends typings.awsSdk.converterMod.Converter
 
     @js.native
     /**
       * Creates a DynamoDB document client with a set of configuration options.
       */
     class DocumentClient ()
-      extends typings.awsSdk.dynamodbMod.DocumentClient {
+      extends typings.awsSdk.documentClientMod.DocumentClient {
       def this(options: DocumentClientOptions with ClientConfiguration) = this()
     }
 

tests/aws-sdk/check/a/aws-sdk/src/main/scala/typings/awsSdk/mod.scala

@@ -23,14 +23,14 @@ object mod extends js.Object {
   object DynamoDB extends js.Object {
     @js.native
     class Converter ()
-      extends typings.awsSdk.allMod.DynamoDB.Converter
+      extends typings.awsSdk.converterMod.Converter
 
     @js.native
     /**
       * Creates a DynamoDB document client with a set of configuration options.
       */
     class DocumentClient ()
-      extends typings.awsSdk.allMod.DynamoDB.DocumentClient {
+      extends typings.awsSdk.documentClientMod.DocumentClient {
       def this(options: DocumentClientOptions with ClientConfiguration) = this()
     }
 

tests/firebase-admin/check/f/firebase-admin/build.sbt

@@ -1,6 +1,6 @@
 organization := "org.scalablytyped"
 name := "firebase-admin"
-version := "8.2.0-e100e5"
+version := "8.2.0-64d207"
 scalaVersion := "2.13.3"
 enablePlugins(ScalaJSPlugin)
 libraryDependencies ++= Seq(

tests/firebase-admin/check/f/firebase-admin/src/main/scala/typings/firebaseAdmin/mod.scala

@@ -20,8 +20,8 @@ object mod extends js.Object {
       def this(settings: Settings) = this()
     }
 
-    def apply(): Firestore = js.native
-    def apply(str: String): Firestore = js.native
+    def apply(): typings.googleCloudFirestore.FirebaseFirestore.Firestore = js.native
+    def apply(str: String): typings.googleCloudFirestore.FirebaseFirestore.Firestore = js.native
   }
 
 }

tests/sax/check/n/node/build.sbt

@@ -1,6 +1,6 @@
 organization := "org.scalablytyped"
 name := "node"
-version := "9.6.x-171ad7"
+version := "9.6.x-b3c907"
 scalaVersion := "2.13.3"
 enablePlugins(ScalaJSPlugin)
 libraryDependencies ++= Seq(

tests/sax/check/n/node/src/main/scala/typings/node/eventsMod/EventEmitter.scala

@@ -13,7 +13,7 @@ class EventEmitter ()
 @JSImport("events", "EventEmitter")
 @js.native
 object EventEmitter extends js.Object {
-  def listenerCount(emitter: EventEmitter, event: String): Double = js.native
-  def listenerCount(emitter: EventEmitter, event: js.Symbol): Double = js.native
+  def listenerCount(emitter: typings.node.NodeJS.EventEmitter, event: String): Double = js.native
+  def listenerCount(emitter: typings.node.NodeJS.EventEmitter, event: js.Symbol): Double = js.native
 }
 

tests/sax/check/n/node/src/main/scala/typings/node/streamMod/internal.scala

@@ -1,8 +1,8 @@
 package typings.node.streamMod
 
+import typings.node.NodeJS.EventEmitter
 import typings.node.NodeJS.WritableStream
 import typings.node.anon.End
-import typings.node.eventsMod.EventEmitter
 import scala.scalajs.js
 import scala.scalajs.js.`|`
 import scala.scalajs.js.annotation.{JSGlobalScope, JSGlobal, JSImport, JSName, JSBracketAccess}