@antora/assembler 1.0.0-rc.1 → 1.0.0-rc.2

package/lib/assemble-content.js

@@ -148,7 +148,7 @@ function generateSelectAssemblyProfile (context, contentCatalog, baseModel, intr
     const navigation = navigationCatalog?.getNavigation(componentVersion.name, componentVersion.version)
     const attributes = Object.assign({}, baseModel.attributes)
     const model = Object.assign({}, baseModel, overrides, { attributes, logger })
-    if (!overrides) return navigation ? Object.assign(model, { navigation }) : model
+    if (!overrides) return Object.assign(model, { navigation: navigation || componentVersion.navigation })
     delete model.navFiles
     delete model.messages
     if (overrides.attributes) Object.entries(overrides.attributes).forEach(([name, val]) => (attributes[name] = val))

package/lib/load-config.js

@@ -98,14 +98,19 @@ function loadConfig (playbook, configSource, preferredQualifier = '') {
     build.dir &&= expandPath(build.dir, { dot: playbook.dir })
     // used as cwd of command (and any scripts it requires)
     build.cwd = build.cwd == null ? playbook.dir : expandPath(build.cwd, { dot: playbook.dir })
-    if (build.command?.includes('$')) {
-      const vars = {
-        $NODE: process.execPath,
-        $NPM: ospath.join(process.execPath, '../npm'),
-        $NPX: ospath.join(process.execPath, '../npx'),
-        $PWD: build.cwd,
+    const command = build.command
+    if (command) {
+      if (command.constructor !== String) {
+        build.command = String(command)
+      } else if (command.includes('$')) {
+        const vars = {
+          $NODE: process.execPath,
+          $NPM: ospath.join(process.execPath, '../npm'),
+          $NPX: ospath.join(process.execPath, '../npx'),
+          $PWD: build.cwd,
+        }
+        build.command = build.command.replace(/^\$(?:NODE|NP[MX])(?= )|\$PWD\b/g, (ref) => vars[ref])
       }
-      build.command = build.command.replace(/^\$(?:NODE|NP[MX])(?= )|\$PWD\b/g, (ref) => vars[ref])
     }
     if (!('clean' in build) && 'output' in playbook) build.clean = playbook.output.clean
     if (!('publish' in build)) build.publish = true

package/lib/produce-assembly-file.js

@@ -181,7 +181,7 @@ function mergeAsciiDoc (
   let navtitlePlain = sanitize(navtitle)
   let navtitleAsciiDoc = unconvertInlineAsciiDoc(navtitle)
   const { items = [], roles = [], unresolved, urlType, url } = outlineEntry
-  const { filetype, linkReferenceStyle, pubRoot, siteRoot, logger, rootLevel } = assemblyModel
+  const { filetype, linkReferenceStyle, pubRoot, sectionMergeStrategy, siteRoot, logger, rootLevel } = assemblyModel
   const assembled = pagesInOutline.assembled
   // 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
@@ -231,13 +231,7 @@ function mergeAsciiDoc (
     let pageFragment = ''
     let pageRoles = []
     let pageStyle = doc.getAttribute('assembly-style', '')
-    if (
-      !pageStyle &&
-      atBookRoot &&
-      rootLevel === 0 &&
-      assemblyModel.sectionMergeStrategy === 'fuse' &&
-      !doc.source_header_attributes['$key?']('assembly-style')
-    ) {
+    if (!pageStyle && atBookRoot && rootLevel === 0 && !doc.source_header_attributes['$key?']('assembly-style')) {
       pageStyle = 'preface'
     }
     let part
@@ -248,6 +242,7 @@ function mergeAsciiDoc (
       pageStyle = pageStyle.substring(0, pageStyle.length - 5)
       if (!supportsParts) part = undefined
     }
+    const hasSections = doc.hasSections()
     let nextSectionLevel = 1
     const lines = doc.getSourceLines()
     const ignoreLines = []
@@ -353,15 +348,16 @@ function mergeAsciiDoc (
             ? ''
             : undefined
         if (htitleOverride != null) {
+          const keepSections = hasSections && sectionMergeStrategy !== 'discrete'
           if (htitleOverride === '') {
-            if (headerHasBlockAttrs || doc.hasSections()) {
+            if (headerHasBlockAttrs || keepSections) {
               htitleAsciiDoc = '{empty}'
               notitle = true
             } else {
               if (hasPrefaceTitleAttr) buffer.splice(++buffer.endHeaderIdx, 0, ':preface-title:')
               htitleAsciiDoc = undefined
             }
-          } else if (hasPrefaceTitleAttr && !(headerHasBlockAttrs || doc.hasSections())) {
+          } else if (hasPrefaceTitleAttr && !headerHasBlockAttrs && !keepSections) {
             buffer.splice(++buffer.endHeaderIdx, 0, `:preface-title: ${unconvertInlineAsciiDoc(htitleOverride)}`)
             htitleAsciiDoc = undefined
           } else {
@@ -405,7 +401,7 @@ function mergeAsciiDoc (
       buffer.push(`${'='.repeat(heading.level)} ${heading.title}`)
     } else {
       if (atDocumentRoot) buffer.unshift(`[#${pageId}]`)
-      if (assemblyModel.sectionMergeStrategy === 'enclose' && hasItems && doc.hasSections()) {
+      if (sectionMergeStrategy === 'enclose' && hasItems && hasSections) {
         enclosed = true
         // TODO: make overview section title configurable
         //let overviewTitle = doc.getDocumentTitle()
@@ -424,14 +420,14 @@ function mergeAsciiDoc (
       }
     }
     assembled.pages.set(page, pageFragment)
-    if (doc.hasSections()) fixSectionLevels(doc.getSections(), nextSectionLevel)
+    if (hasSections) fixSectionLevels(doc.getSections(), nextSectionLevel)
     const allBlocks = doc.findBy({ traverse_documents: true }, (it) =>
       it.getContext() === 'document'
         ? it.getDocument().isNested()
         : !(it.getContext() === 'table_cell' && it.getStyle() === 'asciidoc')
     )
     if (doc.getDoctype() === 'manpage') {
-      const firstSectionIdx = doc.hasSections() ? doc.getSections()[0].getLineNumber() - 1 : lines.length
+      const firstSectionIdx = hasSections ? doc.getSections()[0].getLineNumber() - 1 : lines.length
       for (let idx = 0; idx < firstSectionIdx; idx++) {
         if (~ignoreLines.indexOf(idx)) continue
         const line = lines[idx]
@@ -547,7 +543,7 @@ function mergeAsciiDoc (
       let idx = lineno - 1
       if (context === 'section' && !block.getDocument().isNested()) {
         if (block.getSectionName() === 'header') return
-        let blockStyle = (assemblyModel.sectionMergeStrategy || 'discrete') === 'discrete' ? 'discrete' : undefined
+        let blockStyle = sectionMergeStrategy === 'discrete' ? 'discrete' : undefined
         lines[idx] = lines[idx].replace(/^=+ (.+)/, (_, rest) => {
           let targetMarkerLength = block.level + 1 + level + (enclosed ? 1 : 0)
           if (targetMarkerLength > 6) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/assembler",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.2",
   "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)",
@@ -41,7 +41,7 @@
     "@asciidoctor/reducer": "~1.1",
     "@antora/expand-path-helper": "~3.0",
     "@antora/run-command-helper": "~1.1",
-    "js-yaml": "~4.2"
+    "js-yaml": "~4.3"
   },
   "devDependencies": {
     "@antora/asciidoc-loader": "3.2.0-rc.2",