@antora/assembler 1.0.0-beta.12 → 1.0.0-beta.14

package/lib/assemble-content.js

@@ -16,8 +16,6 @@ const PACKAGE_NAME = require('../package.json').name
 const NEWLINE_RX = /(?:\r?\n)+/
 
 async function assembleContent (playbook, contentCatalog, converter, { configSource, navigationCatalog }) {
-  const assemblerConfig = await loadConfig(playbook, configSource)
-  if (!assemblerConfig) return [] // TODO consider removing and doing this another way
   const context = isBound(this)
     ? this
     : {
@@ -25,6 +23,8 @@ async function assembleContent (playbook, contentCatalog, converter, { configSou
         getLogger: invariably.void,
         getVariables: invariably.new,
       }
+  const assemblerConfig = await loadConfig.call(context, playbook, configSource)
+  if (assemblerConfig.enabled === false) return []
   const generatorFunctions = context.getFunctions()
   const { loadAsciiDoc = require('@antora/asciidoc-loader') } = generatorFunctions
   const {

package/lib/load-config.js

@@ -5,6 +5,8 @@ const fsp = require('node:fs/promises')
 const os = require('node:os')
 const yaml = require('js-yaml')
 
+const PACKAGE_NAME = require('../package.json').name
+
 const ASSEMBLY_KEYS = [
   'rootLevel',
   'insertStartPage',
@@ -13,25 +15,34 @@ const ASSEMBLY_KEYS = [
   'dropExplicitXrefText',
 ]
 
-function loadConfig (playbook, configSource = './antora-assembler.yml') {
+function loadConfig (playbook, configSource) {
+  let resolvedConfigSource
   return (
-    configSource.constructor === Object
+    configSource?.constructor === Object
       ? Promise.resolve(configSource)
       : fsp
-          .access((configSource = expandPath(configSource, { dot: playbook.dir })))
+          .access((resolvedConfigSource = expandPath(configSource ?? './antora-assembler.yml', { dot: playbook.dir })))
           .then(
             () => true,
             () => false
           )
-          .then((exists) =>
-            exists
-              ? fsp
-                  .readFile(configSource)
-                  .then((data) => Object.assign(camelCaseKeys(yaml.load(data), ['asciidoc']), { file: configSource }))
-              : {}
-          )
+          .then((exists) => {
+            if (!exists) {
+              let logger
+              if (configSource && (logger = this?.getLogger?.(PACKAGE_NAME))) {
+                const ctx = { file: { path: configSource } }
+                logger.warn(ctx, 'Could not resolve config file; reverting to default settings')
+              }
+              return {}
+            }
+            return fsp
+              .readFile(resolvedConfigSource)
+              .then((data) =>
+                Object.assign(camelCaseKeys(yaml.load(data), ['asciidoc']), { file: resolvedConfigSource })
+              )
+          })
   ).then((config) => {
-    if (config.enabled === false) return undefined
+    if (config.enabled === false) return config
     let asciidocAttrs
     if (!config.asciidoc) {
       config.asciidoc = { attributes: (asciidocAttrs = {}) }

package/lib/produce-assembly-file.js

@@ -820,7 +820,7 @@ function generateId (componentSrc, componentVersion, coordinateSep, scopeSep, as
   if (component !== componentVersion.name) {
     id = [component, mod === 'ROOT' ? '' : mod, id].join(coordinateSep)
   } else if (mod !== 'ROOT') {
-    if (asXrefTarget && coordinateSep === ':' && /(?:pass|stem)$/.test(mod) && /^[a-z](?:,[a-z-])*/.test(id)) {
+    if (asXrefTarget && coordinateSep === ':' && /(?:pass|stem)$/.test(mod) && /^[a-z]+(?:,[a-z-]+)*$/.test(id)) {
       mod = mod.replace(/(?:pass|stem)$/, '\\$&')
     }
     id = mod + coordinateSep + id

package/lib/produce-assembly-files.js

@@ -64,7 +64,7 @@ function produceAssemblyFiles (loadAsciiDoc, contentCatalog, assemblerConfig, re
         if (linkRefStyle === 'absolute' && siteRoot?.url == null) linkRefStyle = 'root-relative'
         if (linkRefStyle === 'root-relative' && siteRoot?.path == null) linkRefStyle = 'relative'
         assemblyModel.linkReferenceStyle = linkRefStyle
-      } else {
+      } else if (assemblyModel.filetype !== 'pdf') {
         assemblyModel.linkReferenceStyle = 'absolute'
       }
       const auxiliaryImages = new Set()

package/package.json

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