@antora/assembler 1.0.0-beta.7 → 1.0.0-beta.9

package/lib/assemble-content.js

@@ -65,7 +65,7 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
     createResolveAssemblyModel(context, contentCatalog, assemblyConfig, intrinsicAttributes, navigationCatalog)
   )
   if (!(assemblyFiles.length && typeof convert === 'function')) return assemblyFiles
-  if (typeof getDefaultCommand === 'function') {
+  if (buildConfig.command == null && typeof getDefaultCommand === 'function') {
     buildConfig.command = await getDefaultCommand(buildConfig.cwd)
   }
   const { publishSite: publishFiles = require('@antora/site-publisher') } = generatorFunctions

package/lib/configure.js

@@ -6,7 +6,8 @@ function configure (context, ...args) {
 
 function internalConfigure (converter, config = {}, providers = {}) {
   this.once('componentsRegistered', ({ contentCatalog, assemblerProfiles }) => {
-    this.updateVariables(assemblerProfiles ? undefined : { assemblerProfiles: getAssemblerProfiles(contentCatalog) })
+    if (assemblerProfiles) return
+    this.updateVariables({ assemblerProfiles: getAssemblerProfiles(contentCatalog) })
   })
 
   this.once('beforeProcess', ({ siteAsciiDocConfig }) => {
@@ -64,14 +65,10 @@ function getAssemblerProfiles (contentCatalog, assemblerProfiles = new Map()) {
 }
 
 function getAssemblerConfigFromDescriptor (descriptor = {}) {
-  let assemblerConfig = descriptor.ext?.assembler
+  const assemblerConfig = descriptor.ext?.assembler
   if (!assemblerConfig) return
-  if (Array.isArray(assemblerConfig)) {
-    if (!assemblerConfig.length) return
-  } else {
-    assemblerConfig = [assemblerConfig]
-  }
-  return assemblerConfig
+  if (!Array.isArray(assemblerConfig)) return [assemblerConfig]
+  if (assemblerConfig.length) return assemblerConfig
 }
 
 function initNavFile (file, component, version, index) {

package/lib/produce-assembly-file.js

@@ -400,12 +400,8 @@ function mergeAsciiDoc (
           } else {
             fragment = target
           }
-          if (!relativePart) {
-            // Q: should we validate the internal ID here?
-            return text && ~text.indexOf('=')
-              ? `xref:${idPrefix}${fragment}[${text}]`
-              : `<<${idPrefix}${fragment}${text ? ',' + text.replace(/\\]/g, ']') : ''}>>`
-          }
+          // Q: should we validate the internal ID here?
+          if (!relativePart) return `xref:${idPrefix}${fragment}[${text}]`
           if (~dollarIdx) {
             if (relativePart.slice(dollarIdx).startsWith('$./')) {
               relativePart = relativePart.slice(0, dollarIdx + 1) + topicPrefix + relativePart.slice(dollarIdx + 3)
@@ -444,6 +440,7 @@ function mergeAsciiDoc (
           }
           if (targetModule !== 'ROOT') relativePart = `${targetModule}${idCoordinateSeparator}${relativePart}`
           relativePart = relativePart.replace(/\.adoc$/, '').replace(/[/.]/g, '-')
+          if (fragment === resource.asciidoc.id) fragment = ''
           const refid = fragment
             ? `${relativePart}${idScopeSeparator}${fragment}`
             : relativePart + (ReservedIdNames.includes(relativePart) ? idScopeSeparator : '')
@@ -454,7 +451,7 @@ function mergeAsciiDoc (
           ) {
             text = ''
           }
-          return `<<${refid}${text ? ',' + text.replace(/\\]/g, ']') : ''}>>`
+          return `xref:${refid}[${text}]`
         })
       }
       if (~line.indexOf('link:{attachmentsdir}/')) {
@@ -609,7 +606,7 @@ function mergeAsciiDoc (
             let refid = resource.src.relative.replace(/\.adoc$/, '').replace(/[/.]/g, '-')
             if (refid.startsWith('./')) refid = topicPrefix + refid.slice(2)
             if (resource.src.module !== 'ROOT') refid = `${resource.src.module}${idCoordinateSeparator}${refid}`
-            sectionTitle = `<<${refid},${navtitleAsciiDoc}>>`
+            sectionTitle = `xref:${refid}[${navtitleAsciiDoc.replace(/\]/g, '\\]')}]`
           } else if (siteRoot) {
             sectionTitle = `${resolveLinkTarget(resource, siteRoot, pubRoot, linkRefStyle)}[${navtitleAsciiDoc.replace(/\]/g, '\\]')}]`
           }

package/package.json

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