feat(match2): Add conversion generators for matchlists and single matches

lua/wikis/ageofempires/MatchMaps/Legacy.lua

@@ -12,6 +12,7 @@ local Array = Lua.import('Module:Array')
 local Json = Lua.import('Module:Json')
 local Logic = Lua.import('Module:Logic')
 local MatchGroup = Lua.import('Module:MatchGroup')
+local MatchGroupLegacy = Lua.import('Module:MatchGroup/Legacy')
 local PageVariableNamespace = Lua.import('Module:PageVariableNamespace')
 local Table = Lua.import('Module:Table')
 local Template = Lua.import('Module:Template')
@@ -72,11 +73,11 @@ function MatchMapsLegacy._readMaps(matchArgs)
 	end
 	--handle MatchMaps mapXwin
 	local mapWinners = Table.filterByKey(matchArgs, function (key)
-		local winner = key:match('map(%d+)win')
+		local winner = string.match(key, 'map(%d+)win')
 		return winner ~= nil
 	end)
 	Table.iter.forEachPair(mapWinners, function (key)
-		local mapKey = key:match('(map%d+)')
+		local mapKey = string.match(key, '(map%d+)')
 		local mapWinner = Table.extract(matchArgs, mapKey .. 'win')
 		matchArgs[mapKey] = matchArgs[mapKey] or {}
 		matchArgs[mapKey].winner = matchArgs[mapKey].winner or mapWinner
@@ -87,11 +88,17 @@ end
 ---@param frame Frame
 ---@return Html
 function MatchMapsLegacy.convertMatch(frame)
-	local matchArgs = MatchMapsLegacy._mergeDetailsIntoArgs(Arguments.getArgs(frame))
+	local args = Arguments.getArgs(frame)
+	local generate = Logic.readBool(Table.extract(args, 'generate'))
+	local matchArgs = MatchMapsLegacy._mergeDetailsIntoArgs(args)
 	MatchMapsLegacy._readOpponents(matchArgs)
 	MatchMapsLegacy._readMaps(matchArgs)
 	matchArgs.winner = matchArgs.winner or Table.extract(matchArgs, 'win')
 
+	if generate then
+		return Json.stringify(matchArgs)
+	end
+
 	Template.stashReturnValue(matchArgs, 'LegacyMatchlist')
 	return mw.html.create('div'):css('display', 'none')
 end
@@ -121,7 +128,7 @@ function MatchMapsLegacy.showmatch(frame)
 		id = id,
 		hide = true,
 		store = store,
-		noDuplicateCheck = not store,
+		noDuplicateCheck = not store or nil,
 		R1M1 = match
 	})
 
@@ -202,4 +209,65 @@ function MatchMapsLegacy.matchlistEnd()
 	return MatchGroup.MatchList(matchListArgs)
 end
 
+--- for bot conversion to proper match2 matchlists
+---@param frame Frame
+---@return string
+function MatchMapsLegacy.generate(frame)
+	local args = Arguments.getArgs(frame)
+
+	local store = Logic.readBoolOrNil(args.store)
+
+	local offset = 0
+	local title = args.title
+	if not title and not Json.parseIfTable(args[1]) then
+		title = args[1]
+		offset = 1
+	end
+
+	local parsedArgs = {
+		id = args.id,
+		title = title,
+		width = args.width or '320px',
+		collapsed = Logic.nilOr(Logic.readBoolOrNil(args.hide), true),
+		attached = Logic.nilOr(Logic.readBoolOrNil(args.hide), true),
+		store = store,
+		matchsection = args.matchsection,
+		patch = args.patch,
+	}
+
+	local gsl = args.gsl
+	if Logic.isNotEmpty(gsl) then
+		if gsl == GSL_WINNERS or gsl == GSL_LOSERS then
+			gsl = gsl .. 'first'
+			parsedArgs.gsl = gsl
+		end
+	end
+
+	---@type table[]
+	local matches = Array.mapIndexes(function(index)
+		return args[index + offset]
+	end)
+
+	Array.forEach(matches, function(match, matchIndex)
+		parsedArgs['M' .. matchIndex] = match
+	end)
+
+	return MatchGroupLegacy.generateWikiCodeForMatchList(parsedArgs)
+end
+
+---@param frame Frame
+---@return string
+function MatchMapsLegacy.generateSingleMatch(frame)
+	local args = Arguments.getArgs(frame)
+	args.generate = true
+
+	assert(args.id, 'Missing id')
+
+	return MatchGroupLegacy.generateWikiCodeForSingleMatch{
+		match = MatchMapsLegacy.convertMatch(args),
+		id = args.id,
+		width = args.width,
+	}
+end
+
 return MatchMapsLegacy

lua/wikis/arenafps/MatchMaps/Legacy.lua

