@antora/assembler 1.0.0-rc.3 → 1.0.0-rc.4

package/lib/assemble-content.js

@@ -25,8 +25,8 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
     mediaType: targetMediaType,
     loggerName = PACKAGE_NAME,
   } = converter ?? {}
-  const assemblerConfig = await loadConfig.call(this, playbook, configSource, '-' + targetBackend)
-  if (assemblerConfig.enabled === false) return []
+  const assemblerConfig = await loadConfig.call(this, configSource, playbook, '-' + targetBackend)
+  if (assemblerConfig.enabled === false || !contentCatalog.publishableFamilies?.has('export')) return []
   const context = isBound(this)
     ? this
     : {
@@ -40,7 +40,7 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
   assemblyConfig.embedReferenceStyle = embedReferenceStyle
   const profile = (assemblyConfig.profile ??= targetBackend)
   const intrinsicAttributes = { 'loader-assembler': '' }
-  buildConfig.cwd ??= process.cwd()
+  const cwd = (buildConfig.cwd ??= process.cwd())
   if (profile) {
     buildConfig.dir ??= ospath.join(playbook.dir ?? process.cwd(), `build/assembler/${profile}`)
     intrinsicAttributes[`assembler-profile-${profile}`] = ''
@@ -65,7 +65,7 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
     generateSelectAssemblyProfile(context, contentCatalog, assemblyConfig, intrinsicAttributes, navigationCatalog)
   )
   if (!(assemblyFiles.length && typeof convert === 'function')) return assemblyFiles
-  buildConfig.command ??= typeof getDefaultCommand === 'function' ? await getDefaultCommand(buildConfig.cwd) : null
+  buildConfig.command ??= typeof getDefaultCommand === 'function' ? await getDefaultCommand(cwd, playbook) : null
   const { publishSite: publishFiles = require('@antora/site-publisher') } = generatorFunctions
   await prepareWorkspace(publishFiles, assemblyFiles, buildConfig)
   const helpers = { logCommand: logCommand.bind(context, loggerName), runCommand }

package/lib/load-config.js

@@ -10,7 +10,7 @@ const { LEGACY_ASSEMBLY_KEYS } = require('./constants')
 const CAMEL_CASE_STOP_PATHS = ['asciidoc.attributes', 'assembly.attributes']
 const PACKAGE_NAME = require('../package.json').name
 
-function loadConfig (playbook, configSource, preferredQualifier = '') {
+function loadConfig (configSource, playbook, preferredQualifier = '') {
   let resolvedConfigSource
   return (
     configSource?.constructor === Object

package/lib/produce-assembly-file.js

@@ -365,10 +365,10 @@ function mergeAsciiDoc (
           }
         }
       }
-      if (htitleAsciiDoc != null) {
+      if (htitleAsciiDoc) {
         if (atDocumentRoot) {
-          // NOTE use pageStyle as fallback because this section must have a unique ID
-          pageFragment = `#${pageIdLeader}${doc.getId() ?? pageStyle}`
+          // Q: should we use htitleAsciiDoc to generate ID if not {empty} instead of pageStyle
+          pageFragment = `#_${idSeparators.coordinate}${pageIdLeader}${pageStyle}`
           buffer.unshift(`[#${pageId}]`)
         } else {
           pageFragment = `#${pageId}`
@@ -393,31 +393,30 @@ function mergeAsciiDoc (
     } else if (atBookRoot) {
       nextSectionLevel = undefined
     }
-    let enclosed
     if (heading) {
       const rolesAttr = pageRoles.reduce((str, it) => str + '.' + it, '')
       const notitleAttrs = heading.notitle ? '%notitle,toclevels=0,outlinelevels=0' : ''
       buffer.push(`[${heading.style ?? pageStyle}${pageFragment}${rolesAttr}${notitleAttrs}]`)
       buffer.push(`${'='.repeat(heading.level)} ${heading.title}`)
-    } else {
-      if (atDocumentRoot) buffer.unshift(`[#${pageId}]`)
-      if (sectionMergeStrategy === 'enclose' && hasItems && hasSections) {
-        enclosed = true
-        // TODO: make overview section title configurable
-        //let overviewTitle = doc.getDocumentTitle()
-        //if (overviewTitle === navtitle) overviewTitle = doc.getAttribute('overview-title', 'Overview')
-        const overviewTitle = doc.getAttribute('overview-title', 'Overview')
-        const syntheticId = idSeparators.generateIdFromTitle(navtitleAsciiDoc, idSeparators)
-        let hlevel = level + 2
-        if (hlevel > 6) {
-          const blockStyle = `discrete.h${hlevel}`
-          hlevel = 6
-          buffer.push(`[${blockStyle}#${syntheticId}]`)
-        } else {
-          buffer.push(`[#${syntheticId}]`)
-        }
-        buffer.push(`${'='.repeat(hlevel)} ${overviewTitle}`)
+    } else if (atDocumentRoot) {
+      buffer.unshift(`[#${pageId}]`)
+    }
+    if (sectionMergeStrategy === 'enclose' && hasItems && hasSections && !(atDocumentRoot && heading)) {
+      // TODO: make overview section title configurable
+      //let overviewTitle = doc.getDocumentTitle()
+      //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('')
+      let hlevel = level + (nextSectionLevel = 2)
+      if (hlevel > 6) {
+        const blockStyle = `discrete.h${hlevel}`
+        hlevel = 6
+        buffer.push(`[${blockStyle}#${syntheticId}]`)
+      } else {
+        buffer.push(`[#${syntheticId}]`)
       }
+      buffer.push(`${'='.repeat(hlevel)} ${overviewTitle}`)
     }
     assembled.pages.set(page, pageFragment)
     if (hasSections) fixSectionLevels(doc.getSections(), nextSectionLevel)
@@ -545,7 +544,7 @@ function mergeAsciiDoc (
         if (block.getSectionName() === 'header') return
         let blockStyle = sectionMergeStrategy === 'discrete' ? 'discrete' : undefined
         lines[idx] = lines[idx].replace(/^=+ (.+)/, (_, rest) => {
-          let targetMarkerLength = block.level + 1 + level + (enclosed ? 1 : 0)
+          let targetMarkerLength = block.level + 1 + level
           if (targetMarkerLength > 6) {
             blockStyle = `discrete.h${targetMarkerLength}`
             targetMarkerLength = 6
@@ -806,9 +805,10 @@ function safePush (onto, entries) {
   }
 }
 
-function generateIdFromTitle (titleAsciiDoc, idSeparators) {
+function generateIdFromTitle (titleAsciiDoc, idSeparators, idLeader) {
   const Section = this.$class().$const_get('::Asciidoctor::Section')
   const baseId = Section.$generate_id(titleAsciiDoc, this)
+  if (idLeader) return `_${idSeparators.coordinate}${idLeader}${baseId}`
   this.getCatalog().refs['$[]='](baseId, true)
   return `_${idSeparators.coordinate}${baseId}`
 }

package/lib/util/generate-scoped-id.js

@@ -6,6 +6,7 @@ function generateScopedId (componentSrc, componentVersion, separators, filetype,
   let { component, module: mod, relative } = componentSrc
   let id = relative.replace(/\.adoc$/, '').replace(/[/.]/g, '-')
   let { coordinate: coordinateSeparator, prefix: prefixSeparator } = separators
+  if (mod !== 'ROOT' && ~mod.indexOf('.')) mod = mod.replace(/[.]/g, '-')
   if (component !== componentVersion.name) {
     id = [component, mod === 'ROOT' ? '' : mod, id].join(coordinateSeparator)
   } else if (mod !== 'ROOT') {

package/package.json

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