more zod types

Author: cscheid

src/project/project-shared.ts

@@ -47,10 +47,7 @@ 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 {
-  BrandPathBoolLightDark,
-  Zod,
-} from "../resources/types/zod/schema-types.ts";
+import { Zod } from "../resources/types/zod/schema-types.ts";
 import { Brand } from "../core/brand/brand.ts";
 import { assert } from "testing/asserts";
 
@@ -547,7 +544,7 @@ export async function projectResolveBrand(
     let fileNames = ["_brand.yml", "_brand.yaml"].map((file) =>
       join(project.dir, file)
     );
-    let brand = project?.config?.brand as Boolean | string | {
+    const brand = project?.config?.brand as boolean | string | {
       light?: string;
       dark?: string;
     };
@@ -582,7 +579,7 @@ export async function projectResolveBrand(
     return project.brandCache.brand;
   } else {
     const metadata = await project.fileMetadata(fileName);
-    const brand = Zod.BrandPathBoolLightDark.parse(metadata.brand); //  as BrandPathBoolLightDark;
+    const brand = Zod.BrandPathBoolLightDark.parse(metadata.brand);
     if (brand === false) {
       return undefined;
     }

src/project/serve/serve.ts

@@ -109,7 +109,7 @@ import { exitWithCleanup, onCleanup } from "../../core/cleanup.ts";
 import { projectExtensionDirs } from "../../extension/extension.ts";
 import { findOpenPort } from "../../core/port.ts";
 import { kLocalhost } from "../../core/port-consts.ts";
-import { ProjectServe } from "../../resources/types/schema-types.ts";
+import { ProjectServe } from "../../resources/types/zod/schema-types.ts";
 import { handleHttpRequests } from "../../core/http-server.ts";
 import { touch } from "../../core/file.ts";
 import { staticResource } from "../../preview/preview-static.ts";

src/project/types.ts

@@ -14,7 +14,6 @@ import { ExecutionEngine, ExecutionTarget } from "../execute/types.ts";
 import { InspectedMdCell } from "../quarto-core/inspect-types.ts";
 import { NotebookContext } from "../render/notebook/notebook-types.ts";
 import {
-  Brand as BrandJson,
   NavigationItem as NavItem,
   NavigationItemObject,
   NavigationItemObject as SidebarTool,
@@ -70,8 +69,12 @@ export interface ProjectContext {
   fileInformationCache: Map<string, FileInformation>;
 
   // This is a cache of _brand.yml for a project
-  brandCache?: { brand?: LightDarkBrand};
-  resolveBrand: (fileName?: string) => Promise<undefined | {light?: Brand | undefined, dark?: Brand | undefined}>;
+  brandCache?: { brand?: LightDarkBrand };
+  resolveBrand: (
+    fileName?: string,
+  ) => Promise<
+    undefined | { light?: Brand | undefined; dark?: Brand | undefined }
+  >;
 
   // expands markdown for a file
   // input file doesn't have to be markdown; it can be, for example, a knitr spin file