template: Fix duplicate items in required property when merging sections

For #23
f5devcentral · Dec 9, 2021 · 051fc85 · 051fc85
1 parent ad7cef2
commit 051fc85
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # v0.17.0
 ## Fixed
 * guiUtils: Prefer defaults from top-level templates when merging allOf templates
+* template: Fix duplicate items in required property when merging sections (issue #23)
 
 # v0.16.0
 ## Fixed

diff --git a/lib/template.js b/lib/template.js
@@ -457,6 +457,19 @@ class Template {
                     existingDef,
                     newDef
                 );
+
+                // De-dup required arrays
+                if (acc.properties[defName].required) {
+                    acc.properties[defName].required = [
+                        ...new Set(acc.properties[defName].required)
+                    ];
+                }
+                if (acc.properties[defName].items && acc.properties[defName].items.required) {
+                    acc.properties[defName].items.required = [
+                        ...new Set(acc.properties[defName].items.required)
+                    ];
+                }
+
                 if (this._isPropRequired(acc.properties[defName])) {
                     required.add(defName);
                 }

diff --git a/test/template.js b/test/template.js
@@ -385,6 +385,7 @@ describe('Template class tests', function () {
             template: |
                 {{#section}}{{foo}}{{/section}}
                 {{#section}}{{bar}}{{/section}}
+                {{#section}}{{foo}}{{/section}}
                 {{^section}}{{baz}}{{/section}}
         `;