Generalize type references to classes to point to the parent class as…

… long as name and type parameters are the same.
ScalablyTyped · Oct 5, 2020 · 759d141 · 759d141
1 parent 69157a7
commit 759d141
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 25 deletions.
diff --git a/...rtable/src/main/scala/org/scalablytyped/converter/internal/importer/Phase2ToScalaJs.scala b/...rtable/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)

diff --git a/...in/scala/org/scalablytyped/converter/internal/scalajs/transforms/GeneralizeTypeRefs.scala b/...in/scala/org/scalablytyped/converter/internal/scalajs/transforms/GeneralizeTypeRefs.scala
@@ -0,0 +1,32 @@
+package org.scalablytyped.converter.internal
+package scalajs
+package transforms
+
+object GeneralizeTypeRefs extends TreeTransformation {
+  override def leaveTypeRef(scope: TreeScope)(tr: TypeRef): TypeRef =
+    generalize(scope)(tr)
+
+  def generalize(scope: TreeScope)(tr: TypeRef): TypeRef =
+    if (scope.isAbstract(tr)) tr
+    else
+      FollowAliases(scope)(tr) match {
+        case dealiasedTr if dealiasedTr.name === tr.name =>
+          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
+      }
+}
diff --git a/tests/aws-sdk/check/a/aws-sdk/build.sbt b/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(

diff --git a/tests/aws-sdk/check/a/aws-sdk/src/main/scala/typings/awsSdk/allMod.scala b/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()
     }
 

diff --git a/tests/aws-sdk/check/a/aws-sdk/src/main/scala/typings/awsSdk/mod.scala b/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()
     }
 

diff --git a/tests/firebase-admin/check/f/firebase-admin/build.sbt b/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(

diff --git a/tests/firebase-admin/check/f/firebase-admin/src/main/scala/typings/firebaseAdmin/mod.scala b/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
   }
 
 }

diff --git a/tests/sax/check/n/node/build.sbt b/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(

diff --git a/tests/sax/check/n/node/src/main/scala/typings/node/eventsMod/EventEmitter.scala b/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
 }
 
diff --git a/tests/sax/check/n/node/src/main/scala/typings/node/streamMod/internal.scala b/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}

diff --git a/tests/sax/check/s/sax/build.sbt b/tests/sax/check/s/sax/build.sbt
@@ -1,11 +1,11 @@
 organization := "org.scalablytyped"
 name := "sax"
-version := "1.x-cca7a4"
+version := "1.x-ade742"
 scalaVersion := "2.13.3"
 enablePlugins(ScalaJSPlugin)
 libraryDependencies ++= Seq(
   "com.olvind" %%% "scalablytyped-runtime" % "2.1.0",
-  "org.scalablytyped" %%% "node" % "9.6.x-171ad7",
+  "org.scalablytyped" %%% "node" % "9.6.x-b3c907",
   "org.scalablytyped" %%% "std" % "0.0-unknown-f7d52a")
 publishArtifact in packageDoc := false
 scalacOptions ++= List("-encoding", "utf-8", "-feature", "-g:notailcalls", "-language:implicitConversions", "-language:higherKinds", "-language:existentials")

diff --git a/tests/serve-static/check/e/express-serve-static-core/build.sbt b/tests/serve-static/check/e/express-serve-static-core/build.sbt
@@ -1,6 +1,6 @@
 organization := "org.scalablytyped"
 name := "express-serve-static-core"
