@antora/content-aggregator 3.1.0 → 3.1.2

package/lib/aggregate-content.js

@@ -303,6 +303,8 @@ async function selectReferences (source, repo, remote) {
         ? worktreePatterns.map((pattern) => String(pattern))
         : splitRefPatterns(String(worktreePatterns))
     }
+  } else {
+    worktreePatterns = []
   }
   const branchPatternsString = String(branchPatterns)
   if (branchPatternsString === 'HEAD' || branchPatternsString === '.') {
@@ -459,17 +461,16 @@ function readFilesFromWorktree (origin) {
 }
 
 function srcFs (cwd, origin) {
-  const relpathStart = cwd.length + 1
-  return new Promise((resolve, reject, cache = Object.create(null), files = []) =>
+  return new Promise((resolve, reject, cache = Object.create(null), files = [], relpathStart = cwd.length + 1) =>
     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
+        if ((cache[abspathPosix] || {}).constructor === Array) return done() // detects some directories
         const abspath = posixify ? ospath.normalize(abspathPosix) : abspathPosix
         const relpath = abspath.substr(relpathStart)
         symlinkAwareStat(abspath).then(
           (stat) => {
-            if (stat.isDirectory()) return done() // detects remaining directories
+            if (stat.isDirectory()) return done() // detects directories that slipped through cache check
             fsp.readFile(abspath).then(
               (contents) => {
                 files.push(new File({ path: posixify ? posixify(relpath) : relpath, contents, stat, src: { abspath } }))
@@ -824,11 +825,11 @@ function onGitComplete (err) {
 }
 
 function resolveCredentials (credentialsFromUrlHolder, url, auth) {
-  const credentialsFromUrl = credentialsFromUrlHolder.get()
+  const credentialsFromUrl = credentialsFromUrlHolder.get() || {}
+  credentialsFromUrlHolder.clear()
   if ('Authorization' in auth.headers) {
-    if (!credentialsFromUrl) return this.rejected({ url, auth })
-    credentialsFromUrlHolder.clear()
-  } else if (credentialsFromUrl) {
+    if (!('username' in credentialsFromUrl)) return this.rejected({ url, auth })
+  } else if ('username' in credentialsFromUrl) {
     return credentialsFromUrl
   } else {
     auth = undefined
@@ -852,13 +853,9 @@ function resolveCredentials (credentialsFromUrlHolder, url, auth) {
  * @returns {String} The generated folder name.
  */
 function generateCloneFolderName (url) {
-  let normalizedUrl = url.toLowerCase()
-  if (posixify) normalizedUrl = posixify(normalizedUrl)
-  normalizedUrl = removeGitSuffix(normalizedUrl)
+  const normalizedUrl = removeGitSuffix(posixify ? posixify(url.toLowerCase()) : url.toLowerCase())
   const basename = normalizedUrl.split(ANY_SEPARATOR_RX).pop()
-  const hash = createHash('sha1')
-  hash.update(normalizedUrl)
-  return basename + '-' + hash.digest('hex') + '.git'
+  return basename + '-' + createHash('sha1').update(normalizedUrl).digest('hex') + '.git'
 }
 
 /**
@@ -888,7 +885,7 @@ function resolveRemoteUrl (repo, remoteName) {
  * Checks whether the specified URL matches a directory on the local filesystem.
  *
  * @param {String} url - The URL to check.
- * @return {Boolean} A flag indicating whether the URL matches a directory on the local filesystem.
+ * @returns {Boolean} A flag indicating whether the URL matches a directory on the local filesystem.
  */
 function isDirectory (url) {
   return fsp.stat(url).then((stat) => stat.isDirectory(), invariably.false)

package/lib/constants.js

@@ -4,7 +4,7 @@ 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, strict: false, uniqueBy: (m) => m },
+  CONTENT_SRC_OPTS: { follow: true, nomount: true, nosort: true, nounique: true, strict: false },
   FILE_MODES: { 100644: 0o100666 & ~process.umask(), 100755: 0o100777 & ~process.umask() },
   GIT_CORE: 'antora',
   GIT_OPERATION_LABEL_LENGTH: 8,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-aggregator",
-  "version": "3.1.0",
+  "version": "3.1.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,13 +29,13 @@
   },
   "dependencies": {
     "@antora/expand-path-helper": "~2.0",
-    "@antora/logger": "3.1.0",
+    "@antora/logger": "3.1.2",
     "@antora/user-require-helper": "~2.0",
     "braces": "~3.0",
     "cache-directory": "~2.0",
     "glob-stream": "~7.0",
-    "hpagent": "~1.0",
-    "isomorphic-git": "~1.19",
+    "hpagent": "~1.1",
+    "isomorphic-git": "~1.21",
     "js-yaml": "~4.1",
     "multi-progress": "~4.0",
     "picomatch": "~2.3",