refactor(widget): simplify setup of html tags widgets

components/widget/html/widget_html_all.lua

@@ -8,18 +8,66 @@
 
 local Widgets = {}
 
+local Array = require('Module:Array')
+local Class = require('Module:Class')
 local Lua = require('Module:Lua')
+local String = require('Module:StringUtils')
 
-Widgets.Abbr = Lua.import('Module:Widget/Html/Abbr')
-Widgets.Center = Lua.import('Module:Widget/Html/Center')
-Widgets.Div = Lua.import('Module:Widget/Html/Div')
-Widgets.Fragment = Lua.import('Module:Widget/Html/Fragment')
-Widgets.Li = Lua.import('Module:Widget/Html/Li')
-Widgets.Span = Lua.import('Module:Widget/Html/Span')
-Widgets.Table = Lua.import('Module:Widget/Html/Table')
-Widgets.Td = Lua.import('Module:Widget/Html/Td')
-Widgets.Th = Lua.import('Module:Widget/Html/Th')
-Widgets.Tr = Lua.import('Module:Widget/Html/Tr')
-Widgets.Ul = Lua.import('Module:Widget/Html/Ul')
+local Widget = Lua.import('Module:Widget')
+
+---@param tag? string
+---@return WidgetHtml
+local function createHtmlTag(tag)
+	---@class WidgetHtml: Widget
+	---@operator call(table): WidgetHtml
+	local Html = Class.new(Widget)
+	Html.defaultProps = {
+		classes = {},
+		css = {},
+		attributes = {},
+	}
+
+	---@return Html
+	function Html:render()
+		local htmlNode = mw.html.create(tag)
+
+		htmlNode:addClass(String.nilIfEmpty(table.concat(self.props.classes, ' ')))
+		htmlNode:css(self.props.css)
+		htmlNode:attr(self.props.attributes)
+
+		Array.forEach(self.props.children, function(child)
+			if Class.instanceOf(child, Widget) then
+				---@cast child Widget
+				child.context = self:_nextContext()
+				htmlNode:node(child:tryMake())
+			else
+				---@cast child -Widget
+				---@diagnostic disable-next-line: undefined-field
+				if type(child) == 'table' and not child._build then
+					mw.log('ERROR! Bad child input:' .. mw.dumpObject(self.props.children))
+					-- Erroring here to make it easier to debug
+					-- Otherwise it will fail when the html is built
+					error('Table passed to HtmlBase:renderAs() without _build method')
+				end
+				htmlNode:node(child)
+			end
+		end)
+		return htmlNode
+	end
+
+	return Html
+end
+
+Widgets.Abbr = createHtmlTag('abbr')
+Widgets.Center = createHtmlTag('center')
+Widgets.Div = createHtmlTag('div')
+Widgets.Fragment = createHtmlTag()
+Widgets.Li = createHtmlTag('li')
+Widgets.Span = createHtmlTag('span')
+Widgets.Table = createHtmlTag('table')
+Widgets.Td = createHtmlTag('td')
+Widgets.Th = createHtmlTag('th')
+Widgets.Tr = createHtmlTag('tr')
+Widgets.Ul = createHtmlTag('ul')
 
 return Widgets