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

package/lib/compute-origin.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { posix: path } = require('path')
+const { posix: path } = require('node:path')
 const posixify = require('./posixify')
 const removeGitSuffix = require('./remove-git-suffix')
 
@@ -24,7 +24,7 @@ function computeOrigin (url, authStatus, gitdir, ref, startPath, worktreePath =
   if (authStatus) origin.private = authStatus
   if (url) origin.webUrl = removeGitSuffix(url)
   if (editUrl === true) {
-    const match = url && url.match(HOSTED_GIT_REPO_RX)
+    const match = url?.match(HOSTED_GIT_REPO_RX)
     if (match) {
       const host = match[1]
       let action = 'blob'
@@ -33,15 +33,16 @@ function computeOrigin (url, authStatus, gitdir, ref, startPath, worktreePath =
         category = 'f'
       } else if (host === 'bitbucket.org') {
         action = 'src'
-      } else if (reftype === 'branch') {
-        action = 'edit'
+      } else {
+        if (reftype === 'branch') action = 'edit'
+        if (host.startsWith('gitlab.')) action = '-/' + action
       }
       origin.editUrlPattern = 'https://' + path.join(match[1], match[2], action, refname, category, startPath, '%s')
     }
   } else if (editUrl) {
     const vars = {
       path: () => (startPath ? path.join(startPath, '%s') : '%s'),
-      ref: () => 'refs/' + (reftype === 'branch' ? 'heads' : reftype) + '/' + refname,
+      ref: () => 'refs/' + (reftype === 'branch' ? 'head' : reftype) + 's/' + refname,
       refhash: () => refhash,
       reftype: () => reftype,
       refname: () => refname,

package/lib/constants.js

@@ -3,8 +3,8 @@
 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 },
+  CONTENT_SRC_GLOB: '**/!(*~)',
+  CONTENT_SRC_OPTS: { dot: true, ignore: ['**/.*{,/**}'], objectMode: true, onlyFiles: false, unique: false },
   FILE_MODES: { 100644: 0o100666 & ~process.umask(), 100755: 0o100777 & ~process.umask() },
   GIT_CORE: 'antora',
   GIT_OPERATION_LABEL_LENGTH: 8,

package/lib/decode-uint8-array.js

@@ -3,4 +3,4 @@
 module.exports = (({ StringDecoder }) => {
   const decoder = new StringDecoder()
   return decoder.write.bind(decoder)
-})(require('string_decoder'))
+})(require('node:string_decoder'))

package/lib/filter-refs.js

@@ -11,10 +11,9 @@ function compileRx (pattern, opts) {
   return Object.defineProperty(rx, 'pattern', { value: pattern })
 }
 
