various cleaning

- unused import
- foundBrand is a const now

Author: cderv

src/command/render/pandoc-html.ts

@@ -19,7 +19,6 @@ import {
 } from "../../config/types.ts";
 import { ProjectContext } from "../../project/types.ts";
 
-import { TempContext } from "../../core/temp.ts";
 import { cssImports, cssResources } from "../../core/css.ts";
 import { cleanSourceMappingUrl, compileSass } from "../../core/sass.ts";
 
@@ -91,10 +90,12 @@ export async function resolveSassBundles(
     const maybeBrandBundle = bundlesWithBrand.find((bundle) =>
       bundle.key === "brand"
     );
-    assert(!maybeBrandBundle ||
-      !maybeBrandBundle.user?.find((v) => v === "brand") &&
-      !maybeBrandBundle.dark?.user?.find((v) => v === "brand"));
-    let foundBrand = {light: false, dark: false};
+    assert(
+      !maybeBrandBundle ||
+        !maybeBrandBundle.user?.find((v) => v === "brand") &&
+          !maybeBrandBundle.dark?.user?.find((v) => v === "brand"),
+    );
+    const foundBrand = { light: false, dark: false };
     const bundles: SassBundle[] = bundlesWithBrand.filter((bundle) =>
       bundle.key !== "brand"
     ).map((bundle) => {
@@ -106,12 +107,18 @@ export async function resolveSassBundles(
         bundle.user!.splice(userBrand, 1, ...(maybeBrandBundle?.user || []));
         foundBrand.light = true;
       }
-      const darkBrand = bundle.dark?.user?.findIndex((layer) => layer === "brand");
+      const darkBrand = bundle.dark?.user?.findIndex((layer) =>
+        layer === "brand"
+      );
       if (darkBrand && darkBrand !== -1) {
         if (!cloned) {
           bundle = cloneDeep(bundle);
         }
-        bundle.dark!.user!.splice(darkBrand, 1, ...(maybeBrandBundle?.dark?.user || []))
+        bundle.dark!.user!.splice(
+          darkBrand,
+          1,
+          ...(maybeBrandBundle?.dark?.user || []),
+        );
         foundBrand.dark = true;
       }
       return bundle as SassBundle;
@@ -122,18 +129,19 @@ export async function resolveSassBundles(
         key: "brand",
         user: !foundBrand.light && maybeBrandBundle?.user as SassLayer[] || [],
         dark: !foundBrand.dark && maybeBrandBundle?.dark?.user && {
-          user: maybeBrandBundle.dark.user as SassLayer[],
-          default: maybeBrandBundle.dark.default
-        } || undefined
+              user: maybeBrandBundle.dark.user as SassLayer[],
+              default: maybeBrandBundle.dark.default,
+            } || undefined,
       });
     }
 
     // See if any bundles are providing dark specific css
     const hasDark = bundles.some((bundle) => bundle.dark !== undefined);
