more type strictness and enforcement

Author: cscheid

deno.jsonc

@@ -1,6 +1,9 @@
 // auto-generated by package/src/common/create-deno-config.ts
 // see dev-docs/update-deno_jsonc.md
 {
+  "compilerOptions": {
+    "noErrorTruncation": true
+  },
   "lint": {
     "include": ["src/"],
     "exclude": [

src/command/render/project.ts

@@ -80,7 +80,7 @@ import { Format } from "../../config/types.ts";
 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 { Zod } from "../../resources/types/zod/schema-types.ts";
 
 const noMutationValidations = (
   projType: ProjectType,
@@ -255,9 +255,11 @@ const mergeExtensionMetadata = async (
       context.isSingleFile ? undefined : context.dir,
       { builtIn: false },
     );
-    const projectMetadata = extensions.map((extension) =>
+    const projectMetadata = extensions.filter((extension) =>
       extension.contributes.metadata?.project
-    ).filter((project) => project) as ProjectConfig_Project[];
+    ).map((extension) => {
+      return Zod.ProjectConfig.parse(extension.contributes.metadata!.project);
+    });
     context.config.project = mergeProjectMetadata(
       context.config.project,
       ...projectMetadata,

src/core/brand/brand.ts

@@ -7,17 +7,13 @@
  */
 
 import {
-  // Brand as BrandJson,
+  Brand as BrandJson,
   BrandFont,
+  BrandLogoExplicitResource,
   BrandNamedThemeColor,
   BrandTypography,
   BrandTypographyOptionsBase,
   BrandTypographyOptionsHeadings,
-} from "../../resources/types/schema-types.ts";
-
-import {
-  Brand as BrandJson,
-  BrandLogoExplicitResource,
   Zod,
 } from "../../resources/types/zod/schema-types.ts";
 import { InternalError } from "../lib/error.ts";
@@ -72,11 +68,15 @@ export class Brand {
   projectDir: string;
   processedData: ProcessedBrandData;
 
-  constructor(readonly brand: BrandJson, brandDir: string, projectDir: string) {
+  constructor(
+    readonly brand: unknown,
+    brandDir: string,
+    projectDir: string,
+  ) {
     this.data = Zod.Brand.parse(brand);
     this.brandDir = brandDir;
     this.projectDir = projectDir;
-    this.processedData = this.processData(brand);
+    this.processedData = this.processData(this.data);
   }
 
   processData(data: BrandJson): ProcessedBrandData {

src/core/sass/brand.ts

@@ -16,11 +16,12 @@ import {
 import { ProjectContext } from "../../project/types.ts";
 import {
   BrandFont,
-  BrandFontBunny,
+  // BrandFontBunny,
   BrandFontCommon,
   BrandFontGoogle,
   BrandFontWeight,
-} from "../../resources/types/schema-types.ts";
+  Zod,
+} from "../../resources/types/zod/schema-types.ts";
 import { Brand } from "../brand/brand.ts";
 import { darkModeDefault } from "../../format/html/format-html-info.ts";
 
@@ -323,10 +324,11 @@ const brandTypographyLayer = (
   ): string | undefined => {
     let googleFamily = "";
     for (const _resolvedFont of font) {
-      const resolvedFont = _resolvedFont as (BrandFontGoogle | BrandFontBunny);
-      if (resolvedFont.source !== "google") {
+      const safeResolvedFont = Zod.BrandFontGoogle.safeParse(_resolvedFont);
+      if (!safeResolvedFont.success) {
         return undefined;
       }
+      const resolvedFont = safeResolvedFont.data;
       const thisFamily = resolvedFont.family;
       if (!thisFamily) {
         continue;
@@ -351,17 +353,15 @@ const brandTypographyLayer = (
   ): string | undefined => {
     let googleFamily = "";
     for (const _resolvedFont of font) {
-      const resolvedFont =
-        _resolvedFont as (BrandFont | BrandFontGoogle | BrandFontBunny);
+      const safeResolvedFont = Zod.BrandFontBunny.safeParse(_resolvedFont);
+      if (!safeResolvedFont.success) {
+        return undefined;
+      }
+      const resolvedFont = safeResolvedFont.data;
       // Typescript's type checker doesn't understand that it's ok to attempt
       // to access a property that might not exist on a type when you're
       // only testing for its existence.
 
-      // deno-lint-ignore no-explicit-any
-      const source = (resolvedFont as any).source;
-      if (source && source !== "bunny") {
-        return undefined;
-      }
       const thisFamily = resolvedFont.family;
       if (!thisFamily) {
         continue;
@@ -384,6 +384,7 @@ const brandTypographyLayer = (
   type HTMLFontInformation = { [key: string]: unknown };
 
   type FontKind =
+    | "link"
     | "base"
     | "headings"
     | "monospace"
@@ -398,9 +399,14 @@ const brandTypographyLayer = (
     } else if (typeof resolvedFontOptions === "string") {
       resolvedFontOptions = { family: resolvedFontOptions };
     }
-    const family = resolvedFontOptions.family;
-    const font = getFontFamilies(family);
     const result: HTMLFontInformation = {};
+    // This is an ugly hack:
+    //   resolvedFontOptions doesn't always have 'family', but at this
+    //   point in the code we know resolvedFontOptions is an object
+    //   that we can attempt to extract the family from.
+    const family =
+      (resolvedFontOptions as Record<string, string | undefined>).family;
+    const font = getFontFamilies(family);
     result.family = resolveGoogleFontFamily(font) ??
       resolveBunnyFontFamily(font) ??
       // resolveFilesFontFamily(font) ??
@@ -524,11 +530,9 @@ const brandTypographyLayer = (
       "monospace",
       "headings",
       "base",
-    ]
+    ] as const
   ) {
-    const fontInformation = resolveHTMLFontInformation(
-      kind as FontKind,
-    );
+    const fontInformation = resolveHTMLFontInformation(kind);
     if (!fontInformation) {
       continue;
     }

src/project/project-shared.ts

@@ -48,9 +48,9 @@ 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";
+  Zod,
+} from "../resources/types/zod/schema-types.ts";
 import { Brand } from "../core/brand/brand.ts";
 import { assert } from "testing/asserts";
 
@@ -524,7 +524,7 @@ export async function projectResolveBrand(
       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(
@@ -582,7 +582,7 @@ export async function projectResolveBrand(
     return project.brandCache.brand;
   } else {
     const metadata = await project.fileMetadata(fileName);
-    const brand = metadata.brand as BrandPathBoolLightDark;
+    const brand = Zod.BrandPathBoolLightDark.parse(metadata.brand); //  as BrandPathBoolLightDark;
     if (brand === false) {
       return undefined;
     }
@@ -611,7 +611,7 @@ export async function projectResolveBrand(
         }
         if (typeof brand.dark === "string") {
           dark = await loadRelativeBrand(brand.dark);
-        } else if(brand.dark) {
+        } else if (brand.dark) {
           dark = new Brand(
             brand.dark,
             dirname(fileName),
@@ -622,7 +622,7 @@ export async function projectResolveBrand(
       } else {
         fileInformation.brand = {
           light: new Brand(
-            brand as BrandJson,
+            brand,
             dirname(fileName),
             project.dir,
           ),