@@ -12,6 +12,7 @@ local Array = Lua.import('Module:Array')
 local Json = Lua.import('Module:Json')
 local Logic = Lua.import('Module:Logic')
 local MatchGroup = Lua.import('Module:MatchGroup')
+local MatchGroupLegacy = Lua.import('Module:MatchGroup/Legacy')
 local PageVariableNamespace = Lua.import('Module:PageVariableNamespace')
 local Table = Lua.import('Module:Table')
 
@@ -110,7 +111,7 @@ function MatchMapsLegacy.showmatch(frame)
 		id = id,
 		hide = true,
 		store = store,
-		noDuplicateCheck = not store,
+		noDuplicateCheck = not store or nil,
 		R1M1 = match
 	})
 
@@ -120,10 +121,17 @@ function MatchMapsLegacy.showmatch(frame)
 	})
 end
 
+---@param frame any
+---@return string
+function MatchMapsLegacy.generate(frame)
+	return MatchMapsLegacy.matchList(frame, true)
+end
+
 -- invoked by Template:LegacyMatchList
 ---@param frame Frame
+---@param generate true?
 ---@return string
-function MatchMapsLegacy.matchList(frame)
+function MatchMapsLegacy.matchList(frame, generate)
 	globalVars:set('islegacy', 'true')
 	local args = Arguments.getArgs(frame)
 	assert(args.id, 'Missing id')
@@ -133,7 +141,7 @@ function MatchMapsLegacy.matchList(frame)
 	Table.mergeInto(args, {
 		isLegacy = true,
 		store = store,
-		noDuplicateCheck = not store,
+		noDuplicateCheck = not store or nil,
 		collapsed = hide,
 		attached = hide,
 		title = Logic.nilOr(Table.extract(args, 'title'), args[1]),
@@ -148,7 +156,28 @@ function MatchMapsLegacy.matchList(frame)
 	end
 
 	globalVars:delete('islegacy')
+
+	if generate then
+		args.isLegacy = nil
+		return MatchGroupLegacy.generateWikiCodeForMatchList(args)
+	end
+
 	return MatchGroup.MatchList(args)
 end
 
+---@param frame Frame
+---@return string
+function MatchMapsLegacy.generateSingleMatch(frame)
+	local args = Arguments.getArgs(frame)
+	args.generate = true
+
+	assert(args.id, 'Missing id')
+
+	return MatchGroupLegacy.generateWikiCodeForSingleMatch{
+		match = MatchMapsLegacy.convertMatch(args),
+		id = args.id,
+		width = args.width,
+	}
+end
+
 return MatchMapsLegacy

lua/wikis/battalion/MatchGroup/Legacy/MatchList.lua

@@ -8,10 +8,12 @@
 local Lua = require('Module:Lua')
 
 local Arguments = Lua.import('Module:Arguments')
+local Array = Lua.import('Module:Array')
 local Json = Lua.import('Module:Json')
 local Logic = Lua.import('Module:Logic')
 local Match = Lua.import('Module:Match')
 local MatchGroup = Lua.import('Module:MatchGroup')
+local MatchGroupLegacy = Lua.import('Module:MatchGroup/Legacy')
 local Opponent = Lua.import('Module:Opponent/Custom')
 local PageVariableNamespace = Lua.import('Module:PageVariableNamespace')
 local Table = Lua.import('Module:Table')
@@ -24,6 +26,42 @@ local LegacyMatchList = {}
 
 local NUMBER_OF_OPPONENTS = 2
 
+--- for bot conversion to proper match2 matchlists
+---@param frame Frame
+---@return string
+function LegacyMatchList.generate(frame)
+	local args = Arguments.getArgs(frame)
+
+	local store = Logic.readBoolOrNil(args.store)
+
+	local offset = 0
+	local title = args.title
+	if not title and not Json.parseIfTable(args[1]) then
+		title = args[1]
+		offset = 1
+	end
+
+	local parsedArgs = {
+		id = args.id,
+		title = title,
+		width = args.width,
+		collapsed = Logic.nilOr(Logic.readBoolOrNil(args.hide), true),
+		attached = Logic.nilOr(Logic.readBoolOrNil(args.hide), true),
+		store = store,
+	}
+
+	---@type table[]
+	local matches = Array.mapIndexes(function(index)
+		return Json.parseIfTable(args[index + offset])
+	end)
+
+	Array.forEach(matches, function(match, matchIndex)
+		parsedArgs['M' .. matchIndex] = Match.makeEncodedJson(match)
+	end)
+
+	return MatchGroupLegacy.generateWikiCodeForMatchList(parsedArgs)
+end
+
 -- invoked by Template:Legacy Match list start
 ---@param frame Frame
 function LegacyMatchList.init(frame)
@@ -42,9 +80,12 @@ end
 
 -- invoked by Template:Match maps
 ---@param frame Frame
+---@return string?
 function LegacyMatchList.matchMaps(frame)
 	local args = Arguments.getArgs(frame)
 
+	local generate = Logic.readBool(Table.extract(args, 'generate'))
+
 	local processedArgs = Table.copy(args)
 	LegacyMatchList._handleOpponents(processedArgs)
 
@@ -57,6 +98,10 @@ function LegacyMatchList.matchMaps(frame)
 	-- all other args from the match maps calls are just passed along directly
 	-- as they can be read by the match2 processing
 
+	if generate then
+		return Json.stringify(processedArgs)
+	end
+
 	Template.stashReturnValue(processedArgs, 'LegacyMatchlist')
 end
 

lua/wikis/brawlstars/MatchMaps/Legacy.lua

@@ -13,6 +13,7 @@ local Array = Lua.import('Module:Array')
 local Logic = Lua.import('Module:Logic')
 local Json = Lua.import('Module:Json')
 local MatchGroup = Lua.import('Module:MatchGroup')
+local MatchGroupLegacy = Lua.import('Module:MatchGroup/Legacy')
 local PageVariableNamespace = Lua.import('Module:PageVariableNamespace')
 local Table = Lua.import('Module:Table')
 local Template = Lua.import('Module:Template')
@@ -226,13 +227,19 @@ end
 ---@return Html
 function MatchMapsLegacy.convertMatch(frame)
 	local args = Arguments.getArgs(frame)
+	local generate = Logic.readBool(Table.extract(args, 'generate'))
+
 	local details = Json.parseIfString(args.details or '{}')
 
 	args, details = MatchMapsLegacy._handleDetails(args, details)
 	args = MatchMapsLegacy._handleOpponents(args)
 	args = MatchMapsLegacy._setHeaderIfEmpty(args, details)
 	args = MatchMapsLegacy._copyDetailsToArgs(args, details)
 
+	if generate then
+		return Json.stringify(args)
+	end
+
 	Template.stashReturnValue(args, 'LegacyMatchlist')
 	return mw.html.create('div'):css('display', 'none')
 end
@@ -257,7 +264,7 @@ function MatchMapsLegacy.showmatch(frame)
 		id = args.id,
 		hide = true,
 		store = store,
-		noDuplicateCheck = not store,
+		noDuplicateCheck = not store or nil,
 		R1M1 = matches[1]
 	})
 