-    defaultStyle =
-      bundles.some((bundle) => bundle.dark !== undefined && bundle.dark.default)
-        ? "dark"
-        : "light";
+    defaultStyle = bundles.some((bundle) =>
+        bundle.dark !== undefined && bundle.dark.default
+      )
+      ? "dark"
+      : "light";
     const targets: SassTarget[] = [{
       name: `${dependency}.min.css`,
       bundles: (bundles as any),

src/command/render/project.ts

@@ -81,7 +81,6 @@ import { fileExecutionEngine } from "../../execute/engine.ts";
 import { projectContextForDirectory } from "../../project/project-context.ts";
 import { ProjectType } from "../../project/types/types.ts";
 import { ProjectConfig as ProjectConfig_Project } from "../../resources/types/schema-types.ts";
-import { Extension } from "../../extension/types.ts";
 
 const noMutationValidations = (
   projType: ProjectType,

src/core/sass.ts

@@ -8,7 +8,6 @@ import { existsSync } from "../deno_ral/fs.ts";
 import { join } from "../deno_ral/path.ts";
 
 import { quartoCacheDir } from "./appdirs.ts";
-import { TempContext } from "./temp.ts";
 
 import { SassBundleLayers, SassLayer } from "../config/types.ts";
 import { dartCompile } from "./dart-sass.ts";

src/execute/engine.ts

@@ -4,7 +4,7 @@
  * Copyright (C) 2020-2022 Posit Software, PBC
  */
 
-import { extname, join, resolve } from "../deno_ral/path.ts";
+import { extname, join } from "../deno_ral/path.ts";
 
 import * as ld from "../core/lodash.ts";
 
@@ -23,7 +23,6 @@ import { kMdExtensions, markdownEngine } from "./markdown.ts";
 import { ExecutionEngine, kQmdExtensions } from "./types.ts";
 import { languagesInMarkdown } from "./engine-shared.ts";
 import { languages as handlerLanguages } from "../core/handlers/base.ts";
-import { MappedString } from "../core/lib/text-types.ts";
 import { RenderContext, RenderFlags } from "../command/render/types.ts";
 import { mergeConfigs } from "../core/config.ts";
 import { ProjectContext } from "../project/types.ts";

src/project/project-context.ts

@@ -102,7 +102,7 @@ import { NotebookContext } from "../render/notebook/notebook-types.ts";
 import { MappedString } from "../core/mapped-text.ts";
 import { makeTimedFunctionAsync } from "../core/performance/function-times.ts";
 import { createProjectCache } from "../core/cache/cache.ts";
-import { createTempContext, globalTempContext } from "../core/temp.ts";
+import { createTempContext } from "../core/temp.ts";
 
 export async function projectContext(
   path: string,

src/project/project-shared.ts

@@ -47,9 +47,11 @@ import { normalizeNewlines } from "../core/lib/text.ts";
 import { DirectiveCell } from "../core/lib/break-quarto-md-types.ts";
 import { QuartoJSONSchema, readYamlFromMarkdown } from "../core/yaml.ts";
 import { refSchema } from "../core/lib/yaml-schema/common.ts";
-import { Brand as BrandJson, BrandPathBoolLightDark } from "../resources/types/schema-types.ts";
+import {
+  Brand as BrandJson,
+  BrandPathBoolLightDark,
+} from "../resources/types/schema-types.ts";
 import { Brand } from "../core/brand/brand.ts";
-import { warnOnce } from "../core/log.ts";
 import { assert } from "testing/asserts";
 
 export function projectExcludeDirs(context: ProjectContext): string[] {
@@ -503,6 +505,10 @@ export const ensureFileInformationCache = (
   if (!project.fileInformationCache) {
     project.fileInformationCache = new Map();
   }
+  assert(
+    project.fileInformationCache instanceof Map,
+    JSON.stringify(project.fileInformationCache),
+  );
   if (!project.fileInformationCache.has(file)) {
     project.fileInformationCache.set(file, {} as FileInformation);
   }
@@ -512,16 +518,19 @@ export const ensureFileInformationCache = (
 export async function projectResolveBrand(
   project: ProjectContext,
   fileName?: string,
-) : Promise<{light?: Brand, dark?: Brand} | undefined> {
-  async function loadBrand(brandPath: string) : Promise<Brand> {
+): Promise<{ light?: Brand; dark?: Brand } | undefined> {
+  async function loadBrand(brandPath: string): Promise<Brand> {
     const brand = await readAndValidateYamlFromFile(
       brandPath,
       refSchema("brand", "Format-independent brand configuration."),
       "Brand validation failed for " + brandPath + ".",
     ) as BrandJson;
     return new Brand(brand, dirname(brandPath), project.dir);
   }
-  async function loadRelativeBrand(brandPath: string, dir: string = dirname(fileName!)) : Promise<Brand> {
+  async function loadRelativeBrand(
+    brandPath: string,
+    dir: string = dirname(fileName!),
+  ): Promise<Brand> {
     let resolved: string = "";
     if (brandPath.startsWith("/")) {
       resolved = join(project.dir, brandPath);
@@ -538,18 +547,27 @@ export async function projectResolveBrand(
     let fileNames = ["_brand.yml", "_brand.yaml"].map((file) =>
       join(project.dir, file)
     );
-    let brand = project?.config?.brand as Boolean | string | {light?: string, dark?: string};
+    let brand = project?.config?.brand as Boolean | string | {
+      light?: string;
+      dark?: string;
+    };
     if (brand === false) {
       project.brandCache.brand = undefined;
       return project.brandCache.brand;
     }
-    if (typeof brand === "object" && brand &&
-      ("light" in brand || "dark" in brand)) {
+    if (
+      typeof brand === "object" && brand &&
+      ("light" in brand || "dark" in brand)
+    ) {
       project.brandCache.brand = {
-        light: brand.light ? await loadRelativeBrand(brand.light, project.dir) : undefined,
-        dark: brand.dark ? await loadRelativeBrand(brand.dark, project.dir) : undefined,
+        light: brand.light
+          ? await loadRelativeBrand(brand.light, project.dir)
+          : undefined,
+        dark: brand.dark
+          ? await loadRelativeBrand(brand.dark, project.dir)
+          : undefined,
       };
-      return project.brandCache.brand;        
+      return project.brandCache.brand;
     }
     if (typeof brand === "string") {
       fileNames = [join(project.dir, brand)];
@@ -559,7 +577,7 @@ export async function projectResolveBrand(
       if (!existsSync(brandPath)) {
         continue;
       }
-      project.brandCache.brand = {light: await loadBrand(brandPath)};
+      project.brandCache.brand = { light: await loadBrand(brandPath) };
     }
     return project.brandCache.brand;
   } else {
@@ -576,37 +594,39 @@ export async function projectResolveBrand(
       return fileInformation.brand;
     }
     if (typeof brand === "string") {
-      fileInformation.brand = {light: await loadRelativeBrand(brand)};
+      fileInformation.brand = { light: await loadRelativeBrand(brand) };
       return fileInformation.brand;
     } else {
       assert(typeof brand === "object");
       if ("light" in brand || "dark" in brand) {
         let light, dark;
         if (typeof brand.light === "string") {
-          light = await loadRelativeBrand(brand.light)
+          light = await loadRelativeBrand(brand.light);
         } else {
           light = new Brand(
             brand.light!,
             dirname(fileName),
-            project.dir
+            project.dir,
           );
         }
         if (typeof brand.dark === "string") {
-          dark = await loadRelativeBrand(brand.dark)
+          dark = await loadRelativeBrand(brand.dark);
         } else {
           dark = new Brand(
             brand.dark!,
             dirname(fileName),
-            project.dir
+            project.dir,
           );
         }
-        fileInformation.brand = {light, dark};
+        fileInformation.brand = { light, dark };
       } else {
-        fileInformation.brand = {light: new Brand(
-          brand as BrandJson,
-          dirname(fileName),
-          project.dir,
-        )};
+        fileInformation.brand = {
+          light: new Brand(
+            brand as BrandJson,
+            dirname(fileName),
+            project.dir,
+          ),
+        };
       }
       return fileInformation.brand;
     }

src/project/types/website/listing/website-listing-template.ts

@@ -6,7 +6,7 @@
 *
 */
 import { Document, Element } from "deno_dom/deno-dom-wasm-noinit.ts";
-import { cloneDeep, escape } from "../../../../core/lodash.ts";
+import { escape } from "../../../../core/lodash.ts";
 import {
   kListingPageMinutesCompact,
   kListingPageOrderByDateAsc,

src/render/notebook/notebook-contributor-html.ts

@@ -39,8 +39,6 @@ import {
   NotebookTemplateMetadata,
 } from "./notebook-types.ts";
 
-import * as ld from "../../core/lodash.ts";
-
 import { error } from "../../deno_ral/log.ts";
 import { formatResourcePath } from "../../core/resources.ts";
 import { kNotebookViewStyleNotebook } from "../../format/html/format-html-constants.ts";

src/render/notebook/notebook-contributor-ipynb.ts

@@ -25,9 +25,6 @@ import { InternalError } from "../../core/lib/error.ts";
 import { dirAndStem } from "../../core/path.ts";
 import { ProjectContext } from "../../project/types.ts";
 import { NotebookContributor, NotebookMetadata } from "./notebook-types.ts";
-
-import * as ld from "../../core/lodash.ts";
-
 import { error } from "../../deno_ral/log.ts";
 import { Format } from "../../config/types.ts";
 import { ipynbTitleTemplatePath } from "../../format/ipynb/format-ipynb.ts";

src/render/notebook/notebook-contributor-jats.ts

@@ -32,9 +32,6 @@ import {
 import { subarticleTemplatePath } from "../../format/jats/format-jats-paths.ts";
 import { ProjectContext } from "../../project/types.ts";
 import { NotebookContributor, NotebookMetadata } from "./notebook-types.ts";
-
-import * as ld from "../../core/lodash.ts";
-
 import { error } from "../../deno_ral/log.ts";
 import { Format } from "../../config/types.ts";
 import { safeCloneDeep } from "../../core/safe-clone-deep.ts";