partial commit

Author: cscheid

src/command/render/render-contexts.ts

@@ -89,6 +89,21 @@ import {
 import { ExtensionContext } from "../../extension/types.ts";
 import { NotebookContext } from "../../render/notebook/notebook-types.ts";
 
+// we can't naively ld.cloneDeep everything
+// because that destroys class instances
+// with private members
+//
+// Currently, that's ProjectContext.
+//
+// TODO: Ideally, we shouldn't be copying the RenderContext at all.
+export function copyRenderContext(
+  context: RenderContext,
+): RenderContext {
+  return {
+    ...ld.cloneDeep(context),
+    project: context.project,
+  };
+}
 export async function resolveFormatsFromMetadata(
   metadata: Metadata,
   input: string,

src/command/render/render-files.ts

@@ -48,7 +48,7 @@ import { outputRecipe } from "./output.ts";
 
 import { renderPandoc } from "./render.ts";
 import { PandocRenderCompletion, RenderServices } from "./types.ts";
-import { renderContexts } from "./render-contexts.ts";
+import { copyRenderContext, renderContexts } from "./render-contexts.ts";
 import { renderProgress } from "./render-info.ts";
 import {
   ExecutedFile,
@@ -503,7 +503,7 @@ async function renderFileInternal(
 
   for (const format of Object.keys(contexts)) {
     pushTiming("render-context");
-    const context = ld.cloneDeep(contexts[format]) as RenderContext; // since we're going to mutate it...
+    const context = copyRenderContext(contexts[format]); // since we're going to mutate it...
 
     // disquality some documents from server: shiny
     if (isServerShiny(context.format) && context.project) {

src/command/render/render-shared.ts

@@ -97,6 +97,7 @@ export async function render(
 
   // NB: singleFileProjectContext is currently not fully-featured
   context = await singleFileProjectContext(path, nbContext, options.flags);
+  debugger;
 
   // otherwise it's just a file render
   const result = await renderFiles(

src/core/cache/cache.ts

@@ -13,6 +13,7 @@ import { md5HashBytes } from "../hash.ts";
 import { satisfies } from "semver/mod.ts";
 import { quartoConfig } from "../quarto.ts";
 import { CacheIndexEntry, ProjectCache } from "./cache-types.ts";
+import { ProjectContext } from "../../project/types.ts";
 
 export { type ProjectCache } from "./cache-types.ts";
 
@@ -95,6 +96,7 @@ class ProjectCacheImpl {
       join(this.projectScratchDir, "project-cache", hash),
       value,
     );
+    console.log("Adding to cache", key, hash);
     const result = await this.index.set(key, {
       hash,
       type: "string",
@@ -147,6 +149,23 @@ class ProjectCacheImpl {
         join(this.projectScratchDir, "project-cache", hash),
       ));
   }
+
+  memoizeStringFunction(
+    key: string[],
+    fn: (param: string) => Promise<string>,
+  ): (param: string) => Promise<string> {
+    return async (param: string) => {
+      const paramHash = await md5HashBytes(new TextEncoder().encode(param));
+      const memoizationKey = [...key, paramHash];
+      const cached = await this.getString(memoizationKey);
+      if (cached !== null) {
+        return cached;
+      }
+      const result = await fn(param);
+      await this.addString(memoizationKey, result);
+      return result;
+    };
+  }
 }
 
 export const createProjectCache = async (
@@ -156,3 +175,15 @@ export const createProjectCache = async (
   await result.init();
   return result as ProjectCache;
 };
+
+export const memoizeStringFunction = (
+  key: string[],
+  fn: (param: string) => Promise<string>,
+): (project: ProjectContext, param: string) => Promise<string> => {
+  return async (project: ProjectContext, param: string) => {
+    return (project.diskCache as ProjectCacheImpl).memoizeStringFunction(
+      key,
+      fn,
+    )(param);
+  };
+};

src/core/sass.ts

@@ -22,6 +22,7 @@ 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";
+import { memoizeStringFunction } from "./cache/cache.ts";
 
 export interface SassVariable {
   name: string;
@@ -50,10 +51,9 @@ export function outputVariable(
 let counter: number = 1;
 export async function compileSass(
   bundles: SassBundleLayers[],
-  projectContext: ProjectContext,
+  project: ProjectContext,
   minified = true,
 ) {
-  const { temp } = projectContext;
   // Gather the inputs for the framework
   const frameWorkUses = bundles.map(
     (bundle) => bundle.framework?.uses || "",
@@ -161,7 +161,7 @@ export async function compileSass(
   const result = await compileWithCache(
     scssInput,
     loadPaths,
-    temp,
+    project,
     {
       compressed: minified,
       cacheIdentifier: await md5HashBytes(new TextEncoder().encode(scssInput)),
@@ -357,24 +357,37 @@ type CompileWithCacheOptions = {
   addVarsBlock?: boolean;
 };
 
+const memoizedGetVarsBlock = memoizeStringFunction([
+  "core",
+  "sass",
+  "cssVarsBlock",
+], (input: string) => Promise.resolve(cssVarsBlock(input)));
+
 export async function compileWithCache(
   input: string,
   loadPaths: string[],
-  temp: TempContext,
+  project: ProjectContext,
   options?: CompileWithCacheOptions,
 ) {
+  const { temp } = project;
   const {
     compressed,
     cacheIdentifier,
     addVarsBlock,
   } = options || {};
 
-  const handleVarsBlock = (input: string) => {
+  const handleVarsBlock = async (input: string) => {
     if (!addVarsBlock) {
       return input;
     }
     try {
-      input += "\n" + cssVarsBlock(input);
+      const result = await memoizedGetVarsBlock(project, input);
+      console.log("<<<<");
+      console.log(input);
+      console.log("----");
+      console.log(result);
+      console.log(">>>>");
+      return input + result;
     } catch (e) {
       console.warn("Error adding css vars block", e);
       console.warn(
@@ -404,12 +417,12 @@ export async function compileWithCache(
       input,
       cacheIdentifier,
       async (outputFilePath: string) => {
-        input = handleVarsBlock(input);
+        input = await handleVarsBlock(input);
         await dartCompile(input, outputFilePath, temp, loadPaths, compressed);
       },
     );
   } else {
-    input = handleVarsBlock(input);
+    input = await handleVarsBlock(input);
     const outputFilePath = temp.createFile({ suffix: ".css" });
     // Skip the cache and just compile
     await dartCompile(