eyeprolog 1.6.22 → 1.6.24

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.22",
+  "version": "1.6.24",
   "description": "EyeProlog turns facts and rules into answers and proofs.",
   "type": "module",
   "main": "./index.js",

package/src/repl.js

@@ -146,7 +146,18 @@ class LineReader {
   async read(prompt) {
     this.currentPrompt = prompt;
     this.readline.setPrompt(prompt);
-    this.output.write(prompt);
+    // On a terminal, let readline render the prompt rather than writing it
+    // here. setPrompt tells readline how wide the prompt is, but only
+    // prompt() makes readline the thing that drew it; writing the same
+    // characters directly leaves readline redrawing the line from a column it
+    // does not believe the prompt occupies. The cursor can then travel back
+    // over the prompt, and a refresh can paint the line where the prompt
+    // already is.
+    //
+    // Without a terminal there is no line editor to own the prompt, and it
+    // still has to reach the transcript, so there it is written directly.
+    if (this.terminal) this.readline.prompt();
+    else this.output.write(prompt);
     const result = await this.nextLine();
     return result.done ? null : result.value;
   }
@@ -171,26 +182,35 @@ class LineReader {
     this.input.setRawMode(true);
     this.input.resume();
 
-    const control = await new Promise((resolve, reject) => {
-      const cleanup = () => {
-        this.input.off('data', onData);
-        this.input.off('error', onError);
-      };
-      const onData = (data) => {
-        cleanup();
-        const text = String(data);
-        resolve(text === '\x04' ? null : text[0] ?? null);
-      };
-      const onError = (error) => {
-        cleanup();
-        reject(error);
-      };
-      this.input.once('data', onData);
-      this.input.once('error', onError);
-    });
-
-    this.input.setRawMode(false);
-    this.open();
+    // Raw mode has to be given back even when the wait below fails. In raw
+    // mode the terminal does no echo, performs no newline translation, and
+    // delivers Ctrl-C as a byte rather than a signal, so a session that
+    // escapes this block still in raw mode looks frozen while in fact still
+    // reading: nothing echoes, Enter returns the carriage without feeding a
+    // line, and there is no interrupt left to break out with.
+    let control;
+    try {
+      control = await new Promise((resolve, reject) => {
+        const cleanup = () => {
+          this.input.off('data', onData);
+          this.input.off('error', onError);
+        };
+        const onData = (data) => {
+          cleanup();
+          const text = String(data);
+          resolve(text === '\x04' ? null : text[0] ?? null);
+        };
+        const onError = (error) => {
+          cleanup();
+          reject(error);
+        };
+        this.input.once('data', onData);
+        this.input.once('error', onError);
+      });
+    } finally {
+      if (this.input.isRaw) this.input.setRawMode(false);
+      if (!this.readline) this.open();
+    }
     return control;
   }
 

package/test/regression/cases-regression.mjs

@@ -3832,7 +3832,12 @@ c4 ?- call((!;1)).
         assertEqual(result.status, 0, 'exit status');
         assertIncludes(result.stdout, 'X = foo, Y = bar.', 'conjunction reads');
         assertIncludes(result.stdout, 'Z = end_of_file.', 'Ctrl-D read result');
-        assertIncludes(result.stdout, '?- true.', 'top level resumes after Ctrl-D');
+        // On a terminal readline owns the prompt, so it redraws the line with
+        // cursor-positioning escapes between the prompt and the echoed query.
+        // This assertion is about the top level resuming, not about which
+        // control sequences the line editor uses to place the cursor.
+        const plain = result.stdout.replaceAll(/\u001b\[[0-9;]*[A-Za-z]/g, '');
+        assertIncludes(plain, '?- true.', 'top level resumes after Ctrl-D');
         assertIncludes(result.stdout, '   true.', 'post-EOF query executes');
       },
     },
@@ -3892,7 +3897,13 @@ c4 ?- call((!;1)).
         ]);
         assertEqual(result.error?.code, undefined, 'terminal interrupt timeout');
         assertEqual(result.status, 130, 'SIGINT exit status');
-        assertIncludes(result.stdout, '?- put_code(82), put_code(69), put_code(65), put_code(68), put_code(89), repeat, fail.', 'terminal query echo');
+        // Readline owns the prompt on a terminal and places the cursor with
+        // escapes; the echo is what matters here, not how it was drawn.
+        assertIncludes(
+          result.stdout.replaceAll(/\u001b\[[0-9;]*[A-Za-z]/g, ''),
+          '?- put_code(82), put_code(69), put_code(65), put_code(68), put_code(89), repeat, fail.',
+          'terminal query echo',
+        );
         assertIncludes(result.stdout, 'READY', 'query entered computation');
       },
     },