diff --git a/build/files.js b/build/files.js index 96d5210947..49f50ad12e 100644 --- a/build/files.js +++ b/build/files.js @@ -220,6 +220,25 @@ function CorkedRequest(state) { /const \{ once \} = require\('internal\/util'\);/ , 'function once(callback) { let called = false; return function(...args) { if (called) return; called = true; callback(...args); }; }' ] + , nextTickUsage = [ + /process\.nextTick\((.+?)\)/g + , 'nextTick($1)' + ] + , nextTickDeclaration = function(prefix = './') { return [ + /^('use strict';)$/m + , `$1\n\nvar nextTick = require('${prefix}next-tick');\n` + ]} + , isStdStreamCheck = [ + /dest !== process\.(stdout|stderr)/g + , `!isStdStream(dest, '$1')` + ] + , isStdStreamDeclaration = [ + /$/ + , ` +function isStdStream(stream, type) { + return typeof process === 'undefined' ? false : stream === process[type]; +}` + ] module.exports['_stream_duplex.js'] = [ requireReplacement @@ -230,6 +249,8 @@ module.exports['_stream_duplex.js'] = [ , objectKeysReplacement , objectKeysDefine , errorsOneLevel + , nextTickDeclaration('./internal/streams/') + , nextTickUsage ] module.exports['_stream_passthrough.js'] = [ @@ -266,7 +287,11 @@ module.exports['_stream_readable.js'] = [ , noAsyncIterators1 , noAsyncIterators2 , noAsyncIteratorsFrom1 - , noAsyncIteratorsFrom2 + , noAsyncIteratorsFrom2, + , nextTickDeclaration('./internal/streams/') + , nextTickUsage + , isStdStreamCheck + , isStdStreamDeclaration ] module.exports['_stream_transform.js'] = [ @@ -305,6 +330,8 @@ module.exports['_stream_writable.js'] = [ , useCorkedRequest , addConstructors , errorsOneLevel + , nextTickDeclaration('./internal/streams/') + , nextTickUsage ] module.exports['internal/streams/buffer_list.js'] = [ @@ -315,13 +342,15 @@ module.exports['internal/streams/buffer_list.js'] = [ [ /const \{ inspect \} = require\('util'\);/, ` -const { inspect } = require('util') +const inspect = require('./inspect') const custom = inspect && inspect.custom || 'inspect' ` ] ] module.exports['internal/streams/destroy.js'] = [ - errorsTwoLevel + errorsTwoLevel, + , nextTickDeclaration() + , nextTickUsage ] module.exports['internal/streams/state.js'] = [ @@ -343,6 +372,8 @@ module.exports['internal/streams/async_iterator.js'] = [ / return\(\)/, '[Symbol.asyncIterator]() { return this },\n return\(\)' ] + , nextTickDeclaration() + , nextTickUsage ] module.exports['internal/streams/end-of-stream.js'] = [ diff --git a/lib/_stream_duplex.js b/lib/_stream_duplex.js index 6752519225..88b80d299c 100644 --- a/lib/_stream_duplex.js +++ b/lib/_stream_duplex.js @@ -23,8 +23,11 @@ // prototypally inherits from Readable, and then parasitically from // Writable. 'use strict'; + +var nextTick = require('./internal/streams/next-tick'); /**/ + var objectKeys = Object.keys || function (obj) { var keys = []; @@ -105,7 +108,7 @@ function onend() { if (this._writableState.ended) return; // no more data can be written. // But allow more writes to happen in this tick. - process.nextTick(onEndNT, this); + nextTick(onEndNT, this); } function onEndNT(self) { diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js index 192d451488..88f241c740 100644 --- a/lib/_stream_readable.js +++ b/lib/_stream_readable.js @@ -20,6 +20,8 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; +var nextTick = require('./internal/streams/next-tick'); + module.exports = Readable; /**/ @@ -526,7 +528,7 @@ function emitReadable(stream) { if (!state.emittedReadable) { debug('emitReadable', state.flowing); state.emittedReadable = true; - process.nextTick(emitReadable_, stream); + nextTick(emitReadable_, stream); } } @@ -558,7 +560,7 @@ function emitReadable_(stream) { function maybeReadMore(stream, state) { if (!state.readingMore) { state.readingMore = true; - process.nextTick(maybeReadMore_, stream, state); + nextTick(maybeReadMore_, stream, state); } } @@ -625,9 +627,9 @@ Readable.prototype.pipe = function (dest, pipeOpts) { state.pipesCount += 1; debug('pipe count=%d opts=%j', state.pipesCount, pipeOpts); - var doEnd = (!pipeOpts || pipeOpts.end !== false) && dest !== process.stdout && dest !== process.stderr; + var doEnd = (!pipeOpts || pipeOpts.end !== false) && !isStdStream(dest, 'stdout') && !isStdStream(dest, 'stderr'); var endFn = doEnd ? onend : unpipe; - if (state.endEmitted) process.nextTick(endFn);else src.once('end', endFn); + if (state.endEmitted) nextTick(endFn);else src.once('end', endFn); dest.on('unpipe', onunpipe); function onunpipe(readable, unpipeInfo) { @@ -821,7 +823,7 @@ Readable.prototype.on = function (ev, fn) { if (state.length) { emitReadable(this); } else if (!state.reading) { - process.nextTick(nReadingNextTick, this); + nextTick(nReadingNextTick, this); } } } @@ -841,7 +843,7 @@ Readable.prototype.removeListener = function (ev, fn) { // support once('readable', fn) cycles. This means that calling // resume within the same tick will have no // effect. - process.nextTick(updateReadableListening, this); + nextTick(updateReadableListening, this); } return res; @@ -857,7 +859,7 @@ Readable.prototype.removeAllListeners = function (ev) { // support once('readable', fn) cycles. This means that calling // resume within the same tick will have no // effect. - process.nextTick(updateReadableListening, this); + nextTick(updateReadableListening, this); } return res; @@ -902,7 +904,7 @@ Readable.prototype.resume = function () { function resume(stream, state) { if (!state.resumeScheduled) { state.resumeScheduled = true; - process.nextTick(resume_, stream, state); + nextTick(resume_, stream, state); } } @@ -1081,7 +1083,7 @@ function endReadable(stream) { if (!state.endEmitted) { state.ended = true; - process.nextTick(endReadableNT, state, stream); + nextTick(endReadableNT, state, stream); } } @@ -1121,4 +1123,8 @@ function indexOf(xs, x) { } return -1; +} + +function isStdStream(stream, type) { + return typeof process === 'undefined' ? false : stream === process[type]; } \ No newline at end of file diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js index a2634d7c24..ad592e2b04 100644 --- a/lib/_stream_writable.js +++ b/lib/_stream_writable.js @@ -23,6 +23,8 @@ // the drain event emission and buffering. 'use strict'; +var nextTick = require('./internal/streams/next-tick'); + module.exports = Writable; /* */ @@ -261,7 +263,7 @@ function writeAfterEnd(stream, cb) { var er = new ERR_STREAM_WRITE_AFTER_END(); // TODO: defer error events consistently everywhere, not just the cb errorOrDestroy(stream, er); - process.nextTick(cb, er); + nextTick(cb, er); } // Checks that a user-supplied chunk is valid, especially for the particular // mode the stream is in. Currently this means that `null` is never accepted // and undefined/non-string values are only allowed in object mode. @@ -278,7 +280,7 @@ function validChunk(stream, state, chunk, cb) { if (er) { errorOrDestroy(stream, er); - process.nextTick(cb, er); + nextTick(cb, er); return false; } @@ -416,10 +418,10 @@ function onwriteError(stream, state, sync, er, cb) { if (sync) { // defer the callback if we are being called synchronously // to avoid piling up things on the stack - process.nextTick(cb, er); // this can emit finish, and it will always happen + nextTick(cb, er); // this can emit finish, and it will always happen // after error - process.nextTick(finishMaybe, stream, state); + nextTick(finishMaybe, stream, state); stream._writableState.errorEmitted = true; errorOrDestroy(stream, er); } else { @@ -456,7 +458,7 @@ function onwrite(stream, er) { } if (sync) { - process.nextTick(afterWrite, stream, state, finished, cb); + nextTick(afterWrite, stream, state, finished, cb); } else { afterWrite(stream, state, finished, cb); } @@ -605,7 +607,7 @@ function prefinish(stream, state) { if (typeof stream._final === 'function' && !state.destroyed) { state.pendingcb++; state.finalCalled = true; - process.nextTick(callFinal, stream, state); + nextTick(callFinal, stream, state); } else { state.prefinished = true; stream.emit('prefinish'); @@ -643,7 +645,7 @@ function endWritable(stream, state, cb) { finishMaybe(stream, state); if (cb) { - if (state.finished) process.nextTick(cb);else stream.once('finish', cb); + if (state.finished) nextTick(cb);else stream.once('finish', cb); } state.ended = true; diff --git a/lib/internal/streams/async_iterator.js b/lib/internal/streams/async_iterator.js index 9fb615a2f3..b0fb597d5e 100644 --- a/lib/internal/streams/async_iterator.js +++ b/lib/internal/streams/async_iterator.js @@ -4,6 +4,8 @@ var _Object$setPrototypeO; function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } +var nextTick = require('./next-tick'); + var finished = require('./end-of-stream'); var kLastResolve = Symbol('lastResolve'); @@ -41,7 +43,7 @@ function readAndResolve(iter) { function onReadable(iter) { // we wait for the next tick, because it might // emit an error with process.nextTick - process.nextTick(readAndResolve, iter); + nextTick(readAndResolve, iter); } function wrapForNext(lastPromise, iter) { @@ -84,7 +86,7 @@ var ReadableStreamAsyncIteratorPrototype = Object.setPrototypeOf((_Object$setPro // we cannot guarantee that there is no error lingering around // waiting to be emitted. return new Promise(function (resolve, reject) { - process.nextTick(function () { + nextTick(function () { if (_this[kError]) { reject(_this[kError]); } else { diff --git a/lib/internal/streams/buffer_list.js b/lib/internal/streams/buffer_list.js index cdea425f19..3411f22833 100644 --- a/lib/internal/streams/buffer_list.js +++ b/lib/internal/streams/buffer_list.js @@ -15,8 +15,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d var _require = require('buffer'), Buffer = _require.Buffer; -var _require2 = require('util'), - inspect = _require2.inspect; +var inspect = require('./inspect'); var custom = inspect && inspect.custom || 'inspect'; @@ -24,9 +23,7 @@ function copyBuffer(src, target, offset) { Buffer.prototype.copy.call(src, target, offset); } -module.exports = -/*#__PURE__*/ -function () { +module.exports = /*#__PURE__*/function () { function BufferList() { _classCallCheck(this, BufferList); @@ -197,7 +194,7 @@ function () { }, { key: custom, value: function value(_, options) { - return inspect(this, _objectSpread({}, options, { + return inspect(this, _objectSpread(_objectSpread({}, options), {}, { // Only inspect one level. depth: 0, // It should not recurse. diff --git a/lib/internal/streams/destroy.js b/lib/internal/streams/destroy.js index 3268a16f3b..d91d1f0d51 100644 --- a/lib/internal/streams/destroy.js +++ b/lib/internal/streams/destroy.js @@ -1,4 +1,7 @@ -'use strict'; // undocumented cb() API, needed for core, not for public API +'use strict'; + +var nextTick = require('./next-tick'); // undocumented cb() API, needed for core, not for public API + function destroy(err, cb) { var _this = this; @@ -11,10 +14,10 @@ function destroy(err, cb) { cb(err); } else if (err) { if (!this._writableState) { - process.nextTick(emitErrorNT, this, err); + nextTick(emitErrorNT, this, err); } else if (!this._writableState.errorEmitted) { this._writableState.errorEmitted = true; - process.nextTick(emitErrorNT, this, err); + nextTick(emitErrorNT, this, err); } } @@ -35,18 +38,18 @@ function destroy(err, cb) { this._destroy(err || null, function (err) { if (!cb && err) { if (!_this._writableState) { - process.nextTick(emitErrorAndCloseNT, _this, err); + nextTick(emitErrorAndCloseNT, _this, err); } else if (!_this._writableState.errorEmitted) { _this._writableState.errorEmitted = true; - process.nextTick(emitErrorAndCloseNT, _this, err); + nextTick(emitErrorAndCloseNT, _this, err); } else { - process.nextTick(emitCloseNT, _this); + nextTick(emitCloseNT, _this); } } else if (cb) { - process.nextTick(emitCloseNT, _this); + nextTick(emitCloseNT, _this); cb(err); } else { - process.nextTick(emitCloseNT, _this); + nextTick(emitCloseNT, _this); } }); diff --git a/lib/internal/streams/from.js b/lib/internal/streams/from.js index 6c41284416..1eb8066c5d 100644 --- a/lib/internal/streams/from.js +++ b/lib/internal/streams/from.js @@ -40,13 +40,13 @@ function from(Readable, iterable, opts) { function _next2() { _next2 = _asyncToGenerator(function* () { try { - var _ref = yield iterator.next(), - value = _ref.value, - done = _ref.done; + var _yield$iterator$next = yield iterator.next(), + value = _yield$iterator$next.value, + done = _yield$iterator$next.done; if (done) { readable.push(null); - } else if (readable.push((yield value))) { + } else if (readable.push(yield value)) { next(); } else { reading = false; diff --git a/lib/internal/streams/inspect-browser.js b/lib/internal/streams/inspect-browser.js new file mode 100644 index 0000000000..4e49691352 --- /dev/null +++ b/lib/internal/streams/inspect-browser.js @@ -0,0 +1,2 @@ +'use strict'; +module.exports = require('browser-util-inspect') \ No newline at end of file diff --git a/lib/internal/streams/inspect.js b/lib/internal/streams/inspect.js new file mode 100644 index 0000000000..2c8916f2a9 --- /dev/null +++ b/lib/internal/streams/inspect.js @@ -0,0 +1,2 @@ +'use strict'; +module.exports = require('util').inspect \ No newline at end of file diff --git a/lib/internal/streams/next-tick-browser.js b/lib/internal/streams/next-tick-browser.js new file mode 100644 index 0000000000..a4dd5cd5ff --- /dev/null +++ b/lib/internal/streams/next-tick-browser.js @@ -0,0 +1,23 @@ +'use strict'; + +module.exports = function nextTick2 (cb) { + var args = arguments.length > 1 ? Array.prototype.slice.call(arguments, 1) : null; + var handle = function () { + cb.apply(null, args); + }; + + // Base on https://github.com/feross/queue-microtask/blob/master/index.js by feross + if(typeof queueMicrotask === 'function') { + queueMicrotask(handle); + return; + } + if (global.Promise === undefined) { + Promise.resolve() + .then(handle) + .catch(function (err) { + setTimeout(function () { throw err }, 0); + }); + return; + } + setTimeout(handle, 0); +}; diff --git a/lib/internal/streams/next-tick.js b/lib/internal/streams/next-tick.js new file mode 100644 index 0000000000..3f3fa1c938 --- /dev/null +++ b/lib/internal/streams/next-tick.js @@ -0,0 +1,3 @@ +'use strict'; + +module.exports = process.nextTick \ No newline at end of file diff --git a/package.json b/package.json index 48fa4741e3..8f3887e2ce 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,9 @@ "node": ">= 6" }, "dependencies": { + "browser-util-inspect": "^0.2.0", + "buffer": "^5.6.0", + "events": "^3.1.0", "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" @@ -59,7 +62,9 @@ "./errors": "./errors-browser.js", "./readable.js": "./readable-browser.js", "./lib/internal/streams/from.js": "./lib/internal/streams/from-browser.js", - "./lib/internal/streams/stream.js": "./lib/internal/streams/stream-browser.js" + "./lib/internal/streams/stream.js": "./lib/internal/streams/stream-browser.js", + "./lib/internal/streams/next-tick.js": "./lib/internal/streams/next-tick-browser.js", + "./lib/internal/streams/inspect.js": "./lib/internal/streams/inspect-browser.js" }, "nyc": { "include": [ diff --git a/test/browser/test-stream-push-strings.js b/test/browser/test-stream-push-strings.js index 1de240efd8..d42aa9c0f1 100644 --- a/test/browser/test-stream-push-strings.js +++ b/test/browser/test-stream-push-strings.js @@ -1,6 +1,6 @@ 'use strict'; var common = require('../common'); - +var nextTick = require('../../lib/internal/streams/next-tick') var Readable = require('../../').Readable; var inherits = require('inherits'); @@ -24,7 +24,7 @@ module.exports = function (t) { case 2: return this.push('second to last chunk'); case 3: - return process.nextTick(function() { + return nextTick(function() { this.push('first chunk'); }.bind(this)); default: diff --git a/test/browser/test-stream2-base64-single-char-read-end.js b/test/browser/test-stream2-base64-single-char-read-end.js index 86b66f81d5..3fd5f11ff6 100644 --- a/test/browser/test-stream2-base64-single-char-read-end.js +++ b/test/browser/test-stream2-base64-single-char-read-end.js @@ -1,5 +1,6 @@ 'use strict'; var common = require('../common'); +var nextTick = require('../../lib/internal/streams/next-tick') var R = require('../../lib/_stream_readable'); var W = require('../../lib/_stream_writable'); module.exports = function (t) { @@ -14,7 +15,7 @@ module.exports = function (t) { src._read = function(n) { if(!hasRead) { hasRead = true; - process.nextTick(function() { + nextTick(function() { src.push(Buffer.from('1')); src.push(null); }); diff --git a/test/browser/test-stream2-objects.js b/test/browser/test-stream2-objects.js index 26a038b599..95fe295113 100644 --- a/test/browser/test-stream2-objects.js +++ b/test/browser/test-stream2-objects.js @@ -1,5 +1,6 @@ 'use strict'; var common = require('../common'); +var nextTick = require('../../lib/internal/streams/next-tick') var Readable = require('../../lib/_stream_readable'); var Writable = require('../../lib/_stream_writable'); @@ -94,7 +95,7 @@ module.exports = function (t) { var list = [{ one: '1'}, { two: '2' }]; r._read = function(n) { var item = list.shift(); - process.nextTick(function() { + nextTick(function() { r.push(item || null); }); }; @@ -256,7 +257,7 @@ module.exports = function (t) { w._write = function(chunk, encoding, cb) { list.push(chunk); - process.nextTick(cb); + nextTick(cb); }; w.on('finish', function() { @@ -282,7 +283,7 @@ module.exports = function (t) { w._write = function(chunk, encoding, cb) { t.equal(chunk, 'foo'); - process.nextTick(function() { + nextTick(function() { called = true; cb(); }); diff --git a/test/browser/test-stream2-push.js b/test/browser/test-stream2-push.js index 7ca5f39ef3..e1e879ec78 100644 --- a/test/browser/test-stream2-push.js +++ b/test/browser/test-stream2-push.js @@ -1,5 +1,6 @@ 'use strict'; var common = require('../common'); +var nextTick = require('../../lib/internal/streams/next-tick') var stream = require('../../'); var Readable = stream.Readable; var Writable = stream.Writable; @@ -49,7 +50,7 @@ module.exports = function (t) { function readStop() { //console.error('readStop'); reading = false; - process.nextTick(function() { + nextTick(function() { var r = stream.read(); if (r !== null) writer.write(r); @@ -73,7 +74,7 @@ module.exports = function (t) { writer._write = function(chunk, encoding, cb) { //console.error('WRITE %s', chunk); written.push(chunk); - process.nextTick(cb); + nextTick(cb); }; writer.on('finish', finish); diff --git a/test/browser/test-stream2-readable-empty-buffer-no-eof.js b/test/browser/test-stream2-readable-empty-buffer-no-eof.js index fd86d67bc5..881352309e 100644 --- a/test/browser/test-stream2-readable-empty-buffer-no-eof.js +++ b/test/browser/test-stream2-readable-empty-buffer-no-eof.js @@ -1,6 +1,6 @@ 'use strict'; var common = require('../common'); - +var nextTick = require('../../lib/internal/streams/next-tick') var Readable = require('../../').Readable; module.exports = function (t) { @@ -32,7 +32,7 @@ module.exports = function (t) { return r.push(Buffer.alloc(0)); // Not-EOF! case 3: setTimeout(r.read.bind(r, 0), 50); - return process.nextTick(function() { + return nextTick(function() { return r.push(Buffer.alloc(0)); }); case 4: diff --git a/test/browser/test-stream2-readable-legacy-drain.js b/test/browser/test-stream2-readable-legacy-drain.js index 30fd350f97..c87cc14f83 100644 --- a/test/browser/test-stream2-readable-legacy-drain.js +++ b/test/browser/test-stream2-readable-legacy-drain.js @@ -1,6 +1,6 @@ 'use strict'; var common = require('../common'); - +var nextTick = require('../../lib/internal/streams/next-tick') var Stream = require('../../'); var Readable = require('../../').Readable; module.exports = function (t) { @@ -23,7 +23,7 @@ module.exports = function (t) { w.write = function(c) { writes += c.length; buffered += c.length; - process.nextTick(drain); + nextTick(drain); return false; }; diff --git a/test/browser/test-stream2-transform.js b/test/browser/test-stream2-transform.js index 338fcdc5c0..fc0ccf98d1 100644 --- a/test/browser/test-stream2-transform.js +++ b/test/browser/test-stream2-transform.js @@ -1,5 +1,6 @@ 'use strict'; var common = require('../common'); +var nextTick = require('../../lib/internal/streams/next-tick') var PassThrough = require('../../lib/_stream_passthrough'); var Transform = require('../../lib/_stream_transform'); @@ -248,7 +249,7 @@ module.exports = function (t) { }; pt.once('readable', function() { - process.nextTick(function() { + nextTick(function() { pt.write(Buffer.from('d')); pt.write(Buffer.from('ef'), function() { pt.end(); @@ -417,7 +418,7 @@ module.exports = function (t) { // read one more time to get the 'end' event jp.read(); - process.nextTick(function() { + nextTick(function() { t.ok(ended); t.end(); }); @@ -459,7 +460,7 @@ module.exports = function (t) { // read one more time to get the 'end' event js.read(); - process.nextTick(function() { + nextTick(function() { t.ok(ended); t.end(); }); diff --git a/test/browser/test-stream2-unpipe-drain.js b/test/browser/test-stream2-unpipe-drain.js index d3ebbe86c0..b7bd4a58cd 100644 --- a/test/browser/test-stream2-unpipe-drain.js +++ b/test/browser/test-stream2-unpipe-drain.js @@ -1,7 +1,7 @@ 'use strict'; var common = require('../common'); var stream = require('../../'); - +var nextTick = require('../../lib/internal/streams/next-tick') var crypto = require('crypto'); var inherits = require('inherits'); @@ -42,12 +42,12 @@ module.exports = function (t) { src1.pipe(dest); src1.once('readable', function() { - process.nextTick(function() { + nextTick(function() { src2.pipe(dest); src2.once('readable', function() { - process.nextTick(function() { + nextTick(function() { src1.unpipe(dest); }); diff --git a/test/browser/test-stream2-writable.js b/test/browser/test-stream2-writable.js index ca08fdb1b9..bbfa1d6518 100644 --- a/test/browser/test-stream2-writable.js +++ b/test/browser/test-stream2-writable.js @@ -1,5 +1,6 @@ 'use strict'; var common = require('../common'); +var nextTick = require('../../lib/internal/streams/next-tick') var W = require('../../lib/_stream_writable'); var D = require('../../lib/_stream_duplex'); @@ -196,7 +197,7 @@ module.exports = function (t) { }); tw.on('finish', function() { - process.nextTick(function() { + nextTick(function() { t.same(tw.buffer, chunks, 'got chunks in the right order'); t.same(callbacks._called, chunks, 'called all callbacks'); t.end(); @@ -296,7 +297,7 @@ module.exports = function (t) { }); w.end('this is the end'); w.end('and so is this'); - process.nextTick(function() { + nextTick(function() { t.ok(gotError); t.end(); }); @@ -358,7 +359,7 @@ module.exports = function (t) { test('finish is emitted if last chunk is empty', function(t) { var w = new W(); w._write = function(chunk, e, cb) { - process.nextTick(cb); + nextTick(cb); }; w.on('finish', function() { t.end(); diff --git a/test/browser/test-stream3-pause-then-read.js b/test/browser/test-stream3-pause-then-read.js index 9684ea7774..1fdcc5dfb4 100644 --- a/test/browser/test-stream3-pause-then-read.js +++ b/test/browser/test-stream3-pause-then-read.js @@ -2,6 +2,7 @@ var common = require('../common'); var stream = require('../../'); +var nextTick = require('../../lib/internal/streams/next-tick') var Readable = stream.Readable; var Writable = stream.Writable; @@ -18,7 +19,7 @@ module.exports = function (t){ if (!(chunks % 2)) setImmediate(push); else if (!(chunks % 3)) - process.nextTick(push); + nextTick(push); else push(); }; diff --git a/test/common/countdown.js b/test/common/countdown.js index 39193672b5..44f6bd7cd8 100644 --- a/test/common/countdown.js +++ b/test/common/countdown.js @@ -42,9 +42,7 @@ var kCallback = Symbol('callback'); var common = require('./'); -var Countdown = -/*#__PURE__*/ -function () { +var Countdown = /*#__PURE__*/function () { function Countdown(limit, cb) { _classCallCheck(this, Countdown); diff --git a/test/common/dns.js b/test/common/dns.js index f63b686fd2..fb24f70f2f 100644 --- a/test/common/dns.js +++ b/test/common/dns.js @@ -1,10 +1,16 @@ "use strict"; -function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); } +function _createForOfIteratorHelper(o) { if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) { var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var it, normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; } -function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } +function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); } -function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } +function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } + +function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } + +function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } + +function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } @@ -216,12 +222,12 @@ function writeIPv6(ip) { var parts = ip.replace(/^:|:$/g, '').split(':'); var buf = Buffer.alloc(16); var offset = 0; - var _iteratorNormalCompletion = true; - var _didIteratorError = false; - var _iteratorError = undefined; + + var _iterator = _createForOfIteratorHelper(parts), + _step; try { - for (var _iterator = parts[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + for (_iterator.s(); !(_step = _iterator.n()).done;) { var part = _step.value; if (part === '') { @@ -232,18 +238,9 @@ function writeIPv6(ip) { } } } catch (err) { - _didIteratorError = true; - _iteratorError = err; + _iterator.e(err); } finally { - try { - if (!_iteratorNormalCompletion && _iterator.return != null) { - _iterator.return(); - } - } finally { - if (_didIteratorError) { - throw _iteratorError; - } - } + _iterator.f(); } return buf; @@ -260,38 +257,28 @@ function writeDNSPacket(parsed) { var buffers = []; var kStandardResponseFlags = 0x8180; buffers.push(new Uint16Array([parsed.id, parsed.flags === undefined ? kStandardResponseFlags : parsed.flags, parsed.questions && parsed.questions.length, parsed.answers && parsed.answers.length, parsed.authorityAnswers && parsed.authorityAnswers.length, parsed.additionalRecords && parsed.additionalRecords.length])); - var _iteratorNormalCompletion2 = true; - var _didIteratorError2 = false; - var _iteratorError2 = undefined; + + var _iterator2 = _createForOfIteratorHelper(parsed.questions), + _step2; try { - for (var _iterator2 = parsed.questions[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) { + for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) { var q = _step2.value; assert(types[q.type]); buffers.push(writeDomainName(q.domain)); buffers.push(new Uint16Array([types[q.type], q.cls === undefined ? classes.IN : q.cls])); } } catch (err) { - _didIteratorError2 = true; - _iteratorError2 = err; + _iterator2.e(err); } finally { - try { - if (!_iteratorNormalCompletion2 && _iterator2.return != null) { - _iterator2.return(); - } - } finally { - if (_didIteratorError2) { - throw _iteratorError2; - } - } + _iterator2.f(); } - var _iteratorNormalCompletion3 = true; - var _didIteratorError3 = false; - var _iteratorError3 = undefined; + var _iterator3 = _createForOfIteratorHelper([].concat(parsed.answers, parsed.authorityAnswers, parsed.additionalRecords)), + _step3; try { - for (var _iterator3 = [].concat(parsed.answers, parsed.authorityAnswers, parsed.additionalRecords)[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) { + for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) { var rr = _step3.value; if (!rr) continue; assert(types[rr.type]); @@ -320,29 +307,20 @@ function writeDNSPacket(parsed) { }); // Total length of all strings + 1 byte each for their lengths. rdLengthBuf[0] = rr.entries.length + total; - var _iteratorNormalCompletion4 = true; - var _didIteratorError4 = false; - var _iteratorError4 = undefined; + + var _iterator4 = _createForOfIteratorHelper(rr.entries), + _step4; try { - for (var _iterator4 = rr.entries[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) { + for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) { var txt = _step4.value; buffers.push(new Uint8Array([Buffer.byteLength(txt)])); buffers.push(Buffer.from(txt)); } } catch (err) { - _didIteratorError4 = true; - _iteratorError4 = err; + _iterator4.e(err); } finally { - try { - if (!_iteratorNormalCompletion4 && _iterator4.return != null) { - _iterator4.return(); - } - } finally { - if (_didIteratorError4) { - throw _iteratorError4; - } - } + _iterator4.f(); } break; @@ -377,18 +355,9 @@ function writeDNSPacket(parsed) { } } } catch (err) { - _didIteratorError3 = true; - _iteratorError3 = err; + _iterator3.e(err); } finally { - try { - if (!_iteratorNormalCompletion3 && _iterator3.return != null) { - _iterator3.return(); - } - } finally { - if (_didIteratorError3) { - throw _iteratorError3; - } - } + _iterator3.f(); } return Buffer.concat(buffers.map(function (typedArray) { diff --git a/test/common/duplexpair.js b/test/common/duplexpair.js index d4277740aa..143bf1455b 100644 --- a/test/common/duplexpair.js +++ b/test/common/duplexpair.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } /**/ require('@babel/polyfill'); @@ -53,17 +57,17 @@ var assert = require('assert'); var kCallback = Symbol('Callback'); var kOtherSide = Symbol('Other'); -var DuplexSocket = -/*#__PURE__*/ -function (_Duplex) { +var DuplexSocket = /*#__PURE__*/function (_Duplex) { _inherits(DuplexSocket, _Duplex); + var _super = _createSuper(DuplexSocket); + function DuplexSocket() { var _this; _classCallCheck(this, DuplexSocket); - _this = _possibleConstructorReturn(this, _getPrototypeOf(DuplexSocket).call(this)); + _this = _super.call(this); _this[kCallback] = null; _this[kOtherSide] = null; return _this; diff --git a/test/common/fixtures.js b/test/common/fixtures.js index 1ddc225e71..5eeae733bb 100644 --- a/test/common/fixtures.js +++ b/test/common/fixtures.js @@ -1,12 +1,16 @@ "use strict"; -function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); } +function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); } -function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); } +function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } -function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); } +function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } -function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } } +function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); } + +function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); } + +function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } /**/ require('@babel/polyfill'); diff --git a/test/common/heap.js b/test/common/heap.js index 0675fdf453..493f18ad21 100644 --- a/test/common/heap.js +++ b/test/common/heap.js @@ -1,5 +1,11 @@ "use strict"; +function _createForOfIteratorHelper(o) { if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) { var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var it, normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; } + +function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } + +function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } @@ -85,9 +91,7 @@ function isEdge(edge, _ref) { return true; } -var State = -/*#__PURE__*/ -function () { +var State = /*#__PURE__*/function () { function State() { _classCallCheck(this, State); @@ -113,18 +117,16 @@ function () { assert.strictEqual(rootNodes.length, expected.length, "Expect to find ".concat(expected.length, " '").concat(rootName, "', ") + "found ".concat(rootNodes.length)); } - var _iteratorNormalCompletion = true; - var _didIteratorError = false; - var _iteratorError = undefined; + var _iterator = _createForOfIteratorHelper(expected), + _step; try { - for (var _iterator = expected[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + for (_iterator.s(); !(_step = _iterator.n()).done;) { var expectation = _step.value; if (expectation.children) { - var _iteratorNormalCompletion2 = true; - var _didIteratorError2 = false; - var _iteratorError2 = undefined; + var _iterator2 = _createForOfIteratorHelper(expectation.children), + _step2; try { var _loop = function _loop() { @@ -143,38 +145,20 @@ function () { } }; - for (var _iterator2 = expectation.children[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) { + for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) { _loop(); } } catch (err) { - _didIteratorError2 = true; - _iteratorError2 = err; + _iterator2.e(err); } finally { - try { - if (!_iteratorNormalCompletion2 && _iterator2.return != null) { - _iterator2.return(); - } - } finally { - if (_didIteratorError2) { - throw _iteratorError2; - } - } + _iterator2.f(); } } } } catch (err) { - _didIteratorError = true; - _iteratorError = err; + _iterator.e(err); } finally { - try { - if (!_iteratorNormalCompletion && _iterator.return != null) { - _iterator.return(); - } - } finally { - if (_didIteratorError) { - throw _iteratorError; - } - } + _iterator.f(); } } // Validate our internal embedded graph representation @@ -195,18 +179,16 @@ function () { assert.strictEqual(rootNodes.length, expected.length, "Expect to find ".concat(expected.length, " '").concat(rootName, "', ") + "found ".concat(rootNodes.length)); } - var _iteratorNormalCompletion3 = true; - var _didIteratorError3 = false; - var _iteratorError3 = undefined; + var _iterator3 = _createForOfIteratorHelper(expected), + _step3; try { - for (var _iterator3 = expected[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) { + for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) { var expectation = _step3.value; if (expectation.children) { - var _iteratorNormalCompletion4 = true; - var _didIteratorError4 = false; - var _iteratorError4 = undefined; + var _iterator4 = _createForOfIteratorHelper(expectation.children), + _step4; try { var _loop2 = function _loop2() { @@ -226,38 +208,20 @@ function () { } }; - for (var _iterator4 = expectation.children[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) { + for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) { _loop2(); } } catch (err) { - _didIteratorError4 = true; - _iteratorError4 = err; + _iterator4.e(err); } finally { - try { - if (!_iteratorNormalCompletion4 && _iterator4.return != null) { - _iterator4.return(); - } - } finally { - if (_didIteratorError4) { - throw _iteratorError4; - } - } + _iterator4.f(); } } } } catch (err) { - _didIteratorError3 = true; - _iteratorError3 = err; + _iterator3.e(err); } finally { - try { - if (!_iteratorNormalCompletion3 && _iterator3.return != null) { - _iterator3.return(); - } - } finally { - if (_didIteratorError3) { - throw _iteratorError3; - } - } + _iterator3.f(); } } }, { diff --git a/test/common/http2.js b/test/common/http2.js index 73ea152027..943969c3fe 100644 --- a/test/common/http2.js +++ b/test/common/http2.js @@ -1,14 +1,18 @@ "use strict"; +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } @@ -89,9 +93,7 @@ function write8(array, pos, val) { array[pos] = val; } -var Frame = -/*#__PURE__*/ -function () { +var Frame = /*#__PURE__*/function () { function Frame(length, type, flags, id) { _classCallCheck(this, Frame); @@ -112,11 +114,11 @@ function () { return Frame; }(); -var SettingsFrame = -/*#__PURE__*/ -function (_Frame) { +var SettingsFrame = /*#__PURE__*/function (_Frame) { _inherits(SettingsFrame, _Frame); + var _super = _createSuper(SettingsFrame); + function SettingsFrame() { var ack = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false; @@ -124,17 +126,17 @@ function (_Frame) { var flags = 0; if (ack) flags |= FLAG_ACK; - return _possibleConstructorReturn(this, _getPrototypeOf(SettingsFrame).call(this, 0, 4, flags, 0)); + return _super.call(this, 0, 4, flags, 0); } return SettingsFrame; }(Frame); -var DataFrame = -/*#__PURE__*/ -function (_Frame2) { +var DataFrame = /*#__PURE__*/function (_Frame2) { _inherits(DataFrame, _Frame2); + var _super2 = _createSuper(DataFrame); + function DataFrame(id, payload) { var _this; @@ -155,7 +157,7 @@ function (_Frame2) { flags |= FLAG_PADDED; } - _this = _possibleConstructorReturn(this, _getPrototypeOf(DataFrame).call(this, len, 0, flags, id)); + _this = _super2.call(this, len, 0, flags, id); buffers.unshift(_this[kFrameData]); _this[kFrameData] = Buffer.concat(buffers); return _this; @@ -164,11 +166,11 @@ function (_Frame2) { return DataFrame; }(Frame); -var HeadersFrame = -/*#__PURE__*/ -function (_Frame3) { +var HeadersFrame = /*#__PURE__*/function (_Frame3) { _inherits(HeadersFrame, _Frame3); + var _super3 = _createSuper(HeadersFrame); + function HeadersFrame(id, payload) { var _this2; @@ -189,7 +191,7 @@ function (_Frame3) { flags |= FLAG_PADDED; } - _this2 = _possibleConstructorReturn(this, _getPrototypeOf(HeadersFrame).call(this, len, 1, flags, id)); + _this2 = _super3.call(this, len, 1, flags, id); buffers.unshift(_this2[kFrameData]); _this2[kFrameData] = Buffer.concat(buffers); return _this2; @@ -198,11 +200,11 @@ function (_Frame3) { return HeadersFrame; }(Frame); -var PingFrame = -/*#__PURE__*/ -function (_Frame4) { +var PingFrame = /*#__PURE__*/function (_Frame4) { _inherits(PingFrame, _Frame4); + var _super4 = _createSuper(PingFrame); + function PingFrame() { var _this3; @@ -211,7 +213,7 @@ function (_Frame4) { _classCallCheck(this, PingFrame); var buffers = [Buffer.alloc(8)]; - _this3 = _possibleConstructorReturn(this, _getPrototypeOf(PingFrame).call(this, 8, 6, ack ? 1 : 0, 0)); + _this3 = _super4.call(this, 8, 6, ack ? 1 : 0, 0); buffers.unshift(_this3[kFrameData]); _this3[kFrameData] = Buffer.concat(buffers); return _this3; @@ -220,18 +222,18 @@ function (_Frame4) { return PingFrame; }(Frame); -var AltSvcFrame = -/*#__PURE__*/ -function (_Frame5) { +var AltSvcFrame = /*#__PURE__*/function (_Frame5) { _inherits(AltSvcFrame, _Frame5); + var _super5 = _createSuper(AltSvcFrame); + function AltSvcFrame(size) { var _this4; _classCallCheck(this, AltSvcFrame); var buffers = [Buffer.alloc(size)]; - _this4 = _possibleConstructorReturn(this, _getPrototypeOf(AltSvcFrame).call(this, size, 10, 0, 0)); + _this4 = _super5.call(this, size, 10, 0, 0); buffers.unshift(_this4[kFrameData]); _this4[kFrameData] = Buffer.concat(buffers); return _this4; diff --git a/test/common/index.js b/test/common/index.js index 8c7f9d030a..da4e4ae4ae 100644 --- a/test/common/index.js +++ b/test/common/index.js @@ -4,13 +4,19 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } -function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); } +function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); } -function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); } +function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } -function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); } +function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); } -function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } } +function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); } + +function _createForOfIteratorHelper(o) { if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) { var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var it, normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; } + +function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } + +function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } /**/ require('@babel/polyfill'); @@ -129,12 +135,12 @@ if (false && isMainThread && module.parent && require('cluster').isMaster) { var args = process.execArgv.map(function (arg) { return arg.replace(/_/g, '-'); }); - var _iteratorNormalCompletion = true; - var _didIteratorError = false; - var _iteratorError = undefined; + + var _iterator = _createForOfIteratorHelper(flags), + _step; try { - for (var _iterator = flags[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + for (_iterator.s(); !(_step = _iterator.n()).done;) { var flag = _step.value; if (!args.includes(flag) && // If the binary was built without-ssl then the crypto flags are @@ -146,18 +152,9 @@ if (false && isMainThread && module.parent && require('cluster').isMaster) { } } } catch (err) { - _didIteratorError = true; - _iteratorError = err; + _iterator.e(err); } finally { - try { - if (!_iteratorNormalCompletion && _iterator.return != null) { - _iterator.return(); - } - } finally { - if (_didIteratorError) { - throw _iteratorError; - } - } + _iterator.f(); } } } @@ -610,28 +607,18 @@ function expectWarning(nameOrMap, expected, code) { var Comparison = function Comparison(obj, keys) { _classCallCheck(this, Comparison); - var _iteratorNormalCompletion2 = true; - var _didIteratorError2 = false; - var _iteratorError2 = undefined; + var _iterator2 = _createForOfIteratorHelper(keys), + _step2; try { - for (var _iterator2 = keys[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) { + for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) { var key = _step2.value; if (key in obj) this[key] = obj[key]; } } catch (err) { - _didIteratorError2 = true; - _iteratorError2 = err; + _iterator2.e(err); } finally { - try { - if (!_iteratorNormalCompletion2 && _iterator2.return != null) { - _iterator2.return(); - } - } finally { - if (_didIteratorError2) { - throw _iteratorError2; - } - } + _iterator2.f(); } }; // Useful for testing expected internal/error objects @@ -681,12 +668,12 @@ function expectsError(fn, settings, exact) { var keys = objectKeys(settings); - var _iteratorNormalCompletion3 = true; - var _didIteratorError3 = false; - var _iteratorError3 = undefined; + + var _iterator3 = _createForOfIteratorHelper(keys), + _step3; try { - for (var _iterator3 = keys[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) { + for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) { var key = _step3.value; if (!require('deep-strict-equal')(error[key], innerSettings[key])) { @@ -695,34 +682,27 @@ function expectsError(fn, settings, exact) { var b = new Comparison(innerSettings, keys); var tmpLimit = Error.stackTraceLimit; Error.stackTraceLimit = 0; - var err = new assert.AssertionError({ + + var _err = new assert.AssertionError({ actual: a, expected: b, operator: 'strictEqual', stackStartFn: assert.throws }); + Error.stackTraceLimit = tmpLimit; throw new assert.AssertionError({ actual: error, expected: settings, operator: 'common.expectsError', - message: err.message + message: _err.message }); } } } catch (err) { - _didIteratorError3 = true; - _iteratorError3 = err; + _iterator3.e(err); } finally { - try { - if (!_iteratorNormalCompletion3 && _iterator3.return != null) { - _iterator3.return(); - } - } finally { - if (_didIteratorError3) { - throw _iteratorError3; - } - } + _iterator3.f(); } return true; diff --git a/test/common/inspector-helper.js b/test/common/inspector-helper.js index f90d43220b..40e0f69cc9 100644 --- a/test/common/inspector-helper.js +++ b/test/common/inspector-helper.js @@ -1,14 +1,18 @@ "use strict"; +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } @@ -20,6 +24,12 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _createForOfIteratorHelper(o) { if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) { var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var it, normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; } + +function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } + +function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } + /**/ require('@babel/polyfill'); @@ -100,28 +110,19 @@ function makeBufferingDataCallback(dataCallback) { var str = newData.toString('utf8'); var lines = str.replace(/\r/g, '').split('\n'); if (str.endsWith('\n')) buffer = Buffer.alloc(0);else buffer = Buffer.from(lines.pop(), 'utf8'); - var _iteratorNormalCompletion = true; - var _didIteratorError = false; - var _iteratorError = undefined; + + var _iterator = _createForOfIteratorHelper(lines), + _step; try { - for (var _iterator = lines[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + for (_iterator.s(); !(_step = _iterator.n()).done;) { var line = _step.value; dataCallback(line); } } catch (err) { - _didIteratorError = true; - _iteratorError = err; + _iterator.e(err); } finally { - try { - if (!_iteratorNormalCompletion && _iterator.return != null) { - _iterator.return(); - } - } finally { - if (_didIteratorError) { - throw _iteratorError; - } - } + _iterator.f(); } }; } @@ -216,9 +217,7 @@ function formatWSFrame(message) { return Buffer.concat([wsHeaderBuf.slice(0, maskOffset + 4), messageBuf]); } -var InspectorSession = -/*#__PURE__*/ -function () { +var InspectorSession = /*#__PURE__*/function () { function InspectorSession(socket, instance) { var _this = this; @@ -420,28 +419,19 @@ function () { if (params.type === type) { var _i2 = 0; - var _iteratorNormalCompletion2 = true; - var _didIteratorError2 = false; - var _iteratorError2 = undefined; + + var _iterator2 = _createForOfIteratorHelper(params.args), + _step2; try { - for (var _iterator2 = params.args[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) { + for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) { var value = _step2.value; if (value.value !== values[_i2++]) return false; } } catch (err) { - _didIteratorError2 = true; - _iteratorError2 = err; + _iterator2.e(err); } finally { - try { - if (!_iteratorNormalCompletion2 && _iterator2.return != null) { - _iterator2.return(); - } - } finally { - if (_didIteratorError2) { - throw _iteratorError2; - } - } + _iterator2.f(); } return _i2 === values.length; @@ -503,11 +493,11 @@ function () { return InspectorSession; }(); -var NodeInstance = -/*#__PURE__*/ -function (_EventEmitter) { +var NodeInstance = /*#__PURE__*/function (_EventEmitter) { _inherits(NodeInstance, _EventEmitter); + var _super = _createSuper(NodeInstance); + function NodeInstance() { var _this7; @@ -517,7 +507,7 @@ function (_EventEmitter) { _classCallCheck(this, NodeInstance); - _this7 = _possibleConstructorReturn(this, _getPrototypeOf(NodeInstance).call(this)); + _this7 = _super.call(this); _this7._scriptPath = scriptFile; _this7._script = scriptFile ? null : scriptContents; _this7._portCallback = null; diff --git a/test/common/internet.js b/test/common/internet.js index e34dabbe21..325f539d59 100644 --- a/test/common/internet.js +++ b/test/common/internet.js @@ -1,5 +1,11 @@ "use strict"; +function _createForOfIteratorHelper(o) { if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) { var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var it, normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; } + +function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } + +function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } + /**/ require('@babel/polyfill'); @@ -68,12 +74,12 @@ var addresses = { // An accessible IPv4 DNS server DNS6_SERVER: '2001:4860:4860::8888' }; -var _iteratorNormalCompletion = true; -var _didIteratorError = false; -var _iteratorError = undefined; + +var _iterator = _createForOfIteratorHelper(objectKeys(addresses)), + _step; try { - for (var _iterator = objectKeys(addresses)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + for (_iterator.s(); !(_step = _iterator.n()).done;) { var key = _step.value; var envName = "NODE_TEST_".concat(key); @@ -82,18 +88,9 @@ try { } } } catch (err) { - _didIteratorError = true; - _iteratorError = err; + _iterator.e(err); } finally { - try { - if (!_iteratorNormalCompletion && _iterator.return != null) { - _iterator.return(); - } - } finally { - if (_didIteratorError) { - throw _iteratorError; - } - } + _iterator.f(); } module.exports = { diff --git a/test/common/tls.js b/test/common/tls.js index 98b00d0e09..47261b0e15 100644 --- a/test/common/tls.js +++ b/test/common/tls.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } /**/ require('@babel/polyfill'); @@ -51,17 +55,17 @@ var net = require('net'); exports.ccs = Buffer.from('140303000101', 'hex'); -var TestTLSSocket = -/*#__PURE__*/ -function (_net$Socket) { +var TestTLSSocket = /*#__PURE__*/function (_net$Socket) { _inherits(TestTLSSocket, _net$Socket); + var _super = _createSuper(TestTLSSocket); + function TestTLSSocket(server_cert) { var _this; _classCallCheck(this, TestTLSSocket); - _this = _possibleConstructorReturn(this, _getPrototypeOf(TestTLSSocket).call(this)); + _this = _super.call(this); _this.server_cert = server_cert; _this.version = Buffer.from('0303', 'hex'); _this.handshake_list = []; // AES128-GCM-SHA256 diff --git a/test/ours/lolex-fake-timers.js b/test/ours/lolex-fake-timers.js index 59af1328ea..21ee3e7bee 100644 --- a/test/ours/lolex-fake-timers.js +++ b/test/ours/lolex-fake-timers.js @@ -3,6 +3,7 @@ var tap = require('tap'); var util = require('util'); var assert = require('assert'); var lolex = require('lolex'); +var clock = lolex.install({toFake: [ 'setImmediate', 'nextTick' ]}); var stream = require('../../'); var Transform = stream.Transform; @@ -12,7 +13,6 @@ function MyTransform() { util.inherits(MyTransform, Transform); -var clock = lolex.install({toFake: [ 'setImmediate', 'nextTick' ]}); var stream2DataCalled = false; var stream = new MyTransform(); diff --git a/test/parallel/test-stream-big-packet.js b/test/parallel/test-stream-big-packet.js index 063dee3e1e..73188557eb 100644 --- a/test/parallel/test-stream-big-packet.js +++ b/test/parallel/test-stream-big-packet.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } // Copyright Joyent, Inc. and other Node contributors. // @@ -50,15 +54,15 @@ var stream = require('../../'); var passed = false; -var TestStream = -/*#__PURE__*/ -function (_stream$Transform) { +var TestStream = /*#__PURE__*/function (_stream$Transform) { _inherits(TestStream, _stream$Transform); + var _super = _createSuper(TestStream); + function TestStream() { _classCallCheck(this, TestStream); - return _possibleConstructorReturn(this, _getPrototypeOf(TestStream).apply(this, arguments)); + return _super.apply(this, arguments); } _createClass(TestStream, [{ diff --git a/test/parallel/test-stream-events-prepend.js b/test/parallel/test-stream-events-prepend.js index adfe99df5c..fd6dfb2594 100644 --- a/test/parallel/test-stream-events-prepend.js +++ b/test/parallel/test-stream-events-prepend.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } /**/ var bufferShim = require('safe-buffer').Buffer; @@ -25,17 +29,17 @@ var common = require('../common'); var stream = require('../../'); -var Writable = -/*#__PURE__*/ -function (_stream$Writable) { +var Writable = /*#__PURE__*/function (_stream$Writable) { _inherits(Writable, _stream$Writable); + var _super = _createSuper(Writable); + function Writable() { var _this; _classCallCheck(this, Writable); - _this = _possibleConstructorReturn(this, _getPrototypeOf(Writable).call(this)); + _this = _super.call(this); _this.prependListener = undefined; return _this; } @@ -50,15 +54,15 @@ function (_stream$Writable) { return Writable; }(stream.Writable); -var Readable = -/*#__PURE__*/ -function (_stream$Readable) { +var Readable = /*#__PURE__*/function (_stream$Readable) { _inherits(Readable, _stream$Readable); + var _super2 = _createSuper(Readable); + function Readable() { _classCallCheck(this, Readable); - return _possibleConstructorReturn(this, _getPrototypeOf(Readable).apply(this, arguments)); + return _super2.apply(this, arguments); } _createClass(Readable, [{ diff --git a/test/parallel/test-stream-pipe-after-end.js b/test/parallel/test-stream-pipe-after-end.js index 5e39fce11d..f44ef0951f 100644 --- a/test/parallel/test-stream-pipe-after-end.js +++ b/test/parallel/test-stream-pipe-after-end.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } // Copyright Joyent, Inc. and other Node contributors. // @@ -50,17 +54,17 @@ var Readable = require('../../lib/_stream_readable'); var Writable = require('../../lib/_stream_writable'); -var TestReadable = -/*#__PURE__*/ -function (_Readable) { +var TestReadable = /*#__PURE__*/function (_Readable) { _inherits(TestReadable, _Readable); + var _super = _createSuper(TestReadable); + function TestReadable(opt) { var _this; _classCallCheck(this, TestReadable); - _this = _possibleConstructorReturn(this, _getPrototypeOf(TestReadable).call(this, opt)); + _this = _super.call(this, opt); _this._ended = false; return _this; } @@ -77,17 +81,17 @@ function (_Readable) { return TestReadable; }(Readable); -var TestWritable = -/*#__PURE__*/ -function (_Writable) { +var TestWritable = /*#__PURE__*/function (_Writable) { _inherits(TestWritable, _Writable); + var _super2 = _createSuper(TestWritable); + function TestWritable(opt) { var _this2; _classCallCheck(this, TestWritable); - _this2 = _possibleConstructorReturn(this, _getPrototypeOf(TestWritable).call(this, opt)); + _this2 = _super2.call(this, opt); _this2._written = []; return _this2; } diff --git a/test/parallel/test-stream-pipe-await-drain-manual-resume.js b/test/parallel/test-stream-pipe-await-drain-manual-resume.js index aacd62cdf7..5ace908fc1 100644 --- a/test/parallel/test-stream-pipe-await-drain-manual-resume.js +++ b/test/parallel/test-stream-pipe-await-drain-manual-resume.js @@ -1,5 +1,11 @@ "use strict"; +function _createForOfIteratorHelper(o) { if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) { var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var it, normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; } + +function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } + +function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } + /**/ var bufferShim = require('safe-buffer').Buffer; /**/ @@ -46,28 +52,19 @@ readable.once('pause', common.mustCall(function () { // should be flushed. isCurrentlyBufferingWrites = false; - var _iteratorNormalCompletion = true; - var _didIteratorError = false; - var _iteratorError = undefined; + + var _iterator = _createForOfIteratorHelper(queue), + _step; try { - for (var _iterator = queue[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + for (_iterator.s(); !(_step = _iterator.n()).done;) { var queued = _step.value; queued.cb(); } } catch (err) { - _didIteratorError = true; - _iteratorError = err; + _iterator.e(err); } finally { - try { - if (!_iteratorNormalCompletion && _iterator.return != null) { - _iterator.return(); - } - } finally { - if (_didIteratorError) { - throw _iteratorError; - } - } + _iterator.f(); } })); })); diff --git a/test/parallel/test-stream-pipe-multiple-pipes.js b/test/parallel/test-stream-pipe-multiple-pipes.js index 011923a043..1bee44d574 100644 --- a/test/parallel/test-stream-pipe-multiple-pipes.js +++ b/test/parallel/test-stream-pipe-multiple-pipes.js @@ -1,5 +1,11 @@ "use strict"; +function _createForOfIteratorHelper(o) { if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) { var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var it, normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; } + +function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } + +function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } + /**/ var bufferShim = require('safe-buffer').Buffer; /**/ @@ -38,30 +44,20 @@ readable.push(input); // The pipe() calls will postpone emission of the 'resume' // so no data will be available to the writable streams until then. process.nextTick(common.mustCall(function () { - var _iteratorNormalCompletion = true; - var _didIteratorError = false; - var _iteratorError = undefined; + var _iterator = _createForOfIteratorHelper(writables), + _step; try { - for (var _iterator = writables[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + for (_iterator.s(); !(_step = _iterator.n()).done;) { var target = _step.value; assert.deepStrictEqual(target.output, [input]); target.on('unpipe', common.mustCall()); readable.unpipe(target); } } catch (err) { - _didIteratorError = true; - _iteratorError = err; + _iterator.e(err); } finally { - try { - if (!_iteratorNormalCompletion && _iterator.return != null) { - _iterator.return(); - } - } finally { - if (_didIteratorError) { - throw _iteratorError; - } - } + _iterator.f(); } readable.push('something else'); // This does not get through. @@ -70,28 +66,18 @@ process.nextTick(common.mustCall(function () { readable.resume(); // Make sure the 'end' event gets emitted. })); readable.on('end', common.mustCall(function () { - var _iteratorNormalCompletion2 = true; - var _didIteratorError2 = false; - var _iteratorError2 = undefined; + var _iterator2 = _createForOfIteratorHelper(writables), + _step2; try { - for (var _iterator2 = writables[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) { + for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) { var target = _step2.value; assert.deepStrictEqual(target.output, [input]); } } catch (err) { - _didIteratorError2 = true; - _iteratorError2 = err; + _iterator2.e(err); } finally { - try { - if (!_iteratorNormalCompletion2 && _iterator2.return != null) { - _iterator2.return(); - } - } finally { - if (_didIteratorError2) { - throw _iteratorError2; - } - } + _iterator2.f(); } })); ; diff --git a/test/parallel/test-stream-push-strings.js b/test/parallel/test-stream-push-strings.js index f2555d6241..c56c1ae817 100644 --- a/test/parallel/test-stream-push-strings.js +++ b/test/parallel/test-stream-push-strings.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } // Copyright Joyent, Inc. and other Node contributors. // @@ -48,17 +52,17 @@ var assert = require('assert/'); var Readable = require('../../').Readable; -var MyStream = -/*#__PURE__*/ -function (_Readable) { +var MyStream = /*#__PURE__*/function (_Readable) { _inherits(MyStream, _Readable); + var _super = _createSuper(MyStream); + function MyStream(options) { var _this; _classCallCheck(this, MyStream); - _this = _possibleConstructorReturn(this, _getPrototypeOf(MyStream).call(this, options)); + _this = _super.call(this, options); _this._chunks = 3; return _this; } diff --git a/test/parallel/test-stream-readable-async-iterators.js b/test/parallel/test-stream-readable-async-iterators.js index d97cb866bc..2d6b526402 100644 --- a/test/parallel/test-stream-readable-async-iterators.js +++ b/test/parallel/test-stream-readable-async-iterators.js @@ -207,7 +207,7 @@ function _tests() { var iterator = _readable4[Symbol.asyncIterator](); - var err = new Error('kaboom'); + var _err = new Error('kaboom'); _readable4.destroy(new Error('kaboom')); @@ -223,7 +223,7 @@ function _tests() { assert.strictEqual(e.message, e2.message); }); - }(iterator.next.bind(iterator), err); + }(iterator.next.bind(iterator), _err); } { console.log('read object mode'); @@ -280,7 +280,7 @@ function _tests() { } }); - var _err; + var _err2; try { // eslint-disable-next-line no-unused-vars @@ -308,10 +308,10 @@ function _tests() { } } } catch (e) { - _err = e; + _err2 = e; } - assert.strictEqual(_err.message, 'kaboom from read'); + assert.strictEqual(_err2.message, 'kaboom from read'); } { console.log('destroy async'); @@ -332,7 +332,7 @@ function _tests() { }); var _received = 0; - var _err2 = null; + var _err3 = null; try { // eslint-disable-next-line no-unused-vars @@ -361,10 +361,10 @@ function _tests() { } } } catch (e) { - _err2 = e; + _err3 = e; } - assert.strictEqual(_err2.message, 'kaboom'); + assert.strictEqual(_err3.message, 'kaboom'); assert.strictEqual(_received, 1); } { @@ -377,7 +377,7 @@ function _tests() { } }); - var _err3 = null; + var _err4 = null; try { var _iteratorNormalCompletion5 = true; @@ -406,10 +406,10 @@ function _tests() { } } } catch (e) { - _err3 = e; + _err4 = e; } - assert.strictEqual(_err3.message, 'kaboom'); + assert.strictEqual(_err4.message, 'kaboom'); assert.strictEqual(_readable8.destroyed, true); } { @@ -424,7 +424,7 @@ function _tests() { }); var _received2 = 0; - var _err4 = null; + var _err5 = null; try { var _iteratorNormalCompletion6 = true; @@ -453,10 +453,10 @@ function _tests() { } } } catch (e) { - _err4 = e; + _err5 = e; } - assert.strictEqual(_err4.message, 'kaboom'); + assert.strictEqual(_err5.message, 'kaboom'); assert.strictEqual(_received2, 1); } { @@ -575,8 +575,8 @@ function _tests() { _readable12.destroy(); - var _ref = yield _readable12[Symbol.asyncIterator]().next(), - done = _ref.done; + var _yield$_readable12$Sy = yield _readable12[Symbol.asyncIterator]().next(), + done = _yield$_readable12$Sy.done; assert.strictEqual(done, true); } @@ -590,18 +590,18 @@ function _tests() { var passthrough = new PassThrough(); - var _err5 = new Error('kaboom'); + var _err6 = new Error('kaboom'); pipeline(_readable13, passthrough, common.mustCall(function (e) { - assert.strictEqual(e, _err5); + assert.strictEqual(e, _err6); })); - _readable13.destroy(_err5); + _readable13.destroy(_err6); try { yield _readable13[Symbol.asyncIterator]().next(); } catch (e) { - assert.strictEqual(e, _err5); + assert.strictEqual(e, _err6); } } { @@ -718,11 +718,11 @@ function _tests() { _r2.push(null); - assert.deepStrictEqual((yield c), { + assert.deepStrictEqual(yield c, { done: true, value: undefined }); - assert.deepStrictEqual((yield _d), { + assert.deepStrictEqual(yield _d, { done: true, value: undefined }); @@ -743,11 +743,11 @@ function _tests() { _r3.destroy(); - assert.deepStrictEqual((yield _c), { + assert.deepStrictEqual(yield _c, { done: true, value: undefined }); - assert.deepStrictEqual((yield _d2), { + assert.deepStrictEqual(yield _d2, { done: true, value: undefined }); @@ -766,9 +766,9 @@ function _tests() { var _d3 = _b3.next(); - var _err6 = new Error('kaboom'); + var _err7 = new Error('kaboom'); - _r4.destroy(_err6); + _r4.destroy(_err7); yield Promise.all([_asyncToGenerator(function* () { var e; @@ -779,7 +779,7 @@ function _tests() { e = _e; } - assert.strictEqual(e, _err6); + assert.strictEqual(e, _err7); })(), _asyncToGenerator(function* () { var e; @@ -789,7 +789,7 @@ function _tests() { e = _e; } - assert.strictEqual(e, _err6); + assert.strictEqual(e, _err7); })()]); } }); diff --git a/test/parallel/test-stream-uint8array.js b/test/parallel/test-stream-uint8array.js index b5b767270c..86b509ff55 100644 --- a/test/parallel/test-stream-uint8array.js +++ b/test/parallel/test-stream-uint8array.js @@ -1,12 +1,16 @@ "use strict"; -function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); } +function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); } -function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); } +function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } -function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); } +function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } -function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } } +function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); } + +function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); } + +function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } /**/ var bufferShim = require('safe-buffer').Buffer; diff --git a/test/parallel/test-stream-unpipe-event.js b/test/parallel/test-stream-unpipe-event.js index 797e03182d..65e0693d9c 100644 --- a/test/parallel/test-stream-unpipe-event.js +++ b/test/parallel/test-stream-unpipe-event.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } if (process.version.indexOf('v0.8') === 0) { process.exit(0); @@ -34,15 +38,15 @@ var _require = require('../../'), Writable = _require.Writable, Readable = _require.Readable; -var NullWriteable = -/*#__PURE__*/ -function (_Writable) { +var NullWriteable = /*#__PURE__*/function (_Writable) { _inherits(NullWriteable, _Writable); + var _super = _createSuper(NullWriteable); + function NullWriteable() { _classCallCheck(this, NullWriteable); - return _possibleConstructorReturn(this, _getPrototypeOf(NullWriteable).apply(this, arguments)); + return _super.apply(this, arguments); } _createClass(NullWriteable, [{ @@ -55,15 +59,15 @@ function (_Writable) { return NullWriteable; }(Writable); -var QuickEndReadable = -/*#__PURE__*/ -function (_Readable) { +var QuickEndReadable = /*#__PURE__*/function (_Readable) { _inherits(QuickEndReadable, _Readable); + var _super2 = _createSuper(QuickEndReadable); + function QuickEndReadable() { _classCallCheck(this, QuickEndReadable); - return _possibleConstructorReturn(this, _getPrototypeOf(QuickEndReadable).apply(this, arguments)); + return _super2.apply(this, arguments); } _createClass(QuickEndReadable, [{ @@ -76,15 +80,15 @@ function (_Readable) { return QuickEndReadable; }(Readable); -var NeverEndReadable = -/*#__PURE__*/ -function (_Readable2) { +var NeverEndReadable = /*#__PURE__*/function (_Readable2) { _inherits(NeverEndReadable, _Readable2); + var _super3 = _createSuper(NeverEndReadable); + function NeverEndReadable() { _classCallCheck(this, NeverEndReadable); - return _possibleConstructorReturn(this, _getPrototypeOf(NeverEndReadable).apply(this, arguments)); + return _super3.apply(this, arguments); } _createClass(NeverEndReadable, [{ diff --git a/test/parallel/test-stream-writable-change-default-encoding.js b/test/parallel/test-stream-writable-change-default-encoding.js index 441dc637e5..b57d9e2085 100644 --- a/test/parallel/test-stream-writable-change-default-encoding.js +++ b/test/parallel/test-stream-writable-change-default-encoding.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } // Copyright Joyent, Inc. and other Node contributors. // @@ -48,17 +52,17 @@ var assert = require('assert/'); var stream = require('../../'); -var MyWritable = -/*#__PURE__*/ -function (_stream$Writable) { +var MyWritable = /*#__PURE__*/function (_stream$Writable) { _inherits(MyWritable, _stream$Writable); + var _super = _createSuper(MyWritable); + function MyWritable(fn, options) { var _this; _classCallCheck(this, MyWritable); - _this = _possibleConstructorReturn(this, _getPrototypeOf(MyWritable).call(this, options)); + _this = _super.call(this, options); _this.fn = fn; return _this; } diff --git a/test/parallel/test-stream-writable-decoded-encoding.js b/test/parallel/test-stream-writable-decoded-encoding.js index 1bf9ed6ea3..2b9189eebc 100644 --- a/test/parallel/test-stream-writable-decoded-encoding.js +++ b/test/parallel/test-stream-writable-decoded-encoding.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } // Copyright Joyent, Inc. and other Node contributors. // @@ -48,17 +52,17 @@ var assert = require('assert/'); var stream = require('../../'); -var MyWritable = -/*#__PURE__*/ -function (_stream$Writable) { +var MyWritable = /*#__PURE__*/function (_stream$Writable) { _inherits(MyWritable, _stream$Writable); + var _super = _createSuper(MyWritable); + function MyWritable(fn, options) { var _this; _classCallCheck(this, MyWritable); - _this = _possibleConstructorReturn(this, _getPrototypeOf(MyWritable).call(this, options)); + _this = _super.call(this, options); _this.fn = fn; return _this; } diff --git a/test/parallel/test-stream-writable-null.js b/test/parallel/test-stream-writable-null.js index a6e8794a33..2ce9768b4b 100644 --- a/test/parallel/test-stream-writable-null.js +++ b/test/parallel/test-stream-writable-null.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } /**/ var bufferShim = require('safe-buffer').Buffer; @@ -27,15 +31,15 @@ var assert = require('assert/'); var stream = require('../../'); -var MyWritable = -/*#__PURE__*/ -function (_stream$Writable) { +var MyWritable = /*#__PURE__*/function (_stream$Writable) { _inherits(MyWritable, _stream$Writable); + var _super = _createSuper(MyWritable); + function MyWritable() { _classCallCheck(this, MyWritable); - return _possibleConstructorReturn(this, _getPrototypeOf(MyWritable).apply(this, arguments)); + return _super.apply(this, arguments); } _createClass(MyWritable, [{ diff --git a/test/parallel/test-stream2-basic.js b/test/parallel/test-stream2-basic.js index 7a16dc3fbf..de87a4e9a9 100644 --- a/test/parallel/test-stream2-basic.js +++ b/test/parallel/test-stream2-basic.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } // Copyright Joyent, Inc. and other Node contributors. // @@ -50,17 +54,17 @@ var assert = require('assert/'); var EE = require('events').EventEmitter; -var TestReader = -/*#__PURE__*/ -function (_R) { +var TestReader = /*#__PURE__*/function (_R) { _inherits(TestReader, _R); + var _super = _createSuper(TestReader); + function TestReader(n) { var _this; _classCallCheck(this, TestReader); - _this = _possibleConstructorReturn(this, _getPrototypeOf(TestReader).call(this)); + _this = _super.call(this); _this._buffer = bufferShim.alloc(n || 100, 'x'); _this._pos = 0; _this._bufs = 10; @@ -106,17 +110,17 @@ function (_R) { return TestReader; }(R); -var TestWriter = -/*#__PURE__*/ -function (_EE) { +var TestWriter = /*#__PURE__*/function (_EE) { _inherits(TestWriter, _EE); + var _super2 = _createSuper(TestWriter); + function TestWriter() { var _this3; _classCallCheck(this, TestWriter); - _this3 = _possibleConstructorReturn(this, _getPrototypeOf(TestWriter).call(this)); + _this3 = _super2.call(this); _this3.received = []; _this3.flush = false; return _this3; diff --git a/test/parallel/test-stream2-compatibility.js b/test/parallel/test-stream2-compatibility.js index 04ab8eeced..d24100ff18 100644 --- a/test/parallel/test-stream2-compatibility.js +++ b/test/parallel/test-stream2-compatibility.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } // Copyright Joyent, Inc. and other Node contributors. // @@ -52,17 +56,17 @@ var assert = require('assert/'); var ondataCalled = 0; -var TestReader = -/*#__PURE__*/ -function (_R) { +var TestReader = /*#__PURE__*/function (_R) { _inherits(TestReader, _R); + var _super = _createSuper(TestReader); + function TestReader() { var _this; _classCallCheck(this, TestReader); - _this = _possibleConstructorReturn(this, _getPrototypeOf(TestReader).call(this)); + _this = _super.call(this); _this._buffer = bufferShim.alloc(100, 'x'); _this.on('data', function () { @@ -92,17 +96,17 @@ setImmediate(function () { reader.push(null); }); -var TestWriter = -/*#__PURE__*/ -function (_W) { +var TestWriter = /*#__PURE__*/function (_W) { _inherits(TestWriter, _W); + var _super2 = _createSuper(TestWriter); + function TestWriter() { var _this2; _classCallCheck(this, TestWriter); - _this2 = _possibleConstructorReturn(this, _getPrototypeOf(TestWriter).call(this)); + _this2 = _super2.call(this); _this2.write('foo'); diff --git a/test/parallel/test-stream2-pipe-error-once-listener.js b/test/parallel/test-stream2-pipe-error-once-listener.js index ad613095d1..7891ae6f4c 100644 --- a/test/parallel/test-stream2-pipe-error-once-listener.js +++ b/test/parallel/test-stream2-pipe-error-once-listener.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } // Copyright Joyent, Inc. and other Node contributors. // @@ -46,15 +50,15 @@ require('../common'); var stream = require('../../'); -var Read = -/*#__PURE__*/ -function (_stream$Readable) { +var Read = /*#__PURE__*/function (_stream$Readable) { _inherits(Read, _stream$Readable); + var _super = _createSuper(Read); + function Read() { _classCallCheck(this, Read); - return _possibleConstructorReturn(this, _getPrototypeOf(Read).apply(this, arguments)); + return _super.apply(this, arguments); } _createClass(Read, [{ @@ -68,15 +72,15 @@ function (_stream$Readable) { return Read; }(stream.Readable); -var Write = -/*#__PURE__*/ -function (_stream$Writable) { +var Write = /*#__PURE__*/function (_stream$Writable) { _inherits(Write, _stream$Writable); + var _super2 = _createSuper(Write); + function Write() { _classCallCheck(this, Write); - return _possibleConstructorReturn(this, _getPrototypeOf(Write).apply(this, arguments)); + return _super2.apply(this, arguments); } _createClass(Write, [{ diff --git a/test/parallel/test-stream2-set-encoding.js b/test/parallel/test-stream2-set-encoding.js index d1c7c8f693..465f98602e 100644 --- a/test/parallel/test-stream2-set-encoding.js +++ b/test/parallel/test-stream2-set-encoding.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } // Copyright Joyent, Inc. and other Node contributors. // @@ -48,17 +52,17 @@ var assert = require('assert/'); var R = require('../../lib/_stream_readable'); -var TestReader = -/*#__PURE__*/ -function (_R) { +var TestReader = /*#__PURE__*/function (_R) { _inherits(TestReader, _R); + var _super = _createSuper(TestReader); + function TestReader(n, opts) { var _this; _classCallCheck(this, TestReader); - _this = _possibleConstructorReturn(this, _getPrototypeOf(TestReader).call(this, opts)); + _this = _super.call(this, opts); _this.pos = 0; _this.len = n || 100; return _this; diff --git a/test/parallel/test-stream2-unpipe-drain.js b/test/parallel/test-stream2-unpipe-drain.js index a2e8166cf6..45814ea76d 100644 --- a/test/parallel/test-stream2-unpipe-drain.js +++ b/test/parallel/test-stream2-unpipe-drain.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } (function () { // Copyright Joyent, Inc. and other Node contributors. @@ -49,15 +53,15 @@ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || func var stream = require('../../'); - var TestWriter = - /*#__PURE__*/ - function (_stream$Writable) { + var TestWriter = /*#__PURE__*/function (_stream$Writable) { _inherits(TestWriter, _stream$Writable); + var _super = _createSuper(TestWriter); + function TestWriter() { _classCallCheck(this, TestWriter); - return _possibleConstructorReturn(this, _getPrototypeOf(TestWriter).apply(this, arguments)); + return _super.apply(this, arguments); } _createClass(TestWriter, [{ @@ -72,17 +76,17 @@ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || func var dest = new TestWriter(); - var TestReader = - /*#__PURE__*/ - function (_stream$Readable) { + var TestReader = /*#__PURE__*/function (_stream$Readable) { _inherits(TestReader, _stream$Readable); + var _super2 = _createSuper(TestReader); + function TestReader() { var _this; _classCallCheck(this, TestReader); - _this = _possibleConstructorReturn(this, _getPrototypeOf(TestReader).call(this)); + _this = _super2.call(this); _this.reads = 0; return _this; } diff --git a/test/parallel/test-stream2-unpipe-leak.js b/test/parallel/test-stream2-unpipe-leak.js index 93e26015d9..e0d40ff58f 100644 --- a/test/parallel/test-stream2-unpipe-leak.js +++ b/test/parallel/test-stream2-unpipe-leak.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } // Copyright Joyent, Inc. and other Node contributors. // @@ -50,15 +54,15 @@ var stream = require('../../'); var chunk = bufferShim.from('hallo'); -var TestWriter = -/*#__PURE__*/ -function (_stream$Writable) { +var TestWriter = /*#__PURE__*/function (_stream$Writable) { _inherits(TestWriter, _stream$Writable); + var _super = _createSuper(TestWriter); + function TestWriter() { _classCallCheck(this, TestWriter); - return _possibleConstructorReturn(this, _getPrototypeOf(TestWriter).apply(this, arguments)); + return _super.apply(this, arguments); } _createClass(TestWriter, [{ @@ -74,17 +78,17 @@ function (_stream$Writable) { var dest = new TestWriter(); // Set this high so that we'd trigger a nextTick warning // and/or RangeError if we do maybeReadMore wrong. -var TestReader = -/*#__PURE__*/ -function (_stream$Readable) { +var TestReader = /*#__PURE__*/function (_stream$Readable) { _inherits(TestReader, _stream$Readable); + var _super2 = _createSuper(TestReader); + function TestReader() { _classCallCheck(this, TestReader); - return _possibleConstructorReturn(this, _getPrototypeOf(TestReader).call(this, { + return _super2.call(this, { highWaterMark: 0x10000 - })); + }); } _createClass(TestReader, [{ diff --git a/test/parallel/test-stream2-writable.js b/test/parallel/test-stream2-writable.js index 4d38254e8d..0e70441dd2 100644 --- a/test/parallel/test-stream2-writable.js +++ b/test/parallel/test-stream2-writable.js @@ -6,15 +6,19 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } + +function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } + +function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function () { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } + function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } +function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } } -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } +function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } // Copyright Joyent, Inc. and other Node contributors. // @@ -50,17 +54,17 @@ var D = require('../../lib/_stream_duplex'); var assert = require('assert/'); -var TestWriter = -/*#__PURE__*/ -function (_W) { +var TestWriter = /*#__PURE__*/function (_W) { _inherits(TestWriter, _W); + var _super = _createSuper(TestWriter); + function TestWriter(opts) { var _this; _classCallCheck(this, TestWriter); - _this = _possibleConstructorReturn(this, _getPrototypeOf(TestWriter).call(this, opts)); + _this = _super.call(this, opts); _this.buffer = []; _this.written = 0; return _this;