feat: allow non-str types in colorize function

The colorize function currently only allows strings, so you have to
always convert the inputs yourself before invoking. This is a bit
annoying, we should be able to handle e.g. lists of bools.

Let's just accept all types and stringify them. This might not behave
well with odd types such as function references, but eh, that's on the
user. In future we might behave more gracefully there.

Author: amterp

core/func_colorize.go

@@ -14,7 +14,7 @@ import (
 var FuncColorize = BuiltInFunc{
 	Name: FUNC_COLORIZE,
 	Execute: func(f FuncInvocation) RadValue {
-		strVal := f.GetStr("_val").Plain()
+		strVal := ToPrintableQuoteStr(f.GetArg("_val"), false)
 		enum := lo.Uniq(f.GetList("_enum").AsStringList(false))
 		skipIfSingle := f.GetBool("skip_if_single")
 

core/testing/color_test.go

@@ -303,3 +303,67 @@ display:
 	assertOnlyOutput(t, stdOutBuffer, expected)
 	assertNoErrors(t)
 }
+
+func Test_Colorize_CanColorInts(t *testing.T) {
+	script := `
+nums = [1, 2, 3]
+for n in nums:
+	n.colorize(nums).print()
+`
+	setupAndRunCode(t, script, "--color=always")
+	expected := "\x1b[38;2;230;38;25m1\x1b[0;22;0;0;0m\n\x1b[38;2;99;130;233m2\x1b[0;22;0;0;0m\n\x1b[38;2;106;189;15m3\x1b[0;22;0;0;0m\n"
+	assertOnlyOutput(t, stdOutBuffer, expected)
+	assertNoErrors(t)
+}
+
+func Test_Colorize_CanColorBools(t *testing.T) {
+	script := `
+bools = [true, false]
+for b in bools:
+	b.colorize(bools).print()
+`
+	setupAndRunCode(t, script, "--color=always")
+	expected := "\x1b[38;2;99;130;233mtrue\x1b[0;22;0;0;0m\n\x1b[38;2;230;38;25mfalse\x1b[0;22;0;0;0m\n"
+	assertOnlyOutput(t, stdOutBuffer, expected)
+	assertNoErrors(t)
+}
+
+func Test_Colorize_CanColorMixedTypes(t *testing.T) {
+	script := `
+items = [42, "hello", true]
+for item in items:
+	item.colorize(items).print()
+`
+	setupAndRunCode(t, script, "--color=always")
+	expected := "\x1b[38;2;230;38;25m42\x1b[0;22;0;0;0m\n\x1b[38;2;99;130;233mhello\x1b[0;22;0;0;0m\n\x1b[38;2;106;189;15mtrue\x1b[0;22;0;0;0m\n"
+	assertOnlyOutput(t, stdOutBuffer, expected)
+	assertNoErrors(t)
+}
+
+func Test_Colorize_CanColorFloats(t *testing.T) {
+	script := `
+floats = [1.5, 2.7, 3.14]
+for f in floats:
+	f.colorize(floats).print()
+`
+	setupAndRunCode(t, script, "--color=always")
+	expected := "\x1b[38;2;230;38;25m1.5\x1b[0;22;0;0;0m\n\x1b[38;2;99;130;233m2.7\x1b[0;22;0;0;0m\n\x1b[38;2;106;189;15m3.14\x1b[0;22;0;0;0m\n"
+	assertOnlyOutput(t, stdOutBuffer, expected)
+	assertNoErrors(t)
+}
+
+func Test_Colorize_ConsistentColors(t *testing.T) {
+	script := `
+values = [1, 2, 3]
+for v in values:
+	v.colorize(values).print()
+for v in values:
+	v.colorize(values).print()
+`
+	setupAndRunCode(t, script, "--color=always")
+	// Colors should repeat - first three lines same as last three lines
+	expected := "\x1b[38;2;230;38;25m1\x1b[0;22;0;0;0m\n\x1b[38;2;99;130;233m2\x1b[0;22;0;0;0m\n\x1b[38;2;106;189;15m3\x1b[0;22;0;0;0m\n"
+	expected += "\x1b[38;2;230;38;25m1\x1b[0;22;0;0;0m\n\x1b[38;2;99;130;233m2\x1b[0;22;0;0;0m\n\x1b[38;2;106;189;15m3\x1b[0;22;0;0;0m\n"
+	assertOnlyOutput(t, stdOutBuffer, expected)
+	assertNoErrors(t)
+}

docs-web/docs/reference/functions.md

@@ -766,15 +766,15 @@ Assigns consistent colors to values from a set of possible values. The same valu
 same set.
 
 ```rad
-colorize(_val: str, _enum: str[], *, skip_if_single: bool = false) -> str
+colorize(_val: any, _enum: any[], *, skip_if_single: bool = false) -> str
 ```
 
 **Parameters:**
 
 | Parameter        | Type           | Description                                    |
 |------------------|----------------|------------------------------------------------|
-| `_val`           | `str`          | Value to colorize                              |
-| `_enum`          | `str[]`        | Set of possible values for consistent coloring |
+| `_val`           | `any`          | Value to colorize                              |
+| `_enum`          | `any[]`        | Set of possible values for consistent coloring |
 | `skip_if_single` | `bool = false` | Don't colorize if only one value in set        |
 
 Useful for automatically coloring table data or distinguishing values in lists.

rts/signatures.go

@@ -112,7 +112,7 @@ func init() {
 		newFnSignature(`get_rad_home() -> str`),
 		newFnSignature(`load(_map: map, _key: any, _loader: fn() -> any, *, reload: bool = false, override: any?) -> error|any`),
 		newFnSignature(`color_rgb(_val: any, red: int, green: int, blue: int) -> error|str`),
-		newFnSignature(`colorize(_val: str, _enum: str[], *, skip_if_single: bool = false) -> str`),
+		newFnSignature(`colorize(_val: any, _enum: any[], *, skip_if_single: bool = false) -> str`),
 		newFnSignature(`http_get(url: str, *, body: any?, json: any?, headers: map?) -> { "success": bool, "status_code"?: int, "body"?: any, "error"?: str, "duration_seconds": float }`),
 		newFnSignature(`http_post(url: str, *, body: any?, json: any?, headers: map?) -> { "success": bool, "status_code"?: int, "body"?: any, "error"?: str, "duration_seconds": float }`),
 		newFnSignature(`http_put(url: str, *, body: any?, json: any?, headers: map?) -> { "success": bool, "status_code"?: int, "body"?: any, "error"?: str, "duration_seconds": float }`),