add and call project context cleanup method

Author: cscheid

src/command/preview/preview.ts

@@ -485,6 +485,8 @@ export async function renderForPreview(
     [],
   ));
 
+  renderResult.context.cleanup();
+
   return {
     file,
     format: renderResult.files[0].format,

src/command/render/cmd.ts

@@ -245,6 +245,9 @@ export const renderCommand = new Command()
         const services = renderServices(notebookContext());
         try {
           renderResultInput = relative(Deno.cwd(), walk.path) || ".";
+          if (renderResult) {
+            renderResult.context.cleanup();
+          }
           renderResult = await render(renderResultInput, {
             services,
             flags,
@@ -255,6 +258,7 @@ export const renderCommand = new Command()
 
           // check for error
           if (renderResult.error) {
+            renderResult.context.cleanup();
             throw renderResult.error;
           }
         } finally {
@@ -275,6 +279,10 @@ export const renderCommand = new Command()
         if (finalOutput) {
           info("Output created: " + finalOutput + "\n");
         }
+
+        if (renderResult) {
+          renderResult.context.cleanup();
+        }
       }
     } else {
       throw new Error(`No valid input files passed to render`);

src/command/render/render-shared.ts

@@ -33,6 +33,7 @@ import { kTextPlain } from "../../core/mime.ts";
 import { normalizePath } from "../../core/path.ts";
 import { notebookContext } from "../../render/notebook/notebook-context.ts";
 import { singleFileProjectContext } from "../../project/types/single-file/single-file.ts";
+import { assert } from "testing/asserts";
 
 export async function render(
   path: string,
@@ -95,6 +96,7 @@ export async function render(
   // validate that we didn't get any project-only options
   validateDocumentRenderFlags(options.flags);
 
+  assert(!context, "Expected no context here");
   // NB: singleFileProjectContext is currently not fully-featured
   context = await singleFileProjectContext(path, nbContext, options.flags);
 

src/command/render/types.ts

@@ -102,7 +102,7 @@ export interface RenderResourceFiles {
 }
 
 export interface RenderResult {
-  context?: ProjectContext;
+  context: ProjectContext;
   baseDir?: string;
   outputDir?: string;
   files: RenderResultFile[];

src/project/project-context.ts

@@ -310,6 +310,9 @@ export async function projectContext(
           isSingleFile: false,
           diskCache: await createProjectCache(join(dir, ".quarto")),
           temp,
+          cleanup: () => {
+            result.diskCache.close();
+          },
         };
 
         // see if the project [kProjectType] wants to filter the project config
@@ -397,6 +400,9 @@ export async function projectContext(
           isSingleFile: false,
           diskCache: await createProjectCache(join(dir, ".quarto")),
           temp,
+          cleanup: () => {
+            result.diskCache.close();
+          },
         };
         const { files, engines } = await projectInputFiles(
           result,
@@ -466,6 +472,9 @@ export async function projectContext(
             isSingleFile: false,
             diskCache: await createProjectCache(join(temp.baseDir, ".quarto")),
             temp,
+            cleanup: () => {
+              context.diskCache.close();
+            },
           };
           if (Deno.statSync(path).isDirectory) {
             const { files, engines } = await projectInputFiles(context);

src/project/serve/serve.ts

@@ -824,6 +824,7 @@ function previewControlChannelRequestHandler(
             })
           ).then((result) => {
             if (result.error) {
+              result.context.cleanup();
               renderManager.onRenderError(result.error);
             } else {
               // print output created
@@ -844,6 +845,7 @@ function previewControlChannelRequestHandler(
                 resourceFiles,
                 watcher.project(),
               );
+              result.context.cleanup();
 
               info("Output created: " + finalOutput + "\n");
 

src/project/serve/watch.ts

@@ -178,40 +178,42 @@ export function watchProject(
               });
 
               if (result.error) {
+                result.context.cleanup();
                 renderManager.onRenderError(result.error);
                 return undefined;
-              } else {
-                // record rendered hash
-                for (const input of inputs.filter(existsSync1)) {
-                  rendered.set(input, md5Hash(Deno.readTextFileSync(input)));
-                }
-                renderManager.onRenderResult(
-                  result,
-                  extensionDirs,
-                  resourceFiles,
-                  project!,
-                );
-
-                // Filter out supplmental files (e.g. files that were injected as supplements)
-                // to the render. Instead, we should return the first non-supplemental file.
-                // Example of supplemental file is a user rendering a post that appears in a listing
-                // - the listing will be added as a supplement since changes in the post may change the
-                // listing itself
-                const nonSupplementalFiles = result.files.filter(
-                  (renderResultFile) => {
-                    return !renderResultFile.supplemental;
-                  },
-                );
-
-                return {
-                  config: false,
-                  output: true,
-                  reloadTarget: (nonSupplementalFiles.length &&
-                      !isPdfContent(nonSupplementalFiles[0].file))
-                    ? join(outputDir, nonSupplementalFiles[0].file)
-                    : undefined,
-                };
               }
+
+              // record rendered hash
+              for (const input of inputs.filter(existsSync1)) {
+                rendered.set(input, md5Hash(Deno.readTextFileSync(input)));
+              }
+              renderManager.onRenderResult(
+                result,
+                extensionDirs,
+                resourceFiles,
+                project!,
+              );
+
+              // Filter out supplmental files (e.g. files that were injected as supplements)
+              // to the render. Instead, we should return the first non-supplemental file.
+              // Example of supplemental file is a user rendering a post that appears in a listing
+              // - the listing will be added as a supplement since changes in the post may change the
+              // listing itself
+              const nonSupplementalFiles = result.files.filter(
+                (renderResultFile) => {
+                  return !renderResultFile.supplemental;
+                },
+              );
+              result.context.cleanup();
+
+              return {
+                config: false,
+                output: true,
+                reloadTarget: (nonSupplementalFiles.length &&
+                    !isPdfContent(nonSupplementalFiles[0].file))
+                  ? join(outputDir, nonSupplementalFiles[0].file)
+                  : undefined,
+              };
             } finally {
               services.cleanup();
             }

src/project/types.ts

@@ -116,6 +116,8 @@ export interface ProjectContext {
 
   diskCache: ProjectCache;
   temp: TempContext;
+
+  cleanup: () => void;
 }
 
 export interface ProjectFiles {

src/project/types/single-file/single-file.ts

@@ -77,7 +77,10 @@ export async function singleFileProjectContext(
     isSingleFile: true,
     diskCache: await createProjectCache(projectCacheBaseDir),
     temp,
+    cleanup: () => {
+      result.diskCache.close();
+    },
   };
-  temp.onCleanup(() => result.diskCache.close());
+  temp.onCleanup(result.cleanup);
   return result;
 }

src/publish/publish.ts

@@ -88,6 +88,7 @@ export async function publishSite(
           {},
         );
 
+        result.context.cleanup();
         if (result.error) {
           throw result.error;
         }
@@ -169,6 +170,7 @@ export async function publishDocument(
           flags,
         });
         if (result.error) {
+          result.context.cleanup();
           throw result.error;
         }
 
@@ -258,6 +260,7 @@ export async function publishDocument(
             relBasePath,
           );
         }
+        result.context.cleanup();
 
         return normalizePublishFiles({
           baseDir: finalBaseDir,