move a few types to zod validator

Author: cscheid

src/command/render/pandoc.ts

@@ -197,11 +197,6 @@ import {
   MarkdownPipelineHandler,
 } from "../../core/markdown-pipeline.ts";
 import { getenv } from "../../core/env.ts";
-import {
-  BrandFontBunny,
-  BrandFontFile,
-  BrandFontGoogle,
-} from "../../resources/types/schema-types.ts";
 import { Zod } from "../../resources/types/zod/schema-types.ts";
 import { kFieldCategories } from "../../project/types/website/listing/website-listing-shared.ts";
 import { isWindows } from "../../deno_ral/platform.ts";
@@ -1487,13 +1482,13 @@ async function resolveExtras(
             fontdirs.add(dirname(join(brand.brandDir, path)));
           }
         } else if (source === "bunny") {
-          const font = _font as BrandFontBunny;
+          const font = Zod.BrandFontBunny.parse(_font);
           console.log(
             "Font bunny is not yet supported for Typst, skipping",
             font.family,
           );
         } else if (source === "google" /* || font.source === "bunny" */) {
-          const font = _font as BrandFontGoogle;
+          const font = Zod.BrandFontGoogle.parse(_font);
           let { family, style, weight } = font;
           const parts = [family!];
           if (style) {

src/core/brand/brand.ts

@@ -7,14 +7,19 @@
  */
 
 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";
 
 import { join, relative } from "../../deno_ral/path.ts";
@@ -68,7 +73,7 @@ export class Brand {
   processedData: ProcessedBrandData;
 
   constructor(readonly brand: BrandJson, brandDir: string, projectDir: string) {
-    this.data = brand;
+    this.data = Zod.Brand.parse(brand);
     this.brandDir = brandDir;
     this.projectDir = projectDir;
     this.processedData = this.processData(brand);
@@ -261,8 +266,10 @@ export class Brand {
     if (typeof entry === "string") {
       return { path: join(pathPrefix, entry) };
     }
-    entry.path = join(pathPrefix, entry.path);
-    return entry;
+    return {
+      ...entry,
+      path: join(pathPrefix, entry.path),
+    };
   }
 
   getLogo(name: "small" | "medium" | "large"): CanonicalLogoInfo | undefined {

src/core/schema/zod-types-from-schema.ts

@@ -407,7 +407,7 @@ ${zodObject}
       baseObj = `${baseObj}.passthrough()`;
     }
     if (Array.isArray(required)) {
-      baseObj = `${baseObj}.required({${
+      baseObj = `${baseObj}.partial().required({${
         required.map((key: string) => {
           return `${key}: true`;
         }).join(", ")

src/resources/types/zod/schema-types.ts

@@ -24,9 +24,8 @@ export type JsonObject = { [key: string]: unknown };
 
 export const ZodDate = z.union([
   z.string(),
-  z.object({ value: z.string(), format: z.string() }).passthrough().required({
-    value: true,
-  }),
+  z.object({ value: z.string(), format: z.string() }).passthrough().partial()
+    .required({ value: true }),
 ]);
 
 export const ZodMathMethods = z.enum(
@@ -40,9 +39,8 @@ export const ZodPandocFormatOutputFile = z.union([z.string(), z.literal(null)]);
 export const ZodPandocFormatFilters = z.array(
   z.union([
     z.string(),
-    z.object({ type: z.string(), path: z.string() }).passthrough().required({
-      path: true,
-    }),
+    z.object({ type: z.string(), path: z.string() }).passthrough().partial()
+      .required({ path: true }),
     z.object({
       type: z.string(),
       path: z.string(),
@@ -56,7 +54,7 @@ export const ZodPandocFormatFilters = z.array(
           "post-render",
         ] as const,
       ),
-    }).passthrough().required({ path: true, at: true }),
+    }).passthrough().partial().required({ path: true, at: true }),
     z.object({ type: z.enum(["citeproc"] as const) }).strict(),
   ]),
 );
@@ -133,7 +131,7 @@ export const ZodGiscusConfiguration = z.object({
     }).strict().partial(),
   ]),
   language: z.string(),
-}).strict().required({ repo: true });
+}).strict().partial().required({ repo: true });
 
 export const ZodDocumentCommentsConfiguration = z.union([
   z.literal(false),
@@ -143,7 +141,7 @@ export const ZodDocumentCommentsConfiguration = z.union([
       label: z.string(),
       theme: z.string(),
       "issue-term": z.string(),
-    }).strict().required({ repo: true }),
+    }).strict().partial().required({ repo: true }),
     giscus: z.lazy(() => ZodGiscusConfiguration),
     hypothesis: z.union([
       z.boolean(),
@@ -169,7 +167,7 @@ export const ZodDocumentCommentsConfiguration = z.union([
               z.array(z.string()),
             ]),
             icon: z.string(),
-          }).passthrough().required({
+          }).passthrough().partial().required({
             apiUrl: true,
             authority: true,
             grantToken: true,
@@ -189,7 +187,7 @@ export const ZodDocumentCommentsConfiguration = z.union([
             userid: z.string(),
             displayName: z.string(),
           }).passthrough().partial(),
-        }).passthrough().required({ user: true }),
+        }).passthrough().partial().required({ user: true }),
         requestConfigFromFrame: z.object({
           origin: z.string(),
           ancestorLevel: z.number(),
@@ -232,7 +230,7 @@ export const ZodProjectServe = z.object({
   args: z.string(),
   env: z.object({}).passthrough().partial(),
   ready: z.string(),
-}).strict().required({ cmd: true, ready: true });
+}).strict().partial().required({ cmd: true, ready: true });
 
 export const ZodPublish = z.object({
   netlify: z.array(z.lazy(() => ZodPublishRecord)),
@@ -650,7 +648,7 @@ export const ZodChapterItem = z.union([
   z.object({
     part: z.string(),
     chapters: z.array(z.lazy(() => ZodNavigationItem)),
-  }).passthrough().required({ part: true }),
+  }).passthrough().partial().required({ part: true }),
 ]);
 
 export const ZodChapterList = z.array(z.lazy(() => ZodChapterItem));
