refactor: Make code a bit safer

RSeidelsohn · Apr 12, 2023 · 13c7656 · 13c7656
1 parent 369f1d4
commit 13c7656
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -131,17 +131,21 @@ const recursivelyCollectAllDependencies = (options) => {
         if (Array.isArray(licenseData) && licenseData.length > 0) {
             moduleInfo.licenses = licenseData.map((moduleLicense) => {
                 /*istanbul ignore else*/
-                if (typeof moduleLicense === 'object') {
+                if (
+                    typeof helpers.getFirstNotUndefinedOrUndefined(moduleLicense.type, moduleLicense.name) === 'string'
+                ) {
                     /*istanbul ignore next*/
-                    return moduleLicense.type || moduleLicense.name;
+                    return helpers.getFirstNotUndefinedOrUndefined(moduleLicense.type, moduleLicense.name);
                 }
 
                 if (typeof moduleLicense === 'string') {
                     return moduleLicense;
                 }
             });
-        } else if (typeof licenseData === 'object' && (licenseData.type || licenseData.name)) {
-            moduleInfo.licenses = getLicenseTitle(licenseData.type || licenseData.name);
+        } else if (typeof helpers.getFirstNotUndefinedOrUndefined(licenseData.type, licenseData.name) === 'string') {
+            moduleInfo.licenses = getLicenseTitle(
+                helpers.getFirstNotUndefinedOrUndefined(licenseData.type, licenseData.name),
+            );
         } else if (typeof licenseData === 'string') {
             moduleInfo.licenses = getLicenseTitle(licenseData);
         }