Module:Format link/sandbox - Revision history

Pppery at 13:36, 4 October 2022

2022-10-04T13:36:21Z

← Previous revision		Revision as of 13:36, 4 October 2022
Line 170:		Line 170:
	if title and (not title.isExternal) then		if title and (not title.isExternal) then
	local success, exists = pcall(function() return title.exists end)		local success, exists = pcall(function() return title.exists end)
	if success and exists then		if success and not exists then
	category = mw.ustring.format('[[Category:%s]]', catMissing)		category = mw.ustring.format('[[Category:%s]]', catMissing)
	end		end

Pppery at 13:31, 4 October 2022

2022-10-04T13:31:58Z

← Previous revision		Revision as of 13:31, 4 October 2022
Line 98:		Line 98:
	local function missingArgError(target)		local function missingArgError(target)
	mError = require('Module:Error')		mError = require('Module:Error')
	return mError.~~_error~~{message =		return mError.error{message =
	'Error: no link or target specified! ([[' .. target .. '#Errors\|help]])'		'Error: no link or target specified! ([[' .. target .. '#Errors\|help]])'
	}		}
Line 168:		Line 168:
	local title = nil		local title = nil
	if parsed.page then title = mw.title.new(parsed.page) end		if parsed.page then title = mw.title.new(parsed.page) end
	if title and (not title.isExternal~~) and (not title.exists~~) then		if title and (not title.isExternal) then
			local success, exists = pcall(function() return title.exists end)
⚫	category = mw.ustring.format('[[Category:%s]]', catMissing)
			if success and exists then
		⚫	category = mw.ustring.format('[[Category:%s]]', catMissing)
			end
	end		end
	end		end

Nihiltres: Merged checkNamedNillable into _formatLink because it's ultimately only used there

2022-01-04T18:05:49Z

Merged checkNamedNillable into _formatLink because it's ultimately only used there

← Previous revision		Revision as of 18:05, 4 January 2022
Line 25:		Line 25:
	mArguments = require('Module:Arguments')		mArguments = require('Module:Arguments')
	return mArguments.getArgs(frame, {parentOnly = true})		return mArguments.getArgs(frame, {parentOnly = true})
	end

	local function checkTypeNamedNillable(funcName, options, key, expectedType)
	-- Slightly DRYer type-checking convenience function
⚫	checkTypeForNamedArg(
⚫	~~funcName~~, key, options[key], expectedType or 'string', true
	)
	end		end

Line 92:		Line 85:
	-- output of parseLink) and an options table (matching the input options for		-- output of parseLink) and an options table (matching the input options for
	-- _formatLink).		-- _formatLink).
	local function check(arg) --for brevity
	checkTypeNamedNillable('formatDisplay', options, arg, 'boolean')
	end
	check('italicizePage')
	check('italicizeSection')
	local page = maybeItalicize(parsed.page, options.italicizePage)		local page = maybeItalicize(parsed.page, options.italicizePage)
	local section = maybeItalicize(parsed.section, options.italicizeSection)		local section = maybeItalicize(parsed.section, options.italicizeSection)
Line 143:		Line 131:
	checkType('_formatLink', 1, options, 'table')		checkType('_formatLink', 1, options, 'table')
	local function check(key, expectedType) --for brevity		local function check(key, expectedType) --for brevity
		⚫	checkTypeForNamedArg(
	checkTypeNamedNillable('_formatLink', options, key, expectedType)
		⚫	'_formatLink', key, options[key], expectedType or 'string', true
			)
	end		end
	check('link')		check('link')

Nihiltres: Merged italicize function into maybeItalicize (only used there) and tweaked missingArgError, mostly to customize help targets

2022-01-04T17:24:43Z

Merged italicize function into maybeItalicize (only used there) and tweaked missingArgError, mostly to customize help targets

