@antora/assembler 1.0.0-beta.17 → 1.0.0-beta.19

package/lib/assemble-content.js

@@ -5,10 +5,12 @@ const fs = require('node:fs')
 const { promises: fsp } = fs
 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 runCommand = require('@antora/run-command-helper')
 const { stringify: toJSON } = JSON
 
 const invariably = { new: () => ({}), void: () => undefined }
@@ -16,17 +18,6 @@ const PACKAGE_NAME = require('../package.json').name
 const NEWLINE_RX = /(?:\r?\n)+/
 
 async function assembleContent (playbook, contentCatalog, converter, { configSource, navigationCatalog }) {
-  const context = isBound(this)
-    ? this
-    : {
-        getFunctions: invariably.new,
-        getLogger: invariably.void,
-        getVariables: invariably.new,
-      }
-  const assemblerConfig = await loadConfig.call(context, playbook, configSource)
-  if (assemblerConfig.enabled === false) return []
-  const generatorFunctions = context.getFunctions()
-  const { loadAsciiDoc = require('@antora/asciidoc-loader') } = generatorFunctions
   const {
     convert = converter,
     getDefaultCommand,
@@ -36,13 +27,24 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
     mediaType: targetMediaType,
     loggerName = PACKAGE_NAME,
   } = converter ?? {}
+  const assemblerConfig = await loadConfig.call(this, playbook, configSource, '-' + targetBackend)
+  if (assemblerConfig.enabled === false) return []
+  const context = isBound(this)
+    ? this
+    : {
+        getFunctions: invariably.new,
+        getLogger: invariably.void,
+        getVariables: invariably.new,
+      }
+  const generatorFunctions = context.getFunctions()
+  const { loadAsciiDoc = 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 (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) {
@@ -50,14 +52,14 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
       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 (targetExtname) {
     const targetFiletype = targetExtname.slice(1)
     intrinsicAttributes[`assembler-filetype-${targetFiletype}`] = ''
     intrinsicAttributes['assembler-filetype'] = targetFiletype
   }
-  Object.assign(assemblerConfig.assembly.attributes, intrinsicAttributes)
+  Object.assign(assemblyConfig.attributes, intrinsicAttributes)
   const assemblyFiles = produceAssemblyFiles(
     loadAsciiDoc,
     contentCatalog,
@@ -70,14 +72,15 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
   }
   const { publishSite: publishFiles = require('@antora/site-publisher') } = generatorFunctions
   await prepareWorkspace(publishFiles, assemblyFiles, buildConfig)
+  const helpers = { logCommand: logCommand.bind(context, loggerName), runCommand }
   const boundConvert = convert.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)
+        const convertAttributes = prepareConvertAttributes(doc, targetExtname, relativeToOutput, assemblerConfig)
         if (buildConfig.mkdirs) await fsp.mkdir(convertAttributes.outdir, { recursive: true, force: true })
-        return boundConvert(doc, convertAttributes, buildConfig).then((result) => {
+        return boundConvert(doc, convertAttributes, buildConfig, helpers).then((result) => {
           const fileOrContents = resolveFileOrContents.call(context, result, convertAttributes, buildConfig, loggerName)
           return coerceToExportFormat(doc, targetBackend, targetExtname, targetMediaType, fileOrContents)
         })
@@ -178,21 +181,21 @@ function generateSelectAssemblyProfile (context, contentCatalog, base, intrinsic
   }
 }
 
-function prepareConvertAttributes (doc, targetExtname, relativeToOutput, buildConfig) {
+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 } = buildConfig
+  const { cwd = process.cwd(), dir = cwd } = assemblerConfig.build
   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, {
+  const attributes = Object.assign({ revdate: `${assemblerConfig.assembly.revdate}@` }, docAttributes, {
     docdir,
     docfile,
     docfilesuffix,
@@ -256,7 +259,13 @@ function prepareWorkspace (publishFiles, assemblyFiles, buildConfig) {
       outPaths.add(asset.out.path)
     }
   }
-  if (keepSource) files.push(...assemblyFiles.map((file) => Object.assign(file, { out: { path: file.path } })))
+  if (keepSource) {
+    for (const file of assemblyFiles) {
+      file.src.contents = file.contents
+      file.out = { path: file.path }
+      files.push(file)
+    }
+  }
   return publishFiles({ output: { clean, dir } }, { getFiles: () => files })
 }
 

package/lib/configure.js

@@ -10,21 +10,41 @@ function internalConfigure (converter, config = {}, providers = {}) {
     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)
+    if (assembleContentConfig.configSource?.constructor === Object) {
+      await assembleContent.call(this, playbook, contentCatalog, converter, assembleContentConfig)
+    } 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)
+        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}`

package/lib/load-config.js

@@ -5,8 +5,6 @@ const fsp = require('node:fs/promises')
 const os = require('node:os')
 const yaml = require('js-yaml')
 
-const PACKAGE_NAME = require('../package.json').name
-
 const ASSEMBLY_KEYS = [
   'rootLevel',
   'insertStartPage',
@@ -15,18 +13,24 @@ const ASSEMBLY_KEYS = [
   'dropExplicitXrefText',
 ]
 const CAMEL_CASE_STOP_PATHS = ['asciidoc.attributes', 'assembly.attributes']
+const PACKAGE_NAME = require('../package.json').name
 
-function loadConfig (playbook, configSource) {
+function loadConfig (playbook, configSource, preferredQualifier = '') {
   let resolvedConfigSource
   return (
     configSource?.constructor === Object
       ? Promise.resolve(configSource)
-      : fsp
-          .access((resolvedConfigSource = expandPath(configSource ?? './antora-assembler.yml', { dot: playbook.dir })))
-          .then(
-            () => true,
-            () => false
-          )
+      : fileExists(
+          (resolvedConfigSource = expandPath(configSource ?? `./antora-assembler${preferredQualifier}.yml`, {
+            dot: playbook.dir,
+          }))
+        )
+          .then((exists) => {
+            if (exists || configSource || !preferredQualifier) return exists
+            return fileExists(
+              (resolvedConfigSource = resolvedConfigSource.slice(0, -(preferredQualifier.length + 4)) + '.yml')
+            )
+          })
           .then((exists) => {
             if (!exists) {
               let logger
@@ -134,6 +138,13 @@ function camelCaseKeys (o, stopPaths = [], p = undefined) {
   return accum
 }
 
+function fileExists (path) {
+  return fsp.access(path).then(
+    () => true,
+    () => false
+  )
+}
+
 function getLocalDate (now = new Date()) {
   return new Date(now - now.getTimezoneOffset() * 60000).toISOString().split('T')[0]
 }

package/lib/log-command.js

@@ -0,0 +1,18 @@
+'use strict'
+
+function logCommand (loggerName, command, file, convertAttributes, attributeOptionFlagOrArgs) {
+  const logger = this?.getLogger(loggerName)
+  if (!logger?.isLevelEnabled('debug')) return
+  const { docfile, 'assembler-filetype': filetype } = convertAttributes
+  const args = Array.isArray(attributeOptionFlagOrArgs)
+    ? attributeOptionFlagOrArgs
+    : attributeOptionFlagOrArgs
+      ? convertAttributes.toArgs(attributeOptionFlagOrArgs, command)
+      : []
+  const ctx = { command: [command].concat(args).join(' '), file: { path: docfile } }
+  const msg = `Running external command to export assembly in %s to %s: %s`
+  const componentVersionStr = file.src.version ? `${file.src.version}@${file.src.component}` : file.src.component
+  logger.debug(ctx, msg, componentVersionStr, filetype, file.src.relative)
+}
+
+module.exports = logCommand

package/lib/produce-assembly-file.js

@@ -2,16 +2,30 @@
 
 const createAsciiDocFile = require('./util/create-asciidoc-file')
 const createResourceKey = require('./util/create-resource-key')
-const generateId = require('./util/generate-id')
+const generateScopedId = require('./util/generate-scoped-id')
 const { resolveLinkTarget } = require('./util/resolver')
-const { rewriteXrefs, rewriteImageRef, rewriteInlineImages, rewriteStyleAttribute } = require('./util/rewriter')
+const {
+  rewriteXrefs,
+  rewriteImageAttr,
+  rewriteImageRef,
+  rewriteInlineImages,
+  rewriteStyleAttribute,
+} = require('./util/rewriter')
 const sanitize = require('./util/sanitize')
 const unconvertInlineAsciiDoc = require('./util/unconvert-inline-asciidoc')
 
-const AttributeEntryRx = /^:([^:-][^:]*):(?: .*)?$/
-const BuiltInNamedEntities = { amp: '&', apos: "'", gt: '>', lt: '<', nbsp: ' ', quot: '"' }
-const CharRefRx = /&(?:([a-z][a-z]+\d{0,2})|#(?:(\d{2,6})|x([a-z\d]{2,5})));/g
-const DiscardAttributes = 'doctype leveloffset assembly-navtitle assembly-style underscore'.split(' ')
+const ATTR_ENTRY_RX = /^:(!?[\p{Alpha}0-9_][^:]*):(?: |$)/u
+const BUILT_IN_NAMED_ENTITIES = { amp: '&', apos: "'", gt: '>', lt: '<', nbsp: ' ', quot: '"' }
+const CHAR_REF_RX = /&(?:([a-z][a-z]+\d{0,2})|#(?:(\d{2,6})|x([a-z\d]{2,5})));/g
+const DISCARD_ATTRIBUTE_NAMES = [
+  'doctype',
+  'leveloffset',
+  'assembly-header-attributes',
+  'assembly-navtitle',
+  'assembly-style',
+  'underscore',
+]
+const { NAMED_ID_ATTR_RX } = require('./util/rx')
 
 function produceAssemblyFile (
   loadAsciiDoc,
@@ -25,7 +39,30 @@ function produceAssemblyFile (
 ) {
   const pagesByUrl = files.reduce((map, it) => (it.src.family === 'page' ? map.set(it.pub.url, it) : map), new Map())
   if (outline.urlType === 'internal' && !pagesByUrl.get(outline.url) && !(outline.items || []).length) return
-  const pagesInOutline = selectPagesInOutline(outline, pagesByUrl, componentVersion)
+  const pagesInOutline = selectPagesInOutline(outline, pagesByUrl)
+  const { rootLevel, xmlIds } = assemblyModel
+  const idSeparators = {
+    prefix:
+      'assembler-idprefix' in asciidocConfig.attributes ? (asciidocConfig.attributes['assembler-idprefix'] ?? '') : '_',
+    scope: xmlIds ? '---' : ':::',
+    coordinate: xmlIds ? '----' : ':',
+    generateIdFromTitle: generateIdFromTitle.bind(
+      loadAsciiDoc(
+        { contents: Buffer.alloc(0), src: { family: 'page', relative: 'generate-id-from-title.adoc' } },
+        undefined,
+        asciidocConfig
+      )
+    ),
+  }
+  const { name: component, version } = componentVersion
+  asciidocConfig = prepareAsciiDocConfig(
+    contentCatalog,
+    { component, version },
+    pagesInOutline,
+    asciidocConfig,
+    assemblyModel,
+    idSeparators
+  )
   const buffer = mergeAsciiDoc(
     loadAsciiDoc,
     contentCatalog,
@@ -34,29 +71,51 @@ function produceAssemblyFile (
     outline,
     files,
     pagesInOutline,
+    idSeparators,
     asciidocConfig,
     mutableAttributes,
     assemblyModel
   )
-  const rootLevel = assemblyModel.rootLevel
   const stem = rootLevel === 0 ? 'index' : generateSlug(buffer.navtitle)
-  const downloadStem = [componentVersion.name, componentVersion.version, rootLevel === 0 ? '' : stem]
-    .filter((it) => it)
-    .join('-')
+  const downloadStem = [component, version, rootLevel === 0 ? '' : stem].filter((it) => it).join('-')
   return createAsciiDocFile(contentCatalog, {
     asciidoc: asciidocConfig,
     assembler: { assembled: pagesInOutline.assembled, downloadStem, rootLevel },
     contents: Buffer.from(buffer.join('\n') + '\n'),
-    src: {
-      component: componentVersion.name,
-      version: componentVersion.version,
-      module: 'ROOT',
-      family: 'export',
-      relative: stem + '.adoc',
-    },
+    src: { component, version, module: 'ROOT', family: 'export', relative: stem + '.adoc' },
   })
 }
 
+function prepareAsciiDocConfig (contentCatalog, ctx, pagesInOutline, asciidocConfig, assemblyModel, idSeparators) {
+  let attributesModified
+  const configShared = asciidocConfig.$shared
+  const sharedAttributes = asciidocConfig.attributes
+  if (!configShared) {
+    if (configShared == null) {
+      const assets = pagesInOutline.assembled.assets
+      for (const [name, val] of Object.entries(sharedAttributes)) {
+        if (!(typeof val === 'string' && ~val.indexOf(':'))) continue
+        let newVal
+        if (!name.endsWith('-image') || !(newVal = rewriteImageAttr(val, contentCatalog, assemblyModel, ctx, assets))) {
+          if (~(newVal = val).indexOf('image:')) {
+            newVal = rewriteInlineImages(newVal, contentCatalog, assemblyModel, ctx, assets)
+          }
+        }
+        if (newVal !== val) sharedAttributes[name] = newVal
+      }
+    }
+    for (const [name, val] of Object.entries(sharedAttributes)) {
+      if (!(typeof val === 'string' && ~val.indexOf(':'))) continue
+      if (~val.indexOf('xref:')) {
+        const newVal = rewriteXrefs(val, contentCatalog, assemblyModel, ctx, false, pagesInOutline, idSeparators)
+        if (newVal !== val) (attributesModified ??= {})[name] = newVal
+      }
+    }
+    if (configShared == null) Object.defineProperty(asciidocConfig, '$shared', { value: attributesModified == null })
+  }
+  return Object.assign({}, asciidocConfig, { attributes: Object.assign({}, sharedAttributes, attributesModified) })
+}
+
 function buildAsciiDocHeader (componentVersion, navtitle, assemblyModel) {
   const doctype = assemblyModel.doctype ?? 'book'
   const navtitlePlain = sanitize(navtitle)
@@ -64,29 +123,30 @@ function buildAsciiDocHeader (componentVersion, navtitle, assemblyModel) {
   let doctitle = navtitleAsciiDoc
   if (navtitlePlain !== componentVersion.title) doctitle = `${componentVersion.title}: ${doctitle}`
   const version = componentVersion.version === 'master' ? '' : componentVersion.version
+  const displayVersion = componentVersion.displayVersion
   const buffer = [
     `= ${doctitle}`,
-    ...(version ? [`:revnumber: ${version}`] : []),
+    ...(version ? [`:revnumber: ${displayVersion}`] : []),
     ...(doctype === 'article' ? [] : [`:doctype: ${doctype ?? 'book'}`]),
     ':underscore: _',
     // Q: should we pass these via the CLI so they cannot be modified?
     `:page-component-name: ${componentVersion.name}`,
     `:page-component-version:${version ? ' ' + version : ''}`,
     ':page-version: {page-component-version}',
-    `:page-component-display-version: ${componentVersion.displayVersion}`,
+    `:page-component-display-version: ${displayVersion}`,
     `:page-component-title: ${componentVersion.title}`,
   ]
   return Object.assign(buffer, { navtitle })
 }
 
-function selectPagesInOutline (outlineEntry, pagesByUrl, componentVersion, accum) {
+function selectPagesInOutline (outlineEntry, pagesByUrl, accum) {
   accum ??= Object.assign(new Map(), { assembled: { pages: new Map(), assets: new Set() } })
   const page = outlineEntry.urlType === 'internal' ? pagesByUrl.get(outlineEntry.url) : undefined
   if (page) {
     accum.set(createResourceKey(page.src), page)
     accum.set(outlineEntry.url, page)
   }
-  for (const item of outlineEntry.items || []) selectPagesInOutline(item, pagesByUrl, componentVersion, accum)
+  for (const item of outlineEntry.items || []) selectPagesInOutline(item, pagesByUrl, accum)
   return accum
 }
 
@@ -98,6 +158,7 @@ function mergeAsciiDoc (
   outlineEntry,
   files,
   pagesInOutline,
+  idSeparators,
   asciidocConfig,
   mutableAttributes,
   assemblyModel,
@@ -114,18 +175,14 @@ function mergeAsciiDoc (
   let navtitlePlain = sanitize(navtitle)
   let navtitleAsciiDoc = unconvertInlineAsciiDoc(navtitle)
   const { items = [], unresolved, urlType, url } = outlineEntry
-  const { doctype, linkReferenceStyle, pubRoot, siteRoot, xmlIds, logger } = assemblyModel
+  const { doctype, filetype, linkReferenceStyle, pubRoot, siteRoot, logger } = assemblyModel
   const assembled = pagesInOutline.assembled
   // FIXME: ideally, resource ID would be stored in navigation so we can look up the page more efficiently
   const page = urlType === 'internal' && !unresolved ? pagesInOutline.get(url) : undefined
   const atDocumentRoot = !buffer.inBody
+  const isRootPage = page && atDocumentRoot && !level
   const atBookRoot = atDocumentRoot && !level && doctype === 'book' && (supportsParts = true)
   const hasItems = items.length > 0
-  const idPrefix =
-    asciidocConfig.attributes['assembler-idprefix'] ?? ('assembler-idprefix' in asciidocConfig.attributes ? '' : '_')
-  const idSeparator = xmlIds ? '-' : ':'
-  const idScopeSeparator = idSeparator.repeat(3)
-  const idCoordinateSeparator = idSeparator === '-' ? '----' : idSeparator
   if (page && !assembled.pages.has(page)) {
     const contents = page.src.contents
     if (contents == null) {
@@ -146,6 +203,7 @@ function mergeAsciiDoc (
           },
         })
       : doc.getLogger()
+    doc.source_header_attributes ??= doc.parent.$to_h()
     if (doc.hasAttribute('assembly-navtitle')) {
       navtitleAsciiDoc = doc.getAttribute('assembly-navtitle')
       navtitlePlain = sanitize((navtitle = doc.$apply_reftext_subs(navtitleAsciiDoc)))
@@ -159,30 +217,21 @@ function mergeAsciiDoc (
         }
       }
     }
-    if (atDocumentRoot) {
-      const authors = doc.getAuthors()
-      if (authors.length) {
-        const authorLine = authors
-          .map((author) => {
-            const email = author.getEmail()
-            return email ? `${author.getName()} <${author.getEmail()}>` : author.getName()
-          })
-          .join('; ')
-        buffer.splice(1, 0, authorLine)
-      }
-    }
     // NOTE: in Antora, docname is relative src path from module without file extension
     const docname = doc.getAttribute('docname')
-    const { idLeader, id: idScope } = generateId(
-      page.src,
-      componentVersion,
-      idCoordinateSeparator,
-      idScopeSeparator,
-      idPrefix
-    )
+    const pageId = generateScopedId(page.src, componentVersion, idSeparators, filetype)
+    const pageIdLeader = pageId + idSeparators.scope
     let pageFragment = ''
     let pageRoles = ''
     let pageStyle = doc.getAttribute('assembly-style', '')
+    if (
+      !pageStyle &&
+      atBookRoot &&
+      doc.isAttribute('preface-title') &&
+      !('assembly-style' in doc.source_header_attributes.$$smap)
+    ) {
+      pageStyle = 'preface'
+    }
     let part
     if ((part = pageStyle === 'part')) {
       pageStyle = ''
@@ -194,7 +243,10 @@ function mergeAsciiDoc (
     let nextSectionLevel = 1
     const lines = doc.getSourceLines()
     const ignoreLines = []
-    buffer.inBody = true
+    if (!buffer.inBody) {
+      buffer.inBody = true
+      buffer.endHeaderIdx = buffer.length - 1
+    }
     buffer.push('')
     buffer.push(`:docname: ${docname}`)
     if (component !== lastComponentVersion.name) {
@@ -218,7 +270,63 @@ function mergeAsciiDoc (
     buffer.push(`:page-origin-refname: ${origin.branch || origin.tag}`)
     buffer.push(`:page-origin-reftype: ${origin.branch ? 'branch' : 'tag'}`)
     buffer.push(`:page-origin-refhash: ${origin.worktree ? '(worktree)' : origin.refhash}`)
-    if (doc.hasHeader()) pageRoles = processDocumentHeader(doc, lines, buffer, ignoreLines)
+    if (doc.hasHeader()) {
+      for (const entry of processDocumentHeader(doc, lines, ignoreLines, isRootPage)) {
+        if (entry.type === 'author_line') {
+          buffer.splice(1, 0, entry.lines[0])
+          buffer.endHeaderIdx += 1
+        } else if (entry.type === 'attribute_entry') {
+          const name = entry.name
+          if (!entry.negated && !doc.isAttributeLocked(name)) {
+            let val, newVal
+            if (
+              name.endsWith('-image') &&
+              (val = doc.getAttribute(name)) &&
+              (newVal = rewriteImageAttr(val, contentCatalog, assemblyModel, page.src, assembled.assets))
+            ) {
+              if (newVal !== val) entry.lines = [`:${name}: ${newVal}`]
+            } else if (~(val = entry.lines.join('\n').slice(name.length + 3)).indexOf(':')) {
+              newVal = val
+              if (~newVal.indexOf('image:')) {
+                newVal = rewriteInlineImages(
+                  newVal,
+                  contentCatalog,
+                  assemblyModel,
+                  page.src,
+                  assembled.assets,
+                  false,
+                  doc
+                )
+              }
+              if (~newVal.indexOf('xref:')) {
+                newVal = rewriteXrefs(
+                  newVal,
+                  contentCatalog,
+                  assemblyModel,
+                  page.src,
+                  false,
+                  pagesInOutline,
+                  idSeparators,
+                  pageIdLeader,
+                  doc,
+                  { file: relative, lineno: entry.lineno }
+                )
+              }
+              if (newVal !== val) entry.lines = `:${entry.name}: ${newVal}`.split('\n')
+            }
+          }
+          if (entry.promote) {
+            buffer.splice(buffer.endHeaderIdx + 1, 0, ...entry.lines)
+            buffer.endHeaderIdx += entry.lines.length
+          } else {
+            buffer.push(...entry.lines)
+          }
+        } else {
+          buffer.push(...entry.lines)
+        }
+      }
+      pageRoles = doc.getRoles().reduce((accum, role) => `${accum}.${role}`, '')
+    }
     let heading
     if (pageStyle && (part && level === 1 ? (level = 0) : level) === 0) {
       let htitleAsciiDoc = navtitleAsciiDoc
@@ -235,10 +343,10 @@ function mergeAsciiDoc (
         assemblyModel = Object.assign({}, assemblyModel, { sectionMergeStrategy: 'discrete' })
       } else {
         if (atDocumentRoot) {
-          pageFragment = `#${idLeader}${doc.getId() ?? pageStyle}`
-          buffer.unshift(`[#${idScope}]`)
+          pageFragment = `#${pageIdLeader}${doc.getId() ?? pageStyle}`
+          buffer.unshift(`[#${pageId}]`)
         } else {
-          pageFragment = `#${idScope}`
+          pageFragment = `#${pageId}`
         }
         heading = { title: htitleAsciiDoc, level: part ? 1 : 2 }
         nextSectionLevel++
@@ -247,7 +355,7 @@ function mergeAsciiDoc (
       if (atDocumentRoot && navtitlePlain === componentVersion.title) {
         level--
       } else {
-        pageFragment = `#${idScope}`
+        pageFragment = `#${pageId}`
         if (part && level === 1) level--
         if ((heading = { title: navtitleAsciiDoc, level: level + 1 }).level > 6) {
           Object.assign(heading, { level: 6, style: `discrete.h${heading.level}` })
@@ -258,7 +366,7 @@ function mergeAsciiDoc (
       buffer.push(`[${heading.style ?? pageStyle}${pageFragment}${pageRoles}]`)
       buffer.push(`${'='.repeat(heading.level)} ${heading.title}`)
     } else if (atDocumentRoot) {
-      buffer.unshift(`[#${idScope}]`)
+      buffer.unshift(`[#${pageId}]`)
     }
     let enclosed
     if (assemblyModel.sectionMergeStrategy === 'enclose' && hasItems && doc.hasSections()) {
@@ -268,26 +376,16 @@ function mergeAsciiDoc (
       //if (overviewTitle === navtitle) overviewTitle = doc.getAttribute('overview-title', 'Overview')
       const overviewTitle = doc.getAttribute('overview-title', 'Overview')
       buffer.push('')
-      // NOTE: try to toggle sectids; otherwise, fallback to globally unique synthetic ID
-      let toggleSectids, syntheticId
-      if (doc.isAttribute('sectids')) {
-        if (doc.isAttributeLocked('sectids')) {
-          syntheticId = `__object-id-${getObjectId(outlineEntry)}`
-        } else {
-          buffer.push(':!sectids:')
-          toggleSectids = true
-        }
-      }
+      const syntheticId = idSeparators.generateIdFromTitle(navtitleAsciiDoc, idSeparators)
       let hlevel = level + 2
       if (hlevel > 6) {
         const blockStyle = `discrete.h${hlevel}`
         hlevel = 6
-        buffer.push(syntheticId ? `[${blockStyle}#${syntheticId}]` : `[${blockStyle}]`)
-      } else if (syntheticId) {
+        buffer.push(`[${blockStyle}#${syntheticId}]`)
+      } else {
         buffer.push(`[#${syntheticId}]`)
       }
       buffer.push(`${'='.repeat(hlevel)} ${overviewTitle}`)
-      if (toggleSectids) buffer.push(':sectids:')
     }
     assembled.pages.set(page, pageFragment)
     if (doc.hasSections()) {
@@ -363,7 +461,7 @@ function mergeAsciiDoc (
       if (
         line.charAt() === ':' &&
         ~line.indexOf(':', 2) &&
-        (line.match(AttributeEntryRx) || ['', ''])[1].replace('!', '') === 'leveloffset'
+        (line.match(ATTR_ENTRY_RX) || ['', ''])[1].replace('!', '') === 'leveloffset'
       ) {
         if (lines[idx - 1] === '') lines[idx - 1] = undefined
         lines[idx] = undefined
@@ -375,13 +473,13 @@ function mergeAsciiDoc (
           if (!refs['$key?'](refid) && (~refid.indexOf(' ') || refid.toLowerCase() !== refid)) {
             if ((refid = doc.$resolve_id(refid))['$nil?']()) return m
           }
-          return `<<${idLeader}${refid}${text ? ',' + text : ''}>>`
+          return `<<${pageIdLeader}${refid}${text ? ',' + text : ''}>>`
         })
       }
       // NOTE: the next check takes care of inline and block anchors
       if (~line.indexOf('[[')) {
         line = line.replace(/\[\[([\p{Alpha}_:][\p{Alpha}0-9_\-:.]*)(|, *.+?)\]\]/gu, (_, refid, text) => {
-          return `[[${idLeader}${refid}${text}]]`
+          return `[[${pageIdLeader}${refid}${text}]]`
         })
       }
       if (~line.indexOf('xref:')) {
@@ -391,17 +489,15 @@ function mergeAsciiDoc (
           assemblyModel,
           page.src,
           true,
-          idCoordinateSeparator,
-          idScopeSeparator,
-          idPrefix,
-          idLeader,
           pagesInOutline,
+          idSeparators,
+          pageIdLeader,
           doc,
           { file: relative, lineno: idx + 1 }
         )
       }
       if (~line.indexOf('image:') && !line.startsWith('image::')) {
-        line = rewriteInlineImages(line, contentCatalog, assemblyModel, page.src, assembled.assets, true)
+        line = rewriteInlineImages(line, contentCatalog, assemblyModel, page.src, assembled.assets, true, doc)
       }
       lines[idx] = line
     }
@@ -427,7 +523,7 @@ function mergeAsciiDoc (
           return '='.repeat(targetMarkerLength) + ' ' + rest
         })
         // NOTE: ID will be undefined if sectids are turned off
-        if (block.getId()) rewriteStyleAttribute(block, lines, idx, idLeader, blockStyle)
+        if (block.getId()) rewriteStyleAttribute(block, lines, idx, pageIdLeader, blockStyle)
       } else {
         if (context === 'image') {
           let line = lines[idx] || ''
@@ -456,14 +552,14 @@ function mergeAsciiDoc (
           // nested document
           idx = (block.getHeader().getLineNumber() || idx + 1) - 1
         }
-        if (block.getId()) rewriteStyleAttribute(block, lines, idx, idLeader)
+        if (block.getId()) rewriteStyleAttribute(block, lines, idx, pageIdLeader)
       }
     })
     safePush(
       buffer,
       lines.filter((it) => it !== undefined)
     )
-    const attributeEntries = Object.entries(doc.source_header_attributes?.$$smap || {})
+    const attributeEntries = Object.entries(doc.source_header_attributes.$$smap)
     if (attributeEntries.length) {
       const resolvedAttributeEntries = attributeEntries.reduce(
         (accum, [name, val]) => {
@@ -475,7 +571,7 @@ function mergeAsciiDoc (
             } else if (val !== initialVal) {
               accum.push(`:${name}:${initialVal ? ' ' + initialVal : ''}`)
             }
-          } else if (!(val == null || doc.isAttributeLocked(name) || DiscardAttributes.includes(name))) {
+          } else if (!(val == null || doc.isAttributeLocked(name) || DISCARD_ATTRIBUTE_NAMES.includes(name))) {
             accum.push(`:!${name}:`)
           }
           return accum
@@ -491,20 +587,7 @@ function mergeAsciiDoc (
     } else {
       buffer.inBody = true
       buffer.push('')
-      // NOTE: try to toggle sectids; otherwise, fallback to globally unique synthetic ID
-      // Q: should we unset docname, page-module, etc?
-      let toggleSectids, syntheticId
-      if (!('sectids' in asciidocConfig.attributes)) {
-        buffer.push(':!sectids:')
-        toggleSectids = true
-      } else if (typeof asciidocConfig.attributes.sectids === 'string') {
-        if ('sectids' in mutableAttributes) {
-          buffer.push(':!sectids:')
-          toggleSectids = true
-        } else {
-          syntheticId = `__object-id-${global.Opal.hash(outlineEntry).$object_id()}`
-        }
-      }
+      const syntheticId = idSeparators.generateIdFromTitle(navtitleAsciiDoc, idSeparators)
       let sectionTitle = navtitleAsciiDoc
       if (urlType === 'external') {
         sectionTitle = `${url}[${navtitleAsciiDoc.replace(/\]/g, '\\]')}]`
@@ -512,14 +595,7 @@ function mergeAsciiDoc (
         const resource = files.find((it) => it.pub.url === url)
         if (resource) {
           if (resource.src.family === 'page' && pagesInOutline.has(resource.pub.url)) {
-            const refid = generateId(
-              resource.src,
-              componentVersion,
-              idCoordinateSeparator,
-              idScopeSeparator,
-              idPrefix,
-              true
-            ).id
+            const refid = generateScopedId(resource.src, componentVersion, idSeparators, filetype, true)
             sectionTitle = `xref:${refid}[${navtitleAsciiDoc.replace(/\]/g, '\\]')}]`
           } else if (siteRoot) {
             sectionTitle = `${resolveLinkTarget(resource, siteRoot, pubRoot, linkReferenceStyle, true)}[${navtitleAsciiDoc.replace(/\]/g, '\\]')}]`
@@ -529,15 +605,13 @@ function mergeAsciiDoc (
       let hlevel = level + 1
       if (hlevel > 6) {
         hlevel = 6
-        buffer.push(syntheticId ? `[discrete#${syntheticId}]` : '[discrete]')
-      } else if (syntheticId) {
+        buffer.push(`[discrete#${syntheticId}]`)
+      } else {
         buffer.push(`[#${syntheticId}]`)
       }
       buffer.push(`${'='.repeat(hlevel)} ${sectionTitle}`)
-      if (toggleSectids) buffer.push(':sectids:')
     }
   }
-
   if (hasItems) {
     const nextLevel = level + 1
     // NOTE: drop first child if same as parent; should we keep if content is different?
@@ -553,6 +627,7 @@ function mergeAsciiDoc (
         item,
         files,
         pagesInOutline,
+        idSeparators,
         asciidocConfig,
         mutableAttributes,
         assemblyModel,
@@ -565,11 +640,32 @@ function mergeAsciiDoc (
   return buffer
 }
 
-function processDocumentHeader (doc, lines, buffer, ignoreLines) {
+function processDocumentHeader (doc, lines, ignoreLines, isRootPage) {
+  const entries = []
+  let assemblyHeaderAttributes = isRootPage && doc.getAttribute('assembly-header-attributes', '%authors')
+  assemblyHeaderAttributes = new Set(assemblyHeaderAttributes ? assemblyHeaderAttributes.split(/, */) : undefined)
+  if (assemblyHeaderAttributes.size) {
+    if (assemblyHeaderAttributes.has('%authors')) {
+      const authors = doc.getAuthors()
+      if (authors.length) {
+        entries.push({
+          type: 'author_line',
+          promote: true,
+          lines: [
+            authors
+              .map((author) => (author.getEmail() ? `${author.getName()} <${author.getEmail()}>` : author.getName()))
+              .join('; '),
+          ],
+        })
+      }
+      assemblyHeaderAttributes.delete('%authors')
+    }
+    const headerAttributes = doc.source_header_attributes
+    for (const name of assemblyHeaderAttributes) headerAttributes.$delete(name)
+  }
   const doctitleIdx = doc.getHeader().getLineNumber() - 1
   const end = doc.getBlocks()[0]?.getLineNumber() ?? lines.length
-  let belowDoctitle
-  let open
+  let belowDoctitle, current, open
   const implicitLines = []
   for (let idx = 0; idx < end; idx++) {
     if (idx === doctitleIdx) {
@@ -580,37 +676,51 @@ function processDocumentHeader (doc, lines, buffer, ignoreLines) {
     }
     const line = lines[idx]
     if (open === ':' || open === '-:') {
-      if (open === ':') buffer.push(line)
-      if (!line || !line.endsWith(' \\')) open = undefined
+      if (open === ':') current.lines.push(line)
+      if (!line || !line.endsWith(' \\')) current = open = undefined
     } else if (line) {
-      const chr0 = line.charAt()
       let attributeEntryMatch
+      const chr0 = line.charAt()
       if (chr0 === '/' && line.charAt(1) === '/') {
-        if (line.startsWith('////')) {
-          open = open ? (open === line ? undefined : open) : line
-        } else if (belowDoctitle && !open && line.charAt(2) === '/') {
+        if (line.startsWith('////') && line === '/'.repeat(line.length)) {
+          if (open) {
+            current.lines.push(line)
+            if (open === line) current = open = undefined
+          } else {
+            entries.push((current = { type: 'block_comment', lines: [(open = line)] }))
+          }
+        } else if (open) {
+          current.lines.push(line)
+        } else if (belowDoctitle && line.charAt(2) === '/') {
           break
+        } else {
+          entries.push({ type: 'line_comment', lines: [line] })
+          current = undefined
         }
-        buffer.push(line)
       } else if (open) {
-        buffer.push(line)
-      } else if (chr0 === ':' && ~line.indexOf(':', 2) && (attributeEntryMatch = line.match(AttributeEntryRx))) {
-        const attributeName = attributeEntryMatch[1].replace('!', '')
-        if (DiscardAttributes.includes(attributeName)) {
+        current.lines.push(line)
+      } else if (chr0 === ':' && ~line.indexOf(':', 2) && (attributeEntryMatch = line.match(ATTR_ENTRY_RX))) {
+        let name = attributeEntryMatch[1]
+        const negated = name.charAt() === '!' || name.charAt(name.length - 1) === '!'
+        if (negated) name = name.replace('!', '')
+        if (DISCARD_ATTRIBUTE_NAMES.includes(name)) {
           if (line.endsWith(' \\')) open = '-:' // disallow value continuation
         } else {
           if (line.endsWith(' \\')) open = ':'
-          buffer.push(line)
+          entries.push((current = { type: 'attribute_entry', name, negated, lines: [line], lineno: idx + 1 }))
+          if (assemblyHeaderAttributes.has(name)) current.promote = true
         }
       } else if (belowDoctitle) {
         if (implicitLines.length === 2 || !/[\p{Alpha}0-9]/u.test(chr0)) break
         implicitLines.push(line)
       } else if (chr0 === '[' && line.charAt(line.length - 1) === ']') {
+        current = undefined
         const attrlist = line
           .slice(1, -1)
           .trim()
-          .replace(/(?:^\w[\w-]*(?!=|[\w-]))?([#.%]\w[\w-]*)*/, '')
-        if (attrlist) buffer.push('[' + attrlist + ']')
+          .replace(/(?:^\w[\w-]*(?!=|[\w-]))?([#.]\w[\w-]*)*/, '')
+          .replace(NAMED_ID_ATTR_RX, '')
+        if (attrlist) entries.push({ type: 'attrlist', lines: ['[' + attrlist + ']'] })
       }
     } else if (belowDoctitle) {
       break
@@ -618,18 +728,15 @@ function processDocumentHeader (doc, lines, buffer, ignoreLines) {
     lines[idx] = undefined
     ignoreLines.push(idx)
   }
-  return doc
-    .getRoles()
-    .map((role) => '.' + role)
-    .join('')
+  return entries
 }
 
 function generateSlug (title) {
   return title
     .toLowerCase()
     .replace(/<[^>]+>/g, '')
-    .replace(CharRefRx, (_, name, dec, hex) => {
-      if (name) return BuiltInNamedEntities[name] ?? '?'
+    .replace(CHAR_REF_RX, (_, name, dec, hex) => {
+      if (name) return BUILT_IN_NAMED_ENTITIES[name] ?? '?'
       return String.fromCharCode(dec ? parseInt(dec, 10) : parseInt(hex, 16))
     })
     .replace(/[\x27\u2019]/g, '')
@@ -645,10 +752,6 @@ function fixSectionLevels (sections, expectedLevel) {
   })
 }
 
-function getObjectId (obj) {
-  return global.Opal.id(obj)
-}
-
 // NOTE: blank lines at top and bottom of document create mismatch when using line numbers to navigate source lines
 // IMPORTANT: this must not leave behind lines the parser will drop!
 // IDEA: another option is to capture initial lineno of reader and use as offset (but preseves those blank lines)
@@ -671,4 +774,11 @@ function safePush (onto, entries) {
   }
 }
 
+function generateIdFromTitle (titleAsciiDoc, idSeparators) {
+  const Section = this.$class().$const_get('::Asciidoctor::Section')
+  const baseId = Section.$generate_id(titleAsciiDoc, this)
+  this.getCatalog().refs['$[]='](baseId, true)
+  return `_${idSeparators.coordinate}${baseId}`
+}
+
 module.exports = produceAssemblyFile

package/lib/produce-assembly-files.js

@@ -4,7 +4,6 @@ const computeOut = require('./util/compute-out')
 const createAsciiDocFile = require('./util/create-asciidoc-file')
 const filterComponentVersions = require('./filter-component-versions')
 const produceAssemblyFile = require('./produce-assembly-file')
-const { rewriteImageAttr, rewriteInlineImages, rewriteXrefs } = require('./util/rewriter')
 const selectMutableAttributes = require('./select-mutable-attributes')
 
 const ATTR_REF_RX = /\\?\{(\w[\w-]*)\}/g
@@ -43,7 +42,7 @@ function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, se
         delete assemblyAttributes['source-highlighter']
       }
       const mergedAsciiDocAttributes = collateAsciiDocAttributes(
-        Object.assign({ revdate: assemblyModel.revdate }, componentVersionAsciiDocConfig.attributes),
+        Object.assign({}, componentVersionAsciiDocConfig.attributes),
         assemblyAttributes,
         contextualLogger
       )
@@ -75,22 +74,6 @@ function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, se
       } else if (!(assemblyModel.filetype === 'pdf' && assemblyModel.linkReferenceStyle === 'relative')) {
         assemblyModel.linkReferenceStyle = 'absolute'
       }
-      const auxiliaryImages = new Set()
-      const ctx = { component: componentName, version }
-      Object.entries(mergedAsciiDocAttributes).forEach(([name, val]) => {
-        if (!(typeof val === 'string' && ~val.indexOf(':'))) return
-        if (name.endsWith('-image')) {
-          const newVal = rewriteImageAttr(val, contentCatalog, assemblyModel, ctx, auxiliaryImages)
-          if (newVal) {
-            mergedAsciiDocAttributes[name] = newVal
-            return
-          }
-        }
-        const oldVal = val
-        if (~val.indexOf('image:')) val = rewriteInlineImages(val, contentCatalog, assemblyModel, ctx, auxiliaryImages)
-        if (~val.indexOf('xref:')) val = rewriteXrefs(val, contentCatalog, assemblyModel, ctx)
-        if (val !== oldVal) mergedAsciiDocAttributes[name] = val
-      })
       const rootEntry = { content: title }
       let startPage =
         'startPage' in componentVersion
@@ -115,7 +98,6 @@ function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, se
         })
       }
       const mutableAttributes = selectMutableAttributes(loadAsciiDoc, contentCatalog, startPage, mergedAsciiDocConfig)
-      delete mutableAttributes.doctype // Q: should this be in selectMutableAttributes?
       prepareOutlines(navigation, rootEntry, rootLevel).reduce((any, outline) => {
         const assemblyFile = produceAssemblyFile(
           loadAsciiDoc,
@@ -128,19 +110,14 @@ function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, se
           assemblyModel
         )
         if (!assemblyFile) return any
-        if (!any && auxiliaryImages.size) {
-          const assembledAssets = assemblyFile.assembler.assembled.assets
-          auxiliaryImages.forEach((asset) => assembledAssets.add(asset))
+        // NOTE restore source highlighter for conversion if defined in Assembler config
+        if (sourceHighlighter !== undefined) {
+          assemblyFile.asciidoc.attributes['source-highlighter'] = sourceHighlighter
+        } else if (assemblyModel.filetype !== 'html') {
+          delete assemblyFile.asciidoc.attributes['source-highlighter']
         }
-        accum.push(assemblyFile)
-        return true
+        return !!accum.push(assemblyFile)
       }, false)
-      // NOTE restore source highlighter for conversion if defined in Assembler config
-      if (sourceHighlighter !== undefined) {
-        mergedAsciiDocAttributes['source-highlighter'] = sourceHighlighter
-      } else if (assemblyModel.filetype !== 'html') {
-        delete mergedAsciiDocAttributes['source-highlighter']
-      }
       return accum
     },
     []

package/lib/select-mutable-attributes.js

@@ -17,6 +17,7 @@ function selectMutableAttributes (loadAsciiDoc, contentCatalog, referencePage, a
   ]
   // we could consider using an Asciidoctor extension here to grab attributes passed via the API instead
   const immutableAttributeNames = doc.attribute_overrides.$keys()['$-'](additionalMutableNames)
+  immutableAttributeNames.push('doctype')
   return Object.entries(doc.getAttributes()).reduce((accum, [name, val]) => {
     if (!immutableAttributeNames.includes(name)) accum[name] = val
     return accum

package/lib/util/generate-scoped-id.js

@@ -0,0 +1,25 @@
+'use strict'
+
+const HTML_RESERVED_ID_NAMES = 'content header footnotes footer footer-text premable toc toctitle'.split(' ')
+
+function generateScopedId (componentSrc, componentVersion, separators, filetype, asXrefTarget) {
+  let { component, module: mod, relative } = componentSrc
+  let id = relative.replace(/\.adoc$/, '').replace(/[/.]/g, '-')
+  let { coordinate: coordinateSeparator, prefix: prefixSeparator } = separators
+  if (component !== componentVersion.name) {
+    id = [component, mod === 'ROOT' ? '' : mod, id].join(coordinateSeparator)
+  } else if (mod !== 'ROOT') {
+    if (asXrefTarget && coordinateSeparator === ':' && /(?:pass|stem)$/.test(mod) && /^[a-z]+(?:,[a-z-]+)*$/.test(id)) {
+      prefixSeparator = ''
+      mod = mod.replace(/(?:pass|stem)$/, '\\$&')
+    }
+    id = mod + coordinateSeparator + id
+  } else if (filetype === 'html' && HTML_RESERVED_ID_NAMES.includes(id)) {
+    id = prefixSeparator + id
+    prefixSeparator = ''
+  }
+  if (prefixSeparator && !/^[\p{Alpha}_:]/u.test(id)) id = prefixSeparator + id
+  return id
+}
+
+module.exports = generateScopedId

package/lib/util/rewriter.js

@@ -1,9 +1,11 @@
 'use strict'
 
 const createResourceKey = require('./create-resource-key')
-const generateId = require('./generate-id')
-const { resolveEmbedTarget, resolveLinkTarget } = require('./resolver')
+const generateScopedId = require('./generate-scoped-id')
 const parseResourceRef = require('./parse-resource-ref')
+const { resolveEmbedTarget, resolveLinkTarget } = require('./resolver')
+
+const { NAMED_ID_ATTR_RX } = require('./rx')
 
 function rewriteXrefs (
   line,
@@ -11,15 +13,13 @@ function rewriteXrefs (
   assemblyModel,
   ctx,
   escapeForInline,
-  idCoordinateSep,
-  idScopeSep,
-  idPrefix,
-  idLeader,
   pagesInOutline,
+  idSeparators,
+  idLeader,
   doc,
   sourceLocation
 ) {
-  return line.replace(/(?<![\\+])xref:((?:\.\/)?[\p{Alpha}0-9_/.{#].*?)\[(|.*?[^\\])\]/gu, (_, target, text) =>
+  return line.replace(/(?<![\\+])xref:((?:\.\/)?[\p{Alpha}0-9_/.{#].*?)\[(|[\s\S]*?[^\\])\]/gu, (_, target, text) =>
     rewriteXref(
       target,
       text,
@@ -27,11 +27,9 @@ function rewriteXrefs (
       assemblyModel,
       ctx,
       escapeForInline,
-      idCoordinateSep,
-      idScopeSep,
-      idPrefix,
-      idLeader,
       pagesInOutline,
+      idSeparators,
+      idLeader,
       doc,
       sourceLocation
     )
@@ -45,11 +43,9 @@ function rewriteXref (
   assemblyModel,
   ctx,
   escapeForInline,
-  idCoordinateSep,
-  idScopeSep,
-  idPrefix,
-  idLeader,
   pagesInOutline,
+  idSeparators,
+  idLeader,
   doc,
   sourceLocation
 ) {
@@ -66,7 +62,7 @@ function rewriteXref (
   } else {
     fragment = target
   }
-  if (!resourceRef) return `xref:${idLeader || ''}${fragment}[${text}]`
+  if (!resourceRef) return `xref:${idLeader == null ? rawTarget : idLeader + fragment}[${text}]`
   const resourceId = parseResourceRef(resourceRef, ctx, 'page', contentCatalog)
   const family = resourceId.family
   let resource
@@ -75,7 +71,8 @@ function rewriteXref (
       const { linkReferenceStyle, pubRoot, siteRoot } = assemblyModel
       text ||= resource.asciidoc?.xreftext || rawTarget
       if (siteRoot || linkReferenceStyle === 'relative') {
-        return `${resolveLinkTarget(resource, siteRoot, pubRoot, linkReferenceStyle, escapeForInline)}${fragment && '#' + fragment}[${text}]`
+        const hash = fragment && !(family === 'page' && fragment === resource.asciidoc.id) ? '#' + fragment : ''
+        return `${resolveLinkTarget(resource, siteRoot, pubRoot, linkReferenceStyle, escapeForInline)}${hash}[${text}]`
       }
       if (doc) {
         const msg = `Cannot create external ${family} reference in assembly because site URL is unknown: ${rawTarget}`
@@ -96,42 +93,41 @@ function rewriteXref (
     text = ''
   }
   const componentVersionCtx = { name: ctx.component, version: ctx.version }
-  const refid = generateId(
+  const refid = generateScopedId(
     resource.src,
     componentVersionCtx,
-    idCoordinateSep,
-    idScopeSep,
-    idPrefix,
-    text.length > 0,
-    fragment
-  ).id
-  return `xref:${refid}[${text}]`
+    idSeparators,
+    assemblyModel.filetype,
+    text.length > 0
+  )
+  return `xref:${fragment ? refid + idSeparators.scope + fragment : refid}[${text}]`
 }
 
 function rewriteImageAttr (val, contentCatalog, assemblyModel, ctx, assets) {
-  const match = val.startsWith('image:') && /^image::?(.+?)\[(.*?)\]$/.exec(val)
+  const match = val.startsWith('image:') && /^image::?(.+?)\[(.*?)\](@|)$/.exec(val)
   if (!match) return
   const newTarget = rewriteImageRef(match[1], contentCatalog, assemblyModel, ctx, assets)
-  return newTarget ? `image:${newTarget}[${match[2]}]` : val
+  return newTarget ? `image:${newTarget}[${match[2]}]${match[3]}` : val
 }
 
-function rewriteInlineImages (line, contentCatalog, assemblyModel, ctx, assets, escapeForInline) {
-  return line.replace(/(?<![\\+])image:([^:\s[](?:[^[]*[^\s[])?)\[([^\]]*)\]/g, (m, target, attrlist) => {
-    const newTarget = rewriteImageRef(target, contentCatalog, assemblyModel, ctx, assets, escapeForInline)
+function rewriteInlineImages (line, contentCatalog, assemblyModel, ctx, assets, escapeForInline, doc) {
+  return line.replace(/(?<![\\+])image:([^:\s[](?:[^[]*[^\s[])?)\[(|[\s\S]*?[^\\])\]/g, (m, target, attrlist) => {
+    const newTarget = rewriteImageRef(target, contentCatalog, assemblyModel, ctx, assets, escapeForInline, doc)
     return newTarget ? `image:${newTarget}[${attrlist}]` : m
   })
 }
 
-function rewriteImageRef (target, contentCatalog, assemblyModel, ctx, assets, escapeForInline = false) {
+function rewriteImageRef (target, contentCatalog, assemblyModel, ctx, assets, escapeForInline, doc) {
+  if (doc && ~target.indexOf('{')) target = doc.$sub_attributes(target, global.Opal.hash({ attribute_missing: 'skip' }))
   const image = isResourceRef(target) && contentCatalog.resolveResource(target, ctx, 'image', ['image'])
   if (!image?.out) return
   let newTarget
   const { filetype, embedReferenceStyle, linkReferenceStyle, outDirname, pubRoot, siteRoot } = assemblyModel
   if (filetype !== 'html') {
-    newTarget = resolveEmbedTarget(image, outDirname, embedReferenceStyle, escapeForInline)
+    newTarget = resolveEmbedTarget(image, outDirname, embedReferenceStyle, escapeForInline ?? false)
     assets.add(image)
   } else if (siteRoot || linkReferenceStyle === 'relative') {
-    newTarget = resolveLinkTarget(image, siteRoot, pubRoot, linkReferenceStyle, escapeForInline, false)
+    newTarget = resolveLinkTarget(image, siteRoot, pubRoot, linkReferenceStyle, escapeForInline ?? false, false)
     if (linkReferenceStyle === 'relative') assets.add(image)
   }
   if (!newTarget) return
@@ -160,6 +156,8 @@ function rewriteStyleAttribute (block, lines, idx, idLeader, replacementStyle =
     if (cellSpec) {
       prevLine = cellSpec[2]
       cellSpec = cellSpec[1]
+    } else if (~prevLine.indexOf('id=')) {
+      prevLine = `[${prevLine.slice(1, -1).replace(NAMED_ID_ATTR_RX, '')}]`
     }
     let rawStyle
     const commaIdx = prevLine.indexOf(',')

package/lib/util/rx.js

@@ -0,0 +1,5 @@
+'use strict'
+
+const NAMED_ID_ATTR_RX = /(?:^|, *)id=(?:("[^"]*"|'[^']*'|[^,]*))/
+
+module.exports = { NAMED_ID_ATTR_RX }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/assembler",
-  "version": "1.0.0-beta.17",
+  "version": "1.0.0-beta.19",
   "description": "A JavaScript library that merges AsciiDoc content from multiple pages in an Antora site into assembly files and delegates to an exporter to convert those files to another format, such as PDF.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
@@ -27,6 +27,7 @@
     ".": "./lib/index.js",
     "./filter-component-versions": "./lib/filter-component-versions.js",
     "./load-config": "./lib/load-config.js",
+    "./log-command": "./lib/log-command.js",
     "./parse-resource-ref": "./lib/util/parse-resource-ref.js",
     "./produce-assembly-file": "./lib/produce-assembly-file.js",
     "./produce-assembly-files": "./lib/produce-assembly-files.js",
@@ -35,12 +36,12 @@
   },
   "imports": {
     "#asciidoctor-log-adapter": "./adapters/asciidoctor/jsonl-logger.rb",
-    "#run-command": "@antora/run-command-helper",
     "#unconvert-inline-asciidoc": "./lib/util/unconvert-inline-asciidoc.js"
   },
   "dependencies": {
     "@asciidoctor/reducer": "~1.1",
     "@antora/expand-path-helper": "~3.0",
+    "@antora/run-command-helper": "~1.0",
     "braces": "~3.0",
     "picomatch": "~3.0",
     "js-yaml": "~4.1"

package/lib/util/generate-id.js

@@ -1,25 +0,0 @@
-'use strict'
-
-const ReservedIdNames = 'content header footnotes footer footer-text premable toc toctitle'.split(' ')
-
-function generateId (componentSrc, componentVersion, coordinateSep, scopeSep, prefix, asXrefTarget, fragment) {
-  let { component, module: mod, relative } = componentSrc
-  let id = relative.replace(/\.adoc$/, '').replace(/[/.]/g, '-')
-  if (component !== componentVersion.name) {
-    id = [component, mod === 'ROOT' ? '' : mod, id].join(coordinateSep)
-  } else if (mod !== 'ROOT') {
-    if (asXrefTarget && coordinateSep === ':' && /(?:pass|stem)$/.test(mod) && /^[a-z]+(?:,[a-z-]+)*$/.test(id)) {
-      prefix = ''
-      mod = mod.replace(/(?:pass|stem)$/, '\\$&')
-    }
-    id = mod + coordinateSep + id
-  } else if (ReservedIdNames.includes(id)) {
-    id += scopeSep
-    scopeSep = ''
-  }
-  if (prefix && !/^[\p{Alpha}_:]/u.test(id)) id = prefix + id
-  const idLeader = id + scopeSep
-  return { idLeader, id: fragment ? idLeader + fragment : id }
-}
-
-module.exports = generateId