@antora/content-aggregator 3.0.0-beta.1 → 3.0.0-beta.5

package/lib/aggregate-content.js

@@ -1,7 +1,5 @@
 'use strict'
 
-if (!Promise.allSettled) require('./promise-all-settled-polyfill')
-
 const camelCaseKeys = require('camelcase-keys')
 const { createHash } = require('crypto')
 const createHttpPlugin = require('./git-plugin-http')
@@ -17,17 +15,17 @@ const getCacheDir = require('cache-directory')
 const GitCredentialManagerStore = require('./git-credential-manager-store')
 const git = require('./git')
 const { NotFoundError, ObjectTypeError, UnknownTransportError, UrlParseError } = git.Errors
-const invariably = { true: () => true, false: () => false, void: () => undefined, emptyArray: () => [] }
-const { makeRe: makePicomatchRx } = require('picomatch')
-const MultiProgress = require('multi-progress')
+const globStream = require('glob-stream')
+const invariably = require('./invariably')
+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 { posix: path } = ospath
 const posixify = ospath.sep === '\\' ? (p) => p.replace(/\\/g, '/') : undefined
 const { fs: resolvePathGlobsFs, git: resolvePathGlobsGit } = require('./resolve-path-globs')
-const { Transform } = require('stream')
-const map = (transform, flush = undefined) => new Transform({ objectMode: true, transform, flush })
+const { pipeline, Writable } = require('stream')
+const forEach = (write) => new Writable({ objectMode: true, write })
 const userRequire = require('@antora/user-require-helper')
-const vfs = require('vinyl-fs')
 const yaml = require('js-yaml')
 
 const {
@@ -39,12 +37,10 @@ const {
   GIT_CORE,
   GIT_OPERATION_LABEL_LENGTH,
   GIT_PROGRESS_PHASES,
-  PICOMATCH_VERSION_OPTS,
   REF_PATTERN_CACHE_KEY,
   SYMLINK_FILE_MODE,
   VALID_STATE_FILENAME,
 } = require('./constants')
-
 const ANY_SEPARATOR_RX = /[:/]/
 const CSV_RX = /\s*,\s*/
 const VENTILATED_CSV_RX = /\s*,\s+/
@@ -124,14 +120,14 @@ async function collectFiles (sourcesByUrl, loadOpts, concurrency) {
         })
       ),
   ])
-  let rejected, started
+  let rejection, started
   const startedContinuations = []
   const recordRejection = (err) => {
-    throw (rejected = true) && err
+    rejection = err
   }
   const runTask = (primary, continuation, idx) =>
     primary().then((value) => {
-      if (!rejected) startedContinuations[idx] = continuation(value).catch(recordRejection)
+      if (!rejection) startedContinuations[idx] = continuation(value).catch(recordRejection)
     }, recordRejection)
   if (tasks.length > concurrency) {
     started = []
@@ -142,17 +138,16 @@ async function collectFiles (sourcesByUrl, loadOpts, concurrency) {
       )
       started.push(current)
       if (pending.push(current) < concurrency) continue
-      if (await Promise.race(pending).then(invariably.true, invariably.false)) continue
-      break
+      await Promise.race(pending)
+      if (rejection) break
     }
   } else {
     started = tasks.map(([primary, continuation], idx) => runTask(primary, continuation, idx))
   }
