Модуль:GetField - История изменений

Pok в 15:03, 24 июня 2026

2026-06-24T15:03:23Z

← Предыдущая версия		Версия от 18:03, 24 июня 2026
Строка 793:		Строка 793:

	return ""		return ""
			end

			local function collect_ids_from_entry(entry)
			local out = {}
			local seen = {}

			local function add(v)
			if v == nil then
			return
			end
			local s = tostring(v)
			if s ~= "" and not seen[s] then
			seen[s] = true
			out[#out + 1] = s
			end
			end

			if type(entry) == "table" then
			if is_array(entry) then
			for _, v in ipairs(entry) do
			add(v)
			end
			else
			for _, v in pairs(entry) do
			if type(v) == "table" and is_array(v) then
			for _, item in ipairs(v) do
			add(item)
			end
			elseif type(v) ~= "table" then
			add(v)
			end
			end
			end
			else
			add(entry)
			end

			return out
	end		end

Строка 809:		Строка 847:
	end		end

	local pagePath		local pagePath = (mode == "component") and "component.json" or "tag.json"
	if mode == "component" ~~then~~
	~~pagePath =~~ "component.json"
	~~else~~
	~~pagePath =~~ "tag.json"
	~~end~~

	local data = p.loadCachedData(pagePath)		local data = p.loadCachedData(pagePath)
	if not data ~~or type(data) ~= "table"~~ then		if not data then
	return ""		return ""
	end		end

	local ~~ids~~ = ~~collect_id_keys(data)~~		local matches = {}
	~~if #ids~~ =~~= 0 then~~		local seen = {}
	~~return ""~~
	~~end~~

	~~table.sort(ids, function(a, b)~~
	~~return tostring(a) < tostring(b)~~
	~~end)~~

	local function ~~entry_has_all_targets~~(~~entry, wanted~~)		local function add_id(id)
	~~if type~~(~~entry~~) ~= "~~table~~" then		local s = tostring(id)
	~~return false~~		if s ~= "" and not seen[s] then
	~~end~~		seen[s] = true
			matches[#matches + 1] = s
	~~local set~~ = {}
	~~for _, v in ipairs(entry) do~~
	~~set~~[~~tostring(v)~~] = ~~true~~
	end		end
			end

	~~for i~~ = 1, ~~#wanted do~~		for _, key in ipairs(targets) do
	if ~~not set[wanted[i]]~~ then		local entry = resolve_entry_from_data(data, key)
	~~return false~~		if entry ~= nil then
			local ids = collect_ids_from_entry(entry)
			for _, id in ipairs(ids) do
			add_id(id)
	end		end
	end		end

	~~return true~~
	end		end

	~~local~~ matches ~~= {}~~		table.sort(matches, function(a, b)
			return tostring(a) < tostring(b)
	~~for _~~, ~~idKey in ipairs~~(~~ids~~) do		end)
	~~local entry = resolve_entry_from_data~~(~~data, idKey~~)
	~~if entry_has_all_targets~~(~~entry, targets~~) ~~then~~
	~~matches[#matches + 1] = idKey~~
	~~end~~
	end

	local ok, json = pcall(mw.text.jsonEncode, matches)		local ok, json = pcall(mw.text.jsonEncode, matches)

Pok в 12:54, 23 июня 2026

2026-06-23T12:54:11Z

← Предыдущая версия		Версия от 15:54, 23 июня 2026
Строка 548:		Строка 548:
	local searchId = args[1] or ""		local searchId = args[1] or ""
	local kind = (args[2] or ""):lower()		local kind = (args[2] or ""):lower()
	local fieldId = args[3] or ""		local fieldId = p.ucfirst(args[3] or "")

	if searchId == "" or fieldId == "" then		if searchId == "" or fieldId == "" then
Строка 974:		Строка 974:
	local searchId = args[1] or ""		local searchId = args[1] or ""
	local kind = (args[2] or ""):lower()		local kind = (args[2] or ""):lower()
	local generatorId = args[3] or ""		local generatorId = p.ucfirst(args[3] or "")
	local tplPath = mw.text.unstripNoWiki(args[4] or "")		local tplPath = mw.text.unstripNoWiki(args[4] or "")
	local tplArgs = args[5] or args.tplArgs or args.templateArgs or ""		local tplArgs = args[5] or args.tplArgs or args.templateArgs or ""
Строка 1023:		Строка 1023:
	local searchId = args[1] or ""		local searchId = args[1] or ""
	local kind = (args[2] or ""):lower()		local kind = (args[2] or ""):lower()
	local generatorId = args[3] or ""		local generatorId = p.ucfirst(args[3] or "")

	if searchId == "" or generatorId == "" then		if searchId == "" or generatorId == "" then

Pok в 03:28, 23 июня 2026

2026-06-23T03:28:35Z

Внесённые изменения

Pok в 01:23, 23 июня 2026

2026-06-23T01:23:35Z

← Предыдущая версия		Версия от 04:23, 23 июня 2026
Строка 1644:		Строка 1644:
	end		end
	end		end

			p.ucfirst = ucfirst
			p.loadCachedData = load_cached_data
			p.loadEntityData = load_entity_data
			p.normalizeComponentName = normalizeComponentName
			p.collectEntityComponents = collect_entity_components
			p.entityHasComponent = entity_has_component

	function p.flattenFieldSelectiveDirect(id, dataPage, paramNames)		function p.flattenFieldSelectiveDirect(id, dataPage, paramNames)

Pok в 01:21, 23 июня 2026

2026-06-23T01:21:20Z

Внесённые изменения

Pok в 23:06, 22 июня 2026

2026-06-22T23:06:33Z

← Предыдущая версия		Версия от 02:06, 23 июня 2026
Строка 152:		Строка 152:
	end		end

	local function resolve_entry_from_data(data, id)		local function resolve_entry_from_data(data, id, allowDefault)
	if type(data) ~= "table" then		if type(data) ~= "table" then
	return nil		return nil
Строка 176:		Строка 176:
	end		end
	end		end
			end

			if allowDefault == false then
			return nil
	end		end

Строка 186:		Строка 190:
	end		end

	local function load_entry(id, pagePath, data)		local function load_entry(id, pagePath, data, allowDefault)
	data = data or load_cached_data(pagePath)		data = data or load_cached_data(pagePath)
	return resolve_entry_from_data(data, id)		if allowDefault == nil then
			allowDefault = true
			end
			return resolve_entry_from_data(data, id, allowDefault)
	end		end

Строка 424:		Строка 431:
	end		end

	local function build_tpl(id, pagePath, tplPath, data, tplArgs, preEntry)		local function build_tpl(id, pagePath, tplPath, data, tplArgs, preEntry, strictExact)
	if id == "" or pagePath == "" or tplPath == "" then		if id == "" or pagePath == "" or tplPath == "" then
	return ""		return ""
	end		end

	local entry = preEntry or load_entry(id, pagePath, data)		local entry
			if strictExact then
			entry = load_entry(id, pagePath, data, false)
			else
			entry = preEntry or load_entry(id, pagePath, data)
			end

	if entry == nil then		if entry == nil then
	return ""		return ""
Строка 722:		Строка 735:

	for _, idKey in ipairs(ids) do		for _, idKey in ipairs(ids) do
	local entry = resolve_entry_from_data(data, idKey)		local entry = resolve_entry_from_data(data, idKey, true)
	if type(entry) == "table" and entry_matches_path(entry, parsedPath, target, searchType) then		if type(entry) == "table" and entry_matches_path(entry, parsedPath, target, searchType) then
	matches[#matches + 1] = idKey		matches[#matches + 1] = idKey
Строка 827:		Строка 840:

	for _, idKey in ipairs(ids) do		for _, idKey in ipairs(ids) do
	local entry = resolve_entry_from_data(data, idKey)		local entry = resolve_entry_from_data(data, idKey, true)
	if mode == "component" then		if mode == "component" then
	if entry_has_all_targets_component(entry, targets) then		if entry_has_all_targets_component(entry, targets) then
Строка 897:		Строка 910:
	if searchType == "path" then		if searchType == "path" then
	for _, idKey in ipairs(ids) do		for _, idKey in ipairs(ids) do
	local entry = resolve_entry_from_data(data, idKey)		local entry = resolve_entry_from_data(data, idKey, true)
	entryCache[idKey] = entry		entryCache[idKey] = entry
	if type(entry) == "table" and entry_has_any_nonempty_path(entry, parsedPath) then		if type(entry) == "table" and entry_has_any_nonempty_path(entry, parsedPath) then
Строка 906:		Строка 919:
	local target = tostring(searchValue)		local target = tostring(searchValue)
	for _, idKey in ipairs(ids) do		for _, idKey in ipairs(ids) do
	local entry = resolve_entry_from_data(data, idKey)		local entry = resolve_entry_from_data(data, idKey, true)
	entryCache[idKey] = entry		entryCache[idKey] = entry
	if type(entry) == "table" and entry_matches_path(entry, parsedPath, target, searchType) then		if type(entry) == "table" and entry_matches_path(entry, parsedPath, target, searchType) then
Строка 920:		Строка 933:
	local out = {}		local out = {}
	for _, idKey in ipairs(matches) do		for _, idKey in ipairs(matches) do
	local tpl = build_tpl(idKey, pagePath, tplPath, data, tplArgs, entryCache[idKey])		local tpl = build_tpl(idKey, pagePath, tplPath, data, tplArgs, entryCache[idKey], false)
	if tpl ~= "" then		if tpl ~= "" then
	out[#out + 1] = tpl		out[#out + 1] = tpl
Строка 947:		Строка 960:

	local data = frame.data		local data = frame.data
	local tplStr = build_tpl(id, pagePath, tplPath, data, tplArgs)		local tplStr = build_tpl(id, pagePath, tplPath, data, tplArgs, nil, true)
	return preprocess_or_return(frame, tplStr)		return preprocess_or_return(frame, tplStr)
	end		end
Строка 983:		Строка 996:
	local out = {}		local out = {}
	for _, id in ipairs(ids) do		for _, id in ipairs(ids) do
	local entry = resolve_entry_from_data(data, id)		local entry = resolve_entry_from_data(data, id, true)
	if entry ~= nil then		if entry ~= nil then
	local tpl = build_tpl(id, pagePath, tplPath, data, tplArgs, entry)		local tpl = build_tpl(id, pagePath, tplPath, data, tplArgs, entry, true)
	if tpl ~= "" then		if tpl ~= "" then
	out[#out + 1] = tpl		out[#out + 1] = tpl
Строка 1165:		Строка 1178:

	for idKey in pairs(idsTable) do		for idKey in pairs(idsTable) do
	local entry = resolve_entry_from_data(data, idKey)		local entry = resolve_entry_from_data(data, idKey, true)
	if entry ~= nil then		if entry ~= nil then
	local tpl = build_tpl(idKey, pagePath, tplPath, data, tplArgs, entry)		local tpl = build_tpl(idKey, pagePath, tplPath, data, tplArgs, entry, true)
	if tpl ~= "" then		if tpl ~= "" then
	out[#out + 1] = tpl		out[#out + 1] = tpl

Pok в 13:31, 21 июня 2026

2026-06-21T13:31:07Z

Внесённые изменения

Pok: Отмена версии 367813, сделанной Pok (обсуждение)

2026-06-21T13:29:17Z

Отмена версии 367813, сделанной Pok (обсуждение)

Внесённые изменения

Pok в 05:11, 21 июня 2026

2026-06-21T05:11:44Z

Внесённые изменения

Pok в 00:45, 21 июня 2026

2026-06-21T00:45:07Z

Внесённые изменения