@antora/html-single-extension 1.0.0-beta.18 → 1.0.0-beta.19

package/lib/converter.js

@@ -4,10 +4,10 @@ const fsp = require('node:fs/promises')
 const ospath = require('node:path')
 
 const DEFAULT_COMMAND = 'asciidoctor'
+const PACKAGE_NAME = require('../package.json').name
 
-async function convert (runCommand, file, convertAttributes, buildConfig) {
-  const { command } = buildConfig
-  if (command === false) {
+async function convert (file, convertAttributes, buildConfig, { logCommand, runCommand }) {
+  if (buildConfig.command === false) {
     const Asciidoctor = this.require('@asciidoctor/core')()
     const Extensions = Asciidoctor.Extensions
     const exts = this.getVariables().siteAsciiDocConfig?.extensions || []
@@ -31,9 +31,10 @@ async function convert (runCommand, file, convertAttributes, buildConfig) {
       if (exts.length) extDslTypes.forEach((type) => (Opal.const_get_local(Extensions, type).$$iclasses.length = 0))
     }
   } else {
-    const { cwd = process.cwd(), stderr = 'print' } = buildConfig
-    const args = convertAttributes.toArgs('-a', command).concat('-o', convertAttributes.outfile, '-')
-    return await runCommand(command, args, { parse: true, cwd, stdin: file.contents, stdout: 'print', stderr })
+    const { command, cwd = process.cwd(), attributeOptionFlag = '-a', stderr = 'print' } = buildConfig
+    logCommand?.(command, file, convertAttributes, attributeOptionFlag)
+    const args = convertAttributes.toArgs(attributeOptionFlag, command).concat('-o', convertAttributes.outfile, '-')
+    return runCommand(command, args, { parse: true, cwd, stdin: file.contents, stdout: 'print', stderr })
   }
 }
 
@@ -45,13 +46,10 @@ function getDefaultCommand (cwd) {
 }
 
 module.exports = {
-  bind (thisArg, runCommand) {
-    return Object.assign({}, this, { convert: convert.bind(thisArg, runCommand) })
-  },
   convert,
   backend: 'html',
   getDefaultCommand,
   extname: '.html',
   mediaType: 'text/html',
-  loggerName: require('../package.json').name,
+  loggerName: PACKAGE_NAME,
 }

package/lib/index.js

@@ -1,10 +1,9 @@
 'use strict'
 
 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)
+  requireAssembler(this).configure(this, converter, config, providers)
 }
 
 function requireAssembler (context, packageName = '@antora/assembler') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/html-single-extension",
-  "version": "1.0.0-beta.18",
+  "version": "1.0.0-beta.19",
   "description": "An Antora extension that uses Assembler to merge pages into assembly files, export them to standalone HTML documents, and publish them with the site.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
@@ -32,8 +32,7 @@
     "#package": "./package.json"
   },
   "dependencies": {
-    "@antora/assembler": "1.0.0-beta.18",
-    "@antora/run-command-helper": "~1.0"
+    "@antora/assembler": "1.0.0-beta.19"
   },
   "engines": {
     "node": ">=16.0.0"