-  return Promise.allSettled(started).then((outcomes) =>
-    Promise.allSettled(startedContinuations).then((continuationOutcomes) => {
-      const rejection = outcomes.push(...continuationOutcomes) && outcomes.find(({ status }) => status === 'rejected')
-      if (rejection) throw rejection.reason
-      return continuationOutcomes.map(({ value }) => value)
+  return Promise.all(started).then(() =>
+    Promise.all(startedContinuations).then((result) => {
+      if (rejection) throw rejection
+      return result
     })
   )
 }
@@ -232,9 +227,8 @@ async function loadRepository (url, opts) {
     try {
       await git.resolveRef(Object.assign({ ref: 'HEAD', depth: 1 }, repo))
     } catch {
-      throw new Error(
-        `Local content source must be a git repository: ${dir}${url !== dir ? ' (url: ' + url + ')' : ''}`
-      )
+      const msg = `Local content source must be a git repository: ${dir}${url !== dir ? ' (url: ' + url + ')' : ''}`
+      throw new Error(msg)
     }
   } else {
     throw new Error(`Local content source does not exist: ${dir}${url !== dir ? ' (url: ' + url + ')' : ''}`)
@@ -275,99 +269,100 @@ async function selectReferences (source, repo, remote) {
   const patternCache = repo.cache[REF_PATTERN_CACHE_KEY]
   const noWorktree = repo.url ? undefined : null
   const refs = new Map()
-  if (tagPatterns) {
-    tagPatterns = Array.isArray(tagPatterns)
+  if (
+    tagPatterns &&
+    (tagPatterns = Array.isArray(tagPatterns)
       ? tagPatterns.map((pattern) => String(pattern))
-      : splitRefPatterns(String(tagPatterns))
-    if (tagPatterns.length) {
-      const tags = await git.listTags(repo)
-      for (const shortname of tags.length ? filterRefs(tags, tagPatterns, patternCache) : tags) {
+      : splitRefPatterns(String(tagPatterns))).length
+  ) {
+    const tags = await git.listTags(repo)
+    if (tags.length) {
+      for (const shortname of filterRefs(tags, tagPatterns, patternCache)) {
         // NOTE tags are stored using symbol keys to distinguish them from branches
         refs.set(Symbol(shortname), { shortname, fullname: 'tags/' + shortname, type: 'tag', head: noWorktree })
       }
     }
   }
-  if (branchPatterns) {
-    if (worktreePatterns) {
-      if (worktreePatterns === '.') {
-        worktreePatterns = ['.']
-      } else if (worktreePatterns === true) {
-        worktreePatterns = ['.', '*']
-      } else {
-        worktreePatterns = Array.isArray(worktreePatterns)
-          ? worktreePatterns.map((pattern) => String(pattern))
-          : splitRefPatterns(String(worktreePatterns))
-      }
+  if (!branchPatterns) return [...refs.values()]
+  if (worktreePatterns) {
+    if (worktreePatterns === '.') {
+      worktreePatterns = ['.']
+    } else if (worktreePatterns === true) {
+      worktreePatterns = ['.', '*']
+    } else {
+      worktreePatterns = Array.isArray(worktreePatterns)
+        ? worktreePatterns.map((pattern) => String(pattern))
+        : splitRefPatterns(String(worktreePatterns))
     }
-    const branchPatternsString = String(branchPatterns)
-    if (branchPatternsString === 'HEAD' || branchPatternsString === '.') {
+  }
+  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 = worktreePatterns[0] === '.' ? 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 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) {
-        branchPatterns = [currentBranch]
-      } else {
-        if (!isBare) {
-          // NOTE current branch is undefined when HEAD is detached
-          const head = worktreePatterns[0] === '.' ? 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 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.indexOf(currentBranch)) {
-            branchPatterns.splice(headBranchIdx, 1)
-          } else {
-            branchPatterns[headBranchIdx] = currentBranch
-          }
-        } else {
-          if (!isBare) {
-            let head = noWorktree
-            if (worktreePatterns[0] === '.') {
-              worktreePatterns = worktreePatterns.slice(1)
-              head = repo.dir
-            }
-            // NOTE current branch is undefined when HEAD is detached
-            refs.set('HEAD', { shortname: 'HEAD', fullname: 'HEAD', type: 'branch', detached: true, head })
-          }
+        // NOTE ignore if current branch is already in list
+        if (~branchPatterns.indexOf(currentBranch)) {
           branchPatterns.splice(headBranchIdx, 1)
+        } else {
+          branchPatterns[headBranchIdx] = currentBranch
+        }
+      } else if (isBare) {
+        branchPatterns.splice(headBranchIdx, 1)
+      } else {
+        let head = noWorktree
+        if (worktreePatterns[0] === '.') {
+          worktreePatterns = worktreePatterns.slice(1)
+          head = repo.dir
         }
+        // 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 = (await git.listBranches(Object.assign({ remote }, repo))).filter((it) => it !== 'HEAD')
-    if (remoteBranches.length) {
-      for (const shortname of filterRefs(remoteBranches, branchPatterns, patternCache)) {
-        const fullname = 'remotes/' + remote + '/' + shortname
-        refs.set(shortname, { shortname, fullname, type: 'branch', remote, head: noWorktree })
-      }
+  } else {
+    return [...refs.values()]
+  }
+  // NOTE isomorphic-git includes HEAD in list of remote branches (see https://isomorphic-git.org/docs/listBranches)
+  const remoteBranches = (await git.listBranches(Object.assign({ remote }, repo))).filter((it) => it !== 'HEAD')
+  if (remoteBranches.length) {
+    for (const shortname of filterRefs(remoteBranches, branchPatterns, patternCache)) {
+      const fullname = 'remotes/' + remote + '/' + shortname
+      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)
-        for (const shortname of filterRefs(localBranches, branchPatterns, patternCache)) {
-          const head = worktrees.get(shortname) || noWorktree
-          refs.set(shortname, { shortname, fullname: 'heads/' + shortname, type: 'branch', head })
-        }
+  }
+  // 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)
+      for (const shortname of filterRefs(localBranches, branchPatterns, patternCache)) {
+        const head = worktrees.get(shortname) || noWorktree
+        refs.set(shortname, { shortname, fullname: 'heads/' + shortname, type: 'branch', head })
       }
-    } else if (!remoteBranches.length) {
-      const localBranches = await git.listBranches(repo)
-      if (localBranches.length) {
-        for (const shortname of filterRefs(localBranches, branchPatterns, patternCache)) {
-          refs.set(shortname, { shortname, fullname: 'heads/' + shortname, type: 'branch', head: noWorktree })
-        }
+    }
+  } else if (!remoteBranches.length) {
+    const localBranches = await git.listBranches(repo)
+    if (localBranches.length) {
+      for (const shortname of filterRefs(localBranches, branchPatterns, patternCache)) {
+        refs.set(shortname, { shortname, fullname: 'heads/' + shortname, type: 'branch', head: noWorktree })
       }
     }
   }
@@ -433,35 +428,19 @@ function collectFilesFromStartPath (startPath, repo, authStatus, ref, worktreePa
       return componentVersionBucket
     })
     .catch((err) => {
+      const msg = err.message
       const refInfo = `ref: ${ref.fullname.replace(HEADS_DIR_RX, '')}${worktreePath ? ' <worktree>' : ''}`
-      const pathInfo = !startPath || err.message.startsWith('the start path ') ? '' : ' | path: ' + startPath
-      throw Object.assign(err, { message: `${err.message} in ${repo.url || repo.dir} (${refInfo}${pathInfo})` })
+      const pathInfo = !startPath || msg.startsWith('the start path ') ? '' : ' | path: ' + startPath
+      throw Object.assign(err, { message: msg.replace(/$/m, ` in ${repo.url || repo.dir} (${refInfo}${pathInfo})`) })
     })
 }
 
 function readFilesFromWorktree (worktreePath, startPath) {
-  const cwd = ospath.join(worktreePath, startPath)
+  const cwd = ospath.join(worktreePath, startPath, '.') // . shaves off trailing slash
   return fsp.stat(cwd).then(
-    (stat) => {
-      if (!stat.isDirectory()) throw new Error(`the start path '${startPath}' is not a directory`)
-      return new Promise((resolve, reject) =>
-        vfs
-          .src(CONTENT_SRC_GLOB, Object.assign({ cwd }, CONTENT_SRC_OPTS))
-          .on('error', (err) => {
-            if (err.code === 'ENOENT' && err.syscall === 'stat') {
-              try {
-                if (fs.lstatSync(err.path).isSymbolicLink()) {
-                  err.message = `Broken symbolic link detected at ${ospath.relative(cwd, err.path)}`
-                }
-              } catch {}
-            } else if (err.code === 'ELOOP') {
-              err.message = `Symbolic link cycle detected at ${ospath.relative(cwd, err.path)}`
-            }
-            reject(err)
-          })
-          .pipe(relativizeFiles())
-          .pipe(collectDataFromStream(resolve))
-      )
+    (startPathStat) => {
+      if (!startPathStat.isDirectory()) throw new Error(`the start path '${startPath}' is not a directory`)
+      return srcFs(cwd)
     },
     () => {
       throw new Error(`the start path '${startPath}' does not exist`)
@@ -469,40 +448,43 @@ function readFilesFromWorktree (worktreePath, startPath) {
   )
 }
 
-/**
- * Transforms the path of every file in the stream to a relative posix path.
- *
- * Applies a mapping function to all files in the stream so they end up with a
- * posixified path relative to the file's base instead of the filesystem root.
- * This mapper also filters out any directories (indicated by file.isNull())
- * that got caught up in the glob.
- */
-function relativizeFiles () {
-  return map((file, enc, next) => {
-    if (file.isNull()) {
-      next()
-    } else {
-      next(
-        null,
-        new File({
-          path: posixify ? posixify(file.relative) : file.relative,
-          contents: file.contents,
-          stat: file.stat,
-          src: { abspath: file.path },
-        })
-      )
-    }
-  })
-}
-
-function collectDataFromStream (done) {
-  const accum = []
-  return map(
-    (obj, _, next) => {
-      accum.push(obj)
-      next()
-    },
-    () => done(accum)
+function srcFs (cwd) {
+  const relpathStart = cwd.length + 1
+  return new Promise((resolve, reject, cache = Object.create(null), files = []) =>
+    pipeline(
+      globStream(CONTENT_SRC_GLOB, Object.assign({ cache, cwd }, CONTENT_SRC_OPTS)),
+      forEach(({ path: abspathPosix }, _, done) => {
+        if (Array.isArray(cache[abspathPosix])) return done() // detects some directories, but not all
+        const abspath = posixify ? ospath.normalize(abspathPosix) : abspathPosix
+        const relpath = abspath.substr(relpathStart)
+        symlinkAwareStat(abspath).then(
+          (stat) => {
+            if (stat.isDirectory()) return done() // detects remaining directories
+            fsp.readFile(abspath).then(
+              (contents) => {
+                files.push(new File({ path: posixify ? posixify(relpath) : relpath, contents, stat, src: { abspath } }))
+                done()
+              },
+              (readErr) => {
+                done(Object.assign(readErr, { message: readErr.message.replace(`'${abspath}'`, relpath) }))
+              }
+            )
+          },
+          (statErr) => {
+            if (statErr.symlink) {
+              statErr.message =
+                statErr.code === 'ELOOP'
+                  ? `Symbolic link cycle detected at ${relpath}`
+                  : `Broken symbolic link detected at ${relpath}`
+            } else {
+              statErr.message = statErr.message.replace(`'${abspath}'`, relpath)
+            }
+            done(statErr)
+          }
+        )
+      }),
+      (err) => (err ? reject(err) : resolve(files))
+    )
   )
 }
 
@@ -671,7 +653,7 @@ function loadComponentDescriptor (files, ref, version) {
   files.splice(descriptorFileIdx, 1)
   let data
   try {
-    data = yaml.load(descriptorFile.contents.toString())
+    data = yaml.load(descriptorFile.contents.toString(), { schema: yaml.CORE_SCHEMA })
   } catch (err) {
     throw Object.assign(err, { message: `${COMPONENT_DESC_FILENAME} has invalid syntax; ${err.message}` })
   }
@@ -683,7 +665,8 @@ function loadComponentDescriptor (files, ref, version) {
   if ('version' in data) version = data.version
   if (!version) {
     if (version === undefined) throw new Error(`${COMPONENT_DESC_FILENAME} is missing a version`)
-    version = ''
+    if (version === false) throw new Error(`${COMPONENT_DESC_FILENAME} has an invalid version`)
+    version = '' + (typeof version === 'number' ? version : '')
   } else if (version === true) {
     version = ref.shortname.replace(PATH_SEPARATOR_RX, '-')
   } else if (version.constructor === Object) {
@@ -693,7 +676,7 @@ function loadComponentDescriptor (files, ref, version) {
       matched = version[refname]
     } else if (
       !Object.entries(version).some(([pattern, replacement]) => {
-        const result = refname.replace(makePicomatchRx(pattern, PICOMATCH_VERSION_OPTS), '\0' + replacement)
+        const result = refname.replace(makeMatcherRx(pattern, VERSION_MATCHER_OPTS), '\0' + replacement)
         if (result === refname) return false
         matched = result.substr(1)
         return true
@@ -705,7 +688,7 @@ function loadComponentDescriptor (files, ref, version) {
       throw new Error(`version in ${COMPONENT_DESC_FILENAME} cannot have path segments: ${matched}`)
     }
     version = matched.replace(PATH_SEPARATOR_RX, '-')
-  } else if ((version = String(version)) === '.' || version === '..' || ~version.indexOf('/')) {
+  } else if ((version = '' + version) === '.' || version === '..' || ~version.indexOf('/')) {
     throw new Error(`version in ${COMPONENT_DESC_FILENAME} cannot have path segments: ${version}`)
   }
   data.version = version
@@ -721,7 +704,8 @@ function computeOrigin (url, authStatus, gitdir, ref, startPath, worktreePath =
   } else {
     if (worktreePath) {
       origin.fileUriPattern =
-        (posixify ? 'file:///' + posixify(worktreePath) : 'file://' + worktreePath) + path.join('/', startPath, '%s')
+        (posixify ? 'file:///' + posixify(worktreePath) : 'file://' + worktreePath) +
+        (startPath ? '/' + startPath + '/%s' : '/%s')
     } else {
       origin.refhash = refhash
     }
@@ -909,7 +893,8 @@ function resolveRemoteUrl (repo, remoteName) {
         return 'https://' + url.substr(url.indexOf('@') + 1 || 6).replace(URL_PORT_CLEANER_RX, '$1')
       }
     }
-    return posixify ? 'file:///' + posixify(repo.dir) : 'file://' + repo.dir
+    url = posixify ? 'file:///' + posixify(repo.dir) : 'file://' + repo.dir
+    return ~url.indexOf(' ') ? url.replace(SPACE_RX, '%20') : url
   })
 }
 
@@ -923,6 +908,15 @@ function isDirectory (url) {
   return fsp.stat(url).then((stat) => stat.isDirectory(), invariably.false)
 }
 
+function symlinkAwareStat (path_) {
+  return fsp.lstat(path_).then((lstat) => {
+    if (!lstat.isSymbolicLink()) return lstat
+    return fsp.stat(path_).catch((statErr) => {
+      throw Object.assign(statErr, { symlink: true })
+    })
+  })
+}
+
 function tagsSpecified (sources) {
   return sources.some(({ tags }) => tags && (Array.isArray(tags) ? tags.length : true))
 }
@@ -1022,7 +1016,7 @@ function findWorktrees (repo, patterns) {
   return (patterns.length
     ? fsp
       .readdir((worktreesDir = ospath.join(repo.dir, '.git', 'worktrees')))
-      .then((worktreeNames) => filterRefs(worktreeNames, [...patterns], patternCache), invariably.emptyArray)
+      .then((worktreeNames) => filterRefs(worktreeNames, patterns, patternCache), invariably.emptyArray)
       .then((worktreeNames) =>
         worktreeNames.length
           ? Promise.all(

package/lib/constants.js

@@ -4,22 +4,11 @@ module.exports = Object.freeze({
   COMPONENT_DESC_FILENAME: 'antora.yml',
   CONTENT_CACHE_FOLDER: 'content',
   CONTENT_SRC_GLOB: '**/*[!~]',
-  CONTENT_SRC_OPTS: { follow: true, nomount: true, nosort: true, nounique: true, removeBOM: false, uniqueBy: (m) => m },
+  CONTENT_SRC_OPTS: { follow: true, nomount: true, nosort: true, nounique: true, strict: false, uniqueBy: (m) => m },
   FILE_MODES: { 100644: 0o100666 & ~process.umask(), 100755: 0o100777 & ~process.umask() },
   GIT_CORE: 'antora',
   GIT_OPERATION_LABEL_LENGTH: 8,
   GIT_PROGRESS_PHASES: ['Counting objects', 'Compressing objects', 'Receiving objects', 'Resolving deltas'],
-  PICOMATCH_VERSION_OPTS: {
-    bash: true,
-    dot: true,
-    fastpaths: false,
-    nobracket: true,
-    noglobstar: true,
-    nonegate: true,
-    noquantifiers: true,
-    regex: false,
-    strictSlashes: true,
-  },
   REF_PATTERN_CACHE_KEY: Symbol('RefPatternCache'),
   SYMLINK_FILE_MODE: '120000',
   VALID_STATE_FILENAME: 'valid',

package/lib/filter-refs.js

@@ -1,49 +1,31 @@
 'use strict'
 
-const { compile: bracesToGroup } = require('braces')
-const { makeRe: makePicomatchRx } = require('picomatch')
-
-function getPicomatchOpts (cache) {
-  return {
-    bash: true,
-    dot: true,
-    expandRange: (begin, end, step, opts) => {
-      const pattern = opts ? `{${begin}..${end}..${step}}` : `{${begin}..${end}}`
-      return cache.braces.get(pattern) || cache.braces.set(pattern, bracesToGroup(pattern)).get(pattern)
-    },
-    fastpaths: false,
-    nobracket: true,
-    noglobstar: true,
-    noquantifiers: true,
-    regex: false,
-    strictSlashes: true,
-  }
-}
+const { makeMatcherRx, refMatcherOpts: getMatcherOpts, MATCH_ALL_RX } = require('./matcher')
 
 function compileRx (pattern, opts) {
-  if (pattern === '*' || pattern === '**') return { test: () => true }
+  if (pattern === '*' || pattern === '**') return MATCH_ALL_RX
   return pattern.charAt() === '!' // do our own negate
-    ? Object.defineProperty(makePicomatchRx(pattern.substr(1), opts), 'negated', { value: true })
-    : makePicomatchRx(pattern, opts)
+    ? Object.defineProperty(makeMatcherRx(pattern.substr(1), opts), 'negated', { value: true })
+    : makeMatcherRx(pattern, opts)
 }
 
-function createMatcher (patterns, cache) {
-  let opts
+function createMatcher (patterns, cache, opts) {
   const rxs = patterns.map(
     (pattern) =>
-      cache.get(pattern) ||
-      cache.set(pattern, compileRx(pattern, opts || (opts = getPicomatchOpts(cache)))).get(pattern)
+      cache.get(pattern) || cache.set(pattern, compileRx(pattern, opts || (opts = getMatcherOpts(cache)))).get(pattern)
   )
+  if (rxs[0].negated) rxs.unshift(MATCH_ALL_RX)
   return (candidate) => {
-    let first = true
     let matched
     for (const rx of rxs) {
+      let voteIfMatched = true
       if (matched) {
-        if (rx.negated && rx.test(candidate)) return
-      } else if (first || !rx.negated) {
-        matched = rx.test(candidate)
+        if (!rx.negated) continue
+        voteIfMatched = false
+      } else if (rx.negated) {
+        continue
       }
-      first = false
+      if (rx.test(candidate)) matched = voteIfMatched
     }
     return matched
   }

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

@@ -2,17 +2,16 @@
 
 const { homedir } = require('os')
 const expandPath = require('@antora/expand-path-helper')
-const invariably = { void: () => undefined }
 const { promises: fsp } = require('fs')
+const invariably = require('./invariably')
 const ospath = require('path')
 
 class GitCredentialManagerStore {
   configure ({ config, startDir }) {
     this.entries = undefined
+    this.path = undefined
     this.urls = {}
-    if ((this.contents = (config = config || {}).contents) || !config.path) {
-      this.path = undefined
-    } else {
+    if (!(this.contents = (config = config || {}).contents) && config.path) {
       this.path = expandPath(config.path, { dot: startDir })
     }
     return this
@@ -35,14 +34,13 @@ class GitCredentialManagerStore {
           'git',
           'credentials'
         )
-        contentsPromise = fsp
-          .access(homeGitCredentialsPath)
-          .then(() => fsp.readFile(homeGitCredentialsPath, 'utf8'))
-          .catch(() =>
+        contentsPromise = fsp.access(homeGitCredentialsPath).then(
+          () => fsp.readFile(homeGitCredentialsPath, 'utf8'),
+          () =>
             fsp
               .access(xdgConfigGitCredentialsPath)
               .then(() => fsp.readFile(xdgConfigGitCredentialsPath, 'utf8'), invariably.void)
-          )
+        )
       }
       contentsPromise.then((contents) => {
         if (contents) {

package/lib/invariably.js

@@ -0,0 +1,3 @@
+'use strict'
+
+module.exports = { true: () => true, false: () => false, void: () => undefined, emptyArray: () => [] }

package/lib/matcher.js

@@ -0,0 +1,32 @@
+'use strict'
+
+const { compile: bracesToGroup, expand: expandBraces } = require('braces')
+const { makeRe: makeMatcherRx } = require('picomatch')
+
+const BASE_OPTS = {
+  bash: true,
+  dot: true,
+  expandRange: (begin, end, step, opts) => bracesToGroup(opts ? `{${begin}..${end}..${step}}` : `{${begin}..${end}}`),
+  fastpaths: false,
+  nobracket: true,
+  noglobstar: true,
+  nonegate: true,
+  noquantifiers: true,
+  regex: false,
+  strictSlashes: true,
+}
+
+module.exports = {
+  MATCH_ALL_RX: { test: () => true },
+  expandBraces,
+  makeMatcherRx,
+  pathMatcherOpts: Object.assign({}, BASE_OPTS, { dot: false }),
+  refMatcherOpts: (cache) =>
+    Object.assign({}, BASE_OPTS, {
+      expandRange: (begin, end, step, opts) => {
+        const pattern = opts ? `{${begin}..${end}..${step}}` : `{${begin}..${end}}`
+        return cache.braces.get(pattern) || cache.braces.set(pattern, bracesToGroup(pattern)).get(pattern)
+      },
+    }),
+  versionMatcherOpts: Object.assign({}, BASE_OPTS, { nonegate: false }),
+}

package/lib/resolve-path-globs.js

@@ -1,32 +1,20 @@
 'use strict'
 
-const { expand: expandBraces, compile: bracesToGroup } = require('braces')
 const flattenDeep = require('./flatten-deep')
 const { promises: fsp } = require('fs')
 const git = require('./git')
-const invariably = { true: () => true, false: () => false, void: () => undefined, emptyArray: () => [] }
-const { makeRe: makePicomatchRx } = require('picomatch')
+const invariably = require('./invariably')
+const { expandBraces, makeMatcherRx, pathMatcherOpts: MATCHER_OPTS } = require('./matcher')
 
 const NON_GLOB_SPECIAL_CHARS_RX = /[.+?^${}()|[\]\\]/g
 const RX_MAGIC_DETECTOR = /[*{(]/
-const PICOMATCH_OPTS = {
-  bash: true,
-  expandRange: (begin, end, step, opts) => bracesToGroup(opts ? `{${begin}..${end}..${step}}` : `{${begin}..${end}}`),
-  fastpaths: false,
-  nobracket: true,
-  noglobstar: true,
-  nonegate: true,
-  noquantifiers: true,
-  regex: false,
-  strictSlashes: true,
-}
 
 function resolvePathGlobs (base, patterns, listDirents, retrievePath, tree = { path: '' }) {
   return patterns.reduce((paths, pattern) => {
     if (pattern.charAt() === '!') {
       return paths.then((resolvedPaths) => {
         if (resolvedPaths.length) {
-          const rx = makePicomatchRx(pattern.substr(1), PICOMATCH_OPTS)
+          const rx = makeMatcherRx(pattern.substr(1), MATCHER_OPTS)
           return resolvedPaths.filter((it) => !rx.test(it))
         } else {
           return resolvedPaths
@@ -49,10 +37,10 @@ async function glob (base, patternSegments, listDirents, retrievePath, { oid, pa
     if (patternSegment === '*') {
       isMatch = (it) => it.charAt() !== '.'
     } else if (~patternSegment.indexOf('(')) {
-      isMatch = (isMatch = makePicomatchRx(patternSegment, PICOMATCH_OPTS)).test.bind(isMatch)
+      isMatch = (isMatch = makeMatcherRx(patternSegment, MATCHER_OPTS)).test.bind(isMatch)
     } else if (~patternSegment.indexOf('{')) {
       if (globbed) {
-        isMatch = (isMatch = makePicomatchRx(patternSegment, PICOMATCH_OPTS)).test.bind(isMatch)
+        isMatch = (isMatch = makeMatcherRx(patternSegment, MATCHER_OPTS)).test.bind(isMatch)
       } else if (~patternSegment.indexOf('*')) {
         const [wildPatterns, literals] = expandBraces(patternSegment).reduce(
           ([wild, literal], it) => (~it.indexOf('*') ? [[...wild, it], literal] : [wild, [...literal, it]]),
@@ -64,7 +52,7 @@ async function glob (base, patternSegments, listDirents, retrievePath, { oid, pa
         return expandBraces(patternSegment).map((it) => joinPath(path, it))
       }
     } else {
-      isMatch = (isMatch = makeMatcherRx(patternSegment)).test.bind(isMatch)
+      isMatch = (isMatch = makeSingleMatcherRx(patternSegment)).test.bind(isMatch)
     }
     let dirents = await listDirents(base, oid || path)
     if (explicit) dirents = dirents.filter((dirent) => !explicit.has(dirent.name))
@@ -134,7 +122,7 @@ function makeAlternationMatcherRx (patterns) {
   return new RegExp('^(?:' + patterns.map(patternToRx).join('|') + ')$')
 }
 
-function makeMatcherRx (pattern) {
+function makeSingleMatcherRx (pattern) {
   return new RegExp('^' + patternToRx(pattern) + '$')
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-aggregator",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.5",
   "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)",
@@ -22,6 +22,7 @@
     "braces": "~3.0",
     "cache-directory": "~2.0",
     "camelcase-keys": "~7.0",
+    "glob-stream": "~7.0",
     "hpagent": "~0.1.0",
     "isomorphic-git": "~1.10",
     "js-yaml": "~4.1",
@@ -30,8 +31,7 @@
     "progress": "~2.0",
     "should-proxy": "~1.0",
     "simple-get": "~4.0",
-    "vinyl": "~2.2",
-    "vinyl-fs": "~3.0"
+    "vinyl": "~2.2"
   },
   "engines": {
     "node": ">=12.21.0"
@@ -49,5 +49,5 @@
     "static site",
     "web publishing"
   ],
-  "gitHead": "7c5ef1ea93dd489af533c80a936c736013c41769"
+  "gitHead": "a13d03df41654d4deb78211a5a54953ce2a35fb8"
 }

package/lib/promise-all-settled-polyfill.js

@@ -1,11 +0,0 @@
-'use strict'
-
-Promise.allSettled = (iterable) =>
-  Promise.all(
-    iterable.map((it) =>
-      it.then(
-        (value) => ({ status: 'fulfilled', value }),
-        (reason) => ({ status: 'rejected', reason })
-      )
-    )
-  )