-version := "0.0-unknown-577f29"
+version := "0.0-unknown-b641a9"
 scalaVersion := "2.13.3"
 enablePlugins(ScalaJSPlugin)
 libraryDependencies ++= Seq(

diff --git a/...xpress-serve-static-core/src/main/scala/typings/expressServeStaticCore/mod/Response.scala b/...xpress-serve-static-core/src/main/scala/typings/expressServeStaticCore/mod/Response.scala
@@ -7,12 +7,12 @@ import scala.scalajs.js.annotation.{JSGlobalScope, JSGlobal, JSImport, JSName, J
 @js.native
 trait Response
   extends typings.expressServeStaticCore.mod.global.Express.Response {
-  def location(url: String): Response = js.native
+  def location(url: String): typings.expressServeStaticCore.mod.global.Express.Response = js.native
 }
 
 object Response {
   @scala.inline
-  def apply(location: String => Response): Response = {
+  def apply(location: String => typings.expressServeStaticCore.mod.global.Express.Response): Response = {
     val __obj = js.Dynamic.literal(location = js.Any.fromFunction1(location))
     __obj.asInstanceOf[Response]
   }
@@ -28,7 +28,7 @@ object Response {
         x
     }
     @scala.inline
-    def setLocation(value: String => Response): Self = this.set("location", js.Any.fromFunction1(value))
+    def setLocation(value: String => typings.expressServeStaticCore.mod.global.Express.Response): Self = this.set("location", js.Any.fromFunction1(value))
   }
 
 }

diff --git a/...express-serve-static-core/src/main/scala/typings/expressServeStaticCore/mod/package.scala b/...express-serve-static-core/src/main/scala/typings/expressServeStaticCore/mod/package.scala
@@ -8,8 +8,8 @@ package object mod {
   type Handler = typings.expressServeStaticCore.mod.RequestHandler
   type NextFunction = js.Function1[/* err */ js.UndefOr[js.Any], scala.Unit]
   type RequestHandler = js.Function3[
-    /* req */ typings.expressServeStaticCore.mod.Request, 
-    /* res */ typings.expressServeStaticCore.mod.Response, 
+    typings.expressServeStaticCore.mod.global.Express.Request, 
+    typings.expressServeStaticCore.mod.global.Express.Response, 
     /* next */ typings.expressServeStaticCore.mod.NextFunction, 
     js.Any
   ]

diff --git a/tests/serve-static/check/s/serve-static/build.sbt b/tests/serve-static/check/s/serve-static/build.sbt
@@ -1,11 +1,11 @@
 organization := "org.scalablytyped"
 name := "serve-static"
-version := "0.0-unknown-79d765"
+version := "0.0-unknown-b8f141"
 scalaVersion := "2.13.3"
 enablePlugins(ScalaJSPlugin)
 libraryDependencies ++= Seq(
   "com.olvind" %%% "scalablytyped-runtime" % "2.1.0",
-  "org.scalablytyped" %%% "express-serve-static-core" % "0.0-unknown-577f29",
+  "org.scalablytyped" %%% "express-serve-static-core" % "0.0-unknown-b641a9",
   "org.scalablytyped" %%% "mime" % "2.0-a17b50",
   "org.scalablytyped" %%% "std" % "0.0-unknown-c6dcd1")
 publishArtifact in packageDoc := false

diff --git a/...atic/check/s/serve-static/src/main/scala/typings/serveStatic/mod/ServeStaticOptions.scala b/...atic/check/s/serve-static/src/main/scala/typings/serveStatic/mod/ServeStaticOptions.scala
@@ -1,13 +1,13 @@
 package typings.serveStatic.mod
 
-import typings.expressServeStaticCore.mod.Response
+import typings.expressServeStaticCore.mod.global.Express.Response
 import scala.scalajs.js
 import scala.scalajs.js.`|`
 import scala.scalajs.js.annotation.{JSGlobalScope, JSGlobal, JSImport, JSName, JSBracketAccess}
 
 @js.native
 trait ServeStaticOptions extends js.Object {
-  var setHeaders: js.UndefOr[js.Function3[/* res */ Response, /* path */ String, /* stat */ js.Any, _]] = js.native
+  var setHeaders: js.UndefOr[js.Function3[Response, /* path */ String, /* stat */ js.Any, _]] = js.native
 }
 
 object ServeStaticOptions {
@@ -28,7 +28,7 @@ object ServeStaticOptions {
         x
     }
     @scala.inline
-    def setSetHeaders(value: (/* res */ Response, /* path */ String, /* stat */ js.Any) => _): Self = this.set("setHeaders", js.Any.fromFunction3(value))
+    def setSetHeaders(value: (Response, /* path */ String, /* stat */ js.Any) => _): Self = this.set("setHeaders", js.Any.fromFunction3(value))
     @scala.inline
     def deleteSetHeaders: Self = this.set("setHeaders", js.undefined)
   }