Fixed order of operations for parsing

davglass · Sep 7, 2016 · 60fce1a · 60fce1a
1 parent 9d4db11
commit 60fce1a
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -112,20 +112,27 @@ var flatten = function(options) {
             moduleInfo.licenses = licenseData.map(function(license){
                 /*istanbul ignore else*/
                 if (typeof license === 'object') {
-                    return license.type;
+                    return license.type || license.name;
                 } else if (typeof license === 'string') {
                     return license;
                 }
             });
-        } else if (typeof licenseData === 'object' && licenseData.type) {
-            moduleInfo.licenses = licenseData.type;
+        } else if (typeof licenseData === 'object' && (licenseData.type || licenseData.name)) {
+            moduleInfo.licenses = licenseData.type || licenseData.name;
         } else if (typeof licenseData === 'string') {
             moduleInfo.licenses = licenseData;
         }
     } else if (license(json.readme)) {
         moduleInfo.licenses = license(json.readme);
     }
 
+    if (Array.isArray(moduleInfo.licenses)) {
+        /*istanbul ignore else*/
+        if (moduleInfo.licenses.length === 1) {
+            moduleInfo.licenses = moduleInfo.licenses[0];
+        }
+    }
+
     /*istanbul ignore else*/
     if (json.path && fs.existsSync(json.path)) {
         files = fs.readdirSync(json.path).filter(function(filename) {
@@ -147,13 +154,6 @@ var flatten = function(options) {
         }
     });
 
-    if (Array.isArray(moduleInfo.licenses)) {
-        /*istanbul ignore else*/
-        if (moduleInfo.licenses.length === 1) {
-            moduleInfo.licenses = moduleInfo.licenses[0];
-        }
-    }
-
     /*istanbul ignore else*/
     if (json.dependencies) {
         Object.keys(json.dependencies).forEach(function(name) {