resolve globs in template-partials

Author: cscheid

news/changelog-1.1.md

@@ -93,3 +93,7 @@
 - `QUARTO_PRINT_STACK` environment variable to print stack along with error messages
 - More compact download progress when installing Quarto tools in CI environments
 - Ignore case when loading date local files from `lang`
+
+## Format Templates
+
+- expand globs in template-partials (#1248)

src/command/render/pandoc.ts

@@ -429,7 +429,7 @@ export async function runPandoc(
       allDefaults[kTemplate];
 
     // The user partials (if any)
-    const userPartials = readPartials(options.format.metadata);
+    const userPartials = readPartials(options.format.metadata, cwd);
     const inputDir = Deno.realPathSync(cwd);
     const resolvePath = (path: string) => {
       if (isAbsolute(path)) {
@@ -484,11 +484,7 @@ export async function runPandoc(
 
       // Place any user partials at the end of the list of partials
       const partials: string[] = templateContext.partials || [];
-      partials.push(
-        ...userPartials.map((path) => {
-          return resolvePath(path);
-        }),
-      );
+      partials.push(...userPartials);
 
       // Stage the template and partials
       const stagedTemplate = await stageTemplate(

src/command/render/template.ts

@@ -4,7 +4,7 @@
 * Copyright (C) 2020 by RStudio, PBC
 *
 */
-import { basename, join } from "path/mod.ts";
+import { basename, isAbsolute, join } from "path/mod.ts";
 import {
   kEmbedResources,
   kHtmlMathMethod,
@@ -22,15 +22,39 @@ import { copyTo } from "../../core/copy.ts";
 import { PandocOptions, RenderFlags } from "./types.ts";
 import * as ld from "../../core/lodash.ts";
 import { isHtmlDocOutput, isRevealjsOutput } from "../../config/format.ts";
+import { expandGlobSync } from "fs/mod.ts";
 
 export const kPatchedTemplateExt = ".patched";
 export const kTemplatePartials = "template-partials";
 
-export function readPartials(metadata: Metadata) {
+/**
+ * read and expand template partial globs
+ *
+ * @param metadata
+ * @param cwd current working directory for glob expansion
+ */
+export function readPartials(metadata: Metadata, inputDir?: string) {
   if (typeof (metadata?.[kTemplatePartials]) === "string") {
     metadata[kTemplatePartials] = [metadata[kTemplatePartials]];
   }
-  return (metadata?.[kTemplatePartials] || []) as string[];
+  const result = (metadata?.[kTemplatePartials] || []) as string[];
+
+  inputDir = inputDir ? Deno.realPathSync(inputDir) : undefined;
+  const resolvePath = (path: string) => {
+    if (!inputDir || isAbsolute(path)) {
+      return path;
+    } else {
+      return join(inputDir, path);
+    }
+  };
+
+  return result.flatMap((path) => {
+    const result = [];
+    for (const walk of expandGlobSync(resolvePath(path))) {
+      result.push(walk.path);
+    }
+    return result;
+  });
 }
 
 export async function stageTemplate(

src/format/ipynb/format-ipynb.ts

@@ -5,7 +5,7 @@
 *
 */
 
-import { basename, join } from "path/mod.ts";
+import { basename, dirname, join } from "path/mod.ts";
 import { readPartials } from "../../command/render/template.ts";
 import {
   kCellFormat,
@@ -31,7 +31,7 @@ export function ipynbFormat(): Format {
       [kDefaultImageExtension]: "png",
     },
     formatExtras: (
-      _input: string,
+      input: string,
       _markdown: string,
       _flags: PandocFlags,
       format: Format,
@@ -46,7 +46,7 @@ export function ipynbFormat(): Format {
           join("templates", "title-block.md"),
         );
 
-        const partials = readPartials(format.metadata);
+        const partials = readPartials(format.metadata, dirname(input));
         if (partials.length > 0) {
           const userTitleTemplate = partials.find((part) => {
             return basename(part) === "title-block.md";