@@ -662,7 +660,7 @@ export const ZodOtherLinks = z.array(
     icon: z.string(),
     rel: z.string(),
     target: z.string(),
-  }).passthrough().required({ text: true, href: true }),
+  }).passthrough().partial().required({ text: true, href: true }),
 );
 
 export const ZodCrossrefLabelsSchema = z.string();
@@ -756,7 +754,7 @@ export const ZodWebsiteAbout = z.object({
   "image-width": z.string(),
   "image-shape": z.enum(["rectangle", "round", "rounded"] as const),
   links: z.array(z.lazy(() => ZodNavigationItem)),
-}).strict().required({ template: true });
+}).strict().partial().required({ template: true });
 
 export const ZodWebsiteListing = z.object({
   id: z.string(),
@@ -1224,9 +1222,8 @@ export const ZodSemver = z.string().regex(
 
 export const ZodQuartoDate = z.union([
   z.string(),
-  z.object({ format: z.string(), value: z.string() }).strict().required({
-    value: true,
-  }),
+  z.object({ format: z.string(), value: z.string() }).strict().partial()
+    .required({ value: true }),
 ]);
 
 export const ZodProjectProfile = z.object({
@@ -1248,7 +1245,7 @@ export const ZodNotebookViewSchema = z.object({
   title: z.union([z.string(), z.boolean()]),
   url: z.string(),
   "download-url": z.string(),
-}).passthrough().required({ notebook: true });
+}).passthrough().partial().required({ notebook: true });
 
 export const ZodCodeLinksSchema = z.union([
   z.boolean(),
@@ -1317,7 +1314,7 @@ export const ZodBrandStringLightDark = z.union([
 export const ZodBrandLogoExplicitResource = z.object({
   path: z.string(),
   alt: z.string(),
-}).strict().required({ path: true });
+}).strict().partial().required({ path: true });
 
 export const ZodBrandLogoResource = z.union([
   z.string(),
@@ -1564,10 +1561,10 @@ export const ZodBrandFontFile = z.object({
         path: z.string(),
         weight: z.lazy(() => ZodBrandFontWeight),
         style: z.lazy(() => ZodBrandFontStyle),
-      }).passthrough().required({ path: true }),
+      }).passthrough().partial().required({ path: true }),
     ]),
   ),
-}).strict().required({ files: true, family: true, source: true });
+}).strict().partial().required({ files: true, family: true, source: true });
 
 export const ZodBrandFontFamily = z.string();