@antora/content-aggregator 3.1.14 → 3.2.0-alpha.10

package/lib/aggregate-content.js

@@ -1,32 +1,32 @@
 'use strict'
 
 const computeOrigin = require('./compute-origin')
-const { createHash } = require('crypto')
+const { createHash } = require('node:crypto')
 const createGitHttpPlugin = require('./git-plugin-http')
 const decodeUint8Array = require('./decode-uint8-array')
 const deepClone = require('./deep-clone')
-const EventEmitter = require('events')
+const EventEmitter = require('node:events')
 const expandPath = require('@antora/expand-path-helper')
 const File = require('./file')
 const filterRefs = require('./filter-refs')
-const fs = require('fs')
+const fs = require('node:fs')
 const { promises: fsp } = fs
 const getCacheDir = require('cache-directory')
 const GitCredentialManagerStore = require('./git-credential-manager-store')
 const git = require('./git')
 const { NotFoundError, ObjectTypeError, UnknownTransportError, UrlParseError } = git.Errors
 const { globStream } = require('fast-glob')
-const { inspect } = require('util')
+const { inspect } = require('node:util')
 const invariably = require('./invariably')
 const logger = require('./logger')
 const { makeMatcherRx, versionMatcherOpts: VERSION_MATCHER_OPTS } = require('./matcher')
 const MultiProgress = require('multi-progress') // calls require('progress') as a peer dependencies
-const ospath = require('path')
+const ospath = require('node:path')
 const { posix: path } = ospath
 const posixify = require('./posixify')
 const removeGitSuffix = require('./remove-git-suffix')
 const { fs: resolvePathGlobsFs, git: resolvePathGlobsGit } = require('./resolve-path-globs')
-const { pipeline, Writable } = require('stream')
+const { pipeline, Writable } = require('node:stream')
 const forEach = (write) => new Writable({ objectMode: true, write })
 const userRequire = require('@antora/user-require-helper')
 const yaml = require('js-yaml')
@@ -102,7 +102,8 @@ function aggregateContent (playbook) {
     }, new Map())
     const progress = quiet ? undefined : createProgress(sourcesByUrl.keys(), process.stdout)
     const refPatternCache = Object.assign(new Map(), { braces: new Map() })
-    const loadOpts = { cacheDir, fetch, gitPlugins, progress, startDir, refPatternCache }
+    const fetchConfig = { always: fetch, depth: Math.max(0, gitConfig.fetchDepth ?? 1) }
+    const loadOpts = { cacheDir, fetch: fetchConfig, gitPlugins, progress, startDir, refPatternCache }
     return collectFiles(sourcesByUrl, loadOpts, concurrency).then(buildAggregate, (err) => {
       progress?.terminate()
       throw err
@@ -110,11 +111,11 @@ function aggregateContent (playbook) {
   })
 }
 
