Correct notebook rendering cleanup

Notebook view rendering was interfering with project rendering since it was inheriting the project context. Switch to a lower level render and manage supporting files myself.

Author: dragonstyle

src/command/render/render.ts

@@ -121,6 +121,11 @@ export async function renderPandoc(
     executeResult.markdown,
   );
 
+  if (notebookResult.supporting) {
+    executeResult.supporting = executeResult.supporting || [];
+    executeResult.supporting.push(notebookResult.supporting);
+  }
+
   // Map notebook includes to pandoc includes
   const pandocIncludes: PandocIncludes = {
     [kIncludeAfterBody]: notebookResult.includes?.afterBody
@@ -284,11 +289,6 @@ export async function renderPandoc(
         supporting.push(...htmlPostProcessResult.supporting);
       }
 
-      if (notebookResult.supporting) {
-        supporting = supporting || [];
-        supporting.push(...notebookResult.supporting);
-      }
-
       withTiming("render-cleanup", () =>
         renderCleanup(
           context.target.input,

src/core/jupyter/jupyter-embed.ts

@@ -149,14 +149,17 @@ export async function replaceNotebookPlaceholders(
   flags: RenderFlags,
   markdown: string,
 ) {
-  // Assets
-  const assets = jupyterAssets(
-    input,
-    to,
-  );
   let match = kPlaceholderRegex.exec(markdown);
+  let assets;
   let includes;
   while (match) {
+    if (!assets) {
+      assets = jupyterAssets(
+        context.target.source,
+        to,
+      );
+    }
+
     // Parse the address and if this is a notebook
     // then proceed with the replacement
     const nbAddressStr = match[1];
@@ -215,15 +218,13 @@ export async function replaceNotebookPlaceholders(
     match = kPlaceholderRegex.exec(markdown);
   }
   kPlaceholderRegex.lastIndex = 0;
-  const cleaned = cleanEmptyJupyterAssets(assets);
-  const supporting = cleaned
-    ? []
-    : [join(assets.base_dir, assets.supporting_dir)];
-
+  const supporting = assets
+    ? join(assets.base_dir, assets.supporting_dir)
+    : undefined;
   return {
     includes,
     markdown,
-    supporting: supporting,
+    supporting,
   };
 }
 

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

@@ -246,6 +246,7 @@ function bootstrapHtmlPostprocessor(
   ): Promise<HtmlPostProcessResult> => {
     // Resources used in this post processor
     const resources: string[] = [];
+    const supporting: string[] = [];
 
     // use display-7 style for title
     const title = doc.querySelector("header > .title");
@@ -334,7 +335,16 @@ function bootstrapHtmlPostprocessor(
 
     // Look for included / embedded notebooks and include those
     if (format.render[kNotebookLinks] !== false) {
-      await processNotebookEmbeds(input, doc, format, resources, services);
+      const notebookPreviews = await processNotebookEmbeds(
+        input,
+        doc,
+        format,
+        resources,
+        services,
+      );
+      if (notebookPreviews && notebookPreviews.length > 0) {
+        supporting.push(...notebookPreviews);
+      }
     }
 
     // default treatment for computational tables
@@ -421,7 +431,7 @@ function bootstrapHtmlPostprocessor(
     }
 
     // no resource refs
-    return Promise.resolve({ resources, supporting: [] });
+    return Promise.resolve({ resources, supporting });
   };
 }
 

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

@@ -26,9 +26,9 @@ import {
   HtmlPostProcessResult,
   RenderServices,
 } from "../../command/render/types.ts";
-import { render } from "../../command/render/render-shared.ts";
 
 import { basename, dirname, join, relative } from "path/mod.ts";
+import { renderFiles } from "../../command/render/render-files.ts";
 
 interface NotebookView {
   title: string;
@@ -226,6 +226,11 @@ export async function processNotebookEmbeds(
     if (nbViewConfig) {
       nbViewConfig.unused(linkedNotebooks);
     }
+
+    const inputDir = dirname(input);
+    return nbPaths.map((nbPath) => {
+      return join(inputDir, nbPath.href);
+    });
   }
 }
 
@@ -288,7 +293,7 @@ async function renderHtmlView(
 
     // Render the notebook and update the path
     const nbPreviewFile = `${filename}.html`;
-    await render(nbAbsPath, {
+    await renderFiles([{ path: nbAbsPath }], {
       services,
       flags: {
         metadata: {