@antora/assembler 1.0.0-alpha.2 → 1.0.0-alpha.3

package/lib/produce-aggregate-document.js

@@ -171,22 +171,10 @@ function aggregateAsciiDoc (
     const ignoreLines = []
     // TODO: think more about when multipart is allowed; perhaps configurable
     if (doc.hasSections()) fixSectionLevels(doc.getSections(), level === 0)
-    // TODO: update / simplify findBy calls when upgrading to Asciidoctor 2
-    const allBlocks = doc
-      .findBy((it) => it.getContext() !== 'document')
-      .reduce((accum, block) => {
-        accum.push(block)
-        if (block.getContext() === 'table') {
-          const rows = block.rows
-          ;[...rows.body, ...rows.foot].forEach((row) => {
-            row.forEach((cell) => {
-              if (cell.style !== 'asciidoc') return
-              accum.push(...cell.inner_document.findBy((it) => it.getContext() !== 'document'))
-            })
-          })
-        }
-        return accum
-      }, [])
+    const allBlocks = doc.findBy(
+      { traverse_documents: true },
+      (it) => it.getContext() !== 'document' && !(it.getContext() === 'table_cell' && it.getStyle() === 'asciidoc')
+    )
     allBlocks.forEach((block) => {
       const contentModel = block.content_model
       if (
@@ -301,6 +289,7 @@ function aggregateAsciiDoc (
     // NOTE: need to do this last since it modifies the line numbers
     // we could remap the line numbers to make them resilient
     // or we could mark which lines to remove and filter them after
+    let lastImageMacroAt
     ;[...allBlocks].reverse().forEach((block) => {
       const lineno = block.getLineNumber()
       // NOTE: lineno is not defined for preamble
@@ -327,33 +316,34 @@ function aggregateAsciiDoc (
         if (block.getId()) rewriteStyleAttribute(block, lines, idx, idprefix, blockStyle)
       } else {
         if (context === 'image') {
-          const atImageMacro = (lines[idx] || '').startsWith('image::')
-          // NOTE: the following logic is needed only if parser is messing up line number of image block
-          //let atImageMacro
-          //// NOTE: account for line number tracking error in parser when image has block anchor
-          //if (block.getId()) {
-          //  const originalIdx = idx
-          //  let line
-          //  while ((line = lines[idx]) != null && !(atImageMacro = line.startsWith('image::'))) idx++
-          //  if (!atImageMacro) {
-          //    idx = originalIdx
-          //    if ((lines[idx - 1] || '').startsWith('image::')) {
-          //      atImageMacro = true
-          //      idx--
-          //    }
-          //  }
-          //} else if ((lines[idx] || '').startsWith('image::')) {
-          //  atImageMacro = true
-          //}
-          const target = block.getAttribute('target')
-          if (atImageMacro && isResourceSpec(target)) {
-            const image = contentCatalog.resolveResource(target, page.src, 'image', ['image'])
-            // FIXME: handle (or report) case when image is not resolved
-            if (image) {
-              image.out.assembled = true
-              const line = lines[idx]
-              lines[idx] = `image::${image.pub.url.substr(1)}${line.substr(line.indexOf('['))}`
+          let line = lines[idx] || ''
+          let prefix = ''
+          // Q: can we use startsWith('image::') in certain cases?
+          let imageMacroOffset = (
+            lastImageMacroAt && lastImageMacroAt[0] === idx ? line.substr(0, lastImageMacroAt[1]) : line
+          ).lastIndexOf('image::')
+          if (imageMacroOffset > 0) {
+            if (
+              block.getParent().getContext() === 'document' &&
+              block.getParent().isNested() &&
+              (prefix = line.substr(0, imageMacroOffset)).trimRight().endsWith('|')
+            ) {
+              line = line.substr(prefix.length)
+            } else {
+              imageMacroOffset = -1
+            }
+          }
+          if (imageMacroOffset >= 0) {
+            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) {
+                lines[idx] = `${prefix}image::${image.pub.url.substr(1)}${line.substr(line.indexOf('['))}`
+                image.out.assembled = true
+              }
             }
+            lastImageMacroAt = [idx, imageMacroOffset]
           }
         }
         if (block.getId()) rewriteStyleAttribute(block, lines, idx, idprefix)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/assembler",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "description": "An extension library for Antora that assembles content from multiple pages into a single AsciiDoc file to converted and publish.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",