utility.js: resolveURL() is now only used in markdown.js

opts.removeURL() is now an alias to the function, so configs that use
markdown_extend config can access it

Author: slusarz

README.md

@@ -208,6 +208,9 @@ Dovecot-specific markdown processing (i.e. [[xyz,...]]).
 
 Opening tag function. Returns opening tag.
 
+The opts argument contains a "resolveURL" key that allows access to the
+internal Dovecot Markdown `resolveURL()` function.
+
 Example: `open: (mode, parts, opts, env) => { return '' }`
 
 ##### body

lib/markdown.js

@@ -3,7 +3,7 @@ import fg from 'fast-glob'
 import deflistPlugin from 'markdown-it-deflist'
 import path from 'path'
 import { createMarkdownRenderer } from 'vitepress'
-import { dovecotSetting, frontmatterIter, loadData, resolveURL } from './utility.js'
+import { dovecotSetting, frontmatterIter, loadData } from './utility.js'
 
 let md_conf = null
 export async function dovecotMdExtend(md) {
@@ -174,8 +174,8 @@ function dovecot_markdown(md, opts) {
 			}
 
 			return '<code><a href="' +
-				resolveURL('core/summaries/' + page + '.html#' + env.inner,
-					opts.base) + '">'
+				resolveURL('core/summaries/' + page + '.html#' + env.inner) +
+				'">'
 
 		case 'link':
 			let url = '#'
@@ -206,8 +206,8 @@ function dovecot_markdown(md, opts) {
 			}
 
 			return '<code><a href="' +
-				resolveURL('core/man/' + env.inner + '.' + env.args,
-					opts.base) + '.html' + (hash ? '#' + hash : '') + '">'
+				resolveURL('core/man/' + env.inner + '.' + env.args) +
+				'.html' + (hash ? '#' + hash : '') + '">'
 
 		case 'plugin':
 			env.inner = parts[1]
@@ -222,8 +222,7 @@ function dovecot_markdown(md, opts) {
 			}
 
 			return '<a href="' +
-				resolveURL('core/plugins/' + plugin + '.html', opts.base) +
-					'">'
+				resolveURL('core/plugins/' + plugin + '.html') + '">'
 
 		case 'removed':
 			env.args = parts[1]
@@ -275,8 +274,7 @@ function dovecot_markdown(md, opts) {
 			}
 
 			return '<code><a href="' +
-				resolveURL('core/settings/variables.html' + hash,
-					opts.base) + '">'
+				resolveURL('core/settings/variables.html' + hash) + '">'
 
 		default:
 			initMarkdownExtend()
@@ -394,7 +392,7 @@ function dovecot_markdown(md, opts) {
 				}
 
 				links[k] = {
-					url: resolveURL(rewrites[f].substring(0, rewrites[f].lastIndexOf('.')) + '.html', opts.base)
+					url: resolveURL(rewrites[f].substring(0, rewrites[f].lastIndexOf('.')) + '.html')
 				}
 
 				if ((typeof v) == 'object') {
@@ -436,8 +434,15 @@ function dovecot_markdown(md, opts) {
 		}
 	}
 
+	function resolveURL(url) {
+		return (opts.base.endsWith('/') ? opts.base.slice(0, -1) : opts.base) +
+			'/' + url
+	}
+
 	md.inline.ruler.after('emphasis', 'dovecot_brackets', process_brackets)
 	md.renderer.rules.dovecot_open = dovecot_open
 	md.renderer.rules.dovecot_body = dovecot_body
 	md.renderer.rules.dovecot_close = dovecot_close
+
+	opts.resolveURL = resolveURL
 }

lib/utility.js

@@ -93,7 +93,3 @@ export function frontmatterIter(files, callback) {
 		}
 	}
 }
-
-export function resolveURL(url, base) {
-	return (base.endsWith('/') ? base.slice(0, -1) : base) + '/' + url
-}