Skip to content

Commit 9cfa60d

Browse files
committed
stream: fix test failures
1 parent 804399a commit 9cfa60d

3 files changed

Lines changed: 21 additions & 21 deletions

File tree

lib/internal/webstreams/readablestream.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ class ReadableStreamDefaultController {
10211021
[kType] = 'ReadableStreamDefaultController';
10221022

10231023
constructor(skipThrowSymbol) {
1024-
if (new.target === ReadableStreamDefaultController || skipThrowSymbol !== kSkipThrow) {
1024+
if (skipThrowSymbol !== kSkipThrow) {
10251025
throw new ERR_ILLEGAL_CONSTRUCTOR();
10261026
}
10271027
}
@@ -1079,12 +1079,13 @@ ObjectDefineProperties(ReadableStreamDefaultController.prototype, {
10791079
[SymbolToStringTag]: getNonWritablePropertyDescriptor(ReadableStreamDefaultController.name),
10801080
});
10811081

1082-
class ReadableStreamDefaultControllerClazz extends ReadableStreamDefaultController {
1083-
constructor(skipThrowSymbol) {
1084-
super(skipThrowSymbol);
1085-
this[kType] = 'ReadableStreamDefaultController';
1086-
this[kState] = {};
1087-
}
1082+
function createReadableStreamDefaultController() {
1083+
const controller = new ReadableStreamDefaultController(kSkipThrow);
1084+
1085+
controller[kType] = 'ReadableStreamDefaultController';
1086+
controller[kState] = {};
1087+
1088+
return controller;
10881089
}
10891090

10901091
class ReadableByteStreamController {
@@ -2415,7 +2416,7 @@ function setupReadableStreamDefaultControllerFromSource(
24152416
source,
24162417
highWaterMark,
24172418
sizeAlgorithm) {
2418-
const controller = new ReadableStreamDefaultControllerClazz(kSkipThrow);
2419+
const controller = createReadableStreamDefaultController();
24192420
const start = source?.start;
24202421
const pull = source?.pull;
24212422
const cancel = source?.cancel;

lib/internal/webstreams/transformstream.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const {
88
PromiseResolve,
99
ReflectConstruct,
1010
SymbolToStringTag,
11+
Symbol,
1112
} = primordials;
1213

1314
const {
@@ -334,11 +335,10 @@ ObjectDefineProperties(TransformStreamDefaultController.prototype, {
334335
[SymbolToStringTag]: getNonWritablePropertyDescriptor(TransformStreamDefaultController.name),
335336
});
336337

337-
class TransformStreamDefaultControllerClazz extends TransformStreamDefaultController {
338-
constructor(skipThrowSymbol) {
339-
super(skipThrowSymbol);
340-
this[kType] = 'TransformStreamDefaultController';
341-
}
338+
function createTransformStreamDefaultController() {
339+
const controller = new TransformStreamDefaultController(kSkipThrow);
340+
controller[kType] = 'TransformStreamDefaultController';
341+
return controller;
342342
}
343343

344344
const isTransformStream =
@@ -455,7 +455,7 @@ function setupTransformStreamDefaultController(
455455
function setupTransformStreamDefaultControllerFromTransformer(
456456
stream,
457457
transformer) {
458-
const controller = new TransformStreamDefaultControllerClazz(kSkipThrow);
458+
const controller = createTransformStreamDefaultController();
459459
const transform = transformer?.transform || defaultTransformAlgorithm;
460460
const flush = transformer?.flush || nonOpFlush;
461461
const transformAlgorithm =

lib/internal/webstreams/writablestream.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ class WritableStreamDefaultController {
524524
[kType] = 'WritableStreamDefaultController';
525525

526526
constructor(skipThrowSymbol) {
527-
if (new.target === WritableStreamDefaultController || skipThrowSymbol !== kSkipThrow) {
527+
if (skipThrowSymbol !== kSkipThrow) {
528528
throw new ERR_ILLEGAL_CONSTRUCTOR();
529529
}
530530
}
@@ -572,11 +572,10 @@ ObjectDefineProperties(WritableStreamDefaultController.prototype, {
572572
[SymbolToStringTag]: getNonWritablePropertyDescriptor(WritableStreamDefaultController.name),
573573
});
574574

575-
class WritableStreamDefaultControllerClazz extends WritableStreamDefaultController {
576-
constructor(skipThrowSymbol) {
577-
super(skipThrowSymbol);
578-
this[kType] = 'WritableStreamDefaultController';
579-
}
575+
function createWritableStreamDefaultController() {
576+
const controller = new WritableStreamDefaultController(kSkipThrow);
577+
controller[kType] = 'WritableStreamDefaultController';
578+
return controller;
580579
}
581580

582581
const isWritableStream =
@@ -1235,7 +1234,7 @@ function setupWritableStreamDefaultControllerFromSink(
12351234
sink,
12361235
highWaterMark,
12371236
sizeAlgorithm) {
1238-
const controller = new WritableStreamDefaultControllerClazz(kSkipThrow);
1237+
const controller = createWritableStreamDefaultController();
12391238
const start = sink?.start;
12401239
const write = sink?.write;
12411240
const close = sink?.close;

0 commit comments

Comments
 (0)