stream: do not use _stream_* anymore

lib/_stream_duplex.js

@@ -1,6 +1,5 @@
 'use strict';
 
-// TODO(mcollina): deprecate this file
+// Keep this file as an alias for the full stream module.
 
-const Duplex = require('internal/streams/duplex');
-module.exports = Duplex;
+module.exports = require('stream').Duplex;

lib/_stream_passthrough.js

@@ -1,6 +1,5 @@
 'use strict';
 
-// TODO(mcollina): deprecate this file
+// Keep this file as an alias for the full stream module.
 
-const PassThrough = require('internal/streams/passthrough');
-module.exports = PassThrough;
+module.exports = require('stream').PassThrough;

lib/_stream_readable.js

@@ -1,6 +1,5 @@
 'use strict';
 
-// TODO(mcollina): deprecate this file
+// Keep this file as an alias for the full stream module.
 
-const Readable = require('internal/streams/readable');
-module.exports = Readable;
+module.exports = require('stream').Readable;

lib/_stream_transform.js

@@ -1,6 +1,5 @@
 'use strict';
 
-// TODO(mcollina): deprecate this file
+// Keep this file as an alias for the full stream module.
 
-const Transform = require('internal/streams/transform');
-module.exports = Transform;
+module.exports = require('stream').Transform;

lib/_stream_writable.js

@@ -1,6 +1,5 @@
 'use strict';
 
-// TODO(mcollina): deprecate this file
+// Keep this file as an alias for the full stream module.
 
-const Writable = require('internal/streams/writable');
-module.exports = Writable;
+module.exports = require('stream').Writable;

test/parallel/test-stream-aliases-legacy.js

@@ -0,0 +1,14 @@
+'use strict';
+
+require('../common');
+
+const assert = require('assert');
+const stream = require('stream');
+
+// Verify that all individual aliases are left in place.
+
+assert.strictEqual(stream.Readable, require('_stream_readable'));
+assert.strictEqual(stream.Writable, require('_stream_writable'));
+assert.strictEqual(stream.Duplex, require('_stream_duplex'));
+assert.strictEqual(stream.Transform, require('_stream_transform'));
+assert.strictEqual(stream.PassThrough, require('_stream_passthrough'));

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

@@ -22,8 +22,7 @@
 'use strict';
 const common = require('../common');
 const assert = require('assert');
-const Readable = require('_stream_readable');
-const Writable = require('_stream_writable');
+const { Readable, Writable } = require('stream');
 
 class TestReadable extends Readable {
   constructor(opt) {

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

@@ -2,8 +2,7 @@
 
 const common = require('../common');
 const assert = require('assert');
-const Readable = require('_stream_readable');
-const Writable = require('_stream_writable');
+const { Readable, Writable } = require('stream');
 
 // Pipe should pause temporarily if writable needs drain.
 {

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

@@ -21,8 +21,7 @@
 
 'use strict';
 require('../common');
-const R = require('_stream_readable');
-const W = require('_stream_writable');
+const { Readable: R, Writable: W } = require('stream');
 const assert = require('assert');
 
 const src = new R({ encoding: 'base64' });

test/parallel/test-stream2-basic.js

@@ -22,8 +22,7 @@
 'use strict';
 
 const common = require('../common');
-const R = require('_stream_readable');
-const W = require('_stream_writable');
+const { Readable: R, Writable: W } = require('stream');
 const assert = require('assert');
 
 const EE = require('events').EventEmitter;

test/parallel/test-stream2-compatibility.js

@@ -21,8 +21,7 @@
 
 'use strict';
 require('../common');
-const R = require('_stream_readable');
-const W = require('_stream_writable');
+const { Readable: R, Writable: W } = require('stream');
 const assert = require('assert');
 
 let ondataCalled = 0;

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

@@ -1,6 +1,6 @@
 'use strict';
 require('../common');
-const Readable = require('_stream_readable');
+const { Readable } = require('stream');
 const assert = require('assert');
 
 let buf = '';

test/parallel/test-stream2-objects.js

@@ -22,8 +22,7 @@
 'use strict';
 
 const common = require('../common');
-const Readable = require('_stream_readable');
-const Writable = require('_stream_writable');
+const { Readable, Writable } = require('stream');
 const assert = require('assert');
 
 function toArray(callback) {

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

@@ -23,7 +23,7 @@
 'use strict';
 require('../common');
 const assert = require('assert');
-const fromList = require('_stream_readable')._fromList;
+const fromList = require('stream').Readable._fromList;
 const BufferList = require('internal/streams/buffer_list');
 const util = require('util');
 

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

@@ -22,7 +22,7 @@
 'use strict';
 const common = require('../common');
 const assert = require('assert');
-const Readable = require('_stream_readable');
+const { Readable } = require('stream');
 
 let len = 0;
 const chunks = new Array(10);

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

@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../common');
 
-const Readable = require('_stream_readable');
+const { Readable } = require('stream');
 const EE = require('events').EventEmitter;
 
 const oldStream = new EE();

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

@@ -22,7 +22,7 @@
 'use strict';
 const common = require('../common');
 
-const Readable = require('_stream_readable');
+const { Readable } = require('stream');
 const EE = require('events').EventEmitter;
 
 const oldStream = new EE();

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

@@ -2,7 +2,7 @@
 const common = require('../common');
 const assert = require('assert');
 
-const Readable = require('_stream_readable');
+const { Readable } = require('stream');
 const EE = require('events').EventEmitter;
 
 class LegacyStream extends EE {

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

@@ -22,8 +22,7 @@
 'use strict';
 const common = require('../common');
 const assert = require('assert');
-const Readable = require('_stream_readable');
-const Writable = require('_stream_writable');
+const { Readable, Writable } = require('stream');
 const EE = require('events').EventEmitter;
 
 function runTest(highWaterMark, objectMode, produce) {

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

@@ -22,7 +22,7 @@
 'use strict';
 const common = require('../common');
 const assert = require('assert');
-const R = require('_stream_readable');
+const { Readable: R } = require('stream');
 
 class TestReader extends R {
   constructor(n, opts) {

test/parallel/test-stream2-transform.js

@@ -22,8 +22,7 @@
 'use strict';
 const common = require('../common');
 const assert = require('assert');
-const PassThrough = require('_stream_passthrough');
-const Transform = require('_stream_transform');
+const { PassThrough, Transform } = require('stream');
 
 {
   // Verify writable side consumption

test/parallel/test-stream2-writable.js

@@ -22,8 +22,7 @@
 'use strict';
 
 const common = require('../common');
-const W = require('_stream_writable');
-const D = require('_stream_duplex');
+const { Writable: W, Duplex: D } = require('stream');
 const assert = require('assert');
 
 class TestWriter extends W {