fix: allow empty elicitation form data when all fields are optional
This commit is contained in:
parent
dff91a8696
commit
92e01dca08
2 changed files with 11 additions and 4 deletions
|
|
@ -43,8 +43,8 @@ describe("generateDefaultValue", () => {
|
||||||
expect(generateDefaultValue({ type: "array" })).toBe(undefined);
|
expect(generateDefaultValue({ type: "array" })).toBe(undefined);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("generates undefined for optional object", () => {
|
test("generates empty object for optional root object", () => {
|
||||||
expect(generateDefaultValue({ type: "object" })).toBe(undefined);
|
expect(generateDefaultValue({ type: "object" })).toEqual({});
|
||||||
});
|
});
|
||||||
|
|
||||||
test("generates default null for unknown types", () => {
|
test("generates default null for unknown types", () => {
|
||||||
|
|
|
||||||
|
|
@ -100,6 +100,7 @@ export function generateDefaultValue(
|
||||||
propertyName && parentSchema
|
propertyName && parentSchema
|
||||||
? isPropertyRequired(propertyName, parentSchema)
|
? isPropertyRequired(propertyName, parentSchema)
|
||||||
: false;
|
: false;
|
||||||
|
const isRootSchema = propertyName === undefined && parentSchema === undefined;
|
||||||
|
|
||||||
switch (schema.type) {
|
switch (schema.type) {
|
||||||
case "string":
|
case "string":
|
||||||
|
|
@ -112,7 +113,9 @@ export function generateDefaultValue(
|
||||||
case "array":
|
case "array":
|
||||||
return isRequired ? [] : undefined;
|
return isRequired ? [] : undefined;
|
||||||
case "object": {
|
case "object": {
|
||||||
if (!schema.properties) return isRequired ? {} : undefined;
|
if (!schema.properties) {
|
||||||
|
return isRequired || isRootSchema ? {} : undefined;
|
||||||
|
}
|
||||||
|
|
||||||
const obj: JsonObject = {};
|
const obj: JsonObject = {};
|
||||||
// Only include properties that are required according to the schema's required array
|
// Only include properties that are required according to the schema's required array
|
||||||
|
|
@ -124,7 +127,11 @@ export function generateDefaultValue(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return isRequired ? obj : Object.keys(obj).length > 0 ? obj : undefined;
|
|
||||||
|
if (Object.keys(obj).length === 0) {
|
||||||
|
return isRequired || isRootSchema ? {} : undefined;
|
||||||
|
}
|
||||||
|
return obj;
|
||||||
}
|
}
|
||||||
case "null":
|
case "null":
|
||||||
return null;
|
return null;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue