@antora/playbook-builder 3.1.2 → 3.2.0-alpha.2

package/README.md

@@ -10,4 +10,4 @@ Its site generator aggregates documents from versioned content repositories and
 
 Copyright (C) 2017-present [OpenDevise Inc.](https://opendevise.com) and the [Antora Project](https://antora.org).
 
-Use of this software is granted under the terms of the [Mozilla Public License Version 2.0](https://www.mozilla.org/en-US/MPL/2.0/) (MPL-2.0).
+Use of this software is granted under the terms of the [Mozilla Public License Version 2.0](https://www.mozilla.org/en-US/MPL/2.0/) (MPL-2.0).

package/lib/solitary-convict.js

@@ -52,8 +52,8 @@ function registerFormats (convict) {
       if (config == null) return val
       const accum = config.has(name) ? config.get(name) : {}
       let match
-      ARGS_SCANNER_RX.lastIndex = 0
-      while ((match = ARGS_SCANNER_RX.exec(val))) {
+      const scanner = new RegExp(ARGS_SCANNER_RX)
+      while ((match = scanner.exec(val))) {
         const [, k, v] = match
         if (k) accum[k] = v ? (v === '-' ? '-' : yaml.load(v, { schema: yaml.CORE_SCHEMA })) : ''
       }
@@ -77,8 +77,8 @@ function registerFormats (convict) {
       if (config == null) return val
       const accum = config.has(name) ? config.get(name) : {}
       let match
-      ARGS_SCANNER_RX.lastIndex = 0
-      while ((match = ARGS_SCANNER_RX.exec(val))) {
+      const scanner = new RegExp(ARGS_SCANNER_RX)
+      while ((match = scanner.exec(val))) {
         const [, k, v] = match
         if (k) {
           let parsed
@@ -97,7 +97,7 @@ function registerFormats (convict) {
   convict.addFormat({
     name: 'require-array',
     validate: (val) => {
-      if (!Array.isArray(val)) throw new Error('must be of type Array')
+      if (!Array.isArray(val)) throw new Error('must be an array')
     },
     coerce: (val, config, name) => {
       const accum = config && config.has(name) ? config.get(name) : []
@@ -117,7 +117,7 @@ function registerFormats (convict) {
     name: 'boolean-or-string',
     validate: (val) => {
       if (!(val == null || val.constructor === String || val.constructor === Boolean)) {
-        throw new Error('must be a boolean or string')
+        throw new Error('must be a boolean, string, or null')
       }
     },
   })
@@ -159,6 +159,7 @@ function registerFormats (convict) {
       }
       if (~parsedUrl.pathname.indexOf('%20')) throw new Error('pathname segment must not contain spaces')
     },
+    coerce: (val) => (val.length > 1 && val.charAt(val.length - 1) === '/' ? val.slice(0, -1) : val),
   })
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/playbook-builder",
-  "version": "3.1.2",
+  "version": "3.2.0-alpha.2",
   "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)",