repl: add welcome message

PR-URL: nodejs#25947 Reviewed-By: Jeremiah Senkpiel <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Sakthipriyan Vairamani <[email protected]>
BridgeAR · Apr 16, 2019 · fe96314 · fe96314
1 parent f3b5cc0
commit fe96314
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 24 deletions.
diff --git a/lib/internal/main/repl.js b/lib/internal/main/repl.js
@@ -11,17 +11,21 @@ const {
   evalScript
 } = require('internal/process/execution');
 
+const console = require('internal/console/global');
+
 prepareMainThreadExecution();
 
 // --entry-type flag not supported in REPL
 if (require('internal/options').getOptionValue('--entry-type')) {
   // If we can't write to stderr, we'd like to make this a noop,
   // so use console.error.
-  const { error } = require('internal/console/global');
-  error('Cannot specify --entry-type for REPL');
+  console.error('Cannot specify --entry-type for REPL');
   process.exit(1);
 }
 
+console.log(`Welcome to Node.js ${process.version}.\n` +
+  'Type ".help" for more information.');
+
 const cliRepl = require('internal/repl');
 cliRepl.createInternalRepl(process.env, (err, repl) => {
   if (err) {

diff --git a/test/parallel/test-force-repl-with-eval.js b/test/parallel/test-force-repl-with-eval.js
@@ -12,7 +12,7 @@ cp.stdout.setEncoding('utf8');
 let output = '';
 cp.stdout.on('data', function(b) {
   output += b;
-  if (output === '> 42\n') {
+  if (output.endsWith('> 42\n')) {
     gotToEnd = true;
     cp.kill();
   }

diff --git a/test/parallel/test-force-repl.js b/test/parallel/test-force-repl.js
@@ -4,12 +4,19 @@ const assert = require('assert');
 const spawn = require('child_process').spawn;
 
 // Spawn a node child process in interactive mode (enabling the REPL) and
-// confirm the '> ' prompt is included in the output.
+// confirm the '> ' prompt and welcome message is included in the output.
 const cp = spawn(process.execPath, ['-i']);
 
 cp.stdout.setEncoding('utf8');
 
-cp.stdout.once('data', common.mustCall(function(b) {
-  assert.strictEqual(b, '> ');
-  cp.kill();
+let out = '';
+cp.stdout.on('data', (d) => {
+  out += d;
+});
+
+cp.stdout.on('end', common.mustCall(() => {
+  assert.strictEqual(out, `Welcome to Node.js ${process.version}.\n` +
+                        'Type ".help" for more information.\n> ');
 }));
+
+cp.stdin.end('');
diff --git a/test/parallel/test-preload.js b/test/parallel/test-preload.js
@@ -86,16 +86,17 @@ const replProc = childProcess.spawn(
 );
 replProc.stdin.end('.exit\n');
 let replStdout = '';
-replProc.stdout.on('data', function(d) {
+replProc.stdout.on('data', (d) => {
   replStdout += d;
 });
 replProc.on('close', function(code) {
   assert.strictEqual(code, 0);
   const output = [
     'A',
     '> '
-  ].join('\n');
-  assert.strictEqual(replStdout, output);
+  ];
+  assert.ok(replStdout.startsWith(output[0]));
+  assert.ok(replStdout.endsWith(output[1]));
 });
 
 // Test that preload placement at other points in the cmdline
@@ -114,7 +115,7 @@ const interactive = childProcess.exec(
   `"${nodeBinary}" ${preloadOption([fixtureD])}-i`,
   common.mustCall(function(err, stdout, stderr) {
     assert.ifError(err);
-    assert.strictEqual(stdout, "> 'test'\n> ");
+    assert.ok(stdout.endsWith("> 'test'\n> "));
   })
 );
 

diff --git a/test/parallel/test-repl-harmony.js b/test/parallel/test-repl-harmony.js
@@ -30,19 +30,19 @@ const child = spawn(process.execPath, args);
 const input = '(function(){"use strict"; const y=1;y=2})()\n';
 // This message will vary based on JavaScript engine, so don't check the message
 // contents beyond confirming that the `Error` is a `TypeError`.
-const expectOut = /^> Thrown:\nTypeError: /;
+const expectOut = /> Thrown:\nTypeError: /;
 
 child.stderr.setEncoding('utf8');
-child.stderr.on('data', function(c) {
+child.stderr.on('data', (d) => {
   throw new Error('child.stderr be silent');
 });
 
 child.stdout.setEncoding('utf8');
 let out = '';
-child.stdout.on('data', function(c) {
-  out += c;
+child.stdout.on('data', (d) => {
+  out += d;
 });
-child.stdout.on('end', function() {
+child.stdout.on('end', () => {
   assert(expectOut.test(out));
   console.log('ok');
 });

diff --git a/test/parallel/test-repl-inspect-defaults.js b/test/parallel/test-repl-inspect-defaults.js
@@ -11,7 +11,7 @@ child.stdout.on('data', (data) => {
 });
 
 child.on('exit', common.mustCall(() => {
-  const results = output.replace(/^> /mg, '').split('\n');
+  const results = output.replace(/^> /mg, '').split('\n').slice(2);
   assert.deepStrictEqual(
     results,
     [

diff --git a/test/parallel/test-repl-require-after-write.js b/test/parallel/test-repl-require-after-write.js
@@ -25,7 +25,7 @@ child.stdout.on('data', (c) => {
   out += c;
 });
 child.stdout.on('end', common.mustCall(() => {
-  assert.strictEqual(out, '> 1\n> ');
+  assert.ok(out.endsWith('> 1\n> '));
 }));
 
 child.stdin.end(input);
diff --git a/test/parallel/test-repl-require-context.js b/test/parallel/test-repl-require-context.js
@@ -13,7 +13,7 @@ child.stdout.on('data', (data) => {
 });
 
 child.on('exit', common.mustCall(() => {
-  const results = output.replace(/^> /mg, '').split('\n');
+  const results = output.replace(/^> /mg, '').split('\n').slice(2);
   assert.deepStrictEqual(results, ['undefined', 'true', 'true', '']);
 }));
 

diff --git a/test/parallel/test-repl-unexpected-token-recoverable.js b/test/parallel/test-repl-unexpected-token-recoverable.js
@@ -12,20 +12,20 @@ const child = spawn(process.execPath, args);
 
 const input = 'var foo = "bar\\\nbaz"';
 // Match '...' as well since it marks a multi-line statement
-const expectOut = /^> \.\.\. undefined\n/;
+const expectOut = /> \.\.\. undefined\n/;
 
 child.stderr.setEncoding('utf8');
-child.stderr.on('data', function(c) {
+child.stderr.on('data', (d) => {
   throw new Error('child.stderr be silent');
 });
 
 child.stdout.setEncoding('utf8');
 let out = '';
-child.stdout.on('data', function(c) {
-  out += c;
+child.stdout.on('data', (d) => {
+  out += d;
 });
 
-child.stdout.on('end', function() {
+child.stdout.on('end', () => {
   assert(expectOut.test(out));
   console.log('ok');
 });