Merge pull request #12337 from quarto-dev/bugfix/12336

Clean up transients from `quarto inspect`

Author: cscheid

news/changelog-1.7.md

@@ -41,6 +41,10 @@ All changes included in 1.7:
 
 - ([#12042](https://github.com/quarto-dev/quarto-cli/issues/12042)): Preserve Markdown content that follows YAML metadata in a `raw` .ipynb cell.
 
+## `quarto inspect`
+
+- ([#12336](https://github.com/quarto-dev/quarto-cli/issues/12336)): Clean up transient files created by `quarto inspect`.
+
 ## `html` format
 
 - ([#12277](https://github.com/quarto-dev/quarto-cli/pull/12277)): Provide light and dark plot and table renderings with `renderings: [light,dark]`

src/project/project-context.ts

@@ -69,6 +69,7 @@ import { ExecutionEngine, kMarkdownEngine } from "../execute/types.ts";
 import { projectResourceFiles } from "./project-resources.ts";
 
 import {
+  cleanupFileInformationCache,
   ignoreFieldsForProjectType,
   normalizeFormatYaml,
   projectConfigFile,
@@ -268,6 +269,7 @@ export async function projectContext(
           dir: join(dir, ".quarto"),
           prefix: "quarto-session-temp",
         });
+        const fileInformationCache = new Map();
         const result: ProjectContext = {
           resolveBrand: async (fileName?: string) =>
             projectResolveBrand(result, fileName),
@@ -287,7 +289,7 @@ export async function projectContext(
           },
           dir,
           engines: [],
-          fileInformationCache: new Map(),
+          fileInformationCache,
           files: {
             input: [],
           },
@@ -313,6 +315,7 @@ export async function projectContext(
           diskCache: await createProjectCache(join(dir, ".quarto")),
           temp,
           cleanup: () => {
+            cleanupFileInformationCache(result);
             result.diskCache.close();
             temp.cleanup();
           },
@@ -361,6 +364,7 @@ export async function projectContext(
         const temp = createTempContext({
           dir: join(dir, ".quarto", "temp"),
         });
+        const fileInformationCache = new Map();
         const result: ProjectContext = {
           resolveBrand: async (fileName?: string) =>
             projectResolveBrand(result, fileName),
@@ -381,7 +385,7 @@ export async function projectContext(
           dir,
           config: projectConfig,
           engines: [],
-          fileInformationCache: new Map(),
+          fileInformationCache,
           files: {
             input: [],
           },
@@ -404,6 +408,7 @@ export async function projectContext(
           diskCache: await createProjectCache(join(dir, ".quarto")),
           temp,
           cleanup: () => {
+            cleanupFileInformationCache(result);
             result.diskCache.close();
           },
         };
@@ -429,6 +434,7 @@ export async function projectContext(
           configResolvers.shift();
         } else if (force) {
           const temp = globalTempContext();
+          const fileInformationCache = new Map();
           const context: ProjectContext = {
             resolveBrand: async (fileName?: string) =>
               projectResolveBrand(context, fileName),
@@ -453,7 +459,7 @@ export async function projectContext(
                 [kProjectOutputDir]: flags?.outputDir,
               },
             },
-            fileInformationCache: new Map(),
+            fileInformationCache,
             files: {
               input: [],
             },
@@ -476,6 +482,7 @@ export async function projectContext(
             diskCache: await createProjectCache(join(temp.baseDir, ".quarto")),
             temp,
             cleanup: () => {
+              cleanupFileInformationCache(context);
               context.diskCache.close();
             },
           };

src/project/project-shared.ts

@@ -4,7 +4,7 @@
  * Copyright (C) 2020-2022 Posit Software, PBC
  */
 
-import { existsSync } from "../deno_ral/fs.ts";
+import { existsSync, safeRemoveSync } from "../deno_ral/fs.ts";
 import {
   dirname,
   isAbsolute,
@@ -582,3 +582,27 @@ export async function projectResolveBrand(
     }
   }
 }
+
+export function cleanupFileInformationCache(project: ProjectContext) {
+  project.fileInformationCache.forEach((entry) => {
+    if (entry?.target?.data) {
+      const data = entry.target.data as {
+        transient?: boolean;
+      };
+      if (data.transient && entry.target?.input) {
+        safeRemoveSync(entry.target?.input);
+      }
+    }
+  });
+}
+
+export async function withProjectCleanup<T>(
+  project: ProjectContext,
+  fn: (project: ProjectContext) => Promise<T>,
+): Promise<T> {
+  try {
+    return await fn(project);
+  } finally {
+    project.cleanup();
+  }
+}