Module:Command: Difference between revisions

Auto escape sub-commands
mNo edit summary
 
(29 intermediate revisions by 9 users not shown)
Line 1: Line 1:
local p = {}
local p = {}
function p.cmd( f )
function p.cmd( f )
local args = f:getParent().args
local args = f
local syntax = mw.loadData( 'Module:Command/Syntax' )
if f == mw.getCurrentFrame() then
args = f:getParent().args
end
--if args.be then
--local syntax = mw.loadData( 'Module:Command/SyntaxBE' )
--else
local syntax = mw.loadData( 'Module:Command/Syntax')
--end
local fullCommand
local fullCommand
local commandName = args[1]:match( '^%s*/?([^%s]+)' ):lower()
local commandName = args[1]:match( '^%s*/?([^%s]+)' ):lower()
local params = {}
local command = {}
local command = {}
--getparams
for i, v in ipairs( args ) do
for i, v in ipairs( args ) do
if not fullCommand and v == '...' then
if not args[i+1] and v == '...' then
fullCommand = true
fullCommand = true
elseif i > 1 or v:match( '^%s*/?(.+)' ):lower() ~= commandName then
elseif i > 1 or v:match( '^%s*/?(.+)' ):lower() ~= commandName then
-- Don't encode if told not to or if there is a sub-command
table.insert( params, mw.text.trim( v ) )
if args.encode ~= '0' and not v:find( '<!%-%- Command %-%->' ) then
v = v:gsub( '<', '&lt;' )
end
table.insert( command, mw.text.trim( v ) )
end
end
end
end
if #command == 1 and ( not args[2] or args[2] == '...' ) and command[1]:find( '%s' ) then
 
local startPos, endPos = command[1]:find( '{.+}' )
local needFormat = false
if not startPos then
if ( fullCommand or args[2] or args[1]:match('?') ) and syntax['command'..commandName] then
startPos, endPos = command[1]:find( '<!%-%- Command %-%->.+<!%-%- /Command %-%->' )
needFormat = true
end
end
 
