@antora/assembler 1.0.0-beta.10 → 1.0.0-beta.11

package/lib/assemble-content.js

@@ -267,10 +267,15 @@ function resolveFileOrContents (convertResult, convertAttributes, buildConfig, l
           if (entry.name) ctx.program = entry.name
           if (entry.file?.line) ctx.line = entry.file.line
           logger[entry.level](ctx, entry.msg)
-        } else if ((match = /^(.+):(\d+): warning: (.+)/.exec(line))) {
+        } else if ((match = /^([^:]+):(\d+): warning: (.+)/.exec(line))) {
           const [, scriptPath, lineno, msg] = match
           ctx.stack = [{ file: { path: scriptPath }, line: parseInt(lineno, 10) }]
           logger.warn(ctx, msg)
+        } else if ((match = /^asciidoctor: ([A-Z]+): (?:[^:]+: line (\d+): )?(.+)/.exec(line))) {
+          // NOTE we don't care about the filename in the message since it can only be docfile
+          const [, level, lineno, msg] = match
+          if (lineno) ctx.line = parseInt(lineno, 10)
+          logger[level === 'WARNING' ? 'warn' : level.toLowerCase()](ctx, msg)
         } else {
           logger.info(ctx, line)
         }

package/lib/load-config.js

@@ -78,7 +78,8 @@ function loadConfig (playbook, configSource = './antora-assembler.yml') {
       throw new Error('Not implemented')
     }
     build.dir &&= expandPath(build.dir, { dot: playbook.dir })
-    build.cwd = playbook.dir // use playbook.dir for finding and loading require scripts
+    // used as cwd of command (and any scripts it requires)
+    build.cwd = build.cwd == null ? playbook.dir : expandPath(build.cwd, { dot: playbook.dir })
     if (!('clean' in build) && 'output' in playbook) build.clean = playbook.output.clean
     if (!('publish' in build)) build.publish = true
     if ('keepAggregateSource' in build) {

package/lib/produce-assembly-file.js

@@ -406,7 +406,6 @@ function mergeAsciiDoc (
             return m
           }
           if (fragment === resource.asciidoc.id) fragment = ''
-          const refid = generateId(resource.src, componentVersion, idCoordinateSeparator, idScopeSeparator, fragment).id
           if (
             text &&
             (assemblyModel.dropExplicitXrefText === 'always' ||
@@ -414,6 +413,14 @@ function mergeAsciiDoc (
           ) {
             text = ''
           }
+          const refid = generateId(
+            resource.src,
+            componentVersion,
+            idCoordinateSeparator,
+            idScopeSeparator,
+            text.length > 0,
+            fragment
+          ).id
           return `xref:${refid}[${text}]`
         })
       }
@@ -566,7 +573,7 @@ function mergeAsciiDoc (
         const resource = files.find((it) => it.pub.url === url)
         if (resource) {
           if (resource.src.family === 'page' && pagesInOutline.has(resource.pub.url)) {
-            const refid = generateId(resource.src, componentVersion, idCoordinateSeparator, idScopeSeparator).id
+            const refid = generateId(resource.src, componentVersion, idCoordinateSeparator, idScopeSeparator, true).id
             sectionTitle = `xref:${refid}[${navtitleAsciiDoc.replace(/\]/g, '\\]')}]`
           } else if (siteRoot) {
             sectionTitle = `${resolveLinkTarget(resource, siteRoot, pubRoot, linkRefStyle)}[${navtitleAsciiDoc.replace(/\]/g, '\\]')}]`
@@ -807,11 +814,13 @@ function createResourceKey ({ component, version, module: mod, family, relative
   return `${version}@${component}:${mod === 'ROOT' ? '' : mod}:${family === 'page' ? '' : family + '$'}${relative}`
 }
 
-function generateId ({ component, module: mod, relative }, componentVersion, coordinateSep, scopeSep, fragment) {
+function generateId (componentSrc, componentVersion, coordinateSep, scopeSep, escapePass, fragment) {
+  let { component, module: mod, relative } = componentSrc
   let id = relative.replace(/\.adoc$/, '').replace(/[/.]/g, '-')
   if (component !== componentVersion.name) {
     id = [component, mod === 'ROOT' ? '' : mod, id].join(coordinateSep)
   } else if (mod !== 'ROOT') {
+    if (escapePass && coordinateSep === ':' && /(?:pass|stem)$/.test(mod)) mod = mod.replace(/(?:pass|stem)$/, '\\$&')
     id = mod + coordinateSep + id
   } else if (ReservedIdNames.includes(id)) {
     id += scopeSep

package/package.json

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