update merge logic to merge keywords and defaultValue

j3rem1e · Sep 8, 2021 · edc2739 · edc2739
1 parent 6fd4ab8
commit edc2739
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -77,7 +77,7 @@ function mergeItems(itemType, currentItem, newItem, ignoreLocations) {
         currentItem.description = newItem.description;
     }
 
-    if (!currentItem.defaultValue && newItem.defaultValue) {
+    if (!currentItem.defaultValue && typeof newItem.defaultValue != 'undefined') {
         currentItem.defaultValue = newItem.defaultValue;
     }
 
@@ -87,7 +87,7 @@ function mergeItems(itemType, currentItem, newItem, ignoreLocations) {
         }
     }
 
-    if (!currentItem.keywords && newItem.keywords) {
+    if ((!currentItem.keywords || currentItem.keywords.length == 0) && newItem.keywords) {
         currentItem.keywords = newItem.keywords;
     }