--escape space and split args
if #params == 1 and ( not args[2] or args[2] == '...' ) and params[1]:find( '%s' ) then
params[1] = params[1]:match( '^[^%s]+%s(.+)' )
if needFormat then
params[1] = params[1]:gsub( '\\\\', '&bsol;&bsol;' ):gsub( '\\"', '&bsol;&quot;' ):gsub( "\\'", '&bsol;&apos;' ):gsub( '(@[aesprcv])%s+(%[)', '%1%2' )
while(true) do
local startPos, endPos = params[1]:find( "'[^']-'" )
local startPosn, endPosn = params[1]:find('"[^"]-"')
if startPosn and startPos and startPosn < startPos then
startPos, endPos = startPosn, endPosn
end
if not startPos then
startPos, endPos = params[1]:find( '"[^"]+"' )
if not startPos then
startPos, endPos = params[1]:find( '%b[]' )
if not startPos then
startPos, endPos = params[1]:find( '%b{}' )
if not startPos then
startPos, endPos = params[1]:find( '&lt;!%-%- Command %-%->.+&lt;!%-%- /Command %-%->' )
end
end
end
end
if startPos then
params[1] = params[1]:sub( 1, startPos - 1 ) ..
params[1]:sub( startPos, endPos ):gsub('%[','〈lsqb〉'):gsub('%]','〈rsqb〉'):gsub('{','&#123;'):gsub('}','&#125;'):gsub("'",'〈apos〉'):gsub('"','〈quot〉'):gsub( '%s', '〈space〉' ) ..
params[1]:sub( endPos + 1 )
else
break
end
end
if startPos then
params = mw.text.split( params[1], '%s+' )
command[1] = command[1]:sub( 1, startPos ) ..
command[1]:sub( startPos + 1, endPos - 1 ):gsub( '%s', '&#32;' ) ..
command[1]:sub( endPos )
end
end
command = mw.text.split( command[1]:match( '^[^%s]+%s(.+)' ), '%s+' )
end
end
if ( fullCommand or command[1] ) and syntax[commandName] then
if needFormat then
local param = 0
local param = 0
function parseParams( defaultParams, sub )
function parseParams( defaultParams )
local section = {}
local section = {}
local hasValue
local hasValue
for i, v in ipairs( defaultParams ) do
local prefix
for i, v in pairs( defaultParams or {} ) do
if type( v ) == 'table' then
if type( v ) == 'table' then
local subSection, subHasValue = parseParams( v, true )
param = param + 1
if subHasValue then
for k,j in pairs(v) do
hasValue = true
v = j
prefix = k
break
end
if params[param] and params[param] ~= '' and params[param]~='?' then
hasValue = false
for k,j in pairs(v) do
if j == params[param] or j:match('<.+>') then
table.insert(section, params[param])
hasValue=true
if k=='redirect' then
param = param - 1
table.insert(section, parseParams(syntax[j:match('<(.+)>')]))
else
table.insert(section, parseParams(syntax[prefix..j]))
end
break
end
end
if not hasValue then
params = {}
break
end
else
params = {}
local option = {}
local swap
for _,j in pairs(v) do
if fullCommand then
swap = {j,parseParams(syntax[prefix..j])}
table.insert(option, table.concat(swap,' '))
else
table.insert(option, j)
end
end
table.insert(section, '('..table.concat(option, '|')..')')
end
elseif i == 'redirect' then
if params[param+1] then
table.insert(section, parseParams(syntax[v]))
elseif v:match("^command$") then
table.insert(section, "-> ''"..v.."''")
else
table.insert(section, "-> ''"..v:match('command(.+)').."''")
end
end
table.insert( section, subSection )
else
else
param = param + 1
param = param + 1
if command[param] then
if params[param] and params[param] ~= '' and params[param] ~= '?' then
hasValue = true
table.insert(section,params[param])
if command[param] ~= '' and command[param] ~= '?' then
else
table.insert( section, command[param] )
table.insert(section, v)
end
end
if not section[i] then
table.insert( section, v )
end
end
end
if not fullCommand and not params[param+1] then
break
end
end
end
end
section = table.concat( section, ' ' )
section = table.concat( section, ' ' )
if section == '' then
section = nil
end
if sub then
return section
if not hasValue then
end
if fullCommand then
section = '(' .. section .. ')'
command = { parseParams( syntax['command'..commandName] ) }
else
section = nil
-- Add any extra parameters not defined in the syntax
end
if #params > param then
for i, v in ipairs( params ) do
if i > param then
table.insert( command, v )
end
end
return section, hasValue
else
return section
end
end
end
end
else
command = { parseParams( syntax[syntax[commandName]] or syntax[commandName] ) }
command = params
end
end
Line 84: Line 164:
end
end
else
else
commandName = '[[Commands#' .. commandName .. '|' .. commandName .. ']]'
commandName = '[[Commands/' .. commandName .. '|' .. commandName .. ']]'
end
end
table.insert( command, 1, commandName )
table.insert( command, 1, commandName )
Line 93: Line 173:
end
end
local attr
local attr = ''
if args.long == '1' then
if args.long then
attr = 'style="display:block;padding:0.8em 1em;margin-bottom:0.4em;word-wrap:break-word"'
attr = 'style="display: flex; padding: 0.8em 1em; margin-bottom: 0.4em; word-warp: break-word;"'
else
attr = 'class="nowrap"'
end
end
return '<!-- Command --><code ' .. attr .. '>' .. slash .. table.concat( command, ' ' ):gsub( '&#32;', ' ' ) .. '</code><!-- /Command -->'
local result = table.concat( command, ' ' ):gsub( '〈space〉', ' ' ):gsub('〈lsqb〉', '%['):gsub('〈rsqb〉', '%]'):gsub('〈apos〉',"'"):gsub('〈quot〉','"')
-- Don't encode if told not to or if there is a sub-command
if args.escape ~= '0' then
result = result:gsub( '<', '&lt;' ):gsub( '&lt;(!%-%- Command %-%->)&lt;','<%1<'):gsub( '&lt;/code>&lt;(!%-%- /Command %-%->)','</code><%1')
end
result = '<!-- Command --><code ' .. attr .. '><span>' .. slash .. result .. '</span></code><!-- /Command -->'
    if needFormat then
        result = result .. '[[Category:Pages using deprecated command module]]'
    end
    return result
end
end
return p
return p