Upgrade Goal, enhance vendored help

Author: semperos

go.mod

@@ -5,7 +5,7 @@ go 1.22
 toolchain go1.22.7
 
 require (
-	codeberg.org/anaseto/goal v1.0.0
+	codeberg.org/anaseto/goal v1.0.1-0.20241109155047-ee95ff40957e
 	github.com/charmbracelet/lipgloss v1.0.0
 	github.com/go-resty/resty/v2 v2.16.0
 	github.com/jarcoal/httpmock v1.3.1

go.sum

@@ -1,5 +1,5 @@
-codeberg.org/anaseto/goal v1.0.0 h1:bE4KdvlQlRt/c9ktZIzIrweG6WeBN53vGbGar5wnGtQ=
-codeberg.org/anaseto/goal v1.0.0/go.mod h1:uSilOn+ZWioD+gG+3OopP090Fth5H47V/TU9ziI++CM=
+codeberg.org/anaseto/goal v1.0.1-0.20241109155047-ee95ff40957e h1:4djk1MQ/HyHGsANgbtEy9OGMUEFgFFLZ9dpHRd7yJNw=
+codeberg.org/anaseto/goal v1.0.1-0.20241109155047-ee95ff40957e/go.mod h1:uSilOn+ZWioD+gG+3OopP090Fth5H47V/TU9ziI++CM=
 github.com/apache/arrow/go/v17 v17.0.0 h1:RRR2bdqKcdbss9Gxy2NS/hK8i4LDMh23L6BbkN5+F54=
 github.com/apache/arrow/go/v17 v17.0.0/go.mod h1:jR7QHkODl15PfYyjM2nU+yTLScZ/qfj7OSUZmJ8putc=
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=

script/vendor-help

@@ -6,4 +6,5 @@ GOALSHA="$(git -C $GOAL rev-parse HEAD)"
 
 mkdir -p "$REPO/vendored"
 cp -R "$GOAL/help" "$REPO/vendored/"
+printf "\nfunc Map() map[string]string {\n	return initHelp()\n}\n" >> "$REPO/vendored/help/get.go"
 printf "# Vendored Go Code from Goal Project\n\nPulled from Goal at Git commit: \`$GOALSHA\`\n" > "$REPO/vendored/README.md"

vendor-goal/README.md

@@ -1,3 +1,3 @@
 # Vendored Goal Code from Goal Project
 
-Pulled from Goal at Git commit: `69d8c2236f559ab8c3d8ca3485beec5bf4c0346a`
+Pulled from Goal at Git commit: `ee95ff40957e5d75a474458fd5c8418ce2ccac16`

vendor-goal/fmt.goal

@@ -1,17 +1,18 @@
-/ dict[d;f] outputs dict d, assuming string keys and atom or flat array values,
-/ using format string f for floating point numbers.
+/ dict[d;f] outputs dict d using format string f for floating point numbers.
 dict:{[d;f]
   nk:#d; say"=== Dict ($nk keys) ==="
-  k:(|/-1+""#k)!k:!d; v:" "/(..?[(@x)¿"nN";p.f$x;$'x])'.d
-  say"\n"/k{"$x| $y"}'v
-}
-/ tbl[t;r;c;f] outputs dict t as table, assuming string keys and flat columns,
-/ and outputs at most r rows and c columns, using format string f for floating
-/ point numbers. Example: tbl[t;5;8;"%.1f"].
+  k:(|/-1+""#k)!k:keys@!d; v:val[f]'.d
+  say"\n"/k{"$x| $y"}'v}
+/ tbl[t;r;c;f] outputs dict t as table using at most r rows and c columns, and
+/ format string f for floating point numbers.
+/ Example: tbl[t;5;8;"%.1f"].
 tbl:{[t;r;c;f]
   (nr;nc):(#*t;#t); say"=== Table ${nr}x$nc ==="
-  t:t[!r&nr;(c&nc)@!t] / keep up to r rows and c columns
-  k:!t; v:(..?[(@x)¿"nN";p.f$x;$'x])'.t; w:(-1+""#k)|(|/-1+""#)'v
-  (k;v):(-w)!'´(k;v); say"\n"/,/" "/(k;"-"*w;+v)
-}
+  m:{?[x<0;x|-y;x&y]}; t:t[!m[r;nr];m[c;nc]@!t:![keys@!t;{1}#'.t]]
+  k:!t; v:(..?[(@x)¿"nN";p.f$x;"A"~@x;q.val[p.f]'x;$'x])'.t; w:(-1+""#k)|(|/-1+""#)'v
+  (k;v):(-w)!'´(k;v); say"\n"/,/" "/(k;"-"*w;+v)}
+/ val[f;x] formats value x using f$x for floats and $x otherwise.
+val:{[f;x]?[(@x)¿"nN";(" "/f$x)or"?0";"A"~@x;[x:";"/o[f]'x;"($x)"];$x]}
+/ keys formats list into a list of string keys (if not already one).
+keys:{?[(@x)¿"S";x;$'x]}
 1

vendored/README.md

@@ -1,3 +1,3 @@
 # Vendored Go Code from Goal Project
 
-Pulled from Goal at Git commit: `69d8c2236f559ab8c3d8ca3485beec5bf4c0346a`
+Pulled from Goal at Git commit: `ee95ff40957e5d75a474458fd5c8418ce2ccac16`

vendored/help/get.go

@@ -63,24 +63,30 @@ func initHelp() map[string]string {
 	help["rshift"] = help["»"]
 	help["«"] = getBuiltin(helpVerbs, "«", vcols)
 	help["shift"] = help["«"]
-	for _, v := range []string{"+", "-", "*", "%", "!", "&", "|", "<", ">", "=", "~", ",", "^",
-		"#", "_", "$", "?", "@", "."} {
+	for _, v := range []string{
+		"+", "-", "*", "%", "!", "&", "|", "<", ">", "=", "~", ",", "^",
+		"#", "_", "$", "?", "@", ".",
+	} {
 		help[v] = getBuiltin(helpVerbs, v, vcols)
 	}
 	for _, v := range []string{"'", "/", "\\"} {
 		help[v] = getBuiltin(helpAdverbs, v, acols)
 	}
-	for _, v := range []string{"abs", "bytes", "uc", "error", "eval", "firsts", "json", "ocount", "panic",
+	for _, v := range []string{
+		"abs", "bytes", "uc", "error", "eval", "firsts", "json", "ocount", "panic",
 		"sign", "csv", "in", "mod", "nan", "rotate", "sub", "utf8",
-		"atan", "cos", "exp", "log", "round", "sin", "sqrt"} {
+		"atan", "cos", "exp", "log", "round", "sin", "sqrt",
+	} {
 		help[v] = getBuiltin(helpNamedVerbs, v, nvcols)
 	}
 	help["¿"] = help["firsts"] + help["in"]
 	for _, v := range []string{"rt.get", "rt.log", "rt.seed", "rt.time", "rt.try"} {
 		help[v] = getBuiltin(helpRuntime, v, nvcols)
 	}
-	for _, v := range []string{"abspath", "chdir", "close", "dirfs", "env", "flush", "glob", "import", "mkdir", "open", "print",
-		"read", "remove", "rename", "run", "say", "shell", "stat", "ARGS", "STDIN", "STDOUT", "STDERR"} {
+	for _, v := range []string{
+		"abspath", "chdir", "close", "dirfs", "env", "flush", "glob", "import", "mkdir", "open", "print",
+		"read", "remove", "rename", "run", "say", "shell", "stat", "ARGS", "STDIN", "STDOUT", "STDERR",
+	} {
 		help[v] = getBuiltin(helpIO, v, nvcols)
 	}
 	help["subfs"] = help["dirfs"]
@@ -112,3 +118,7 @@ func getBuiltin(s string, v string, n int) string {
 	}
 	return sb.String()
 }
+
+func Map() map[string]string {
+	return initHelp()
+}