Merge pull request #4904 from armanbilge/topic/undefOr2jsAny

sjrd · web-flow · commit 9235e116ee96 · 2023-09-20T10:47:52.000+02:00
Move `undefOr2jsAny` implicit conversion to `js.Any` companion
diff --git a/library/src/main/scala-new-collections/scala/scalajs/js/Any.scala b/library/src/main/scala-new-collections/scala/scalajs/js/Any.scala
@@ -79,6 +79,16 @@ object Any extends LowPrioAnyImplicits {
   @inline implicit def fromString(s: String): js.Any =
     s.asInstanceOf[js.Any]
 
+  /* This one is not very "in the spirit" of the union type, but it used to be
+   * available for `js.UndefOr[A]`, so we keep it for backward source
+   * compatibility. It is not really harmful, and has some perks in certain
+   * interoperability scenarios.
+   */
+  implicit def undefOr2jsAny[A](value: js.UndefOr[A])(
+      implicit ev: A => js.Any): js.Any = {
+    value.map(ev).asInstanceOf[js.Any]
+  }
+
   /* The following overload makes sure that the developer does not
    * inadvertently convert a Long to a Double to fit it in a js.Any.
    */
diff --git a/library/src/main/scala-old-collections/scala/scalajs/js/Any.scala b/library/src/main/scala-old-collections/scala/scalajs/js/Any.scala
@@ -77,6 +77,16 @@ object Any extends js.LowPrioAnyImplicits {
   @inline implicit def fromString(s: String): js.Any =
     s.asInstanceOf[js.Any]
 
+  /* This one is not very "in the spirit" of the union type, but it used to be
+   * available for `js.UndefOr[A]`, so we keep it for backward source
+   * compatibility. It is not really harmful, and has some perks in certain
+   * interoperability scenarios.
+   */
+  implicit def undefOr2jsAny[A](value: js.UndefOr[A])(
+      implicit ev: A => js.Any): js.Any = {
+    value.map(ev).asInstanceOf[js.Any]
+  }
+
   /* The following overload makes sure that the developer does not
    * inadvertently convert a Long to a Double to fit it in a js.Any.
    */
diff --git a/library/src/main/scala/scala/scalajs/js/Union.scala b/library/src/main/scala/scala/scalajs/js/Union.scala
@@ -113,7 +113,8 @@ object | { // scalastyle:ignore
    * compatibility. It is not really harmful, and has some perks in certain
    * interoperability scenarios.
    */
-  implicit def undefOr2jsAny[A](value: js.UndefOr[A])(
+  @deprecated("Relocated to js.Any.undefOr2jsAny", "1.14.0")
+  def undefOr2jsAny[A](value: js.UndefOr[A])(
       implicit ev: A => js.Any): js.Any = {
     value.map(ev).asInstanceOf[js.Any]
   }
diff --git a/sbt-plugin/src/sbt-test/scala3/basic/Main.scala b/sbt-plugin/src/sbt-test/scala3/basic/Main.scala
@@ -22,5 +22,8 @@ object Main {
 
     // Testing the library resolved with %%% + withDottyCompat
     assert(Types.IntType.show() == "int")
+
+    // Testing the undefOr2jsAny implicit conversion
+    val x: js.Any = js.defined("")
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,8 @@ object Main {`
`22`	`22`
`23`	`23`	`// Testing the library resolved with %%% + withDottyCompat`
`24`	`24`	`assert(Types.IntType.show() == "int")`
	`25`	`+`
	`26`	`+ // Testing the undefOr2jsAny implicit conversion`
	`27`	`+ val x: js.Any = js.defined("")`
`25`	`28`	`}`
`26`	`29`	`}`