From 5683491a58977652048b2d3ce4bcbc50e47f2c73 Mon Sep 17 00:00:00 2001 From: Nazar Kovtun Date: Thu, 3 Jul 2025 18:15:11 +0300 Subject: [PATCH 1/4] HCK-11878: FE additionalProperties only when false or undefined --- forward_engineering/helpers/typeHelper.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/forward_engineering/helpers/typeHelper.js b/forward_engineering/helpers/typeHelper.js index a126c14..67d398b 100644 --- a/forward_engineering/helpers/typeHelper.js +++ b/forward_engineering/helpers/typeHelper.js @@ -247,8 +247,9 @@ function getAdditionalProperties(data) { return; } - if (data.additionalPropControl === 'Boolean') { - return data.additionalProperties || undefined; + const additionalProperties = Boolean(data.additionalProperties); + if (data.additionalPropControl === 'Boolean' && !additionalProperties) { + return additionalProperties; } return getAdditionalPropsObject(data); From 82f7c4f8159ce683384ab6368dc9ab1614a08fdc Mon Sep 17 00:00:00 2001 From: Nazar Kovtun Date: Fri, 4 Jul 2025 11:27:31 +0300 Subject: [PATCH 2/4] HCK-11878: fixed condition --- forward_engineering/helpers/typeHelper.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/forward_engineering/helpers/typeHelper.js b/forward_engineering/helpers/typeHelper.js index 67d398b..66395f9 100644 --- a/forward_engineering/helpers/typeHelper.js +++ b/forward_engineering/helpers/typeHelper.js @@ -247,9 +247,8 @@ function getAdditionalProperties(data) { return; } - const additionalProperties = Boolean(data.additionalProperties); - if (data.additionalPropControl === 'Boolean' && !additionalProperties) { - return additionalProperties; + if (data.additionalPropControl === 'Boolean') { + return data.additionalProperties && undefined; } return getAdditionalPropsObject(data); From 38b23c2bcee62cc191a96767fd996cfe1edae615 Mon Sep 17 00:00:00 2001 From: Nazar Kovtun Date: Fri, 4 Jul 2025 11:35:57 +0300 Subject: [PATCH 3/4] HCK-11878: make condition more robust --- forward_engineering/helpers/typeHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forward_engineering/helpers/typeHelper.js b/forward_engineering/helpers/typeHelper.js index 66395f9..c740c9b 100644 --- a/forward_engineering/helpers/typeHelper.js +++ b/forward_engineering/helpers/typeHelper.js @@ -248,7 +248,7 @@ function getAdditionalProperties(data) { } if (data.additionalPropControl === 'Boolean') { - return data.additionalProperties && undefined; + return Boolean(data.additionalProperties) && undefined; } return getAdditionalPropsObject(data); From beea544943f939edf38e616ffc106caa56597dab Mon Sep 17 00:00:00 2001 From: Nazar Kovtun Date: Fri, 4 Jul 2025 12:13:42 +0300 Subject: [PATCH 4/4] HCK-11878: make condition more explicit --- forward_engineering/helpers/typeHelper.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/forward_engineering/helpers/typeHelper.js b/forward_engineering/helpers/typeHelper.js index c740c9b..684bb7a 100644 --- a/forward_engineering/helpers/typeHelper.js +++ b/forward_engineering/helpers/typeHelper.js @@ -248,7 +248,11 @@ function getAdditionalProperties(data) { } if (data.additionalPropControl === 'Boolean') { - return Boolean(data.additionalProperties) && undefined; + /** + * additionalProperties property should be omitted when the value is equal to "true" because it is enabled by default. + * In case the property is missing or false it is explicitly included with "false" value + */ + return data.additionalProperties ? undefined : false; } return getAdditionalPropsObject(data);