@astrojs/starlight 0.41.4 → 0.41.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @astrojs/starlight
 
+## 0.41.6
+
+### Patch Changes
+
+- [#4102](https://github.com/withastro/starlight/pull/4102) [`f1dddc0`](https://github.com/withastro/starlight/commit/f1dddc057dc2b52092058f39679a5790b9cf0a38) Thanks [@delucis](https://github.com/delucis)! - Adds 1 new icon: `forgejo`
+
+## 0.41.5
+
+### Patch Changes
+
+- [#4095](https://github.com/withastro/starlight/pull/4095) [`bb06434`](https://github.com/withastro/starlight/commit/bb06434a1bc199b59f9d7953d0e41c6c287b1aa2) Thanks [@HiDeoo](https://github.com/HiDeoo)! - Fixes a regression when using a union to [extend](https://starlight.astro.build/reference/frontmatter/#extend) Starlight’s `docsSchema()`.
+
 ## 0.41.4
 
 ### Patch Changes

package/components-internals/Icons.ts

@@ -105,6 +105,8 @@ export const BuiltInIcons = {
 		'<path d="m22.63 9.8-.03-.09-3-7.81a.78.78 0 0 0-.76-.5.8.8 0 0 0-.46.18.8.8 0 0 0-.26.4L16.1 8.17H7.9l-2-6.19a.79.79 0 0 0-1.5-.08l-3 7.81-.02.08a5.56 5.56 0 0 0 1.84 6.43h.01l.03.02 4.56 3.42 2.26 1.7 1.37 1.05a.92.92 0 0 0 1.12 0l1.38-1.04 2.25-1.71 4.6-3.44a5.56 5.56 0 0 0 1.84-6.43Z"/>',
 	bitbucket:
 		'<path d="M1 1.5a.8.8 0 0 0-.7.9l3.2 19.3c0 .5.5.8 1 .8h15.2c.4 0 .7-.2.8-.6l3.2-19.5a.7.7 0 0 0-.8-.9H1zm13.4 14H9.6l-1.3-7h7.3l-1.2 7z"/>',
+	forgejo:
+		'<path d="M16.8 0a2.9 2.9 0 1 1-2.6 4.3H13a4.3 4.3 0 0 0-4.3 4.2v2.1a7 7 0 0 1 4.2-1.4h1.4a2.9 2.9 0 0 1 5.5 1.4 2.9 2.9 0 0 1-5.5 1.5H13a4.3 4.3 0 0 0-4.3 4.2v2.3A2.9 2.9 0 0 1 7.2 24a2.9 2.9 0 0 1-1.4-5.4v-10a7 7 0 0 1 7-7.1h1.4A3 3 0 0 1 16.8 0M7.2 20a1.2 1.2 0 1 0 0 2.3 1.2 1.2 0 0 0 0-2.4m9.6-10.5a1.2 1.2 0 1 0 0 2.4 1.2 1.2 0 0 0 0-2.4m0-7.7a1.2 1.2 0 1 0 0 2.4 1.2 1.2 0 0 0 0-2.4"/>',
 	codePen:
 		'<path d="M23.5 7.5 12.5.2a1 1 0 0 0-1 0L.4 7.5a1 1 0 0 0-.5.8v7.4c0 .3.2.6.5.8l11 7.3c.3.3.7.3 1 0l11-7.3c.3-.2.5-.5.5-.8V8.3a1 1 0 0 0-.5-.8zM13 3l8.1 5.3-3.6 2.5-4.5-3V3zm-2 0v4.8l-4.5 3-3.6-2.5 8-5.3zm-9 7.3L4.7 12l-2.5 1.7v-3.4zM11 21l-8.1-5.3 3.6-2.5 4.5 3V21zm1-6.6L8.4 12 12 9.6l3.6 2.4-3.6 2.4zm1 6.6v-4.8l4.5-3 3.6 2.5-8 5.3zm9-7.3L19.3 12l2.5-1.7v3.4z"/>',
 	farcaster:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/starlight",
-  "version": "0.41.4",
+  "version": "0.41.6",
   "description": "Build beautiful, high-performance documentation websites with Astro",
   "keywords": [
     "docs",

package/schema.ts

@@ -115,7 +115,8 @@ const StarlightFrontmatterSchema = (context: SchemaContext) =>
 type DefaultSchema = ReturnType<typeof StarlightFrontmatterSchema>;
 
 /** Base subset of Zod types that we support passing to the `extend` option. */
-type BaseSchema<T extends z.ZodRawShape = z.ZodRawShape> = z.ZodObject<T>;
+type BaseObjectSchema = z.ZodObject<z.ZodRawShape, z.core.$ZodObjectConfig>;
+type BaseSchema = BaseObjectSchema | z.ZodUnion<readonly BaseObjectSchema[]>;
 
 /** Type that extends Starlight’s default schema with an optional, user-defined schema. */
 type ExtendedSchema<T extends BaseSchema = never> = [T] extends [never]

package/utils/zodDeepMerge.ts

@@ -10,17 +10,19 @@ export type DeepMergedSchema<Default extends z.core.$ZodType, User extends z.cor
 				? z.ZodDefault<DeepMergedSchema<UnwrappedSchema<Default>, WrappedSchema>>
 				: User extends z.ZodPrefault<infer WrappedSchema extends z.core.$ZodType>
 					? z.ZodPrefault<DeepMergedSchema<UnwrappedSchema<Default>, WrappedSchema>>
-					: UnwrappedSchema<Default> extends z.ZodObject<infer DefaultShape>
-						? User extends z.ZodObject<infer UserShape, infer UserConfig>
-							? z.ZodObject<DeepMergedShape<DefaultShape, UserShape>, UserConfig>
-							: User
-						: UnwrappedSchema<Default> extends z.ZodArray<
-									infer DefaultItemSchema extends z.core.$ZodType
-							  >
-							? User extends z.ZodArray<infer UserItemSchema extends z.core.$ZodType>
-								? z.ZodArray<DeepMergedSchema<DefaultItemSchema, UserItemSchema>>
+					: User extends z.ZodUnion<infer Users extends readonly z.core.$ZodType[]>
+						? z.ZodUnion<DeepMergedUnionMembers<UnwrappedSchema<Default>, Users>>
+						: UnwrappedSchema<Default> extends z.ZodObject<infer DefaultShape>
+							? User extends z.ZodObject<infer UserShape, infer UserConfig>
+								? z.ZodObject<DeepMergedShape<DefaultShape, UserShape>, UserConfig>
 								: User
-							: User;
+							: UnwrappedSchema<Default> extends z.ZodArray<
+										infer DefaultItemSchema extends z.core.$ZodType
+								  >
+								? User extends z.ZodArray<infer UserItemSchema extends z.core.$ZodType>
+									? z.ZodArray<DeepMergedSchema<DefaultItemSchema, UserItemSchema>>
+									: User
+								: User;
 
 /** Type-level equivalent of {@link unwrapSchema}. */
 type UnwrappedSchema<T extends z.core.$ZodType> =
@@ -48,6 +50,16 @@ type DeepMergedShape<Default extends z.ZodRawShape, User extends z.ZodRawShape>
 			: never;
 };
 
+/** Merged union schemas where each union member is deep-merged with the default schema. */
+type DeepMergedUnionMembers<
+	Default extends z.core.$ZodType,
+	Users extends readonly z.core.$ZodType[],
+> = {
+	[Key in keyof Users]: Users[Key] extends z.core.$ZodType
+		? DeepMergedSchema<Default, Users[Key]>
+		: Users[Key];
+};
+
 export function deepMergeSchemas(defaultSchema: z.ZodType, userSchema: z.ZodType): z.ZodType {
 	const unwrappedDefaultSchema = unwrapSchema(defaultSchema);
 
@@ -58,6 +70,13 @@ export function deepMergeSchemas(defaultSchema: z.ZodType, userSchema: z.ZodType
 		} as Parameters<typeof userSchema.clone>[0]);
 	}
 
+	if (isZodUnion(userSchema)) {
+		return userSchema.clone({
+			...userSchema._zod.def,
+			options: userSchema.options.map((schema) => deepMergeSchemas(unwrappedDefaultSchema, schema)),
+		});
+	}
+
 	if (isZodObject(unwrappedDefaultSchema) && isZodObject(userSchema)) {
 		const shape: z.core.$ZodLooseShape = { ...unwrappedDefaultSchema.shape };
 
@@ -119,3 +138,7 @@ function isZodObject(schema: z.ZodType): schema is z.ZodObject<z.ZodRawShape> {
 function isZodArray(schema: z.ZodType): schema is z.ZodArray<z.ZodType> {
 	return schema._zod.def.type === 'array';
 }
+
+function isZodUnion(schema: z.ZodType): schema is z.ZodUnion<readonly z.ZodType[]> {
+	return schema._zod.def.type === 'union';
+}