From f2c729fd7d8bac5d11b12b3338fda3cb5d76b8ab Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jonathan@jdbernard.com>
Date: Wed, 19 Nov 2025 08:19:12 -0600
Subject: [PATCH] withColor should reset the terminal color afterwards by
 default.

---
 cliutils.nim | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/cliutils.nim b/cliutils.nim
index 2141b39..ec327f5 100644
--- a/cliutils.nim
+++ b/cliutils.nim
@@ -21,14 +21,19 @@ proc termColor*(color: TermColor, bright, bold = false): string =
   if bright: inc(colorVal, 60)
   return "\e[" & $colorVal & (if bold: ";1" else: "") & "m"
 
-proc withColor*(str: string, color: TermColor, bright, bold = false): string =
-  return termColor(color, bright, bold) & str
+
+proc withColor*(str: string, color: TermColor, bright, bold, skipReset = false): string =
+  if skipReset:
+    return termColor(color, bright, bold) & str
+  else:
+    return termColor(color, bright, bold) & str & termReset
 
 
 proc stripAnsi*(str: string): string =
   let STRIP_ANSI_REGEX = re"\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]"
   return str.replace(STRIP_ANSI_REGEX, "")
 
+
 proc doParseQueryParams[T](queryParams: T): seq[string] =
   result = @[]
 
@@ -40,8 +45,10 @@ proc doParseQueryParams[T](queryParams: T): seq[string] =
       result.add("--" & k)
       if v != "true": result.add(v) # support things like ?verbose=true -> cmd --verbose
 
+
 proc queryParamsToCliArgs*(queryParams: Table[string, string]): seq[string] =
   doParseQueryParams(queryParams)
 
+
 proc queryParamsToCliArgs*(queryParams: StringTableRef): seq[string] =
   doParseQueryParams(queryParams)