← Previous revision		Revision as of 17:24, 4 January 2022
Line 37:		Line 37:
	-- Removes the initial colon from a string, if present.		-- Removes the initial colon from a string, if present.
	return s:match('^:?(.*)')		return s:match('^:?(.*)')
	end

	local function italicize(s)
	-- Italicize a string.
	return '<i>' .. s .. '</i>'
	end		end

	local function maybeItalicize(s, shouldItalicize)		local function maybeItalicize(s, shouldItalicize)
	-- ~~italicize~~ s if s is a string and the shouldItalicize parameter is true.		-- Italicize s if s is a string and the shouldItalicize parameter is true.
	if s and shouldItalicize then		if s and shouldItalicize then
	return ~~italicize(~~s)		return '<i>' .. s .. '</i>'
	else		else
	return s		return s
Line 113:		Line 108:
	end		end

	local function missingArgError()		local function missingArgError(target)
	mError = require('Module:Error')		mError = require('Module:Error')
	return mError.~~error(~~{message='Error: no link or target specified! '..		return mError._error{message =
			'Error: no link or target specified! ([[' .. target .. '#Errors\|help]])'
			}
	'([[Template:Format link#Errors\|help]])'})
	end		end

Line 130:		Line 126:
	local target = args[3] or args.target		local target = args[3] or args.target
	if not (link or target) then		if not (link or target) then
	return missingArgError()		return missingArgError('Template:Format link')
	end		end

Line 160:		Line 156:
	if options.target == '' then options.target = nil end		if options.target == '' then options.target = nil end
	if not (options.link or options.target) then		if not (options.link or options.target) then
	return missingArgError()		return missingArgError('Module:Format link')
	end		end

Line 191:		Line 187:
	return mw.ustring.format('[[:%s]]%s', parsed.link, category)		return mw.ustring.format('[[:%s]]%s', parsed.link, category)
	else		else
	return mw.ustring.format('[[:%s\|%s]]%s', parsed.link, display, category)		return mw.ustring.format('[[:%s\|%s]]%s', parsed.link, display, category)
	end		end
	end		end

Psiĥedelisto: use Module:Error

2022-01-04T10:10:21Z

use Module:Error

← Previous revision		Revision as of 10:10, 4 January 2022
Line 11:		Line 11:
	local checkTypeForNamedArg = libraryUtil.checkTypeForNamedArg		local checkTypeForNamedArg = libraryUtil.checkTypeForNamedArg
	local mArguments -- lazily initialise [[Module:Arguments]]		local mArguments -- lazily initialise [[Module:Arguments]]
			local mError -- lazily initialise [[Module:Error]]
	local yesno -- lazily initialise [[Module:Yesno]]		local yesno -- lazily initialise [[Module:Yesno]]

Line 110:		Line 111:
	return mw.ustring.format('%s § %s', page, section)		return mw.ustring.format('%s § %s', page, section)
	end		end
			end

			local function missingArgError()
			mError = require('Module:Error')
			return mError.error({message='Error: no link or target specified! '..
		⚫	'([[Template:Format link#Errors\|help]])'})
	end		end

Line 123:		Line 130:
	local target = args[3] or args.target		local target = args[3] or args.target
	if not (link or target) then		if not (link or target) then
	return		return missingArgError()
	'<strong class="error">Error: no link or target specified '..
⚫	'([[Template:Format link#Errors\|help]])~~.</strong>~~'
	end		end

	return p._formatLink{		return p._formatLink{
	link = link,		link = link,
Line 154:		Line 160:
	if options.target == '' then options.target = nil end		if options.target == '' then options.target = nil end
	if not (options.link or options.target) then		if not (options.link or options.target) then
	return		return missingArgError()
	'<strong class="error">Error: no link or target specified '..
	'([[Module:Format link#Errors\|help]]).</strong>'
	end		end

Nihiltres: Slight cleanup of some redundancy

2022-01-01T22:44:02Z

Slight cleanup of some redundancy

← Previous revision		Revision as of 22:44, 1 January 2022
Line 96:		Line 96:
	-- output of parseLink) and an options table (matching the input options for		-- output of parseLink) and an options table (matching the input options for
	-- _formatLink).		-- _formatLink).
			local function check(arg) --for brevity
	checkTypeForNamedArg(
	'formatDisplay', ~~'italicizePage'~~, ~~options.italicizePage~~, 'boolean'~~, true~~		checkTypeNamedNillable('formatDisplay', options, arg, 'boolean')
	)		end
	~~checkTypeNamedNillable~~(~~'formatDisplay', options,~~ 'italicizePage~~', 'boolean~~')		check('italicizePage')
	~~checkTypeNamedNillable~~(~~'formatDisplay', options,~~ 'italicizeSection~~', 'boolean~~')		check('italicizeSection')
	local page = maybeItalicize(parsed.page, options.italicizePage)		local page = maybeItalicize(parsed.page, options.italicizePage)
	local section = maybeItalicize(parsed.section, options.italicizeSection)		local section = maybeItalicize(parsed.section, options.italicizeSection)

