From bd9e8f107a3fc06f804995fc22553cab0366d27a Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Wed, 26 Apr 2017 12:42:18 -0700
Subject: [PATCH 1/2] console: add console.count() and console.clear()

Both are simple utility functions defined by the WHATWG
console spec (https://console.spec.whatwg.org/).
---
 doc/api/console.md                  | 70 +++++++++++++++++++++++++++++
 lib/console.js                      | 39 ++++++++++++++++
 test/parallel/test-console-clear.js | 22 +++++++++
 test/parallel/test-console-count.js | 60 +++++++++++++++++++++++++
 4 files changed, 191 insertions(+)
 create mode 100644 test/parallel/test-console-clear.js
 create mode 100644 test/parallel/test-console-count.js

diff --git a/doc/api/console.md b/doc/api/console.md
index 4939ed77bef1b8..10f9eba540e6c1 100644
--- a/doc/api/console.md
+++ b/doc/api/console.md
@@ -167,6 +167,76 @@ console.assert(false, 'this message will print, but no error thrown');
 console.log('this will also print');
 ```
 
+### console.clear()
+<!-- YAML
+added: REPLACEME
+-->
+
+When `stdout` is a TTY, calling `console.clear()` will attempt to clear the
+TTY. When `stdout` is not a TTY, this method does nothing.
+
+*Note*: The specific operation of `console.clear()` can vary across operating
+systems and terminal types. For most Linux operating systems, `console.clear()`
+operates similarly to the `clear` shell command. On Windows, `console.clear()`
+will clear only the output in the current terminal viewport for the Node.js
+binary.
+
+### console.count([label])
+<!-- YAML
+added: REPLACEME
+-->
+
+* `label` {string} The display label for the counter. Defaults to `'default'`.
+
+Maintains an internal counter specific to `label` and outputs to `stdout` the
+number of times `console.count()` has been called with the given `label`.
+
+<!-- eslint-skip -->
+```js
+> console.count()
+default: 1
+undefined
+> console.count('default')
+default: 2
+undefined
+> console.count('abc')
+abc: 1
+undefined
+> console.count('xyz')
+xyz: 1
+undefined
+> console.count('abc')
+abc: 2
+undefined
+> console.count()
+default: 3
+undefined
+>
+```
+
+### console.countReset([label = 'default'])
+<!-- YAML
+added: REPLACEME
+-->
+
+* `label` {string} The display label for the counter. Defaults to `'default'`.
+
+Resets the internal counter specific to `label`.
+
+<!-- eslint-skip -->
+```js
+> console.count('abc');
+abc: 1
+undefined
+> console.countReset('abc');
+undefined
+> console.count('abc');
+abc: 1
+undefined
+>
+```
+<!-- eslint-enable -->
+
 ### console.dir(obj[, options])
 <!-- YAML
 added: v0.1.101
diff --git a/lib/console.js b/lib/console.js
index 4b76bac8808046..ba2f76917d1cf6 100644
--- a/lib/console.js
+++ b/lib/console.js
@@ -23,6 +23,7 @@
 
 const errors = require('internal/errors');
 const util = require('util');
+const kCounts = Symbol('counts');
 
 function Console(stdout, stderr, ignoreErrors = true) {
   if (!(this instanceof Console)) {
@@ -55,6 +56,8 @@ function Console(stdout, stderr, ignoreErrors = true) {
   prop.value = createWriteErrorHandler(stderr);
   Object.defineProperty(this, '_stderrErrorHandler', prop);
 
+  this[kCounts] = new Map();
+
   // bind the prototype functions to this Console instance
   var keys = Object.keys(Console.prototype);
   for (var v = 0; v < keys.length; v++) {
@@ -166,6 +169,42 @@ Console.prototype.assert = function assert(expression, ...args) {
   }
 };
 
+// Defined by: https://console.spec.whatwg.org/#clear
+Console.prototype.clear = function clear() {
+  // It only makes sense to clear if _stdout is a TTY.
+  // Otherwise, do nothing.
+  if (this._stdout.isTTY) {
+    // The require is here intentionally to avoid readline being
+    // required too early when console is first loaded.
+    const { cursorTo, clearScreenDown } = require('readline');
+    cursorTo(this._stdout, 0, 0);
+    clearScreenDown(this._stdout);
+  }
+};
+
+// Defined by: https://console.spec.whatwg.org/#count
+Console.prototype.count = function count(label = 'default') {
+  // Ensures that label is a string, and only things that can be
+  // coerced to strings. e.g. Symbol is not allowed
+  label = `${label}`;
+  const counts = this[kCounts];
+  let count = counts.get(label);
+  if (count === undefined)
+    count = 1;
+  else
+    count++;
+  counts.set(label, count);
+  this.log(`${label}: ${count}`);
+};
+
+// Not yet defined by the https://console.spec.whatwg.org, but
+// proposed to be added and currently implemented by Edge. Having
+// the ability to reset counters is important to help prevent
+// the counter from being a memory leak.
+Console.prototype.countReset = function countReset(label = 'default') {
+  const counts = this[kCounts];
+  counts.delete(label);
+};
 
 module.exports = new Console(process.stdout, process.stderr);
 module.exports.Console = Console;
diff --git a/test/parallel/test-console-clear.js b/test/parallel/test-console-clear.js
new file mode 100644
index 00000000000000..3df73f1178a15d
--- /dev/null
+++ b/test/parallel/test-console-clear.js
@@ -0,0 +1,22 @@
+'use strict';
+
+require('../common');
+const assert = require('assert');
+
+const stdoutWrite = process.stdout.write;
+
+// The sequence for moving the cursor to 0,0 and clearing screen down
+const check = '\u001b[1;1H\u001b[0J';
+
+let buf = '';
+
+// Fake TTY
+process.stdout.isTTY = true;
+
+process.stdout.write = (string) => buf += string;
+
+console.clear();
+
+process.stdout.write = stdoutWrite;
+
+assert.strictEqual(buf, check);
diff --git a/test/parallel/test-console-count.js b/test/parallel/test-console-count.js
new file mode 100644
index 00000000000000..163c36c8f6ea4d
--- /dev/null
+++ b/test/parallel/test-console-count.js
@@ -0,0 +1,60 @@
+'use strict';
+
+require('../common');
+const assert = require('assert');
+
+const stdoutWrite = process.stdout.write;
+
+let buf = '';
+
+process.stdout.write = (string) => buf = string;
+
+console.count();
+assert.strictEqual(buf, 'default: 1\n');
+
+// 'default' and undefined are equivalent
+console.count('default');
+assert.strictEqual(buf, 'default: 2\n');
+
+console.count('a');
+assert.strictEqual(buf, 'a: 1\n');
+
+console.count('b');
+assert.strictEqual(buf, 'b: 1\n');
+
+console.count('a');
+assert.strictEqual(buf, 'a: 2\n');
+
+console.count();
+assert.strictEqual(buf, 'default: 3\n');
+
+console.count({});
+assert.strictEqual(buf, '[object Object]: 1\n');
+
+console.count(1);
+assert.strictEqual(buf, '1: 1\n');
+
+console.count(null);
+assert.strictEqual(buf, 'null: 1\n');
+
+console.count('null');
+assert.strictEqual(buf, 'null: 2\n');
+
+console.countReset();
+console.count();
+assert.strictEqual(buf, 'default: 1\n');
+
+console.countReset('a');
+console.count('a');
+assert.strictEqual(buf, 'a: 1\n');
+
+// countReset('a') only reset the a counter
+console.count();
+assert.strictEqual(buf, 'default: 2\n');
+
+process.stdout.write = stdoutWrite;
+
+// Symbol labels do not work
+assert.throws(
+  () => console.count(Symbol('test')),
+  /^TypeError: Cannot convert a Symbol value to a string$/);

From 60269cd3be3d41788c0c3b2c180991d2783c0db5 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Mon, 31 Jul 2017 09:46:42 -0700
Subject: [PATCH 2/2] [Squash] Address final nits

---
 lib/console.js                      |  2 +-
 test/parallel/test-console-clear.js | 20 ++++++++++----------
 test/parallel/test-console-count.js |  3 +++
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/console.js b/lib/console.js
index ba2f76917d1cf6..08a6cf4fa79413 100644
--- a/lib/console.js
+++ b/lib/console.js
@@ -203,7 +203,7 @@ Console.prototype.count = function count(label = 'default') {
 // the counter from being a memory leak.
 Console.prototype.countReset = function countReset(label = 'default') {
   const counts = this[kCounts];
-  counts.delete(label);
+  counts.delete(`${label}`);
 };
 
 module.exports = new Console(process.stdout, process.stderr);
diff --git a/test/parallel/test-console-clear.js b/test/parallel/test-console-clear.js
index 3df73f1178a15d..b6fc003165dc66 100644
--- a/test/parallel/test-console-clear.js
+++ b/test/parallel/test-console-clear.js
@@ -8,15 +8,15 @@ const stdoutWrite = process.stdout.write;
 // The sequence for moving the cursor to 0,0 and clearing screen down
 const check = '\u001b[1;1H\u001b[0J';
 
-let buf = '';
+function doTest(isTTY, check) {
+  let buf = '';
+  process.stdout.isTTY = isTTY;
+  process.stdout.write = (string) => buf += string;
+  console.clear();
+  process.stdout.write = stdoutWrite;
+  assert.strictEqual(buf, check);
+}
 
 // Fake TTY
-process.stdout.isTTY = true;
-
-process.stdout.write = (string) => buf += string;
-
-console.clear();
-
-process.stdout.write = stdoutWrite;
-
-assert.strictEqual(buf, check);
+doTest(true, check);
+doTest(false, '');
diff --git a/test/parallel/test-console-count.js b/test/parallel/test-console-count.js
index 163c36c8f6ea4d..64e2641f0a641d 100644
--- a/test/parallel/test-console-count.js
+++ b/test/parallel/test-console-count.js
@@ -58,3 +58,6 @@ process.stdout.write = stdoutWrite;
 assert.throws(
   () => console.count(Symbol('test')),
   /^TypeError: Cannot convert a Symbol value to a string$/);
+assert.throws(
+  () => console.countReset(Symbol('test')),
+  /^TypeError: Cannot convert a Symbol value to a string$/);