@antora/cli 3.0.3 → 3.1.1

package/lib/cli.js

@@ -2,7 +2,7 @@
 
 const buildPlaybook = require('@antora/playbook-builder')
 const cli = require('./commander')
-const convict = require('@antora/playbook-builder/lib/solitary-convict')
+const convict = require('@antora/playbook-builder/lib/solitary-convict') // drop lib segment in Antora 4
 const ospath = require('path')
 const userRequire = require('@antora/user-require-helper')
 
@@ -13,7 +13,6 @@ async function run (argv = process.argv) {
 }
 
 function exitWithError (err, opts, msg = undefined) {
-  const { getLogger, configureLogger } = requireLogger()
   let errMessage = String(
     err instanceof Error ? err.message : Object.assign((err = new Error(String(err))), { stack: undefined }).message
   )
@@ -21,6 +20,8 @@ function exitWithError (err, opts, msg = undefined) {
     ? (errMessage = errMessage.slice(21)) && 'asciidoctor'
     : cli.name()
   if (!msg) msg = errMessage
+  const { configureLogger, getLogger } = requireLogger()
+  if (!getLogger) return lastDitchExit(err, msg)
   if (!getLogger(null)) {
     configureLogger({ format: 'pretty', level: opts.silent ? 'silent' : 'fatal', failureLevel: 'fatal' })
   }
@@ -38,6 +39,12 @@ function exit () {
     .then((failOnExit) => process.exitCode || (process.exitCode = failOnExit ? 1 : 0))
 }
 
+function lastDitchExit (err, msg) {
+  if (msg !== err.message) console.error(msg)
+  console.error(err)
+  process.exitCode = process.exitCode || 1
+}
+
 function getTTYColumns () {
   return +process.env.COLUMNS || process.stdout.columns || 80
 }
@@ -53,7 +60,7 @@ function requireLogger (fromPath = undefined, moduleName = '@antora/logger') {
       (requireLogger.cache = fromPath ? userRequire(moduleName, { paths: [fromPath] }) : require(moduleName))
     ) // dynamic require('@antora/logger')
   } catch {
-    return fromPath && (requireLogger.cache = require(moduleName))
+    return fromPath ? (requireLogger.cache = require(moduleName)) : {}
   }
 }
 
@@ -152,7 +159,7 @@ cli.command('help [command]', { hidden: true }).action((name, options, command)
       helpCommand.help()
     } else {
       const message = `error: unknown command '${name}'. See '${cli.name()} --help' for a list of commands.`
-      cli._displayError(1, 'commander.unknownCommand', message)
+      cli.error(message, { code: 'commander.unknownCommand', exitCode: 1 })
     }
   } else {
     cli.help()

package/lib/commander/options-from-convict.js

@@ -27,10 +27,12 @@ function collectOptions (props, context = undefined) {
       accum.push(...collectOptions(value._cvtProperties, context ? `${context}.${key}` : key))
     } else if ('arg' in value) {
       const { arg, format, default: default_ } = value
-      const option = { name: arg, form: `--${arg}`, description: value.doc, format: format }
+      const option = { name: arg, form: `--${arg}`, description: value.doc, format }
       if (Array.isArray(format)) {
         option.form += ' <choice>'
-        option.choices = Object.defineProperty(format.slice(), 'map', { value: () => format })
+        const choices = format.slice()
+        const value = () => choices
+        Object.defineProperties((option.choices = choices), { map: { value }, slice: { value } })
       } else if (format !== 'boolean') {
         option.form += ` <${arg.substr(arg.lastIndexOf('-') + 1, arg.length)}>`
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/cli",
-  "version": "3.0.3",
+  "version": "3.1.1",
   "description": "The command line interface for Antora.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
@@ -14,23 +14,30 @@
     "url": "https://gitlab.com/antora/antora/issues"
   },
   "main": "lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./package.json": "./package.json"
+  },
+  "imports": {
+    "#commander": "./lib/commander.js"
+  },
   "bin": {
     "antora": "bin/antora"
   },
   "dependencies": {
-    "@antora/logger": "3.0.3",
-    "@antora/playbook-builder": "3.0.3",
+    "@antora/logger": "3.1.1",
+    "@antora/playbook-builder": "3.1.1",
     "@antora/user-require-helper": "~2.0",
-    "commander": "~8.3"
+    "commander": "~9.4"
   },
   "devDependencies": {
-    "@antora/site-publisher": "3.0.3",
+    "@antora/site-publisher": "3.1.1",
     "@asciidoctor/core": "~2.2",
     "convict": "~6.2",
     "kapok-js": "~0.10"
   },
   "engines": {
-    "node": ">=12.21.0"
+    "node": ">=16.0.0"
   },
   "files": [
     "bin/",