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

package/lib/produce-assembly-file.js

@@ -11,19 +11,22 @@ const {
   rewriteStyleAttribute,
 } = require('./util/rewriter')
 const sanitize = require('./util/sanitize')
+const toHash = require('./util/to-hash')
 const unconvertInlineAsciiDoc = require('./util/unconvert-inline-asciidoc')
 
 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',
-  'preface-title',
+  'assembly-doctype',
   'assembly-header-attributes',
   'assembly-navtitle',
   'assembly-slug',
   'assembly-style',
+  'doctype',
+  'leveloffset',
+  'page-aliases',
+  'preface-title',
   'underscore',
 ]
 const { NAMED_ID_ATTR_RX } = require('./util/rx')
@@ -39,21 +42,20 @@ function produceAssemblyFile (
   assemblyModel
 ) {
   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)
+  if (outline.urlType === 'internal' && !pagesByUrl.has(outline.pathname) && !outline.items?.length) return
   const { rootLevel, xmlIds } = assemblyModel
+  const scratchDoc = loadAsciiDoc(
+    { contents: Buffer.alloc(0), src: { family: 'page', relative: '_scratch.adoc' } },
+    undefined,
+    asciidocConfig
+  )
   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
-      )
-    ),
+    generateIdFromTitle: generateIdFromTitle.bind(scratchDoc),
   }
   const { name: component, version } = componentVersion
   asciidocConfig = prepareAsciiDocConfig(
@@ -62,12 +64,14 @@ function produceAssemblyFile (
     pagesInOutline,
     asciidocConfig,
     assemblyModel,
-    idSeparators
+    idSeparators,
+    scratchDoc
   )
-  const buffer = mergeAsciiDoc(
+  const builder = buildAsciiDocHeader(componentVersion, outline.content, assemblyModel)
+  mergeAsciiDoc(
     loadAsciiDoc,
     contentCatalog,
-    buildAsciiDocHeader(componentVersion, outline.content, assemblyModel),
+    builder,
     componentVersion,
     outline,
     files,
@@ -78,22 +82,22 @@ function produceAssemblyFile (
     assemblyModel
   )
   const stem =
-    (buffer.slug ? sanitizeSlug(buffer.slug) : generateSlug(rootLevel === 0 ? 'index' : buffer.navtitle)) ||
+    (builder.slug ? sanitizeSlug(builder.slug) : generateSlug(rootLevel === 0 ? 'index' : builder.navtitle)) ||
     'export-' + (assemblyModel.stemSeq = (assemblyModel.exportSeq ?? 0) + 1)
   const downloadStem = [component, version, stem === 'index' ? '' : stem].filter((it) => it).join('-')
   const file = contentCatalog.createFile({
     asciidoc: asciidocConfig,
     assembler: { assembled: pagesInOutline.assembled, downloadStem, rootLevel },
-    contents: Buffer.from(buffer.join('\n') + '\n'),
+    contents: builder.serialize(),
     src: { component, version, componentVersion, module: 'ROOT', family: 'export', relative: stem + '.adoc' },
     pub: false,
   })
-  file.path = file.out.path // use out path as file path so assets can easily be published to same hierarchy
+  file.path = file.src.path = file.out.path // use out path as path so assets can be published to same hierarchy
   delete file.out
   return file
 }
 
-function prepareAsciiDocConfig (contentCatalog, ctx, pagesInOutline, asciidocConfig, assemblyModel, idSeparators) {
+function prepareAsciiDocConfig (contentCatalog, ctx, pagesInOutline, asciidocConfig, assemblyModel, idSeparators, doc) {
   let attributesModified
   const configShared = asciidocConfig.$shared
   const sharedAttributes = asciidocConfig.attributes
@@ -114,7 +118,17 @@ function prepareAsciiDocConfig (contentCatalog, ctx, pagesInOutline, asciidocCon
     for (const [name, val] of Object.entries(sharedAttributes)) {
       if (!(val?.constructor === String && ~val.indexOf(':'))) continue
       if (~val.indexOf('xref:')) {
-        const newVal = rewriteXrefs(val, contentCatalog, assemblyModel, ctx, false, pagesInOutline, idSeparators)
+        const newVal = rewriteXrefs(
+          val,
+          contentCatalog,
+          assemblyModel,
+          ctx,
+          false,
+          pagesInOutline,
+          idSeparators,
+          null,
+          doc
+        )
         if (newVal !== val) (attributesModified ??= {})[name] = newVal
       }
     }
@@ -124,42 +138,65 @@ function prepareAsciiDocConfig (contentCatalog, ctx, pagesInOutline, asciidocCon
 }
 
 function buildAsciiDocHeader (componentVersion, navtitle, assemblyModel) {
-  const doctype = assemblyModel.doctype ?? 'book'
+  const { name: componentName, version, displayVersion, title } = componentVersion
   const navtitlePlain = sanitize(navtitle)
   const navtitleAsciiDoc = unconvertInlineAsciiDoc(navtitle)
-  const doctitle = (componentVersion.title === navtitlePlain ? '' : componentVersion.title + ': ') + navtitleAsciiDoc
-  const version = componentVersion.version === 'master' ? '' : componentVersion.version
-  const displayVersion = componentVersion.displayVersion
-  const buffer = [
-    `= ${doctitle}`,
-    ...(version ? [`:revnumber: ${displayVersion}`] : []),
-    ...(doctype === 'article' ? [] : [`:doctype: ${doctype}`]),
-    ':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: ${displayVersion}`,
-    `:page-component-title: ${componentVersion.title}`,
-  ]
-  return Object.assign(buffer, { navtitle })
+  const doctitle = (title === navtitlePlain ? '' : title + ': ') + navtitleAsciiDoc
+  const versioned = !!(version && version !== 'master')
+  return {
+    header: [
+      `= ${doctitle}`,
+      ...(versioned ? [`:revnumber: ${displayVersion}`] : []),
+      `:doctype: ${(assemblyModel.doctype ??= 'book')}`,
+      ':underscore: _',
+      `:page-component-name: ${componentName}`,
+      `:page-component-version:${versioned ? ' ' + version : ''}`,
+      ':page-version: {page-component-version}',
+      `:page-component-display-version: ${displayVersion}`,
+      `:page-component-title: ${title}`,
+    ],
+    currentComponentVersion: componentVersion,
+    navtitle,
+    setAuthor (author) {
+      this.header.splice(1, 0, author)
+    },
+    setDoctitle (doctitle_) {
+      this.header[0] = `= ${doctitle_}`
+    },
+    setDoctype (doctype) {
+      this.header[this.header.findIndex((line) => line.startsWith(':doctype: '))] = `:doctype: ${doctype}`
+    },
+    setDocid (docid) {
+      this.header.unshift(`[#${docid}]`)
+    },
+    serialize () {
+      const normalizedHeader = this.header.filter((it) => it !== ':doctype: article')
+      return this.body
+        ? Buffer.from(normalizedHeader.join('\n') + '\n\n' + this.body.join('\n') + '\n')
+        : Buffer.from(normalizedHeader.join('\n') + '\n')
+    },
+  }
 }
 
 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)
+  const { urlType, url, hash, unresolved, items = [] } = outlineEntry
+  if (urlType === 'internal' && !unresolved) {
+    const pathname = (outlineEntry.pathname ??= hash ? url.substring(0, url.length - hash.length) : url)
+    let page
+    if (!accum.has(pathname) && (page = pagesByUrl.get(pathname))) {
+      accum.set(createResourceKey(page.src), page)
+      accum.set(pathname, page)
+    }
   }
-  for (const item of outlineEntry.items || []) selectPagesInOutline(item, pagesByUrl, accum)
+  for (const item of items) selectPagesInOutline(item, pagesByUrl, accum)
   return accum
 }
 
 function mergeAsciiDoc (
   loadAsciiDoc,
   contentCatalog,
-  buffer,
+  builder,
   componentVersion,
   outlineEntry,
   files,
@@ -168,31 +205,31 @@ function mergeAsciiDoc (
   asciidocConfig,
   mutableAttributes,
   assemblyModel,
-  lastComponentVersion = componentVersion,
   level = 0,
   supportsParts = false
 ) {
-  const { items = [], roles = [], unresolved, urlType, url, hash } = outlineEntry
+  const { items = [], roles = [], unresolved, urlType, url, pathname, hash } = outlineEntry
   // TODO: we could try to be smart about it and make sure the page with fragment is included at least once
-  if (hash || roles.includes('site-only')) {
-    buffer.inBody ??= false
-    return buffer
+  if (roles.includes('site-only') || (urlType === 'external' && !URL.canParse(url))) {
+    builder.body ??= []
+    return builder
   }
-  let navtitle = outlineEntry.navtitle ?? outlineEntry.content
+  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(pathname) : undefined
+  let navtitle = outlineEntry.navtitle ?? (page && hash ? page.asciidoc.navtitle : outlineEntry.content)
   let navtitlePlain = sanitize(navtitle)
   let navtitleAsciiDoc = unconvertInlineAsciiDoc(navtitle)
   const { filetype, linkReferenceStyle, pubRoot, sectionMergeStrategy, siteRoot, logger, rootLevel } = 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 && assemblyModel.doctype === 'book' && (supportsParts = true)
+  const doctype = assemblyModel.doctype
+  const atDocumentRoot = !builder.body?.length
+  let atBookRoot = atDocumentRoot && !level && doctype === 'book' && (supportsParts = true)
   const hasItems = items.length > 0
   if (page && !assembled.pages.has(page)) {
     const contents = page.src.contents
     if (contents == null) {
-      buffer.inBody ??= false
-      return buffer
+      builder.body ??= []
+      return builder
     }
     const pageAsAsciiDoc = new page.constructor(
       Object.assign({}, page, { contents: trimAsciiDoc(contents), mediaType: page.src.mediaType })
@@ -208,20 +245,25 @@ function mergeAsciiDoc (
           },
         })
       : doc.getLogger()
-    doc.source_header_attributes ??= doc.parent.$to_h()
+    doc.source_header_attributes ??= toHash()
     const isRootPage = atDocumentRoot && !level
     const { component, version, module: module_, relative, origin } = page.src
-    if (isRootPage && doc.hasAttribute('assembly-slug')) buffer.slug = doc.getAttribute('assembly-slug')
+    const doctypeOverride = doc.getAttribute('assembly-doctype')
+    if (doctypeOverride) {
+      if (doctypeOverride !== doctype) builder.setDoctype(doctypeOverride)
+      if (doctypeOverride !== 'book') atBookRoot = supportsParts = false
+    }
+    if (isRootPage && doc.hasAttribute('assembly-slug')) builder.slug = doc.getAttribute('assembly-slug')
     let hasAssemblyNavtitleAttr
     if ((hasAssemblyNavtitleAttr = !!doc.getAttribute('assembly-navtitle'))) {
       navtitleAsciiDoc = doc.getAttribute('assembly-navtitle')
       navtitlePlain = sanitize((navtitle = doc.$apply_reftext_subs(navtitleAsciiDoc)))
-      if (buffer.inBody == null) {
-        buffer.navtitle = navtitle
+      if (builder.body == null) {
+        builder.navtitle = navtitle
         if (rootLevel) {
-          const doctitle =
+          builder.setDoctitle(
             (componentVersion.title === navtitlePlain ? '' : componentVersion.title + ': ') + navtitleAsciiDoc
-          buffer[0] = `= ${doctitle}`
+          )
         }
       }
     }
@@ -247,13 +289,10 @@ function mergeAsciiDoc (
     let nextSectionLevel = 1
     const lines = doc.getSourceLines()
     const ignoreLines = []
-    if (!buffer.inBody) {
-      buffer.inBody = true
-      buffer.endHeaderIdx = buffer.length - 1
-    }
-    buffer.push('')
+    const buffer = (builder.body ??= [])
+    if (buffer.length) buffer.push('')
     buffer.push(`:docname: ${docname}`)
-    if (component !== lastComponentVersion.name) {
+    if (component !== builder.currentComponentVersion.name) {
       const thisComponentVersion =
         component === componentVersion.name && version === componentVersion.version
           ? componentVersion
@@ -264,7 +303,7 @@ function mergeAsciiDoc (
         buffer.push(':page-version: {page-component-version}')
         buffer.push(`:page-component-display-version: ${thisComponentVersion.displayVersion}`)
         buffer.push(`:page-component-title: ${thisComponentVersion.title}`)
-        lastComponentVersion = thisComponentVersion
+        builder.currentComponentVersion = thisComponentVersion
       }
     }
     buffer.push(`:page-module: ${module_}`)
@@ -274,12 +313,10 @@ 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}`)
-    let headerHasBlockAttrs
     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
+          builder.setAuthor(entry.lines[0])
         } else if (entry.type === 'attribute_entry') {
           const name = entry.name
           if (!entry.negated && !doc.isAttributeLocked(name)) {
@@ -320,14 +357,9 @@ function mergeAsciiDoc (
               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)
-          }
+          ;(entry.promote ? builder.header : buffer).push(...entry.lines)
         } else {
-          if (entry.type === 'attrlist') headerHasBlockAttrs = true
+          if (entry.type === 'attrlist') builder.headerHasBlockAttrs = true
           buffer.push(...entry.lines)
         }
       }
@@ -351,15 +383,15 @@ function mergeAsciiDoc (
         if (htitleOverride != null) {
           const keepSections = hasSections && sectionMergeStrategy !== 'discrete'
           if (htitleOverride === '') {
-            if (headerHasBlockAttrs || keepSections) {
+            if (builder.headerHasBlockAttrs || keepSections) {
               htitleAsciiDoc = '{empty}'
               notitle = true
             } else {
-              if (hasPrefaceTitleAttr) buffer.splice(++buffer.endHeaderIdx, 0, ':preface-title:')
+              if (hasPrefaceTitleAttr) builder.header.push(':preface-title:')
               htitleAsciiDoc = undefined
             }
-          } else if (hasPrefaceTitleAttr && !headerHasBlockAttrs && !keepSections) {
-            buffer.splice(++buffer.endHeaderIdx, 0, `:preface-title: ${unconvertInlineAsciiDoc(htitleOverride)}`)
+          } else if (hasPrefaceTitleAttr && !builder.headerHasBlockAttrs && !keepSections) {
+            builder.header.push(`:preface-title: ${unconvertInlineAsciiDoc(htitleOverride)}`)
             htitleAsciiDoc = undefined
           } else {
             htitleAsciiDoc = unconvertInlineAsciiDoc(htitleOverride)
@@ -370,7 +402,7 @@ function mergeAsciiDoc (
         if (atDocumentRoot) {
           // Q: should we use htitleAsciiDoc to generate ID if not {empty} instead of pageStyle
           pageFragment = `#_${idSeparators.coordinate}${pageIdLeader}${pageStyle}`
-          buffer.unshift(`[#${pageId}]`)
+          builder.setDocid(pageId)
         } else {
           pageFragment = `#${pageId}`
         }
@@ -400,7 +432,7 @@ function mergeAsciiDoc (
       buffer.push(`[${heading.style ?? pageStyle}${pageFragment}${rolesAttr}${notitleAttrs}]`)
       buffer.push(`${'='.repeat(heading.level)} ${heading.title}`)
     } else if (atDocumentRoot) {
-      buffer.unshift(`[#${pageId}]`)
+      builder.setDocid(pageId)
     }
     if (sectionMergeStrategy === 'enclose' && hasItems && hasSections && !(atDocumentRoot && heading)) {
       // TODO: make overview section title configurable
@@ -408,7 +440,7 @@ function mergeAsciiDoc (
       //if (overviewTitle === navtitle) overviewTitle = doc.getAttribute('overview-title', 'Overview')
       const overviewTitle = doc.getAttribute('overview-title', 'Overview')
       const syntheticId = idSeparators.generateIdFromTitle(overviewTitle, idSeparators, pageIdLeader)
-      if (heading) buffer.push('')
+      if (heading && buffer.length) buffer.push('')
       let hlevel = level + (nextSectionLevel = 2)
       if (hlevel > 6) {
         const blockStyle = `discrete.h${hlevel}`
@@ -429,7 +461,7 @@ function mergeAsciiDoc (
     if (doc.getDoctype() === 'manpage') {
       const firstSectionIdx = hasSections ? doc.getSections()[0].getLineNumber() - 1 : lines.length
       for (let idx = 0; idx < firstSectionIdx; idx++) {
-        if (~ignoreLines.indexOf(idx)) continue
+        if (ignoreLines.includes(idx)) continue
         const line = lines[idx]
         if (line.startsWith('== ') && line.length > 3) {
           allBlocks.unshift({
@@ -473,7 +505,7 @@ function mergeAsciiDoc (
     })
     let skipping
     for (let idx = 0, lastIdx = lines.length - 1; idx <= lastIdx; idx++) {
-      if (~ignoreLines.indexOf(idx)) continue
+      if (ignoreLines.includes(idx)) continue
       let line = lines[idx]
       if (line.startsWith('//')) {
         if (line.charAt(2) !== '/') continue
@@ -589,10 +621,13 @@ function mergeAsciiDoc (
       buffer,
       lines.filter((it) => it !== undefined)
     )
-    const attributeEntries = Object.entries(doc.source_header_attributes.$$smap)
+    const attributeEntries = doc.source_header_attributes.$entries()
     if (attributeEntries.length) {
       const resolvedAttributeEntries = attributeEntries.reduce(
         (accum, [name, val]) => {
+          if (val) {
+            if (val['$nil?']()) val = null
+          }
           // Q: couldn't we just check if attribute is locked?
           if (name in mutableAttributes) {
             const initialVal = mutableAttributes[name]
@@ -610,19 +645,18 @@ function mergeAsciiDoc (
       )
       if (resolvedAttributeEntries.length > 1) safePush(buffer, resolvedAttributeEntries)
     }
-  } else if (level) {
+  } else if (level && !hash) {
+    const buffer = (builder.body ??= [])
     if (atDocumentRoot && rootLevel === 0 && navtitlePlain === componentVersion.title) {
-      buffer.inBody ??= false
       level--
     } else {
-      buffer.inBody = true
-      buffer.push('')
+      if (buffer.length) buffer.push('')
       const syntheticId = idSeparators.generateIdFromTitle(navtitleAsciiDoc, idSeparators)
       let sectionTitle = navtitleAsciiDoc
       if (urlType === 'external') {
         sectionTitle = `${url}[${navtitleAsciiDoc.replace(/\]/g, '\\]')}]`
       } else if (urlType === 'internal' && !unresolved) {
-        const resource = files.find((it) => it.pub.url === url)
+        const resource = files.find((it) => it.pub.url === pathname)
         if (resource) {
           if (resource.src.family === 'page' && pagesInOutline.has(resource.pub.url)) {
             const refid = generateScopedId(resource.src, componentVersion, idSeparators, filetype, true)
@@ -632,38 +666,39 @@ function mergeAsciiDoc (
           }
         }
       }
+      if (supportsParts && level === 1 && roles.includes('part')) {
+        roles.splice(roles.indexOf('part', 1))
+        level--
+      }
       const hlevel = level > 5 ? 6 : level + 1
       const hroles = urlType === 'internal' ? roles.slice(1) : roles
       buffer.push(`[${hlevel > 6 ? 'discrete' : ''}#${syntheticId}${hroles.reduce((str, it) => str + '.' + it, '')}]`)
       buffer.push(`${'='.repeat(hlevel)} ${sectionTitle}`)
     }
   }
-  if (hasItems) {
-    const nextLevel = level + 1
-    // NOTE: drop first child if same as parent; should we keep if content is different?
-    ;(urlType === 'internal' && urlType === items[0].urlType && url === items[0].url && !items[0].items
-      ? items.slice(1)
-      : items
-    ).forEach((item) => {
-      mergeAsciiDoc(
-        loadAsciiDoc,
-        contentCatalog,
-        buffer,
-        componentVersion,
-        item,
-        files,
-        pagesInOutline,
-        idSeparators,
-        asciidocConfig,
-        mutableAttributes,
-        assemblyModel,
-        lastComponentVersion,
-        nextLevel,
-        atBookRoot
-      )
-    })
-  }
-  return buffer
+  if (!hasItems) return
+  const nextLevel = level + 1
+  // NOTE: drop first child if same as parent; should we keep if content is different?
+  ;(urlType === 'internal' && items[0].urlType === 'internal' && pathname === items[0].url && !items[0].items?.length
+    ? items.slice(1)
+    : items
+  ).forEach((item) => {
+    mergeAsciiDoc(
+      loadAsciiDoc,
+      contentCatalog,
+      builder,
+      componentVersion,
+      item,
+      files,
+      pagesInOutline,
+      idSeparators,
+      asciidocConfig,
+      mutableAttributes,
+      assemblyModel,
+      nextLevel,
+      atBookRoot
+    )
+  })
 }
 
 function processDocumentHeader (doc, lines, ignoreLines, isRootPage) {
@@ -702,7 +737,7 @@ function processDocumentHeader (doc, lines, ignoreLines, isRootPage) {
     }
     const line = lines[idx]
     if (open === ':' || open === '-:') {
-      if (open === ':') current.lines.push(line)
+      if (open === ':') current.appendLine(line)
       if (!line?.endsWith(' \\')) current = open = undefined
     } else if (line) {
       let attributeEntryMatch
@@ -710,13 +745,14 @@ function processDocumentHeader (doc, lines, ignoreLines, isRootPage) {
       if (chr0 === '/' && line.charAt(1) === '/') {
         if (line.startsWith('////') && line === '/'.repeat(line.length)) {
           if (open) {
-            current.lines.push(line)
+            current.appendLine(line)
             if (open === line) current = open = undefined
           } else {
             entries.push((current = { type: 'block_comment', lines: [(open = line)] }))
+            current.appendLine = Array.prototype.push.bind(current.lines)
           }
         } else if (open) {
-          current.lines.push(line)
+          current.appendLine(line)
         } else if (belowDoctitle && line.charAt(2) === '/') {
           break
         } else {
@@ -724,7 +760,7 @@ function processDocumentHeader (doc, lines, ignoreLines, isRootPage) {
           current = undefined
         }
       } else if (open) {
-        current.lines.push(line)
+        current.appendLine(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) === '!'
@@ -733,7 +769,9 @@ function processDocumentHeader (doc, lines, ignoreLines, isRootPage) {
           if (line.endsWith(' \\')) open = '-:' // disallow value continuation
         } else {
           if (line.endsWith(' \\')) open = ':'
-          entries.push((current = { type: 'attribute_entry', name, negated, lines: [line], lineno: idx + 1 }))
+          entries.push((current = { type: 'attribute_entry', name, negated, lines: [], lineno: idx + 1 }))
+          current.lines.push(negated ? `:!${name}:` : line)
+          current.appendLine = Array.prototype.push.bind(negated ? [] : current.lines)
           if (assemblyHeaderAttributes.has(name)) current.promote = true
         }
       } else if (belowDoctitle) {
@@ -807,13 +845,13 @@ function safePush (onto, entries) {
 }
 
 function generateIdFromTitle (titleAsciiDoc, idSeparators, idLeader) {
-  const Section = this.$class().$const_get('::Asciidoctor::Section')
+  const Section = this.$class().$$base_module.Section
   const baseId = Section.$generate_id(titleAsciiDoc, this) // refs in catalog will always be empty
   let id = `_${idSeparators.coordinate}${idLeader ?? ''}${baseId}`
   const syntheticIds = (this.catalog.syntheticIds ??= {})
   if (id in syntheticIds) {
     const sep = (this.getAttribute('idseparator') ?? '_').charAt()
-    let cnt = this.$class().$const_get('::Asciidoctor::Compliance').unique_id_start_index
+    let cnt = this.$class().$$base_module.Compliance.unique_id_start_index
     let candidate
     while ((candidate = `${id}${sep}${cnt}`) in syntheticIds) cnt++
     id = candidate