Nihiltres: Overwrote sandbox with a prototype that adds the "target" parameter more cleanly

2022-01-01T22:33:56Z

Overwrote sandbox with a prototype that adds the "target" parameter more cleanly

Show changes

Psiĥedelisto: fix failed tests

2021-12-29T15:45:50Z

fix failed tests

← Previous revision		Revision as of 15:45, 29 December 2021
Line 53:		Line 53:
	-- - display: the display text, if manually entered after a pipe (may be nil)		-- - display: the display text, if manually entered after a pipe (may be nil)
	link = removeInitialColon(link)		link = removeInitialColon(link)
⚫	if target then
⚫	target = removeInitialColon(target)
⚫	else
⚫	target = link
⚫	end

	-- Find whether a faux display value has been added with the {{!}} magic		-- Find whether a faux display value has been added with the {{!}} magic
Line 80:		Line 75:
	if postHash and postHash ~= '' then		if postHash and postHash ~= '' then
	section = postHash		section = postHash
		⚫	end

		⚫	if target then
		⚫	target = removeInitialColon(target)
		⚫	else
		⚫	target = link
	end		end

Line 167:		Line 168:

	-- Deal with the case where we don't have to pipe the link		-- Deal with the case where we don't have to pipe the link
	if not display and not parsed.section and not options.italicizePage ~~then~~		if not display and not parsed.section and not options.italicizePage
	~~return~~ ~~mw.ustring.format('[[:%s\|%s]]%s',~~ parsed.target, parsed.link, ~~category)~~		and not parsed.target ~= parsed.link then
			return mw.ustring.format('[[:%s]]%s', parsed.link, category)
	end		end

Psiĥedelisto: fix {{{target}}}

2021-12-29T15:09:31Z

fix {{{target}}}

← Previous revision		Revision as of 15:09, 29 December 2021
Line 45:		Line 45:
	end		end

	local function parseLink(link)		local function parseLink(link, target)
	-- Parse a link and return a table with the link's components.		-- Parse a link and return a table with the link's components.
	-- These components are:		-- These components are:
Line 53:		Line 53:
	-- - display: the display text, if manually entered after a pipe (may be nil)		-- - display: the display text, if manually entered after a pipe (may be nil)
	link = removeInitialColon(link)		link = removeInitialColon(link)
			if target then
		⚫	target = removeInitialColon(target)
			else
			target = link
			end

	-- Find whether a faux display value has been added with the {{!}} magic		-- Find whether a faux display value has been added with the {{!}} magic
