@antora/assembler 1.0.0-beta.2 → 1.0.0-beta.20

package/lib/produce-assembly-files.js

@@ -1,49 +1,80 @@
 'use strict'
 
+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 selectMutableAttributes = require('./select-mutable-attributes')
 
-const IMAGE_MACRO_RX = /^image::?(.+?)\[(.*?)\]$/
+const ATTR_REF_RX = /\\?\{(\w[\w-]*)\}/g
 
-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,
     sectionMergeStrategy: assemblyConfig.sectionMergeStrategy,
     navigation: componentVersion.navigation,
     xmlIds: assemblyConfig.xmlIds,
+    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)
-  return filterComponentVersions(contentCatalog.getComponents(), assemblerConfig.componentVersionFilter.names).reduce(
+  let siteRoot
+  const configMdc = assemblerConfig.file ? { file: { path: assemblerConfig.file } } : {}
+  return filterComponentVersions(contentCatalog.getComponents(), assemblerConfig.componentVersionFilter).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({}, componentVersionAsciiDocConfig.attributes),
+        assemblyAttributes,
+        contextualLogger
+      )
       const mergedAsciiDocConfig = Object.assign({}, componentVersionAsciiDocConfig, {
-        attributes: Object.assign({ revdate }, componentVersionAsciiDocConfig.attributes, assemblerAsciiDocAttributes),
-      })
-      const mergedAsciiDocAttributes = mergedAsciiDocConfig.attributes
-      const auxiliaryImages = new Set()
-      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)
+        attributes: mergedAsciiDocAttributes,
       })
+      assemblyModel.filetype = baseAssemblyAttributes['assembler-filetype']
+      const outDirname = (assemblyModel.outDirname = computeOut.call(contentCatalog, {
+        component: componentName,
+        version,
+        family: 'export',
+        relative: '.index.adoc',
+      }).dirname)
+      assemblyModel.pubRoot = outDirname ? '/' + outDirname : ''
+      assemblyModel.siteRoot =
+        siteRoot === undefined
+          ? (siteRoot ??= ((val) => {
+              if (!val) return null
+              if (val.charAt(val.length - 1) === '/') val = val.slice(0, val.length - 1)
+              if (!val || val.charAt() === '/') return { path: val }
+              return { url: val, path: extractUrlPath(val) }
+            })(mergedAsciiDocAttributes['site-url'] || mergedAsciiDocAttributes['primary-site-url']))
+          : siteRoot
+      if (assemblyModel.filetype === 'html') {
+        let linkRefStyle = assemblyModel.linkReferenceStyle
+        if (linkRefStyle === 'absolute' && siteRoot?.url == null) linkRefStyle = 'root-relative'
+        if (linkRefStyle === 'root-relative' && siteRoot?.path == null) linkRefStyle = 'relative'
+        assemblyModel.linkReferenceStyle = linkRefStyle
+      } else if (!(assemblyModel.filetype === 'pdf' && assemblyModel.linkReferenceStyle === 'relative')) {
+        assemblyModel.linkReferenceStyle = 'absolute'
+      }
       const rootEntry = { content: title }
-      const { navigation, rootLevel } = assemblyModel
       let startPage =
         'startPage' in componentVersion
           ? componentVersion.startPage
@@ -67,7 +98,6 @@ function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, re
         })
       }
       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,
@@ -80,17 +110,14 @@ function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, re
           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)
-      mergedAsciiDocAttributes.doctype = assemblyModel.doctype
-      sourceHighlighter
-        ? (mergedAsciiDocAttributes['source-highlighter'] = sourceHighlighter)
-        : delete mergedAsciiDocAttributes['source-highlighter']
       return accum
     },
     []
