@antora/assembler 1.0.0-rc.5 → 1.0.0-rc.7

package/lib/assemble-content.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const fs = require('node:fs')
-const { promises: fsp } = fs
+const compileConversionAttributes = require('./compile-conversion-attributes')
+const fsp = require('node:fs/promises')
 const LazyReadable = require('./util/lazy-readable')
 const loadConfig = require('./load-config')
 const logCommand = require('./log-command')
@@ -11,22 +11,24 @@ const produceAssemblyFiles = require('./produce-assembly-files')
 const PromiseQueue = require('./util/promise-queue')
 const runCommand = require('@antora/run-command-helper')
 
-const invariably = { true: () => true, false: () => false, new: () => ({}), void: () => undefined }
+const invariably = { new: () => ({}), null: () => null, void: () => undefined }
 const PACKAGE_NAME = require('../package.json').name
 const NEWLINE_RX = /(?:\r?\n)+/
 
-async function assembleContent (playbook, contentCatalog, converter, { configSource, navigationCatalog }) {
+async function assembleContent (playbook, contentCatalog, converter, providers) {
+  const { configSource, navigationCatalog, componentVersionFilter } = providers
   const {
     convert = converter,
     getDefaultCommand,
     extname: targetExtname = '',
     backend: targetBackend = targetExtname.substring(1),
+    format: targetFormat = targetBackend,
     embedReferenceStyle = 'relative',
     mediaType: targetMediaType,
     loggerName = `${PACKAGE_NAME} [${targetBackend}-exporter]`,
     xmlCompliant,
   } = converter ?? {}
-  const assemblerConfig = await loadConfig.call(this, configSource, playbook, '-' + targetBackend)
+  const assemblerConfig = await loadConfig.call(this, configSource, playbook, targetBackend ? '-' + targetBackend : '')
   if (assemblerConfig.enabled === false || !contentCatalog.publishableFamilies?.has('export')) return []
   const context = isBound(this)
     ? this
@@ -34,9 +36,10 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
         getFunctions: invariably.new,
         getLogger: invariably.void,
         getVariables: invariably.new,
+        require,
       }
   const generatorFunctions = context.getFunctions()
-  const { loadAsciiDoc = require('@antora/asciidoc-loader') } = generatorFunctions
+  const { loadAsciiDoc = context.require('@antora/asciidoc-loader') } = generatorFunctions
   const { assembly: assemblyConfig, build: buildConfig } = assemblerConfig
   assemblyConfig.embedReferenceStyle = embedReferenceStyle
   if (xmlCompliant) assemblyConfig.xmlIds ??= true
@@ -47,13 +50,17 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
     buildConfig.dir ??= ospath.join(playbook.dir ?? process.cwd(), `build/assembler/${profile}`)
     intrinsicAttributes[`assembler-profile-${profile}`] = ''
     intrinsicAttributes['assembler-profile'] = profile
-    if (targetBackend) {
-      intrinsicAttributes[`assembler-backend-${targetBackend}`] = ''
-      intrinsicAttributes['assembler-backend'] = targetBackend
-    }
   } else {
     buildConfig.dir ??= ospath.join(playbook.dir ?? process.cwd(), 'build/assembler/_')
   }
+  if (targetBackend) {
+    intrinsicAttributes[`assembler-backend-${targetBackend}`] = ''
+    intrinsicAttributes['assembler-backend'] = targetBackend
+  }
+  if (targetFormat) {
+    intrinsicAttributes[`assembler-format-${targetFormat}`] = ''
+    intrinsicAttributes['assembler-format'] = targetFormat
+  }
   if (targetExtname) {
     const targetFiletype = targetExtname.substring(1)
     intrinsicAttributes[`assembler-filetype-${targetFiletype}`] = ''
@@ -64,11 +71,12 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
     loadAsciiDoc,
     contentCatalog,
     assemblerConfig,
-    generateSelectAssemblyProfile(context, contentCatalog, assemblyConfig, intrinsicAttributes, navigationCatalog)
+    generateSelectAssemblerProfile(context, contentCatalog, assemblyConfig, intrinsicAttributes, navigationCatalog),
+    typeof componentVersionFilter === 'function' ? componentVersionFilter : undefined
   )
   if (!(assemblyFiles.length && typeof convert === 'function')) return assemblyFiles
   buildConfig.command ??= typeof getDefaultCommand === 'function' ? await getDefaultCommand(cwd, playbook) : null
