chore(refactor): remove wrapper class in handlers

## Details

No need to add the "buffer handler" classes given that the language
level implementations fan out to components now so are very thin.

Author: MeanderingProgrammer

doc/render-markdown.txt

@@ -1,4 +1,4 @@
-*render-markdown.txt*       For NVIM v0.11.3       Last change: 2025 August 08
+*render-markdown.txt*       For NVIM v0.11.3       Last change: 2025 August 14
 
 ==============================================================================
 Table of Contents                          *render-markdown-table-of-contents*

lua/render-markdown/handler/html.lua

@@ -2,54 +2,35 @@ local Context = require('render-markdown.request.context')
 local Marks = require('render-markdown.lib.marks')
 local ts = require('render-markdown.core.ts')
 
----@class render.md.handler.buf.Html
----@field private query vim.treesitter.Query
----@field private renders table<string, render.md.Render>
----@field private context render.md.request.Context
-local Handler = {}
-Handler.__index = Handler
+---@class render.md.handler.Html: render.md.Handler
+local M = {}
 
----@param buf integer
----@return render.md.handler.buf.Html
-function Handler.new(buf)
-    local self = setmetatable({}, Handler)
-    self.query = ts.parse(
+---@param ctx render.md.handler.Context
+---@return render.md.Mark[]
+function M.parse(ctx)
+    local query = ts.parse(
         'html',
         [[
             (comment) @comment
             (element) @tag
         ]]
     )
-    self.renders = {
+    ---@type table<string, render.md.Render>
+    local renders = {
         comment = require('render-markdown.render.html.comment'),
         tag = require('render-markdown.render.html.tag'),
     }
-    self.context = Context.get(buf)
-    return self
-end
-
----@param root TSNode
----@return render.md.Mark[]
-function Handler:run(root)
-    if self.context:skip(self.context.config.html) then
+    local context = Context.get(ctx.buf)
+    if context:skip(context.config.html) then
         return {}
     end
-    local marks = Marks.new(self.context, true)
-    self.context.view:nodes(root, self.query, function(capture, node)
-        local render = self.renders[capture]
-        assert(render, 'unhandled html capture: ' .. capture)
-        render:execute(self.context, marks, node)
+    local marks = Marks.new(context, true)
+    context.view:nodes(ctx.root, query, function(capture, node)
+        local render = renders[capture]
+        assert(render, ('unhandled html capture: %s'):format(capture))
+        render:execute(context, marks, node)
     end)
     return marks:get()
 end
 
----@class render.md.handler.Html: render.md.Handler
-local M = {}
-
----@param ctx render.md.handler.Context
----@return render.md.Mark[]
-function M.parse(ctx)
-    return Handler.new(ctx.buf):run(ctx.root)
-end
-
 return M

lua/render-markdown/handler/markdown.lua

@@ -2,18 +2,13 @@ local Context = require('render-markdown.request.context')
 local Marks = require('render-markdown.lib.marks')
 local ts = require('render-markdown.core.ts')
 
----@class render.md.handler.buf.Markdown
----@field private query vim.treesitter.Query
----@field private renders table<string, render.md.Render>
----@field private context render.md.request.Context
-local Handler = {}
-Handler.__index = Handler
+---@class render.md.handler.Markdown: render.md.Handler
+local M = {}
 
----@param buf integer
----@return render.md.handler.buf.Markdown
-function Handler.new(buf)
-    local self = setmetatable({}, Handler)
-    self.query = ts.parse(
+---@param ctx render.md.handler.Context
+---@return render.md.Mark[]
+function M.parse(ctx)
+    local query = ts.parse(
         'markdown',
         [[
             (fenced_code_block) @code
@@ -42,7 +37,8 @@ function Handler.new(buf)
             (pipe_table) @table
         ]]
     )
-    self.renders = {
+    ---@type table<string, render.md.Render>
+    local renders = {
         code = require('render-markdown.render.markdown.code'),
         dash = require('render-markdown.render.markdown.dash'),
         document = require('render-markdown.render.markdown.document'),
@@ -53,29 +49,14 @@ function Handler.new(buf)
         section = require('render-markdown.render.markdown.section'),
         table = require('render-markdown.render.markdown.table'),
     }
-    self.context = Context.get(buf)
-    return self
-end
-
----@param root TSNode
----@return render.md.Mark[]
-function Handler:run(root)
-    local marks = Marks.new(self.context, false)
-    self.context.view:nodes(root, self.query, function(capture, node)
-        local render = self.renders[capture]
-        assert(render, 'unhandled markdown capture: ' .. capture)
-        render:execute(self.context, marks, node)
+    local context = Context.get(ctx.buf)
+    local marks = Marks.new(context, false)
+    context.view:nodes(ctx.root, query, function(capture, node)
+        local render = renders[capture]
+        assert(render, ('unhandled markdown capture: %s'):format(capture))
+        render:execute(context, marks, node)
     end)
     return marks:get()
 end
 
----@class render.md.handler.Markdown: render.md.Handler
-local M = {}
-
----@param ctx render.md.handler.Context
----@return render.md.Mark[]
-function M.parse(ctx)
-    return Handler.new(ctx.buf):run(ctx.root)
-end
-
 return M

lua/render-markdown/handler/markdown_inline.lua

@@ -2,18 +2,13 @@ local Context = require('render-markdown.request.context')
 local Marks = require('render-markdown.lib.marks')
 local ts = require('render-markdown.core.ts')
 
----@class render.md.handler.buf.MarkdownInline
----@field private query vim.treesitter.Query
----@field private renders table<string, render.md.Render>
----@field private context render.md.request.Context
-local Handler = {}
-Handler.__index = Handler
+---@class render.md.handler.MarkdownInline: render.md.Handler
+local M = {}
 
----@param buf integer
----@return render.md.handler.buf.MarkdownInline
-function Handler.new(buf)
-    local self = setmetatable({}, Handler)
-    self.query = ts.parse(
+---@param ctx render.md.handler.Context
+---@return render.md.Mark[]
+function M.parse(ctx)
+    local query = ts.parse(
         'markdown_inline',
         [[
             (code_span) @code
@@ -32,35 +27,21 @@ function Handler.new(buf)
             (shortcut_link) @shortcut
         ]]
     )
-    self.renders = {
+    ---@type table<string, render.md.Render>
+    local renders = {
         code = require('render-markdown.render.inline.code'),
         highlight = require('render-markdown.render.inline.highlight'),
         link = require('render-markdown.render.inline.link'),
         shortcut = require('render-markdown.render.inline.shortcut'),
     }
-    self.context = Context.get(buf)
-    return self
-end
-
----@param root TSNode
----@return render.md.Mark[]
-function Handler:run(root)
-    local marks = Marks.new(self.context, true)
-    self.context.view:nodes(root, self.query, function(capture, node)
-        local render = self.renders[capture]
-        assert(render, 'unhandled inline capture: ' .. capture)
-        render:execute(self.context, marks, node)
+    local context = Context.get(ctx.buf)
+    local marks = Marks.new(context, true)
+    context.view:nodes(ctx.root, query, function(capture, node)
+        local render = renders[capture]
+        assert(render, ('unhandled inline capture: %s'):format(capture))
+        render:execute(context, marks, node)
     end)
     return marks:get()
 end
 
----@class render.md.handler.MarkdownInline: render.md.Handler
-local M = {}
-
----@param ctx render.md.handler.Context
----@return render.md.Mark[]
-function M.parse(ctx)
-    return Handler.new(ctx.buf):run(ctx.root)
-end
-
 return M

lua/render-markdown/health.lua

@@ -5,7 +5,7 @@ local state = require('render-markdown.state')
 local M = {}
 
 ---@private
-M.version = '8.7.0'
+M.version = '8.7.1'
 
 function M.check()
     M.start('versions')

lua/render-markdown/lib/node.lua

@@ -64,7 +64,7 @@ end
 ---@return integer[]
 function Node:sections()
     local result = {} ---@type integer[]
-    local levels = 0
+    local levels = 0 ---@type integer
     local section = self:parent('section')
     while section do
         local level = section:level(false)
@@ -96,12 +96,13 @@ function Node:level(parent)
 end
 
 ---@param target string
+---@param outside string
 ---@return integer, render.md.Node?
-function Node:level_in_section(target)
+function Node:level_in(target, outside)
     local level = 0
     local root = nil ---@type TSNode?
     local node = self.node ---@type TSNode?
-    while node and node:type() ~= 'section' do
+    while node and node:type() ~= outside do
         if node:type() == target then
             level = level + 1
             root = node

lua/render-markdown/render/inline/link.lua

@@ -1,11 +1,11 @@
 local Base = require('render-markdown.render.base')
 
----@class render.md.link.Data
+---@class render.md.inline.link.Data
 ---@field icon render.md.mark.Text
 ---@field autolink boolean
 
 ---@class render.md.render.inline.Link: render.md.Render
----@field private data render.md.link.Data
+---@field private data render.md.inline.link.Data
 local Render = setmetatable({}, Base)
 Render.__index = Render
 

lua/render-markdown/render/markdown/bullet.lua

@@ -27,7 +27,7 @@ function Render:setup()
     if not marker then
         return false
     end
-    local level, root = self.node:level_in_section('list')
+    local level, root = self.node:level_in('list', 'section')
     ---@type render.md.bullet.Context
     local ctx = {
         level = level,
@@ -54,17 +54,17 @@ end
 ---@param ctx render.md.bullet.Context
 ---@return string?
 function Render.get_string(values, ctx)
-    if type(values) == 'function' then
-        return values(ctx)
-    elseif type(values) == 'string' then
-        return values
-    else
+    if type(values) == 'table' then
         local value = list.cycle(values, ctx.level)
         if type(value) == 'table' then
             return list.clamp(value, ctx.index)
         else
             return value
         end
+    elseif type(values) == 'function' then
+        return values(ctx)
+    else
+        return values
     end
 end
 

lua/render-markdown/render/markdown/quote.lua

@@ -23,7 +23,7 @@ function Render:setup()
         return false
     end
     local callout = self.context.callout:get(self.node)
-    local level = self.node:level_in_section('block_quote')
+    local level = self.node:level_in('block_quote', 'section')
     local icon = callout and callout.config.quote_icon or config.icon
     local highlight = callout and callout.config.highlight or config.highlight
     self.data = {
@@ -90,7 +90,7 @@ function Render:markers()
         if capture == 'marker' then
             -- marker nodes are a single '>' at the start of a block quote
             -- overlay the only range if it is at the current level
-            if node:level_in_section('block_quote') == self.data.level then
+            if node:level_in('block_quote', 'section') == self.data.level then
                 self:marker(node, 1)
             end
         elseif capture == 'continuation' then