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

package/lib/produce-aggregate-document.js

@@ -105,7 +105,7 @@ function aggregateAsciiDoc (
     page = new page.constructor(Object.assign({}, page, { contents, mediaType: 'text/asciidoc' }))
     const { module: module_, relative, origin } = page.src
     const doc = loadAsciiDoc(page, contentCatalog, asciidocConfig)
-    const ids = doc.getCatalog().ids
+    const refs = doc.getCatalog().refs
     // NOTE: in Antora, docname is relative src path from module without file extension
     const docname = doc.getAttribute('docname')
     //const idprefix = `${module_ === 'ROOT' ? '' : module_ + ':'}${docname}//`
@@ -206,11 +206,9 @@ function aggregateAsciiDoc (
       let line = lines[idx]
       if (~line.indexOf('<<')) {
         line = line.replace(/(?<![\\+])<<#?([\p{Alpha}0-9_/.:{][^>,]*?)(?:|, *([^>]+?))?>>/gu, (m, refid, text) => {
-          // support natural xref; note this logic will change when upgrading to Asciidoctor 2
-          if (!ids['$key?'](refid) && (~refid.indexOf(' ') || refid.toLowerCase() !== refid)) {
-            if (!(refid = doc.getCatalog().ids.$key(refid).$to_s())) {
-              return m
-            }
+          // support natural xref
+          if (!refs['$key?'](refid) && (~refid.indexOf(' ') || refid.toLowerCase() !== refid)) {
+            if ((refid = doc.$resolve_id(refid))['$nil?']()) return m
           }
           return `<<${idprefix}${refid}${text ? ',' + text : ''}>>`
         })
@@ -221,21 +219,26 @@ function aggregateAsciiDoc (
       }
       if (~line.indexOf('xref:')) {
         // Q: should we allow : as first character of target?
-        line = line.replace(/xref:([\p{Alpha}#/.{].*?)\[(|.*?[^\\])\]/gu, (m, target, text) => {
+        line = line.replace(/xref:([\p{Alpha}0-9_/.{#].*?)\[(|.*?[^\\])\]/gu, (m, target, text) => {
           let pagePart, fragment, targetPage
           const hashIdx = target.indexOf('#')
           if (~hashIdx) {
             pagePart = target.substr(0, hashIdx)
             fragment = target.substr(hashIdx + 1)
             // TODO: for now, assume .adoc; in the future, consider other file extensions
-            if (!(pagePart && pagePart.endsWith('.adoc'))) pagePart += '.adoc'
+            if (pagePart && !pagePart.endsWith('.adoc')) pagePart += '.adoc'
           } else if (target.endsWith('.adoc')) {
             pagePart = target
             fragment = ''
           } else {
             fragment = target
           }
-          if (!pagePart) return `<<${idprefix}${fragment}${text ? ',' + text.replace(/\\]/g, ']') : ''}>>`
+          if (!pagePart) {
+            // Q: should we validate the internal ID here?
+            return text && ~text.indexOf('=')
+              ? `xref:${idprefix}${fragment}[${text}]`
+              : `<<${idprefix}${fragment}${text ? ',' + text.replace(/\\]/g, ']') : ''}>>`
+          }
           if (~pagePart.indexOf('@') || /:.*:/.test(pagePart)) {
             // TODO: handle unresolved page better
             return siteUrl && (targetPage = contentCatalog.resolvePage(pagePart, page.src))
@@ -324,8 +327,7 @@ function aggregateAsciiDoc (
           ).lastIndexOf('image::')
           if (imageMacroOffset > 0) {
             if (
-              block.getParent().getContext() === 'document' &&
-              block.getParent().isNested() &&
+              block.getDocument().isNested() &&
               (prefix = line.substr(0, imageMacroOffset)).trimRight().endsWith('|')
             ) {
               line = line.substr(prefix.length)

package/lib/util/lazy-readable.js

@@ -6,9 +6,8 @@ const { PassThrough } = require('stream')
 class LazyReadable extends PassThrough {
   constructor (fn, options) {
     super(options)
-    const _read = this._read
     this._read = function () {
-      this._read = _read.bind(this)
+      delete this._read // restores original method
       fn.call(this, options).on('error', this.emit.bind(this, 'error')).pipe(this)
       return this._read.apply(this, arguments)
     }

package/lib/util/run-command.js

@@ -43,11 +43,15 @@ async function runCommand (cmd, argv = [], opts = {}) {
     ps.on('error', (err) => reject(err.code === 'ENOENT' ? new Error(`Command not found: ${cmdv.join(' ')}`) : err))
     ps.stdout.on('data', (data) => (output ? process.stdout.write(data) : stdout.push(data)))
     ps.stderr.on('data', (data) => stderr.push(data))
-    try {
-      input instanceof Buffer ? ps.stdin.end(input) : ps.stdin.end()
-    } catch (err) {
-      reject(err)
-    } finally {
+    if (input instanceof Buffer) {
+      try {
+        ps.stdin.on('error', () => undefined)
+        ps.stdin.end(input)
+      } catch (err) {
+        if (!ps.stdin.writableEnded) ps.stdin.end()
+        reject(err)
+      }
+    } else {
       ps.stdin.end()
     }
   })

package/package.json

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