@antora/content-aggregator 3.0.0-beta.4 → 3.0.0-beta.5

package/lib/aggregate-content.js

@@ -428,9 +428,10 @@ function collectFilesFromStartPath (startPath, repo, authStatus, ref, worktreePa
       return componentVersionBucket
     })
     .catch((err) => {
+      const msg = err.message
       const refInfo = `ref: ${ref.fullname.replace(HEADS_DIR_RX, '')}${worktreePath ? ' <worktree>' : ''}`
-      const pathInfo = !startPath || err.message.startsWith('the start path ') ? '' : ' | path: ' + startPath
-      throw Object.assign(err, { message: `${err.message} in ${repo.url || repo.dir} (${refInfo}${pathInfo})` })
+      const pathInfo = !startPath || msg.startsWith('the start path ') ? '' : ' | path: ' + startPath
+      throw Object.assign(err, { message: msg.replace(/$/m, ` in ${repo.url || repo.dir} (${refInfo}${pathInfo})`) })
     })
 }
 
@@ -652,7 +653,7 @@ function loadComponentDescriptor (files, ref, version) {
   files.splice(descriptorFileIdx, 1)
   let data
   try {
-    data = yaml.load(descriptorFile.contents.toString())
+    data = yaml.load(descriptorFile.contents.toString(), { schema: yaml.CORE_SCHEMA })
   } catch (err) {
     throw Object.assign(err, { message: `${COMPONENT_DESC_FILENAME} has invalid syntax; ${err.message}` })
   }
@@ -664,7 +665,8 @@ function loadComponentDescriptor (files, ref, version) {
   if ('version' in data) version = data.version
   if (!version) {
     if (version === undefined) throw new Error(`${COMPONENT_DESC_FILENAME} is missing a version`)
-    version = ''
+    if (version === false) throw new Error(`${COMPONENT_DESC_FILENAME} has an invalid version`)
+    version = '' + (typeof version === 'number' ? version : '')
   } else if (version === true) {
     version = ref.shortname.replace(PATH_SEPARATOR_RX, '-')
   } else if (version.constructor === Object) {
@@ -686,7 +688,7 @@ function loadComponentDescriptor (files, ref, version) {
       throw new Error(`version in ${COMPONENT_DESC_FILENAME} cannot have path segments: ${matched}`)
     }
     version = matched.replace(PATH_SEPARATOR_RX, '-')
-  } else if ((version = String(version)) === '.' || version === '..' || ~version.indexOf('/')) {
+  } else if ((version = '' + version) === '.' || version === '..' || ~version.indexOf('/')) {
     throw new Error(`version in ${COMPONENT_DESC_FILENAME} cannot have path segments: ${version}`)
   }
   data.version = version
@@ -702,7 +704,8 @@ function computeOrigin (url, authStatus, gitdir, ref, startPath, worktreePath =
   } else {
     if (worktreePath) {
       origin.fileUriPattern =
-        (posixify ? 'file:///' + posixify(worktreePath) : 'file://' + worktreePath) + path.join('/', startPath, '%s')
+        (posixify ? 'file:///' + posixify(worktreePath) : 'file://' + worktreePath) +
+        (startPath ? '/' + startPath + '/%s' : '/%s')
     } else {
       origin.refhash = refhash
     }
@@ -890,7 +893,8 @@ function resolveRemoteUrl (repo, remoteName) {
         return 'https://' + url.substr(url.indexOf('@') + 1 || 6).replace(URL_PORT_CLEANER_RX, '$1')
       }
     }
-    return posixify ? 'file:///' + posixify(repo.dir) : 'file://' + repo.dir
+    url = posixify ? 'file:///' + posixify(repo.dir) : 'file://' + repo.dir
+    return ~url.indexOf(' ') ? url.replace(SPACE_RX, '%20') : url
   })
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-aggregator",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
   "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,9 +33,6 @@
     "simple-get": "~4.0",
     "vinyl": "~2.2"
   },
-  "devDependencies": {
-    "node-git-server": "~0.6"
-  },
   "engines": {
     "node": ">=12.21.0"
   },
@@ -52,6 +49,5 @@
     "static site",
     "web publishing"
   ],
-  "gitHead": "8a142499e9f1a9e0631777796e06dd6c010d3a90",
-  "readmeFilename": "README.md"
+  "gitHead": "a13d03df41654d4deb78211a5a54953ce2a35fb8"
 }