Модуль:Сущность/поля - История изменений

Pok в 15:38, 17 июня 2026

2026-06-17T15:38:54Z

@@ Строка 62: / Строка 62: @@
      end
      return nil
 end
@@ Строка 88: / Строка 73: @@
      if field ~= '' and label ~= '' then
-         local result = nil
+         local value = get_raw_arg(sources, field .. '_' .. label)
-        each_raw_compound_arg(sources, function(source, key, base, rem)
+        if value ~= nil then
-            if base == field and trim(strip_trailing_digits(rem)) == label then
+             return tostring(value)
-                local value = tostring(source[key])
+         end
      end

Pok в 15:35, 17 июня 2026

2026-06-17T15:35:22Z

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

	function p.main(frame)		function p.main(frame)
	local field = frame.args[1]		local parent = frame:getParent()
			local field = get_raw_arg({ frame.args, parent and parent.args }, 1)

	if field == "json" then		if field == "json" then

Pok в 15:32, 17 июня 2026

2026-06-17T15:32:45Z

← Предыдущая версия		Версия от 18:32, 17 июня 2026
Строка 55:		Строка 55:
	end		end

	local function ~~render_from_args~~(args)		local function get_raw_arg(sources, key)
	local field = ~~args[~~1]		for _, source in ipairs(sources) do
	local label = ~~args[~~2]		if source and source[key] ~= nil then
			return source[key]
			end
			end
			return nil
			end

			local function each_raw_compound_arg(sources, fn)
			for _, source in ipairs(sources) do
			if source then
			for k in pairs(source) do
			if type(k) == 'string' and k:find('_', 1, true) then
			local base, rem = split_first_underscore(k)
			if base and rem then
			fn(source, k, base, rem)
			end
			end
			end
			end
			end
			end

			local function render_from_frame(frame)
			local parent = frame:getParent()
			local sources = { frame.args, parent and parent.args }
			local field = get_raw_arg(sources, 1)
			local label = get_raw_arg(sources, 2)
	field = field and trim(field) or ''		field = field and trim(field) or ''
	label = label and trim(label) or ''		label = label and trim(label) or ''

	~~-- map base -> label -> value~~
	~~local map = {}~~
	~~each_compound_arg(args, function(base, rem, v)~~
	~~local lab = trim(strip_trailing_digits(rem))~~
	~~map[base] = map[base] or {}~~
	~~local cur = map[base][lab]~~
	~~if cur then~~
	~~map[base][lab] = cur .. '\n' .. tostring(v)~~
	~~else~~
	~~map[base][lab] = tostring(v)~~
	~~end~~
	~~end)~~

	if field ~= '' and label ~= '' then		if field ~= '' and label ~= '' then
	local ~~base~~ = ~~map[field]~~		local result = nil
	if base then ~~return base~~[~~label~~] or '' end		each_raw_compound_arg(sources, function(source, key, base, rem)
			if base == field and trim(strip_trailing_digits(rem)) == label then
			local value = tostring(source[key])
			if result then
			result = result .. '\n' .. value
			else
			result = value
			end
			end
			end)
			if result then return result end
	end		end

	if field ~= '' ~~and args[~~field] ~= nil then		if field ~= '' then
	return trim(tostring(~~args[field]~~))		local value = get_raw_arg(sources, field)
			if value ~= nil then
			return trim(tostring(value))
			end
	end		end

Строка 87:		Строка 113:

	function p.main(frame)		function p.main(frame)
	local ~~args~~ = ~~getArgs(~~frame~~, { removeBlanks = false })~~		local field = frame.args[1]
	~~local field =~~ args[1]

	if field == "json" then		if field == "json" then
			local args = getArgs(frame, { removeBlanks = false })
	local json = collect_labels_from_args(args)		local json = collect_labels_from_args(args)
	return mw.text.jsonEncode(json)		return mw.text.jsonEncode(json)
	end		end

	return ~~render_from_args~~(~~args~~)		return render_from_frame(frame)
	end		end

	return p		return p

Pok в 17:17, 8 марта 2026

2026-03-08T17:17:43Z

← Предыдущая версия		Версия от 20:17, 8 марта 2026
Строка 12:		Строка 12:

	local function split_first_underscore(k)		local function split_first_underscore(k)
	local ~~a, b~~ = k:~~match~~('~~^([^_]+)~~_~~(.+)$~~')		local pos = k:find('_', 1, true)
	return a, b		if not pos or pos == 1 or pos == #k then
			return nil, nil
			end
			return k:sub(1, pos - 1), k:sub(pos + 1)
	end		end

	local function ~~collect_labels_from_args~~(args)		local function each_compound_arg(args, fn)
	~~local meta = {}~~
	~~local seen = {}~~

	for k, v in pairs(args) do		for k, v in pairs(args) do
	if type(k) == 'string' and k:find('_', 1, true) then		if type(k) == 'string' and k:find('_', 1, true) then
	local base, rem = split_first_underscore(k)		local base, rem = split_first_underscore(k)
	if base and rem then		if base and rem then
	~~local label = trim(strip_trailing_digits~~(rem))		fn(base, rem, v)
	~~if label ~= '' then~~
	~~meta[base] = meta[base] or {}~~
	~~if not seen[base] then seen[base] = {} end~~
	~~if not seen[base][label] then~~
	~~table.insert(meta[base]~~, ~~label~~)
	~~seen[base][label] = true~~
	~~end~~
	~~end~~
	end		end
	end		end
	end		end
			end

			local function collect_labels_from_args(args)
			local meta = {}
			local seen = {}

			each_compound_arg(args, function(base, rem)
			local label = trim(strip_trailing_digits(rem))
			if label ~= '' then
			meta[base] = meta[base] or {}
			if not seen[base] then seen[base] = {} end
			if not seen[base][label] then
			table.insert(meta[base], label)
			seen[base][label] = true
			end
			end
			end)

	for k, v in pairs(args) do		for k, v in pairs(args) do
Строка 54:		Строка 63:
	-- map base -> label -> value		-- map base -> label -> value
	local map = {}		local map = {}
	~~for k, v in pairs~~(args~~) do~~		each_compound_arg(args, function(base, rem, v)
	~~if type~~(~~k) == 'string' and k:find('_', 1, true) then~~		local lab = trim(strip_trailing_digits(rem))
	~~local~~ base, rem ~~= split_first_underscore(k~~)		map[base] = map[base] or {}
	~~if base and rem then~~		local cur = map[base][lab]
	local lab = strip_trailing_digits(rem)		if cur then
	~~lab = trim(lab~~)		map[base][lab] = cur .. '\n' .. tostring(v)
	map[base] = map[base] or {}		else
	local cur = map[base][lab]		map[base][lab] = tostring(v)
	if cur then
	map[base][lab] = cur .. '\n' .. tostring(v)
	else
	map[base][lab] = tostring(v)
	~~end~~
	~~end~~
	end		end
	end		end)

	if field ~= '' and label ~= '' then		if field ~= '' and label ~= '' then

Pok в 14:20, 8 марта 2026

2026-03-08T14:20:01Z

← Предыдущая версия		Версия от 17:20, 8 марта 2026
Строка 31:		Строка 31:
	table.insert(meta[base], label)		table.insert(meta[base], label)
	seen[base][label] = true		seen[base][label] = true
	~~end~~
	~~if base == 'cardLabel' or base == 'cardContent' then~~
	~~meta.card = meta.card or {}~~
	~~seen.card = seen.card or {}~~
	~~if not seen.card[label] then~~
	~~table.insert(meta.card, label)~~
	~~seen.card[label] = true~~
	~~end~~
	end		end
	end		end

Pok в 14:17, 8 марта 2026

2026-03-08T14:17:00Z

← Предыдущая версия		Версия от 17:17, 8 марта 2026
Строка 59:		Строка 59:
	field = field and trim(field) or ''		field = field and trim(field) or ''
	label = label and trim(label) or ''		label = label and trim(label) or ''

	~~if field ~= '' and label == '' and args[field] ~= nil then~~
	~~return trim(tostring(args[field]))~~
	~~end~~

	-- map base -> label -> value		-- map base -> label -> value
Строка 86:		Строка 82:
	local base = map[field]		local base = map[field]
	if base then return base[label] or '' end		if base then return base[label] or '' end
	~~return ''~~
	end		end

	if ~~args[1]~~ and args[2] then		if field ~= '' and args[field] ~= nil then
	~~local f =~~ trim(args[1])~~; local l = trim(args[2]~~)		return trim(tostring(args[field]))
	~~local base = map[f]~~
	~~if base then return base[l] or '' end~~
	end		end

Pok в 14:15, 8 марта 2026

2026-03-08T14:15:13Z

← Предыдущая версия		Версия от 17:15, 8 марта 2026
Строка 59:		Строка 59:
	field = field and trim(field) or ''		field = field and trim(field) or ''
	label = label and trim(label) or ''		label = label and trim(label) or ''

			if field ~= '' and label == '' and args[field] ~= nil then
			return trim(tostring(args[field]))
			end

	-- map base -> label -> value		-- map base -> label -> value
Строка 76:		Строка 80:
	end		end
	end		end
	~~else~~
	~~map[k] = tostring(v)~~
	end		end
	end		end

Pok в 14:13, 8 марта 2026

2026-03-08T14:13:51Z

← Предыдущая версия		Версия от 17:13, 8 марта 2026
Строка 59:		Строка 59:
	field = field and trim(field) or ''		field = field and trim(field) or ''
	label = label and trim(label) or ''		label = label and trim(label) or ''

	~~if field == 'cardTag' and args.cardTag then~~
	~~return trim(tostring(args.cardTag))~~
	~~end~~

	-- map base -> label -> value		-- map base -> label -> value
Строка 80:		Строка 76:
	end		end
	end		end
			else
			map[k] = tostring(v)
	end		end
	end		end

Pok в 14:11, 8 марта 2026

2026-03-08T14:11:50Z

← Предыдущая версия		Версия от 17:11, 8 марта 2026
Строка 59:		Строка 59:
	field = field and trim(field) or ''		field = field and trim(field) or ''
	label = label and trim(label) or ''		label = label and trim(label) or ''

			if field == 'cardTag' and args.cardTag then
			return trim(tostring(args.cardTag))
			end

	-- map base -> label -> value		-- map base -> label -> value

Pok в 13:01, 1 марта 2026

2026-03-01T13:01:46Z

← Предыдущая версия		Версия от 16:01, 1 марта 2026
Строка 31:		Строка 31:
	table.insert(meta[base], label)		table.insert(meta[base], label)
	seen[base][label] = true		seen[base][label] = true
			end
			if base == 'cardLabel' or base == 'cardContent' then
			meta.card = meta.card or {}
			seen.card = seen.card or {}
			if not seen.card[label] then
			table.insert(meta.card, label)
			seen.card[label] = true
			end
	end		end
	end		end