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

package/lib/assemble-content.js

@@ -57,12 +57,12 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
     intrinsicAttributes[`assembler-filetype-${targetFiletype}`] = ''
     intrinsicAttributes['assembler-filetype'] = targetFiletype
   }
-  Object.assign(assemblerConfig.asciidoc.attributes, intrinsicAttributes)
+  Object.assign(assemblerConfig.assembly.attributes, intrinsicAttributes)
   const assemblyFiles = produceAssemblyFiles(
     loadAsciiDoc,
     contentCatalog,
     assemblerConfig,
-    createResolveAssemblyModel(context, contentCatalog, assemblyConfig, intrinsicAttributes, navigationCatalog)
+    generateSelectAssemblyProfile(context, contentCatalog, assemblyConfig, intrinsicAttributes, navigationCatalog)
   )
   if (!(assemblyFiles.length && typeof convert === 'function')) return assemblyFiles
   if (buildConfig.command == null && typeof getDefaultCommand === 'function') {
@@ -123,24 +123,33 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
     })
 }
 
-function createResolveAssemblyModel (context, contentCatalog, common, intrinsicAttributes, navigationCatalog) {
+/**
+ * Generates a function that selects the active assembly 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, base, 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({}, base, { attributes: Object.assign({}, base.attributes), navigation, logger })
     }
   }
   const boundSendToLog = sendToLog.bind(logger)
   const { buildNavigation = require('@antora/navigation-builder') } = context.getFunctions()
   return (componentVersion) => {
+    const attributes = Object.assign({}, base.attributes)
     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)
+    Object.entries(overrides.attributes ?? {}).forEach(([name, val]) => {
+      attributes[name] = val
+    })
+    const model = Object.assign({}, base, overrides, { attributes, logger })
     delete model.navFiles
     delete model.messages
     const navigationOverride = navigationCatalog?.getNavigation(componentVersion.name, componentVersion.version)

package/lib/load-config.js

@@ -14,6 +14,7 @@ const ASSEMBLY_KEYS = [
   'linkReferenceStyle',
   'dropExplicitXrefText',
 ]
+const CAMEL_CASE_STOP_PATHS = ['asciidoc.attributes', 'assembly.attributes']
 
 function loadConfig (playbook, configSource) {
   let resolvedConfigSource
@@ -38,19 +39,11 @@ function loadConfig (playbook, configSource) {
             return fsp
               .readFile(resolvedConfigSource)
               .then((data) =>
-                Object.assign(camelCaseKeys(yaml.load(data), ['asciidoc']), { file: resolvedConfigSource })
+                Object.assign(camelCaseKeys(yaml.load(data), CAMEL_CASE_STOP_PATHS), { file: resolvedConfigSource })
               )
           })
   ).then((config) => {
     if (config.enabled === false) return config
-    let asciidocAttrs
-    if (!config.asciidoc) {
-      config.asciidoc = { attributes: (asciidocAttrs = {}) }
-    } else if (!(asciidocAttrs = config.asciidoc.attributes)) {
-      config.asciidoc.attributes = asciidocAttrs = {}
-    }
-    if (!('revdate' in asciidocAttrs)) asciidocAttrs.revdate = getLocalDate()
-    asciidocAttrs['page-partial'] = null
     const remapComponentVersionsKey = !('componentVersionFilter' in config)
     const componentVersionFilter = (config.componentVersionFilter ??= {})
     if (remapComponentVersionsKey && 'componentVersions' in config) {
@@ -71,8 +64,24 @@ function loadConfig (playbook, configSource) {
         delete config[key]
       }
     }
-    if (!('doctype' in assembly)) assembly.doctype = 'doctype' in asciidocAttrs ? asciidocAttrs.doctype : 'book'
-    delete asciidocAttrs.doctype
+    let assemblyAttrs
+    if ('attributes' in assembly) {
+      assemblyAttrs = assembly.attributes ?? {}
+      if ('asciidoc' in config) delete config.asciidoc
+    } else if ('asciidoc' in config) {
+      assemblyAttrs = assembly.attributes = config.asciidoc?.attributes ?? {}
+      delete config.asciidoc
+    } else {
+      assemblyAttrs = assembly.attributes = {}
+    }
+    assemblyAttrs['page-partial'] = null
+    config.asciidoc = Object.defineProperty({}, 'attributes', {
+      get: function () {
+        return this.assembly.attributes
+      }.bind(config),
+    })
+    if (!('doctype' in assembly)) assembly.doctype = 'doctype' in assemblyAttrs ? assemblyAttrs.doctype : 'book'
+    delete assemblyAttrs.doctype
     if (!('rootLevel' in assembly)) assembly.rootLevel = 0
     if (!('insertStartPage' in assembly)) assembly.insertStartPage = true
     if (['discrete', 'fuse', 'enclose'].indexOf(assembly.sectionMergeStrategy) < 0) {
@@ -84,6 +93,7 @@ function loadConfig (playbook, configSource) {
     if (['always', 'if-redundant', 'never'].indexOf(assembly.dropExplicitXrefText) < 0) {
       assembly.dropExplicitXrefText = 'never'
     }
+    assembly.revdate = getLocalDate()
     const build = (config.build ??= {})
     if (build.dir === '$' + '{playbook.output.dir}') {
       throw new Error('Not implemented')

package/lib/produce-assembly-file.js

@@ -1,8 +1,10 @@
 'use strict'
 
 const createAsciiDocFile = require('./util/create-asciidoc-file')
-const parseResourceRef = require('./util/parse-resource-ref')
-const path = require('node:path/posix')
+const createResourceKey = require('./util/create-resource-key')
+const generateId = require('./util/generate-id')
+const { resolveLinkTarget } = require('./util/resolver')
+const { rewriteXrefs, rewriteImageRef, rewriteInlineImages, rewriteStyleAttribute } = require('./util/rewriter')
 const sanitize = require('./util/sanitize')
 const unconvertInlineAsciiDoc = require('./util/unconvert-inline-asciidoc')
 
@@ -10,7 +12,6 @@ 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 ReservedIdNames = 'content header footnotes footer footer-text premable toc toctitle'.split(' ')
 
 function produceAssemblyFile (
   loadAsciiDoc,
@@ -113,26 +114,19 @@ function mergeAsciiDoc (
   let navtitlePlain = sanitize(navtitle)
   let navtitleAsciiDoc = unconvertInlineAsciiDoc(navtitle)
   const { items = [], unresolved, urlType, url } = outlineEntry
-  const {
-    doctype,
-    filetype,
-    embedReferenceStyle: embedRefStyle,
-    linkReferenceStyle: linkRefStyle,
-    outDirname,
-    siteRoot,
-    xmlIds,
-    logger,
-  } = assemblyModel
+  const { doctype, linkReferenceStyle, pubRoot, siteRoot, xmlIds, 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 atBookRoot = atDocumentRoot && !level && doctype === 'book' && (supportsParts = true)
   const hasItems = items.length > 0
-  const pubRoot = outDirname ? '/' + outDirname : ''
+  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 && !pagesInOutline.assembled.pages.has(page)) {
+  if (page && !assembled.pages.has(page)) {
     const contents = page.src.contents
     if (contents == null) {
       buffer.inBody ??= false
@@ -143,16 +137,15 @@ function mergeAsciiDoc (
       Object.assign({}, page, { contents: trimAsciiDoc(contents), mediaType })
     )
     const doc = loadAsciiDoc(pageAsAsciiDoc, contentCatalog, asciidocConfig)
-    let asciidoctorLogger = doc.getLogger()
-    if (logger) {
-      asciidoctorLogger = Object.assign(asciidoctorLogger.$dup(), {
-        delegate: {
-          warn () {
-            return logger.warn.apply(logger, arguments)
+    doc.logger = logger
+      ? Object.assign(doc.getLogger().$dup(), {
+          delegate: {
+            warn () {
+              return logger.warn.apply(logger, arguments)
+            },
           },
-        },
-      })
-    }
+        })
+      : doc.getLogger()
     if (doc.hasAttribute('assembly-navtitle')) {
       navtitleAsciiDoc = doc.getAttribute('assembly-navtitle')
       navtitlePlain = sanitize((navtitle = doc.$apply_reftext_subs(navtitleAsciiDoc)))
@@ -180,7 +173,13 @@ function mergeAsciiDoc (
     }
     // NOTE: in Antora, docname is relative src path from module without file extension
     const docname = doc.getAttribute('docname')
-    const { idPrefix, id: idScope } = generateId(page.src, componentVersion, idCoordinateSeparator, idScopeSeparator)
+    const { idLeader, id: idScope } = generateId(
+      page.src,
+      componentVersion,
+      idCoordinateSeparator,
+      idScopeSeparator,
+      idPrefix
+    )
     let pageFragment = ''
     let pageRoles = ''
     let pageStyle = doc.getAttribute('assembly-style', '')
@@ -236,7 +235,7 @@ function mergeAsciiDoc (
         assemblyModel = Object.assign({}, assemblyModel, { sectionMergeStrategy: 'discrete' })
       } else {
         if (atDocumentRoot) {
-          pageFragment = `#${idPrefix}${doc.getId() ?? pageStyle}`
+          pageFragment = `#${idLeader}${doc.getId() ?? pageStyle}`
           buffer.unshift(`[#${idScope}]`)
         } else {
           pageFragment = `#${idScope}`
@@ -290,7 +289,7 @@ function mergeAsciiDoc (
       buffer.push(`${'='.repeat(hlevel)} ${overviewTitle}`)
       if (toggleSectids) buffer.push(':sectids:')
     }
-    pagesInOutline.assembled.pages.set(page, pageFragment)
+    assembled.pages.set(page, pageFragment)
     if (doc.hasSections()) {
       fixSectionLevels(doc.getSections(), atBookRoot && !pageStyle ? undefined : nextSectionLevel)
     }
@@ -318,10 +317,6 @@ function mergeAsciiDoc (
       }
     }
     const refs = doc.getCatalog().refs
-    const scannedInlineAnchors = Object.values(refs.$$smap).reduce((accum, it) => {
-      if (it.node_name === 'inline_anchor') accum[it.id] = it
-      return accum
-    }, {})
     allBlocks.forEach((block) => {
       const contentModel = block.content_model
       if (
@@ -380,112 +375,33 @@ function mergeAsciiDoc (
           if (!refs['$key?'](refid) && (~refid.indexOf(' ') || refid.toLowerCase() !== refid)) {
             if ((refid = doc.$resolve_id(refid))['$nil?']()) return m
           }
-          const alphaPrefix = !(refid in scannedInlineAnchors) || /^[\p{Alpha}_:]/u.test(idPrefix) ? '' : 'iid-'
-          return `<<${alphaPrefix}${idPrefix}${refid}${text ? ',' + text : ''}>>`
+          return `<<${idLeader}${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, (m, refid, text) => {
-          const alphaPrefix = !(refid in scannedInlineAnchors) || /^[\p{Alpha}_:]/u.test(idPrefix) ? '' : 'iid-'
-          return `[[${alphaPrefix}${idPrefix}${refid}${text}]]`
+        line = line.replace(/\[\[([\p{Alpha}_:][\p{Alpha}0-9_\-:.]*)(|, *.+?)\]\]/gu, (_, refid, text) => {
+          return `[[${idLeader}${refid}${text}]]`
         })
       }
       if (~line.indexOf('xref:')) {
-        // Q: should we allow : as first character of target?
-        line = line.replace(/(?<![\\+])xref:((?:\.\/)?[\p{Alpha}0-9_/.{#].*?)\[(|.*?[^\\])\]/gu, (_, target_, text) => {
-          let target = target_
-          if (~target.indexOf('{')) target = doc.$sub_attributes(target, Opal.hash({ attribute_missing: 'skip' }))
-          let fragment, resource, resourceRef
-          const hashIdx = target.indexOf('#')
-          if (~hashIdx) {
-            resourceRef = target.slice(0, hashIdx)
-            fragment = target.slice(hashIdx + 1)
-          } else if (target.endsWith('.adoc') || ~target.indexOf('$')) {
-            resourceRef = target
-            fragment = ''
-          } else {
-            fragment = target
-          }
-          // Q: should we validate the internal ID here?
-          if (!resourceRef) return `xref:${idPrefix}${fragment}[${text}]`
-          const resourceId = parseResourceRef(resourceRef, page.src, 'page', contentCatalog)
-          if (resourceId.family !== 'page' || !(resource = pagesInOutline.get(createResourceKey(resourceId)))) {
-            if ((resource = contentCatalog.getById(resourceId))?.pub) {
-              text ||= resource.asciidoc?.xreftext || target_
-              if (siteRoot || linkRefStyle === 'relative') {
-                return `${resolveLinkTarget(resource, siteRoot, pubRoot, linkRefStyle)}${fragment && '#' + fragment}[${text}]`
-              }
-              asciidoctorLogger.warn(
-                doc.createLogMessage(
-                  `Cannot create external ${resourceId.family} reference in assembly because site URL is unknown: ${target_}`,
-                  { source_location: { file: relative, lineno: idx + 1 } }
-                )
-              )
-            }
-            const linkAttrlist = text
-              ? (~text.indexOf(',') ? `"${text}"` : text) + ',role=unresolved'
-              : (~target.indexOf(':') ? `${target},` : '') + 'role=unresolved'
-            return `link:${target_}[${linkAttrlist}]`
-          }
-          if (fragment === resource.asciidoc.id) fragment = ''
-          if (
-            text &&
-            (assemblyModel.dropExplicitXrefText === 'always' ||
-              (assemblyModel.dropExplicitXrefText === 'if-redundant' && text === resource.title))
-          ) {
-            text = ''
-          }
-          const refid = generateId(
-            resource.src,
-            componentVersion,
-            idCoordinateSeparator,
-            idScopeSeparator,
-            text.length > 0,
-            fragment
-          ).id
-          return `xref:${refid}[${text}]`
-        })
-      }
-      if (~line.indexOf('link:{attachmentsdir}/')) {
-        line = line.replace(/(?<![\\+])link:\{attachmentsdir\}\/([^\s[]+)\[(|.*?[^\\])\]/g, (m, relative, text) => {
-          const attachment =
-            (siteRoot || linkRefStyle === 'relative') &&
-            contentCatalog.getById({
-              component: componentVersion.name,
-              version: componentVersion.version,
-              module: module_,
-              family: 'attachment',
-              relative,
-            })
-          // TODO: handle unresolved attachment page
-          return attachment?.out ? `${resolveLinkTarget(attachment, siteRoot, pubRoot, linkRefStyle)}[${text}]` : m
-        })
+        line = rewriteXrefs(
+          line,
+          contentCatalog,
+          assemblyModel,
+          page.src,
+          true,
+          idCoordinateSeparator,
+          idScopeSeparator,
+          idPrefix,
+          idLeader,
+          pagesInOutline,
+          doc,
+          { file: relative, lineno: idx + 1 }
+        )
       }
       if (~line.indexOf('image:') && !line.startsWith('image::')) {
-        line = line.replace(/(?<![\\+])image:([^:\s[](?:[^[]*[^\s[])?)\[([^\]]*)\]/g, (m, target, attrlist) => {
-          let image
-          if (
-            isResourceSpec(target) &&
-            (image = contentCatalog.resolveResource(target, page.src, 'image', ['image']))?.out
-          ) {
-            if (filetype !== 'html') {
-              pagesInOutline.assembled.assets.add(image)
-              return `image:${resolveEmbedTarget(image, outDirname, embedRefStyle, true)}[${attrlist}]`
-            }
-            if (siteRoot || linkRefStyle === 'relative') {
-              pagesInOutline.assembled.assets.add(image)
-              return `image:${resolveLinkTarget(image, siteRoot, pubRoot, linkRefStyle)}[${attrlist}]`
-            }
-            asciidoctorLogger.warn(
-              doc.createLogMessage(
-                `Cannot create external image reference in assembly because site URL is unknown: ${target}`,
-                { source_location: { file: relative, lineno: idx + 1 } }
-              )
-            )
-          }
-          return m
-        })
+        line = rewriteInlineImages(line, contentCatalog, assemblyModel, page.src, assembled.assets, true)
       }
       lines[idx] = line
     }
@@ -511,7 +427,7 @@ function mergeAsciiDoc (
           return '='.repeat(targetMarkerLength) + ' ' + rest
         })
         // NOTE: ID will be undefined if sectids are turned off
-        if (block.getId()) rewriteStyleAttribute(block, lines, idx, idPrefix, blockStyle)
+        if (block.getId()) rewriteStyleAttribute(block, lines, idx, idLeader, blockStyle)
       } else {
         if (context === 'image') {
           let line = lines[idx] || ''
@@ -530,27 +446,17 @@ function mergeAsciiDoc (
               imageMacroOffset = -1
             }
           }
-          if (imageMacroOffset >= 0) {
+          if (~imageMacroOffset) {
             const target = block.getAttribute('target')
-            if (isResourceSpec(target)) {
-              const image = contentCatalog.resolveResource(target, page.src, 'image', ['image'])
-              // FIXME: handle (or report) case when image is not resolved
-              if (image?.out && (filetype !== 'html' || siteRoot)) {
-                const attrlist = line.slice(line.indexOf('[') + 1, -1)
-                pagesInOutline.assembled.assets.add(image)
-                lines[idx] =
-                  filetype === 'html'
-                    ? `${prefix}image::${resolveLinkTarget(image, siteRoot, pubRoot, linkRefStyle, false)}[${attrlist}]`
-                    : `${prefix}image::${resolveEmbedTarget(image, outDirname, embedRefStyle)}[${attrlist}]`
-              }
-            }
+            const newTarget = rewriteImageRef(target, contentCatalog, assemblyModel, page.src, assembled.assets)
+            if (newTarget) lines[idx] = `${prefix}image::${newTarget}${line.slice(line.indexOf('['))}`
             lastImageMacroAt = [idx, imageMacroOffset]
           }
         } else if (context === 'document' && block.hasHeader()) {
           // nested document
           idx = (block.getHeader().getLineNumber() || idx + 1) - 1
         }
-        if (block.getId()) rewriteStyleAttribute(block, lines, idx, idPrefix)
+        if (block.getId()) rewriteStyleAttribute(block, lines, idx, idLeader)
       }
     })
     safePush(
@@ -606,10 +512,17 @@ 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, true).id
+            const refid = generateId(
+              resource.src,
+              componentVersion,
+              idCoordinateSeparator,
+              idScopeSeparator,
+              idPrefix,
+              true
+            ).id
             sectionTitle = `xref:${refid}[${navtitleAsciiDoc.replace(/\]/g, '\\]')}]`
           } else if (siteRoot) {
-            sectionTitle = `${resolveLinkTarget(resource, siteRoot, pubRoot, linkRefStyle)}[${navtitleAsciiDoc.replace(/\]/g, '\\]')}]`
+            sectionTitle = `${resolveLinkTarget(resource, siteRoot, pubRoot, linkReferenceStyle, true)}[${navtitleAsciiDoc.replace(/\]/g, '\\]')}]`
           }
         }
       }
@@ -732,60 +645,6 @@ function fixSectionLevels (sections, expectedLevel) {
   })
 }
 
-function rewriteStyleAttribute (block, lines, idx, idPrefix, replacementStyle = '') {
-  let prevLine = lines[idx - 1]
-  const char0 = prevLine?.charAt()
-  if (char0) {
-    if (
-      (char0 === '.' && /^\.\.?[^ \t.]/.test(prevLine)) ||
-      (char0 === '[' &&
-        prevLine.charAt(1) === '[' &&
-        /^\[\[(?:|[\p{Alpha}_:][\p{Alpha}0-9_\-:.]*(?:, *.+)?)\]\]$/u.test(prevLine))
-    ) {
-      return rewriteStyleAttribute(block, lines, idx - 1, idPrefix, replacementStyle)
-    }
-  }
-  let cellSpec
-  if (
-    char0 &&
-    (char0 === '[' || (block.getDocument().isNested() && (cellSpec = prevLine.match(/^([^[|]*)\| *(\[.+)/)))) &&
-    prevLine.charAt(prevLine.length - 1) === ']'
-  ) {
-    if (cellSpec) {
-      prevLine = cellSpec[2]
-      cellSpec = cellSpec[1]
-    }
-    let rawStyle
-    const commaIdx = prevLine.indexOf(',')
-    if (~commaIdx) {
-      rawStyle = prevLine.slice(1, commaIdx)
-      if (~rawStyle.indexOf('=')) rawStyle = undefined
-    } else if (!~prevLine.indexOf('=')) {
-      rawStyle = prevLine.slice(1, prevLine.length - 1)
-    }
-    if (rawStyle) {
-      if (~rawStyle.indexOf('#')) {
-        prevLine = prevLine.replace(/#[^.%,\]]+/, `#${idPrefix}${block.getId()}`)
-        if (replacementStyle) prevLine = prevLine.replace(/^[^#.%,\]]+/, `[${replacementStyle}`)
-      } else {
-        prevLine = `[${
-          replacementStyle ? rawStyle.replace(/^[^.%]*/, replacementStyle) : rawStyle
-        }#${idPrefix}${block.getId()}${prevLine.slice(rawStyle.length + 1)}`
-      }
-    } else {
-      prevLine = `[${replacementStyle}#${idPrefix}${block.getId()}${rawStyle == null ? ',' : ''}${prevLine.slice(1)}`
-    }
-    if (cellSpec) prevLine = `${cellSpec}|${prevLine}`
-    lines[idx - 1] = prevLine
-  } else {
-    lines.splice(idx, 0, `[${replacementStyle}#${idPrefix}${block.getId()}]`)
-  }
-}
-
-function isResourceSpec (str) {
-  return !(~str.indexOf(':') && (~str.indexOf('://') || (str.startsWith('data:') && ~str.indexOf(','))))
-}
-
 function getObjectId (obj) {
   return global.Opal.id(obj)
 }
