Swap Thenable for Promise in fromPromise

typelevel · Aug 16, 2021 · 0e5e01a · 0e5e01a
1 parent 8e0cc4e
commit 0e5e01a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/core/js/src/main/scala/cats/effect/IOCompanionPlatform.scala b/core/js/src/main/scala/cats/effect/IOCompanionPlatform.scala
@@ -18,7 +18,7 @@ package cats.effect
 
 import scalajs.js
 
-import scala.scalajs.js.{Promise, Thenable}
+import scala.scalajs.js.Thenable
 
 private[effect] abstract class IOCompanionPlatform { this: IO.type =>
 
@@ -35,10 +35,7 @@ private[effect] abstract class IOCompanionPlatform { this: IO.type =>
     apply(thunk)
   }
 
-  def fromThenable[A](iot: IO[Thenable[A]]): IO[A] =
-    asyncForIO.fromThenable(iot)
-
-  def fromPromise[A](iop: IO[Promise[A]]): IO[A] =
+  def fromPromise[A](iop: IO[Thenable[A]]): IO[A] =
     asyncForIO.fromPromise(iop)
 
   def realTimeDate: IO[js.Date] = asyncForIO.realTimeDate

diff --git a/kernel/js/src/main/scala/cats/effect/kernel/AsyncPlatform.scala b/kernel/js/src/main/scala/cats/effect/kernel/AsyncPlatform.scala
@@ -16,14 +16,12 @@
 
 package cats.effect.kernel
 
-import scala.scalajs.js.{|, defined, Function1, JavaScriptException, Promise, Thenable}
+import scala.scalajs.js.{|, defined, Function1, JavaScriptException, Thenable}
 
 private[kernel] trait AsyncPlatform[F[_]] { this: Async[F] =>
 
-  def fromPromise[A](iop: F[Promise[A]]): F[A] = fromThenable(widen(iop))
-
-  def fromThenable[A](iot: F[Thenable[A]]): F[A] =
-    flatMap(iot) { t =>
+  def fromPromise[A](iop: F[Thenable[A]]): F[A] =
+    flatMap(iop) { p =>
       async_[A] { cb =>
         val onFulfilled: Function1[A, Unit | Thenable[Unit]] =
           (v: A) => cb(Right(v)): Unit | Thenable[Unit]
@@ -37,7 +35,7 @@ private[kernel] trait AsyncPlatform[F[_]] { this: Async[F] =>
           cb(Left(e)): Unit | Thenable[Unit]
         }
 
-        t.`then`[Unit](onFulfilled, defined(onRejected))
+        p.`then`[Unit](onFulfilled, defined(onRejected))
 
         ()
       }