@antora/playbook-builder 3.2.0-alpha.10 → 3.2.0-alpha.11

package/lib/solitary-convict.js

@@ -130,16 +130,29 @@ function registerFormats (convict) {
     },
     coerce: (val, config, name) => {
       const accum = config?.has(name) ? config.get(name) : []
-      for (const v of val.split(',')) {
-        if (~accum.indexOf(v)) continue
-        const match = accum.find((it) => it.constructor === Object && it.id === v)
-        if (match) {
-          if (match.enabled === false) match.enabled = true
+      const byId = {}
+      const byRequire = {}
+      let orderIdx = 0
+      const order = new Map()
+      for (const [idx, it] of accum.entries()) {
+        const ext = it.constructor === Object ? it : (accum[idx] = { require: it })
+        byRequire[ext.require] ??= ext
+        if ('id' in ext) byId[ext.id] ??= ext
+        order.set(it, orderIdx++)
+      }
+      for (let request of val.split(',')) {
+        const enable = request.charAt() === '!' ? (request = request.slice(1)) == null : true
+        let match
+        if ((match = byId[request] ?? byRequire[request])) {
+          if ((match.enabled ?? true) !== enable) match.enabled = enable
         } else {
-          accum.push(v)
+          accum.push((match = byRequire[request] = { require: request }))
         }
+        order.set(match, orderIdx++)
       }
       return accum
+        .sort((a, b) => order.get(a) - order.get(b))
+        .map((it) => (Object.keys(it).length === 1 && 'require' in it ? it.require : it))
     },
   })
   convict.addFormat({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/playbook-builder",
-  "version": "3.2.0-alpha.10",
+  "version": "3.2.0-alpha.11",
   "description": "Builds a playbook object from user input for configuring successive documentation components in an Antora pipeline.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",