Line 79:		Line 84:
	return {		return {
	link = link,		link = link,
			target = target,
	page = page,		page = page,
	section = section,		section = section,
Line 93:		Line 99:
	yesno = require('Module:Yesno')		yesno = require('Module:Yesno')
	local args = getArgs(frame)		local args = getArgs(frame)
	local link = args[1]		local link = args[1] or args["link"]

	local target = args["target"] or link
	if not link then		if not link then
	return		return
Line 101:		Line 107:
	'</strong>'		'</strong>'
	end		end

	return p._formatLink({		return p._formatLink({
	link = link,		link = link,
	display = args[2],		display = args[2] or args["display"],
			target = args[3] or args["target"],
	italicizePage = yesno(args.italicizepage),		italicizePage = yesno(args.italicizepage),
	italicizeSection = yesno(args.italicizesection),		italicizeSection = yesno(args.italicizesection),
	categorizeMissing = args.categorizemissing,		categorizeMissing = args.categorizemissing,
⚫	target = target
	})		})
	end		end
Line 115:		Line 122:
	checkType('_formatLink', 1, options, 'table')		checkType('_formatLink', 1, options, 'table')
	checkTypeForNamedArg('_formatLink', 'link', options.link, 'string', false)		checkTypeForNamedArg('_formatLink', 'link', options.link, 'string', false)
	checkTypeForNamedArg('_formatLink', '~~link~~', options.target, 'string', true)		checkTypeForNamedArg('_formatLink', 'target', options.target, 'string', true)
	checkTypeForNamedArg(		checkTypeForNamedArg(
	'_formatLink',		'_formatLink',
Line 145:		Line 152:
	)		)

	local parsed = parseLink(options.link)		local parsed = parseLink(options.link, options.target)
	local display = options.display or parsed.display		local display = options.display or parsed.display
	local catMissing = options.categorizeMissing		local catMissing = options.categorizeMissing
Line 161:		Line 168:
	-- Deal with the case where we don't have to pipe the link		-- Deal with the case where we don't have to pipe the link
	if not display and not parsed.section and not options.italicizePage then		if not display and not parsed.section and not options.italicizePage then
	return mw.ustring.format('[[:%s]]%s', parsed.link, category)		return mw.ustring.format('[[:%s\|%s]]%s', parsed.target, parsed.link, category)
	end		end

Line 177:		Line 184:
	end		end

	return mw.ustring.format('[[:%s\|%s]]%s', ~~options~~.target ~~or parsed.link~~, display, category)		return mw.ustring.format('[[:%s\|%s]]%s', parsed.target, display, category)
	end		end

Line 191:		Line 198:
	ret[i] = p._formatLink{		ret[i] = p._formatLink{
	link = page,		link = page,
			target = (options.targets and options.targets[i]) or page,
	categorizeMissing = options.categorizeMissing,		categorizeMissing = options.categorizeMissing,
	italicizePage = options.italicizePage,		italicizePage = options.italicizePage,
	italicizeSection = options.italicizeSection		italicizeSection = options.italicizeSection,
	}		}
	end		end

Psiĥedelisto: import from master; +{{{target|}}}

2021-12-29T14:11:15Z

import from master; +{{{target|}}}

← Previous revision		Revision as of 14:11, 29 December 2021
Line 94:		Line 94:
	local args = getArgs(frame)		local args = getArgs(frame)
	local link = args[1]		local link = args[1]
			local target = args["target"] or link
	if not link then		if not link then
	return		return
Line 100:		Line 101:
	'</strong>'		'</strong>'
	end		end
	return p._formatLink{		return p._formatLink({
	link = link,		link = link,
	display = args[2],		display = args[2],
	italicizePage = yesno(args.italicizepage),		italicizePage = yesno(args.italicizepage),
	italicizeSection = yesno(args.italicizesection),		italicizeSection = yesno(args.italicizesection),
	categorizeMissing = args.categorizemissing		categorizeMissing = args.categorizemissing,
			target = target
	}		})
	end		end

Line 113:		Line 115:
	checkType('_formatLink', 1, options, 'table')		checkType('_formatLink', 1, options, 'table')
	checkTypeForNamedArg('_formatLink', 'link', options.link, 'string', false)		checkTypeForNamedArg('_formatLink', 'link', options.link, 'string', false)
			checkTypeForNamedArg('_formatLink', 'link', options.target, 'string', true)
	checkTypeForNamedArg(		checkTypeForNamedArg(
	'_formatLink',		'_formatLink',
Line 149:		Line 152:
	--Test if page exists if a diagnostic category is specified		--Test if page exists if a diagnostic category is specified
	if catMissing and (mw.ustring.len(catMissing) > 0) then		if catMissing and (mw.ustring.len(catMissing) > 0) then
			local title = nil
	if ~~not~~ mw.title.new(parsed.page)~~.exists~~ ~~then~~		if parsed.page then title = mw.title.new(parsed.page) end
			if title and (not title.isExternal) and (not title.exists) then
	category = mw.ustring.format('[[Category:%s]]', catMissing)		category = mw.ustring.format('[[Category:%s]]', catMissing)
	end		end
Line 172:		Line 177:
	end		end

	return mw.ustring.format('[[:%s\|%s]]%s', parsed.link, display, category)		return mw.ustring.format('[[:%s\|%s]]%s', options.target or parsed.link, display, category)
	end		end