Merge ReadableByteStream into ReadableStream

reference-implementation/lib/helpers.js

@@ -36,6 +36,10 @@ export function createArrayFromList(elements) {
   return elements.slice();
 }
 
+export function ArrayBufferCopy(dest, destOffset, src, srcOffset, n) {
+  new Uint8Array(dest).set(new Uint8Array(src, srcOffset, n), destOffset);
+}
+
 export function CreateIterResultObject(value, done) {
   assert(typeof done === 'boolean');
   const obj = {};
@@ -44,6 +48,20 @@ export function CreateIterResultObject(value, done) {
   return obj;
 }
 
+export function IsFiniteNonNegativeNumber(v) {
+  if (Number.isNaN(v)) {
+    return false;
+  }
+  if (v === +Infinity) {
+    return false;
+  }
+  if (v < 0) {
+    return false;
+  }
+
+  return true;
+}
+
 export function InvokeOrNoop(O, P, args) {
   const method = O[P];
   if (method === undefined) {
@@ -90,11 +108,13 @@ export function PromiseInvokeOrFallbackOrNoop(O, P1, args1, P2, args2) {
   }
 }
 
-export function ValidateAndNormalizeQueuingStrategy(size, highWaterMark) {
-  if (size !== undefined && typeof size !== 'function') {
-    throw new TypeError('size property of a queuing strategy must be a function');
-  }
+export function TransferArrayBuffer(buffer) {
+  // No-op. Just for marking places where detaching an ArrayBuffer is required.
+
+  return buffer;
+}
 
+export function ValidateAndNormalizeHighWaterMark(highWaterMark) {
   highWaterMark = Number(highWaterMark);
   if (Number.isNaN(highWaterMark)) {
     throw new TypeError('highWaterMark property of a queuing strategy must be convertible to a non-NaN number');
@@ -103,5 +123,15 @@ export function ValidateAndNormalizeQueuingStrategy(size, highWaterMark) {
     throw new RangeError('highWaterMark property of a queuing strategy must be nonnegative');
   }
 
+  return highWaterMark;
+}
+
+export function ValidateAndNormalizeQueuingStrategy(size, highWaterMark) {
+  if (size !== undefined && typeof size !== 'function') {
+    throw new TypeError('size property of a queuing strategy must be a function');
+  }
+
+  highWaterMark = ValidateAndNormalizeHighWaterMark(highWaterMark);
+
   return { size, highWaterMark };
 }

reference-implementation/lib/queue-with-sizes.js

@@ -1,4 +1,5 @@
 const assert = require('assert');
+import { IsFiniteNonNegativeNumber } from './helpers';
 
 export function DequeueValue(queue) {
   assert(queue.length > 0, 'Spec-level failure: should never dequeue from an empty queue.');
@@ -8,7 +9,7 @@ export function DequeueValue(queue) {
 
 export function EnqueueValueWithSize(queue, value, size) {
   size = Number(size);
-  if (Number.isNaN(size) || size === +Infinity || size < 0) {
+  if (!IsFiniteNonNegativeNumber(size)) {
     throw new RangeError('Size must be a finite, non-NaN, non-negative number.');
   }