JSchema: computed default values also for empty object

Author: zonia3000

jschema/__tests__/jschema_initial_data.test.js

@@ -521,4 +521,80 @@ describe('jschema_intial_data', () => {
 		);
 		expect(data).deep.eq({ foo: [1, 1] });
 	});
+
+	it('Compute default for null initial value', async function () {
+		const data = getJsonSchemaData(
+			{
+				title: 'test',
+				type: 'object',
+				properties: {
+					foo: {
+						default: 1,
+						type: 'number'
+					}
+				}
+			},
+			'pydantic_v2',
+			null
+		);
+		expect(data).deep.eq({ foo: 1 });
+	});
+
+	it('Compute default for undefined initial value', async function () {
+		const data = getJsonSchemaData(
+			{
+				title: 'test',
+				type: 'object',
+				properties: {
+					foo: {
+						default: 1,
+						type: 'number'
+					}
+				}
+			},
+			'pydantic_v2',
+			undefined
+		);
+		expect(data).deep.eq({ foo: 1 });
+	});
+
+	it('Compute default for empty object initial value', async function () {
+		const data = getJsonSchemaData(
+			{
+				title: 'test',
+				type: 'object',
+				properties: {
+					foo: {
+						default: 1,
+						type: 'number'
+					}
+				}
+			},
+			'pydantic_v2',
+			{}
+		);
+		expect(data).deep.eq({ foo: 1 });
+	});
+
+	it('Does not compute default for populated initial value', async function () {
+		const data = getJsonSchemaData(
+			{
+				title: 'test',
+				type: 'object',
+				properties: {
+					foo: {
+						default: 1,
+						type: 'number'
+					},
+					bar: {
+						default: 2,
+						type: 'number'
+					}
+				}
+			},
+			'pydantic_v2',
+			{ foo: 5 }
+		);
+		expect(data).deep.eq({ foo: 5, bar: null });
+	});
 });

jschema/src/lib/components/jschema_initial_data.js

@@ -7,7 +7,9 @@ import { getAllObjectProperties, isTuple } from './property_utils.js';
  * @param {any} initialValue
  */
 export function getJsonSchemaData(jsonSchema, schemaVersion, initialValue = undefined) {
-	return getPropertyData(jsonSchema, schemaVersion, true, initialValue, initialValue === undefined);
+	const loadDefaults =
+		initialValue === undefined || initialValue === null || Object.keys(initialValue).length === 0;
+	return getPropertyData(jsonSchema, schemaVersion, true, initialValue, loadDefaults);
 }
 
 /**