Merge pull request #185 from Atry/compatiblity-fix

Revert 252da61 in case of breaking source code backward-compatibility

Author: Atry

Binding/src/main/scala/com/thoughtworks/binding/Binding.scala

@@ -363,7 +363,7 @@ object Binding extends MonadicFactory.WithTypeClass[Monad, Binding] {
     }
 
     @inline
-    override def value: B = {
+    override protected def value: B = {
       cache
     }
 
@@ -442,7 +442,7 @@ object Binding extends MonadicFactory.WithTypeClass[Monad, Binding] {
       cache = f(upstream.value)
     }
 
-    override def value: B = {
+    override protected def value: B = {
       @tailrec
       @inline
       def tailrecGetValue(binding: Binding[B]): B = {
@@ -615,7 +615,7 @@ object Binding extends MonadicFactory.WithTypeClass[Monad, Binding] {
     override protected def addPatchedListener(listener: PatchedListener[Nothing]): Unit = {}
 
     @inline
-    override def value = Nil
+    override protected def value = Nil
   }
 
   private[Binding] abstract class ValueProxy[B] extends Seq[B] with HasCache[Binding[B]] {
@@ -726,7 +726,7 @@ object Binding extends MonadicFactory.WithTypeClass[Monad, Binding] {
       }
 
       @inline
-      override def value = new FlatProxy(cacheData)
+      override protected def value = new FlatProxy(cacheData)
 
       @inline
       private def flatIndex(oldCache: Cache, upstreamBegin: Int, upstreamEnd: Int): Int = {
@@ -848,7 +848,7 @@ object Binding extends MonadicFactory.WithTypeClass[Monad, Binding] {
         } yield f(a))(collection.breakOut)
       }
 
-      override def value: Seq[B] = {
+      override protected def value: Seq[B] = {
         val cacheData0 = cacheData
         new ValueProxy[B] {
           var cacheData = cacheData0
@@ -918,7 +918,7 @@ object Binding extends MonadicFactory.WithTypeClass[Monad, Binding] {
       private val publisher = new SafeBuffer[ChangedListener[Int]]
 
       @inline
-      override def value: Int = bindingSeq.value.length
+      override protected def value: Int = bindingSeq.value.length
 
       @inline
       override protected def removeChangedListener(listener: ChangedListener[Int]): Unit = {
@@ -961,7 +961,7 @@ object Binding extends MonadicFactory.WithTypeClass[Monad, Binding] {
       private val publisher = new SafeBuffer[ChangedListener[Seq[Element]]]
 
       @inline
-      override def value: Seq[Element] = upstream.value
+      override protected def value: Seq[Element] = upstream.value
 
       @inline
       override protected def removeChangedListener(listener: ChangedListener[Seq[Element]]): Unit = {
@@ -1016,18 +1016,13 @@ object Binding extends MonadicFactory.WithTypeClass[Monad, Binding] {
       removePatchedListener(Binding.DummyPatchedListener)
     }
 
-    /**
-      * Returns the current value of this [[BindingSeq]].
-      *
-      * @note This method must not be invoked inside a `@dom` method body or a `Binding { ... }` block..
-      */
-    def value: Seq[A]
+    /** Returns the current value of this [[BindingSeq]]. */
+    protected def value: Seq[A]
 
     /** Returns the current value of this [[BindingSeq]].
       *
       * @note This method is used for internal testing purpose only.
       */
-    @deprecated(message = "Use [[value]] instead", since = "11.0.0")
     private[binding] def get: Seq[A] = value
 
     protected def removePatchedListener(listener: PatchedListener[A]): Unit
@@ -1377,7 +1372,7 @@ object Binding extends MonadicFactory.WithTypeClass[Monad, Binding] {
     override def length: Constant[Int] = Constant(1)
 
     @inline
-    override def value = SingleSeq(upstream.value)
+    override protected def value = SingleSeq(upstream.value)
 
     @inline
     override protected def removePatchedListener(listener: PatchedListener[A]): Unit = {
@@ -1427,7 +1422,7 @@ object Binding extends MonadicFactory.WithTypeClass[Monad, Binding] {
     }
 
     @inline
-    override def value: Unit = ()
+    override protected def value: Unit = ()
 
   }
 
@@ -1520,15 +1515,14 @@ trait Binding[+A] {
     */
   final def bind: A = macro Binding.Macros.bind
 
-  @deprecated(message = "Use [[value]] instead", since = "11.0.0")
   private[binding] def get: A = value
 
   /**
     * Returns the current value of this [[Binding]]
     *
     * @note This method must not be invoked inside a `@dom` method body or a `Binding { ... }` block..
     */
-  def value: A
+  protected def value: A
 
   protected def removeChangedListener(listener: Binding.ChangedListener[A]): Unit
 

Binding/src/test/scala/com/thoughtworks/binding/BindingTest.scala

@@ -53,9 +53,9 @@ final class BindingTest extends FreeSpec with Matchers {
     }
     hello.watch()
 
-    assert(hello.value == "Hello, World!")
+    assert(hello.get == "Hello, World!")
     target.value = "Each"
-    assert(hello.value == "Hello, Each!")
+    assert(hello.get == "Hello, Each!")
   }
 
   "TripleBinding" in {
@@ -64,10 +64,10 @@ final class BindingTest extends FreeSpec with Matchers {
       input.bind + input.bind + input.bind
     }
     output.watch()
-    assert(output.value == 0)
+    assert(output.get == 0)
     for (i <- 0 until 10) {
       input.value = i
-      assert(output.value == i * 3)
+      assert(output.get == i * 3)
     }
   }
 
@@ -89,7 +89,7 @@ final class BindingTest extends FreeSpec with Matchers {
 
     var resultChanged = 0
 
-    assert(expr1.value == 0)
+    assert(expr1.get == 0)
 
     addChangedListener(expr1, new ChangedListener[Any] {
       override def changed(event: ChangedEvent[Any]): Unit = {
@@ -98,12 +98,12 @@ final class BindingTest extends FreeSpec with Matchers {
     })
 
     assert(resultChanged == 0)
-    assert(expr1.value == 32100)
+    assert(expr1.get == 32100)
 
     expr3.value = 4000
 
     assert(resultChanged == 1)
-    assert(expr1.value == 34100)
+    assert(expr1.get == 34100)
 
   }
 
@@ -122,10 +122,10 @@ final class BindingTest extends FreeSpec with Matchers {
         resultChanged += 1
       }
     })
-    assert(result.value == 0.5)
+    assert(result.get == 0.5)
     assert(resultChanged == 0)
     source.value = 4.0
-    assert(result.value == 0.25)
+    assert(result.get == 0.25)
     assert(resultChanged == 1)
   }
 
@@ -218,7 +218,7 @@ final class BindingTest extends FreeSpec with Matchers {
         assert(event.that == Seq("ForYield 0/3", "ForYield 1/3", "ForYield 2/3"))
     }
     assert(
-      mapped.value == Seq(
+      mapped.get == Seq(
         "ForYield 0/2",
         "ForYield 1/2",
         "ForYield 0/3",
@@ -234,7 +234,7 @@ final class BindingTest extends FreeSpec with Matchers {
       ))
     prefix.value = "3"
     assert(sourceEvents.length == 4)
-    assert(mapped.value == Seq("3 0/2", "3 1/2", "3 0/4", "3 1/4", "3 2/4", "3 3/4"))
+    assert(mapped.get == Seq("3 0/2", "3 1/2", "3 0/4", "3 1/4", "3 2/4", "3 3/4"))
 
     removePatchedListener(mapped, mappedEvents.listener)
     removePatchedListener(source, sourceEvents.listener)
@@ -595,7 +595,7 @@ final class BindingTest extends FreeSpec with Matchers {
       val myVars = Vars(1, 2, 100, 3)
       val filtered = myVars.withFilter(_ < 10).map(x => x)
       filtered.watch()
-      assert(filtered.value == Seq(1, 2, 3))
+      assert(filtered.get == Seq(1, 2, 3))
     }
   }
 
@@ -620,21 +620,21 @@ final class BindingTest extends FreeSpec with Matchers {
     c.watch()
 
     var result: (Int, Int) = null
-    assert((3, 1) == ((c.value, count)))
+    assert((3, 1) == ((c.get, count)))
 
     a.value = 4
-    assert((6, 2) == ((c.value, count)))
+    assert((6, 2) == ((c.get, count)))
 
     b.value = 3
-    assert((7, 3) == ((c.value, count)))
+    assert((7, 3) == ((c.get, count)))
 
     (0 to 100).foreach { i =>
       a.value = i
     }
-    assert((103, 104) == ((c.value, count)))
+    assert((103, 104) == ((c.get, count)))
 
     b.value = 4
-    assert((104, 105) == ((c.value, count)))
+    assert((104, 105) == ((c.get, count)))
   }
 
   "multi to one dependencies" in {
@@ -658,15 +658,15 @@ final class BindingTest extends FreeSpec with Matchers {
     }
     Binding.BindingInstances.ap _
     aPlusOneTimesBPlusOn.watch()
-    aPlusOneTimesBPlusOn.value should be((100 + 1) * (200 + 1))
+    aPlusOneTimesBPlusOn.get should be((100 + 1) * (200 + 1))
     aFlushCount should be(1)
     bFlushCount should be(1)
     a.value = 500
-    aPlusOneTimesBPlusOn.value should be((500 + 1) * (200 + 1))
+    aPlusOneTimesBPlusOn.get should be((500 + 1) * (200 + 1))
     aFlushCount should be(2)
     bFlushCount should be(2)
     b.value = 600
-    aPlusOneTimesBPlusOn.value should be((500 + 1) * (600 + 1))
+    aPlusOneTimesBPlusOn.get should be((500 + 1) * (600 + 1))
     aFlushCount should be(2)
     bFlushCount should be(3)
 
@@ -680,15 +680,15 @@ final class BindingTest extends FreeSpec with Matchers {
         if myVar < 10
       } yield myVar
       filtered.watch()
-      assert(filtered.value == Seq(1, 2, 3))
+      assert(filtered.get == Seq(1, 2, 3))
     }
     domMethod()
   }
 
   "flatMap" in {
     val flatMapped = Constants(Constants(1, 2), Constants(), Constants(3)).flatMap(identity)
     flatMapped.watch()
-    flatMapped.value should be(Seq(1, 2, 3))
+    flatMapped.get should be(Seq(1, 2, 3))
   }
 
   "foreach" in {

Binding/src/test/scala/com/thoughtworks/binding/regression/InsertThenClear.scala

@@ -39,13 +39,13 @@ final class InsertThenClear extends FreeSpec with Matchers {
 
     val mapped = items.map(-_)
     mapped.watch()
-    assert(mapped.value == Seq(-1, -2, -3, -4, -5, -6, -7, -8, -9, -10))
+    assert(mapped.get == Seq(-1, -2, -3, -4, -5, -6, -7, -8, -9, -10))
 
     items.value.insertAll(3, 100 to 103)
-    assert(mapped.value == Seq(-1, -2, -3, -100, -101, -102, -103, -4, -5, -6, -7, -8, -9, -10))
+    assert(mapped.get == Seq(-1, -2, -3, -100, -101, -102, -103, -4, -5, -6, -7, -8, -9, -10))
 
     items.value.clear()
-    assert(mapped.value == Seq.empty)
+    assert(mapped.get == Seq.empty)
   }
 }
 

Binding/src/test/scala/com/thoughtworks/binding/regression/Issue56.scala

@@ -28,7 +28,7 @@ final class Issue56 extends FreeSpec with Matchers {
     result.watch()
     dataSource.value = 300
     isEnabled.value = true
-    result.value should be(301)
+    result.get should be(301)
   }
 
 }

Binding/src/test/scala/com/thoughtworks/binding/regression/Zhihu50863924.scala

@@ -56,9 +56,9 @@ final class Zhihu50863924 extends FreeSpec with Matchers {
     }
 
     render.watch()
-    assert(render.value == Left("None here!"))
+    assert(render.get == Left("None here!"))
     value.value = Some("Changed")
-    assert(render.value == Right("Changed"))
+    assert(render.get == Right("Changed"))
     assert(renderCount0 == 1)
     assert(renderCount1 == 1)
   }

JsPromiseBinding/src/main/scala/com/thoughtworks/binding/JsPromiseBinding.scala

@@ -119,7 +119,7 @@ final class JsPromiseBinding[A](thenable: Thenable[A]) extends Binding[Option[Ei
 
   private val publisher = new SafeBuffer[ChangedListener[Option[Either[Any, A]]]]
 
-  override def value = cache
+  override protected def value = cache
 
   override protected def removeChangedListener(listener: ChangedListener[Option[Either[Any, A]]]): Unit = {
     publisher -= listener

dom/src/test/scala/com/thoughtworks/binding/Issue113.scala

@@ -7,7 +7,7 @@ class Issue113 extends FreeSpec with Matchers {
   "name clash should be avoided" in {
     val dialog = dialogUI("id")
     dialog.watch()
-    dialog.value.outerHTML should be ("""<aside id="id">
+    dialog.get.outerHTML should be ("""<aside id="id">
     <div>
       <fieldset>
       </fieldset>

dom/src/test/scala/com/thoughtworks/binding/Issue118.scala

@@ -8,8 +8,8 @@ class Issue118 extends FreeSpec with Matchers {
   "XHTML boolean attributes should compile" in {
     @dom val elementWithBooleanAttributes = <textarea hidden="hidden" draggable="true" readOnly="readOnly"></textarea>
     elementWithBooleanAttributes.watch()
-    elementWithBooleanAttributes.value.getAttribute("draggable") should be("true")
-    elementWithBooleanAttributes.value.getAttribute("hidden") should be("hidden")
-    elementWithBooleanAttributes.value.getAttribute("readOnly") should be("readOnly")
+    elementWithBooleanAttributes.get.getAttribute("draggable") should be("true")
+    elementWithBooleanAttributes.get.getAttribute("hidden") should be("hidden")
+    elementWithBooleanAttributes.get.getAttribute("readOnly") should be("readOnly")
   }
 }

dom/src/test/scala/com/thoughtworks/binding/Issue21.scala

@@ -10,6 +10,6 @@ class Issue21 extends FreeSpec with Matchers {
   "dashed-id should compile" in {
     @dom def invalidId: Binding[html.Div] = <div id="dashed-id" class={ s"${`dashed-id`.tagName}-1" }></div>
     invalidId.watch()
-    invalidId.value.className should be("DIV-1")
+    invalidId.get.className should be("DIV-1")
   }
 }