StateT.liftR ⇒ liftS

Author: japgolly

HISTORY.md

@@ -3,8 +3,8 @@ History
 
 ### 0.5.3 (unreleased)
 
-* Workaround for Scala's type inference failing with `StateT.liftR` on functions.
-  Instead of `f(_).liftR`, `f.liftR` is now available and is confirmed to work in `_runState`.
+* Workaround for Scala's type inference failing with `StateT.liftS` on functions.
+  Instead of `f(_).liftS`, `f._liftS` is now available and is confirmed to work in `_runState`.
 
 ### 0.5.2 ([commit log](https://github.com/japgolly/scalajs-react/compare/v0.5.1...v0.5.2))
 

scalaz-7.0/src/main/scala/japgolly/scalajs/react/ScalazReact.scala

@@ -175,13 +175,13 @@ object ScalazReact {
   }
 
   implicit final class SzRExt_StateTOps[M[+_], S, A](val s: StateT[M, S, A]) extends AnyVal {
-    @inline def liftR(implicit M: Functor[M]): ReactST[M, S, A] =
-      ReactS lift s
+    @deprecated("Instead of StateT.liftR use StateT.liftS. StateT.liftR will be removed in 0.7.0.", "0.5.3")
+    @inline def liftR(implicit M: Functor[M]): ReactST[M, S, A] = s.liftS
+    @inline def liftS(implicit M: Functor[M]): ReactST[M, S, A] = ReactS lift s
   }
 
   implicit final class SzRExt__StateTOps[I, M[+_], S, A](val f: I => StateT[M, S, A]) extends AnyVal {
-    @inline def liftR(implicit M: Functor[M]): I => ReactST[M, S, A] =
-      f(_).liftR
+    @inline def _liftS(implicit M: Functor[M]): I => ReactST[M, S, A] = f(_).liftS
   }
 
   implicit final class SzRExt_ReactSTOps[M[+_], S, A](val s: ReactST[M,S,A]) extends AnyVal {
@@ -219,13 +219,13 @@ object ScalazReact {
     def _runState[I, M[+_], A](f: I => ReactST[M, S, A], cb: I => OpCallbackIO)(implicit C: CC, M: M ~> IO, N: Monad[M]): I => IO[A] =
       i => runState(f(i) addCallback cb(i))
 
-    @deprecated("Instead of runStateS(s) use runState(s.liftR). runStateS will be removed in 0.7.0.", "0.5.2")
+    @deprecated("Instead of runStateS(s) use runState(s.liftS). runStateS will be removed in 0.7.0.", "0.5.2")
     def runStateS[M[+_], A](st: => StateT[M, S, A])(implicit C: CC, M: M ~> IO, N: Functor[M]): IO[A] =
-      runState(st.liftR)
+      runState(st.liftS)
 
-    @deprecated("Instead of _runStateS(f), use _runState(f.liftR). _runStateS will be removed in 0.7.0.", "0.5.2")
+    @deprecated("Instead of _runStateS(f), use _runState(f._liftS). _runStateS will be removed in 0.7.0.", "0.5.2")
     def _runStateS[I, M[+_], A](f: I => StateT[M, S, A])(implicit C: CC, M: M ~> IO, N: Functor[M]): I => IO[A] =
-      _runState(f(_).liftR)
+      _runState(f._liftS)
 
     def runStateF[M[+_], A](st: => ReactST[M, S, A])(implicit C: CC, M: M ~> IO, F: ChangeFilter[S]): IO[A] =
       run[M, A, A](st, (s1,s2,a,io) => if (F.allowChange(s1,s2)) io.map(_ => a) else IO(a))
@@ -236,13 +236,13 @@ object ScalazReact {
     def _runStateF[I, M[+_], A](f: I => ReactST[M, S, A], cb: I => OpCallbackIO)(implicit C: CC, M: M ~> IO, N: Monad[M], F: ChangeFilter[S]): I => IO[A] =
       i => runStateF(f(i) addCallback cb(i))
 
-    @deprecated("Instead of runStateFS(s) use runStateF(s.liftR). runStateFS will be removed in 0.7.0.", "0.5.2")
+    @deprecated("Instead of runStateFS(s) use runStateF(s.liftS). runStateFS will be removed in 0.7.0.", "0.5.2")
     def runStateFS[M[+_], A](st: => StateT[M, S, A])(implicit C: CC, M: M ~> IO, N: Functor[M], F: ChangeFilter[S]): IO[A] =
-      runStateF(st.liftR)
+      runStateF(st.liftS)
 
-    @deprecated("Instead of _runStateFS(f), use _runStateF(f.liftR). _runStateFS will be removed in 0.7.0.", "0.5.2")
+    @deprecated("Instead of _runStateFS(f), use _runStateF(f._liftS). _runStateFS will be removed in 0.7.0.", "0.5.2")
     def _runStateFS[I, M[+_], A](f: I => StateT[M, S, A])(implicit C: CC, M: M ~> IO, N: Functor[M], F: ChangeFilter[S]): I => IO[A] =
-      _runStateF(f(_).liftR)
+      _runStateF(f._liftS)
   }
 
   case class ChangeFilter[S](allowChange: (S, S) => Boolean)

scalaz-7.1/src/main/scala/japgolly/scalajs/react/ScalazReact.scala

@@ -174,13 +174,13 @@ object ScalazReact {
   }
 
   implicit final class SzRExt_StateTOps[M[_], S, A](val s: StateT[M, S, A]) extends AnyVal {
-    @inline def liftR(implicit M: Functor[M]): ReactST[M, S, A] =
-      ReactS lift s
+    @deprecated("Instead of StateT.liftR use StateT.liftS. StateT.liftR will be removed in 0.7.0.", "0.5.3")
+    @inline def liftR(implicit M: Functor[M]): ReactST[M, S, A] = s.liftS
+    @inline def liftS(implicit M: Functor[M]): ReactST[M, S, A] = ReactS lift s
   }
 
   implicit final class SzRExt__StateTOps[I, M[_], S, A](val f: I => StateT[M, S, A]) extends AnyVal {
-    @inline def liftR(implicit M: Functor[M]): I => ReactST[M, S, A] =
-      f(_).liftR
+    @inline def _liftS(implicit M: Functor[M]): I => ReactST[M, S, A] = f(_).liftS
   }
 
   implicit final class SzRExt_ReactSTOps[M[_], S, A](val s: ReactST[M,S,A]) extends AnyVal {
@@ -218,13 +218,13 @@ object ScalazReact {
     def _runState[I, M[_], A](f: I => ReactST[M, S, A], cb: I => OpCallbackIO)(implicit C: CC, M: M ~> IO, N: Monad[M]): I => IO[A] =
       i => runState(f(i) addCallback cb(i))
 
-    @deprecated("Instead of runStateS(s) use runState(s.liftR). runStateS will be removed in 0.7.0.", "0.5.2")
+    @deprecated("Instead of runStateS(s) use runState(s.liftS). runStateS will be removed in 0.7.0.", "0.5.2")
     def runStateS[M[_], A](st: => StateT[M, S, A])(implicit C: CC, M: M ~> IO, N: Functor[M]): IO[A] =
-      runState(st.liftR)
+      runState(st.liftS)
 
-    @deprecated("Instead of _runStateS(f), use _runState(f.liftR). _runStateS will be removed in 0.7.0.", "0.5.2")
+    @deprecated("Instead of _runStateS(f), use _runState(f._liftS). _runStateS will be removed in 0.7.0.", "0.5.2")
     def _runStateS[I, M[_], A](f: I => StateT[M, S, A])(implicit C: CC, M: M ~> IO, N: Functor[M]): I => IO[A] =
-      _runState(f(_).liftR)
+      _runState(f._liftS)
 
     def runStateF[M[_], A](st: => ReactST[M, S, A])(implicit C: CC, M: M ~> IO, F: ChangeFilter[S]): IO[A] =
       run[M, A, A](st, (s1,s2,a,io) => if (F.allowChange(s1,s2)) io.map(_ => a) else IO(a))
@@ -235,13 +235,13 @@ object ScalazReact {
     def _runStateF[I, M[_], A](f: I => ReactST[M, S, A], cb: I => OpCallbackIO)(implicit C: CC, M: M ~> IO, N: Monad[M], F: ChangeFilter[S]): I => IO[A] =
       i => runStateF(f(i) addCallback cb(i))
 
-    @deprecated("Instead of runStateFS(s) use runStateF(s.liftR). runStateFS will be removed in 0.7.0.", "0.5.2")
+    @deprecated("Instead of runStateFS(s) use runStateF(s.liftS). runStateFS will be removed in 0.7.0.", "0.5.2")
     def runStateFS[M[_], A](st: => StateT[M, S, A])(implicit C: CC, M: M ~> IO, N: Functor[M], F: ChangeFilter[S]): IO[A] =
-      runStateF(st.liftR)
+      runStateF(st.liftS)
 
-    @deprecated("Instead of _runStateFS(f), use _runStateF(f.liftR). _runStateFS will be removed in 0.7.0.", "0.5.2")
+    @deprecated("Instead of _runStateFS(f), use _runStateF(f._liftS). _runStateFS will be removed in 0.7.0.", "0.5.2")
     def _runStateFS[I, M[_], A](f: I => StateT[M, S, A])(implicit C: CC, M: M ~> IO, N: Functor[M], F: ChangeFilter[S]): I => IO[A] =
-      _runStateF(f(_).liftR)
+      _runStateF(f._liftS)
   }
 
   case class ChangeFilter[S](allowChange: (S, S) => Boolean)

test/src/test/scala/japgolly/scalajs/react/ScalazTest.scala

@@ -25,7 +25,7 @@ object ScalazTest extends TestSuite {
   val c = null.asInstanceOf[ComponentScopeM[Unit, S, Unit]]
 
   val tests = TestSuite {
-    "runState(StateT.liftR)"      - test[StateT[M,S,A]     ](s => c.runState(s.liftR) ).expect[IO[A]]
-    "_runState((I→StateT).liftR)" - test[B => StateT[M,S,A]](s => c._runState(s.liftR)).expect[B => IO[A]]
+    "runState(s.liftS)"   - test[StateT[M,S,A]     ](s => c.runState(s.liftS)  ).expect[IO[A]]
+    "_runState(f._liftS)" - test[B => StateT[M,S,A]](s => c._runState(s._liftS)).expect[B => IO[A]]
   }
 }