Default values for nested discriminated unions didn't work.

Fixes #519

Author: ciscoheat

CHANGELOG.md

@@ -5,6 +5,12 @@ Headlines: Added, Changed, Deprecated, Removed, Fixed, Security
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.21.1] - 2024-12-04
+
+### Fixed
+
+- Default values for nested discriminated unions didn't work.
+
 ## [2.21.0] - 2024-12-01
 
 ### Fixed

src/lib/errors.ts

@@ -286,14 +286,9 @@ export function replaceInvalidDefaults<T extends Record<string, unknown>>(
 			}
 
 			const fieldType = pathTypes.value ?? defaultType;
-			if (!fieldType) {
-				throw new SchemaError(
-					'No default value specified for field (can be undefined, but must be explicit)',
-					currentPath
-				);
+			if (fieldType) {
+				Data_setValue(currentPath, Types_correctValue(dataValue, defValue, fieldType));
 			}
-
-			Data_setValue(currentPath, Types_correctValue(dataValue, defValue, fieldType));
 		}
 	}
 

src/tests/zodUnion.test.ts

@@ -1,13 +1,13 @@
-import type { ValidationAdapter } from '$lib/adapters/adapters.js';
+import type { Infer, ValidationAdapter } from '$lib/adapters/adapters.js';
 import { zod } from '$lib/adapters/zod.js';
 import { superValidate } from '$lib/superValidate.js';
 import { stringify } from 'devalue';
-import { describe, expect, test } from 'vitest';
+import { assert, describe, expect, test } from 'vitest';
 import { z } from 'zod';
 
-async function validate(
-	data: unknown,
-	schema: ValidationAdapter<Record<string, unknown>>,
+async function validate<T extends Record<string, unknown>>(
+	data: T,
+	schema: ValidationAdapter<T>,
 	strict = false
 ) {
 	const formInput = new FormData();
@@ -35,10 +35,49 @@ describe('Default discriminated union values 1', () => {
 	});
 
 	test('Union with schema 2', async () => {
-		const form = await validate({ type: 'extra' }, zod(schema), true);
+		const form = await validate({ type: 'extra' } as Infer<typeof schema>, zod(schema), true);
 		expect(form.valid).toBe(false);
 		expect(form.data).toEqual({ type: 'extra', options: [] });
 	});
+
+	test('Nested discriminated union with default value', async () => {
+		const nested = z.object({
+			addresses: z.object({
+				additional: z
+					.discriminatedUnion('type', [
+						z.object({
+							type: z.literal('poBox'),
+							name: z.string().min(1, 'min len').max(10, 'max len')
+						}),
+						z.object({
+							type: z.literal('none')
+						})
+					])
+					.default({
+						type: 'none'
+					})
+			})
+		});
+
+		const form1 = await superValidate(zod(nested));
+		expect(form1.data.addresses.additional).toEqual({ type: 'none' });
+
+		const form2 = await validate(
+			{
+				addresses: {
+					additional: {
+						type: 'poBox',
+						name: '#123'
+					}
+				}
+			},
+			zod(nested)
+		);
+
+		expect(form2.valid).toBe(true);
+		assert(form2.data.addresses.additional?.type === 'poBox');
+		expect(form2.data.addresses.additional.name).toBe('#123');
+	});
 });
 
 describe('Default discriminated union values 2', () => {