Update todo script and remove some todos

scripts/todos.tl

@@ -1,9 +1,9 @@
 local argparse <const> = require("argparse")
 local log <const> = require("cyan.log")
 local fs <const> = require("cyan.fs")
-local cs <const> = require("cyan.colorstring")
+local decoration <const> = require("cyan.experimental.decoration")
 local util <const> = require("cyan.util")
-local pad_left <const>, map <const> = util.str.pad_left, util.tab.map
+local pad_left <const>, ivalues <const> = util.str.pad_left, util.tab.ivalues
 
 local has_ltreesitter <const>, ts <const> = pcall(require, "ltreesitter")
 if not has_ltreesitter then
@@ -22,21 +22,18 @@ parser:flag("--raw", "Output in a raw format useful for piping into other comman
 local parsed <const> = parser:parse()
 local raw <const> = parsed.raw as boolean
 
-local query <const> = teal_parser:query[[
-   ((comment) @c
-    (match? @c "TODO"))]]
+local query <const> = teal_parser:query[[ ((comment) @c (#match? @c "TODO")) ]]
 
-local todo <const> = log.create_logger(
-   io.stderr,
-   "normal",
-   cs.highlight(cs.colors.teal, "Todo"),
-   cs.highlight(cs.colors.teal, "...")
+local todo <const> = log.err:copy(
+   decoration.decorate("Todo", decoration.scheme.teal),
+   decoration.decorate("...", decoration.scheme.teal)
 )
 
 local record Todo
    line: integer
    content: string
 end
+local total = 0
 for path in fs.scan_dir(".", {"src/cyan/**/*"}) do
    local real_path <const> = path:to_real_path()
    local text <const> = fs.read(real_path)
@@ -46,7 +43,7 @@ for path in fs.scan_dir(".", {"src/cyan/**/*"}) do
       local node <const> = match.captures.c as ts.Node
       assert(node is ts.Node)
       table.insert(todos, {
-         line = node:start_point().row,
+         line = node:start_point().row + 1,
          content = node:source():match("TODO%s*:?%s*(.*)"),
       })
    end
@@ -57,17 +54,22 @@ for path in fs.scan_dir(".", {"src/cyan/**/*"}) do
          end
       else
          todo(
-            cs.highlight(cs.colors.emphasis, #todos .. " todo comment" .. (#todos == 1 and "" or "s")), " in ",
-            cs.highlight(cs.colors.file, real_path),
-            "\n   ",
-            table.concat(map(todos, function(t: Todo): string
-               return (
-                  cs.highlight(cs.colors.number, pad_left(tostring(t.line), 4)) .. " | "
-                  .. t.content
-               ):tostring()
-            end), "\n   "),
-            "\n"
+            decoration.decorate(#todos .. " todo comment" .. (#todos == 1 and "" or "s"), decoration.scheme.emphasis),
+            " in ",
+            decoration.file_name(real_path)
          )
+         for t in ivalues(todos) do
+            todo:cont(
+               "   ",
+               decoration.decorate(pad_left(tostring(t.line), 4)),
+               " │ ", t.content
+            )
+         end
+
       end
    end
+   total = total + #todos
+end
+if not raw and total then
+   todo("Found ", total, " total todo comments")
 end

src/cyan/config.tl

@@ -45,11 +45,6 @@ local config <const> = {
    filename = "tlconfig.lua",
 }
 
--- TODO: Get Teal itself to do this typechecking for us
---
---       Ideally, we could somehow use teal to tell us the types inferred in the config file
---       For now, we just try to make a biased `type` function that reports nicer table types
-
 local function get_types_in_array(val: {any}, typefn: function(any): string): {string}
    typefn = typefn or type
    local set <const> = {}

src/cyan/experimental/decoration.tl

@@ -2,9 +2,6 @@
 --- A replacement for colorstring that doesn't specifically rely on ANSI
 --- terminal escapes
 
--- local util <const> = require("cyan.util")
--- local tab <const> = util.tab
-
 local util <const> = require("cyan.util")
 local ivalues <const>, map <const> = util.tab.ivalues, util.tab.map
 local insert <const> = table.insert

src/cyan/script.tl

@@ -90,7 +90,6 @@ function script.register(path: string, command_name: string, hooks: string | {st
       registered[command_name] = {}
    end
    local reg <const> = registered[command_name]
-   -- TODO(tl bug)
    for hook in ivalues((hooks is string and {hooks} or hooks) as {string}) do
       if not reg[hook] then
          reg[hook] = {}