@@ -812,58 +671,4 @@ function safePush (onto, entries) {
   }
 }
 
-function resolveEmbedTarget (resource, outDirname, referenceStyle, escapeForInline) {
-  const target =
-    referenceStyle === 'output-relative' ? resource.out.path : path.relative(outDirname + '/', resource.out.path)
-  return escapeForInline ? target.replace(/_/g, '{underscore}') : target
-}
-
-function resolveLinkTarget (resource, siteRoot, pubRoot, referenceStyle, escapeForInline = true) {
-  let target
-  if (resource.site?.url) {
-    target = ['', resource.pub.url]
-  } else {
-    switch (referenceStyle) {
-      case 'absolute':
-        target = ['', siteRoot.url + resource.pub.url]
-        break
-      case 'root-relative':
-        target = ['link:', siteRoot.path + resource.pub.url]
-        break
-      default:
-        target = ['link:', computeRelativeUrl(pubRoot + '/', resource.pub.url)]
-    }
-  }
-  if (escapeForInline) target[1] = target[1].replace(/_/g, '{underscore}')
-  return target.join('')
-}
-
-function computeRelativeUrl (from, to) {
-  const rel = path.relative(from, to)
-  return to.charAt(to.length - 1) === '/' ? rel + '/' : rel
-}
-
-function createResourceKey ({ component, version, module: mod, family, relative }) {
-  return `${version}@${component}:${mod === 'ROOT' ? '' : mod}:${family === 'page' ? '' : family + '$'}${relative}`
-}
-
-function generateId (componentSrc, componentVersion, coordinateSep, scopeSep, 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)) {
-      mod = mod.replace(/(?:pass|stem)$/, '\\$&')
-    }
-    id = mod + coordinateSep + id
-  } else if (ReservedIdNames.includes(id)) {
-    id += scopeSep
-    scopeSep = ''
-  }
-  const idPrefix = id + scopeSep
-  if (fragment) id = idPrefix + fragment
-  return { idPrefix, id }
-}
-
 module.exports = produceAssemblyFile

