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

package/lib/assemble-content.js

@@ -113,7 +113,7 @@ function createResolveAssemblyModel (context, contentCatalog, shared, intrinsicA
   return (componentVersion) => {
     const componentVersionProfiles = assemblerProfiles.get(componentVersion.version + '@' + componentVersion.name)
     const overrides =
-      componentVersionProfiles?.get(intrinsicAttributes['assembler-profile']) ?? componentVersionProfiles?.get()
+      componentVersionProfiles?.get(intrinsicAttributes['assembler-profile']) ?? componentVersionProfiles?.get() ?? {}
     const { navFiles, messages } = overrides
     const model = Object.assign({}, shared, overrides)
     delete model.navFiles

package/lib/produce-assembly-file.js

@@ -371,57 +371,70 @@ function mergeAsciiDoc (
       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) => {
-          let pagePart, fragment, targetPage
+          let relativePart, fragment, targetResource, isPage
           const hashIdx = target.indexOf('#')
+          const dollarIdx = target.indexOf('$')
           if (~hashIdx) {
-            pagePart = target.slice(0, hashIdx)
+            relativePart = target.slice(0, hashIdx)
             fragment = target.slice(hashIdx + 1)
-            // TODO: for now, assume .adoc; in the future, consider other file extensions
-            if (pagePart && !pagePart.endsWith('.adoc')) pagePart += '.adoc'
-          } else if (target.endsWith('.adoc')) {
-            pagePart = target
+          } else if (~dollarIdx || target.endsWith('.adoc')) {
+            relativePart = target
             fragment = ''
           } else {
             fragment = target
           }
-          if (!pagePart) {
+          if (!relativePart) {
             // Q: should we validate the internal ID here?
             return text && ~text.indexOf('=')
               ? `xref:${idPrefix}${fragment}[${text}]`
               : `<<${idPrefix}${fragment}${text ? ',' + text.replace(/\\]/g, ']') : ''}>>`
           }
-          if (~pagePart.indexOf('@') || /:.*:/.test(pagePart)) {
-            if (siteUrl && (targetPage = contentCatalog.resolvePage(pagePart, page.src)) && targetPage.out) {
-              text ||= targetPage.asciidoc?.xreftext || target
-              return `${siteUrl}${targetPage.pub.url}${fragment && '#' + fragment}[${text}]`
+          if (~dollarIdx) {
+            if (relativePart.slice(dollarIdx).startsWith('$./')) {
+              relativePart = relativePart.slice(0, dollarIdx + 1) + topicPrefix + relativePart.slice(dollarIdx + 3)
             }
-            // TODO: handle unresolved page better
+            if ((isPage = /\bpage\$/.test(relativePart))) relativePart = relativePart.replace('page$', '')
+          } else {
+            isPage = true
+            if (relativePart.startsWith('./')) relativePart = topicPrefix + relativePart.slice(2)
+            if (~hashIdx && !relativePart.endsWith('.adoc')) relativePart += '.adoc'
+          }
+          if (!isPage || ~relativePart.indexOf('@') || /:.*:/.test(relativePart)) {
+            if (siteUrl && (targetResource = contentCatalog.resolveResource(relativePart, page.src, 'page'))?.out) {
+              text ||= targetResource.asciidoc?.xreftext || target
+              return `${siteUrl}${targetResource.pub.url}${fragment && '#' + fragment}[${text}]`
+            }
+            // TODO: handle unresolved resource better
             return m
           }
           let targetModule
-          const colonIdx = pagePart.indexOf(':')
+          const colonIdx = relativePart.indexOf(':')
           if (~colonIdx) {
-            targetModule = pagePart.slice(0, colonIdx)
-            pagePart = pagePart.slice(colonIdx + 1)
+            targetModule = relativePart.slice(0, colonIdx)
+            relativePart = relativePart.slice(colonIdx + 1)
+            if (relativePart.startsWith('./')) relativePart = topicPrefix + relativePart.slice(2)
           } else {
             targetModule = module_
           }
-          if (pagePart.startsWith('./')) pagePart = topicPrefix + pagePart.slice(2)
-          const pageResourceRef = targetModule === 'ROOT' ? pagePart : `${targetModule}:${pagePart}`
-          if (!(targetPage = pagesInOutline.get(pageResourceRef))) {
-            if (siteUrl && (targetPage = contentCatalog.resolvePage(pageResourceRef, page.src)) && targetPage.out) {
-              text ||= targetPage.asciidoc?.xreftext || target
-              return `${siteUrl}${targetPage.pub.url}${fragment && '#' + fragment}[${text}]`
+          const pageResourceRef = targetModule === 'ROOT' ? relativePart : `${targetModule}:${relativePart}`
+          if (!(targetResource = pagesInOutline.get(pageResourceRef))) {
+            if (
+              siteUrl &&
+              (targetResource = contentCatalog.resolvePage(pageResourceRef, page.src)) &&
+              targetResource.out
+            ) {
+              text ||= targetResource.asciidoc?.xreftext || target
+              return `${siteUrl}${targetResource.pub.url}${fragment && '#' + fragment}[${text}]`
             }
             // TODO: handle unresolved page better
             return m
           }
-          if (targetModule !== 'ROOT') pagePart = `${targetModule}${idCoordinateSeparator}${pagePart}`
-          pagePart = pagePart.replace(/\.adoc$/, '').replace(/[/.]/g, '-')
+          if (targetModule !== 'ROOT') relativePart = `${targetModule}${idCoordinateSeparator}${relativePart}`
+          relativePart = relativePart.replace(/\.adoc$/, '').replace(/[/.]/g, '-')
           const refid = fragment
-            ? `${pagePart}${idScopeSeparator}${fragment}`
-            : pagePart + (ReservedIdNames.includes(pagePart) ? idScopeSeparator : '')
-          return `<<${refid}${text && text !== targetPage.title ? ',' + text.replace(/\\]/g, ']') : ''}>>`
+            ? `${relativePart}${idScopeSeparator}${fragment}`
+            : relativePart + (ReservedIdNames.includes(relativePart) ? idScopeSeparator : '')
+          return `<<${refid}${text && text !== targetResource.title ? ',' + text.replace(/\\]/g, ']') : ''}>>`
         })
       }
       if (~line.indexOf('link:{attachmentsdir}/')) {

package/lib/produce-assembly-files.js

@@ -87,7 +87,6 @@ function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, re
         accum.push(assemblyFile)
         return true
       }, false)
-      mergedAsciiDocAttributes.doctype = assemblyModel.doctype
       sourceHighlighter
         ? (mergedAsciiDocAttributes['source-highlighter'] = sourceHighlighter)
         : delete mergedAsciiDocAttributes['source-highlighter']

package/package.json

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