Don’t create jupyter assets unless necessary

Author: dragonstyle

src/command/render/render.ts

@@ -123,10 +123,10 @@ export async function renderPandoc(
 
   // Map notebook includes to pandoc includes
   const pandocIncludes: PandocIncludes = {
-    [kIncludeAfterBody]: notebookResult.includes?.afterBody
+    [kIncludeAfterBody]: notebookResult && notebookResult.includes?.afterBody
       ? [notebookResult.includes?.afterBody]
       : undefined,
-    [kIncludeInHeader]: notebookResult.includes?.inHeader
+    [kIncludeInHeader]: notebookResult && notebookResult.includes?.inHeader
       ? [notebookResult.includes?.inHeader]
       : undefined,
   };
@@ -139,7 +139,7 @@ export async function renderPandoc(
 
   // pandoc options
   const pandocOptions: PandocOptions = {
-    markdown: notebookResult.markdown,
+    markdown: notebookResult ? notebookResult.markdown : executeResult.markdown,
     source: context.target.source,
     output: recipe.output,
     keepYaml: recipe.keepYaml,
@@ -282,15 +282,6 @@ export async function renderPandoc(
         supporting.push(...htmlPostProcessResult.supporting);
       }
 
-      // Add notebook embed results
-      if (
-        notebookResult.supporting &&
-        notebookResult.supporting.length > 0
-      ) {
-        supporting = supporting || [];
-        supporting.push(...notebookResult.supporting);
-      }
-
       withTiming("render-cleanup", () =>
         renderCleanup(
           context.target.input,

src/core/jupyter/jupyter-embed.ts

@@ -148,78 +148,82 @@ export async function replaceNotebookPlaceholders(
   flags: RenderFlags,
   markdown: string,
 ) {
-  // Assets
-  const assets = jupyterAssets(
-    input,
-    to,
-  );
-
   let match = kPlaceholderRegex.exec(markdown);
-  let includes;
-  while (match) {
-    // Parse the address and if this is a notebook
-    // then proceed with the replacement
-    const nbAddressStr = match[1];
-    const nbAddress = parseNotebookAddress(nbAddressStr);
-    if (nbAddress) {
-      // If a list of outputs are provided, resolve that range
-      const outputsStr = match[2];
-      const nbOutputs = outputsStr ? resolveRange(outputsStr) : undefined;
-
-      // If cell options are provided, resolve those
-      const placeholderStr = match[3];
-      const nbOptions = placeholderStr
-        ? placeholderToOptions(placeholderStr)
-        : {};
-
-      // Compute appropriate includes based upon the note
-      // dependendencies
-      const notebookIncludes = () => {
-        const nbPath = resolveNbPath(input, nbAddress.path);
-        if (safeExistsSync(nbPath)) {
-          const notebook = jupyterFromFile(nbPath);
-          const dependencies = isHtmlOutput(context.format.pandoc)
-            ? extractJupyterWidgetDependencies(notebook)
-            : undefined;
-          if (dependencies) {
-            const tempDir = globalTempContext().createDir();
-            return includesForJupyterWidgetDependencies(
-              [dependencies],
-              tempDir,
-            );
+  if (match) {
+    // Assets
+    const assets = jupyterAssets(
+      input,
+      to,
+    );
+
+    let includes;
+    while (match) {
+      // Parse the address and if this is a notebook
+      // then proceed with the replacement
+      const nbAddressStr = match[1];
+      const nbAddress = parseNotebookAddress(nbAddressStr);
+      if (nbAddress) {
+        // If a list of outputs are provided, resolve that range
+        const outputsStr = match[2];
+        const nbOutputs = outputsStr ? resolveRange(outputsStr) : undefined;
+
+        // If cell options are provided, resolve those
+        const placeholderStr = match[3];
+        const nbOptions = placeholderStr
+          ? placeholderToOptions(placeholderStr)
+          : {};
+
+        // Compute appropriate includes based upon the note
+        // dependendencies
+        const notebookIncludes = () => {
+          const nbPath = resolveNbPath(input, nbAddress.path);
+          if (safeExistsSync(nbPath)) {
+            const notebook = jupyterFromFile(nbPath);
+            const dependencies = isHtmlOutput(context.format.pandoc)
+              ? extractJupyterWidgetDependencies(notebook)
+              : undefined;
+            if (dependencies) {
+              const tempDir = globalTempContext().createDir();
+              return includesForJupyterWidgetDependencies(
+                [dependencies],
+                tempDir,
+              );
+            } else {
+              return undefined;
+            }
           } else {
-            return undefined;
+            const notebookName = basename(nbPath);
+            throw new Error(
+              `Unable to embed content from notebook '${notebookName}'\nThe file ${nbPath} doesn't exist or cannot be read.`,
+            );
           }
-        } else {
-          const notebookName = basename(nbPath);
-          throw new Error(
-            `Unable to embed content from notebook '${notebookName}'\nThe file ${nbPath} doesn't exist or cannot be read.`,
-          );
-        }
-      };
-      includes = notebookIncludes();
-
-      // Render the notebook markdown
-      const nbMarkdown = await notebookMarkdown(
-        nbAddress,
-        assets,
-        context,
-        flags,
-        nbOptions,
-        nbOutputs,
-      );
+        };
+        includes = notebookIncludes();
+
+        // Render the notebook markdown
+        const nbMarkdown = await notebookMarkdown(
+          nbAddress,
+          assets,
+          context,
+          flags,
+          nbOptions,
+          nbOutputs,
+        );
 
-      // Replace the placeholders with the rendered markdown
-      markdown = markdown.replaceAll(match[0], nbMarkdown);
+        // Replace the placeholders with the rendered markdown
+        markdown = markdown.replaceAll(match[0], nbMarkdown);
+      }
+      match = kPlaceholderRegex.exec(markdown);
     }
-    match = kPlaceholderRegex.exec(markdown);
+    kPlaceholderRegex.lastIndex = 0;
+    return {
+      includes,
+      markdown,
+      supporting: [join(assets.base_dir, assets.supporting_dir)],
+    };
+  } else {
+    return undefined;
   }
-  kPlaceholderRegex.lastIndex = 0;
-  return {
-    includes,
-    markdown,
-    supporting: [join(assets.base_dir, assets.supporting_dir)],
-  };
 }
 
 function resolveNbPath(input: string, path: string) {