fix: Handle standalone "\r" before overwrite removal

Author: Jason2866

js/util/console-color.js

@@ -83,8 +83,8 @@ export class ColoredConsole {
           case 1: this.state.bold = true; break;
           case 3: this.state.italic = true; break;
           case 4: this.state.underline = true; break;
-          case 5: this.state.blink = true; break;
-          case 6: this.state.rapidBlink = true; break;
+          case 5: this.state.blink = true; this.state.rapidBlink = false; break;
+          case 6: this.state.rapidBlink = true; this.state.blink = false; break;
           case 8: this.state.secret = true; break;
           case 9: this.state.strikethrough = true; break;
           case 22: this.state.bold = false; break;
@@ -130,26 +130,25 @@ export class ColoredConsole {
     }
 
     for (const line of this.state.lines) {
-      if (this.state.carriageReturn && line !== "\n") {
-        if (fragment.childElementCount) {
-          fragment.removeChild(fragment.lastChild);
-        }
-      }
       // A lone \r is a pure carriage-return signal — update state but don't
       // create a DOM node for it (it has no renderable content).
       if (line === "\r") {
         this.state.carriageReturn = true;
         continue;
       }
+      if (this.state.carriageReturn && line !== "\n") {
+        if (fragment.childElementCount) {
+          fragment.removeChild(fragment.lastChild);
+        }
+      }
       const hadCarriageReturn = line.endsWith("\r");
       fragment.appendChild(this.processLine(line.replace(/\r/g, "")));
       this.state.carriageReturn = hadCarriageReturn;
     }
 
     if (
       prevCarriageReturn &&
-      this.state.lines[0] !== "\n" &&
-      this.state.lines[0] !== "\r" &&
+      fragment.childElementCount > 0 &&
       this.targetElement.lastChild
     ) {
       this.targetElement.replaceChild(fragment, this.targetElement.lastChild);

src/util/console-color.ts

@@ -106,9 +106,11 @@ export class ColoredConsole {
             break;
           case 5:
             this.state.blink = true;
+            this.state.rapidBlink = false;
             break;
           case 6:
             this.state.rapidBlink = true;
+            this.state.blink = false;
             break;
           case 8:
             this.state.secret = true;
@@ -209,26 +211,25 @@ export class ColoredConsole {
     }
 
     for (const line of this.state.lines) {
-      if (this.state.carriageReturn && line !== "\n") {
-        if (fragment.childElementCount) {
-          fragment.removeChild(fragment.lastChild!);
-        }
-      }
       // A lone \r is a pure carriage-return signal — update state but don't
       // create a DOM node for it (it has no renderable content).
       if (line === "\r") {
         this.state.carriageReturn = true;
         continue;
       }
+      if (this.state.carriageReturn && line !== "\n") {
+        if (fragment.childElementCount) {
+          fragment.removeChild(fragment.lastChild!);
+        }
+      }
       const hadCarriageReturn = line.endsWith("\r");
       fragment.appendChild(this.processLine(line.replace(/\r/g, "")));
       this.state.carriageReturn = hadCarriageReturn;
     }
 
     if (
       prevCarriageReturn &&
-      this.state.lines[0] !== "\n" &&
-      this.state.lines[0] !== "\r" &&
+      fragment.childElementCount > 0 &&
       this.targetElement.lastChild
     ) {
       this.targetElement.replaceChild(fragment, this.targetElement.lastChild!);