lib: rewrite the same code again :)

Author: Raoof

doc/api/readline.md

@@ -376,11 +376,9 @@ changes:
     to the history list duplicates an older one, this removes the older line
     from the list. **Default:** `false`.
   * `escapeCodeTimeout` {number} The duration `readline` will wait for a
-    character when reading an ambiguous key sequence in milliseconds (one that 
+    character (when reading an ambiguous key sequence in milliseconds one that 
     can both form a complete key sequence using the input read so far and can 
-    take additional input to complete a longer key sequence). The default 
-    value is used if `NaN`, a negative number, or a non-number is provided. 
-    **Default:** `500`.
+    take additional input to complete a longer key sequence).
 
 The `readline.createInterface()` method creates a new `readline.Interface`
 instance.

lib/readline.js

@@ -82,13 +82,13 @@ function Interface(input, output, completer, terminal) {
   this.isCompletionEnabled = true;
   this._sawKeyPress = false;
   this._previousKey = null;
+  this.escapeCodeTimeout = ESCAPE_CODE_TIMEOUT;
 
   EventEmitter.call(this);
   var historySize;
   var removeHistoryDuplicates = false;
   let crlfDelay;
   let prompt = '> ';
-  let escapeCodeTimeout = ESCAPE_CODE_TIMEOUT;
 
   if (input && input.input) {
     // an options object was given
@@ -100,15 +100,19 @@ function Interface(input, output, completer, terminal) {
     if (input.prompt !== undefined) {
       prompt = input.prompt;
     }
-    if (typeof input.escapeCodeTimeout === 'number' &&
-        !Number.isNaN(input.escapeCodeTimeout) &&
-        input.escapeCodeTimeout > 0) {
-      escapeCodeTimeout = input.escapeCodeTimeout;
+    if (input.escapeCodeTimeout !== undefined) {
+      this.escapeCodeTimeout = input.escapeCodeTimeout;
     }
     crlfDelay = input.crlfDelay;
     input = input.input;
   }
 
+  if (!Number.isFinite(this.escapeCodeTimeout)) {
+    throw new ERR_INVALID_OPT_VALUE(
+      'escapeCodeTimeout',
+      this.escapeCodeTimeout
+    );
+  }
 
   if (completer && typeof completer !== 'function') {
     throw new ERR_INVALID_OPT_VALUE('completer', completer);
@@ -138,7 +142,6 @@ function Interface(input, output, completer, terminal) {
   this.removeHistoryDuplicates = !!removeHistoryDuplicates;
   this.crlfDelay = crlfDelay ?
     Math.max(kMincrlfDelay, crlfDelay) : kMincrlfDelay;
-  this.escapeCodeTimeout = escapeCodeTimeout;
   // Check arity, 2 - for async, 1 for sync
   if (typeof completer === 'function') {
     this.completer = completer.length === 2 ?
@@ -1005,7 +1008,7 @@ function emitKeypressEvents(stream, iface) {
   stream[ESCAPE_DECODER] = emitKeys(stream);
   stream[ESCAPE_DECODER].next();
 
-  const escapeCodeTimeoutFn = () => stream[ESCAPE_DECODER].next('');
+  const escapeCodeTimeout = () => stream[ESCAPE_DECODER].next('');
   let timeoutId;
 
   function onData(b) {
@@ -1028,7 +1031,7 @@ function emitKeypressEvents(stream, iface) {
             // Escape letter at the tail position
             if (r[i] === kEscape && i + 1 === r.length) {
               timeoutId = setTimeout(
-                escapeCodeTimeoutFn,
+                escapeCodeTimeout,
                 iface ? iface.escapeCodeTimeout : ESCAPE_CODE_TIMEOUT
               );
             }

test/parallel/test-readline-interface-escapecodetimeout.js

@@ -1,12 +1,11 @@
 'use strict';
-require('../common');
+const common = require('../common');
 
 // This test ensures that the escapeCodeTimeout option set correctly
 
 const assert = require('assert');
 const readline = require('readline');
 const EventEmitter = require('events').EventEmitter;
-const ESCAPE_CODE_TIMEOUT = 500;
 
 class FakeInput extends EventEmitter {
   resume() {}
@@ -26,46 +25,22 @@ class FakeInput extends EventEmitter {
   rli.close();
 }
 
-{
-  const fi = new FakeInput();
-  const rli = new readline.Interface({
-    input: fi,
-    output: fi,
-    escapeCodeTimeout: null
-  });
-  assert.strictEqual(rli.escapeCodeTimeout, ESCAPE_CODE_TIMEOUT);
-  rli.close();
-}
-
-{
-  const fi = new FakeInput();
-  const rli = new readline.Interface({
-    input: fi,
-    output: fi,
-    escapeCodeTimeout: {}
-  });
-  assert.strictEqual(rli.escapeCodeTimeout, ESCAPE_CODE_TIMEOUT);
-  rli.close();
-}
-
-{
-  const fi = new FakeInput();
-  const rli = new readline.Interface({
-    input: fi,
-    output: fi,
-    escapeCodeTimeout: NaN
+[
+  null,
+  {},
+  NaN,
+  '50'
+].forEach((invalidInput) => {
+  common.expectsError(() => {
+    const fi = new FakeInput();
+    const rli = new readline.Interface({
+      input: fi,
+      output: fi,
+      escapeCodeTimeout: invalidInput
+    });
+    rli.close();
+  }, {
+    type: TypeError,
+    code: 'ERR_INVALID_OPT_VALUE'
   });
-  assert.strictEqual(rli.escapeCodeTimeout, ESCAPE_CODE_TIMEOUT);
-  rli.close();
-}
-
-{
-  const fi = new FakeInput();
-  const rli = new readline.Interface({
-    input: fi,
-    output: fi,
-    escapeCodeTimeout: '50'
-  });
-  assert.strictEqual(rli.escapeCodeTimeout, ESCAPE_CODE_TIMEOUT);
-  rli.close();
-}
+});