WIP: label accidentally added to default

Author: ciscoheat

src/lib/jsonSchema/schemaInfo.ts

@@ -57,13 +57,21 @@ export function schemaInfo(
 				) as JSONSchema7[])
 			: undefined;
 
-	const properties =
-		schema.properties && types.includes('object')
-			? (Object.fromEntries(
-					Object.entries(schema.properties).filter(([, value]) => typeof value !== 'boolean')
-				) as { [key: string]: JSONSchema7 })
+	const additionalProperties =
+		types.includes('object') && typeof schema.additionalProperties == 'object'
+			? schemaInfo(schema.additionalProperties, isOptional, path)
 			: 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 union = unionInfo(schema)?.filter((u) => u.type !== 'null' && u.const !== null);
 
 	return {

src/tests/superValidate.test.ts

@@ -628,6 +628,39 @@ describe('Zod', () => {
 		expect(() => zod(schema)).toThrow(Error);
 	});
 
+	describe.only('with z.record', () => {
+		it('should work with additionalProperties for records', async () => {
+			const schema = z.object({
+				id: z.string(),
+				options: z.record(
+					z.string(),
+					z.object({
+						label: z.string().refine((value) => value.length > 0, {
+							message: 'Label is required'
+						})
+					})
+				)
+			});
+
+			console.dir(zod(schema).jsonSchema, { depth: 10 }); //debug
+
+			let row = {
+				id: '1',
+				options: {
+					'1': {
+						label: 'Option 1'
+					},
+					'2': {
+						label: ''
+					}
+				}
+			};
+
+			const form = await superValidate(row, zod(schema));
+			console.dir(form, { depth: 10 }); //debug
+		});
+	});
+
 	schemaTest(zod(schema));
 });