From d76d3716b1a01548d597d8584cb0cff8f39ce97c Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 29 Apr 2026 11:50:07 +0200 Subject: [PATCH] stream: remove duplicated utility Signed-off-by: Antoine du Hamel --- lib/internal/webstreams/queuingstrategies.js | 9 +------- lib/internal/webstreams/readablestream.js | 19 +++++----------- lib/internal/webstreams/transformstream.js | 12 +++------- lib/internal/webstreams/util.js | 23 ++++++++++++++------ lib/internal/webstreams/writablestream.js | 21 ++++++------------ 5 files changed, 33 insertions(+), 51 deletions(-) diff --git a/lib/internal/webstreams/queuingstrategies.js b/lib/internal/webstreams/queuingstrategies.js index cb2adefdacaee9..aa5e5e58af23af 100644 --- a/lib/internal/webstreams/queuingstrategies.js +++ b/lib/internal/webstreams/queuingstrategies.js @@ -19,6 +19,7 @@ const { const { customInspect, + getNonWritablePropertyDescriptor, } = require('internal/webstreams/util'); const { @@ -46,14 +47,6 @@ const byteSizeFunction = ObjectDefineProperty( ); const countSizeFunction = ObjectDefineProperty(() => 1, 'name', nameDescriptor); -const getNonWritablePropertyDescriptor = (value) => { - return { - __proto__: null, - configurable: true, - value, - }; -}; - /** * @type {QueuingStrategy} */ diff --git a/lib/internal/webstreams/readablestream.js b/lib/internal/webstreams/readablestream.js index 597135778a1e0f..7abde514cf78a5 100644 --- a/lib/internal/webstreams/readablestream.js +++ b/lib/internal/webstreams/readablestream.js @@ -106,15 +106,16 @@ const { enqueueValueWithSize, extractHighWaterMark, extractSizeAlgorithm, - lazyTransfer, + getNonWritablePropertyDescriptor, isBrandCheck, - resetQueue, - setPromiseHandled, + kState, + kType, + lazyTransfer, nonOpCancel, nonOpPull, nonOpStart, - kType, - kState, + resetQueue, + setPromiseHandled, } = require('internal/webstreams/util'); const { @@ -171,14 +172,6 @@ function lazyReadableReleasingError() { return releasingError; } -const getNonWritablePropertyDescriptor = (value) => { - return { - __proto__: null, - configurable: true, - value, - }; -}; - /** * @typedef {import('../abort_controller').AbortSignal} AbortSignal * @typedef {import('./queuingstrategies').QueuingStrategy} QueuingStrategy diff --git a/lib/internal/webstreams/transformstream.js b/lib/internal/webstreams/transformstream.js index e2d15c05bca249..96d48b438d479c 100644 --- a/lib/internal/webstreams/transformstream.js +++ b/lib/internal/webstreams/transformstream.js @@ -47,11 +47,12 @@ const { customInspect, extractHighWaterMark, extractSizeAlgorithm, + getNonWritablePropertyDescriptor, isBrandCheck, - nonOpFlush, - kType, kState, + kType, nonOpCancel, + nonOpFlush, } = require('internal/webstreams/util'); const { @@ -72,13 +73,6 @@ const { const assert = require('internal/assert'); const kSkipThrow = Symbol('kSkipThrow'); -const getNonWritablePropertyDescriptor = (value) => { - return { - __proto__: null, - configurable: true, - value, - }; -}; /** * @typedef {import('./queuingstrategies').QueuingStrategy diff --git a/lib/internal/webstreams/util.js b/lib/internal/webstreams/util.js index 81e65815eabe6b..2778b434c50e25 100644 --- a/lib/internal/webstreams/util.js +++ b/lib/internal/webstreams/util.js @@ -52,6 +52,14 @@ const AsyncIterator = { return: undefined, }; +const getNonWritablePropertyDescriptor = (value) => { + return { + __proto__: null, + configurable: true, + value, + }; +}; + function extractHighWaterMark(value, defaultHWM) { if (value === undefined) return defaultHWM; value = +value; @@ -204,25 +212,26 @@ module.exports = { ArrayBufferViewGetByteOffset, AsyncIterator, canCopyArrayBuffer, - createPromiseCallback, cloneAsUint8Array, copyArrayBuffer, + createPromiseCallback, customInspect, dequeueValue, enqueueValueWithSize, extractHighWaterMark, extractSizeAlgorithm, - lazyTransfer, + getNonWritablePropertyDescriptor, isBrandCheck, isPromisePending, - peekQueueValue, - resetQueue, - setPromiseHandled, + kState, + kType, + lazyTransfer, nonOpCancel, nonOpFlush, nonOpPull, nonOpStart, nonOpWrite, - kType, - kState, + peekQueueValue, + resetQueue, + setPromiseHandled, }; diff --git a/lib/internal/webstreams/writablestream.js b/lib/internal/webstreams/writablestream.js index ca20c08b258c3c..8f62a199d5b301 100644 --- a/lib/internal/webstreams/writablestream.js +++ b/lib/internal/webstreams/writablestream.js @@ -61,17 +61,18 @@ const { enqueueValueWithSize, extractHighWaterMark, extractSizeAlgorithm, - lazyTransfer, + getNonWritablePropertyDescriptor, isBrandCheck, isPromisePending, - peekQueueValue, - resetQueue, - setPromiseHandled, + kState, + kType, + lazyTransfer, nonOpCancel, nonOpStart, nonOpWrite, - kType, - kState, + peekQueueValue, + resetQueue, + setPromiseHandled, } = require('internal/webstreams/util'); const { @@ -106,14 +107,6 @@ function lazyWritableReleasedError() { return releasedError; } -const getNonWritablePropertyDescriptor = (value) => { - return { - __proto__: null, - configurable: true, - value, - }; -}; - /** * @typedef {import('../abort_controller').AbortSignal} AbortSignal * @typedef {import('./queuingstrategies').QueuingStrategy