@antora/content-aggregator 3.0.0-beta.1 → 3.0.0-beta.2

package/lib/aggregate-content.js

@@ -1,7 +1,5 @@
 'use strict'
 
-if (!Promise.allSettled) require('./promise-all-settled-polyfill')
-
 const camelCaseKeys = require('camelcase-keys')
 const { createHash } = require('crypto')
 const createHttpPlugin = require('./git-plugin-http')
@@ -17,7 +15,7 @@ const getCacheDir = require('cache-directory')
 const GitCredentialManagerStore = require('./git-credential-manager-store')
 const git = require('./git')
 const { NotFoundError, ObjectTypeError, UnknownTransportError, UrlParseError } = git.Errors
-const invariably = { true: () => true, false: () => false, void: () => undefined, emptyArray: () => [] }
+const invariably = { false: () => false, void: () => undefined, emptyArray: () => [] }
 const { makeRe: makePicomatchRx } = require('picomatch')
 const MultiProgress = require('multi-progress')
 const ospath = require('path')
@@ -124,14 +122,14 @@ async function collectFiles (sourcesByUrl, loadOpts, concurrency) {
         })
       ),
   ])
-  let rejected, started
+  let rejection, started
   const startedContinuations = []
   const recordRejection = (err) => {
-    throw (rejected = true) && err
+    rejection = err
   }
   const runTask = (primary, continuation, idx) =>
     primary().then((value) => {
-      if (!rejected) startedContinuations[idx] = continuation(value).catch(recordRejection)
+      if (!rejection) startedContinuations[idx] = continuation(value).catch(recordRejection)
     }, recordRejection)
   if (tasks.length > concurrency) {
     started = []
@@ -142,17 +140,16 @@ async function collectFiles (sourcesByUrl, loadOpts, concurrency) {
       )
       started.push(current)
       if (pending.push(current) < concurrency) continue
-      if (await Promise.race(pending).then(invariably.true, invariably.false)) continue
-      break
+      await Promise.race(pending)
+      if (rejection) break
     }
   } else {
     started = tasks.map(([primary, continuation], idx) => runTask(primary, continuation, idx))
   }
-  return Promise.allSettled(started).then((outcomes) =>
-    Promise.allSettled(startedContinuations).then((continuationOutcomes) => {
-      const rejection = outcomes.push(...continuationOutcomes) && outcomes.find(({ status }) => status === 'rejected')
-      if (rejection) throw rejection.reason
-      return continuationOutcomes.map(({ value }) => value)
+  return Promise.all(started).then(() =>
+    Promise.all(startedContinuations).then((result) => {
+      if (rejection) throw rejection
+      return result
     })
   )
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-aggregator",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.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)",
@@ -49,5 +49,5 @@
     "static site",
     "web publishing"
   ],
-  "gitHead": "7c5ef1ea93dd489af533c80a936c736013c41769"
+  "gitHead": "5cd3f9cc70622e465cb44daf1aa2035ed5a35f54"
 }

package/lib/promise-all-settled-polyfill.js

@@ -1,11 +0,0 @@
-'use strict'
-
-Promise.allSettled = (iterable) =>
-  Promise.all(
-    iterable.map((it) =>
-      it.then(
-        (value) => ({ status: 'fulfilled', value }),
-        (reason) => ({ status: 'rejected', reason })
-      )
-    )
-  )