Merge branch 'additionalproperties'

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[];
 };
 
@@ -57,6 +58,17 @@ export function schemaInfo(
 				) as JSONSchema7[])
 			: undefined;
 
+	const additionalProperties =
+		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 properties =
 		schema.properties && types.includes('object')
 			? (Object.fromEntries(
@@ -74,6 +86,7 @@ export function schemaInfo(
 		union: union?.length ? union : undefined,
 		array,
 		properties,
+		additionalProperties,
 		required: schema.required
 	};
 }

src/tests/superValidate.test.ts

@@ -656,6 +656,65 @@ describe('Zod', () => {
 		expect(sameAdapter).toBe(adapter);
 	});
 
+	describe('with z.record', () => {
+		it('should work with additionalProperties for records', async () => {
+			/*
+			{
+				type: 'object',
+				properties: {
+					id: { type: 'string' },
+					options: {
+						type: 'object',
+						additionalProperties: {
+							type: 'object',
+							properties: { label: { type: 'string' } },
+							required: [ 'label' ],
+							additionalProperties: false
+						}
+					}
+				},
+				required: [ 'id', 'options' ],
+				additionalProperties: false,
+				'$schema': 'http://json-schema.org/draft-07/schema#'
+			}
+			*/
+			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'
+						})
+					})
+				)
+			});
+
+			const row = {
+				id: '1',
+				options: {
+					'1': {
+						label: 'Option 1'
+					},
+					'2': {
+						label: ''
+					}
+				}
+			};
+
+			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);
+		});
+	});
+
 	schemaTest(zod(schema));
 });