@antora/assembler 1.0.0-beta.9 → 1.0.0-rc.10

package/adapters/asciidoctor/jsonl-logger.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+autoload :JSON, 'json'
+
+class JsonlFormatter < Asciidoctor::Logger::BasicFormatter
+  def call severity, time, progname, msg
+    entry = { 'time' => time.utc.to_i, 'level' => severity.downcase, 'name' => progname }
+    if ::String === msg
+      entry['msg'] = msg
+    else
+      loc = msg[:source_location]
+      entry['file'] = { 'path' => loc.file, 'line' => loc.lineno }
+      entry['msg'] = msg[:text]
+    end
+    (JSON.generate entry) + ?\n
+  end
+end
+
+proc do
+  logger = Asciidoctor::LoggerManager.logger
+  logger.formatter = JsonlFormatter.new
+  unless (progname = ::File.basename $PROGRAM_NAME).empty?
+    logger.progname = progname
+  end
+end.call

package/lib/assemble-content.js

@@ -1,99 +1,116 @@
 'use strict'
 
-const computeOut = require('./util/compute-out')
-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')
 const ospath = require('node:path')
 const { posix: path } = ospath
 const produceAssemblyFiles = require('./produce-assembly-files')
 const PromiseQueue = require('./util/promise-queue')
-const { stringify: toJSON } = JSON
+const runCommand = require('@antora/run-command-helper')
 
-const invariably = { 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 }) {
-  const assemblerConfig = await loadConfig(playbook, configSource)
-  if (!assemblerConfig) return [] // TODO consider removing and doing this another way
+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 ? '-' + targetBackend : '')
+  if (assemblerConfig.enabled === false || !contentCatalog.publishableFamilies?.has('export')) return []
   const context = isBound(this)
     ? this
     : {
         getFunctions: invariably.new,
         getLogger: invariably.void,
         getVariables: invariably.new,
+        require,
       }
   const generatorFunctions = context.getFunctions()
-  const { loadAsciiDoc = require('@antora/asciidoc-loader') } = generatorFunctions
-  const {
-    convert = converter,
-    getDefaultCommand,
-    extname: targetExtname = '',
-    backend: targetBackend = targetExtname.slice(1),
-    embedReferenceStyle = 'relative',
-    mediaType: targetMediaType,
-    loggerName = PACKAGE_NAME,
-  } = converter ?? {}
+  const { loadAsciiDoc = context.require('@antora/asciidoc-loader') } = generatorFunctions
   const { assembly: assemblyConfig, build: buildConfig } = assemblerConfig
   assemblyConfig.embedReferenceStyle = embedReferenceStyle
-  const { profile = targetBackend } = assemblyConfig
-  const intrinsicAttributes = { 'loader-assembler': '' }
-  buildConfig.cwd ??= process.cwd()
+  if (xmlCompliant) assemblyConfig.xmlIds ??= true
+  const profile = (assemblyConfig.profile ??= targetBackend)
+  const intrinsicAttributes = { 'loader-assembler': '', 'assembler-root-level': assemblyConfig.rootLevel }
+  const cwd = (buildConfig.cwd ??= process.cwd())
   if (profile) {
-    buildConfig.dir ??= ospath.join(playbook.dir ?? process.cwd(), `build/assembler-${profile}`)
+    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')
+    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.slice(1)
+    const targetFiletype = targetExtname.substring(1)
     intrinsicAttributes[`assembler-filetype-${targetFiletype}`] = ''
     intrinsicAttributes['assembler-filetype'] = targetFiletype
   }
-  Object.assign(assemblerConfig.asciidoc.attributes, intrinsicAttributes)
+  Object.assign(assemblyConfig.attributes, intrinsicAttributes)
   const assemblyFiles = produceAssemblyFiles(
     loadAsciiDoc,
     contentCatalog,
     assemblerConfig,
-    createResolveAssemblyModel(context, contentCatalog, assemblyConfig, intrinsicAttributes, navigationCatalog)
+    generateSelectAssemblerProfile(context, contentCatalog, assemblyConfig, intrinsicAttributes, navigationCatalog),
+    typeof componentVersionFilter === 'function' ? componentVersionFilter : undefined
   )
   if (!(assemblyFiles.length && typeof convert === 'function')) return assemblyFiles
