@antora/cli 3.0.0-beta.1 → 3.0.0-beta.2

package/lib/cli.js

@@ -1,11 +1,8 @@
-#!/usr/bin/env node
-
 'use strict'
 
 const buildPlaybook = require('@antora/playbook-builder')
 const cli = require('./commander')
 const convict = require('@antora/playbook-builder/lib/solitary-convict')
-const { configureLogger, getLogger, finalizeLogger } = require('@antora/logger')
 const ospath = require('path')
 const userRequire = require('@antora/user-require-helper')
 
@@ -17,11 +14,13 @@ async function run (argv = process.argv) {
 }
 
 function exitWithError (err, opts, msg = undefined) {
+  const { getLogger, configureLogger } = requireLogger()
   if (!msg) msg = err.message || err
   const name = msg.startsWith('asciidoctor: FAILED: ') ? (msg = msg.slice(21)) && 'asciidoctor' : cli.name()
-  const logger = getLogger(null)
-    ? getLogger(name)
-    : configureLogger({ format: 'pretty', level: opts.silent ? 'silent' : 'fatal', failureLevel: 'fatal' }).get(name)
+  if (!getLogger(null)) {
+    configureLogger({ format: 'pretty', level: opts.silent ? 'silent' : 'fatal', failureLevel: 'fatal' })
+  }
+  const logger = getLogger(name)
   if (opts.stacktrace) {
     let loc, stack
     if ((stack = err.backtrace)) {
@@ -47,7 +46,9 @@ function exitWithError (err, opts, msg = undefined) {
 }
 
 function exit () {
-  return finalizeLogger().then((failOnExit) => process.exit(failOnExit ? 1 : process.exitCode))
+  return requireLogger()
+    .finalizeLogger()
+    .then((failOnExit) => process.exit(failOnExit ? 1 : process.exitCode))
 }
 
 function getTTYColumns () {
@@ -58,6 +59,16 @@ function outputError (str, write) {
   write(str.replace(/^error: /, cli.name() + ': '))
 }
 
+function requireLogger (fromPath = undefined, moduleName = '@antora/logger') {
+  try {
+    return (
+      requireLogger.cache ||
+      (requireLogger.cache = fromPath ? userRequire(moduleName, { paths: [fromPath] }) : require(moduleName))
+    )
+  } catch {}
+  return fromPath && (requireLogger.cache = require(moduleName))
+}
+
 cli
   .allowExcessArguments(false)
   .configureOutput({ getOutHelpWidth: getTTYColumns, getErrHelpWidth: getTTYColumns, outputError })
@@ -118,21 +129,23 @@ cli
       }
     }
     const args = command.optionArgs.concat('--playbook', playbookFile)
-    let playbook
+    let generator, generatorPath, playbook
     try {
       playbook = buildPlaybook(args, process.env, buildPlaybook.defaultSchema, (config) => {
         try {
-          configureLogger(config.getModel('runtime.log'), playbookDir)
+          generatorPath = userRequire.resolve((generator = config.get('antora.generator')), userRequireContext)
+        } catch {}
+        try {
+          requireLogger(generatorPath).configureLogger(config.getModel('runtime.log'), playbookDir)
         } catch {}
       })
     } catch (err) {
       return exitWithError(err, errorOpts)
     }
-    const generator = playbook.antora.generator
     let generateSite
     try {
       generateSite =
-        (generateSite = userRequire(generator, userRequireContext)).length === 1
+        (generateSite = require(generatorPath || userRequire.resolve(generator, userRequireContext))).length === 1
           ? generateSite.bind(null, playbook)
           : generateSite.bind(null, args, process.env)
     } catch (err) {

package/lib/index.js

@@ -0,0 +1,14 @@
+'use strict'
+
+/**
+ * The command line interface (CLI) for Antora.
+ *
+ * Provides a built-in set of commands to run Antora. The default command is
+ * generate. The generate command builds the specified playbook, configures the
+ * logger, then requires and invokes the generator function. When the generator
+ * function completes or fails, the generate command finalizes the logger and
+ * exits with the specified exit code.
+ *
+ * @namespace cli
+ */
+module.exports = require('./cli')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/cli",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.2",
   "description": "The command line interface for Antora.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
@@ -13,18 +13,18 @@
   "bugs": {
     "url": "https://gitlab.com/antora/antora/issues"
   },
-  "main": "lib/cli.js",
+  "main": "lib/index.js",
   "bin": {
     "antora": "bin/antora"
   },
   "dependencies": {
-    "@antora/logger": "3.0.0-beta.1",
-    "@antora/playbook-builder": "3.0.0-beta.1",
+    "@antora/logger": "3.0.0-beta.2",
+    "@antora/playbook-builder": "3.0.0-beta.2",
     "@antora/user-require-helper": "~2.0",
     "commander": "~8.3"
   },
   "devDependencies": {
-    "@antora/site-publisher": "3.0.0-beta.1",
+    "@antora/site-publisher": "3.0.0-beta.2",
     "convict": "~6.2",
     "kapok-js": "~0.10"
   },
@@ -43,5 +43,5 @@
     "static site",
     "web publishing"
   ],
-  "gitHead": "7c5ef1ea93dd489af533c80a936c736013c41769"
+  "gitHead": "5cd3f9cc70622e465cb44daf1aa2035ed5a35f54"
 }