license-checker - npm Package Compare versions

Comparing version 7.0.0 to 7.1.0

CHANGELOG.md

 ## Change Log
 
+### v7.1.0 (2016/09/07 15:12 +00:00)
+- [9f8b7f1](https://github.com/davglass/license-checker/commit/9f8b7f1c367dfe86342ee5f5cc97171bf97281aa) 7.1.0 (@davglass)
+- [60fce1a](https://github.com/davglass/license-checker/commit/60fce1a24a4ef5add98a08dd8c8a85870db3f4a6) Fixed order of operations for parsing (@davglass)
+- [9d4db11](https://github.com/davglass/license-checker/commit/9d4db112794b8110a1bfe0abfe2d3e63bc812299) Updated changelog (@davglass)
+
 ### v7.0.0 (2016/09/06 14:50 +00:00)
@@ -4,0 +9,0 @@ - [a3a08da](https://github.com/davglass/license-checker/commit/a3a08da70b680d724045f655e107f36b16b45fea) 7.0.0 (@davglass)

lib/index.js

@@ -115,3 +115,3 @@ /*
                 if (typeof license === 'object') {
-                    return license.type;
+                    return license.type || license.name;
                 } else if (typeof license === 'string') {
@@ -121,4 +121,4 @@ 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') {
@@ -131,2 +131,9 @@ moduleInfo.licenses = licenseData;
 
+    if (Array.isArray(moduleInfo.licenses)) {
+        /*istanbul ignore else*/
+        if (moduleInfo.licenses.length === 1) {
+            moduleInfo.licenses = moduleInfo.licenses[0];
+        }
+    }
+
     /*istanbul ignore else*/
@@ -153,9 +160,2 @@ if (json.path && fs.existsSync(json.path)) {
 
-    if (Array.isArray(moduleInfo.licenses)) {
-        /*istanbul ignore else*/
-        if (moduleInfo.licenses.length === 1) {
-            moduleInfo.licenses = moduleInfo.licenses[0];
-        }
-    }
-
     /*istanbul ignore else*/
@@ -162,0 +162,0 @@ if (json.dependencies) {

package.json

@@ -5,3 +5,3 @@ {
   "author": "Dav Glass <[e-mail]>",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "contributors": [
@@ -8,0 +8,0 @@ "Adam Weber <[e-mail]>",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

73871

increased by0.69%

No dependency changes