0
0
mirror of https://github.com/nodejs/node.git synced 2024-11-29 15:06:33 +01:00

readline: expose stream API in cursorTo()

This commit adds an optional callback to cursorTo(), which is
passed to the stream's write() method. It also exposes the
return value of write().

PR-URL: https://github.com/nodejs/node/pull/28674
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
This commit is contained in:
cjihrig 2019-07-13 20:10:17 -04:00
parent 795c7482f2
commit 462f43824f
No known key found for this signature in database
GPG Key ID: 7434390BDBE9B9C5
3 changed files with 36 additions and 17 deletions

View File

@ -487,14 +487,22 @@ function completer(linePartial, callback) {
}
```
## readline.cursorTo(stream, x, y)
## readline.cursorTo(stream, x, y[, callback])
<!-- YAML
added: v0.7.7
changes:
- version: REPLACEME
pr-url: https://github.com/nodejs/node/pull/28674
description: The stream's write() callback and return value are exposed.
-->
* `stream` {stream.Writable}
* `x` {number}
* `y` {number}
* `callback` {Function} Invoked once the operation completes.
* Returns: {boolean} `false` if `stream` wishes for the calling code to wait for
the `'drain'` event to be emitted before continuing to write additional data;
otherwise `true`.
The `readline.cursorTo()` method moves cursor to the specified position in a
given [TTY][] `stream`.

View File

@ -1189,21 +1189,21 @@ function emitKeypressEvents(stream, iface) {
* moves the cursor to the x and y coordinate on the given stream
*/
function cursorTo(stream, x, y) {
if (stream === null || stream === undefined)
return;
function cursorTo(stream, x, y, callback) {
if (callback !== undefined && typeof callback !== 'function')
throw new ERR_INVALID_CALLBACK(callback);
if (typeof x !== 'number' && typeof y !== 'number')
return;
if (stream == null || (typeof x !== 'number' && typeof y !== 'number')) {
if (typeof callback === 'function')
process.nextTick(callback);
return true;
}
if (typeof x !== 'number')
throw new ERR_INVALID_CURSOR_POS();
if (typeof y !== 'number') {
stream.write(CSI`${x + 1}G`);
} else {
stream.write(CSI`${y + 1};${x + 1}H`);
}
const data = typeof y !== 'number' ? CSI`${x + 1}G` : CSI`${y + 1};${x + 1}H`;
return stream.write(data, callback);
}
/**

View File

@ -106,15 +106,17 @@ assert.strictEqual(readline.moveCursor(undefined, 1, 1, common.mustCall()),
true);
// Undefined or null as stream should not throw.
readline.cursorTo(null);
readline.cursorTo();
assert.strictEqual(readline.cursorTo(null), true);
assert.strictEqual(readline.cursorTo(), true);
assert.strictEqual(readline.cursorTo(null, 1, 1, common.mustCall()), true);
assert.strictEqual(readline.cursorTo(undefined, 1, 1, common.mustCall()), true);
writable.data = '';
readline.cursorTo(writable, 'a');
assert.strictEqual(readline.cursorTo(writable, 'a'), true);
assert.strictEqual(writable.data, '');
writable.data = '';
readline.cursorTo(writable, 'a', 'b');
assert.strictEqual(readline.cursorTo(writable, 'a', 'b'), true);
assert.strictEqual(writable.data, '');
writable.data = '';
@ -128,9 +130,18 @@ common.expectsError(
assert.strictEqual(writable.data, '');
writable.data = '';
readline.cursorTo(writable, 1, 'a');
assert.strictEqual(readline.cursorTo(writable, 1, 'a'), true);
assert.strictEqual(writable.data, '\x1b[2G');
writable.data = '';
readline.cursorTo(writable, 1, 2);
assert.strictEqual(readline.cursorTo(writable, 1, 2), true);
assert.strictEqual(writable.data, '\x1b[3;2H');
writable.data = '';
assert.strictEqual(readline.cursorTo(writable, 1, 2, common.mustCall()), true);
assert.strictEqual(writable.data, '\x1b[3;2H');
// Verify that cursorTo() throws on invalid callback.
assert.throws(() => {
readline.cursorTo(writable, 1, 1, null);
}, /ERR_INVALID_CALLBACK/);