-  if (buildConfig.command == null && typeof getDefaultCommand === 'function') {
-    buildConfig.command = await getDefaultCommand(buildConfig.cwd)
-  }
-  const { publishSite: publishFiles = require('@antora/site-publisher') } = generatorFunctions
+  buildConfig.command ??= typeof getDefaultCommand === 'function' ? await getDefaultCommand(cwd, playbook) : null
+  const { publishSite: publishFiles = context.require('@antora/site-publisher') } = generatorFunctions
   await prepareWorkspace(publishFiles, assemblyFiles, buildConfig)
+  const helpers = { runCommand }
+  Object.defineProperty(helpers, 'logger', {
+    get: () => context?.getLogger(loggerName),
+  })
+  Object.defineProperty(helpers, 'logCommand', {
+    get: () => logCommand.bind(null, helpers.logger),
+  })
   const boundConvert = convert.bind(context)
+  const boundResolveFileOrContents = resolveFileOrContents.bind(context)
   return new PromiseQueue({ concurrency: buildConfig.processLimit })
     .add(
       assemblyFiles.map((doc) => async () => {
         const relativeToOutput = embedReferenceStyle === 'output-relative'
-        const convertAttributes = prepareConvertAttributes(doc, targetExtname, relativeToOutput, buildConfig)
-        if (buildConfig.mkdirs) await fsp.mkdir(convertAttributes.outdir, { recursive: true, force: true })
-        return boundConvert(doc, convertAttributes, buildConfig).then((result) => {
-          const fileOrContents = resolveFileOrContents.call(context, result, convertAttributes, buildConfig, loggerName)
-          return coerceToExportFormat(doc, targetBackend, targetExtname, targetMediaType, 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)
+          )
+        )
       })
     )
     .toPromise()
     .then((files) => {
-      if (!buildConfig.publish) {
+      const { publish, qualifyExports } = buildConfig
+      if (!publish) {
         for (const file of files) delete file.assembler.assembled
         return files
       }
-      const qualifyExports = buildConfig.qualifyExports
       return files.map((file) => {
-        const pages = file.assembler.assembled.pages
+        const pages = file.isNull() ? undefined : file.assembler.assembled.pages
         delete file.assembler.assembled
-        file = contentCatalog.addFile(Object.assign(file, { out: computeOut.call(contentCatalog, file.src) }))
+        if (!pages) return file
+        file = contentCatalog.addFile(file)
         const extname = file.extname
         const download = file.assembler.downloadStem + extname
         if (qualifyExports) {
@@ -103,8 +120,15 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
         }
         pages.forEach((fragment, page) => {
           const assemblerMeta = (page.assembler ??= {})
-          ;(assemblerMeta.exports ??= []).push({ fragment, file })
-          const extnameProp = extname.slice(1)
+          const exports = (assemblerMeta.exports ??= [])
+          const exportEntry = { fragment, file }
+          if (fragment === pages.rootPageFragment) exportEntry.root = true
+          const insertIdx = exports.findIndex(
+            ({ file: candidate }) =>
+              !(candidate.src.component === page.src.component && candidate.src.version === page.src.version)
+          )
+          ~insertIdx ? exports.splice(insertIdx, 0, exportEntry) : exports.push(exportEntry)
+          const extnameProp = extname.substring(1)
           if (extnameProp in assemblerMeta) return
           Object.defineProperty(assemblerMeta, extnameProp, {
             configurable: true,
@@ -117,106 +141,63 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
     })
 }
 
-function createResolveAssemblyModel (context, contentCatalog, common, intrinsicAttributes, navigationCatalog) {
+/**
+ * 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 generateSelectAssemblerProfile (context, contentCatalog, baseModel, intrinsicAttributes, navigationCatalog) {
   const logger = context.getLogger?.(PACKAGE_NAME)
   const { assemblerProfiles } = context.getVariables()
   if (!assemblerProfiles) {
     return (componentVersion) => {
       const navigation =
         navigationCatalog?.getNavigation(componentVersion.name, componentVersion.version) ?? componentVersion.navigation
-      return Object.assign({ logger }, common, { navigation })
+      return Object.assign({}, baseModel, { attributes: Object.assign({}, baseModel.attributes), navigation, logger })
     }
   }
   const boundSendToLog = sendToLog.bind(logger)
-  const { buildNavigation = require('@antora/navigation-builder') } = context.getFunctions()
+  const { buildAlternateNavigation = context.require('@antora/navigation-builder').buildAlternateNavigation } =
+    context.getFunctions()
   return (componentVersion) => {
     const componentVersionProfiles = assemblerProfiles.get(componentVersion.version + '@' + componentVersion.name)
-    const overrides =
-      componentVersionProfiles?.get(intrinsicAttributes['assembler-profile']) ?? componentVersionProfiles?.get() ?? {}
-    const { navFiles, messages } = overrides
-    const model = Object.assign({ logger }, common, overrides)
+    const overrides = componentVersionProfiles?.get(baseModel.profile) ?? componentVersionProfiles?.get()
+    const navigation = navigationCatalog?.getNavigation(componentVersion.name, componentVersion.version)
+    const attributes = Object.assign({}, baseModel.attributes)
+    const model = Object.assign({}, baseModel, overrides, { attributes, logger })
+    if (!overrides) return Object.assign(model, { navigation: navigation || componentVersion.navigation })
+    if ('rootLevel' in overrides) attributes['assembler-root-level'] = overrides.rootLevel
     delete model.navFiles
     delete model.messages
-    const navigationOverride = navigationCatalog?.getNavigation(componentVersion.name, componentVersion.version)
-    if (navigationOverride) return Object.assign(model, { navigation: navigationOverride })
-    messages?.forEach(boundSendToLog)
-    model.navigation = componentVersion.navigation
-    if (!navFiles) return model
+    if (overrides.attributes) {
+      for (const [name, val] of Object.entries(overrides.attributes)) {
+        if (!(name in intrinsicAttributes)) attributes[name] = val
+      }
+    }
+    if (navigation) return Object.assign(model, { navigation })
+    overrides.messages?.forEach(boundSendToLog)
+    const navFiles = overrides.navFiles
+    if (!navFiles) return Object.assign(model, { navigation: componentVersion.navigation })
     if (!navFiles.length) return Object.assign(model, { navigation: [] })
-    const navigation_ = model.navigation
-    const asciidoc_ = componentVersion.asciidoc
-    componentVersion.asciidoc = Object.assign({}, asciidoc_, {
-      attributes: Object.assign({}, asciidoc_.attributes, intrinsicAttributes),
+    model.navigation = buildAlternateNavigation(contentCatalog, componentVersion, navFiles, {
+      attributes: model.attributes,
     })
-    buildNavigation(
-      new Proxy(contentCatalog, {
-        get (target, property) {
-          const method = target[property]
-          if (property !== 'findBy') return method
-          return (criteria) => (toJSON(criteria) === '{"family":"nav"}' ? navFiles : method.call(target, criteria))
-        },
-      })
-    )
-    model.navigation = componentVersion.navigation
-    Object.assign(componentVersion, { asciidoc: asciidoc_, navigation: navigation_ })
     return model
   }
 }
 
-function prepareConvertAttributes (doc, targetExtname, relativeToOutput, buildConfig) {
-  const {
-    asciidoc: { attributes: docAttributes } = { attributes: {} },
-    extname: docfilesuffix,
-    path: reldocfile,
-    src: { family, relative },
-  } = doc
-  const { cwd = process.cwd(), dir = cwd } = buildConfig
-  const docname = family + '$' + relative.slice(0, relative.length - docfilesuffix.length)
-  const docfile = ospath.join(dir, reldocfile)
-  const outdir = ospath.dirname(docfile)
-  const docdir = relativeToOutput ? dir : outdir
-  const imagesdir = ''
-  const outfile = docfile.slice(0, docfile.length - docfilesuffix.length) + targetExtname
-  const attributes = Object.assign({}, docAttributes, {
-    docdir,
-    docfile,
-    docfilesuffix,
-    'docname@': docname,
-    imagesdir,
-    outdir,
-    outfile,
-    outfilesuffix: targetExtname,
-    toArgs (optionFlag, command) {
-      const padCharRef = process.platform === 'win32' && command.startsWith('bundle exec ')
-      const args = []
-      for (let [name, val] of Object.entries(this)) {
-        if (val) {
-          val = `${name}=${padCharRef && typeof val.charAt === 'function' && val.charAt() === '&' ? ' ' : ''}${val}`
-        } else if (val === '') {
-          val = name
-        } else {
-          val = `!${name}${val === false ? '@' : ''}`
-        }
-        args.push(optionFlag, val)
-      }
-      return args
-    },
-  })
-  return Object.defineProperty(attributes, 'toArgs', { enumerable: false })
-}
-
-function coerceToExportFormat (originalFile, targetBackend, targetExtname, targetMediaType, fileOrContents) {
+function coerceToExportFormat (assemblyFile, targetBackend, targetExtname, targetMediaType, fileOrContents) {
   const file =
     fileOrContents == null || Buffer.isBuffer(fileOrContents) || typeof fileOrContents.pipe === 'function'
-      ? Object.assign(originalFile, { contents: fileOrContents })
+      ? Object.assign(assemblyFile, { contents: fileOrContents })
       : fileOrContents
   ;(file.assembler ??= {}).backend = targetBackend
   if (file.extname === targetExtname) return file
-  const sourcePath = file.path
-  const sourceExtname = file.extname
-  const relativeWithoutExtname = file.src.relative.slice(0, file.src.relative.length - sourceExtname.length)
-  const newPath = sourcePath.slice(0, sourcePath.length - sourceExtname.length) + targetExtname
-  Object.assign(file, { mediaType: (file.src.mediaType = targetMediaType), path: newPath })
+  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: (file.src.path = newPath) })
+  delete file.src.abspath
   file.src.basename = path.basename((file.src.relative = relativeWithoutExtname + (file.src.extname = targetExtname)))
   return file
 }
@@ -237,41 +218,66 @@ function prepareWorkspace (publishFiles, assemblyFiles, buildConfig) {
       outPaths.add(asset.out.path)
     }
   }
-  if (keepSource) files.push(...assemblyFiles.map((file) => Object.assign(file, { out: { path: file.path } })))
-  return publishFiles({ output: { clean, dir } }, { getFiles: () => files })
+  if (keepSource) {
+    for (const file of assemblyFiles) {
+      file.out = { path: file.path }
+      file.src.contents = file.contents
+      file.src.abspath = ospath.join(dir, file.path)
+      files.push(file)
+    }
+  }
+  return publishFiles({ output: { clean, dir } }, { getFiles: () => files }).then(() => {
+    if (keepSource) {
+      for (const file of assemblyFiles) delete file.out
+    }
+  })
 }
 
-function resolveFileOrContents (convertResult, convertAttributes, buildConfig, loggerName) {
+function resolveFileOrContents (convertResult, attributes, buildConfig, loggerName) {
   let fileOrContents
   if (convertResult?.status != null) {
-    fileOrContents = 'file' in convertResult ? convertResult.file : convertResult.contents
+    if ('file' in convertResult) {
+      fileOrContents = convertResult.file
+    } else if ('contents' in convertResult) {
+      fileOrContents = convertResult.contents
+    } else if (buildConfig.outputOptionFlag === false) {
+      fileOrContents = convertResult.stdout
+    }
     let logger, match
-    if (buildConfig.stderrSink === 'log' && convertResult.stderr.length && (logger = this.getLogger(loggerName))) {
-      const docfile = convertAttributes.docfile
+    if (buildConfig.stderrSink === 'log' && convertResult.stderr?.length && (logger = this.getLogger(loggerName))) {
+      const docfile = attributes.docfile
       const command = buildConfig.command
+      const file = { path: docfile }
       const stderr = convertResult.stderr.toString().trimEnd()
+      const additionalLines = ['Additional stderr lines from command:']
       stderr.split(NEWLINE_RX).forEach((line) => {
-        const ctx = { command, file: { path: docfile } }
+        const ctx = { command, file }
         if (line.charAt() === '{' && line.charAt(line.length - 1) === '}') {
           const entry = JSON.parse(line)
           if (entry.name) ctx.program = entry.name
           if (entry.file?.line) ctx.line = entry.file.line
           logger[entry.level](ctx, entry.msg)
-        } else if ((match = /^(.+):(\d+): warning: (.+)/.exec(line))) {
+        } else if ((match = /^([^:]+):(\d+): warning: (.+)/.exec(line))) {
           const [, scriptPath, lineno, msg] = match
           ctx.stack = [{ file: { path: scriptPath }, line: parseInt(lineno, 10) }]
           logger.warn(ctx, msg)
+        } else if ((match = /^asciidoctor: ([A-Z]+): (?:[^:]+: line (\d+): )?(.+)/.exec(line))) {
+          // NOTE we don't care about the filename in the message since it can only be docfile
+          const [, level, lineno, msg] = match
+          if (lineno) ctx.line = parseInt(lineno, 10)
+          logger[level === 'WARNING' ? 'warn' : level.toLowerCase()](ctx, msg)
         } else {
-          logger.info(ctx, line)
+          additionalLines.push(line)
         }
       })
+      if (additionalLines.length > 1) logger.info({ command, file }, additionalLines.join('\n'))
     }
   } else if (convertResult !== undefined) {
-    return convertResult
+    return Promise.resolve(convertResult)
   }
-  return fileOrContents === undefined
-    ? new LazyReadable(() => fs.createReadStream(convertAttributes.outfile))
-    : fileOrContents
+  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,76 @@
+'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 = (doc.src.path = ospath.join(dir, reldocfile))
+  const outdir = ospath.dirname(docfile)
+  const outfile = docfile.substring(0, docfile.length - docfilesuffix.length) + targetExtname
+  const docdir = relativeToOutput ? dir : outdir
+  //const imagesoutdir = ospath.join(outdir, '..', '_images/generated')
+  const imagesoutdir = outdir
+  const attributes = Object.assign({ revdate: `${assemblerConfig.assembly.revdate}@` }, docAttributes, {
+    docdir,
+    docfile,
+    docfilesuffix,
+    docname,
+    imagesdir: '',
+    imagesoutdir,
+    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

@@ -1,34 +1,61 @@
 'use strict'
 
+const { ASSEMBLY_KEYS } = require('./constants')
+
 function configure (context, ...args) {
   internalConfigure.apply(context, args)
 }
 
 function internalConfigure (converter, config = {}, providers = {}) {
-  this.once('componentsRegistered', ({ contentCatalog, assemblerProfiles }) => {
-    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', ({ siteAsciiDocConfig }) => {
-    siteAsciiDocConfig.keepSource = true
-  })
+    this.once('beforeProcess', enableKeepSource)
+  }
 
   this.once('navigationBuilt', async ({ playbook, contentCatalog }) => {
-    const { assembleContent = require('./assemble-content'), ...assembleContentConfig } = providers
-    assembleContentConfig.configSource ??= config.configFile
-    await assembleContent.call(this, playbook, contentCatalog, converter, assembleContentConfig)
+    const { assembleContent = require('./assemble-content'), ...assembleContentProviders } = providers
+    if (config.configSource?.constructor === Object) {
+      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 assembleContentProvidersWithConfigSource = Object.assign({}, assembleContentProviders, { configSource })
+        await assembleContent.call(this, playbook, contentCatalog, converter, assembleContentProvidersWithConfigSource)
+        if (singleConfig) break
+      }
+    }
   })
 }
 
+function enableKeepSource ({ siteAsciiDocConfig }) {
+  if (siteAsciiDocConfig.keepSource instanceof Boolean) return
+  siteAsciiDocConfig.keepSource = Object.assign(new Boolean(true), { oldValue: siteAsciiDocConfig.keepSource })
+  this.once('navigationBuilt', restoreKeepSource)
+}
+
+function restoreKeepSource ({ siteAsciiDocConfig, contentCatalog }) {
+  if (!(siteAsciiDocConfig.keepSource instanceof Boolean)) return
+  if ((siteAsciiDocConfig.keepSource = siteAsciiDocConfig.keepSource.oldValue)) return
+  contentCatalog.getPages((page) => delete page.src.contents)
+}
+
 function getAssemblerProfiles (contentCatalog, assemblerProfiles = new Map()) {
   contentCatalog.getComponents().forEach((component) => {
     component.versions.forEach((componentVersion) => {
-      const source = componentVersion.nav?.origin
+      const source =
+        componentVersion.nav?.origin ??
+        [...(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
@@ -37,14 +64,15 @@ function getAssemblerProfiles (contentCatalog, assemblerProfiles = new Map()) {
         Object.entries(entry).forEach(([key, val]) => {
           if (key === 'profile' || key === 'nav') return
           const camelKey = key.toLowerCase().replace(/[_-]([a-z0-9])/g, (_, l, idx) => (idx ? l.toUpperCase() : l))
-          data[camelKey] = val
+          if (ASSEMBLY_KEYS.includes(camelKey)) data[camelKey] = val
         })
         if (nav) {
           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 },
@@ -58,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

@@ -0,0 +1,24 @@
+'use strict'
+
+module.exports = Object.freeze({
+  ASSEMBLY_KEYS: [
+    'attributes',
+    'doctype',
+    'dropExplicitXrefText',
+    'linkReferenceStyle',
+    'insertStartPage',
+    'profile',
+    'rootLevel',
+    'rootPageStyle',
+    'sectionMergeStrategy',
+    'xmlIds',
+  ],
+  LEGACY_ASSEMBLY_KEYS: [
+    'dropExplicitXrefText',
+    'linkReferenceStyle',
+    'insertStartPage',
+    'rootLevel',
+    'sectionMergeStrategy',
+  ],
+  CAMEL_CASE_STOP_KEYS: ['asciidoc.attributes', 'assembly.attributes'],
+})