Skip to content

Commit b996e3b

Browse files
mcollinadanielleadams
authored andcommitted
stream: do not use _stream_* anymore
Remove all leftover usage of _stream_* and keep all of them as legacy. We do not deprecate the old modules to avoid disrupition and ease maintainance. PR-URL: #36684 Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent 67dd48e commit b996e3b

22 files changed

+40
-40
lines changed

lib/_stream_duplex.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
// TODO(mcollina): deprecate this file
3+
// Keep this file as an alias for the full stream module.
44

5-
const Duplex = require('internal/streams/duplex');
6-
module.exports = Duplex;
5+
module.exports = require('stream').Duplex;

lib/_stream_passthrough.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
// TODO(mcollina): deprecate this file
3+
// Keep this file as an alias for the full stream module.
44

5-
const PassThrough = require('internal/streams/passthrough');
6-
module.exports = PassThrough;
5+
module.exports = require('stream').PassThrough;

lib/_stream_readable.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
// TODO(mcollina): deprecate this file
3+
// Keep this file as an alias for the full stream module.
44

5-
const Readable = require('internal/streams/readable');
6-
module.exports = Readable;
5+
module.exports = require('stream').Readable;

lib/_stream_transform.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
// TODO(mcollina): deprecate this file
3+
// Keep this file as an alias for the full stream module.
44

5-
const Transform = require('internal/streams/transform');
6-
module.exports = Transform;
5+
module.exports = require('stream').Transform;

lib/_stream_writable.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
// TODO(mcollina): deprecate this file
3+
// Keep this file as an alias for the full stream module.
44

5-
const Writable = require('internal/streams/writable');
6-
module.exports = Writable;
5+
module.exports = require('stream').Writable;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
require('../common');
4+
5+
const assert = require('assert');
6+
const stream = require('stream');
7+
8+
// Verify that all individual aliases are left in place.
9+
10+
assert.strictEqual(stream.Readable, require('_stream_readable'));
11+
assert.strictEqual(stream.Writable, require('_stream_writable'));
12+
assert.strictEqual(stream.Duplex, require('_stream_duplex'));
13+
assert.strictEqual(stream.Transform, require('_stream_transform'));
14+
assert.strictEqual(stream.PassThrough, require('_stream_passthrough'));

test/parallel/test-stream-pipe-after-end.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
'use strict';
2323
const common = require('../common');
2424
const assert = require('assert');
25-
const Readable = require('_stream_readable');
26-
const Writable = require('_stream_writable');
25+
const { Readable, Writable } = require('stream');
2726

2827
class TestReadable extends Readable {
2928
constructor(opt) {

test/parallel/test-stream-pipe-needDrain.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
const common = require('../common');
44
const assert = require('assert');
5-
const Readable = require('_stream_readable');
6-
const Writable = require('_stream_writable');
5+
const { Readable, Writable } = require('stream');
76

87
// Pipe should pause temporarily if writable needs drain.
98
{

test/parallel/test-stream2-base64-single-char-read-end.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121

2222
'use strict';
2323
require('../common');
24-
const R = require('_stream_readable');
25-
const W = require('_stream_writable');
24+
const { Readable: R, Writable: W } = require('stream');
2625
const assert = require('assert');
2726

2827
const src = new R({ encoding: 'base64' });

test/parallel/test-stream2-basic.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
'use strict';
2323

2424
const common = require('../common');
25-
const R = require('_stream_readable');
26-
const W = require('_stream_writable');
25+
const { Readable: R, Writable: W } = require('stream');
2726
const assert = require('assert');
2827

2928
const EE = require('events').EventEmitter;

test/parallel/test-stream2-compatibility.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121

2222
'use strict';
2323
require('../common');
24-
const R = require('_stream_readable');
25-
const W = require('_stream_writable');
24+
const { Readable: R, Writable: W } = require('stream');
2625
const assert = require('assert');
2726

2827
let ondataCalled = 0;

test/parallel/test-stream2-decode-partial.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22
require('../common');
3-
const Readable = require('_stream_readable');
3+
const { Readable } = require('stream');
44
const assert = require('assert');
55

66
let buf = '';

test/parallel/test-stream2-objects.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
'use strict';
2323

2424
const common = require('../common');
25-
const Readable = require('_stream_readable');
26-
const Writable = require('_stream_writable');
25+
const { Readable, Writable } = require('stream');
2726
const assert = require('assert');
2827

2928
function toArray(callback) {

test/parallel/test-stream2-readable-from-list.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
'use strict';
2424
require('../common');
2525
const assert = require('assert');
26-
const fromList = require('_stream_readable')._fromList;
26+
const fromList = require('stream').Readable._fromList;
2727
const BufferList = require('internal/streams/buffer_list');
2828
const util = require('util');
2929

test/parallel/test-stream2-readable-non-empty-end.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
'use strict';
2323
const common = require('../common');
2424
const assert = require('assert');
25-
const Readable = require('_stream_readable');
25+
const { Readable } = require('stream');
2626

2727
let len = 0;
2828
const chunks = new Array(10);

test/parallel/test-stream2-readable-wrap-destroy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22
const common = require('../common');
33

4-
const Readable = require('_stream_readable');
4+
const { Readable } = require('stream');
55
const EE = require('events').EventEmitter;
66

77
const oldStream = new EE();

test/parallel/test-stream2-readable-wrap-empty.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
'use strict';
2323
const common = require('../common');
2424

25-
const Readable = require('_stream_readable');
25+
const { Readable } = require('stream');
2626
const EE = require('events').EventEmitter;
2727

2828
const oldStream = new EE();

test/parallel/test-stream2-readable-wrap-error.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
const common = require('../common');
33
const assert = require('assert');
44

5-
const Readable = require('_stream_readable');
5+
const { Readable } = require('stream');
66
const EE = require('events').EventEmitter;
77

88
class LegacyStream extends EE {

test/parallel/test-stream2-readable-wrap.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
'use strict';
2323
const common = require('../common');
2424
const assert = require('assert');
25-
const Readable = require('_stream_readable');
26-
const Writable = require('_stream_writable');
25+
const { Readable, Writable } = require('stream');
2726
const EE = require('events').EventEmitter;
2827

2928
function runTest(highWaterMark, objectMode, produce) {

test/parallel/test-stream2-set-encoding.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
'use strict';
2323
const common = require('../common');
2424
const assert = require('assert');
25-
const R = require('_stream_readable');
25+
const { Readable: R } = require('stream');
2626

2727
class TestReader extends R {
2828
constructor(n, opts) {

test/parallel/test-stream2-transform.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
'use strict';
2323
const common = require('../common');
2424
const assert = require('assert');
25-
const PassThrough = require('_stream_passthrough');
26-
const Transform = require('_stream_transform');
25+
const { PassThrough, Transform } = require('stream');
2726

2827
{
2928
// Verify writable side consumption

test/parallel/test-stream2-writable.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
'use strict';
2323

2424
const common = require('../common');
25-
const W = require('_stream_writable');
26-
const D = require('_stream_duplex');
25+
const { Writable: W, Duplex: D } = require('stream');
2726
const assert = require('assert');
2827

2928
class TestWriter extends W {

0 commit comments

Comments
 (0)