@baiyibai-antora/adf-extension 1.0.0-beta.2 → 1.0.0-beta.4

package/lib/convert-pages.js

@@ -66,6 +66,14 @@ module.exports = async function convertPages ({
   const outputDir = ospath.resolve(playbook.dir || '.', config.outputDir || path.join('build', 'adf'))
   const included = buildVersionFilter(contentCatalog, config)
 
+  // Confluence requires unique page titles per space; the publisher suffixes
+  // collisions using this strategy ("parent" or "filename").
+  let titleConflicts = config.titleConflicts || 'parent'
+  if (!['parent', 'filename'].includes(titleConflicts)) {
+    logger.warn(`unknown title_conflicts value "${titleConflicts}"; using "parent" (expected parent or filename)`)
+    titleConflicts = 'parent'
+  }
+
   const asciidocConfigs = new Map()
   for (const component of contentCatalog.getComponents()) {
     for (const { version, asciidoc } of component.versions) {
@@ -229,7 +237,7 @@ module.exports = async function convertPages ({
   // The manifest itself is written by finalizeManifest (on beforePublish), so
   // assembler-produced exports (family "export") are collected regardless of
   // extension registration order.
-  return { outputDir, manifestPages, nav, included }
+  return { outputDir, manifestPages, nav, included, titleConflicts }
 }
 
 // Component/version scoping: `components` limits to the listed component
@@ -263,7 +271,7 @@ function globToRx (pattern) {
  * final manifest.json.
  */
 async function finalizeManifest ({ playbook, contentCatalog, state, logger }) {
-  const { outputDir, manifestPages, nav, included } = state
+  const { outputDir, manifestPages, nav, included, titleConflicts } = state
   const exports_ = []
   for (const file of contentCatalog.getFiles()) {
     if (!file.src || file.src.family !== 'export' || !file.out || !file.contents) continue
@@ -294,6 +302,7 @@ async function finalizeManifest ({ playbook, contentCatalog, state, logger }) {
   const manifest = {
     version: 1,
     site: { title: playbook.site.title || null, url: playbook.site.url || null },
+    titleConflicts,
     pages: manifestPages,
     nav,
     exports: exports_,

package/lib/load-config.js

@@ -13,6 +13,9 @@ const yaml = require('js-yaml')
 //   versions: latest    #   Antora catalog, so includes and xrefs resolve —
 //   components: [docs]  #   links to nav-excluded pages fall back to the
 //   output_dir: ./build/adf  # static site url. `exclude` is an alias.
+//   title_conflicts: parent  # or filename — how colliding page titles are
+//                            #   suffixed (Confluence requires unique titles
+//                            #   per space)
 //
 // Keys given directly on the extension entry in the playbook win.
 
@@ -38,6 +41,7 @@ function loadConfig (playbook, config, logger) {
   if (fileConfig.orphans) normalized.orphans = fileConfig.orphans
   if (fileConfig.components) normalized.components = fileConfig.components
   if (fileConfig.output_dir) normalized.outputDir = fileConfig.output_dir
+  if (fileConfig.title_conflicts) normalized.titleConflicts = fileConfig.title_conflicts
   logger.info(`loaded confluence config from ${configPath}`)
   return { ...normalized, ...config }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baiyibai-antora/adf-extension",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "description": "Antora extension that emits Confluence ADF JSON and a publish manifest for every page during a site build",
   "license": "MIT",
   "author": "baiyibai",