@antora/playbook-builder 3.2.0-alpha.6 → 3.2.0-alpha.9

package/lib/build-playbook.js

@@ -4,6 +4,8 @@ const convict = require('./solitary-convict')
 const defaultSchema = require('./config/schema')
 const fs = require('node:fs')
 const ospath = require('node:path')
+const parseArgs = require('yargs-parser')
+const yaml = require('js-yaml')
 
 /**
  * Builds a playbook object according to the provided schema from the specified
@@ -28,8 +30,22 @@ const ospath = require('node:path')
  *   marked in the schema as preserve, all keys in the playbook are camelCased.
  */
 function buildPlaybook (args = [], env = process.env, schema = defaultSchema, beforeValidate = undefined) {
-  const config = Object.assign(convict(schema, { args, env }), { getModel })
-  const playbook = config.has('playbook') && config.get('playbook')
+  const parsedArgs = parseArgs(args, { configuration: { 'dot-notation': false } })
+  const opts = { args: [], env: {} }
+  const config = Object.assign(convict(schema, opts), { getModel, getSchema })
+  Object.assign(opts, { args, env })
+  let playbook
+  if ('playbook' in schema) {
+    const playbookEnv = schema.playbook.env
+    if (playbookEnv != null) playbook = env[playbookEnv]
+    const playbookArg = schema.playbook.arg
+    if (playbookArg != null) playbook = parsedArgs[playbookArg] ?? playbook
+    if (playbook === undefined) {
+      if (config.has('playbook')) playbook = config.get('playbook')
+    } else {
+      config.set('playbook', playbook)
+    }
+  }
   let absPlaybookPath
   if (playbook) {
     if (ospath.extname((absPlaybookPath = ospath.resolve(playbook)))) {
@@ -50,10 +66,11 @@ function buildPlaybook (args = [], env = process.env, schema = defaultSchema, be
     }
   }
   try {
-    if (playbook) {
-      config.loadFile(absPlaybookPath)
-      if (playbook !== absPlaybookPath) config.set('playbook', absPlaybookPath)
-    }
+    Object.assign(opts, { args: [] })
+    playbook ? config.loadFile(absPlaybookPath) : config.load({})
+    importArguments(config, parsedArgs)
+    Object.assign(opts, { args })
+    if (playbook && playbook !== absPlaybookPath) config.set('playbook', absPlaybookPath)
     const beforeValidateFromSchema = config._def[Symbol.for('convict.beforeValidate')]
     if (beforeValidateFromSchema) beforeValidateFromSchema(config)
     if (beforeValidate) beforeValidate(config)
@@ -82,9 +99,8 @@ function camelCaseKeys (o, stopPaths = [], p = '') {
 function getModel (name) {
   let config = this
   const data = config.get(name)
-  let schema = config._schema
+  const schema = config.getSchema(name)
   if (name) {
-    schema = name.split('.').reduce((accum, key) => accum._cvtProperties[key], schema)
     config = Object.assign(convict(name.split('.').reduce((def, key) => def[key], config._def)), { _instance: data })
   }
   config.validate({ allowed: 'strict' })
@@ -97,6 +113,10 @@ function getModel (name) {
   return model
 }
 
+function getSchema (name) {
+  return name ? name.split('.').reduce((accum, key) => accum._cvtProperties[key], this._schema) : this._schema
+}
+
 function getStopPaths (schemaProperties, schemaPath = [], stopPaths = []) {
   for (const [key, { preserve, _cvtProperties }] of Object.entries(schemaProperties)) {
     if (preserve) {
@@ -110,6 +130,22 @@ function getStopPaths (schemaProperties, schemaPath = [], stopPaths = []) {
   return stopPaths
 }
 
+function importArguments (config, args) {
+  for (const [argName, configKey] of Object.entries(config._argv)) {
+    const argVal = args[argName]
+    if (argVal === undefined) continue
+    const argFormat = config.getSchema(configKey).format
+    let argValStr = argVal
+    if (argFormat === 'map' || argFormat === 'primitive-map') {
+      const dumpOpts = { condenseFlow: true, flowLevel: 0, noCompatMode: true, quotingType: '"' }
+      argValStr = yaml.dump(Array.isArray(argVal) ? argVal : [argVal], dumpOpts)
+    } else if (Array.isArray(argVal)) {
+      argValStr = argVal.join(',')
+    }
+    config.set(configKey, argValStr)
+  }
+}
+
 function getDetails (playbook, absPlaybookPath) {
   if (playbook === absPlaybookPath) return ''
   return ` (${ospath.isAbsolute(playbook) ? '' : 'cwd: ' + process.cwd() + ', '}playbook: ${playbook})`

package/lib/solitary-convict.js

@@ -5,9 +5,10 @@ const json = require('json5')
 const toml = require('@iarna/toml')
 const yaml = require('js-yaml')
 
-const ARGS_SCANNER_RX = /(?:([^=,]+)|(?==))(?:,|$|=(|("|').*?\3|[^,]+)(?:,|$))/g
 const PRIMITIVE_TYPES = [Boolean, Number, String]
+const COERCE_SCHEMA = yaml.FAILSAFE_SCHEMA
 const YAML_SCHEMA = yaml.CORE_SCHEMA.extend({ implicit: [yaml.types.merge] })
+const YAML_PREFIX_RX = new RegExp('!!((?:auto|str|bool|int|float|seq|map)(?= )|null(?=$))(?: |$)')
 
 /**
  * A convict function wrapper that registers custom formats and parsers and
@@ -51,16 +52,23 @@ function registerFormats (convict) {
     coerce: (val, config, name) => {
       if (config == null) return val
       const accum = config.has(name) ? config.get(name) : {}
-      let match
-      const scanner = new RegExp(ARGS_SCANNER_RX)
-      while ((match = scanner.exec(val))) {
-        const [, k, v = ''] = match
-        if (!k) continue
+      const entries = yaml.load(val, { schema: COERCE_SCHEMA })
+      for (const entry of Array.isArray(entries) ? entries : [entries]) {
+        let k = entry
+        let v = ''
+        const equalsIdx = entry.indexOf('=')
+        if (~equalsIdx) {
+          if (!(k = entry.slice(0, equalsIdx))) continue
+          v = entry.slice(equalsIdx + 1)
+        }
         let parsed = v
-        if (parsed && parsed !== '-') {
-          try {
-            parsed = yaml.load(v, { schema: yaml.CORE_SCHEMA })
-          } catch {}
+        if (v) {
+          const match = v.match(YAML_PREFIX_RX)
+          if (match) {
+            try {
+              parsed = yaml.load(match[1] === 'auto' ? v.slice(7) : v, { schema: yaml.CORE_SCHEMA })
+            } catch {}
+          }
         }
         accum[k] = parsed
       }
@@ -83,20 +91,26 @@ function registerFormats (convict) {
     coerce: (val, config, name) => {
       if (config == null) return val
       const accum = config.has(name) ? config.get(name) : {}
-      let match
-      const scanner = new RegExp(ARGS_SCANNER_RX)
-      while ((match = scanner.exec(val))) {
-        const [, k, v] = match
-        if (k) {
-          let parsed
-          if (v && v !== '-') {
-            parsed = yaml.load(v, { schema: yaml.CORE_SCHEMA })
-            if (parsed && PRIMITIVE_TYPES.indexOf(parsed.constructor) < 0) parsed = v
-          } else {
-            parsed = v || ''
+      const entries = yaml.load(val, { schema: COERCE_SCHEMA })
+      for (const entry of Array.isArray(entries) ? entries : [entries]) {
+        let k = entry
+        let v = ''
+        const equalsIdx = entry.indexOf('=')
+        if (~equalsIdx) {
+          if (!(k = entry.slice(0, equalsIdx))) continue
+          v = entry.slice(equalsIdx + 1)
+        }
+        let parsed = v
+        if (v) {
+          const match = v.match(YAML_PREFIX_RX)
+          if (match) {
+            try {
+              parsed = yaml.load(match[1] === 'auto' ? v.slice(7) : v, { schema: yaml.CORE_SCHEMA })
+              if (parsed && !~PRIMITIVE_TYPES.indexOf(parsed.constructor)) parsed = v
+            } catch {}
           }
-          accum[~k.indexOf('-') ? k.replace(/-/g, '_') : k] = parsed
         }
+        accum[~k.indexOf('-') ? k.replace(/-/g, '_') : k] = parsed
       }
       return accum
     },
@@ -107,16 +121,16 @@ function registerFormats (convict) {
       if (!Array.isArray(val)) throw new Error('must be an array')
     },
     coerce: (val, config, name) => {
-      const accum = config && config.has(name) ? config.get(name) : []
-      val.split(',').forEach((v) => {
-        if (~accum.indexOf(v)) return
+      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
         } else {
           accum.push(v)
         }
-      })
+      }
       return accum
     },
   })
@@ -166,7 +180,10 @@ 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),
+    coerce: (val) => {
+      if (!val || val === '~') return null
+      return 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.2.0-alpha.6",
+  "version": "3.2.0-alpha.9",
   "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)",
@@ -10,7 +10,11 @@
     "Hubert SABLONNIÈRE <hubert.sablonniere@gmail.com>"
   ],
   "homepage": "https://antora.org",
-  "repository": "gitlab:antora/antora",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitlab.com/antora/antora.git",
+    "directory": "packages/playbook-builder"
+  },
   "bugs": {
     "url": "https://gitlab.com/antora/antora/issues"
   },
@@ -26,7 +30,8 @@
     "@iarna/toml": "~2.2",
     "convict": "~6.2",
     "js-yaml": "~4.1",
-    "json5": "~2.2"
+    "json5": "~2.2",
+    "yargs-parser": "~20.2"
   },
   "engines": {
     "node": ">=18.0.0"