-function createMatcher (patterns, cache, opts) {
+function createMatcher (patterns, cache = Object.assign(new Map(), { braces: new Map() })) {
   const rxs = patterns.map(
-    (pattern) =>
-      cache.get(pattern) || cache.set(pattern, compileRx(pattern, opts || (opts = getMatcherOpts(cache)))).get(pattern)
+    (pattern) => cache.get(pattern) || cache.set(pattern, compileRx(pattern, getMatcherOpts(cache))).get(pattern)
   )
   if (rxs[0].negated) rxs.unshift(MATCH_ALL_RX)
   return (candidate, onMatch) => {
@@ -39,7 +38,8 @@ function createMatcher (patterns, cache, opts) {
   }
 }
 
-function filterRefs (candidates, patterns, cache = Object.assign(new Map(), { braces: new Map() }), onMatch) {
+function filterRefs (candidates, patterns, cache, onMatch) {
+  if (!(patterns = patterns.filter(compact)).length) return []
   const match = createMatcher(patterns, cache)
   return candidates.reduce((accum, candidate) => {
     if ((candidate = match(candidate, onMatch))) accum.push(candidate)
@@ -47,4 +47,8 @@ function filterRefs (candidates, patterns, cache = Object.assign(new Map(), { br
   }, [])
 }
 
+function compact (str) {
+  return str !== ''
+}
+
 module.exports = filterRefs

package/lib/git-credential-manager-store.js

@@ -1,10 +1,10 @@
 'use strict'
 
-const { homedir } = require('os')
+const { homedir } = require('node:os')
 const expandPath = require('@antora/expand-path-helper')
-const { promises: fsp } = require('fs')
+const { promises: fsp } = require('node:fs')
 const invariably = require('./invariably')
-const ospath = require('path')
+const ospath = require('node:path')
 
 class GitCredentialManagerStore {
   configure ({ config, startDir }) {

package/lib/git-plugin-http.js

@@ -49,11 +49,12 @@ module.exports = ({ headers: extraHeaders, httpProxy, httpsProxy, noProxy } = {}
   }
   return {
     async request ({ url, method, headers, body }) {
-      headers = mergeHeaders(headers, extraHeaders)
+      headers = Object.assign(mergeHeaders(headers, extraHeaders), { connection: 'close' })
       body = await mergeBuffers(body)
-      return new Promise((resolve, reject) =>
-        get({ url, method, headers, body }, (err, res) => (err ? reject(err) : resolve(distillResponse(res))))
-      )
+      return new Promise((resolve, reject) => {
+        const opts = { url, method, headers, body, timeout: 0, keepAlive: false }
+        return get(opts, (err, res) => (err ? reject(err) : resolve(distillResponse(res))))
+      })
     },
   }
 }

package/lib/git.js

@@ -1,3 +1,10 @@
 'use strict'
 
-module.exports = require('isomorphic-git')
+const zlib = require('node:zlib')
+const { promisify } = require('node:util')
+
+module.exports = ((pakoModuleId) => {
+  const git = require('isomorphic-git')
+  require(pakoModuleId).inflate = promisify(zlib.inflate)
+  return git
+})('pako')

package/lib/matcher.js

@@ -16,15 +16,10 @@ const BASE_OPTS = {
   strictSlashes: true,
 }
 
-function makeMatcherRx (input, opts) {
-  if (input && ~input.indexOf('{')) input = input.replace(/^([^({]+)\./, '$1(?:.)')
-  return makeRe(input, opts)
-}
-
 module.exports = {
   MATCH_ALL_RX: Object.defineProperty({ test: () => true }, 'pattern', { value: '*' }),
   expandBraces,
-  makeMatcherRx,
+  makeMatcherRx: makeRe,
   pathMatcherOpts: Object.assign({}, BASE_OPTS, { dot: false }),
   refMatcherOpts: (cache) =>
     Object.assign({}, BASE_OPTS, {

package/lib/posixify.js

@@ -1,3 +1,3 @@
 'use strict'
 
-module.exports = require('path').sep === '\\' ? (p) => p.replace(/\\/g, '/') : undefined
+module.exports = require('node:path').sep === '\\' ? (p) => p.replace(/\\/g, '/') : undefined

package/lib/resolve-path-globs.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const deepFlatten = require('./deep-flatten')
-const { promises: fsp } = require('fs')
+const { promises: fsp } = require('node:fs')
 const git = require('./git')
 const invariably = require('./invariably')
 const { expandBraces, makeMatcherRx, pathMatcherOpts: MATCHER_OPTS } = require('./matcher')
@@ -16,11 +16,11 @@ function resolvePathGlobs (base, patterns, listDirents, retrievePath, tree = { p
         if (resolvedPaths.length) {
           const rx = makeMatcherRx(pattern.substr(1), MATCHER_OPTS)
           return resolvedPaths.filter((it) => !rx.test(it))
-        } else {
-          return resolvedPaths
         }
+        return resolvedPaths
       })
-    } else if (RX_MAGIC_DETECTOR.test(pattern)) {
+    }
+    if (RX_MAGIC_DETECTOR.test(pattern)) {
       return glob(base, pattern.split('/'), listDirents, retrievePath, tree).then((nestedPaths) =>
         paths.then((resolvedPaths) => [...resolvedPaths, ...nestedPaths])
       )
@@ -62,35 +62,36 @@ async function glob (base, patternSegments, listDirents, retrievePath, { oid, pa
           dirent.isDirectory() && isMatch(dirent.name)
             ? patternSegments.length
               ? glob(base, patternSegments, listDirents, retrievePath, {
-                oid: dirent.oid,
-                path: joinPath(path, dirent.name),
-                globbed: true,
-              })
+                  oid: dirent.oid,
+                  path: joinPath(path, dirent.name),
+                  globbed: true,
+                })
               : joinPath(path, dirent.name)
             : []
         )
       )
     )
     return explicit ? [...[...explicit].map((it) => joinPath(path, it)), ...discovered] : discovered
-  } else {
-    const [magicBase, nextSegment] = extractMagicBase(patternSegments, patternSegment)
-    patternSegment = magicBase
-    if (nextSegment) {
-      const obj = await retrievePath(base, { oid, path }, patternSegment)
-      if (obj) {
-        return glob(base, patternSegments, listDirents, retrievePath, {
-          oid: obj.oid,
-          path: joinPath(path, patternSegment),
-        })
-      } else if ((patternSegment += '/' + patternSegments.join('/')).indexOf('{')) {
-        return expandBraces(patternSegment).map((it) => joinPath(path, it))
-      }
-      return [joinPath(path, patternSegment)]
-    } else if (globbed) {
-      return (await retrievePath(base, { oid, path }, patternSegment)) ? [joinPath(path, patternSegment)] : []
+  }
+  const [magicBase, nextSegment] = extractMagicBase(patternSegments, patternSegment)
+  patternSegment = magicBase
+  if (nextSegment) {
+    const obj = await retrievePath(base, { oid, path }, patternSegment)
+    if (obj) {
+      return glob(base, patternSegments, listDirents, retrievePath, {
+        oid: obj.oid,
+        path: joinPath(path, patternSegment),
+      })
+    }
+    if ((patternSegment += '/' + patternSegments.join('/')).indexOf('{')) {
+      return expandBraces(patternSegment).map((it) => joinPath(path, it))
     }
     return [joinPath(path, patternSegment)]
   }
+  if (globbed) {
+    return (await retrievePath(base, { oid, path }, patternSegment)) ? [joinPath(path, patternSegment)] : []
+  }
+  return [joinPath(path, patternSegment)]
 }
 
 function extractMagicBase (patternSegments, base) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-aggregator",
-  "version": "3.2.0-alpha.1",
+  "version": "3.2.0-alpha.11",
   "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)",
@@ -11,7 +11,11 @@
     "Balachandran Sivakumar <balachandran@balachandran.org>"
   ],
   "homepage": "https://antora.org",
-  "repository": "gitlab:antora/antora",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitlab.com/antora/antora.git",
+    "directory": "packages/content-aggregator"
+  },
   "bugs": {
     "url": "https://gitlab.com/antora/antora/issues"
   },
@@ -28,24 +32,24 @@
     "#constants": "./lib/constants.js"
   },
   "dependencies": {
-    "@antora/expand-path-helper": "~2.0",
-    "@antora/logger": "3.2.0-alpha.1",
-    "@antora/user-require-helper": "~2.0",
+    "@antora/expand-path-helper": "~3.0",
+    "@antora/logger": "3.2.0-alpha.11",
+    "@antora/user-require-helper": "~3.0",
     "braces": "~3.0",
     "cache-directory": "~2.0",
-    "glob-stream": "~7.0",
-    "hpagent": "~1.1",
-    "isomorphic-git": "~1.21",
+    "fast-glob": "~3.3",
+    "hpagent": "~1.2",
+    "isomorphic-git": "~1.25",
     "js-yaml": "~4.1",
     "multi-progress": "~4.0",
-    "picomatch": "~2.3",
+    "picomatch": "~4.0",
     "progress": "~2.0",
     "should-proxy": "~1.0",
     "simple-get": "~4.0",
-    "vinyl": "~2.2"
+    "vinyl": "~3.0"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "files": [
     "lib/"
@@ -62,7 +66,7 @@
   ],
   "scripts": {
     "test": "_mocha",
-    "prepublishOnly": "node $npm_config_local_prefix/npm/prepublishOnly.js",
-    "postpublish": "node $npm_config_local_prefix/npm/postpublish.js"
+    "prepublishOnly": "npx -y downdoc@latest --prepublish",
+    "postpublish": "npx -y downdoc@latest --postpublish"
   }
 }