@antora/assembler 1.0.0-alpha.4 → 1.0.0-alpha.5

package/lib/load-config.js

@@ -27,13 +27,15 @@ function loadConfig (playbook, configSource = './antora-assembler.yml') {
     if (config.enabled === false) return undefined
     let asciidocAttrs
     if (!config.asciidoc) {
-      config.asciidoc = { attributes: (asciidocAttrs = { doctype: 'book' }) }
+      config.asciidoc = { attributes: (asciidocAttrs = {}) }
     } else if (!(asciidocAttrs = config.asciidoc.attributes)) {
-      config.asciidoc.attributes = asciidocAttrs = { doctype: 'book' }
+      config.asciidoc.attributes = asciidocAttrs = {}
     }
-    Object.assign(asciidocAttrs, { revdate: new Date().toISOString().split('T')[0], 'page-partial': null })
+    if (!('doctype' in asciidocAttrs)) asciidocAttrs.doctype = 'book'
+    asciidocAttrs.revdate = new Date().toISOString().split('T')[0]
+    asciidocAttrs['page-partial'] = null
     if (config.componentVersions == null) {
-      config.componentVersions = ['**']
+      config.componentVersions = ['*']
     } else if (typeof config.componentVersions === 'string') {
       config.componentVersions = config.componentVersions.split(', ')
     }

package/lib/produce-aggregate-document.js

@@ -166,14 +166,18 @@ function aggregateAsciiDoc (
       buffer.push(`${'='.repeat(hlevel)} ${overviewTitle}`)
       if (toggleSectids) buffer.push(':sectids:')
     }
-    const siteUrl = doc.getAttribute('site-url')
+    const siteUrl = ((val) => {
+      if (!val || val === '/') return ''
+      return val.charAt(val.length - 1) === '/' ? val.substr(0, val.length - 1) : val
+    })(doc.getAttribute('site-url'))
     const lines = doc.getSourceLines()
     const ignoreLines = []
     // TODO: think more about when multipart is allowed; perhaps configurable
     if (doc.hasSections()) fixSectionLevels(doc.getSections(), level === 0)
-    const allBlocks = doc.findBy(
-      { traverse_documents: true },
-      (it) => it.getContext() !== 'document' && !(it.getContext() === 'table_cell' && it.getStyle() === 'asciidoc')
+    const allBlocks = doc.findBy({ traverse_documents: true }, (it) =>
+      it.getContext() === 'document'
+        ? it.getDocument().isNested()
+        : !(it.getContext() === 'table_cell' && it.getStyle() === 'asciidoc')
     )
     allBlocks.forEach((block) => {
       const contentModel = block.content_model
@@ -298,8 +302,8 @@ function aggregateAsciiDoc (
       // NOTE: lineno is not defined for preamble
       if (typeof lineno !== 'number') return
       const context = block.getContext()
-      const idx = lineno - 1
-      if (context === 'section') {
+      let idx = lineno - 1
+      if (context === 'section' && !block.getDocument().isNested()) {
         if (block.getSectionName() === 'header') {
           lines.splice(idx, 1)
           return
@@ -347,6 +351,9 @@ function aggregateAsciiDoc (
             }
             lastImageMacroAt = [idx, imageMacroOffset]
           }
+        } else if (context === 'document' && block.hasHeader()) {
+          // nested document
+          idx = (block.getHeader().getLineNumber() || idx + 1) - 1
         }
         if (block.getId()) rewriteStyleAttribute(block, lines, idx, idprefix)
       }
@@ -364,7 +371,7 @@ function aggregateAsciiDoc (
             } else if (val !== initialVal) {
               accum.push(`:${name}:${initialVal ? ' ' + initialVal : ''}`)
             }
-          } else if (val != null && !doc.isAttributeLocked(name)) {
+          } else if (val != null && !(doc.isAttributeLocked(name) || name === 'doctype')) {
             accum.push(`:!${name}:`)
           }
           return accum

package/lib/produce-aggregate-documents.js

@@ -7,7 +7,9 @@ const selectMutableAttributes = require('./select-mutable-attributes')
 function produceAggregateDocuments (loadAsciiDoc, contentCatalog, assemblerConfig) {
   const { insertStartPage, rootLevel, sectionMergeStrategy, asciidoc: assemblerAsciiDocConfig } = assemblerConfig
   const assemblerAsciiDocAttributes = Object.assign({}, assemblerAsciiDocConfig.attributes)
-  delete assemblerAsciiDocAttributes['source-highlighter'] // only used at convert time
+  const { doctype, 'source-highlighter': sourceHighlighter } = assemblerAsciiDocAttributes
+  delete assemblerAsciiDocAttributes.doctype
+  delete assemblerAsciiDocAttributes['source-highlighter']
   return filterComponentVersions(contentCatalog.getComponents(), assemblerConfig.componentVersions).reduce(
     (accum, componentVersion) => {
       const { name: componentName, version, title, navigation } = componentVersion
@@ -30,7 +32,8 @@ function produceAggregateDocuments (loadAsciiDoc, contentCatalog, assemblerConfi
       const mutableAttributes = startPage
         ? selectMutableAttributes(loadAsciiDoc, contentCatalog, startPage, mergedAsciiDocConfig)
         : {}
-      return accum.concat(
+      delete mutableAttributes.doctype
+      accum = accum.concat(
         prepareOutlines(navigation, rootEntry, rootLevel).map((outline) =>
           produceAggregateDocument(
             loadAsciiDoc,
@@ -44,6 +47,11 @@ function produceAggregateDocuments (loadAsciiDoc, contentCatalog, assemblerConfi
           )
         )
       )
+      mergedAsciiDocConfig.attributes.doctype = doctype
+      sourceHighlighter
+        ? (mergedAsciiDocConfig.attributes['source-highlighter'] = sourceHighlighter)
+        : delete mergedAsciiDocConfig.attributes['source-highlighter']
+      return accum
     },
     []
   )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/assembler",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-alpha.5",
   "description": "An extension library for Antora that assembles content from multiple pages into a single AsciiDoc file to converted and publish.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
@@ -25,6 +25,7 @@
     "./filter-component-versions": "./lib/filter-component-versions.js",
     "./load-config": "./lib/load-config.js",
     "./produce-aggregate-document": "./lib/produce-aggregate-document.js",
+    "./produce-aggregate-documents": "./lib/produce-aggregate-documents.js",
     "./select-mutable-attributes": "./lib/select-mutable-attributes.js"
   },
   "dependencies": {