Place single file book outputs in subdirectories

- goes to: `_book/book-<format>`
- Also ensure that download links for books use the format output directory

Author: dragonstyle

src/format/asciidoc/format-asciidoc.ts

@@ -72,7 +72,7 @@ export function asciidocFormat(): Format {
   );
 }
 
-const kFormatOutputDir = "asciidoc";
+const kFormatOutputDir = "book-asciidoc";
 const kAsciidocDocType = "asciidoc-doctype";
 
 // Ref target marks the refs div so the post process can inject the bibliography
@@ -85,7 +85,7 @@ const kUseAsciidocNativeCites = "use-asciidoc-native-cites";
 // This provide book specific behavior for producing asciidoc books
 const asciidocBookExtension = {
   multiFile: true,
-  formatOutputDirectory(_format: Format) {
+  formatOutputDirectory() {
     return kFormatOutputDir;
   },
   filterParams: (_options: PandocOptions) => {

src/format/docx/format-docx.ts

@@ -33,7 +33,11 @@ export function docxFormat(): Format {
         };
       },
       extensions: {
-        book: {},
+        book: {
+          formatOutputDirectory: () => {
+            return "book-docx";
+          },
+        },
       },
     },
   );

src/format/epub/format-epub.ts

@@ -30,6 +30,9 @@ export function epubFormat(): Format {
 }
 
 const epubBookExtension: BookExtension = {
+  formatOutputDirectory: () => {
+    return "book-epub";
+  },
   onSingleFilePreRender: (format: Format, config?: ProjectConfig): Format => {
     // derive epub-cover-image from cover-image if not explicitly specified
     if (!format.pandoc[kEPubCoverImage] && !format.metadata[kBookCoverImage]) {

src/format/pdf/format-pdf.ts

@@ -265,6 +265,10 @@ function createPdfFormat(
 }
 
 const pdfBookExtension: BookExtension = {
+  formatOutputDirectory: () => { 
+    return "book-pdf";
+  },
+
   onSingleFilePostRender: (
     project: ProjectContext,
     renderedFile: RenderedFile,

src/project/types/book/book-config.ts

@@ -10,7 +10,11 @@ import { basename, join } from "path/mod.ts";
 
 import * as ld from "../../../core/lodash.ts";
 
-import { ensureTrailingSlash, safeExistsSync } from "../../../core/path.ts";
+import {
+  ensureTrailingSlash,
+  pathWithForwardSlashes,
+  safeExistsSync,
+} from "../../../core/path.ts";
 import { FormatLanguage, Metadata } from "../../../config/types.ts";
 
 import {
@@ -90,6 +94,7 @@ import {
   NavigationItemObject,
   PageFooterRegion,
 } from "../../../resources/types/schema-types.ts";
+import { projectType } from "../project-types.ts";
 
 export const kBookChapters = "chapters";
 export const kBookAppendix = "appendices";
@@ -455,7 +460,7 @@ function downloadTools(
   config: ProjectConfig,
 ): SidebarTool[] | undefined {
   // Filter the user actions to the set that are single file books
-  const downloadActions = websiteConfigActions("downloads", kBook, config);
+  const downloadActions = websiteConfigActions(kBookDownloads, kBook, config);
   const filteredActions = downloadActions.filter((action) => {
     const format = defaultWriterFormat(action);
     if (format) {
@@ -467,19 +472,32 @@ function downloadTools(
 
   // Map the action into sidebar items
   const outputStem = bookOutputStem(projectDir, config);
+  const projType = projectType(config.project.type);
   const downloads = filteredActions.map((action) => {
     const format = defaultWriterFormat(action);
+    const outputDir = projType.formatOutputDirectory
+      ? projType.formatOutputDirectory(format) || ""
+      : "";
+
     const downloadItem = kDownloadableItems[action];
     if (downloadItem) {
       return {
         icon: downloadItem.icon,
         text: `Download ${downloadItem.name}`,
-        href: `/${outputStem}.${format.render[kOutputExt]}`,
+        href: pathWithForwardSlashes(join(
+          "/",
+          outputDir,
+          `/${outputStem}.${format.render[kOutputExt]}`,
+        )),
       };
     } else {
       return {
         text: `Download action}`,
-        href: `/${outputStem}.${format.render[kOutputExt]}`,
+        href: pathWithForwardSlashes(join(
+          "/",
+          outputDir,
+          `${outputStem}.${format.render[kOutputExt]}`,
+        )),
       };
     }
   });

src/project/types/book/book-shared.ts

@@ -44,7 +44,7 @@ export interface BookExtension {
 
   filterParams?: (options: PandocOptions) => Record<string, unknown>;
 
-  formatOutputDirectory?: (format: Format) => string;
+  formatOutputDirectory?: () => string;
 
   // book extensions can modify the format before render
   onSingleFilePreRender?: (format: Format, config?: ProjectConfig) => Format;

src/project/types/book/book.ts

@@ -118,7 +118,7 @@ export const bookProjectType: ProjectType = {
     if (format.extensions?.book) {
       const bookExt = format.extensions?.book as BookExtension;
       if (bookExt.formatOutputDirectory) {
-        return bookExt.formatOutputDirectory(format);
+        return bookExt.formatOutputDirectory();
       } else {
         return undefined;
       }