fix: recursive content schema types (#13706)

ascorbic · web-flow · commit b4929ae9e77f · 2025-04-28T13:12:55.000+01:00
diff --git a/.changeset/red-boxes-bet.md b/.changeset/red-boxes-bet.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes typechecking for content config schema
diff --git a/packages/astro/types/content.d.ts b/packages/astro/types/content.d.ts
@@ -45,11 +45,18 @@ declare module 'astro:content' {
 		has: (key: string) => boolean;
 	}
 
+	type BaseAtomicSchema = import('astro/zod').AnyZodObject;
+
+	type BaseCompositeSchema =
+		| import('astro/zod').ZodUnion<[BaseAtomicSchema, ...BaseAtomicSchema[]]>
+		| import('astro/zod').ZodDiscriminatedUnion<string, BaseAtomicSchema[]>
+		// If we have a union of unions, give up on trying to type-check it all. You're on your own.
+		| import('astro/zod').ZodUnion<[import('astro/zod').ZodUnion<z.any>, ...z.any[]]>
+
 	type BaseSchemaWithoutEffects =
-		| import('astro/zod').AnyZodObject
-		| import('astro/zod').ZodUnion<[BaseSchemaWithoutEffects, ...BaseSchemaWithoutEffects[]]>
-		| import('astro/zod').ZodDiscriminatedUnion<string, import('astro/zod').AnyZodObject[]>
-		| import('astro/zod').ZodIntersection<BaseSchemaWithoutEffects, BaseSchemaWithoutEffects>;
+		| BaseAtomicSchema
+		| BaseCompositeSchema
+		| import('astro/zod').ZodIntersection<BaseAtomicSchema, BaseAtomicSchema | BaseCompositeSchema>;
 
 	export type BaseSchema =
 		| BaseSchemaWithoutEffects

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'astro': patch
 +---
++
 +Fixes typechecking for content config schema