Support multiple scan dirs { run: , scan [ { dir: }, { dir: } ] }

rwinch · rwinch · commit 0936b238d091 · 2026-03-19T11:09:18.000-04:00
Closes gh-57
diff --git a/lib/inject-collector-cache-config-extension.js b/lib/inject-collector-cache-config-extension.js
@@ -73,13 +73,17 @@ module.exports.register = function ({ playbook, config = {} }) {
             const normalizedCollectorConfig = Array.isArray(collectorConfig) ? collectorConfig : [collectorConfig]
             origin.descriptor.ext.collector = cachedConfig
             normalizedCollectorConfig.forEach((collector) => {
-              const { scan: scanConfig = [] } = collector
-              // cache the output of the build
-              const scanDir = expandPath(scanConfig.dir, expandPathContext)
-              logger.info(`Configuring collector to cache '${scanDir}' at '${cacheDir}'`)
-              const cachedCollectorConfig = createCachedCollectorConfig(scanDir, cacheDir)
               cachedConfig.push(collector)
-              cachedConfig.push.apply(cachedConfig, cachedCollectorConfig)
+              const { scan: scanConfig = [] } = collector
+              const normalizedScanConfigs = Array.isArray(scanConfig) ? scanConfig : [scanConfig]
+              normalizedScanConfigs.forEach((normalizedScanConfig) => {
+                // cache the output of the build
+                const scanDirExpandedPath = expandPath(normalizedScanConfig.dir, expandPathContext)
+                logger.info(`Configuring collector to cache '${scanDirExpandedPath}' at '${cacheDir}'`)
+                const cachedCollectorConfig = createCachedCollectorConfig(scanDirExpandedPath, cacheDir)
+
+                cachedConfig.push.apply(cachedConfig, cachedCollectorConfig)
+              })
             })
             // add the zip of cache to be published
             zipInfo.push({ cacheDir, zipCacheFile })
diff --git a/test/inject-collector-cache-config-extension-test.js b/test/inject-collector-cache-config-extension-test.js
@@ -200,7 +200,7 @@ describe('inject-collector-cache-config-extension', () => {
       expect(fs.existsSync(zipFileName)).to.eql(true)
     })
 
-    it('cache not found multiple scans', async () => {
+    it('cache not with multiple scan [{ scan: { dir: }, { scan: dir: } ]', async () => {
       const tag = createTag('1.0.0')
       tag.origins[0].refhash = tag.origins[0].refhash.split('').reverse().join('')
       // make multiple scan dirs
@@ -255,6 +255,63 @@ describe('inject-collector-cache-config-extension', () => {
       await generatorContext.beforePublish()
       expect(fs.existsSync(zipFileName)).to.eql(true)
     })
+
+    it('cache not found with multiple scan dirs { run: , scan [ { dir: }, { dir: } ] }', async () => {
+      const tag = createTag('1.0.0')
+      tag.origins[0].refhash = tag.origins[0].refhash.split('').reverse().join('')
+      // make multiple scan dirs
+      tag.origins[0].descriptor = {
+        ext: {
+          collector: [
+            {
+              run: { command: './mvnw -B validate process-resources dependency:unpack -am -Pantora-process-resources' },
+              scan: [{ dir: 'target/classes/antora-resources/' }, { dir: 'target/antora/' }],
+            },
+          ],
+        },
+      }
+      contentAggregate = [tag]
+      ext.register.call(generatorContext, { playbook })
+      await generatorContext.contentAggregated({ playbook, contentAggregate })
+      expect(fs.existsSync(ospath.join(cacheDir, 'collector-cache/spring-security'))).to.equal(true)
+      const actual = contentAggregate[0].origins[0].descriptor.ext
+      const scan = ospath.join(cacheDir, 'collector/spring-security/target/classes/antora-resources')
+      const scan2 = ospath.join(cacheDir, 'collector/spring-security/target/antora')
+      const cache = ospath.join(cacheDir, 'collector-cache/spring-security/2c4fb2f-1.0.0')
+      const zipFileName = ospath.join(
+        playbookDir,
+        'build/antora/inject-collector-cache-config-extension/.cache/2c4fb2f-1.0.0.zip'
+      )
+      const expected = {
+        collector: [
+          {
+            run: {
+              command: './mvnw -B validate process-resources dependency:unpack -am -Pantora-process-resources',
+            },
+            scan: [{ dir: 'target/classes/antora-resources/' }, { dir: 'target/antora/' }],
+          },
+          {
+            run: {
+              command: `node '${resolvedCacheScanDirIndexJs}' '${scan}' '${cache}'`,
+            },
+          },
+          {
+            run: {
+              command: `node '${resolvedCacheScanDirIndexJs}' '${scan2}' '${cache}'`,
+            },
+          },
+        ],
+      }
+      expect(actual).to.eql(expected)
+      expect(generatorContext.messages).to.eql([
+        `Unable to restore cache from ${httpServerUrl}/.cache/2c4fb2f-1.0.0.zip`,
+        `Configuring collector to cache '${scan}' at '${cache}'`,
+        `Configuring collector to cache '${scan2}' at '${cache}'`,
+      ])
+      expect(fs.existsSync(zipFileName)).to.eql(false)
+      await generatorContext.beforePublish()
+      expect(fs.existsSync(zipFileName)).to.eql(true)
+    })
     it('cache downloaded', async () => {
       const zipFileName = ospath.join(
         playbookDir,
