fix: address feedbacks by @nayeemrmn

denoland · bartlomieju · Oct 13, 2020 · Sep 15, 2020 · Sep 16, 2020 · Sep 16, 2020
commit ff444f15966917a043665f4fb5e699d6e019b015
diff --git a/cli/rt/41_prompt.js b/cli/rt/41_prompt.js
@@ -6,50 +6,36 @@
   const encoder = new TextEncoder();
   const decoder = new TextDecoder();
 
-  function alert(message) {
+  function alert(message = "Alert") {
     if (!isatty(stdin.rid)) {
-      throw new Error(
-        "stdin is not interactive. 'alert' needs stdin to be interactive.",
-      );
+      return;
     }
 
-    if (message) {
-      stdout.writeSync(encoder.encode(message));
-    }
+    stdout.writeSync(encoder.encode(`${message} [Enter] `));
 
     readLineFromStdinSync();
   }
 
-  function confirm(message) {
+  function confirm(message = "Confirm") {
     if (!isatty(stdin.rid)) {
-      throw new Error(
-        "stdin is not interactive. 'confirm' needs stdin to be interactive.",
-      );
-    }
-
-    if (message) {
-      stdout.writeSync(encoder.encode(message));
+      return false;
     }
 
-    stdout.writeSync(encoder.encode(" [y/N] "));
+    stdout.writeSync(encoder.encode(`${message} [y/N] `));
 
     const answer = readLineFromStdinSync();
 
     return answer === "Y" || answer === "y";
   }
 
-  function prompt(message, defaultValue = "") {
-    if (!isatty(stdin.rid)) {
-      throw new Error(
-        "stdin is not interactive. 'prompt' needs stdin to be interactive.",
-      );
-    }
+  function prompt(message = "Prompt", defaultValue) {
+    defaultValue ??= null;
 
-    if (message) {
-      stdout.writeSync(encoder.encode(message));
+    if (!isatty(stdin.rid)) {
+      return defaultValue;
     }
 
-    stdout.writeSync(encoder.encode(" "));
+    stdout.writeSync(encoder.encode(`${message} `));
 
     if (defaultValue) {
       stdout.writeSync(encoder.encode(`[${defaultValue}] `));

diff --git a/cli/tests/066_prompt.ts b/cli/tests/066_prompt.ts
@@ -2,11 +2,16 @@ const name0 = prompt("What is your name?", "Jane Doe"); // Answer John Doe
 console.log(`Your name is ${name0}.`);
 const name1 = prompt("What is your name?", "Jane Doe"); // Answer with default
 console.log(`Your name is ${name1}.`);
+const input = prompt(); // Answer foo
+console.log(`Your input is ${input}.`);
 const answer0 = confirm("Question 0"); // Answer y
 console.log(`Your answer is ${answer0}`);
 const answer1 = confirm("Question 1"); // Answer n
 console.log(`Your answer is ${answer1}`);
 const answer2 = confirm("Question 2"); // Answer with default
 console.log(`Your answer is ${answer2}`);
-alert("Hi"); // Requires the enter key pressed
+const answer3 = confirm(); // Answer with default
+console.log(`Your answer is ${answer3}`);
+alert("Hi");
+alert();
 console.log("The end of test");
diff --git a/cli/tests/066_prompt.ts.out b/cli/tests/066_prompt.ts.out
@@ -1,6 +1,8 @@
 [WILDCARD]What is your name? [Jane Doe] Your name is John Doe.
 What is your name? [Jane Doe] Your name is Jane Doe.
+Prompt Your input is foo.
 Question 0 [y/N] Your answer is true
 Question 1 [y/N] Your answer is false
 Question 2 [y/N] Your answer is false
-HiThe end of test
+Confirm [y/N] Your answer is false
+Hi [Enter] Alert [Enter] The end of test
diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs
@@ -1923,7 +1923,7 @@ fn _066_prompt() {
   let args = "run --unstable 066_prompt.ts";
   let output = "066_prompt.ts.out";
   // These are answers to prompt, confirm, and alert calls.
-  let input = b"John Doe\n\nY\nN\n\n\n";
+  let input = b"John Doe\n\nfoo\nY\nN\n\n\n\n\n";
 
   util::test_pty(args, output, input);
 }