@antora/content-aggregator 3.2.0-alpha.11 → 3.2.0-alpha.12

package/lib/aggregate-content.js

@@ -195,7 +195,7 @@ async function loadRepository (url, opts, result = {}) {
         authStatus = await git.getConfig(Object.assign({ path: 'remote.origin.private' }, repo))
       }
     } catch (gitErr) {
-      await fsp['rm' in fsp ? 'rm' : 'rmdir'](dir, { recursive: true, force: true })
+      await fsp.rm(dir, { recursive: true, force: true })
       if (gitErr.rethrow) throw transformGitCloneError(gitErr, displayUrl)
       const fetchOpts = buildFetchOptions(repo, progress, displayUrl, credentials, gitPlugins, fetch, 'clone')
       await git
@@ -220,6 +220,7 @@ async function loadRepository (url, opts, result = {}) {
     if (dotgitStat.isDirectory()) {
       repo = { cache, dir, fs, gitdir: dotgit }
     } else if (dotgitStat.isFile()) {
+      // NOTE isomorphic-git will discover the gitdir, but we must do it eagerly to process worktree patterns correctly
       repo = await resolveRepositoryFromWorktree({ cache, dir, fs, gitdir: dotgit })
     } else {
       repo = { cache, dir, fs, gitdir: dir, noCheckout: true }
@@ -415,9 +416,11 @@ async function selectReferences (source, repo, remote) {
       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) {
+    let onMatch, worktrees
+    if (
+      (useWorktree || worktreePatterns.length) &&
+      (worktrees = await findWorktrees(repo, worktreePatterns, useWorktree)).size
+    ) {
       const headNames = new Map()
       worktrees.forEach(({ name, symbolicNames }, shortname) => {
         if (name) {
@@ -443,6 +446,7 @@ async function selectReferences (source, repo, remote) {
       const preferRemote = isBare && remoteBranches.length > 0
       for (const shortname of filterRefs(localBranches, branchPatterns, patternCache, onMatch)) {
         if (preferRemote && refs.has(shortname)) continue
+        worktrees ??= await findWorktrees(repo, worktreePatterns, useWorktree)
         const head = (worktrees.get(shortname) || { head: false }).head
         refs.set(shortname, { shortname, fullname: 'heads/' + shortname, type: 'branch', head })
       }
@@ -508,7 +512,9 @@ function collectFilesFromStartPath (startPath, repo, authStatus, ref, originUrl,
   return (worktreePath ? readFilesFromWorktree(origin) : readFilesFromGitTree(repo, ref.oid, startPath))
     .then((files) => {
       const batch = deepClone((origin.descriptor = loadComponentDescriptor(files, ref, version)))
-      if ('nav' in batch && Array.isArray(batch.nav)) batch.nav.origin = origin
+      if ('nav' in batch && Array.isArray(batch.nav)) {
+        Object.defineProperty(batch.nav, 'origin', { configurable: true, value: origin, writable: true })
+      }
       batch.files = files.map((file) => assignFileProperties(file, origin))
       batch.origins = [origin]
       return batch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-aggregator",
-  "version": "3.2.0-alpha.11",
+  "version": "3.2.0-alpha.12",
   "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)",
@@ -33,13 +33,13 @@
   },
   "dependencies": {
     "@antora/expand-path-helper": "~3.0",
-    "@antora/logger": "3.2.0-alpha.11",
+    "@antora/logger": "3.2.0-alpha.12",
     "@antora/user-require-helper": "~3.0",
     "braces": "~3.0",
     "cache-directory": "~2.0",
     "fast-glob": "~3.3",
     "hpagent": "~1.2",
-    "isomorphic-git": "~1.25",
+    "isomorphic-git": "~1.37",
     "js-yaml": "~4.1",
     "multi-progress": "~4.0",
     "picomatch": "~4.0",
@@ -65,7 +65,7 @@
     "web publishing"
   ],
   "scripts": {
-    "test": "_mocha",
+    "test": "node --test",
     "prepublishOnly": "npx -y downdoc@latest --prepublish",
     "postpublish": "npx -y downdoc@latest --postpublish"
   }