Fixed default properties for Record in schemas.

Author: ciscoheat

src/lib/jsonSchema/schemaDefaults.ts

@@ -260,6 +260,20 @@ function _defaultTypes(schema: JSONSchema, isOptional: boolean, path: string[])
 		}
 	}
 
+	// Check if a Record type is used for additionalProperties
+	if (info.additionalProperties && info.types.includes('object')) {
+		const additionalInfo = schemaInfo(info.additionalProperties, info.isOptional, path);
+		if (additionalInfo.properties && additionalInfo.types.includes('object')) {
+			for (const [key] of Object.entries(additionalInfo.properties)) {
+				output[key] = _defaultTypes(
+					additionalInfo.properties[key],
+					!additionalInfo.required?.includes(key),
+					[...path, key]
+				);
+			}
+		}
+	}
+
 	if (info.isNullable && !output.__types.includes('null')) {
 		output.__types.push('null');
 	}

src/lib/jsonSchema/schemaInfo.ts

@@ -22,6 +22,7 @@ export type SchemaInfo = {
 	union?: JSONSchema7[];
 	array?: JSONSchema7[];
 	properties?: { [key: string]: JSONSchema7 };
+	additionalProperties?: { [key: string]: JSONSchema7 };
 	required?: string[];
 };
 
@@ -58,19 +59,22 @@ export function schemaInfo(
 			: undefined;
 
 	const additionalProperties =
-		types.includes('object') && typeof schema.additionalProperties == 'object'
-			? schemaInfo(schema.additionalProperties, isOptional, path)
+		schema.additionalProperties &&
+		typeof schema.additionalProperties === 'object' &&
+		types.includes('object')
+			? (Object.fromEntries(
+					Object.entries(schema.additionalProperties).filter(
+						([, value]) => typeof value !== 'boolean'
+					)
+				) as { [key: string]: JSONSchema7 })
 			: undefined;
 
-	const mergedProperties = types.includes('object')
-		? { ...additionalProperties?.properties, ...schema.properties }
-		: undefined;
-
-	const properties = mergedProperties
-		? (Object.fromEntries(
-				Object.entries(mergedProperties).filter(([, value]) => typeof value !== 'boolean')
-			) as { [key: string]: JSONSchema7 })
-		: undefined;
+	const properties =
+		schema.properties && types.includes('object')
+			? (Object.fromEntries(
+					Object.entries(schema.properties).filter(([, value]) => typeof value !== 'boolean')
+				) as { [key: string]: JSONSchema7 })
+			: undefined;
 
 	const union = unionInfo(schema)?.filter((u) => u.type !== 'null' && u.const !== null);
 
@@ -82,6 +86,7 @@ export function schemaInfo(
 		union: union?.length ? union : undefined,
 		array,
 		properties,
+		additionalProperties,
 		required: schema.required
 	};
 }

src/tests/superValidate.test.ts

@@ -628,7 +628,7 @@ describe('Zod', () => {
 		expect(() => zod(schema)).toThrow(Error);
 	});
 
-	describe.only('with z.record', () => {
+	describe('with z.record', () => {
 		it('should work with additionalProperties for records', async () => {
 			/*
 			{
@@ -662,7 +662,7 @@ describe('Zod', () => {
 				)
 			});
 
-			let row = {
+			const row = {
 				id: '1',
 				options: {
 					'1': {
@@ -674,8 +674,16 @@ describe('Zod', () => {
 				}
 			};
 
-			const form = await superValidate(row, zod(schema));
-			console.dir(form, { depth: 10 }); //debug
+			const adapter = zod(schema);
+			const form = await superValidate(row, adapter);
+
+			assert(!form.valid);
+
+			expect(form.errors).toStrictEqual({
+				options: { '2': { label: ['Label is required'] } }
+			});
+
+			expect(form.data).toEqual(row);
 		});
 	});