Skip to content

Commit

Permalink
stream: remove abortReason from WritableStreamDefaultController
Browse files Browse the repository at this point in the history
The `abortReason` has been removed from the spec since we can get
the abort reason via `controller.signal.reason`.

This reflects the change.

Signed-off-by: Daeyeon Jeong [email protected]
PR-URL: nodejs#44540
Refs: https://streams.spec.whatwg.org/#ws-default-controller-class-definition
Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
  • Loading branch information
daeyeon authored and Fyko committed Sep 15, 2022
1 parent 2f4829b commit 1239f5d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 25 deletions.
4 changes: 0 additions & 4 deletions doc/api/webstreams.md
Original file line number Diff line number Diff line change
Expand Up @@ -978,10 +978,6 @@ changes:
The `WritableStreamDefaultController` manage's the {WritableStream}'s
internal state.
#### `writableStreamDefaultController.abortReason`
* Type: {any} The `reason` value passed to `writableStream.abort()`.
#### `writableStreamDefaultController.error(error)`
<!-- YAML
Expand Down
15 changes: 0 additions & 15 deletions lib/internal/webstreams/writablestream.js
Original file line number Diff line number Diff line change
Expand Up @@ -508,15 +508,6 @@ class WritableStreamDefaultController {
resetQueue(this);
}

/**
* @type {any}
*/
get abortReason() {
if (!isWritableStreamDefaultController(this))
throw new ERR_INVALID_THIS('WritableStreamDefaultController');
return this[kState].abortReason;
}

/**
* @type {AbortSignal}
*/
Expand Down Expand Up @@ -545,7 +536,6 @@ class WritableStreamDefaultController {
}

ObjectDefineProperties(WritableStreamDefaultController.prototype, {
abortReason: kEnumerableProperty,
signal: kEnumerableProperty,
error: kEnumerableProperty,
});
Expand Down Expand Up @@ -637,10 +627,6 @@ function writableStreamAbort(stream, reason) {
if (state === 'closed' || state === 'errored')
return PromiseResolve();

// TODO(daeyeon): Remove `controller[kState].abortReason` and use
// `controller[kState].abortController.signal.reason` for the
// `WritableStreamDefaultController.prototype.abortReason` getter.
controller[kState].abortReason = reason;
controller[kState].abortController.abort(reason);

if (stream[kState].pendingAbortRequest.abort.promise !== undefined)
Expand Down Expand Up @@ -1253,7 +1239,6 @@ function setupWritableStreamDefaultController(
assert(stream[kState].controller === undefined);
controller[kState] = {
abortAlgorithm,
abortReason: undefined,
closeAlgorithm,
highWaterMark,
queue: [],
Expand Down
6 changes: 0 additions & 6 deletions test/parallel/test-whatwg-writablestream.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,6 @@ class Sink {
code: 'ERR_INVALID_THIS',
});

assert.throws(() => {
Reflect.get(WritableStreamDefaultController.prototype, 'abortReason', {});
}, {
code: 'ERR_INVALID_THIS',
});

assert.throws(() => {
Reflect.get(WritableStreamDefaultController.prototype, 'signal', {});
}, {
Expand Down

0 comments on commit 1239f5d

Please sign in to comment.