change from Html to string

components/widget/widget.lua

@@ -22,13 +22,13 @@ function Widget:assertExistsAndCopy(value)
 end
 
 ---@param injector WidgetInjector?
----@return Widget[]|Html|nil
+---@return Widget[]|string|nil
 function Widget:make(injector)
 	error('A Widget must override the make() function!')
 end
 
 ---@param injector WidgetInjector?
----@return Widget[]|Html|nil
+---@return Widget[]|string|nil
 function Widget:tryMake(injector)
 	return Logic.tryOrElseLog(
 		function() return self:make(injector) end,

components/widget/widget_breakdown.lua

@@ -26,9 +26,9 @@ local Breakdown = Class.new(
 )
 
 ---@param injector WidgetInjector?
----@return Html?
+---@return string?
 function Breakdown:make(injector)
-	return Breakdown:_breakdown(self.contents, self.classes, self.contentClasses)
+	return tostring(Breakdown:_breakdown(self.contents, self.classes, self.contentClasses))
 end
 
 ---@param contents (string|number)[]

components/widget/widget_builder.lua

@@ -23,14 +23,14 @@ local Builder = Class.new(
 )
 
 ---@param injector WidgetInjector?
----@return Html
+---@return string
 function Builder:make(injector)
 	local children = self.builder()
 	local builtChildren = mw.html.create()
 	for _, child in ipairs(children or {}) do
 		builtChildren:node(WidgetFactory.work(child, injector))
 	end
-	return builtChildren
+	return tostring(builtChildren)
 end
 
 return Builder

components/widget/widget_cell.lua

@@ -90,19 +90,19 @@ function Cell:_content(...)
 end
 
 ---@param injector WidgetInjector?
----@return Html?
+---@return string?
 function Cell:make(injector)
 	self:_new(self.name)
 	self:_class(unpack(self.classes or {}))
 	self:_content(unpack(self.content))
 
 	if self.contentDiv == nil then
-		return {}
+		return
 	end
 
 	self.root	:node(self.description)
 				:node(self.contentDiv)
-	return self.root
+	return tostring(self.root)
 end
 
 return Cell

components/widget/widget_center.lua

@@ -25,9 +25,9 @@ local Center = Class.new(
 )
 
 ---@param injector WidgetInjector?
----@return Html?
+---@return string?
 function Center:make(injector)
-	return Center:_create(self.content, self.classes)
+	return tostring(Center:_create(self.content, self.classes))
 end
 
 ---@param content (string|number)[]

components/widget/widget_chronology.lua

@@ -23,9 +23,9 @@ local Chronology = Class.new(
 )
 
 ---@param injector WidgetInjector?
----@return Html?
+---@return string?
 function Chronology:make(injector)
-	return Chronology:_chronology(self.links)
+	return tostring(Chronology:_chronology(self.links))
 end
 
 ---@param links table<string, string|number|nil>

components/widget/widget_header.lua

@@ -36,7 +36,7 @@ local Header = Class.new(
 )
 
 ---@param injector WidgetInjector?
----@return Html[]
+---@return string
 function Header:make(injector)
 	local header = {
 		Header:_name(self.name),
@@ -63,7 +63,7 @@ function Header:make(injector)
 	for _, element in ipairs(header) do
 		wrapper:node(element)
 	end
-	return wrapper
+	return tostring(wrapper)
 end
 
 ---@param name string?

components/widget/widget_highlights.lua

@@ -23,9 +23,9 @@ local Highlights = Class.new(
 )
 
 ---@param injector WidgetInjector?
----@return Html?
+---@return string?
 function Highlights:make(injector)
-	return Highlights:_highlights(self.list)
+	return tostring(Highlights:_highlights(self.list))
 end
 
 ---@param list (string|number)[]?

components/widget/widget_links.lua

@@ -28,7 +28,7 @@ local Links = Class.new(
 local PRIORITY_GROUPS = Lua.import('Module:Links/PriorityGroups', {loadData = true})
 
 ---@param injector WidgetInjector?
----@return Html?
+---@return string?
 function Links:make(injector)
 	local infoboxLinks = mw.html.create('div')
 	infoboxLinks	:addClass('infobox-center')
@@ -56,7 +56,7 @@ function Links:make(injector)
 		infoboxLinks:wikitext(' ' .. self:_makeLink(key, value))
 	end
 
-	return mw.html.create('div'):node(infoboxLinks)
+	return tostring(mw.html.create('div'):node(infoboxLinks))
 end
 
 ---@param key string

components/widget/widget_table.lua

@@ -50,7 +50,7 @@ function Table:addClass(class)
 end
 
 ---@param injector WidgetInjector?
----@return Html?
+---@return string?
 function Table:make(injector)
 	local displayTable = mw.html.create('div'):addClass('csstable-widget')
 	displayTable:css{
@@ -67,7 +67,7 @@ function Table:make(injector)
 		displayTable:node(WidgetFactory.work(row, injector))
 	end
 
-	return displayTable
+	return tostring(displayTable)
 end
 
 ---@return integer?

components/widget/widget_table_cell.lua

@@ -57,7 +57,7 @@ function TableCell:addCss(key, value)
 end
 
 ---@param injector WidgetInjector?
----@return Html?
+---@return string?
 function TableCell:make(injector)
 	local cell = mw.html.create('div'):addClass('csstable-widget-cell')
 	cell:css{
@@ -73,7 +73,7 @@ function TableCell:make(injector)
 
 	cell:node(self:_concatContent())
 
-	return cell
+	return tostring(cell)
 end
 
 ---@return string

components/widget/widget_table_cell_new.lua

@@ -43,7 +43,7 @@ local TableCell = Class.new(
 )
 
 ---@param injector WidgetInjector?
----@return Html?
+---@return string?
 function TableCell:make(injector)
 	local cell = mw.html.create(self.isHeader and 'th' or 'td')
 	cell:attr('colspan', self.colSpan)
@@ -55,7 +55,7 @@ function TableCell:make(injector)
 
 	cell:node(self:_content())
 
-	return cell
+	return tostring(cell)
 end
 
 ---@return string

components/widget/widget_table_new.lua

@@ -34,7 +34,7 @@ local Table = Class.new(
 )
 
 ---@param injector WidgetInjector?
----@return Html?
+---@return string?
 function Table:make(injector)
 	local wrapper = mw.html.create('div'):addClass('table-responsive')
 	local output = mw.html.create('table'):addClass('wikitable')
@@ -48,7 +48,7 @@ function Table:make(injector)
 	end)
 
 	wrapper:node(output)
-	return wrapper
+	return tostring(wrapper)
 end
 
 return Table

components/widget/widget_table_row.lua

@@ -59,7 +59,7 @@ function TableRow:getCellCount()
 end
 
 ---@param injector WidgetInjector?
----@return Html?
+---@return string?
 function TableRow:make(injector)
 	local row = mw.html.create('div'):addClass('csstable-widget-row')
 
@@ -73,7 +73,7 @@ function TableRow:make(injector)
 		row:node(WidgetFactory.work(cell, injector))
 	end
 
-	return row
+	return tostring(row)
 end
 
 return TableRow

components/widget/widget_table_row_new.lua

@@ -34,7 +34,7 @@ local TableRow = Class.new(
 )
 
 ---@param injector WidgetInjector?
----@return Html?
+---@return string?
 function TableRow:make(injector)
 	local row = mw.html.create('tr')
 
@@ -46,7 +46,7 @@ function TableRow:make(injector)
 		row:node(WidgetFactory.work(child, injector))
 	end)
 
-	return row
+	return tostring(row)
 end
 
 return TableRow

components/widget/widget_title.lua

@@ -22,9 +22,9 @@ local Title = Class.new(
 )
 
 ---@param injector WidgetInjector?
----@return Html?
+---@return string?
 function Title:make(injector)
-	return Title:_create(self.content)
+	return tostring(Title:_create(self.content))
 end
 
 ---@param infoDescription string|number|nil