Skip to content

[9.x backport] assert & util PRs #19230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BridgeAR wants to merge 21 commits into from
Closed

[9.x backport] assert & util PRs #19230

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c6aa5ff
doc: improve assert documentation
BridgeAR Nov 13, 2017
b3e4476
assert: add strict functionality export
BridgeAR Nov 13, 2017
da78022
assert: use object argument in innerFail
BridgeAR Dec 9, 2017
9664cc8
assert: fix throws and doesNotThrow stack frames
BridgeAR Dec 15, 2017
0ed963b
test: refactor common.expectsError
BridgeAR Dec 15, 2017
cc52dec
assert: improve assert.throws
BridgeAR Dec 9, 2017
f38be41
doc: improve .throws RegExp info
BridgeAR Dec 11, 2017
7f558d5
assert: .throws accept objects
BridgeAR Dec 10, 2017
fe9f098
assert: fix strict regression
BridgeAR Dec 28, 2017
49dc778
lib: handle `throw undefined` in assert.throws()
bnoordhuis Jan 7, 2018
5d88557
util: fix custom inspect description
BridgeAR Dec 9, 2017
f77f91d
util: rename util.inspect argument
BridgeAR Dec 9, 2017
fb85597
util: add util.inspect compact option
BridgeAR Dec 9, 2017
70ac318
assert: improve error messages
BridgeAR Dec 9, 2017
fae00e3
tty: add getColorDepth function
BridgeAR Jan 16, 2018
073cf69
tty: refactor to es6
BridgeAR Jan 17, 2018
4fbed71
assert: use destructuring for errors
BridgeAR Jan 22, 2018
6694f48
assert: fix throws trace
BridgeAR Feb 6, 2018
1ce2898
doc: document asserts Weak(Map|Set) behavior
BridgeAR Jan 19, 2018
ca8a591
assert: fix infinite loop
BridgeAR Feb 7, 2018
254f888
assert: show proper differences
BridgeAR Feb 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tty: refactor to es6 
PR-URL: #17615
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
  • Loading branch information
@BridgeAR
BridgeAR committed Mar 8, 2018
commit 073cf692be409891f6fee07dfcca7448acbffdbf
22 changes: 8 additions & 14 deletions lib/tty.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ function isatty(fd) {
return Number.isInteger(fd) && fd >= 0 && isTTY(fd);
}


function ReadStream(fd, options) {
if (!(this instanceof ReadStream))
return new ReadStream(fd, options);
Expand All @@ -66,7 +65,6 @@ ReadStream.prototype.setRawMode = function(flag) {
this.isRaw = flag;
};


function WriteStream(fd) {
if (!(this instanceof WriteStream))
return new WriteStream(fd);
Expand All @@ -86,16 +84,15 @@ function WriteStream(fd) {
// Ref: https://github.com/nodejs/node/pull/1771#issuecomment-119351671
this._handle.setBlocking(true);

var winSize = new Array(2);
var err = this._handle.getWindowSize(winSize);
const winSize = new Array(2);
const err = this._handle.getWindowSize(winSize);
if (!err) {
this.columns = winSize[0];
this.rows = winSize[1];
}
}
inherits(WriteStream, net.Socket);


WriteStream.prototype.isTTY = true;

WriteStream.prototype.getColorDepth = function(env = process.env) {
Expand Down Expand Up @@ -164,25 +161,23 @@ WriteStream.prototype.getColorDepth = function(env = process.env) {
};

WriteStream.prototype._refreshSize = function() {
var oldCols = this.columns;
var oldRows = this.rows;
var winSize = new Array(2);
var err = this._handle.getWindowSize(winSize);
const oldCols = this.columns;
const oldRows = this.rows;
const winSize = new Array(2);
const err = this._handle.getWindowSize(winSize);
if (err) {
this.emit('error', errors.errnoException(err, 'getWindowSize'));
return;
}
var newCols = winSize[0];
var newRows = winSize[1];
const [newCols, newRows] = winSize;
if (oldCols !== newCols || oldRows !== newRows) {
this.columns = newCols;
this.rows = newRows;
this.emit('resize');
}
};


// backwards-compat
// Backwards-compat
WriteStream.prototype.cursorTo = function(x, y) {
readline.cursorTo(this, x, y);
};
Expand All @@ -199,5 +194,4 @@ WriteStream.prototype.getWindowSize = function() {
return [this.columns, this.rows];
};


module.exports = { isatty, ReadStream, WriteStream };