Модуль:GetField: различия между версиями

Нет описания правки
мНет описания правки
 
(не показано 9 промежуточных версий этого же участника)
Строка 285: Строка 285:
end
end
return true
return true
end
local function find_matching_ids(idsTable, keyPath, searchValue)
local parsedPath = parse_path(keyPath)
local target = tostring(searchValue)
local matches = {}
for idKey, entry in pairs(idsTable) do
if type(entry) == "table" then
local v = get_by_parsed_path(entry, parsedPath)
if v ~= nil and contains_target(v, target) then
matches[#matches + 1] = idKey
end
end
end
return matches
end
end


Строка 629: Строка 612:
local value = get_by_path(entry, keyPath)
local value = get_by_path(entry, keyPath)
return format_value(value)
return format_value(value)
end
local function collect_by_parsed_path(tbl, parsedPath, pos, out)
if pos > #parsedPath then
out[#out + 1] = tbl
return
end
if type(tbl) ~= "table" then
return
end
local token = parsedPath[pos]
local key = token[1]
local idx = token[2]
if key == "*" then
for _, child in pairs(tbl) do
local nextCur = child
if idx then
if type(nextCur) ~= "table" then
nextCur = nil
else
nextCur = nextCur[idx]
end
end
collect_by_parsed_path(nextCur, parsedPath, pos + 1, out)
end
return
end
local nextCur
if key and key ~= "" then
nextCur = tbl[key]
if nextCur == nil then
nextCur = tbl["!type:" .. key]
end
else
nextCur = tbl
end
if idx then
if type(nextCur) ~= "table" then
return
end
nextCur = nextCur[idx]
end
collect_by_parsed_path(nextCur, parsedPath, pos + 1, out)
end
local function get_by_parsed_path_multi(tbl, parsedPath)
local out = {}
collect_by_parsed_path(tbl, parsedPath, 1, out)
return out
end
local function entry_matches_path(entry, parsedPath, searchValue, searchType)
local values = get_by_parsed_path_multi(entry, parsedPath)
local target = tostring(searchValue)
for _, v in ipairs(values) do
if searchType == "key" then
if type(v) == "table" and v[target] ~= nil then
return true
end
else
if contains_target(v, target) then
return true
end
end
end
return false
end
local function entry_has_any_nonempty_path(entry, parsedPath)
local values = get_by_parsed_path_multi(entry, parsedPath)
for _, v in ipairs(values) do
if is_nonempty_value(v) then
return true
end
end
return false
end
end


Строка 656: Строка 728:
end
end


local idsTable = type(data.id) == "table" and data.id or data
local ids = collect_id_keys(data)
local ids = collect_id_keys(data)
if #ids == 0 then
if #ids == 0 then
Строка 662: Строка 733:
end
end


local matches
local matches = {}
if searchType == "key" then
local target = tostring(searchValue)
local target = tostring(searchValue)
 
matches = {}
for _, idKey in ipairs(ids) do
for _, idKey in ipairs(ids) do
local entry = resolve_entry(data, idKey)
local v = resolve_path_value(data, idKey, parsedPath)
if type(entry) == "table" and entry_matches_path(entry, parsedPath, target, searchType) then
if type(v) == "table" and v[target] ~= nil then
matches[#matches + 1] = idKey
matches[#matches + 1] = idKey
end
end
else
local target = tostring(searchValue)
matches = {}
if idsTable == data then
matches = find_matching_ids(idsTable, keyPath, searchValue)
else
for _, idKey in ipairs(ids) do
local v = resolve_path_value(data, idKey, parsedPath)
if v ~= nil and contains_target(v, target) then
matches[#matches + 1] = idKey
end
end
end
end
end
end
Строка 745: Строка 801:
end
end


local matches
local matches = {}
 
if searchType == "path" then
if searchType == "path" then
matches = {}
for _, idKey in ipairs(ids) do
for _, idKey in ipairs(ids) do
local v = resolve_entry_path_value(data, idKey, parsedPath)
local entry = resolve_entry(data, idKey)
if is_nonempty_value(v) then
if type(entry) == "table" and entry_has_any_nonempty_path(entry, parsedPath) then
matches[#matches + 1] = idKey
matches[#matches + 1] = idKey
end
end
end
end
elseif searchType == "key" then
else
local target = tostring(searchValue)
local target = tostring(searchValue)
matches = {}
for _, idKey in ipairs(ids) do
for _, idKey in ipairs(ids) do
local v = resolve_path_value(data, idKey, parsedPath)
local entry = resolve_entry(data, idKey)
if type(v) == "table" and v[target] ~= nil then
if type(entry) == "table" and entry_matches_path(entry, parsedPath, target, searchType) then
matches[#matches + 1] = idKey
matches[#matches + 1] = idKey
end
end
else
local idsTable = data.id
if type(idsTable) == "table" then
local directMatches = find_matching_ids(idsTable, keyPath, searchValue)
local defaultValue = nil
local includeDefault = false
local base = data["default"]
if type(base) == "table" then
defaultValue = get_by_parsed_path(base, parsedPath)
includeDefault = defaultValue ~= nil and contains_target(defaultValue, tostring(searchValue))
end
if includeDefault and #directMatches < #ids then
local seen = {}
for i = 1, #directMatches do
seen[directMatches[i]] = true
end
matches = {}
for _, idKey in ipairs(directMatches) do
matches[#matches + 1] = idKey
end
for _, idKey in ipairs(ids) do
if not seen[idKey] then
local specific = idsTable[idKey]
local specificValue = type(specific) == "table" and get_by_parsed_path(specific, parsedPath) or
nil
if specificValue == nil then
matches[#matches + 1] = idKey
end
end
end
else
matches = directMatches
end
else
local target = tostring(searchValue)
matches = {}
for _, idKey in ipairs(ids) do
local v = resolve_path_value(data, idKey, parsedPath)
if v ~= nil and contains_target(v, target) then
matches[#matches + 1] = idKey
end
end
end
end
end
Строка 1093: Строка 1103:


if aPrimitive ~= bPrimitive then
if aPrimitive ~= bPrimitive then
return aPrimitive
return not aPrimitive
end
end


Строка 1100: Строка 1110:


return keys[1]
return keys[1]
end
local function is_wrapper_block_key(key)
return type(key) == "string" and not key:match("^[%a_][%w_]*$")
end
end


Строка 1138: Строка 1152:
local v = value[k]
local v = value[k]
local key
local key
if prefix and options.nestedKeyMode == "prefixed" then
if prefix then
key = prefix .. "." .. tostring(k)
key = prefix .. "." .. tostring(k)
else
else
Строка 1157: Строка 1171:
end
end


if next(v) ~= nil then
if next(v) ~= nil and not is_array_of_primitives(v) then
local childPrefix = (options.nestedKeyMode == "prefixed") and key or nil
local childPrefix
if options.nestedKeyMode == "prefixed" then
childPrefix = key
elseif type(k) == "string" then
childPrefix = key
else
childPrefix = nil
end
append_table_fields(parts, v, options, childPrefix)
append_table_fields(parts, v, options, childPrefix)
end
end
Строка 1195: Строка 1216:
skipPrimitiveRoot = true,
skipPrimitiveRoot = true,
}
}
local function is_object_map(tbl)
local count = 0
for k, v in pairs(tbl) do
if type(k) ~= "string" or type(v) ~= "table" then
return false
end
count = count + 1
end
return count > 1
end


local function makeCall(obj)
local function makeCall(obj)
Строка 1219: Строка 1251:


if k == idKey then
if k == idKey then
if type(k) == "string" and string.sub(k, 1, 6) == "!type:" then
if is_wrapper_block_key(k) then
if type(v) == "table" then
if type(v) == "table" then
local json = encode_nowiki_json(v)
if json then
parts[#parts + 1] = "value=" .. tostring(json)
end
append_table_fields(parts, v, rawTypeOptions, nil)
append_table_fields(parts, v, rawTypeOptions, nil)
elseif v ~= nil then
elseif v ~= nil then
Строка 1239: Строка 1275:
elseif v ~= nil then
elseif v ~= nil then
parts[#parts + 1] = "value=" .. tostring(v)
parts[#parts + 1] = "value=" .. tostring(v)
parts[#parts + 1] = k .. "=" .. tostring(v)
end
end
else
else
Строка 1257: Строка 1294:
if is_array(data) then
if is_array(data) then
for _, item in ipairs(data) do
for _, item in ipairs(data) do
makeCall(item)
if type(item) == "table" then
makeCall(item)
elseif item ~= nil and item ~= "" then
makeCall({ [item] = {} })
end
end
elseif is_object_map(data) then
local keys = collect_sorted_keys(data, true)
for _, k in ipairs(keys) do
makeCall({ [k] = data[k] })
end
end
else
else
Строка 1282: Строка 1328:
end
end


local outputType = (args.type or "list"):lower()
local outputType = (args.type or "list")


local bullet = mw.text.unstripNoWiki(args.prefix or "* ")
local bullet = mw.text.unstripNoWiki(args.prefix or "* ")
local sep = mw.text.unstripNoWiki(args.sep or ": ")
local sep = mw.text.unstripNoWiki(args.sep or ": ")
if outputType == "none" then
if outputType == "none" then
bullet = ""
bullet = ""
sep = ""
sep = ""
elseif outputType == "revertList" then
sep = mw.text.unstripNoWiki(args.sep or " ")
end
end


Строка 1379: Строка 1428:
if outputType == "enum" then
if outputType == "enum" then
line = vStr .. " " .. keyStr
line = vStr .. " " .. keyStr
elseif outputType == "revertList" then
line = bullet .. vStr .. sep .. keyStr
else
else
line = bullet .. keyStr .. sep .. vStr
line = bullet .. keyStr .. sep .. vStr
Строка 1394: Строка 1445:
if outputType == "enum" then
if outputType == "enum" then
return frame:preprocess(table.concat(out, ", "))
return frame:preprocess(table.concat(out, ", "))
elseif outputType == "list" then
elseif outputType == "list" or outputType == "revertList" then
return frame:preprocess(table.concat(out, "\n"))
return frame:preprocess(table.concat(out, "\n"))
else
else