Space Station 14 Вики

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

Интерактивная навигация по истории
← Предыдущая правка
Нет описания правки
мНет описания правки
 
(не показано 49 промежуточных версий этого же участника)
Строка 30: Строка 30:
end
end


local function get_by_path(tbl, path)
local function parse_path(path)
if not tbl or path == "" then
if not path or path == "" then
return nil
end
 
local parsed = {}
for part in string.gmatch(path, "([^%.]+)") do
parsed[#parsed + 1] = { parse_indexed_part(part) }
end
 
return parsed
end
 
local function get_by_parsed_path(tbl, parsedPath)
if not tbl or not parsedPath then
return nil
return nil
end
end


local cur = tbl
local cur = tbl
for part in string.gmatch(path, "([^%.]+)") do
for i = 1, #parsedPath do
local key, idx = parse_indexed_part(part)
local token = parsedPath[i]
local key = token[1]
local idx = token[2]


if key and key ~= "" then
if key and key ~= "" then
Строка 64: Строка 79:


return cur
return cur
end
local function get_by_path(tbl, path)
return get_by_parsed_path(tbl, parse_path(path))
end
end


Строка 165: Строка 184:


return nil
return nil
end
local function resolve_path_value(data, id, parsedPath)
if type(data) ~= "table" or not parsedPath or not id or id == "" then
return nil
end
local direct = data[id]
if direct ~= nil then
local value = get_by_parsed_path(direct, parsedPath)
if value ~= nil then
return value
end
end
local idsTable = data.id
if type(idsTable) == "table" then
local specific = idsTable[id]
if type(specific) == "table" then
local value = get_by_parsed_path(specific, parsedPath)
if value ~= nil then
return value
end
end
end
local base = data["default"]
if type(base) == "table" then
return get_by_parsed_path(base, parsedPath)
end
return nil
end
local function resolve_entry_path_value(data, id, parsedPath)
if type(data) ~= "table" or not parsedPath or not id or id == "" then
return nil
end
local entry = resolve_entry(data, id)
if type(entry) ~= "table" then
return nil
end
return get_by_parsed_path(entry, parsedPath)
end
end


Строка 221: Строка 285:
end
end
return true
return true
end
local function find_matching_ids(idsTable, keyPath, searchValue)
local target = tostring(searchValue)
local matches = {}
for idKey, entry in pairs(idsTable) do
if type(entry) == "table" then
local v = get_by_path(entry, keyPath)
if v ~= nil and contains_target(v, target) then
matches[#matches + 1] = idKey
end
end
end
return matches
end
end


Строка 346: Строка 394:
end
end


local function build_tpl(id, pagePath, tplPath, data)
local function append_flattened_part(parts, key, value)
if value == nil then
return
end
 
if type(value) == "table" then
if next(value) == nil then
return
end
 
local ok, json = pcall(mw.text.jsonEncode, value)
if ok and json then
parts[#parts + 1] = key .. "=" .. to_nowiki(json)
end
return
end
 
parts[#parts + 1] = key .. "=" .. tostring(value)
end
 
local function flatten_selected_parts(entry, keys)
if type(entry) ~= "table" or type(keys) ~= "table" then
return {}
end
 
local parts = {}
local seen = {}
 
for i = 1, #keys do
local key = keys[i]
if type(key) == "string" and key ~= "" and not seen[key] then
seen[key] = true
append_flattened_part(parts, key, get_by_path(entry, key))
end
end
 
return parts
end
 
local function resolve_template_path(tplPath)
local templatePath = tplPath
local project = JsonPaths.project()
if project ~= nil and project ~= "" then
templatePath = tplPath .. "/" .. project
templatePath = "{{#ifexist:Шаблон:" .. templatePath .. "|" .. templatePath .. "|" .. tplPath .. "}}"
end
 
return templatePath
end
 
local function split_template_spec(tplPath, tplArgs)
tplPath = mw.text.unstripNoWiki(tplPath or "")
tplArgs = mw.text.unstripNoWiki(tplArgs or "")
if tplArgs ~= "" and string.sub(tplArgs, 1, 1) == "|" then
tplArgs = string.sub(tplArgs, 2)
end
 
if tplArgs == "" then
local pipePos = string.find(tplPath, "|", 1, true)
if pipePos then
tplArgs = mw.text.unstripNoWiki(string.sub(tplPath, pipePos + 1))
if tplArgs ~= "" and string.sub(tplArgs, 1, 1) == "|" then
tplArgs = string.sub(tplArgs, 2)
end
tplPath = string.sub(tplPath, 1, pipePos - 1)
end
end
 
return tplPath, tplArgs
end
 
local function build_tpl(id, pagePath, tplPath, data, tplArgs)
if id == "" or pagePath == "" or tplPath == "" then
if id == "" or pagePath == "" or tplPath == "" then
return ""
return ""
Строка 352: Строка 471:


local moduleName = get_module_name(pagePath)
local moduleName = get_module_name(pagePath)
if not data then
data = data or load_cached_data(moduleName)
data = load_cached_data(moduleName)
end
if not data then
if not data then
return ""
return ""
Строка 361: Строка 478:
local entry = resolve_entry(data, id)
local entry = resolve_entry(data, id)
local extra = flatten_entry(entry)
local extra = flatten_entry(entry)
local extraTplArgs = tplArgs or ""


local tplStr = "{{" .. tostring(tplPath) .. "|id=" .. tostring(id)
local templatePath = resolve_template_path(tplPath)
 
local tplStr = "{{Шаблон:" .. templatePath
if extraTplArgs ~= "" then
tplStr = tplStr .. "|" .. extraTplArgs
end
tplStr = tplStr .. "|id=" .. tostring(id)
if extra ~= "" then
if extra ~= "" then
tplStr = tplStr .. "|" .. extra
tplStr = tplStr .. "|" .. extra
Строка 372: Строка 496:


function p.findInGenerator(frame)
function p.findInGenerator(frame)
local args = getArgs(frame, { removeBlanks = false })
local args = frame.args or {}
local searchId = args[1] or ""
local searchId = args[1] or ""
local kind = (args[2] or ""):lower()
local kind = (args[2] or ""):lower()
Строка 415: Строка 539:


function p.flattenField(frame)
function p.flattenField(frame)
local args = getArgs(frame, { removeBlanks = false })
local args = frame.args or {}
local id = args[1] or ""
local id = args[1] or ""
local pagePath = args[2] or ""
local pagePath = args[2] or ""
Строка 430: Строка 554:
local entry = resolve_entry(data, id) or {}
local entry = resolve_entry(data, id) or {}
return flatten_entry(entry)
return flatten_entry(entry)
end
function p.flattenFieldSelective(frame)
local args = frame.args or {}
local id = args[1] or ""
local pagePath = args[2] or ""
local keysJson = mw.text.unstripNoWiki(args[3] or args.keys or "")
if id == "" or pagePath == "" or keysJson == "" then
return ""
end
local okKeys, keys = pcall(mw.text.jsonDecode, keysJson)
if not okKeys or type(keys) ~= "table" or #keys == 0 then
return ""
end
local moduleName = get_module_name(pagePath)
local data = load_cached_data(moduleName)
if not data then
return ""
end
local entry = resolve_entry(data, id) or {}
local parts = flatten_selected_parts(entry, keys)
if #parts == 0 then
return ""
end
return table.concat(parts, "|")
end
end


Строка 461: Строка 614:
end
end


function p.getId(frame)
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
 
function p.searchId(frame)
local args = getArgs(frame, { removeBlanks = false })
local args = getArgs(frame, { removeBlanks = false })
local searchValue = args[1] or ""
local searchValue = args[1] or ""
Строка 479: Строка 721:
if not data then
if not data then
return "[]"
return "[]"
end
local parsedPath = parse_path(keyPath)
if not parsedPath then
return ""
end
end


Строка 486: Строка 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 entry = resolve_entry(data, idKey)
if type(entry) == "table" and entry_matches_path(entry, parsedPath, target, searchType) then
if type(entry) == "table" then
matches[#matches + 1] = idKey
local v = get_by_path(entry, keyPath)
if type(v) == "table" and v[target] ~= nil then
matches[#matches + 1] = idKey
end
end
end
else
local target = tostring(searchValue)
matches = {}
for _, idKey in ipairs(ids) do
local entry = resolve_entry(data, idKey)
if type(entry) == "table" then
local v = get_by_path(entry, keyPath)
if v ~= nil and contains_target(v, target) then
matches[#matches + 1] = idKey
end
end
end
end
end
end
Строка 525: Строка 755:
end
end


function p.getTplId(frame)
function p.searchIdTpl(frame)
local args = getArgs(frame, { removeBlanks = false })
local args = getArgs(frame, { removeBlanks = false })
local searchValue = args[1] or ""
local searchValue = args[1] or ""
Строка 531: Строка 761:
local keyPath = args[3] or ""
local keyPath = args[3] or ""
local tplPath = mw.text.unstripNoWiki(args[4] or "")
local tplPath = mw.text.unstripNoWiki(args[4] or "")
local tplArgs = args.tplArgs or args.templateArgs or ""
local searchType = (args.searchType or ""):lower()
local searchType = (args.searchType or ""):lower()


Строка 542: Строка 773:
keyPath = args[2] or ""
keyPath = args[2] or ""
tplPath = mw.text.unstripNoWiki(args[3] or "")
tplPath = mw.text.unstripNoWiki(args[3] or "")
tplArgs = args[4] or args.tplArgs or args.templateArgs or ""
end
end
tplPath, tplArgs = split_template_spec(tplPath, tplArgs)


if pagePath == "" or keyPath == "" or tplPath == "" then
if pagePath == "" or keyPath == "" or tplPath == "" then
Строка 554: Строка 788:
local data = load_cached_data(moduleName)
local data = load_cached_data(moduleName)
if not data then
if not data then
return ""
end
local parsedPath = parse_path(keyPath)
if not parsedPath then
return ""
return ""
end
end
Строка 562: Строка 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 entry = resolve_entry(data, idKey)
local entry = resolve_entry(data, idKey)
if type(entry) == "table" then
if type(entry) == "table" and entry_has_any_nonempty_path(entry, parsedPath) then
local v = get_by_path(entry, keyPath)
matches[#matches + 1] = idKey
if is_nonempty_value(v) then
matches[#matches + 1] = idKey
end
end
end
elseif searchType == "key" then
local target = tostring(searchValue)
matches = {}
for _, idKey in ipairs(ids) do
local entry = resolve_entry(data, idKey)
if type(entry) == "table" then
local v = get_by_path(entry, keyPath)
if type(v) == "table" and v[target] ~= nil then
matches[#matches + 1] = idKey
end
end
end
end
end
else
else
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 entry = resolve_entry(data, idKey)
if type(entry) == "table" then
if type(entry) == "table" and entry_matches_path(entry, parsedPath, target, searchType) then
local v = get_by_path(entry, keyPath)
matches[#matches + 1] = idKey
if v ~= nil and contains_target(v, target) then
matches[#matches + 1] = idKey
end
end
end
end
end
Строка 606: Строка 826:
local out = {}
local out = {}
for _, idKey in ipairs(matches) do
for _, idKey in ipairs(matches) do
local tpl = build_tpl(idKey, pagePath, tplPath, data)
local tpl = build_tpl(idKey, pagePath, tplPath, data, tplArgs)
if tpl ~= "" then
if tpl ~= "" then
out[#out + 1] = tpl
out[#out + 1] = tpl
Строка 625: Строка 845:
local pagePath = args[2] or ""
local pagePath = args[2] or ""
local tplPath = mw.text.unstripNoWiki(args[3] or "")
local tplPath = mw.text.unstripNoWiki(args[3] or "")
local tplArgs = args[4] or args.tplArgs or args.templateArgs or ""
tplPath, tplArgs = split_template_spec(tplPath, tplArgs)


if id == "" or pagePath == "" or tplPath == "" then
if id == "" or pagePath == "" or tplPath == "" then
Строка 639: Строка 861:
end
end


local tplStr = build_tpl(id, pagePath, tplPath, data)
local tplStr = build_tpl(id, pagePath, tplPath, data, tplArgs)
return preprocess_or_return(frame, tplStr)
return preprocess_or_return(frame, tplStr)
end
end


function p.getTplGenerator(frame)
function p.searchStoreTpl(frame)
local args = getArgs(frame, { removeBlanks = false })
local args = getArgs(frame, { removeBlanks = false })
local searchId = args[1] or ""
local searchId = args[1] or ""
Строка 649: Строка 871:
local generatorId = args[3] or ""
local generatorId = 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 ""
tplPath, tplArgs = split_template_spec(tplPath, tplArgs)


if searchId == "" or generatorId == "" or tplPath == "" then
if searchId == "" or generatorId == "" or tplPath == "" then
Строка 674: Строка 898:
local out = {}
local out = {}
for _, id in ipairs(ids) do
for _, id in ipairs(ids) do
local tpl = build_tpl(id, pagePath, tplPath, data)
local tpl = build_tpl(id, pagePath, tplPath, data, tplArgs)
if tpl ~= "" then
if tpl ~= "" then
out[#out + 1] = tpl
out[#out + 1] = tpl
Строка 688: Строка 912:
end
end


function p.getGenerator(frame)
function p.searchStore(frame)
local args = getArgs(frame, { removeBlanks = false })
local args = getArgs(frame, { removeBlanks = false })
local searchId = args[1] or ""
local searchId = args[1] or ""
Строка 749: Строка 973:
end
end


function p.GeneratorId(frame)
function p.getAll(frame)
local args = getArgs(frame, { removeBlanks = false })
local args = getArgs(frame, { removeBlanks = false })
local pagePath = args[1] or ""
local pagePath = args[1] or ""
Строка 799: Строка 1023:
end
end


function p.GeneratorTplId(frame)
function p.getAllTpl(frame)
local args = getArgs(frame, { removeBlanks = false })
local args = getArgs(frame, { removeBlanks = false })
local pagePath = args[1] or ""
local pagePath = args[1] or ""
local tplPath = args[2] or ""
local tplPath = args[2] or ""
local tplArgs = args[3] or args.tplArgs or args.templateArgs or ""
tplPath, tplArgs = split_template_spec(tplPath, tplArgs)


if pagePath == "" or tplPath == "" then
if pagePath == "" or tplPath == "" then
Строка 822: Строка 1048:


for idKey in pairs(idsTable) do
for idKey in pairs(idsTable) do
local tpl = build_tpl(idKey, pagePath, tplPath, data)
local tpl = build_tpl(idKey, pagePath, tplPath, data, tplArgs)
if tpl ~= "" then
if tpl ~= "" then
out[#out + 1] = tpl
out[#out + 1] = tpl
Строка 832: Строка 1058:
local result = table.concat(out, " ")
local result = table.concat(out, " ")
return preprocess_or_return(frame, result)
return preprocess_or_return(frame, result)
end
local function encode_nowiki_json(value)
local ok, json = pcall(mw.text.jsonEncode, value)
if ok and json then
return to_nowiki(json)
end
return nil
end
local function collect_sorted_keys(tbl, stringOnly)
local keys = {}
for k in pairs(tbl) do
if not stringOnly or type(k) == "string" then
keys[#keys + 1] = k
end
end
table.sort(keys, function(a, b)
return tostring(a) < tostring(b)
end)
return keys
end
local function choose_id_key(obj)
local keys = {}
for k in pairs(obj) do
if type(k) == "string" then
keys[#keys + 1] = k
end
end
if #keys == 0 then
return nil
end
table.sort(keys, function(a, b)
local av = obj[a]
local bv = obj[b]
local aPrimitive = type(av) ~= "table"
local bPrimitive = type(bv) ~= "table"
if aPrimitive ~= bPrimitive then
return not aPrimitive
end
return tostring(a) < tostring(b)
end)
return keys[1]
end
local function is_wrapper_block_key(key)
return type(key) == "string" and not key:match("^[%a_][%w_]*$")
end
local function is_array_of_primitives(tbl)
if type(tbl) ~= "table" or not is_array(tbl) then
return false
end
for _, v in ipairs(tbl) do
if type(v) == "table" then
return false
end
end
return true
end
local function append_table_fields(parts, value, options, prefix)
if type(value) ~= "table" or next(value) == nil then
return
end
if options.skipPrimitiveRoot and is_array_of_primitives(value) then
return
end
if prefix and options.includeJsonAtPrefix then
local json = encode_nowiki_json(value)
if json then
parts[#parts + 1] = prefix .. "=" .. tostring(json)
end
end
local keys = collect_sorted_keys(value, false)
for _, k in ipairs(keys) do
if not (options.nestedKeyMode == "raw" and type(k) == "number") then
local v = value[k]
local key
if prefix then
key = prefix .. "." .. tostring(k)
else
key = tostring(k)
end
if type(v) == "table" then
if is_array_of_primitives(v) then
local json = encode_nowiki_json(v)
if json then
parts[#parts + 1] = key .. "=" .. tostring(json)
end
elseif options.nestedKeyMode == "raw" then
local json = encode_nowiki_json(v)
if json then
parts[#parts + 1] = key .. "=" .. tostring(json)
end
end
if next(v) ~= nil and not is_array_of_primitives(v) then
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)
end
else
parts[#parts + 1] = key .. "=" .. tostring(v)
end
end
end
end
end


Строка 838: Строка 1193:
local jsonStr = mw.text.unstripNoWiki(args[1] or args.json or "")
local jsonStr = mw.text.unstripNoWiki(args[1] or args.json or "")
local tplPath = mw.text.unstripNoWiki(args[2] or args.template or "")
local tplPath = mw.text.unstripNoWiki(args[2] or args.template or "")
local tplArgs = args[3] or args.tplArgs or args.templateArgs or ""
tplPath, tplArgs = split_template_spec(tplPath, tplArgs)
if jsonStr == "" or tplPath == "" then
if jsonStr == "" or tplPath == "" then
return ""
return ""
Строка 847: Строка 1205:
end
end


local okDp, dp = pcall(require, "Module:GetField")
local calls = {}
local nestedOptions = {
includeJsonAtPrefix = true,
nestedKeyMode = "prefixed",
skipPrimitiveRoot = false,
}
local rawTypeOptions = {
includeJsonAtPrefix = false,
nestedKeyMode = "raw",
skipPrimitiveRoot = true,
}


local calls = {}
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)
if type(obj) ~= "table" then
return
end


local function makeCall(id, obj)
local idKey = choose_id_key(obj)
if type(id) ~= "string" then
if not idKey then
return
return
end
end


local parts = { "{{" .. tplPath, "id=" .. id }
local parts = { "{{Шаблон:" .. resolve_template_path(tplPath) }
 
if tplArgs ~= "" then
parts[#parts + 1] = tplArgs
end
 
parts[#parts + 1] = tostring(idKey)
local keys = collect_sorted_keys(obj, true)
 
for _, k in ipairs(keys) do
local v = obj[k]
 
if k == idKey then
if is_wrapper_block_key(k) 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)
elseif v ~= nil then
parts[#parts + 1] = "value=" .. tostring(v)
end
elseif type(v) == "table" then
if is_array_of_primitives(v) then
local json = encode_nowiki_json(v)
if json then
parts[#parts + 1] = "value=" .. tostring(json)
end
end


if type(obj) == "table" then
if next(v) ~= nil then
if okDp and dp and type(dp.flattenParams) == "function" then
append_table_fields(parts, v, nestedOptions, k)
local extra = dp.flattenParams(obj)
append_table_fields(parts, v, rawTypeOptions, nil)
for i = 1, #extra do
end
parts[#parts + 1] = extra[i]
elseif v ~= nil then
parts[#parts + 1] = "value=" .. tostring(v)
parts[#parts + 1] = k .. "=" .. tostring(v)
end
end
else
else
for k, v in pairs(obj) do
if type(v) == "table" then
if v ~= nil then
if next(v) ~= nil then
parts[#parts + 1] = tostring(k) .. "=" .. tostring(v)
append_table_fields(parts, v, nestedOptions, k)
end
end
elseif v ~= nil then
parts[#parts + 1] = k .. "=" .. tostring(v)
end
end
end
end
elseif obj ~= nil then
parts[#parts + 1] = "value=" .. tostring(obj)
end
end


Строка 882: Строка 1295:
for _, item in ipairs(data) do
for _, item in ipairs(data) do
if type(item) == "table" then
if type(item) == "table" then
for k, v in pairs(item) do
makeCall(item)
makeCall(k, v)
elseif item ~= nil and item ~= "" then
end
makeCall({ [item] = {} })
end
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
for k, v in pairs(data) do
makeCall(data)
makeCall(k, v)
end
end
end


Строка 897: Строка 1313:
end
end


local rendered = table.concat(calls, " ")
return frame:preprocess(table.concat(calls, " "))
return frame:preprocess(rendered)
end
end


Строка 913: Строка 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


Строка 1010: Строка 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
Строка 1025: Строка 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
return frame:preprocess(table.concat(out, ""))
return frame:preprocess(table.concat(out, " "))
end
end
end
end


return p
return p
Источник — https://station14.ru/wiki/Модуль:GetField