@antora/pdf-extension 1.0.0-beta.9 → 1.0.0-rc.10

package/README.md

@@ -21,7 +21,9 @@ antora:
 # ...
 ```
 
-You can configure the behavior of the extension using the optional _antora-assembler.yml_ file.
+You can configure the behavior of the extension using the optional configuration file, named _antora-assembler.yml_ by default.
+When using more than one exporter extension, you likely want to use a dedicated configuration file named according to the export filetype (e.g., _antora-assembler-pdf.yml_).
+The configuration file can be specified using the `config_file` key on the extension entry.
 
 ## Copyright and License
 

package/lib/converter.js

@@ -3,29 +3,33 @@
 const fsp = require('node:fs/promises')
 const ospath = require('node:path')
 
-const DEFAULT_COMMAND = 'asciidoctor-pdf'
+const DEFAULT_COMMAND = 'asciidoctor-pdf --sourcemap'
+const PACKAGE_NAME = require('../package.json').name
 
-async function convert (runCommand, file, convertAttributes, buildConfig) {
-  const { command, cwd = process.cwd(), stderr = 'print' } = buildConfig
-  const args = convertAttributes.toArgs('-a', command).concat('-o', convertAttributes.outfile, '-')
-  return runCommand(command, args, { parse: true, cwd, stdin: file.contents, stdout: 'print', stderr })
+async function convert (file, conversionAttributes, buildConfig, { logCommand, runCommand }) {
+  const { command, cwd = process.cwd(), attributeOptionFlag, stderr = 'print' } = buildConfig
+  if (!command) return null
+  const outputOptionFlag = buildConfig.outputOptionFlag || (buildConfig.outputOptionFlag === false ? false : '-o')
+  const extraArgs = conversionAttributes.toArgs(attributeOptionFlag || '-a', outputOptionFlag)
+  const stdout = outputOptionFlag ? 'print' : 'buffer'
+  logCommand?.(command, extraArgs, file, conversionAttributes)
+  return runCommand(command, extraArgs.concat('-'), { parse: true, cwd, stdin: file.contents, stdout, stderr })
 }
 
-function getDefaultCommand (cwd) {
-  return fsp.access(ospath.join(cwd, 'Gemfile.lock')).then(
-    () => `bundle exec ${DEFAULT_COMMAND}`,
-    () => DEFAULT_COMMAND
+function getDefaultCommand (cwd, playbook) {
+  const defaultCommand = playbook?.runtime.stacktrace ? `${DEFAULT_COMMAND} --trace` : DEFAULT_COMMAND
+  const bundleLockfile = playbook?.env.BUNDLE_LOCKFILE ?? `${playbook?.env.BUNDLE_GEMFILE ?? 'Gemfile'}.lock`
+  return fsp.access(ospath.resolve(cwd, bundleLockfile)).then(
+    () => `bundle exec ${defaultCommand}`,
+    () => defaultCommand
   )
 }
 
 module.exports = {
-  bind (thisArg, runCommand) {
-    return Object.assign({}, this, { convert: convert.bind(thisArg, runCommand) })
-  },
   convert,
   backend: 'pdf',
   getDefaultCommand,
   extname: '.pdf',
   mediaType: 'application/pdf',
-  loggerName: require('../package.json').name,
+  loggerName: PACKAGE_NAME,
 }

package/lib/index.js

@@ -1,15 +1,8 @@
 'use strict'
 
+const { configure: configureAssembler } = require('@antora/assembler')
 const converter = require('./converter')
-const runCommand = require('@antora/run-command-helper')
 
 module.exports.register = function ({ config }, providers) {
-  requireAssembler(this).configure(this, converter.bind(this, runCommand), config, providers)
-}
-
-function requireAssembler (context, packageName = '@antora/assembler') {
-  try {
-    return context.require(packageName) // when installed with Antora
-  } catch {}
-  return require(packageName) // when installed separate from Antora, perhaps in project
+  configureAssembler(this, converter, config, providers)
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@antora/pdf-extension",
-  "version": "1.0.0-beta.9",
-  "description": "An Antora extension that uses Assembler to merge pages into assembly files, export them to the PDF format, and publishe them with the site.",
+  "version": "1.0.0-rc.10",
+  "description": "An Antora extension that uses Assembler to merge pages into assembly files, export them to the PDF format, and publish them with the site.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
   "contributors": [
@@ -19,8 +19,8 @@
   },
   "scripts": {
     "test": "node --test test/*-test.js",
-    "prepublishOnly": "npx -y downdoc --prepublish",
-    "postpublish": "npx -y downdoc --postpublish"
+    "prepublishOnly": "npx -y downdoc@latest --prepublish",
+    "postpublish": "npx -y downdoc@latest --postpublish"
   },
   "main": "lib/index.js",
   "exports": {
@@ -32,11 +32,10 @@
     "#package": "./package.json"
   },
   "dependencies": {
-    "@antora/assembler": "1.0.0-beta.9",
-    "@antora/run-command-helper": "~1.0"
+    "@antora/assembler": "1.0.0-rc.10"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=20.0.0"
   },
   "files": [
     "lib/"