@antora/content-aggregator 3.1.13 → 3.1.14

package/lib/aggregate-content.js

@@ -87,8 +87,8 @@ const URL_PORT_CLEANER_RX = /^([^/]+):[0-9]+(?=\/)/
  */
 function aggregateContent (playbook) {
   const startDir = playbook.dir || '.'
-  const { branches, editUrl, tags, sources } = playbook.content
-  const sourceDefaults = { branches, editUrl, tags }
+  const { branches, editUrl, tags, sources, worktrees } = playbook.content
+  const sourceDefaults = { branches, editUrl, tags, worktrees }
   const { cacheDir: requestedCacheDir, fetch, quiet } = playbook.runtime
   return ensureCacheDir(requestedCacheDir, startDir).then((cacheDir) => {
     const gitConfig = Object.assign({ ensureGitSuffix: true }, playbook.git)
@@ -285,7 +285,7 @@ async function selectStartPathsForRepository (repo, authStatus, sources) {
 
 // QUESTION should we resolve HEAD to a ref eagerly to avoid having to do a match on it?
 async function selectReferences (source, repo, remote) {
-  let { branches: branchPatterns, tags: tagPatterns, worktrees: worktreePatterns = '.' } = source
+  let { branches: branchPatterns, tags: tagPatterns, worktrees: worktreePatterns } = source
   const managed = 'url' in repo
   const isBare = managed || repo.noCheckout
   const patternCache = repo.cache[REF_PATTERN_CACHE_KEY]
@@ -306,15 +306,19 @@ async function selectReferences (source, repo, remote) {
     }
   }
   if (!branchPatterns) return [...refs.values()]
+  let usePrimaryWorktree
   if (worktreePatterns) {
     if (worktreePatterns === '.') {
-      worktreePatterns = ['.']
+      worktreePatterns = (usePrimaryWorktree = true) && []
     } else if (worktreePatterns === true) {
-      worktreePatterns = ['.', '*']
+      worktreePatterns = (usePrimaryWorktree = true) && ['*']
     } else {
       worktreePatterns = Array.isArray(worktreePatterns)
         ? worktreePatterns.map((pattern) => String(pattern))
         : splitRefPatterns(String(worktreePatterns))
+      if (~worktreePatterns.indexOf('.')) {
+        worktreePatterns = (usePrimaryWorktree = true) && worktreePatterns.filter((it) => it !== '.')
+      }
     }
   } else {
     worktreePatterns = []
@@ -328,7 +332,7 @@ async function selectReferences (source, repo, remote) {
       return [...refs.values()]
     } else {
       // NOTE current branch is undefined when HEAD is detached
-      const head = worktreePatterns[0] === '.' ? repo.dir : noWorktree
+      const head = usePrimaryWorktree ? repo.dir : noWorktree
       refs.set('HEAD', { shortname: 'HEAD', fullname: 'HEAD', type: 'branch', detached: true, head })
       return [...refs.values()]
     }
@@ -351,11 +355,7 @@ async function selectReferences (source, repo, remote) {
       } else if (isBare) {
         branchPatterns.splice(headBranchIdx, 1)
       } else {
-        let head = noWorktree
-        if (worktreePatterns[0] === '.') {
-          worktreePatterns = worktreePatterns.slice(1)
-          head = repo.dir
-        }
+        const head = usePrimaryWorktree ? 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)
@@ -378,7 +378,7 @@ async function selectReferences (source, repo, remote) {
   if (!isBare) {
     const localBranches = await git.listBranches(repo)
     if (localBranches.length) {
-      const worktrees = await findWorktrees(repo, worktreePatterns)
+      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 })
@@ -1029,9 +1029,8 @@ function coerceToString (value) {
   return value == null ? '' : String(value)
 }
 
-function findWorktrees (repo, patterns) {
-  if (!patterns.length) return new Map()
-  const linkedOnly = patterns[0] === '.' ? !(patterns = patterns.slice(1)) : true
+function findWorktrees (repo, patterns, usePrimaryWorktree) {
+  if (!(usePrimaryWorktree || patterns.length)) return new Map()
   let worktreesDir
   const patternCache = repo.cache[REF_PATTERN_CACHE_KEY]
   return (
@@ -1058,9 +1057,9 @@ function findWorktrees (repo, patterns) {
           )
       : Promise.resolve(new Map())
   ).then((worktrees) =>
-    linkedOnly
-      ? worktrees
-      : git.currentBranch(repo).then((branch) => (branch ? worktrees.set(branch, repo.dir) : worktrees))
+    usePrimaryWorktree
+      ? git.currentBranch(repo).then((branch) => (branch ? worktrees.set(branch, repo.dir) : worktrees))
+      : worktrees
   )
 }
 

package/lib/filter-refs.js

@@ -31,6 +31,7 @@ function createMatcher (patterns, cache = Object.assign(new Map(), { braces: new
 }
 
 function filterRefs (candidates, patterns, cache) {
+  if (!(patterns = patterns.filter(compact)).length) return []
   const isMatch = createMatcher(patterns, cache)
   return candidates.reduce((accum, candidate) => {
     if (isMatch(candidate)) accum.push(candidate)
@@ -38,4 +39,8 @@ function filterRefs (candidates, patterns, cache) {
   }, [])
 }
 
+function compact (str) {
+  return str !== ''
+}
+
 module.exports = filterRefs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-aggregator",
-  "version": "3.1.13",
+  "version": "3.1.14",
   "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)",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@antora/expand-path-helper": "~3.0",
-    "@antora/logger": "3.1.13",
+    "@antora/logger": "3.1.14",
     "@antora/user-require-helper": "~3.0",
     "braces": "~3.0",
     "cache-directory": "~2.0",