feat: add stripAnsi to Terminal

prelude/__internal__/IO.mad

@@ -51,6 +51,9 @@ export red = Terminal.text.red
 export green = Terminal.text.green
 export yellow = Terminal.text.yellow
 export grey = Terminal.text.white
+export blue = Terminal.text.blue
+export cyan = Terminal.text.cyan
+export magenta = Terminal.text.magenta
 
 #iftarget js
 

prelude/__internal__/Terminal.mad

@@ -1,5 +1,7 @@
 import String from "String"
 
+
+
 type HandlerId = HandlerId
 export type HandlerId
 
@@ -24,7 +26,6 @@ export ansi = {
   FGMagenta: "35",
   FGCyan: "36",
   FGWhite: "37",
-
   FGBrightBlack: "90",
   FGBrightRed: "91",
   FGBrightGreen: "92",
@@ -33,7 +34,6 @@ export ansi = {
   FGBrightMagenta: "95",
   FGBrightCyan: "96",
   FGBrightWhite: "97",
-
   BGBlack: "40",
   BGRed: "41",
   BGGreen: "42",
@@ -42,7 +42,6 @@ export ansi = {
   BGMagenta: "45",
   BGCyan: "46",
   BGWhite: "47",
-
   BGBrightBlack: "100",
   BGBrightRed: "101",
   BGBrightGreen: "102",
@@ -51,12 +50,10 @@ export ansi = {
   BGBrightMagenta: "105",
   BGBrightCyan: "106",
   BGBrightWhite: "107",
-
   FormatUnderline: "4",
   FormatNoUnderline: "24",
   FormatBold: "1",
   FormatNoBold: "21",
-
   FormatInvert: "7",
 }
 
@@ -69,9 +66,18 @@ export ansi = {
  * ansiColor([ansi.FormatBold, ansi.FGBrightRed], "will be red and bold")
  */
 ansiColor :: List String -> String -> String
-export ansiColor = (parts, str) => colorize(
-  `\x1b[${String.join(";", parts)}m`,
-  str
+export ansiColor = (parts, str) => colorize(`\x1b[${String.join(";", parts)}m`, str)
+
+/**
+ * Removes ansi escape codes from a given string
+ * @since 0.23.13
+ * @example
+ * Terminal.stripAnsi(Terminal.text.red("hey")) == "hey"
+ */
+stripAnsi :: String -> String
+export stripAnsi = String.replace(
+  `[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))`,
+  "",
 )
 
 export text = {
@@ -161,9 +167,7 @@ onWindowResizedFFI :: ({} -> {}) -> HandlerId
 onWindowResizedFFI = extern "madlib__stdio__onWindowResized"
 
 onWindowResized :: (#[Integer, Integer] -> {}) -> HandlerId
-export onWindowResized = (cb) => onWindowResizedFFI(() => {
-  cb(getWindowSize())
-})
+export onWindowResized = (cb) => onWindowResizedFFI(() => { cb(getWindowSize()) })
 
 
 clearWindowResizeHandler :: HandlerId -> {}
@@ -221,10 +225,7 @@ export clearKeyPressedHandler = (id) => #- {
 
 
 getWindowSize :: {} -> #[Integer, Integer]
-export getWindowSize = () => #[
-  #- process.stdout.columns -#,
-  #- process.stdout.rows -#,
-]
+export getWindowSize = () => #[#- process.stdout.columns -#, #- process.stdout.rows -#]
 
 
 getTTYMode :: {} -> TTYMode

prelude/__internal__/Terminal.spec.mad

@@ -0,0 +1,13 @@
+import { assertEquals, test } from "Test"
+
+import { stripAnsi, text } from "./Terminal"
+
+
+
+test(
+  "stripAnsi",
+  () => do {
+    _ <- assertEquals(stripAnsi(text.red("colorful")), "colorful")
+    return assertEquals(stripAnsi("noChange"), "noChange")
+  },
+)