@@ -299,7 +306,7 @@ function MatchMapsLegacy.matchListEnd()
 		isLegacy = true,
 		id = bracketId,
 		store = store,
-		noDuplicateCheck = not store,
+		noDuplicateCheck = not store or nil,
 		collapsed = hide,
 		attached = hide,
 		title = matchlistVars:get('matchListTitle'),
@@ -325,4 +332,60 @@ function MatchMapsLegacy.matchListEnd()
 	return MatchGroup.MatchList(args)
 end
 
+--- for bot conversion to proper match2 matchlists
+---@param frame Frame
+---@return string
+function MatchMapsLegacy.generate(frame)
+	local args = Arguments.getArgs(frame)
+
+	local store = Logic.readBoolOrNil(args.store)
+
+	local offset = 0
+	local title = args.title
+	if not title and not Json.parseIfTable(args[1]) then
+		title = args[1]
+		offset = 1
+	end
+
+	local parsedArgs = {
+		id = args.id,
+		title = title,
+		width = args.width or '300px',
+		collapsed = Logic.nilOr(Logic.readBoolOrNil(args.hide), true),
+		attached = Logic.nilOr(Logic.readBoolOrNil(args.hide), true),
+		store = store,
+	}
+
+	local matchsection = Logic.nilOr(args.lpdb_title, args.title)
+	if Logic.readBoolOrNil(matchsection) ~= false then
+		parsedArgs.matchsection = matchsection
+	end
+
+	---@type table[]
+	local matches = Array.mapIndexes(function(index)
+		return args[index + offset]
+	end)
+
+	Array.forEach(matches, function(match, matchIndex)
+		parsedArgs['M' .. matchIndex] = match
+	end)
+
+	return MatchGroupLegacy.generateWikiCodeForMatchList(parsedArgs)
+end
+
+---@param frame Frame
+---@return string
+function MatchMapsLegacy.generateSingleMatch(frame)
+	local args = Arguments.getArgs(frame)
+	args.generate = true
+
+	assert(args.id, 'Missing id')
+
+	return MatchGroupLegacy.generateWikiCodeForSingleMatch{
+		match = MatchMapsLegacy.convertMatch(args),
+		id = args.id,
+		width = args.width,
+	}
+end
+
 return MatchMapsLegacy