@antora/content-aggregator 3.2.0-alpha.1 → 3.2.0-alpha.2

package/README.md

@@ -9,4 +9,4 @@ Its site generator aggregates documents from versioned content repositories and
 
 Copyright (C) 2017-present [OpenDevise Inc.](https://opendevise.com) and the [Antora Project](https://antora.org).
 
-Use of this software is granted under the terms of the [Mozilla Public License Version 2.0](https://www.mozilla.org/en-US/MPL/2.0/) (MPL-2.0).
+Use of this software is granted under the terms of the [Mozilla Public License Version 2.0](https://www.mozilla.org/en-US/MPL/2.0/) (MPL-2.0).

package/lib/aggregate-content.js

@@ -297,11 +297,14 @@ async function selectReferences (source, repo, remote) {
       }
     }
   }
-  if (!branchPatterns) return [...refs.values()]
-  branchPatterns = Array.isArray(branchPatterns)
-    ? branchPatterns.map((pattern) => String(pattern))
-    : splitRefPatterns(String(branchPatterns))
-  if (!branchPatterns.length) return [...refs.values()]
+  if (
+    !branchPatterns ||
+    !(branchPatterns = Array.isArray(branchPatterns)
+      ? branchPatterns.map((pattern) => String(pattern))
+      : splitRefPatterns(String(branchPatterns))).length
+  ) {
+    return [...refs.values()]
+  }
   const worktreeName = repo.worktreeName // possibly switch to worktree property ({ name, dir}) in future
   if (worktreeName) branchPatterns = branchPatterns.map((it) => (it === 'HEAD' ? 'HEAD@' + worktreeName : it))
   if (worktreePatterns) {
@@ -1035,22 +1038,20 @@ function coerceToString (value) {
   return value == null ? '' : String(value)
 }
 
-async function resolveRepositoryFromWorktree (repo) {
+function resolveRepositoryFromWorktree (repo) {
   return fsp
     .readFile(repo.gitdir, 'utf8')
     .then((contents) => contents.trimRight().substr(8))
-    .then((worktreeGitdir) => {
-      const worktreeName = ospath.basename(worktreeGitdir)
-      return fsp.readFile(ospath.join(worktreeGitdir, 'commondir'), 'utf8').then(
+    .then((worktreeGitdir) =>
+      fsp.readFile(ospath.join(worktreeGitdir, 'commondir'), 'utf8').then(
         (contents) => {
           const gitdir = ospath.join(worktreeGitdir, contents.trimRight())
-          return ospath.basename(gitdir) === '.git'
-            ? Object.assign(repo, { dir: ospath.dirname(gitdir), gitdir, worktreeName })
-            : Object.assign(repo, { dir: gitdir, gitdir, worktreeName })
+          const dir = ospath.basename(gitdir) === '.git' ? ospath.dirname(gitdir) : gitdir
+          return Object.assign(repo, { dir, gitdir, worktreeName: ospath.basename(worktreeGitdir) })
         },
         () => repo
       )
-    })
+    )
 }
 
 function findWorktrees (repo, patterns) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-aggregator",
-  "version": "3.2.0-alpha.1",
+  "version": "3.2.0-alpha.2",
   "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)",
@@ -29,12 +29,12 @@
   },
   "dependencies": {
     "@antora/expand-path-helper": "~2.0",
-    "@antora/logger": "3.2.0-alpha.1",
+    "@antora/logger": "3.2.0-alpha.2",
     "@antora/user-require-helper": "~2.0",
     "braces": "~3.0",
     "cache-directory": "~2.0",
     "glob-stream": "~7.0",
-    "hpagent": "~1.1",
+    "hpagent": "~1.2",
     "isomorphic-git": "~1.21",
     "js-yaml": "~4.1",
     "multi-progress": "~4.0",