@antora/assembler 1.0.0-beta.9 → 1.0.0-rc.10

package/lib/filter-component-versions.js

@@ -1,71 +1,34 @@
 'use strict'
 
-const { compile: bracesToGroup } = require('braces')
-const { makeRe: makePicomatchRx } = require('picomatch')
+const { filterCollection, compilePattern } = require('./util/matcher')
 
-const PICOMATCH_OPTS = {
-  bash: true,
-  expandRange: (begin, end, step, opts) => bracesToGroup(opts ? `{${begin}..${end}..${step}}` : `{${begin}..${end}}`),
-  fastpaths: false,
-  nobracket: true,
-  noglobstar: true,
-  nonegate: true,
-  noquantifiers: true,
-  regex: false,
-  strictSlashes: true,
-}
-
-const VERSION_SEPARATOR_RX = /@(?!\()/
-
-function compilePatterns (patterns) {
-  if (patterns[0].charAt() === '!') patterns = ['**', ...patterns]
-  return patterns.map((pattern) => {
-    const negated = pattern.charAt() === '!'
-    if (negated) pattern = pattern.slice(1)
-    let version
-    const separatorIdx = pattern.search(VERSION_SEPARATOR_RX)
-    if (~separatorIdx) {
-      pattern = (version = true) && `${pattern.slice(0, separatorIdx)}%${pattern.slice(separatorIdx + 1) || '*'}`
-    }
-    return Object.assign(makePicomatchRx(pattern, PICOMATCH_OPTS), {
-      globstar: pattern === '**',
-      negated,
-      star: pattern === '*',
-      version,
-    })
-  })
-}
+const VERSION_SEPARATOR_RX = /@(?!\()(?=(\w)?)/g
+const US = '\x1f'
 
-function filterComponentVersions (components, patterns) {
+function filterComponentVersions ({ names: patterns, prereleases = true }, components) {
   if (!patterns.length) return []
-  const rxs = compilePatterns(patterns)
-  return components.reduce((accum, { latest, versions }) => {
-    accum.push(
-      ...versions.filter((version) => {
-        let matched
-        for (const rx of rxs) {
-          let voteIfMatched
-          if (matched) {
-            if (rx.negated) voteIfMatched = false
-          } else if (!rx.negated) {
-            voteIfMatched = true
-          }
-          if (voteIfMatched == null) continue
-          if (rx.globstar) {
-            matched = voteIfMatched
-          } else if (rx.star) {
-            if (version === latest) matched = voteIfMatched
-          } else if (rx.version) {
-            if (rx.test(`${version.version}%${version.name}`)) matched = voteIfMatched
-          } else if (version === latest && rx.test(version.name)) {
-            matched = voteIfMatched
-          }
-        }
-        return matched
-      })
-    )
+  const candidateMap = components.reduce((accum, { name: componentName, latest, versions }) => {
+    for (const version of versions) {
+      if (!prereleases && version.prerelease && version !== latest) continue
+      accum[`${version.version}${US}${componentName}`] = { componentName, latest: version === latest, value: version }
+    }
     return accum
-  }, [])
+  }, {})
+  if (patterns[0].charAt() === '!') patterns = ['**', ...patterns]
+  const result = filterCollection(Object.keys(candidateMap), patterns, {
+    compilePattern: new Proxy(compilePattern, {
+      apply: (target, self, [pattern]) => {
+        if (~pattern.indexOf('@')) pattern = pattern.replace(VERSION_SEPARATOR_RX, (_, c) => US + (c ? '' : '*'))
+        return target.call(self, pattern)
+      },
+    }),
+    test: (rx, candidate) => {
+      if (rx.globstar) return true
+      if (rx.star) return candidateMap[candidate].latest
+      return rx.test(candidate) || (candidateMap[candidate].latest && rx.test(candidateMap[candidate].componentName))
+    },
+  })
+  return result.map((it) => candidateMap[it].value)
 }
 
 module.exports = filterComponentVersions

package/lib/index.js

@@ -3,4 +3,4 @@
 const assembleContent = require('./assemble-content')
 const configure = require('./configure')
 
-module.exports = { assembleContent, configure, configureAssembler: configure }
+module.exports = { assembleContent, configure }

package/lib/load-config.js

@@ -1,45 +1,50 @@
 'use strict'
 
+const deepClone = require('./util/deep-clone')
 const expandPath = require('@antora/expand-path-helper')
 const fsp = require('node:fs/promises')
 const os = require('node:os')
+const ospath = require('node:path')
 const yaml = require('js-yaml')
 
-const ASSEMBLY_KEYS = [
-  'rootLevel',
-  'insertStartPage',
-  'sectionMergeStrategy',
-  'linkReferenceStyle',
-  'dropExplicitXrefText',
-]
+const { CAMEL_CASE_STOP_KEYS, LEGACY_ASSEMBLY_KEYS } = require('./constants')
+const PACKAGE_NAME = require('../package.json').name
+const YAML_SCHEMA = yaml.CORE_SCHEMA.withTags(yaml.mergeTag)
 
-function loadConfig (playbook, configSource = './antora-assembler.yml') {
+function loadConfig (configSource, playbook, preferredQualifier = '') {
+  let resolvedConfigSource
   return (
-    configSource.constructor === Object
-      ? Promise.resolve(configSource)
-      : fsp
-          .access((configSource = expandPath(configSource, { dot: playbook.dir })))
-          .then(
-            () => true,
-            () => false
-          )
-          .then((exists) =>
-            exists
-              ? fsp
-                  .readFile(configSource)
-                  .then((data) => Object.assign(camelCaseKeys(yaml.load(data), ['asciidoc']), { file: configSource }))
-              : {}
-          )
+    configSource?.constructor === Object
+      ? Promise.resolve(deepClone(configSource))
+      : fileExists(
+          (resolvedConfigSource = expandPath(configSource ?? `./antora-assembler${preferredQualifier}.yml`, {
+            dot: playbook.dir,
+          }))
+        )
+          .then((exists) => {
+            if (exists || configSource || !preferredQualifier) return exists
+            return fileExists(
+              (resolvedConfigSource =
+                resolvedConfigSource.substring(0, resolvedConfigSource.length - 4 - preferredQualifier.length) + '.yml')
+            )
+          })
+          .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, { schema: YAML_SCHEMA }), CAMEL_CASE_STOP_KEYS), {
+                file: resolvedConfigSource,
+              })
+            )
+          })
   ).then((config) => {
-    if (config.enabled === false) return undefined
-    let asciidocAttrs
-    if (!config.asciidoc) {
-      config.asciidoc = { attributes: (asciidocAttrs = {}) }
-    } else if (!(asciidocAttrs = config.asciidoc.attributes)) {
-      config.asciidoc.attributes = asciidocAttrs = {}
-    }
-    if (!('revdate' in asciidocAttrs)) asciidocAttrs.revdate = getLocalDate()
-    asciidocAttrs['page-partial'] = null
+    if (config.enabled === false) return config
     const remapComponentVersionsKey = !('componentVersionFilter' in config)
     const componentVersionFilter = (config.componentVersionFilter ??= {})
     if (remapComponentVersionsKey && 'componentVersions' in config) {
@@ -48,20 +53,36 @@ function loadConfig (playbook, configSource = './antora-assembler.yml') {
     }
     if (componentVersionFilter.names == null) {
       componentVersionFilter.names = ['*']
-    } else if (typeof componentVersionFilter.names === 'string') {
+    } else if (componentVersionFilter.names.constructor === String) {
       componentVersionFilter.names = componentVersionFilter.names.split(', ')
     }
     const remapAssemblyKeys = !('assembly' in config)
     const assembly = (config.assembly ??= {})
     if (remapAssemblyKeys) {
-      for (const key of ASSEMBLY_KEYS) {
+      for (const key of LEGACY_ASSEMBLY_KEYS) {
         if (!(key in config)) continue
         assembly[key] = config[key]
         delete config[key]
       }
     }
-    if (!('doctype' in assembly)) assembly.doctype = 'doctype' in asciidocAttrs ? asciidocAttrs.doctype : 'book'
-    delete asciidocAttrs.doctype
+    let assemblyAttrs
+    if ('attributes' in assembly) {
+      assemblyAttrs = assembly.attributes ??= {}
+      if ('asciidoc' in config) delete config.asciidoc
+    } else if ('asciidoc' in config) {
+      assemblyAttrs = assembly.attributes = config.asciidoc?.attributes ?? {}
+      delete config.asciidoc
+    } else {
+      assemblyAttrs = assembly.attributes = {}
+    }
+    assemblyAttrs['page-partial'] = null
+    config.asciidoc = Object.defineProperty({}, 'attributes', {
+      get: function () {
+        return this.assembly.attributes
+      }.bind(config),
+    })
+    if (!('doctype' in assembly)) assembly.doctype = 'doctype' in assemblyAttrs ? assemblyAttrs.doctype : 'book'
+    delete assemblyAttrs.doctype
     if (!('rootLevel' in assembly)) assembly.rootLevel = 0
     if (!('insertStartPage' in assembly)) assembly.insertStartPage = true
     if (['discrete', 'fuse', 'enclose'].indexOf(assembly.sectionMergeStrategy) < 0) {
@@ -73,12 +94,25 @@ function loadConfig (playbook, configSource = './antora-assembler.yml') {
     if (['always', 'if-redundant', 'never'].indexOf(assembly.dropExplicitXrefText) < 0) {
       assembly.dropExplicitXrefText = 'never'
     }
+    assembly.revdate = getLocalDate()
     const build = (config.build ??= {})
-    if (build.dir === '$' + '{playbook.output.dir}') {
-      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 })
+    const command = build.command
+    if (command) {
+      if (command.constructor !== String) {
+        build.command = String(command)
+      } else if (~command.indexOf('$')) {
+        const vars = {
+          $NODE: process.execPath,
+          $NPM: ospath.join(process.execPath, '../npm'),
+          $NPX: ospath.join(process.execPath, '../npx'),
+          $PWD: build.cwd,
+        }
+        build.command = build.command.replace(/^\$(?:NODE|NP[MX])(?= )|\$PWD\b/g, (ref) => vars[ref])
+      }
+    }
     if (!('clean' in build) && 'output' in playbook) build.clean = playbook.output.clean
     if (!('publish' in build)) build.publish = true
     if ('keepAggregateSource' in build) {
@@ -100,18 +134,25 @@ function loadConfig (playbook, configSource = './antora-assembler.yml') {
   })
 }
 
-function camelCaseKeys (o, stopPaths = [], p = undefined) {
+function camelCaseKeys (o, stopPaths, p = undefined) {
   if (Array.isArray(o)) return o.map((it) => camelCaseKeys(it, stopPaths, p))
   if (o == null || o.constructor !== Object) return o
   const pathPrefix = p ? p + '.' : ''
   const accum = {}
   for (const [k, v] of Object.entries(o)) {
-    const camelKey = k.charAt() + k.slice(1).replace(/_([a-z])/g, (_, l) => l.toUpperCase())
-    accum[camelKey] = ~stopPaths.indexOf(pathPrefix + camelKey) ? v : camelCaseKeys(v, stopPaths, pathPrefix + camelKey)
+    const camelKey = k.charAt() + k.substring(1).replace(/_([a-z])/g, (_, l) => l.toUpperCase())
+    accum[camelKey] = stopPaths.includes(pathPrefix + camelKey) ? v : camelCaseKeys(v, stopPaths, pathPrefix + camelKey)
   }
   return accum
 }
 
+function fileExists (path) {
+  return fsp.access(path).then(
+    () => true,
+    () => false
+  )
+}
+
 function getLocalDate (now = new Date()) {
   return new Date(now - now.getTimezoneOffset() * 60000).toISOString().split('T')[0]
 }

package/lib/log-command.js

@@ -0,0 +1,18 @@
+'use strict'
+
+function logCommand (logger, command, extraArgsOrAttributeOptionFlag, file, attributes) {
+  if (!logger?.isLevelEnabled('debug')) return
+  const args = (
+    Array.isArray(extraArgsOrAttributeOptionFlag)
+      ? extraArgsOrAttributeOptionFlag
+      : extraArgsOrAttributeOptionFlag
+        ? attributes.toArgs(extraArgsOrAttributeOptionFlag)
+        : []
+  ).map((it) => (~it.indexOf(' ') ? `'${it}'` : it))
+  const ctx = { command: [command].concat(args).join(' '), file: file.src }
+  const msg = `Running external command to export assembly in %s to %s: %s`
+  const componentVersionStr = file.src.version ? `${file.src.version}@${file.src.component}` : file.src.component
+  logger.debug(ctx, msg, componentVersionStr, attributes['assembler-filetype'], file.src.relative)
+}
+
+module.exports = logCommand