re-use RenderServices properly

Author: dragonstyle

src/command/render/filters.ts

@@ -512,8 +512,8 @@ async function quartoFilterParams(
 
 async function extensionShortcodes(options: PandocOptions) {
   const extensionShortcodes: string[] = [];
-  if (options.extension) {
-    const allExtensions = await options.extension?.extensions(
+  if (options.services.extension) {
+    const allExtensions = await options.services.extension?.extensions(
       options.source,
       options.project?.config,
       options.project?.dir,
@@ -681,7 +681,7 @@ async function resolveFilterExtension(
       typeof (filter) === "string" &&
       !existsSync(filter)
     ) {
-      let extensions = await options.extension?.find(
+      let extensions = await options.services.extension?.find(
         filter,
         options.source,
         "filters",

src/command/render/pandoc.ts

@@ -317,7 +317,7 @@ export async function runPandoc(
   const htmlPostprocessors: Array<HtmlPostProcessor> = [];
   const htmlFinalizers: Array<(doc: Document) => Promise<void>> = [];
   const htmlRenderAfterBody: string[] = [];
-  const dependenciesFile = options.temp.createFile();
+  const dependenciesFile = options.services.temp.createFile();
 
   if (
     sysFilters.length > 0 || options.format.formatExtras ||
@@ -329,7 +329,7 @@ export async function runPandoc(
         options.source,
         options.flags || {},
         options.format,
-        options.temp,
+        options.services,
       ))
       : {};
 
@@ -340,9 +340,8 @@ export async function runPandoc(
         options.flags || {},
         options.format,
         options.libDir,
-        options.temp,
+        options.services,
         options.offset,
-        options.extension,
         options.project,
       ))
       : {};
@@ -353,7 +352,7 @@ export async function runPandoc(
       options.format,
       cwd,
       options.libDir,
-      options.temp,
+      options.services.temp,
       dependenciesFile,
       options.project,
     );
@@ -619,7 +618,7 @@ export async function runPandoc(
     if (extras.html?.[kBodyEnvelope] && projectExtras.html?.[kBodyEnvelope]) {
       extras.html[kBodyEnvelope] = projectExtras.html[kBodyEnvelope];
     }
-    resolveBodyEnvelope(allDefaults, extras, options.temp);
+    resolveBodyEnvelope(allDefaults, extras, options.services.temp);
 
     // add any filters
     allDefaults.filters = [
@@ -694,10 +693,10 @@ export async function runPandoc(
   }
 
   // filter results json file
-  const filterResultsFile = options.temp.createFile();
+  const filterResultsFile = options.services.temp.createFile();
 
   // timing results json file
-  const timingResultsFile = options.temp.createFile();
+  const timingResultsFile = options.services.temp.createFile();
 
   if (allDefaults.to?.match(/[.]lua$/)) {
     formatFilterParams["custom-writer"] = allDefaults.to;
@@ -809,7 +808,10 @@ export async function runPandoc(
 
   // write the defaults file
   if (allDefaults) {
-    const defaultsFile = await writeDefaultsFile(allDefaults, options.temp);
+    const defaultsFile = await writeDefaultsFile(
+      allDefaults,
+      options.services.temp,
+    );
     cmd.push("--defaults", defaultsFile);
   }
 
@@ -933,7 +935,7 @@ export async function runPandoc(
     keepSourceBlock(options.format, options.source);
 
   // write input to temp file and pass it to pandoc
-  const inputTemp = options.temp.createFile({
+  const inputTemp = options.services.temp.createFile({
     prefix: "quarto-input",
     suffix: ".md",
   });
@@ -956,7 +958,7 @@ export async function runPandoc(
   // This gives the semantics we want, as our metadata is 'logically' at the top of the
   // file and subsequent blocks within the file should indeed override it (as should
   // user invocations of --metadata-file or -M, which are included below in pandocArgs)
-  const metadataTemp = options.temp.createFile({
+  const metadataTemp = options.services.temp.createFile({
     prefix: "quarto-metadata",
     suffix: ".yml",
   });

src/command/render/render.ts

@@ -148,9 +148,8 @@ export async function renderPandoc(
     format,
     project: context.project,
     args: recipe.args,
-    temp: context.options.services.temp,
+    services: context.options.services,
     metadata: executeResult.metadata,
-    extension: context.options.services.extension,
     quiet,
     flags: context.options.flags,
   };
@@ -437,8 +436,8 @@ async function runHtmlPostprocessors(
           {
             inputMetadata,
             inputTraits,
-            renderedFormats  
-          }
+            renderedFormats,
+          },
         );
 
         postProcessResult.resources.push(...result.resources);

src/command/render/template.ts

@@ -62,7 +62,7 @@ export async function stageTemplate(
   extras: FormatExtras,
   userContext?: FormatTemplateContext,
 ) {
-  const stagingDir = options.temp.createDir();
+  const stagingDir = options.services.temp.createDir();
   const template = "template.patched";
 
   const stageContext = (

src/command/render/types.ts

@@ -176,18 +176,15 @@ export interface PandocOptions {
   // command line args for pandoc
   args: string[];
 
-  // temp context
-  temp: TempContext;
+  // the render services
+  services: RenderServices;
 
   // extra metadata to merge
   metadata?: Metadata;
 
   // optoinal project context
   project?: ProjectContext;
 
-  // optional extension context
-  extension?: ExtensionContext;
-
   // quiet quarto pandoc informational output
   quiet?: boolean;
 

src/config/types.ts

@@ -198,7 +198,7 @@ import {
 } from "./constants.ts";
 
 import { TempContext } from "../core/temp-types.ts";
-import { HtmlPostProcessor } from "../command/render/types.ts";
+import { HtmlPostProcessor, RenderServices } from "../command/render/types.ts";
 import { QuartoFilterSpec } from "../command/render/filters.ts";
 import { ExtensionContext } from "../extension/extension-shared.ts";
 import { ProjectContext } from "../project/types.ts";
@@ -357,9 +357,8 @@ export interface Format {
     flags: PandocFlags,
     format: Format,
     libDir: string,
-    temp: TempContext,
+    services: RenderServices,
     offset?: string,
-    extensionContext?: ExtensionContext,
     project?: ProjectContext,
   ) => Promise<FormatExtras>;
   formatPreviewFile?: (

src/format/html/format-html-bootstrap.ts

@@ -59,6 +59,7 @@ import {
   HtmlPostProcessResult,
   PandocInputTraits,
   RenderedFormat,
+  RenderServices,
 } from "../../command/render/types.ts";
 import { processDocumentAppendix } from "./format-html-appendix.ts";
 import {
@@ -124,7 +125,7 @@ export function boostrapExtras(
   input: string,
   flags: PandocFlags,
   format: Format,
-  temp: TempContext,
+  services: RenderServices,
   offset?: string,
 ): FormatExtras {
   const toc = hasTableOfContents(flags, format);
@@ -175,7 +176,11 @@ export function boostrapExtras(
     sassLayers.push(titleSassLayer);
   }
   const includeInHeader: string[] = [];
-  const titleInclude = documentTitleIncludeInHeader(input, format, temp);
+  const titleInclude = documentTitleIncludeInHeader(
+    input,
+    format,
+    services.temp,
+  );
   if (titleInclude) {
     includeInHeader.push(titleInclude);
   }
@@ -206,6 +211,7 @@ export function boostrapExtras(
           input,
           format,
           flags,
+          services,
           offset,
         ),
       ],
@@ -227,6 +233,7 @@ function bootstrapHtmlPostprocessor(
   input: string,
   format: Format,
   flags: PandocFlags,
+  services: RenderServices,
   offset?: string,
 ): HtmlPostProcessor {
   return async (
@@ -327,7 +334,7 @@ function bootstrapHtmlPostprocessor(
 
     // Look for included / embedded notebooks and include those
     if (format.render[kNotebookLinks] !== false) {
-      await processNotebookEmbeds(input, doc, format, resources);
+      await processNotebookEmbeds(input, doc, format, resources, services);
     }
 
     // default treatment for computational tables

src/format/html/format-html-notebook.ts

@@ -26,7 +26,7 @@ import {
   HtmlPostProcessResult,
   RenderServices,
 } from "../../command/render/types.ts";
-import { render, renderServices } from "../../command/render/render-shared.ts";
+import { render } from "../../command/render/render-shared.ts";
 
 import { basename, dirname, join, relative } from "path/mod.ts";
 
@@ -87,6 +87,7 @@ export async function processNotebookEmbeds(
   doc: Document,
   format: Format,
   resources: string[],
+  services: RenderServices,
 ) {
   const inline = format.render[kNotebookLinks] === "inline" ||
     format.render[kNotebookLinks] === true;
@@ -99,7 +100,6 @@ export async function processNotebookEmbeds(
   if (notebookDivNodes.length > 0) {
     const nbPaths: { href: string; title: string; filename?: string }[] = [];
     let count = 1;
-    const services = renderServices();
 
     // Emit links to the notebooks inline (where the embedded content is located)
     const linkedNotebooks: string[] = [];

src/format/html/format-html.ts

@@ -83,7 +83,10 @@ import {
   kSiteUrl,
   kWebsite,
 } from "../../project/types/website/website-constants.ts";
-import { HtmlPostProcessResult } from "../../command/render/types.ts";
+import {
+  HtmlPostProcessResult,
+  RenderServices,
+} from "../../command/render/types.ts";
 import {
   getDiscussionCategoryId,
   getGithubDiscussionsMetadata,
@@ -122,13 +125,13 @@ export function htmlFormat(
         flags: PandocFlags,
         format: Format,
         _libDir: string,
-        temp: TempContext,
+        services: RenderServices,
         offset: string,
       ) => {
         const htmlFilterParams = htmlFormatFilterParams(format);
         return mergeConfigs(
-          await htmlFormatExtras(input, flags, offset, format, temp),
-          themeFormatExtras(input, flags, format, temp, offset),
+          await htmlFormatExtras(input, flags, offset, format, services.temp),
+          themeFormatExtras(input, flags, format, services, offset),
           { [kFilterParams]: htmlFilterParams },
         );
       },
@@ -856,7 +859,7 @@ function themeFormatExtras(
   input: string,
   flags: PandocFlags,
   format: Format,
-  temp: TempContext,
+  sevices: RenderServices,
   offset?: string,
 ) {
   const theme = format.metadata[kTheme];
@@ -869,7 +872,7 @@ function themeFormatExtras(
   } else if (theme === "pandoc") {
     return pandocExtras(format);
   } else {
-    return boostrapExtras(input, flags, format, temp, offset);
+    return boostrapExtras(input, flags, format, sevices, offset);
   }
 }
 

src/format/jats/format-jats.ts

@@ -12,15 +12,14 @@ import {
   kVariant,
 } from "../../config/constants.ts";
 import { Format, PandocFlags } from "../../config/types.ts";
-import { TempContext } from "../../core/temp-types.ts";
-import { ExtensionContext } from "../../extension/extension-shared.ts";
 import { ProjectContext } from "../../project/types.ts";
 import { createFormat } from "../formats-shared.ts";
 
 import { warning } from "log/mod.ts";
 import { formatResourcePath } from "../../core/resources.ts";
 import { join } from "path/mod.ts";
 import { reformat } from "../../core/xml.ts";
+import { RenderServices } from "../../command/render/types.ts";
 
 const kJatsExtended = "jats-extended";
 const kJatsDtd = "jats-dtd";
@@ -41,9 +40,8 @@ export function jatsFormat(displayName: string, ext: string): Format {
       _flags: PandocFlags,
       format: Format,
       _libDir: string,
-      _temp: TempContext,
+      _services: RenderServices,
       _offset?: string,
-      _extensionContext?: ExtensionContext,
       _project?: ProjectContext,
     ) => {
       // Provide a template and partials