-async function collectFiles (sourcesByUrl, loadOpts, concurrency, fetchedUrls) {
+async function collectFiles (sourcesByUrl, loadOpts, concurrency, fetchedUrls = []) {
   const loadTasks = [...sourcesByUrl.entries()].map(([url, sources]) => {
     const loadOptsForUrl = Object.assign({}, loadOpts)
-    if (loadOpts.fetch && fetchedUrls && fetchedUrls.length && fetchedUrls.includes(url)) loadOptsForUrl.fetch = false
-    if (tagsSpecified(sources)) loadOptsForUrl.fetchTags = true
+    if (loadOpts.fetch.always && fetchedUrls.length && ~fetchedUrls.indexOf(url)) loadOptsForUrl.fetch.always = false
+    if (tagsSpecified(sources)) loadOptsForUrl.fetch.tags = true
     return loadRepository.bind(null, url, loadOptsForUrl, { url, sources })
   })
   return gracefulPromiseAllWithLimit(loadTasks, concurrency.fetch).then(([results, rejections]) => {
@@ -131,7 +132,7 @@ async function collectFiles (sourcesByUrl, loadOpts, concurrency, fetchedUrls) {
     }
     return Promise.all(
       results.map(({ repo, authStatus, sources }) =>
-        selectStartPathsForRepository(repo, authStatus, sources).then((startPaths) =>
+        selectStartPathsForRepository(repo, sources).then((startPaths) =>
           collectFilesFromStartPaths.bind(null, startPaths, repo, authStatus)
         )
       )
@@ -163,7 +164,7 @@ async function loadRepository (url, opts, result = {}) {
   if (~url.indexOf(':') && GIT_URI_DETECTOR_RX.test(url)) {
     let credentials, displayUrl
     ;({ displayUrl, url, credentials } = extractCredentials(url))
-    const { cacheDir, fetch, fetchTags, gitPlugins, progress } = opts
+    const { cacheDir, fetch, gitPlugins, progress } = opts
     dir = ospath.join(cacheDir, generateCloneFolderName(displayUrl))
     // NOTE the presence of the url property on the repo object implies the repository is remote
     repo = { cache, dir, fs, gitdir: dir, noCheckout: true, url }
@@ -171,9 +172,9 @@ async function loadRepository (url, opts, result = {}) {
     const validStateFile = ospath.join(dir, VALID_STATE_FILENAME)
     try {
       await fsp.access(validStateFile)
-      if (fetch) {
+      if (fetch.always) {
         await fsp.unlink(validStateFile)
-        const fetchOpts = buildFetchOptions(repo, progress, displayUrl, credentials, gitPlugins, fetchTags, 'fetch')
+        const fetchOpts = buildFetchOptions(repo, progress, displayUrl, credentials, gitPlugins, fetch, 'fetch')
         await git
           .fetch(fetchOpts)
           .then(() => {
@@ -193,7 +194,7 @@ async function loadRepository (url, opts, result = {}) {
     } catch (gitErr) {
       await fsp['rm' in fsp ? 'rm' : 'rmdir'](dir, { recursive: true, force: true })
       if (gitErr.rethrow) throw transformGitCloneError(gitErr, displayUrl)
-      const fetchOpts = buildFetchOptions(repo, progress, displayUrl, credentials, gitPlugins, fetchTags, 'clone')
+      const fetchOpts = buildFetchOptions(repo, progress, displayUrl, credentials, gitPlugins, fetch, 'clone')
       await git
         .clone(fetchOpts)
         .then(() => git.resolveRef(Object.assign({ ref: 'HEAD', depth: 1 }, repo)))
@@ -210,8 +211,15 @@ async function loadRepository (url, opts, result = {}) {
         .then(() => fetchOpts.onProgress?.finish())
     }
   } else if (await isDirectory((dir = expandPath(url, { dot: opts.startDir })))) {
-    const gitdir = ospath.join(dir, '.git')
-    repo = (await isDirectory(gitdir)) ? { cache, dir, fs, gitdir } : { cache, dir, fs, gitdir: dir, noCheckout: true }
+    const dotgit = ospath.join(dir, '.git')
+    const dotgitStat = await fsp.stat(dotgit).catch(() => ({ isFile: invariably.false, isDirectory: invariably.false }))
+    if (dotgitStat.isDirectory()) {
+      repo = { cache, dir, fs, gitdir: dotgit }
+    } else if (dotgitStat.isFile()) {
+      repo = await resolveRepositoryFromWorktree({ cache, dir, fs, gitdir: dotgit })
+    } else {
+      repo = { cache, dir, fs, gitdir: dir, noCheckout: true }
+    }
     try {
       await git.resolveRef(Object.assign({ ref: 'HEAD', depth: 1 }, repo))
     } catch {
@@ -241,7 +249,7 @@ function extractCredentials (url) {
   return { displayUrl: url, url }
 }
 
-async function selectStartPathsForRepository (repo, authStatus, sources) {
+async function selectStartPathsForRepository (repo, sources) {
   const startPaths = []
   const originUrls = {}
   for (const source of sources) {
@@ -290,6 +298,7 @@ async function selectReferences (source, repo, remote) {
   const isBare = managed || repo.noCheckout
   const patternCache = repo.cache[REF_PATTERN_CACHE_KEY]
   const noWorktree = managed ? undefined : false
+  const isLinkedWorktree = repo.worktree?.name
   const refs = new Map()
   if (
     tagPatterns &&
@@ -305,48 +314,63 @@ async function selectReferences (source, repo, remote) {
       }
     }
   }
-  if (!branchPatterns) return [...refs.values()]
-  let usePrimaryWorktree
-  if (worktreePatterns) {
+  if (
+    !branchPatterns ||
+    !(branchPatterns = Array.isArray(branchPatterns)
+      ? branchPatterns.map((pattern) => String(pattern))
+      : splitRefPatterns(String(branchPatterns))).length
+  ) {
+    return [...refs.values()]
+  }
+  let useWorktree = false
+  if (!managed && (useWorktree = {})) {
     if (worktreePatterns === '.') {
-      worktreePatterns = (usePrimaryWorktree = true) && []
+      isLinkedWorktree ? (useWorktree.linked = isLinkedWorktree) : isBare || (useWorktree.main = true)
+      worktreePatterns = []
+    } else if (!worktreePatterns) {
+      worktreePatterns = []
     } else if (worktreePatterns === true) {
-      worktreePatterns = (usePrimaryWorktree = true) && ['*']
+      if (!isBare) useWorktree.main = true
+      // NOTE if we don't start at a linked worktree, linked worktree cannot be current worktree
+      if (isLinkedWorktree) useWorktree.linked = isLinkedWorktree
+      worktreePatterns = ['*']
+    } else if (worktreePatterns === '/.') {
+      if (!isBare) useWorktree.main = true
+      worktreePatterns = []
     } else {
-      worktreePatterns = Array.isArray(worktreePatterns)
-        ? worktreePatterns.map((pattern) => String(pattern))
-        : splitRefPatterns(String(worktreePatterns))
-      if (~worktreePatterns.indexOf('.')) {
-        worktreePatterns = (usePrimaryWorktree = true) && worktreePatterns.filter((it) => it !== '.')
-      }
+      worktreePatterns = (
+        Array.isArray(worktreePatterns)
+          ? worktreePatterns.map((pattern) => String(pattern))
+          : splitRefPatterns(String(worktreePatterns))
+      ).reduce((accum, it) => {
+        if (it === '/.') return (isBare || (useWorktree.main = true)) && accum
+        if (it === '.') {
+          isLinkedWorktree ? (useWorktree.linked = isLinkedWorktree) : isBare || (useWorktree.main = true)
+        } else {
+          accum.push(it)
+        }
+        return accum
+      }, [])
     }
-  } else {
-    worktreePatterns = []
+    if (!(useWorktree.main || useWorktree.linked)) useWorktree = false
   }
-  const branchPatternsString = String(branchPatterns)
-  if (branchPatternsString === 'HEAD' || branchPatternsString === '.') {
-    const currentBranch = await getCurrentBranchName(repo, remote)
-    if (currentBranch) {
-      branchPatterns = [currentBranch]
-    } else if (isBare) {
-      return [...refs.values()]
-    } else {
-      // NOTE current branch is undefined when HEAD is detached
-      const head = usePrimaryWorktree ? repo.dir : noWorktree
-      refs.set('HEAD', { shortname: 'HEAD', fullname: 'HEAD', type: 'branch', detached: true, head })
-      return [...refs.values()]
-    }
-  } else if (
-    (branchPatterns = Array.isArray(branchPatterns)
-      ? branchPatterns.map((pattern) => String(pattern))
-      : splitRefPatterns(branchPatternsString)).length
-  ) {
+  let currentBranch
+  if (!isLinkedWorktree) {
     let headBranchIdx
-    // NOTE we can assume at least two entries if HEAD or . are present
-    if (~(headBranchIdx = branchPatterns.indexOf('HEAD')) || ~(headBranchIdx = branchPatterns.indexOf('.'))) {
-      const currentBranch = await getCurrentBranchName(repo, remote)
-      if (currentBranch) {
-        // NOTE ignore if current branch is already in list
+    if (branchPatterns.length === 1 && (branchPatterns[0] === 'HEAD' || branchPatterns[0] === '.')) {
+      if ((currentBranch = await getCurrentBranchName(repo, remote).then((branch) => branch ?? false))) {
+        branchPatterns = [currentBranch]
+      } else if (isBare) {
+        return [...refs.values()]
+      } else {
+        // NOTE current branch is undefined when HEAD is detached
+        const head = useWorktree.main ? repo.dir : noWorktree
+        refs.set('HEAD', { shortname: 'HEAD', fullname: 'HEAD', type: 'branch', detached: true, head })
+        return [...refs.values()]
+      }
+    } else if (~(headBranchIdx = branchPatterns.indexOf('HEAD')) || ~(headBranchIdx = branchPatterns.indexOf('.'))) {
+      // NOTE we can assume at least two entries if HEAD or . are present
+      if ((currentBranch = await getCurrentBranchName(repo, remote).then((branch) => branch ?? false))) {
         if (~branchPatterns.indexOf(currentBranch)) {
           branchPatterns.splice(headBranchIdx, 1)
         } else {
@@ -355,14 +379,12 @@ async function selectReferences (source, repo, remote) {
       } else if (isBare) {
         branchPatterns.splice(headBranchIdx, 1)
       } else {
-        const head = usePrimaryWorktree ? repo.dir : noWorktree
+        const head = useWorktree.main ? repo.dir : noWorktree
         // NOTE current branch is undefined when HEAD is detached
         refs.set('HEAD', { shortname: 'HEAD', fullname: 'HEAD', type: 'branch', detached: true, head })
         branchPatterns.splice(headBranchIdx, 1)
       }
     }
-  } else {
-    return [...refs.values()]
   }
   // NOTE isomorphic-git includes HEAD in list of remote branches (see https://isomorphic-git.org/docs/listBranches)
   const remoteBranches = remote
@@ -374,22 +396,42 @@ async function selectReferences (source, repo, remote) {
       refs.set(shortname, { shortname, fullname, type: 'branch', remote, head: noWorktree })
     }
   }
-  // NOTE only consider local branches if repo has a worktree or there are no remote tracking branches
-  if (!isBare) {
-    const localBranches = await git.listBranches(repo)
-    if (localBranches.length) {
-      const worktrees = await findWorktrees(repo, worktreePatterns, usePrimaryWorktree)
-      for (const shortname of filterRefs(localBranches, branchPatterns, patternCache)) {
-        const head = worktrees.get(shortname) || noWorktree
-        refs.set(shortname, { shortname, fullname: 'heads/' + shortname, type: 'branch', head })
+  if (!managed) {
+    const localBranches = await git.listBranches(repo).then((branches) => {
+      if (branches.length || isBare) return branches
+      if (currentBranch != null) return [currentBranch]
+      return getCurrentBranchName(repo).then((branch) => (branch ? [branch] : []))
+    })
+    const worktrees = await findWorktrees(repo, worktreePatterns, useWorktree)
+    let onMatch
+    if ((useWorktree || worktreePatterns.length) && worktrees.size) {
+      const headNames = new Map()
+      worktrees.forEach(({ name, symbolicNames }, shortname) => {
+        if (name) {
+          const headName = 'HEAD@' + name
+          localBranches.push(headName)
+          headNames.set(headName, shortname)
+        }
+        if (symbolicNames) {
+          for (const symbolicName of symbolicNames) {
+            const symbolicHeadName = symbolicName === 'HEAD' ? symbolicName : 'HEAD@' + symbolicName
+            localBranches.push(symbolicHeadName)
+            headNames.set(symbolicHeadName, shortname)
+          }
+        }
+      })
+      onMatch = (candidate, { pattern }) => {
+        const shortname = headNames.get(candidate)
+        if (!shortname) return candidate
+        if (pattern === 'HEAD' || pattern.startsWith('HEAD@')) return shortname
       }
     }
-  } else if (!managed || !remoteBranches.length) {
-    const localBranches = await git.listBranches(repo)
     if (localBranches.length) {
-      for (const shortname of filterRefs(localBranches, branchPatterns, patternCache)) {
-        if (refs.has(shortname)) continue // NOTE prefer remote branches in bare repository
-        refs.set(shortname, { shortname, fullname: 'heads/' + shortname, type: 'branch', head: noWorktree })
+      const preferRemote = isBare && remoteBranches.length > 0
+      for (const shortname of filterRefs(localBranches, branchPatterns, patternCache, onMatch)) {
+        if (preferRemote && refs.has(shortname)) continue
+        const head = (worktrees.get(shortname) || { head: false }).head
+        refs.set(shortname, { shortname, fullname: 'heads/' + shortname, type: 'branch', head })
       }
     }
   }
@@ -400,15 +442,13 @@ async function selectReferences (source, repo, remote) {
  * Returns the current branch name or undefined if the HEAD is detached.
  */
 function getCurrentBranchName (repo, remote) {
-  let refPromise
-  if (repo.noCheckout) {
-    refPromise = git
-      .resolveRef(Object.assign({ ref: 'refs/remotes/' + remote + '/HEAD', depth: 2 }, repo))
-      .catch(() => git.resolveRef(Object.assign({ ref: 'HEAD', depth: 2 }, repo)))
-  } else {
-    refPromise = git.resolveRef(Object.assign({ ref: 'HEAD', depth: 2 }, repo))
-  }
-  return refPromise.then((ref) => (ref.startsWith('refs/') ? ref.replace(SHORTEN_REF_RX, '') : undefined))
+  return (
+    remote && repo.noCheckout
+      ? git
+          .resolveRef(Object.assign({ ref: 'refs/remotes/' + remote + '/HEAD', depth: 2 }, repo))
+          .catch(() => git.resolveRef(Object.assign({ ref: 'HEAD', depth: 2 }, repo)))
+      : git.resolveRef(Object.assign({ ref: 'HEAD', depth: 2 }, repo))
+  ).then((ref) => (ref.startsWith('refs/') ? ref.replace(SHORTEN_REF_RX, '') : undefined))
 }
 
 async function selectStartPaths (source, repo, ref) {
@@ -752,7 +792,7 @@ function loadComponentDescriptor (files, ref, version) {
     throw new Error(`version in ${COMPONENT_DESC_FILENAME} cannot have path segments: ${version}`)
   }
   data.version = version
-  return camelCaseKeys(data, ['asciidoc'])
+  return camelCaseKeys(data, ['asciidoc', 'ext'])
 }
 
 function assignFileProperties (file, origin) {
@@ -769,18 +809,20 @@ function assignFileProperties (file, origin) {
   return file
 }
 
-function buildFetchOptions (repo, progress, displayUrl, credentialsFromUrl, gitPlugins, fetchTags, operation) {
+function buildFetchOptions (repo, progress, displayUrl, credentialsFromUrl, gitPlugins, fetch, operation) {
   const { credentialManager, http, urlRouter } = gitPlugins
+  const corsProxy = false
+  const depth = fetch.depth || undefined
   const onAuth = resolveCredentials.bind(credentialManager, new Map().set(undefined, credentialsFromUrl))
   const onAuthFailure = onAuth
   const onAuthSuccess = (url) => credentialManager.approved({ url })
-  const opts = Object.assign({ corsProxy: false, depth: 1, http, onAuth, onAuthFailure, onAuthSuccess }, repo)
+  const opts = Object.assign({ corsProxy, depth, http, onAuth, onAuthFailure, onAuthSuccess }, repo)
   if (urlRouter) opts.url = urlRouter.ensureGitSuffix(opts.url)
   if (progress) opts.onProgress = createProgressListener(progress, displayUrl, operation)
   if (operation === 'fetch') {
     opts.prune = true
-    if (fetchTags) opts.tags = opts.pruneTags = true
-  } else if (!fetchTags) {
+    if (fetch.tags) opts.tags = opts.pruneTags = true
+  } else if (!fetch.tags) {
     opts.noTags = true
   }
   return opts
@@ -875,7 +917,11 @@ function resolveCredentials (credentialsFromUrlHolder, url, auth) {
 }
 
 function identifyAuthStatus (credentialManager, credentials, url) {
-  return credentials ? 'auth-embedded' : credentialManager.status({ url }) ? 'auth-required' : undefined
+  const status = credentialManager.status({ url })
+  if (credentials) {
+    return typeof status === 'string' && status.startsWith('requested,') ? 'auth-required' : 'auth-embedded'
+  }
+  if (status != null) return 'auth-required'
 }
 
 /**
@@ -1006,7 +1052,7 @@ function transformGitCloneError (err, displayUrl, authRequested) {
 }
 
 function splitRefPatterns (str) {
-  return ~str.indexOf('{') ? str.split(VENTILATED_CSV_RX) : str.split(CSV_RX)
+  return str.split(~str.indexOf('{') ? VENTILATED_CSV_RX : CSV_RX)
 }
 
 function camelCaseKeys (o, stopPaths = [], p = '') {
@@ -1029,38 +1075,60 @@ function coerceToString (value) {
   return value == null ? '' : String(value)
 }
 
-function findWorktrees (repo, patterns, usePrimaryWorktree) {
-  if (!(usePrimaryWorktree || patterns.length)) return new Map()
-  let worktreesDir
+function resolveRepositoryFromWorktree (repo) {
+  return fsp
+    .readFile(repo.gitdir, 'utf8')
+    .then((contents) => contents.substr(8).trimEnd())
+    .then((worktreeGitdir) =>
+      fsp.readFile(ospath.join(worktreeGitdir, 'commondir'), 'utf8').then(
+        (contents) => {
+          const gitdir = ospath.join(worktreeGitdir, contents.trimEnd())
+          const dir = ospath.basename(gitdir) === '.git' ? ospath.dirname(gitdir) : gitdir
+          const name = ospath.basename(worktreeGitdir)
+          return Object.assign(repo, { dir, gitdir, worktree: { gitdir: worktreeGitdir, name } })
+        },
+        () => repo
+      )
+    )
+}
+
+function findWorktrees (repo, patterns, useWorktree) {
+  const useLinkedWorktree = !!useWorktree.linked
+  const mainWorktree = useWorktree.main
+    ? getCurrentBranchName(repo).then((branch) => {
+        if (!branch) return
+        return [branch, { head: repo.dir, name: undefined, symbolicNames: useLinkedWorktree ? ['/.'] : ['/.', '.'] }]
+      })
+    : Promise.resolve()
+  if (!(useLinkedWorktree || patterns.length)) return mainWorktree.then((entry) => new Map(entry && [entry]))
+  const worktreesDir = ospath.join(repo.dir, repo.dir === repo.gitdir ? '' : '.git', 'worktrees')
   const patternCache = repo.cache[REF_PATTERN_CACHE_KEY]
-  return (
-    patterns.length
-      ? fsp
-          .readdir((worktreesDir = ospath.join(repo.dir, '.git', 'worktrees')))
-          .then((worktreeNames) => filterRefs(worktreeNames, patterns, patternCache), invariably.emptyArray)
-          .then((worktreeNames) =>
-            worktreeNames.length
-              ? Promise.all(
-                  worktreeNames.map((worktreeName) => {
-                    const gitdir = ospath.resolve(worktreesDir, worktreeName)
-                    // NOTE uses name of worktree as branch name if HEAD is detached
-                    return git
-                      .currentBranch(Object.assign({}, repo, { gitdir }))
-                      .then((branch = worktreeName) =>
-                        fsp
-                          .readFile(ospath.join(gitdir, 'gitdir'), 'utf8')
-                          .then((contents) => ({ branch, dir: ospath.dirname(contents.trimEnd()) }))
-                      )
-                  })
-                ).then((entries) => entries.reduce((accum, it) => accum.set(it.branch, it.dir), new Map()))
-              : new Map()
+  const scanWorktrees = patterns.length
+    ? fsp
+        .readdir(worktreesDir)
+        .then((worktreeNames) => filterRefs(worktreeNames, patterns, patternCache), invariably.emptyArray)
+        .then((worktreeNames) => {
+          if (useLinkedWorktree && !~worktreeNames.indexOf(useWorktree.linked)) worktreeNames.push(useWorktree.linked)
+          return worktreeNames
+        })
+    : Promise.resolve(useLinkedWorktree ? [useWorktree.linked] : [])
+  return scanWorktrees
+    .then((worktreeNames) =>
+      Promise.all(
+        worktreeNames.map((name) => {
+          const symbolicNames = useLinkedWorktree && name === useWorktree.linked ? ['.', 'HEAD'] : undefined
+          const gitdir = ospath.resolve(worktreesDir, name)
+          // NOTE branch name defaults to worktree name if HEAD is detached
+          return getCurrentBranchName(Object.assign({}, repo, { gitdir })).then((branch = name) =>
+            fsp
+              .readFile(ospath.join(gitdir, 'gitdir'), 'utf8')
+              .then((contents) => [branch, { head: ospath.dirname(contents.trimEnd()), name, symbolicNames }])
           )
-      : Promise.resolve(new Map())
-  ).then((worktrees) =>
-    usePrimaryWorktree
-      ? git.currentBranch(repo).then((branch) => (branch ? worktrees.set(branch, repo.dir) : worktrees))
-      : worktrees
-  )
+        })
+      )
+    )
+    .then((entries) => new Map(entries))
+    .then((worktrees) => mainWorktree.then((result) => (result ? worktrees.set(result[0], result[1]) : worktrees)))
 }
 
 async function gracefulPromiseAllWithLimit (tasks, limit = Infinity) {

package/lib/compute-origin.js

@@ -1,10 +1,10 @@
 'use strict'
 
-const { posix: path } = require('path')
+const { posix: path } = require('node:path')
 const posixify = require('./posixify')
 const removeGitSuffix = require('./remove-git-suffix')
 
-const EDIT_URL_TEMPLATE_VAR_RX = /\{(web_url|ref(?:hash|name|type)|path)\}/g
+const EDIT_URL_TEMPLATE_VAR_RX = /\{(web_url|ref(?:hash|name|type)?|path)\}/g
 const HOSTED_GIT_REPO_RX = /^(?:https?:\/\/|.+@)(git(?:hub|lab)\.com|bitbucket\.org|pagure\.io)[/:](.+?)(?:\.git)?$/
 
 function computeOrigin (url, authStatus, gitdir, ref, startPath, worktreePath = undefined, editUrl = true) {
@@ -33,14 +33,16 @@ function computeOrigin (url, authStatus, gitdir, ref, startPath, worktreePath =
         category = 'f'
       } else if (host === 'bitbucket.org') {
         action = 'src'
-      } else if (reftype === 'branch') {
-        action = 'edit'
+      } else {
+        if (reftype === 'branch') action = 'edit'
+        if (host.startsWith('gitlab.')) action = '-/' + action
       }
       origin.editUrlPattern = 'https://' + path.join(match[1], match[2], action, refname, category, startPath, '%s')
     }
   } else if (editUrl) {
     const vars = {
       path: () => (startPath ? path.join(startPath, '%s') : '%s'),
+      ref: () => 'refs/' + (reftype === 'branch' ? 'heads' : reftype) + '/' + refname,
       refhash: () => refhash,
       reftype: () => reftype,
       refname: () => refname,

package/lib/decode-uint8-array.js

@@ -3,4 +3,4 @@
 module.exports = (({ StringDecoder }) => {
   const decoder = new StringDecoder()
   return decoder.write.bind(decoder)
-})(require('string_decoder'))
+})(require('node:string_decoder'))

package/lib/filter-refs.js

@@ -4,9 +4,11 @@ const { makeMatcherRx, refMatcherOpts: getMatcherOpts, MATCH_ALL_RX } = require(
 
 function compileRx (pattern, opts) {
   if (pattern === '*' || pattern === '**') return MATCH_ALL_RX
-  return pattern.charAt() === '!' // do our own negate
-    ? Object.defineProperty(makeMatcherRx(pattern.substr(1), opts), 'negated', { value: true })
-    : makeMatcherRx(pattern, opts)
+  const rx =
+    pattern.charAt() === '!' // we handle negate ourselves
+      ? Object.defineProperty(makeMatcherRx((pattern = pattern.substr(1)), opts), 'negated', { value: true })
+      : makeMatcherRx(pattern, opts)
+  return Object.defineProperty(rx, 'pattern', { value: pattern })
 }
 
 function createMatcher (patterns, cache = Object.assign(new Map(), { braces: new Map() })) {
@@ -14,8 +16,8 @@ function createMatcher (patterns, cache = Object.assign(new Map(), { braces: new
     (pattern) => cache.get(pattern) || cache.set(pattern, compileRx(pattern, getMatcherOpts(cache))).get(pattern)
   )
   if (rxs[0].negated) rxs.unshift(MATCH_ALL_RX)
-  return (candidate) => {
-    let matched
+  return (candidate, onMatch) => {
+    let matched, symbolic
     for (const rx of rxs) {
       let voteIfMatched = true
       if (matched) {
@@ -24,17 +26,23 @@ function createMatcher (patterns, cache = Object.assign(new Map(), { braces: new
       } else if (rx.negated) {
         continue
       }
-      if (rx.test(candidate)) matched = voteIfMatched
+      if (rx.test(candidate) || (symbolic && rx.test(symbolic) && (candidate = symbolic))) {
+        if (onMatch) {
+          if (!(matched = onMatch(candidate, rx))) continue
+          ;[symbolic, candidate] = [candidate, matched]
+        }
+        matched = voteIfMatched && candidate
+      }
     }
     return matched
   }
 }
 
-function filterRefs (candidates, patterns, cache) {
+function filterRefs (candidates, patterns, cache, onMatch) {
   if (!(patterns = patterns.filter(compact)).length) return []
-  const isMatch = createMatcher(patterns, cache)
+  const match = createMatcher(patterns, cache)
   return candidates.reduce((accum, candidate) => {
-    if (isMatch(candidate)) accum.push(candidate)
+    if ((candidate = match(candidate, onMatch))) accum.push(candidate)
     return accum
   }, [])
 }

package/lib/git-credential-manager-store.js

@@ -1,10 +1,10 @@
 'use strict'
 
-const { homedir } = require('os')
+const { homedir } = require('node:os')
 const expandPath = require('@antora/expand-path-helper')
-const { promises: fsp } = require('fs')
+const { promises: fsp } = require('node:fs')
 const invariably = require('./invariably')
-const ospath = require('path')
+const ospath = require('node:path')
 
 class GitCredentialManagerStore {
   configure ({ config, startDir }) {
@@ -86,11 +86,11 @@ class GitCredentialManagerStore {
   }
 
   async approved ({ url }) {
-    this.urls[url] = 'approved'
+    this.urls[url] = (url in this.urls ? this.urls[url] + ',' : '') + 'approved'
   }
 
   async rejected ({ url, auth }) {
-    this.urls[url] = 'rejected'
+    this.urls[url] = (url in this.urls ? this.urls[url] + ',' : '') + 'rejected'
     const statusCode = 401
     const statusMessage = 'HTTP Basic: Access Denied'
     const err = new Error(`HTTP Error: ${statusCode} ${statusMessage}`)

package/lib/git.js

@@ -1,3 +1,10 @@
 'use strict'
 
-module.exports = require('isomorphic-git')
+const zlib = require('node:zlib')
+const { promisify } = require('node:util')
+
+module.exports = ((pakoModuleId) => {
+  const git = require('isomorphic-git')
+  require(pakoModuleId).inflate = promisify(zlib.inflate)
+  return git
+})('pako')

package/lib/matcher.js

@@ -17,7 +17,7 @@ const BASE_OPTS = {
 }
 
 module.exports = {
-  MATCH_ALL_RX: { test: () => true },
+  MATCH_ALL_RX: Object.defineProperty({ test: () => true }, 'pattern', { value: '*' }),
   expandBraces,
   makeMatcherRx: makeRe,
   pathMatcherOpts: Object.assign({}, BASE_OPTS, { dot: false }),

package/lib/posixify.js

@@ -1,3 +1,3 @@
 'use strict'
 
-module.exports = require('path').sep === '\\' ? (p) => p.replace(/\\/g, '/') : undefined
+module.exports = require('node:path').sep === '\\' ? (p) => p.replace(/\\/g, '/') : undefined

package/lib/resolve-path-globs.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const deepFlatten = require('./deep-flatten')
-const { promises: fsp } = require('fs')
+const { promises: fsp } = require('node:fs')
 const git = require('./git')
 const invariably = require('./invariably')
 const { expandBraces, makeMatcherRx, pathMatcherOpts: MATCHER_OPTS } = require('./matcher')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-aggregator",
-  "version": "3.1.14",
+  "version": "3.2.0-alpha.10",
   "description": "Fetches and aggregates content from distributed sources for use in an Antora documentation pipeline.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
@@ -13,7 +13,8 @@
   "homepage": "https://antora.org",
   "repository": {
     "type": "git",
-    "url": "git+https://gitlab.com/antora/antora.git"
+    "url": "git+https://gitlab.com/antora/antora.git",
+    "directory": "packages/content-aggregator"
   },
   "bugs": {
     "url": "https://gitlab.com/antora/antora/issues"
@@ -32,7 +33,7 @@
   },
   "dependencies": {
     "@antora/expand-path-helper": "~3.0",
-    "@antora/logger": "3.1.14",
+    "@antora/logger": "3.2.0-alpha.10",
     "@antora/user-require-helper": "~3.0",
     "braces": "~3.0",
     "cache-directory": "~2.0",
@@ -48,7 +49,7 @@
     "vinyl": "~3.0"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "files": [
     "lib/"
@@ -65,7 +66,7 @@
   ],
   "scripts": {
     "test": "_mocha",
-    "prepublishOnly": "npx -y downdoc --prepublish",
-    "postpublish": "npx -y downdoc --postpublish"
+    "prepublishOnly": "npx -y downdoc@latest --prepublish",
+    "postpublish": "npx -y downdoc@latest --postpublish"
   }
 }