@antora/content-aggregator 3.0.0-rc.2 → 3.0.0-rc.3

package/lib/aggregate-content.js

@@ -2,7 +2,7 @@
 
 const camelCaseKeys = require('camelcase-keys')
 const { createHash } = require('crypto')
-const createHttpPlugin = require('./git-plugin-http')
+const createGitHttpPlugin = require('./git-plugin-http')
 const decodeUint8Array = require('./decode-uint8-array')
 const EventEmitter = require('events')
 const expandPath = require('@antora/expand-path-helper')
@@ -417,9 +417,8 @@ async function collectFilesFromReference (source, repo, remoteName, authStatus,
 }
 
 function collectFilesFromStartPath (startPath, repo, authStatus, ref, worktreePath, originUrl, editUrl, version) {
-  return (worktreePath
-    ? readFilesFromWorktree(worktreePath, startPath)
-    : readFilesFromGitTree(repo, ref.oid, startPath)
+  return (
+    worktreePath ? readFilesFromWorktree(worktreePath, startPath) : readFilesFromGitTree(repo, ref.oid, startPath)
   )
     .then((files) => {
       const componentVersionBucket = loadComponentDescriptor(files, ref, version)
@@ -775,27 +774,31 @@ function buildFetchOptions (repo, progress, displayUrl, credentialsFromUrl, gitP
 function createProgress (urls, term) {
   if (term.isTTY && term.columns > 59) {
     let maxUrlLength = 0
+    const width = term.columns
     for (const url of urls) {
       if (~url.indexOf(':') && GIT_URI_DETECTOR_RX.test(url)) {
         const urlLength = extractCredentials(url).displayUrl.length
         if (urlLength > maxUrlLength) maxUrlLength = urlLength
       }
     }
-    const progress = new MultiProgress(term)
-    // NOTE remove the width of the operation, then partition the difference between the url and bar
-    progress.maxLabelWidth = Math.min(Math.ceil((term.columns - GIT_OPERATION_LABEL_LENGTH) / 2), maxUrlLength)
-    return progress
+    return Object.assign(new MultiProgress(term), {
+      // NOTE remove the operation width, then partition the difference between the url and bar
+      maxLabelWidth: Math.min(Math.ceil((width - GIT_OPERATION_LABEL_LENGTH) / 2), maxUrlLength),
+      width,
+    })
   }
 }
 
 function createProgressListener (progress, progressLabel, operation) {
+  const width = progress.width
   const progressBar = progress.newBar(formatProgressBar(progressLabel, progress.maxLabelWidth, operation), {
     complete: '#',
     incomplete: '-',
     renderThrottle: 25,
     total: 100,
+    width,
   })
-  const ticks = progressBar.stream.columns - progressBar.fmt.replace(':bar', '').length
+  const ticks = width - progressBar.fmt.replace(':bar', '').length
   // NOTE leave room for indeterminate progress at end of bar; this isn't strictly needed for a bare clone
   progressBar.scaleFactor = Math.max(0, (ticks - 1) / ticks)
   progressBar.tick(0)
@@ -936,7 +939,7 @@ function loadGitPlugins (gitConfig, networkConfig, startDir) {
     credentialManager = new GitCredentialManagerStore().configure({ config: gitConfig.credentials, startDir })
   }
   if (gitConfig.ensureGitSuffix) urlRouter = { ensureGitSuffix: (url) => (url.endsWith('.git') ? url : url + '.git') }
-  const http = plugins.get('http') || createHttpPlugin(networkConfig, 'git/isomorphic-git@' + git.version())
+  const http = plugins.get('http') || createGitHttpPlugin(networkConfig)
   return { credentialManager, http, urlRouter }
 }
 
@@ -1013,28 +1016,29 @@ function findWorktrees (repo, patterns) {
   const linkedOnly = patterns[0] === '.' ? !(patterns = patterns.slice(1)) : true
   let worktreesDir
   const patternCache = repo.cache[REF_PATTERN_CACHE_KEY]
-  return (patterns.length
-    ? fsp
-      .readdir((worktreesDir = ospath.join(repo.dir, '.git', 'worktrees')))
-      .then((worktreeNames) => filterRefs(worktreeNames, patterns, patternCache), invariably.emptyArray)
-      .then((worktreeNames) =>
-        worktreeNames.length
-          ? Promise.all(
-            worktreeNames.map((worktreeName) => {
-              const gitdir = ospath.resolve(worktreesDir, worktreeName)
-              // NOTE uses name of worktree as branch name if HEAD is detached
-              return git
-                .currentBranch(Object.assign({}, repo, { gitdir }))
-                .then((branch = worktreeName) =>
-                  fsp
-                    .readFile(ospath.join(gitdir, 'gitdir'), 'utf8')
-                    .then((contents) => ({ branch, dir: ospath.dirname(contents.trimRight()) }))
-                )
-            })
-          ).then((entries) => entries.reduce((accum, it) => accum.set(it.branch, it.dir), new Map()))
-          : new Map()
-      )
-    : Promise.resolve(new Map())
+  return (
+    patterns.length
+      ? fsp
+        .readdir((worktreesDir = ospath.join(repo.dir, '.git', 'worktrees')))
+        .then((worktreeNames) => filterRefs(worktreeNames, patterns, patternCache), invariably.emptyArray)
+        .then((worktreeNames) =>
+          worktreeNames.length
+            ? Promise.all(
+              worktreeNames.map((worktreeName) => {
+                const gitdir = ospath.resolve(worktreesDir, worktreeName)
+                // NOTE uses name of worktree as branch name if HEAD is detached
+                return git
+                  .currentBranch(Object.assign({}, repo, { gitdir }))
+                  .then((branch = worktreeName) =>
+                    fsp
+                      .readFile(ospath.join(gitdir, 'gitdir'), 'utf8')
+                      .then((contents) => ({ branch, dir: ospath.dirname(contents.trimRight()) }))
+                  )
+              })
+            ).then((entries) => entries.reduce((accum, it) => accum.set(it.branch, it.dir), new Map()))
+            : new Map()
+        )
+      : Promise.resolve(new Map())
   ).then((worktrees) =>
     linkedOnly
       ? worktrees

package/lib/flatten-deep.js

@@ -2,9 +2,7 @@
 
 function flattenDeep (array, accum = []) {
   const len = array.length
-  for (let i = 0, it; i < len; i++) {
-    Array.isArray((it = array[i])) ? flattenDeep(it, accum) : accum.push(it)
-  }
+  for (let i = 0, it; i < len; i++) Array.isArray((it = array[i])) ? flattenDeep(it, accum) : accum.push(it)
   return accum
 }
 

package/lib/git-plugin-http.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const get = require('simple-get')
+const defaultUserAgent = 'git/isomorphic-git@' + require('./git').version()
 
 function distillResponse (res) {
   const { url, method, statusCode, statusMessage, headers } = res
@@ -25,13 +26,21 @@ async function mergeBuffers (data) {
   return Buffer.from(data.buffer)
 }
 
-module.exports = ({ httpProxy, httpsProxy, noProxy }, userAgent) => {
+function mergeHeaders (headers, extraHeaders) {
+  const mergedHeaders = { 'user-agent': defaultUserAgent }
+  if (extraHeaders == null) return Object.assign(headers, mergedHeaders)
+  for (const name in extraHeaders) mergedHeaders[name.toLowerCase()] = extraHeaders[name]
+  for (const name in headers) mergedHeaders[name.toLowerCase()] = headers[name]
+  return mergedHeaders
+}
+
+module.exports = ({ headers: extraHeaders, httpProxy, httpsProxy, noProxy } = {}) => {
   if ((httpsProxy || httpProxy) && noProxy !== '*') {
     const { HttpProxyAgent, HttpsProxyAgent } = require('hpagent')
     const shouldProxy = require('should-proxy')
     return {
       async request ({ url, method, headers, body }) {
-        headers['user-agent'] = userAgent
+        headers = mergeHeaders(headers, extraHeaders)
         body = await mergeBuffers(body)
         const proxy = url.startsWith('https:')
           ? { Agent: HttpsProxyAgent, url: httpsProxy }
@@ -46,7 +55,7 @@ module.exports = ({ httpProxy, httpsProxy, noProxy }, userAgent) => {
   }
   return {
     async request ({ url, method, headers, body }) {
-      headers['user-agent'] = userAgent
+      headers = mergeHeaders(headers, extraHeaders)
       body = await mergeBuffers(body)
       return new Promise((resolve, reject) =>
         get({ url, method, headers, body }, (err, res) => (err ? reject(err) : resolve(distillResponse(res))))

package/lib/resolve-path-globs.js

@@ -129,10 +129,7 @@ function makeSingleMatcherRx (pattern) {
 function patternToRx (pattern) {
   return (
     (pattern.charAt() === '.' ? '' : '(?!\\.)') +
-    pattern
-      .replace(NON_GLOB_SPECIAL_CHARS_RX, '\\$&')
-      .replace('\\\\*', '\\x2a')
-      .replace('*', '.*?')
+    pattern.replace(NON_GLOB_SPECIAL_CHARS_RX, '\\$&').replace('\\\\*', '\\x2a').replace('*', '.*?')
   )
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-aggregator",
-  "version": "3.0.0-rc.2",
+  "version": "3.0.0-rc.3",
   "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)",
@@ -52,5 +52,5 @@
     "static site",
     "web publishing"
   ],
-  "gitHead": "b64861391b7e55ea31fcecce4490b9cc02fec1c7"
+  "gitHead": "f3b3cbb4a08640bbcf55e685929409e20b186634"
 }