@@ -116,10 +143,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) => {
@@ -143,4 +166,37 @@ function prepareOutlines (navigation, rootEntry, rootLevel) {
   return items
 }
 
+function collateAsciiDocAttributes (collated, additional, logger) {
+  Object.entries(additional).forEach(([name, val]) => {
+    if (val && val.constructor === String) {
+      let alias
+      val = val.replace(ATTR_REF_RX, (ref, refname) => {
+        if (ref.charAt() === '\\') return ref.substr(1)
+        const refval = collated[refname]
+        if (refval == null || refval === false) {
+          if (refname in collated && ref === val) {
+            alias = refval
+          } else if (collated['attribute-missing'] === 'warn') {
+            logger?.warn("Skipping reference to missing attribute '%s' in value of '%s' attribute", refname, name)
+          }
+          return ref
+        }
+        if (refval.constructor === String) return refval
+        if (ref !== val) return refval.toString()
+        alias = refval
+        return ref
+      })
+      if (alias !== undefined) val = alias
+    }
+    collated[name] = val
+  })
+  return collated
+}
+
+function extractUrlPath (url) {
+  if (!url) return ''
+  const urlPath = new URL(url).pathname
+  return urlPath === '/' ? '' : urlPath
+}
+
 module.exports = produceAssemblyFiles

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/compute-out.js

@@ -3,9 +3,9 @@
 const { posix: path } = require('node:path')
 
 function computeOut (src) {
-  const { component, version, module: module_, family, relative } = src
+  const { component, version, module: module_ = 'ROOT', family, relative } = src
   const outRelative = family === 'page' ? relative.replace(/\.adoc$/, '.html') : relative
-  const { dir: dirname, base: basename, ext: extname, name: stem } = path.parse(outRelative)
+  const { dir: dirname, base: basename } = path.parse(outRelative)
   const componentVersion = this.getComponentVersion(component, version)
   const versionSegment =
     'activeVersionSegment' in componentVersion
@@ -48,7 +48,7 @@ function resolveActiveVersionSegment (component, version) {
     this.removeFile((startPage = this.addFile({ src: startPageSrc })))
   }
   const outPathSegments = startPage.out.path.split('/')
-  for (const depth of startPage.out.moduleRootPath.split('/')) outPathSegments.pop()
+  for (const _ of startPage.out.moduleRootPath.split('/')) outPathSegments.pop()
   if (startPageSrc.module !== 'ROOT') outPathSegments.pop()
   if (startPageSrc.component !== 'ROOT') outPathSegments.shift()
   return outPathSegments.length ? outPathSegments[0] : ''

package/lib/util/create-asciidoc-file.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const computeOut = require('./compute-out')
-const { posix: path } = require('node:path')
 
 function createAsciiDocFile (contentCatalog, file) {
   file.mediaType = 'text/asciidoc'

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-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/parse-resource-ref.js

@@ -0,0 +1,36 @@
+'use strict'
+
+function parseResourceRef (ref, ctx = {}, family = undefined, contentCatalog = undefined) {
+  const atIdx = ref.indexOf('@')
+  let firstColonIdx = ref.indexOf(':')
+  let component, version, module_
+  if (~atIdx && (~firstColonIdx ? atIdx < firstColonIdx : true)) {
+    if ((version = ref.slice(0, atIdx)) === '_') version = ''
+    ref = ref.slice(atIdx + 1)
+    if (~firstColonIdx) firstColonIdx -= atIdx + 1
+  }
+  const addColons = ~firstColonIdx ? (~ref.indexOf(':', firstColonIdx + 1) ? '' : ':') : '::'
+  const segments = (addColons + ref).split(':')
+  if ((component = segments[0])) {
+    module_ = segments[1] || 'ROOT'
+    version ??= contentCatalog?.getComponent(component)?.latest.version
+  } else {
+    component = ctx.component
+    version ??= ctx.version
+    module_ = segments[1] || ctx.module || 'ROOT'
+  }
+  let relative = segments.length > 3 ? segments.slice(2).join(':') : segments[2]
+  const dollarIdx = relative.indexOf('$')
+  if (~dollarIdx) {
+    family = relative.slice(0, dollarIdx) || family
+    relative = relative.slice(dollarIdx + 1)
+  }
+  if (relative.charAt() === '.' && relative.charAt(1) === '/') {
+    const ctxRelative = ctx.relative
+    const topic = ctxRelative ? ctxRelative.slice(0, (ctxRelative.lastIndexOf('/') + 1 || 1) - 1) : undefined
+    relative = (topic ? topic + '/' : '') + relative.slice(2)
+  }
+  return { component, version, module: module_, family, relative }
+}
+
+module.exports = parseResourceRef

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,200 @@
+'use strict'
+
+const createResourceKey = require('./create-resource-key')
+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,
+  contentCatalog,
+  assemblyModel,
+  ctx,
+  escapeForInline,
+  pagesInOutline,
+  idSeparators,
+  idLeader,
+  doc,
+  sourceLocation
+) {
+  return line.replace(/(?<![\\+])xref:((?:\.\/)?[\p{Alpha}0-9_/.{#].*?)\[(|[\s\S]*?[^\\])\]/gu, (_, target, text) =>
+    rewriteXref(
+      target,
+      text,
+      contentCatalog,
+      assemblyModel,
+      ctx,
+      escapeForInline,
+      pagesInOutline,
+      idSeparators,
+      idLeader,
+      doc,
+      sourceLocation
+    )
+  )
+}
+
+function rewriteXref (
+  target,
+  text,
+  contentCatalog,
+  assemblyModel,
+  ctx,
+  escapeForInline,
+  pagesInOutline,
+  idSeparators,
+  idLeader,
+  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 == null ? rawTarget : 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') {
+        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}`
+        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 = generateScopedId(
+    resource.src,
+    componentVersionCtx,
+    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)
+  if (!match) return
+  const newTarget = rewriteImageRef(match[1], contentCatalog, assemblyModel, ctx, assets)
+  return newTarget ? `image:${newTarget}[${match[2]}]${match[3]}` : val
+}
+
+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, 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 ?? false)
+    assets.add(image)
+  } else if (siteRoot || linkReferenceStyle === 'relative') {
+    newTarget = resolveLinkTarget(image, siteRoot, pubRoot, linkReferenceStyle, escapeForInline ?? false, 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]
+    } else if (~prevLine.indexOf('id=')) {
+      prevLine = `[${prevLine.slice(1, -1).replace(NAMED_ID_ATTR_RX, '')}]`
+    }
+    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/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.2",
+  "version": "1.0.0-beta.20",
   "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,17 +27,21 @@
     ".": "./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",
-    "./select-mutable-attributes": "./lib/select-mutable-attributes.js"
+    "./select-mutable-attributes": "./lib/select-mutable-attributes.js",
+    "./package.json": "./package.json"
   },
   "imports": {
-    "#run-command": "@antora/run-command-helper",
+    "#asciidoctor-log-adapter": "./adapters/asciidoctor/jsonl-logger.rb",
     "#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"
@@ -51,6 +55,7 @@
     "node": ">=16.0.0"
   },
   "files": [
+    "adapters/",
     "lib/"
   ],
   "keywords": [