mikser-io 6.21.3 → 6.21.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mikser-io",
-	"version": "6.21.3",
+	"version": "6.21.4",
 	"description": "<p align=\"center\">   <img src=\"mikser-lockup-stacked.svg\" alt=\"mikser\" width=\"198\" /> </p>",
 	"main": "index.js",
 	"scripts": {

package/src/engine.js

@@ -316,11 +316,31 @@ export async function setup(options) {
         for await (const { entity, options, context, output } of useJournal('Queuing postprocess', [OPERATION.RENDER], signal)) {
             if (output?.success && options.postprocessor) {
                 const ext = await resolveOutputExt(options.postprocessor)
+                let destination = changeExtension(entity.destination, ext)
+
+                // cleanUrls renders a non-index page `foo` to
+                // `foo/index.html` so the served URL is `/foo/`. A
+                // postprocessor that emits a *different* file type (e.g.
+                // PDF) shouldn't inherit that clean-URL folder — a
+                // downloadable artifact wants to be `foo.pdf`, not
+                // `foo/index.pdf`. Collapse the `/index` segment when the
+                // produced extension differs from the rendered page's.
+                // Genuine index documents (name ends in `index`) keep
+                // their path.
+                const originExt = path.extname(entity.destination).slice(1)
+                const isCleanUrlPage =
+                    runtime.config.layouts?.cleanUrls &&
+                    !_.endsWith(entity.name, 'index') &&
+                    path.basename(entity.destination, path.extname(entity.destination)) === 'index'
+                if (ext !== originExt && isCleanUrlPage) {
+                    destination = `${path.dirname(entity.destination)}.${ext}`
+                }
+
                 tasks.push({
                     entity: {
                         ...entity,
                         origin: entity.destination,
-                        destination: changeExtension(entity.destination, ext)
+                        destination
                     },
                     options: { postprocessor: options.postprocessor, tasks: options.tasks },
                     context

package/src/plugins/layouts.js

@@ -1,5 +1,5 @@
 import path from 'node:path'
-import { mkdir, writeFile, unlink } from 'node:fs/promises'
+import { mkdir, writeFile, unlink, rmdir } from 'node:fs/promises'
 import { existsSync } from 'node:fs'
 import { globby } from 'globby'
 import _ from 'lodash'
@@ -405,6 +405,15 @@ export default ({
                 try {
                     await unlink(originFile)
                 } catch { }
+                // With cleanUrls the origin was `<name>/index.html`; once
+                // the postprocessor wrote `<name>.<ext>` elsewhere, that
+                // folder is left empty. Remove it if so. rmdir only
+                // succeeds on an empty directory, so this is a no-op when
+                // the folder still holds other outputs (e.g. paginated
+                // pages).
+                try {
+                    await rmdir(path.dirname(originFile))
+                } catch { }
             }
         }
     })