WIP

Author: ptrdom

dom/src/main/scala/org/scalajs/dom/ReadableStreamType.scala renamed to dom/src/main/scala-2/org/scalajs/dom/ReadableStreamType.scala

@@ -8,4 +8,4 @@ sealed trait ReadableStreamType extends js.Any
 
 object ReadableStreamType {
   val bytes: ReadableStreamType = "bytes".asInstanceOf[ReadableStreamType]
-}
+}

dom/src/main/scala-3/org/scalajs/dom/ReadableStreamType.scala

@@ -0,0 +1,7 @@
+package org.scalajs.dom
+
+opaque type ReadableStreamType <: String = String
+
+object ReadableStreamType {
+  val bytes: ReadableStreamType = "bytes"
+}

dom/src/main/scala/org/scalajs/dom/ReadableStreamController.scala

@@ -1,6 +1,7 @@
 package org.scalajs.dom
 
 import scala.scalajs.js
+import scala.scalajs.js.annotation.JSGlobal
 
 /** [[https://streams.spec.whatwg.org/#rs-controller-class ¶3.3 Class ReadableStreamController]] of whatwg spec
   *
@@ -13,7 +14,8 @@ import scala.scalajs.js
   *   Type of the Chunks to be enqueued to the Stream
   */
 @js.native
-trait ReadableStreamController[-T] extends js.Object {
+@JSGlobal
+class ReadableStreamController[-T] private[this] (stream: ReadableStream[T] = null) extends js.Object {
 
   /** The desiredSize getter returns the desired size to fill the controlled stream’s internal queue. It can be
     * negative, if the queue is over-full. An underlying source should use this information to determine when and how to

dom/src/main/scala/org/scalajs/dom/ReadableStreamReader.scala

@@ -31,7 +31,8 @@ class ReadableStreamReader[+T](stream: ReadableStream[T]) extends js.Object {
     * If the reader is active, the cancel method behaves the same as that for the associated stream. When done, it
     * automatically releases the lock.
     */
-  def cancel[U](reason: js.UndefOr[U]): js.Promise[U] = js.native
+  def cancel[U](reason: U): js.Promise[U] = js.native
+  def cancel(): js.Promise[Unit] = js.native
 
   /** See [[https://streams.spec.whatwg.org/#reader-read 3.4.4.3. read()]] of whatwg Stream spec.
     *

tests-chrome/src/test/scala/org/scalajs/dom/tests/chrome/ChromeTests.scala

@@ -3,4 +3,4 @@ package org.scalajs.dom.tests.chrome
 import org.scalajs.dom.tests.shared._
 import org.scalajs.dom.tests.webworker._
 
-class ChromeTests extends SharedTests with WebWorkerTests
+class ChromeTests extends SharedTests with WebWorkerTests with BrowserTests

tests-firefox/src/test/scala/org/scalajs/dom/tests/firefox/FirefoxTests.scala

@@ -3,4 +3,4 @@ package org.scalajs.dom.tests.firefox
 import org.scalajs.dom.tests.shared._
 import org.scalajs.dom.tests.webworker._
 
-class FirefoxTests extends SharedTests with WebWorkerTests
+class FirefoxTests extends SharedTests with WebWorkerTests with BrowserTests

tests-shared/src/main/scala/org/scalajs/dom/tests/shared/BrowserTests.scala

@@ -0,0 +1,55 @@
+package org.scalajs.dom.tests.shared
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.scalajs.dom.ReadableStream
+import org.scalajs.dom.ReadableStreamController
+import org.scalajs.dom.ReadableStreamUnderlyingSource
+import org.scalajs.dom.tests.shared.AsyncTesting.AsyncResult
+import org.scalajs.dom.tests.shared.AsyncTesting._
+import org.scalajs.dom.tests.shared.AsyncTesting.async
+
+import scala.concurrent.Future
+import scala.scalajs.js
+import scala.scalajs.js.Thenable.Implicits._
+
+trait BrowserTests {
+
+  @Test
+  final def ReadableStreamTest: AsyncResult = async {
+    case class Tuna(color: String)
+
+    val expectedTunas = Seq(
+        Tuna("blue"),
+        Tuna("red")
+    )
+
+    val stream = ReadableStream[Tuna](
+        new ReadableStreamUnderlyingSource[Tuna] {
+          start = { (controller: ReadableStreamController[Tuna]) =>
+            controller.enqueue(Tuna("blue"))
+            controller.enqueue(Tuna("red"))
+            controller.close()
+          }: js.Function1[ReadableStreamController[Tuna], Unit]
+        }
+    )
+
+    val reader = stream.getReader()
+
+    def read(tunas: Seq[Tuna]): Future[Seq[Tuna]] = {
+      reader
+        .read()
+        .flatMap { chunk =>
+          if (chunk.done) {
+            Future.successful(tunas)
+          } else {
+            read(tunas :+ chunk.value)
+          }
+        }
+    }
+    read(Seq.empty)
+      .map { receivedTunas =>
+        assertEquals(receivedTunas, expectedTunas)
+      }
+  }
+}

tests-shared/src/main/scala/org/scalajs/dom/tests/shared/SharedTests.scala

@@ -1,12 +1,7 @@
 package org.scalajs.dom.tests.shared
 
-import org.junit.Assert.assertEquals
-import org.junit.Test
 import org.scalajs.dom.tests.shared.AsyncTesting._
-
-import scala.concurrent.Future
-import scala.scalajs.js
-import scala.scalajs.js.Thenable.Implicits._
+import org.junit.Test
 
 trait SharedTests {
 
@@ -41,42 +36,4 @@ trait SharedTests {
 
   @Test final def WindowIdbTest(): AsyncResult =
     IdbTest(window.indexedDB)
-
-  @Test
-  final def ReadableStreamTest: AsyncResult = async {
-    case class Tuna(color: String)
-
-    val expectedTunas = Seq(
-        Tuna("blue"),
-        Tuna("red")
-    )
-
-    val stream = ReadableStream[Tuna](
-        new ReadableStreamUnderlyingSource[Tuna] {
-          start = { (controller: ReadableStreamController[Tuna]) =>
-            controller.enqueue(Tuna("blue"))
-            controller.enqueue(Tuna("red"))
-            controller.close()
-          }: js.Function1[ReadableStreamController[Tuna], Unit]
-        }
-    )
-
-    val reader = stream.getReader()
-
-    def read(tunas: Seq[Tuna]): Future[Seq[Tuna]] = {
-      reader
-        .read()
-        .flatMap { chunk =>
-          if (chunk.done) {
-            Future.successful(tunas)
-          } else {
-            read(tunas :+ chunk.value)
-          }
-        }
-    }
-    read(Seq.empty)
-      .map { receivedTunas =>
-        assertEquals(receivedTunas, expectedTunas)
-      }
-  }
 }