-  const { publishSite: publishFiles = require('@antora/site-publisher') } = generatorFunctions
+  const { publishSite: publishFiles = context.require('@antora/site-publisher') } = generatorFunctions
   await prepareWorkspace(publishFiles, assemblyFiles, buildConfig)
   const helpers = { logCommand: logCommand.bind(context, loggerName), runCommand }
   const boundConvert = convert.bind(context)
@@ -77,10 +85,9 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
     .add(
       assemblyFiles.map((doc) => async () => {
         const relativeToOutput = embedReferenceStyle === 'output-relative'
-        const convertAttributes = prepareConvertAttributes(doc, targetExtname, relativeToOutput, assemblerConfig)
-        if (buildConfig.mkdirs) await fsp.mkdir(convertAttributes.outdir, { recursive: true, force: true })
-        return boundConvert(doc, convertAttributes, buildConfig, helpers).then((result) =>
-          boundResolveFileOrContents(result, convertAttributes, buildConfig, loggerName).then((fileOrContents) =>
+        const attributes = await compileConversionAttributes(doc, targetExtname, assemblerConfig, relativeToOutput)
+        return boundConvert(doc, attributes, buildConfig, helpers).then((result) =>
+          boundResolveFileOrContents(result, attributes, buildConfig, loggerName).then((fileOrContents) =>
             coerceToExportFormat(doc, targetBackend, targetExtname, targetMediaType, fileOrContents)
           )
         )
@@ -128,11 +135,11 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
 }
 
 /**
- * Generates a function that selects the active assembly profile, initializes an assembly model using
+ * Generates a function that selects the active assembler profile, initializes an assembly model using
  * the keys from the profile as well as any inherited shared keys, builds the navigation for the assembly, and
  * returns the initialized assembly model. The assembly model is further populated after the call to this function.
  */
-function generateSelectAssemblyProfile (context, contentCatalog, baseModel, intrinsicAttributes, navigationCatalog) {
+function generateSelectAssemblerProfile (context, contentCatalog, baseModel, intrinsicAttributes, navigationCatalog) {
   const logger = context.getLogger?.(PACKAGE_NAME)
   const { assemblerProfiles } = context.getVariables()
   if (!assemblerProfiles) {
@@ -143,7 +150,7 @@ function generateSelectAssemblyProfile (context, contentCatalog, baseModel, intr
     }
   }
   const boundSendToLog = sendToLog.bind(logger)
-  const { buildAlternateNavigation = require('@antora/navigation-builder').buildAlternateNavigation } =
+  const { buildAlternateNavigation = context.require('@antora/navigation-builder').buildAlternateNavigation } =
     context.getFunctions()
   return (componentVersion) => {
     const componentVersionProfiles = assemblerProfiles.get(componentVersion.version + '@' + componentVersion.name)
@@ -172,61 +179,6 @@ function generateSelectAssemblyProfile (context, contentCatalog, baseModel, intr
   }
 }
 
-function prepareConvertAttributes (doc, targetExtname, relativeToOutput, assemblerConfig) {
-  const {
-    asciidoc: { attributes: docAttributes } = { attributes: {} },
-    extname: docfilesuffix,
-    path: reldocfile,
-    src: { family, relative },
-  } = doc
-  const { cwd = process.cwd(), dir = cwd } = assemblerConfig.build
-  const docname = family + '$' + relative.substring(0, relative.length - docfilesuffix.length)
-  const docfile = ospath.join(dir, reldocfile)
-  const outdir = ospath.dirname(docfile)
-  const docdir = relativeToOutput ? dir : outdir
-  const outfile = docfile.substring(0, docfile.length - docfilesuffix.length) + targetExtname
-  const attributes = Object.assign({ revdate: `${assemblerConfig.assembly.revdate}@` }, docAttributes, {
-    docdir,
-    docfile,
-    docfilesuffix,
-    docname: `${docname}@`,
-    imagesdir: '',
-    outdir,
-    outfile,
-    outfilesuffix: targetExtname,
-    toArgs (optionFlag) {
-      const args = []
-      for (let [name, val] of Object.entries(this)) {
-        if (val) {
-          val = name + '=' + val
-        } else if (val === '') {
-          if (name === 'asciidoctor-log-integration') {
-            args.push('-r', require.resolve('#asciidoctor-log-adapter'))
-            continue
-          }
-          val = name
-        } else {
-          val = `${name}!${val === false ? '@' : ''}`
-        }
-        args.push(optionFlag, val)
-      }
-      return args
-    },
-  })
-  Object.defineProperty(attributes, 'outfilesuffix', {
-    get () {
-      return ospath.extname(this.outfile)
-    },
-    set (value) {
-      const outfile = this.outfile
-      const extname = ospath.extname(outfile)
-      if (extname && outfile.endsWith(extname)) this.outfile = outfile.substring(0, outfile.length - extname.length)
-      this.outfile += value
-    },
-  })
-  return Object.defineProperty(attributes, 'toArgs', { enumerable: false })
-}
-
 function coerceToExportFormat (assemblyFile, targetBackend, targetExtname, targetMediaType, fileOrContents) {
   const file =
     fileOrContents == null || Buffer.isBuffer(fileOrContents) || typeof fileOrContents.pipe === 'function'
@@ -237,7 +189,8 @@ function coerceToExportFormat (assemblyFile, targetBackend, targetExtname, targe
   const { path: sourcePath, extname: sourceExtname } = file
   const relativeWithoutExtname = file.src.relative.substring(0, file.src.relative.length - sourceExtname.length)
   const newPath = sourcePath.substring(0, sourcePath.length - sourceExtname.length) + targetExtname
-  Object.assign(file, { mediaType: (file.src.mediaType = targetMediaType), path: newPath })
+  Object.assign(file, { mediaType: (file.src.mediaType = targetMediaType), path: (file.src.path = newPath) })
+  delete file.src.abspath
   file.src.basename = path.basename((file.src.relative = relativeWithoutExtname + (file.src.extname = targetExtname)))
   return file
 }
@@ -260,8 +213,9 @@ function prepareWorkspace (publishFiles, assemblyFiles, buildConfig) {
   }
   if (keepSource) {
     for (const file of assemblyFiles) {
-      file.src.contents = file.contents
       file.out = { path: file.path }
+      file.src.contents = file.contents
+      file.src.abspath = ospath.join(dir, file.path)
       files.push(file)
     }
   }
@@ -272,7 +226,7 @@ function prepareWorkspace (publishFiles, assemblyFiles, buildConfig) {
   })
 }
 
-async function resolveFileOrContents (convertResult, convertAttributes, buildConfig, loggerName) {
+function resolveFileOrContents (convertResult, attributes, buildConfig, loggerName) {
   let fileOrContents
   if (convertResult?.status != null) {
     if ('file' in convertResult) {
@@ -284,7 +238,7 @@ async function resolveFileOrContents (convertResult, convertAttributes, buildCon
     }
     let logger, match
     if (buildConfig.stderrSink === 'log' && convertResult.stderr?.length && (logger = this.getLogger(loggerName))) {
-      const docfile = convertAttributes.docfile
+      const docfile = attributes.docfile
       const command = buildConfig.command
       const file = { path: docfile }
       const stderr = convertResult.stderr.toString().trimEnd()
@@ -312,12 +266,11 @@ async function resolveFileOrContents (convertResult, convertAttributes, buildCon
       if (additionalLines.length > 1) logger.info({ command, file }, additionalLines.join('\n'))
     }
   } else if (convertResult !== undefined) {
-    return convertResult
+    return Promise.resolve(convertResult)
   }
-  if (fileOrContents !== undefined) return fileOrContents
-  const outfile = convertAttributes.outfile
-  const outfileExists = await fsp.access(outfile).then(invariably.true, invariably.false)
-  return outfileExists ? new LazyReadable(() => fs.createReadStream(outfile)) : null
+  if (fileOrContents !== undefined) return Promise.resolve(fileOrContents)
+  const outfile = attributes.outfile
+  return fsp.access(outfile).then(() => new LazyReadable(outfile), invariably.null)
 }
 
 function isBound (obj) {

package/lib/compile-conversion-attributes.js

@@ -0,0 +1,73 @@
+'use strict'
+
+const fsp = require('node:fs/promises')
+const ospath = require('node:path')
+
+async function compileConversionAttributes (doc, targetExtname, assemblerConfig, relativeToOutput = false) {
+  const {
+    asciidoc: { attributes: docAttributes } = { attributes: {} },
+    extname: docfilesuffix,
+    path: reldocfile,
+    src: { family, relative },
+  } = doc
+  const { cwd = process.cwd(), dir = cwd, mkdirs } = assemblerConfig.build
+  const docname = family + '$' + relative.substring(0, relative.length - docfilesuffix.length)
+  const docfile = ospath.join(dir, reldocfile)
+  const outdir = ospath.dirname(docfile)
+  const outfile = docfile.substring(0, docfile.length - docfilesuffix.length) + targetExtname
+  const attributes = Object.assign({ revdate: `${assemblerConfig.assembly.revdate}@` }, docAttributes, {
+    docdir: relativeToOutput ? dir : outdir,
+    docfile,
+    docfilesuffix,
+    docname: `${docname}@`,
+    imagesdir: '',
+    imagesoutdir: ospath.join(outdir, '..', '_images'),
+    outdir,
+    outfile,
+    outfilesuffix: targetExtname,
+    toArgs (attributeOptionFlag, outputOptionFlag) {
+      const args = []
+      let requireAsciidoctorLogAdapter
+      for (const [name, val] of Object.entries(this)) {
+        let optionValue
+        if (name === 'asciidoctor-log-integration') {
+          if ((val ?? false) !== false) requireAsciidoctorLogAdapter = val
+          continue
+        } else if ((val ?? false) === false) {
+          optionValue = `${name}!${val === false ? '=@' : ''}`
+        } else {
+          optionValue = val === '' ? name : name + '=' + val
+        }
+        args.push(attributeOptionFlag, optionValue)
+      }
+      if (requireAsciidoctorLogAdapter) args.push('-r', requireAsciidoctorLogAdapter)
+      if (outputOptionFlag) args.push(outputOptionFlag, this.outfile)
+      return args
+    },
+  })
+  Object.defineProperty(attributes, 'outfilesuffix', {
+    get () {
+      return ospath.extname(this.outfile)
+    },
+    set (value) {
+      const outfile = this.outfile
+      const extname = ospath.extname(outfile)
+      if (extname && outfile.endsWith(extname)) this.outfile = outfile.substring(0, outfile.length - extname.length)
+      this.outfile += value
+    },
+  })
+  Object.defineProperty(attributes, 'toArgs', { enumerable: false })
+  if (mkdirs) await fsp.mkdir(outdir, { recursive: true, force: true })
+  if (attributes['asciidoctor-log-integration'] != null) {
+    const scriptSourcePath = require.resolve('#asciidoctor-log-adapter')
+    let scriptTargetPath = scriptSourcePath
+    if (attributes['asciidoctor-log-integration'] === 'copy-to-build-dir') {
+      scriptTargetPath = ospath.join(dir, 'asciidoctor-log-adapter.rb')
+      await fsp.cp(scriptSourcePath, scriptTargetPath, { force: true, recursive: true })
+    }
+    attributes['asciidoctor-log-integration'] = scriptTargetPath
+  }
+  return attributes
+}
+
+module.exports = compileConversionAttributes

package/lib/configure.js

@@ -7,25 +7,26 @@ function configure (context, ...args) {
 }
 
 function internalConfigure (converter, config = {}, providers = {}) {
-  this.once('componentsRegistered', ({ contentCatalog, assemblerProfiles }) => {
-    contentCatalog.publishableFamilies.add('export')
-    if (assemblerProfiles) return
-    this.updateVariables({ assemblerProfiles: getAssemblerProfiles(contentCatalog) })
-  })
+  if (!this.listeners('beforeProcess').includes(enableKeepSource)) {
+    this.once('componentsRegistered', ({ contentCatalog, assemblerProfiles }) => {
+      contentCatalog.publishableFamilies.add('export')
+      if (!assemblerProfiles) this.updateVariables({ assemblerProfiles: getAssemblerProfiles(contentCatalog) })
+    })
 
-  this.once('beforeProcess', enableKeepSource)
+    this.once('beforeProcess', enableKeepSource)
+  }
 
   this.once('navigationBuilt', async ({ playbook, contentCatalog }) => {
-    const { assembleContent = require('./assemble-content'), ...assembleContentConfig } = providers
+    const { assembleContent = require('./assemble-content'), ...assembleContentProviders } = providers
     if (config.configSource?.constructor === Object) {
-      assembleContentConfig.configSource = config.configSource
-      await assembleContent.call(this, playbook, contentCatalog, converter, assembleContentConfig)
+      assembleContentProviders.configSource = config.configSource
+      await assembleContent.call(this, playbook, contentCatalog, converter, assembleContentProviders)
     } else {
       const singleConfig = !('configFiles' in config)
       const configFiles = singleConfig ? config.configFile : config.configFiles
       for (const configSource of Array.isArray(configFiles) ? configFiles : [configFiles]) {
-        const assembleContentConfigWithConfigSource = Object.assign({}, assembleContentConfig, { configSource })
-        await assembleContent.call(this, playbook, contentCatalog, converter, assembleContentConfigWithConfigSource)
+        const assembleContentProvidersWithConfigSource = Object.assign({}, assembleContentProviders, { configSource })
+        await assembleContent.call(this, playbook, contentCatalog, converter, assembleContentProvidersWithConfigSource)
         if (singleConfig) break
       }
     }
@@ -52,8 +53,9 @@ function getAssemblerProfiles (contentCatalog, assemblerProfiles = new Map()) {
         [...(componentVersion.origins ?? [])].find((it) => it.descriptor?.ext?.assembler)
       const assemblerConfig = getAssemblerConfigFromDescriptor(source?.descriptor)
       if (!assemblerConfig) return
-      const componentVersionRef = `${componentVersion.version}@${componentVersion.name}`
-      const filesByPath = componentVersion.files.reduce((accum, it) => accum.set(it.path, it), new Map())
+      const { name: componentName, version, files } = componentVersion
+      const componentVersionKey = `${version}@${componentName}`
+      const filesByPath = files.reduce((accum, it) => accum.set(it.path, it), new Map())
       const componentVersionProfiles = assemblerConfig.reduce((accum, entry) => {
         const data = {}
         const profile = entry.profile ?? undefined
@@ -68,8 +70,9 @@ function getAssemblerProfiles (contentCatalog, assemblerProfiles = new Map()) {
           data.navFiles = (nav.length ? [...new Set(nav)] : nav).reduce((navFiles, path_) => {
             const navFile = filesByPath.get(path_)
             if (navFile) {
-              navFiles.push(initNavFile(navFile, component.name, componentVersion.version, navFiles.length))
+              navFiles.push(initNavFile(navFile, componentName, version, navFiles.length))
             } else {
+              const componentVersionRef = `${version === 'master' ? '' : version}@${componentName}`
               ;(data.messages ??= []).push([
                 'warn',
                 { source },
@@ -83,7 +86,7 @@ function getAssemblerProfiles (contentCatalog, assemblerProfiles = new Map()) {
         }
         return accum.set(profile, data)
       }, new Map())
-      assemblerProfiles.set(componentVersionRef, componentVersionProfiles)
+      assemblerProfiles.set(componentVersionKey, componentVersionProfiles)
     })
   })
   return assemblerProfiles

package/lib/constants.js

@@ -19,4 +19,5 @@ module.exports = Object.freeze({
     'rootLevel',
     'sectionMergeStrategy',
   ],
+  CAMEL_CASE_STOP_KEYS: ['asciidoc.attributes', 'assembly.attributes'],
 })

package/lib/filter-component-versions.js

@@ -5,7 +5,7 @@ const { filterCollection, compilePattern } = require('./util/matcher')
 const VERSION_SEPARATOR_RX = /@(?!\()(?=(\w)?)/g
 const US = '\x1f'
 
-function filterComponentVersions (components, { names: patterns, prereleases = true }) {
+function filterComponentVersions ({ names: patterns, prereleases = true }, components) {
   if (!patterns.length) return []
   const candidateMap = components.reduce((accum, { name: componentName, latest, versions }) => {
     for (const version of versions) {

package/lib/index.js

@@ -3,4 +3,4 @@
 const assembleContent = require('./assemble-content')
 const configure = require('./configure')
 
-module.exports = { assembleContent, configure, configureAssembler: configure }
+module.exports = { assembleContent, configure }

package/lib/load-config.js

@@ -1,13 +1,13 @@
 'use strict'
 
+const deepClone = require('./util/deep-clone')
 const expandPath = require('@antora/expand-path-helper')
 const fsp = require('node:fs/promises')
 const os = require('node:os')
 const ospath = require('node:path')
 const yaml = require('js-yaml')
 
-const { LEGACY_ASSEMBLY_KEYS } = require('./constants')
-const CAMEL_CASE_STOP_PATHS = ['asciidoc.attributes', 'assembly.attributes']
+const { CAMEL_CASE_STOP_KEYS, LEGACY_ASSEMBLY_KEYS } = require('./constants')
 const PACKAGE_NAME = require('../package.json').name
 const YAML_SCHEMA = yaml.CORE_SCHEMA.withTags(yaml.mergeTag)
 
@@ -15,7 +15,7 @@ function loadConfig (configSource, playbook, preferredQualifier = '') {
   let resolvedConfigSource
   return (
     configSource?.constructor === Object
-      ? Promise.resolve(configSource)
+      ? Promise.resolve(deepClone(configSource))
       : fileExists(
           (resolvedConfigSource = expandPath(configSource ?? `./antora-assembler${preferredQualifier}.yml`, {
             dot: playbook.dir,
@@ -38,7 +38,7 @@ function loadConfig (configSource, playbook, preferredQualifier = '') {
               return {}
             }
             return fsp.readFile(resolvedConfigSource).then((data) =>
-              Object.assign(camelCaseKeys(yaml.load(data, { schema: YAML_SCHEMA }), CAMEL_CASE_STOP_PATHS), {
+              Object.assign(camelCaseKeys(yaml.load(data, { schema: YAML_SCHEMA }), CAMEL_CASE_STOP_KEYS), {
                 file: resolvedConfigSource,
               })
             )
@@ -134,14 +134,14 @@ function loadConfig (configSource, playbook, preferredQualifier = '') {
   })
 }
 
-function camelCaseKeys (o, stopPaths = [], p = undefined) {
+function camelCaseKeys (o, stopPaths, p = undefined) {
   if (Array.isArray(o)) return o.map((it) => camelCaseKeys(it, stopPaths, p))
   if (o == null || o.constructor !== Object) return o
   const pathPrefix = p ? p + '.' : ''
   const accum = {}
   for (const [k, v] of Object.entries(o)) {
     const camelKey = k.charAt() + k.substring(1).replace(/_([a-z])/g, (_, l) => l.toUpperCase())
-    accum[camelKey] = ~stopPaths.indexOf(pathPrefix + camelKey) ? v : camelCaseKeys(v, stopPaths, pathPrefix + camelKey)
+    accum[camelKey] = stopPaths.includes(pathPrefix + camelKey) ? v : camelCaseKeys(v, stopPaths, pathPrefix + camelKey)
   }
   return accum
 }

package/lib/log-command.js

@@ -1,14 +1,14 @@
 'use strict'
 
-function logCommand (loggerName, command, extraArgsOrAttributeOptionFlag, file, convertAttributes) {
+function logCommand (loggerName, command, extraArgsOrAttributeOptionFlag, file, attributes) {
   const logger = this?.getLogger(loggerName)
   if (!logger?.isLevelEnabled('debug')) return
-  const { docfile, 'assembler-filetype': filetype } = convertAttributes
+  const { docfile, 'assembler-filetype': filetype } = attributes
   const args = (
     Array.isArray(extraArgsOrAttributeOptionFlag)
       ? extraArgsOrAttributeOptionFlag
       : extraArgsOrAttributeOptionFlag
-        ? convertAttributes.toArgs(extraArgsOrAttributeOptionFlag)
+        ? attributes.toArgs(extraArgsOrAttributeOptionFlag)
         : []
   ).map((it) => (~it.indexOf(' ') ? `'${it}'` : it))
   const ctx = { command: [command].concat(args).join(' '), file: { path: docfile } }