feat: add type annotations for plenary.log

Author: delphinus

lua/plenary/init.lua

@@ -7,6 +7,7 @@
 ---@field functional PlenaryFunctional
 ---@field job PlenaryJob
 ---@field json PlenaryJson
+---@field log PlenaryLog
 ---@field path PlenaryPath
 ---@field scandir PlenaryScandir
 ---@field tbl PlenaryTbl

lua/plenary/log.lua

@@ -9,38 +9,54 @@
 
 local Path = require "plenary.path"
 
+---@type boolean|string|vim.NIL
 local p_debug = vim.fn.getenv "DEBUG_PLENARY"
 if p_debug == vim.NIL then
   p_debug = false
 end
 
+---@alias PlenaryLogLevel "trace"|"debug"|"info"|"warn"|"error"|"fatal"
+
+-- luacheck: push ignore 631
+
+---Adjust content as needed, but must keep function parameters to be filled
+---by library code.
+---* param is_console boolean If output is for console or log file.
+---* param mode_name string Level configuration 'modes' field 'name'
+---* param src_path string Path to source file given by debug.info.source
+---* param src_line integer Line into source file given by debug.info.currentline
+---* param msg string Message, which is later on escaped, if needed.
+---@alias PlenaryLogFmtMsg fun(is_console: boolean, mode_name: string, src_path: string, src_line: integer, msg: string): string
+
+-- luacheck: pop
+
+---@class PlenaryLogLevelConfig
+---@field name PlenaryLogLevel
+---@field hl string highight name for console.
+
+---@class PlenaryLogConfig
+---@field plugin? string Name of the plugin. Prepended to log messages. (default: `plenary`)
+---@field use_console? '"async"'|"sync"|false Should print the output to neovim. (default: `"async"`)
+---@field highlights? boolean Should highlighting be used in console (using echohl). (default: `true`)
+---@field info_level? integer Level of function call stack. (default: `2`)
+---@field use_file? boolean Should write to a file. Default logging file is `stdpath("cache")/plugin`. (default: `true`)
+---@field outfile? string Output file has precedence over plugin, if not nil and use_file == true. (default: `nil`)
+---@field use_quickfix? boolean Should write to the quickfix list. (default: `false`)
+---@field level? PlenaryLogLevel Any messages above this level will be logged. (default: `"info"` or `"debug"`)
+---@field modes? PlenaryLogLevelConfig[] Level configuration.
+---@field float_precision? float Can limit the number of decimals displayed for floats. (default: `0.01`)
+---@field fmt_msg? PlenaryLogFmtMsg
+
 -- User configuration section
