Skip to content

Commit 30d0e6b

Browse files
authored
Merge pull request #551 from scala-js/issue/515
Fix #515 Blob.stream() emits Uint8Array
2 parents 0e3309a + 7c2f2f4 commit 30d0e6b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Diff for: api-reports/2_12.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ Blob[JC] def arrayBuffer(): js.Promise[ArrayBuffer]
311311
Blob[JC] def close(): Unit (@deprecated in 1.2.0)
312312
Blob[JC] def size: Double
313313
Blob[JC] def slice(start: Double?, end: Double?, contentType: String?): Blob
314-
Blob[JC] def stream(): ReadableStream[Byte]
314+
Blob[JC] def stream(): ReadableStream[Uint8Array]
315315
Blob[JC] def text(): js.Promise[String]
316316
Blob[JC] def `type`: String
317317
Blob[JO]
@@ -1601,7 +1601,7 @@ File[JC] def close(): Unit (@deprecated in 1.2.0)
16011601
File[JC] def name: String
16021602
File[JC] def size: Double
16031603
File[JC] def slice(start: Double?, end: Double?, contentType: String?): Blob
1604-
File[JC] def stream(): ReadableStream[Byte]
1604+
File[JC] def stream(): ReadableStream[Uint8Array]
16051605
File[JC] def text(): js.Promise[String]
16061606
File[JC] def `type`: String
16071607
FileList[JC] @JSBracketAccess def apply(index: Int): T

Diff for: api-reports/2_13.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ Blob[JC] def arrayBuffer(): js.Promise[ArrayBuffer]
311311
Blob[JC] def close(): Unit (@deprecated in 1.2.0)
312312
Blob[JC] def size: Double
313313
Blob[JC] def slice(start: Double?, end: Double?, contentType: String?): Blob
314-
Blob[JC] def stream(): ReadableStream[Byte]
314+
Blob[JC] def stream(): ReadableStream[Uint8Array]
315315
Blob[JC] def text(): js.Promise[String]
316316
Blob[JC] def `type`: String
317317
Blob[JO]
@@ -1601,7 +1601,7 @@ File[JC] def close(): Unit (@deprecated in 1.2.0)
16011601
File[JC] def name: String
16021602
File[JC] def size: Double
16031603
File[JC] def slice(start: Double?, end: Double?, contentType: String?): Blob
1604-
File[JC] def stream(): ReadableStream[Byte]
1604+
File[JC] def stream(): ReadableStream[Uint8Array]
16051605
File[JC] def text(): js.Promise[String]
16061606
File[JC] def `type`: String
16071607
FileList[JC] @JSBracketAccess def apply(index: Int): T

Diff for: src/main/scala/org/scalajs/dom/lib.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import scala.collection.mutable
1010
import scala.language.implicitConversions
1111
import scala.scalajs.js
1212
import scala.scalajs.js.annotation._
13-
import scala.scalajs.js.typedarray.ArrayBuffer
13+
import scala.scalajs.js.typedarray.{ArrayBuffer, Uint8Array}
1414
import scala.scalajs.js.|
1515

1616
@js.native
@@ -6617,7 +6617,7 @@ class Blob(blobParts: js.Array[js.Any] = js.native, options: BlobPropertyBag = j
66176617
*
66186618
* MDN
66196619
*/
6620-
def stream(): ReadableStream[Byte] = js.native
6620+
def stream(): ReadableStream[Uint8Array] = js.native
66216621

66226622
/** Returns a promise that resolves with a USVString containing the entire contents of the blob interpreted as UTF-8
66236623
* text.

0 commit comments

Comments
 (0)