projectcontext - add tempcontext as a field

Author: cscheid

src/command/render/pandoc-html.ts

@@ -53,9 +53,9 @@ export async function resolveSassBundles(
   inputDir: string,
   extras: FormatExtras,
   format: Format,
-  temp: TempContext,
   project: ProjectContext,
 ) {
+  const { temp } = project;
   extras = cloneDeep(extras);
 
   const mergedBundles: Record<string, SassBundleWithBrand[]> = {};
@@ -159,11 +159,11 @@ export async function resolveSassBundles(
 
     for (const target of targets) {
       let cssPath: string | undefined;
-      cssPath = await compileSass(target.bundles, temp);
+      cssPath = await compileSass(target.bundles, project);
       // First, Clean CSS
       cleanSourceMappingUrl(cssPath);
       // look for a sentinel 'dark' value, extract variables
-      const cssResult = await processCssIntoExtras(cssPath, extras, temp);
+      const cssResult = await processCssIntoExtras(cssPath, extras, project);
       cssPath = cssResult.path;
 
       // it can happen that processing generate an empty css file (e.g quarto-html deps with Quarto CSS variables)
@@ -261,7 +261,7 @@ export async function resolveSassBundles(
     inputDir,
     extras,
     format,
-    temp,
+    project,
     hasDarkStyles ? "light" : "default",
     defaultStyle,
   );
@@ -272,7 +272,7 @@ export async function resolveSassBundles(
       inputDir,
       extras,
       format,
-      temp,
+      project,
       "dark",
       defaultStyle,
     );
@@ -291,7 +291,7 @@ async function resolveQuartoSyntaxHighlighting(
   inputDir: string,
   extras: FormatExtras,
   format: Format,
-  temp: TempContext,
+  project: ProjectContext,
   style: "dark" | "light" | "default",
   defaultStyle?: "dark" | "light",
 ) {
@@ -381,7 +381,7 @@ async function resolveQuartoSyntaxHighlighting(
             rules: rules.join("\n"),
           },
         }],
-        temp,
+        project,
         false,
       );
 
@@ -500,8 +500,9 @@ interface CSSResult {
 async function processCssIntoExtras(
   cssPath: string,
   extras: FormatExtras,
-  temp: TempContext,
+  project: ProjectContext,
 ): Promise<CSSResult> {
+  const { temp } = project;
   extras.html = extras.html || {};
 
   const css = Deno.readTextFileSync(cssPath);

src/command/render/pandoc.ts

@@ -1415,7 +1415,6 @@ async function resolveExtras(
       inputDir,
       extras,
       format,
-      temp,
       project,
     );
 

src/core/sass.ts

@@ -21,6 +21,7 @@ import { md5HashBytes } from "./hash.ts";
 import { kSourceMappingRegexes } from "../config/constants.ts";
 import { quartoConfig } from "../core/quarto.ts";
 import { safeModeFromFile } from "../deno_ral/fs.ts";
+import { ProjectContext } from "../project/types.ts";
 
 export interface SassVariable {
   name: string;
@@ -49,9 +50,10 @@ export function outputVariable(
 let counter: number = 1;
 export async function compileSass(
   bundles: SassBundleLayers[],
-  temp: TempContext,
+  projectContext: ProjectContext,
   minified = true,
 ) {
+  const { temp } = projectContext;
   // Gather the inputs for the framework
   const frameWorkUses = bundles.map(
     (bundle) => bundle.framework?.uses || "",

src/format/reveal/format-reveal-theme.ts

@@ -68,9 +68,9 @@ export async function revealTheme(
   format: Format,
   input: string,
   libDir: string,
-  temp: TempContext,
   project: ProjectContext,
 ) {
+  const { temp } = project;
   // metadata override to return
   const metadata: Metadata = {};
 
@@ -196,7 +196,7 @@ export async function revealTheme(
   };
 
   // compile sass
-  const css = await compileSass([bundleLayers], temp);
+  const css = await compileSass([bundleLayers], project);
   // Remove sourcemap information
   cleanSourceMappingUrl(css);
   // convert from string to bytes

src/format/reveal/format-reveal.ts

@@ -212,7 +212,6 @@ export function revealjsFormat() {
           format,
           input,
           libDir,
-          services.temp,
           project,
         );
 

src/project/project-context.ts

@@ -99,9 +99,8 @@ import { computeProjectEnvironment } from "./project-environment.ts";
 import { ProjectEnvironment } from "./project-environment-types.ts";
 import { NotebookContext } from "../render/notebook/notebook-types.ts";
 import { MappedString } from "../core/mapped-text.ts";
-import { timeCall } from "../core/performance/function-times.ts";
-import { assertEquals } from "testing/asserts";
 import { createProjectCache } from "../core/cache/cache.ts";
+import { createTempContext } from "../core/temp.ts";
 
 export async function projectContext(
   path: string,
@@ -264,6 +263,9 @@ export async function projectContext(
           );
         }
 
+        const temp = createTempContext({
+          dir: join(dir, ".quarto", "temp"),
+        });
         const result: ProjectContext = {
           resolveBrand: async (fileName?: string) =>
             projectResolveBrand(result, fileName),
@@ -307,6 +309,7 @@ export async function projectContext(
           },
           isSingleFile: false,
           diskCache: await createProjectCache(join(dir, ".quarto")),
+          temp,
         };
 
         // see if the project [kProjectType] wants to filter the project config
@@ -349,6 +352,9 @@ export async function projectContext(
         return result;
       } else {
         debug(`projectContext: Found Quarto project in ${dir}`);
+        const temp = createTempContext({
+          dir: join(dir, ".quarto", "temp"),
+        });
         const result: ProjectContext = {
           resolveBrand: async (fileName?: string) =>
             projectResolveBrand(result, fileName),
@@ -390,6 +396,7 @@ export async function projectContext(
           notebookContext,
           isSingleFile: false,
           diskCache: await createProjectCache(join(dir, ".quarto")),
+          temp,
         };
         const { files, engines } = await projectInputFiles(
           result,
@@ -412,6 +419,9 @@ export async function projectContext(
           dir = originalDir;
           configResolvers.shift();
         } else if (force) {
+          const temp = createTempContext({
+            dir: join(dir, ".quarto", "temp"),
+          });
           const context: ProjectContext = {
             resolveBrand: async (fileName?: string) =>
               projectResolveBrand(context, fileName),
@@ -457,6 +467,7 @@ export async function projectContext(
             },
             isSingleFile: false,
             diskCache: await createProjectCache(join(dir, ".quarto")),
+            temp,
           };
           if (Deno.statSync(path).isDirectory) {
             const { files, engines } = await projectInputFiles(context);

src/project/types.ts

@@ -22,6 +22,7 @@ import {
 } from "../resources/types/schema-types.ts";
 import { ProjectEnvironment } from "./project-environment-types.ts";
 import { ProjectCache } from "../core/cache/cache-types.ts";
+import { TempContext } from "../core/temp-types.ts";
 
 export {
   type NavigationItem as NavItem,
@@ -114,6 +115,7 @@ export interface ProjectContext {
   isSingleFile: boolean;
 
   diskCache: ProjectCache;
+  temp: TempContext;
 }
 
 export interface ProjectFiles {

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

@@ -34,8 +34,8 @@ export async function singleFileProjectContext(
   flags?: RenderFlags,
 ): Promise<ProjectContext> {
   const environmentMemoizer = makeProjectEnvironmentMemoizer(notebookContext);
-  const tempContext = globalTempContext();
-  const projectCacheBaseDir = tempContext.createDir();
+  const temp = globalTempContext();
+  const projectCacheBaseDir = temp.createDir();
 
   const result: ProjectContext = {
     resolveBrand: (fileName?: string) => projectResolveBrand(result, fileName),
@@ -76,6 +76,7 @@ export async function singleFileProjectContext(
     },
     isSingleFile: true,
     diskCache: await createProjectCache(projectCacheBaseDir),
+    temp,
   };
   return result;
 }