package/lib/produce-assembly-files.js

@@ -4,14 +4,15 @@ 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
-const IMAGE_MACRO_RX = /^image::?(.+?)\[(.*?)\]$/
 
-function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, resolveAssemblyModel) {
-  const { asciidoc: assemblerAsciiDocConfig, assembly: assemblyConfig } = assemblerConfig
-  resolveAssemblyModel ??= (componentVersion) => ({
+function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, selectAssemblyProfile) {
+  const { assembly: assemblyConfig } = assemblerConfig
+  selectAssemblyProfile ??= (componentVersion) => ({
+    attributes: assemblyConfig.attributes,
     doctype: assemblyConfig.doctype,
     insertStartPage: assemblyConfig.insertStartPage,
     rootLevel: assemblyConfig.rootLevel,
@@ -21,36 +22,42 @@ function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, re
     embedReferenceStyle: assemblyConfig.embedReferenceStyle,
     linkReferenceStyle: assemblyConfig.linkReferenceStyle,
     dropExplicitXrefText: assemblyConfig.dropExplicitXrefText,
+    revdate: assemblyConfig.revdate,
     logger: assemblyConfig.logger, // for tests
   })
-  const assemblerAsciiDocAttributes = Object.assign({}, assemblerAsciiDocConfig.attributes)
-  const { revdate, 'source-highlighter': sourceHighlighter } = assemblerAsciiDocAttributes
-  delete assemblerAsciiDocAttributes.revdate
-  delete assemblerAsciiDocAttributes['source-highlighter']
+  const baseAssemblyAttributes = assemblyConfig.attributes
   const publishableFiles = contentCatalog.getFiles().filter((file) => file.out)
   let siteRoot
   const configMdc = assemblerConfig.file ? { file: { path: assemblerConfig.file } } : {}
   return filterComponentVersions(contentCatalog.getComponents(), assemblerConfig.componentVersionFilter.names).reduce(
     (accum, componentVersion) => {
-      const assemblyModel = resolveAssemblyModel(componentVersion)
-      if (!assemblyModel.navigation) return accum
+      const assemblyModel = selectAssemblyProfile(componentVersion)
+      const { attributes: assemblyAttributes, logger, navigation, rootLevel } = assemblyModel
+      if (!navigation) return accum
+      const contextualLogger = logger ? { warn: logger.warn.bind(logger, configMdc) } : undefined
       const { name: componentName, version, title } = componentVersion
       const componentVersionAsciiDocConfig = getAsciiDocConfigWithAsciidoctorReducerExtension(componentVersion)
+      let sourceHighlighter
+      if ('source-highlighter' in assemblyAttributes) {
+        sourceHighlighter = assemblyAttributes['source-highlighter']
+        delete assemblyAttributes['source-highlighter']
+      }
       const mergedAsciiDocAttributes = collateAsciiDocAttributes(
-        Object.assign({ revdate }, componentVersionAsciiDocConfig.attributes),
-        assemblerAsciiDocAttributes,
-        { logger: assemblyModel.logger, mdc: configMdc }
+        Object.assign({ revdate: assemblyModel.revdate }, componentVersionAsciiDocConfig.attributes),
+        assemblyAttributes,
+        contextualLogger
       )
       const mergedAsciiDocConfig = Object.assign({}, componentVersionAsciiDocConfig, {
         attributes: mergedAsciiDocAttributes,
       })
-      assemblyModel.outDirname = computeOut.call(contentCatalog, {
+      assemblyModel.filetype = baseAssemblyAttributes['assembler-filetype']
+      const outDirname = (assemblyModel.outDirname = computeOut.call(contentCatalog, {
         component: componentName,
         version,
         family: 'export',
         relative: '.index.adoc',
-      }).dirname
-      assemblyModel.filetype = assemblerAsciiDocAttributes['assembler-filetype']
+      }).dirname)
+      assemblyModel.pubRoot = outDirname ? '/' + outDirname : ''
       assemblyModel.siteRoot =
         siteRoot === undefined
           ? (siteRoot ??= ((val) => {
@@ -69,17 +76,22 @@ function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, re
         assemblyModel.linkReferenceStyle = 'absolute'
       }
       const auxiliaryImages = new Set()
+      const ctx = { component: componentName, version }
       Object.entries(mergedAsciiDocAttributes).forEach(([name, val]) => {
-        const match = name.endsWith('-image') && val.startsWith('image:') && IMAGE_MACRO_RX.exec(val)
-        if (!(match && isResourceRef(match[1]))) return
-        // Q should we allow image to be resolved relative to component version?
-        const image = contentCatalog.resolveResource(match[1], undefined, 'image', ['image'])
-        if (!image?.out) return
-        mergedAsciiDocAttributes[name] = `image:${image.out.path}[${match[2]}]`
-        auxiliaryImages.add(image)
+        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 }
-      const { navigation, rootLevel } = assemblyModel
       let startPage =
         'startPage' in componentVersion
           ? componentVersion.startPage
@@ -123,9 +135,12 @@ function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, re
         accum.push(assemblyFile)
         return true
       }, false)
-      sourceHighlighter
-        ? (mergedAsciiDocAttributes['source-highlighter'] = sourceHighlighter)
-        : delete mergedAsciiDocAttributes['source-highlighter']
+      // 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
     },
     []
@@ -151,10 +166,6 @@ function includedInNav (items, url) {
   return items.find((it) => it.url === url || includedInNav(it.items || [], url))
 }
 
-function isResourceRef (target) {
-  return ~target.indexOf(':') && !(~target.indexOf('://') || (target.startsWith('data:') && ~target.indexOf(',')))
-}
-
 function prepareOutlines (navigation, rootEntry, rootLevel) {
   const singleEntry = navigation.length === 1
   const items = navigation.reduce((accum, it) => {
@@ -178,7 +189,7 @@ function prepareOutlines (navigation, rootEntry, rootLevel) {
   return items
 }
 
-function collateAsciiDocAttributes (collated, additional, { logger, mdc }) {
+function collateAsciiDocAttributes (collated, additional, logger) {
   Object.entries(additional).forEach(([name, val]) => {
     if (val && val.constructor === String) {
       let alias
@@ -189,9 +200,7 @@ function collateAsciiDocAttributes (collated, additional, { logger, mdc }) {
           if (refname in collated && ref === val) {
             alias = refval
           } else if (collated['attribute-missing'] === 'warn') {
-            if (logger) {
-              logger.warn(mdc, "Skipping reference to missing attribute '%s' in value of '%s' attribute", refname, name)
-            }
+            logger?.warn("Skipping reference to missing attribute '%s' in value of '%s' attribute", refname, name)
           }
           return ref
         }

package/lib/util/create-resource-key.js

@@ -0,0 +1,7 @@
+'use strict'
+
+function createResourceKey ({ component, version, module: mod, family, relative }) {
+  return `${version}@${component}:${mod === 'ROOT' ? '' : mod}:${family === 'page' ? '' : family + '$'}${relative}`
+}
+
+module.exports = createResourceKey

package/lib/util/generate-id.js

@@ -0,0 +1,25 @@
+'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

package/lib/util/resolver.js

@@ -0,0 +1,36 @@
+'use strict'
+
+const path = require('node:path/posix')
+
+function resolveEmbedTarget (resource, outDirname, referenceStyle, escapeForInline) {
+  const target =
+    referenceStyle === 'output-relative' ? resource.out.path : path.relative(outDirname + '/', resource.out.path)
+  return escapeForInline ? target.replace(/_/g, '{underscore}') : target
+}
+
+function resolveLinkTarget (resource, siteRoot, pubRoot, referenceStyle, escapeForInline, ensurePrefix = true) {
+  let target
+  if (resource.site?.url) {
+    target = ['', resource.pub.url]
+  } else {
+    switch (referenceStyle) {
+      case 'absolute':
+        target = ['', siteRoot.url + resource.pub.url]
+        break
+      case 'root-relative':
+        target = [ensurePrefix ? 'link:' : '', siteRoot.path + resource.pub.url]
+        break
+      default:
+        target = [ensurePrefix ? 'link:' : '', computeRelativeUrl(pubRoot + '/', resource.pub.url)]
+    }
+  }
+  if (escapeForInline) target[1] = target[1].replace(/_/g, '{underscore}')
+  return target.join('')
+}
+
+function computeRelativeUrl (from, to) {
+  const rel = path.relative(from, to)
+  return to.charAt(to.length - 1) === '/' ? rel + '/' : rel
+}
+
+module.exports = { resolveEmbedTarget, resolveLinkTarget }

package/lib/util/rewriter.js

@@ -0,0 +1,202 @@
+'use strict'
+
+const createResourceKey = require('./create-resource-key')
+const generateId = require('./generate-id')
+const { resolveEmbedTarget, resolveLinkTarget } = require('./resolver')
+const parseResourceRef = require('./parse-resource-ref')
+
+function rewriteXrefs (
+  line,
+  contentCatalog,
+  assemblyModel,
+  ctx,
+  escapeForInline,
+  idCoordinateSep,
+  idScopeSep,
+  idPrefix,
+  idLeader,
+  pagesInOutline,
+  doc,
+  sourceLocation
+) {
+  return line.replace(/(?<![\\+])xref:((?:\.\/)?[\p{Alpha}0-9_/.{#].*?)\[(|.*?[^\\])\]/gu, (_, target, text) =>
+    rewriteXref(
+      target,
+      text,
+      contentCatalog,
+      assemblyModel,
+      ctx,
+      escapeForInline,
+      idCoordinateSep,
+      idScopeSep,
+      idPrefix,
+      idLeader,
+      pagesInOutline,
+      doc,
+      sourceLocation
+    )
+  )
+}
+
+function rewriteXref (
+  target,
+  text,
+  contentCatalog,
+  assemblyModel,
+  ctx,
+  escapeForInline,
+  idCoordinateSep,
+  idScopeSep,
+  idPrefix,
+  idLeader,
+  pagesInOutline,
+  doc,
+  sourceLocation
+) {
+  const rawTarget = target
+  if (doc && ~target.indexOf('{')) target = doc.$sub_attributes(target, global.Opal.hash({ attribute_missing: 'skip' }))
+  let fragment, resourceRef
+  const hashIdx = target.indexOf('#')
+  if (~hashIdx) {
+    resourceRef = target.slice(0, hashIdx)
+    fragment = target.slice(hashIdx + 1)
+  } else if (target.endsWith('.adoc') || ~target.indexOf('$')) {
+    resourceRef = target
+    fragment = ''
+  } else {
+    fragment = target
+  }
+  if (!resourceRef) return `xref:${idLeader || ''}${fragment}[${text}]`
+  const resourceId = parseResourceRef(resourceRef, ctx, 'page', contentCatalog)
+  const family = resourceId.family
+  let resource
+  if (family !== 'page' || !(resource = pagesInOutline?.get(createResourceKey(resourceId)))) {
+    if ((resource = contentCatalog.getById(resourceId))?.pub) {
+      const { linkReferenceStyle, pubRoot, siteRoot } = assemblyModel
+      text ||= resource.asciidoc?.xreftext || rawTarget
+      if (siteRoot || linkReferenceStyle === 'relative') {
+        return `${resolveLinkTarget(resource, siteRoot, pubRoot, linkReferenceStyle, escapeForInline)}${fragment && '#' + fragment}[${text}]`
+      }
+      if (doc) {
+        const msg = `Cannot create external ${family} reference in assembly because site URL is unknown: ${rawTarget}`
+        doc.logger.warn(doc.createLogMessage(msg, { source_location: sourceLocation }))
+      }
+    }
+    const linkAttrlist = text
+      ? (~text.indexOf(',') ? `"${text}"` : text) + ',role=unresolved'
+      : (~target.indexOf(':') ? `${rawTarget},` : '') + 'role=unresolved'
+    return `link:${rawTarget}[${linkAttrlist}]`
+  }
+  if (fragment === resource.asciidoc.id) fragment = ''
+  if (
+    text &&
+    (assemblyModel.dropExplicitXrefText === 'always' ||
+      (assemblyModel.dropExplicitXrefText === 'if-redundant' && text === resource.title))
+  ) {
+    text = ''
+  }
+  const componentVersionCtx = { name: ctx.component, version: ctx.version }
+  const refid = generateId(
+    resource.src,
+    componentVersionCtx,
+    idCoordinateSep,
+    idScopeSep,
+    idPrefix,
+    text.length > 0,
+    fragment
+  ).id
+  return `xref:${refid}[${text}]`
+}
+
+function rewriteImageAttr (val, contentCatalog, assemblyModel, ctx, assets) {
+  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
+}
+
+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)
+    return newTarget ? `image:${newTarget}[${attrlist}]` : m
+  })
+}
+
+function rewriteImageRef (target, contentCatalog, assemblyModel, ctx, assets, escapeForInline = false) {
+  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)
+    assets.add(image)
+  } else if (siteRoot || linkReferenceStyle === 'relative') {
+    newTarget = resolveLinkTarget(image, siteRoot, pubRoot, linkReferenceStyle, escapeForInline, false)
+    if (linkReferenceStyle === 'relative') assets.add(image)
+  }
+  if (!newTarget) return
+  return newTarget
+}
+
+function rewriteStyleAttribute (block, lines, idx, idLeader, replacementStyle = '') {
+  let prevLine = lines[idx - 1]
+  const char0 = prevLine?.charAt()
+  if (char0) {
+    if (
+      (char0 === '.' && /^\.\.?[^ \t.]/.test(prevLine)) ||
+      (char0 === '[' &&
+        prevLine.charAt(1) === '[' &&
+        /^\[\[(?:|[\p{Alpha}_:][\p{Alpha}0-9_\-:.]*(?:, *.+)?)\]\]$/u.test(prevLine))
+    ) {
+      return rewriteStyleAttribute(block, lines, idx - 1, idLeader, replacementStyle)
+    }
+  }
+  let cellSpec
+  if (
+    char0 &&
+    (char0 === '[' || (block.getDocument().isNested() && (cellSpec = prevLine.match(/^([^[|]*)\| *(\[.+)/)))) &&
+    prevLine.charAt(prevLine.length - 1) === ']'
+  ) {
+    if (cellSpec) {
+      prevLine = cellSpec[2]
+      cellSpec = cellSpec[1]
+    }
+    let rawStyle
+    const commaIdx = prevLine.indexOf(',')
+    if (~commaIdx) {
+      rawStyle = prevLine.slice(1, commaIdx)
+      if (~rawStyle.indexOf('=')) rawStyle = undefined
+    } else if (!~prevLine.indexOf('=')) {
+      rawStyle = prevLine.slice(1, prevLine.length - 1)
+    }
+    if (rawStyle) {
+      if (~rawStyle.indexOf('#')) {
+        prevLine = prevLine.replace(/#[^.%,\]]+/, `#${idLeader}${block.getId()}`)
+        if (replacementStyle) prevLine = prevLine.replace(/^[^#.%,\]]+/, `[${replacementStyle}`)
+      } else {
+        prevLine = `[${
+          replacementStyle ? rawStyle.replace(/^[^.%]*/, replacementStyle) : rawStyle
+        }#${idLeader}${block.getId()}${prevLine.slice(rawStyle.length + 1)}`
+      }
+    } else {
+      prevLine = `[${replacementStyle}#${idLeader}${block.getId()}${rawStyle == null ? ',' : ''}${prevLine.slice(1)}`
+    }
+    if (cellSpec) prevLine = `${cellSpec}|${prevLine}`
+    lines[idx - 1] = prevLine
+  } else {
+    lines.splice(idx, 0, `[${replacementStyle}#${idLeader}${block.getId()}]`)
+  }
+}
+
+function isResourceRef (str) {
+  return !(~str.indexOf(':') && (~str.indexOf('://') || (str.startsWith('data:') && ~str.indexOf(','))))
+}
+
+module.exports = {
+  rewriteXref,
+  rewriteXrefs,
+  rewriteImageAttr,
+  rewriteImageRef,
+  rewriteInlineImages,
+  rewriteStyleAttribute,
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/assembler",
-  "version": "1.0.0-beta.16",
+  "version": "1.0.0-beta.17",
   "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)",
@@ -30,7 +30,8 @@
     "./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",
-    "./select-mutable-attributes": "./lib/select-mutable-attributes.js"
+    "./select-mutable-attributes": "./lib/select-mutable-attributes.js",
+    "./package.json": "./package.json"
   },
   "imports": {
     "#asciidoctor-log-adapter": "./adapters/asciidoctor/jsonl-logger.rb",