+---@type PlenaryLogConfig
 local default_config = {
-  -- Name of the plugin. Prepended to log messages.
   plugin = "plenary",
-
-  -- Should print the output to neovim while running.
-  -- values: 'sync','async',false
   use_console = "async",
-
-  -- Should highlighting be used in console (using echohl).
   highlights = true,
-
-  -- Should write to a file.
-  -- Default output for logging file is `stdpath("cache")/plugin`.
   use_file = true,
-
-  -- Output file has precedence over plugin, if not nil.
-  -- Used for the logging file, if not nil and use_file == true.
   outfile = nil,
-
-  -- Should write to the quickfix list.
   use_quickfix = false,
-
-  -- Any messages above this level will be logged.
   level = p_debug and "debug" or "info",
-
-  -- Level configuration.
   modes = {
     { name = "trace", hl = "Comment" },
     { name = "debug", hl = "Comment" },
@@ -49,17 +65,7 @@ local default_config = {
     { name = "error", hl = "ErrorMsg" },
     { name = "fatal", hl = "ErrorMsg" },
   },
-
-  -- Can limit the number of decimals displayed for floats.
   float_precision = 0.01,
-
-  -- Adjust content as needed, but must keep function parameters to be filled
-  -- by library code.
-  ---@param is_console boolean If output is for console or log file.
-  ---@param mode_name string Level configuration 'modes' field 'name'
-  ---@param src_path string Path to source file given by debug.info.source
-  ---@param src_line integer Line into source file given by debug.info.currentline
-  ---@param msg string Message, which is later on escaped, if needed.
   fmt_msg = function(is_console, mode_name, src_path, src_line, msg)
     local nameupper = mode_name:upper()
     local lineinfo = src_path .. ":" .. src_line
@@ -72,36 +78,72 @@ local default_config = {
 }
 
 -- {{{ NO NEED TO CHANGE
+
+---@class PlenaryLog
+---@field trace fun(...) Write TRACE log.
+---@field debug fun(...) Write DEBUG log.
+---@field info fun(...) Write INFO log.
+---@field warn fun(...) Write WARN log.
+---@field error fun(...) Write ERROR log.
+---@field fatal fun(...) Write FATAL log.
+---@field fmt_trace fun(fmt: string, ...: any) Write TRACE log with formatting by string.format.
+---@field fmt_debug fun(fmt: string, ...: any) Write DEBUG log with formatting by string.format.
+---@field fmt_info fun(fmt: string, ...: any) Write INFO log with formatting by string.format.
+---@field fmt_warn fun(fmt: string, ...: any) Write WARN log with formatting by string.format.
+---@field fmt_error fun(fmt: string, ...: any) Write ERROR log with formatting by string.format.
+---@field fmt_fatal fun(fmt: string, ...: any) Write FATAL log with formatting by string.format.
+---@field lazy_trace fun(heavy_func: fun(...): string) Write TRACE log from output of heavy_func().
+---@field lazy_debug fun(heavy_func: fun(...): string) Write DEBUG log from output of heavy_func().
+---@field lazy_info fun(heavy_func: fun(...): string) Write INFO log from output of heavy_func().
+---@field lazy_warn fun(heavy_func: fun(...): string) Write WARN log from output of heavy_func().
+---@field lazy_error fun(heavy_func: fun(...): string) Write ERROR log from output of heavy_func().
+---@field lazy_fatal fun(heavy_func: fun(...): string) Write FATAL log from output of heavy_func().
+---@field file_trace fun(vals: table, override: PlenaryLogConfig) Write TRACE log into file instead of console.
+---@field file_debug fun(vals: table, override: PlenaryLogConfig) Write DEBUG log into file instead of console.
+---@field file_info fun(vals: table, override: PlenaryLogConfig) Write INFO log into file instead of console.
+---@field file_warn fun(vals: table, override: PlenaryLogConfig) Write WARN log into file instead of console.
+---@field file_error fun(vals: table, override: PlenaryLogConfig) Write ERROR log into file instead of console.
+---@field file_fatal fun(vals: table, override: PlenaryLogConfig) Write FATAL log into file instead of console.
 local log = {}
 
 local unpack = unpack or table.unpack
 
+---@param config PlenaryLogConfig
+---@param standalone boolean
+---@return PlenaryLog
 log.new = function(config, standalone)
   config = vim.tbl_deep_extend("force", default_config, config)
 
   local outfile = vim.F.if_nil(
     config.outfile,
     Path:new(vim.api.nvim_call_function("stdpath", { "cache" }), config.plugin .. ".log").filename
-  )
+  ) --[[@as string]]
 
+  ---@type PlenaryLog
   local obj
   if standalone then
     obj = log
   else
-    obj = config
+    obj = config --[[@as PlenaryLog]]
   end
 
+  ---@type table<PlenaryLogLevel, integer>
   local levels = {}
   for i, v in ipairs(config.modes) do
     levels[v.name] = i
   end
 
+  ---@param x float
+  ---@param increment? integer
+  ---@return float
   local round = function(x, increment)
     increment = increment or 1
     x = x / increment
     return (x > 0 and math.floor(x + 0.5) or math.ceil(x - 0.5)) * increment
   end
 
+  ---@param ... any
+  ---@return string
   local make_string = function(...)
     local t = {}
     for i = 1, select("#", ...) do
@@ -120,6 +162,10 @@ log.new = function(config, standalone)
     return table.concat(t, " ")
   end
 
+  ---@param level integer
+  ---@param level_config PlenaryLogLevelConfig
+  ---@param message_maker fun(...): string
+  ---@param ... any
   local log_at_level = function(level, level_config, message_maker, ...)
     -- Return early if we're below the config.level
     if level < levels[config.level] then
@@ -142,7 +188,7 @@ log.new = function(config, standalone)
         for _, v in ipairs(split_console) do
           local formatted_msg = string.format("[%s] %s", config.plugin, vim.fn.escape(v, [["\]]))
 
-          local ok = pcall(vim.cmd, string.format([[echom "%s"]], formatted_msg))
+          local ok = pcall(vim.cmd --[[@as fun(command: string)]], string.format([[echom "%s"]], formatted_msg))
           if not ok then
             vim.api.nvim_out_write(msg .. "\n")
           end
@@ -187,12 +233,14 @@ log.new = function(config, standalone)
   end
 
   for i, x in ipairs(config.modes) do
-    -- log.info("these", "are", "separated")
+    ---log.info("these", "are", "separated")
+    ---@param ... any
     obj[x.name] = function(...)
       return log_at_level(i, x, make_string, ...)
     end
 
-    -- log.fmt_info("These are %s strings", "formatted")
+    ---log.fmt_info("These are %s strings", "formatted")
+    ---@param ... any
     obj[("fmt_%s"):format(x.name)] = function(...)
       return log_at_level(i, x, function(...)
         local passed = { ... }
@@ -205,14 +253,16 @@ log.new = function(config, standalone)
       end, ...)
     end
 
-    -- log.lazy_info(expensive_to_calculate)
+    ---log.lazy_info(expensive_to_calculate)
     obj[("lazy_%s"):format(x.name)] = function()
       return log_at_level(i, x, function(f)
         return f()
       end)
     end
 
-    -- log.file_info("do not print")
+    ---log.file_info("do not print")
+    ---@param vals table
+    ---@param override PlenaryLogConfig
     obj[("file_%s"):format(x.name)] = function(vals, override)
       local original_console = config.use_console
       config.use_console = false