Module:Transclude: Difference between revisions
From Neodyland Wiki
More actions
Only use `#ignoredParams` for parent frame arguments |
m 7 revisions imported |
||
| (4 intermediate revisions by 3 users not shown) | |||
| Line 6: | Line 6: | ||
-- @module transclude | -- @module transclude | ||
-- @author [[User:ExE Boss]] | -- @author [[User:ExE Boss]] | ||
-------------------------------------------------------------------------------- | -------------------------------------------------------------------------------- | ||
require(' | require('strict') | ||
local checkType = require('libraryUtil').checkType; | local checkType = require('libraryUtil').checkType; | ||
local p = {} | |||
local INVALID_TITLES = { | local INVALID_TITLES = { | ||
["."] = true, | ["."] = true, | ||
[".."] = true, | [".."] = true, | ||
}; | }; | ||
local function _ne(value) | |||
return value and value ~= '' | |||
end | |||
-------------------------------------------------------------------------------- | -------------------------------------------------------------------------------- | ||
| Line 24: | Line 28: | ||
-- @param {table} outArgs | -- @param {table} outArgs | ||
-------------------------------------------------------------------------------- | -------------------------------------------------------------------------------- | ||
local function mergeArgs(inArgs, outArgs, | local function mergeArgs(inArgs, outArgs, opts) | ||
checkType("mergeArgs", 1, inArgs, "table"); | checkType("mergeArgs", 1, inArgs, "table"); | ||
checkType("mergeArgs", 2, outArgs, "table"); | checkType("mergeArgs", 2, outArgs, "table"); | ||
checkType("mergeArgs", 3, opts, "table", true); | |||
opts = opts or {} | |||
local ignoredParams = opts.ignoredParams; | |||
local ignoredPrefix = opts.ignoredPrefix; | |||
for name, value in pairs(inArgs) do | for name, value in pairs(inArgs) do | ||
if not (ignoredParams and ignoredParams[name]) then | if (type(name) == "string") then | ||
if not ( | |||
(ignoredParams and ignoredParams[name] == true) | |||
or (ignoredPrefix and | |||
ignoredPrefix == name:sub(1, ignoredPrefix:len())) | |||
) then | |||
outArgs[name] = value; | |||
end | |||
else | |||
outArgs[name] = value; | outArgs[name] = value; | ||
end | end | ||
| Line 36: | Line 53: | ||
return outArgs; | return outArgs; | ||
end | end | ||
-- Exported for testing: | |||
p['#mergeArgs'] = mergeArgs; | |||
local mt = {}; | local mt = {}; | ||
| Line 55: | Line 75: | ||
return function (frame) | return function (frame) | ||
checkType('transclude["' .. name .. '"]', 1, frame, "table"); | checkType('transclude["' .. name .. '"]', 1, frame, "table"); | ||
local parentFrame = frame:getParent(); | |||
local ignoredParams; | local ignoredParams, ignoredPrefix; | ||
if (frame.args["#ignoredParams"]) then | if _ne(frame.args["#ignoredParams"]) then | ||
ignoredParams = {} | ignoredParams = {}; | ||
for m in mw.text.gsplit(frame.args["#ignoredParams"], '|', true) do | for m in mw.text.gsplit(frame.args["#ignoredParams"], '|', true) do | ||
ignoredParams[mw.text.trim(m)] = true | ignoredParams[mw.text.trim(m)] = true; | ||
end | end | ||
end | |||
if _ne(frame.args['#ignoredPrefix']) then | |||
ignoredPrefix = frame.args['#ignoredPrefix']; | |||
end | end | ||
local args = {}; | local args = {}; | ||
mergeArgs( | if (parentFrame) then | ||
mergeArgs(frame.args, args); | mergeArgs(parentFrame.args, args, { | ||
ignoredParams = ignoredParams, | |||
ignoredPrefix = ignoredPrefix, | |||
}); | |||
end | |||
mergeArgs(frame.args, args, { | |||
ignoredPrefix = "#", | |||
}); | |||
if (not title.exists) then | if (not title.exists) then | ||
| Line 79: | Line 111: | ||
end | end | ||
return setmetatable( | return setmetatable(p, mt); | ||