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

package/lib/produce-assembly-file.js

@@ -121,6 +121,7 @@ function mergeAsciiDoc (
     outDirname,
     siteRoot,
     xmlIds,
+    logger,
   } = assemblyModel
   // 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
@@ -142,6 +143,16 @@ 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)
+          },
+        },
+      })
+    }
     if (doc.hasAttribute('assembly-navtitle')) {
       navtitleAsciiDoc = doc.getAttribute('assembly-navtitle')
       navtitlePlain = sanitize((navtitle = doc.$apply_reftext_subs(navtitleAsciiDoc)))
@@ -307,6 +318,10 @@ 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 (
@@ -365,16 +380,22 @@ function mergeAsciiDoc (
           if (!refs['$key?'](refid) && (~refid.indexOf(' ') || refid.toLowerCase() !== refid)) {
             if ((refid = doc.$resolve_id(refid))['$nil?']()) return m
           }
-          return `<<${idPrefix}${refid}${text ? ',' + text : ''}>>`
+          const alphaPrefix = !(refid in scannedInlineAnchors) || /^[\p{Alpha}_:]/u.test(idPrefix) ? '' : 'iid-'
+          return `<<${alphaPrefix}${idPrefix}${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, `[[${idPrefix}$1$2]]`)
+        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}]]`
+        })
       }
       if (~line.indexOf('xref:')) {
         // Q: should we allow : as first character of target?
-        line = line.replace(/(?<![\\+])xref:((?:\.\/)?[\p{Alpha}0-9_/.{#].*?)\[(|.*?[^\\])\]/gu, (m, target, text) => {
+        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) {
@@ -389,21 +410,23 @@ function mergeAsciiDoc (
           // 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') {
-            if (siteRoot && (resource = contentCatalog.getById(resourceId))?.pub) {
-              text ||= resource.asciidoc?.xreftext || target
-              return `${resolveLinkTarget(resource, siteRoot, pubRoot, linkRefStyle)}${fragment && '#' + fragment}[${text}]`
-            }
-            // TODO: handle unresolved resource better
-            return m
-          }
-          if (!(resource = pagesInOutline.get(createResourceKey(resourceId)))) {
-            if (siteRoot && (resource = contentCatalog.getById(resourceId))?.pub) {
-              text ||= resource.asciidoc?.xreftext || target
-              return `${resolveLinkTarget(resource, siteRoot, pubRoot, linkRefStyle)}${fragment && '#' + fragment}[${text}]`
+          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 } }
+                )
+              )
             }
-            // TODO: handle unresolved page better
-            return m
+            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 (
@@ -427,7 +450,7 @@ function mergeAsciiDoc (
       if (~line.indexOf('link:{attachmentsdir}/')) {
         line = line.replace(/(?<![\\+])link:\{attachmentsdir\}\/([^\s[]+)\[(|.*?[^\\])\]/g, (m, relative, text) => {
           const attachment =
-            siteRoot &&
+            (siteRoot || linkRefStyle === 'relative') &&
             contentCatalog.getById({
               component: componentVersion.name,
               version: componentVersion.version,
@@ -441,15 +464,25 @@ function mergeAsciiDoc (
       }
       if (~line.indexOf('image:') && !line.startsWith('image::')) {
         line = line.replace(/(?<![\\+])image:([^:\s[](?:[^[]*[^\s[])?)\[([^\]]*)\]/g, (m, target, attrlist) => {
-          if (isResourceSpec(target)) {
-            const image = contentCatalog.resolveResource(target, page.src, 'image', ['image'])
-            // TODO: handle (or report) unresolved image better
-            if (image?.out && (filetype !== 'html' || siteRoot)) {
+          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 filetype === 'html'
-                ? `image:${resolveLinkTarget(image, siteRoot, pubRoot, linkRefStyle)}[${attrlist}]`
-                : `image:${resolveEmbedTarget(image, outDirname, embedRefStyle, true)}[${attrlist}]`
+              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
         })

package/lib/produce-assembly-files.js

@@ -21,6 +21,7 @@ function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, re
     embedReferenceStyle: assemblyConfig.embedReferenceStyle,
     linkReferenceStyle: assemblyConfig.linkReferenceStyle,
     dropExplicitXrefText: assemblyConfig.dropExplicitXrefText,
+    logger: assemblyConfig.logger, // for tests
   })
   const assemblerAsciiDocAttributes = Object.assign({}, assemblerAsciiDocConfig.attributes)
   const { revdate, 'source-highlighter': sourceHighlighter } = assemblerAsciiDocAttributes
@@ -64,7 +65,7 @@ function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, re
         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') {
+      } else if (!(assemblyModel.filetype === 'pdf' && assemblyModel.linkReferenceStyle === 'relative')) {
         assemblyModel.linkReferenceStyle = 'absolute'
       }
       const auxiliaryImages = new Set()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/assembler",
-  "version": "1.0.0-beta.14",
+  "version": "1.0.0-beta.16",
   "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)",