1 files changed, 70 insertions, 31 deletions

diff --git a/spec/fixtures/expected/js/yarn/v1.1.json b/spec/fixtures/expected/js/yarn/v1.1.json
index ddb581f..a8b760d 100644
--- a/spec/fixtures/expected/js/yarn/v1.1.json
+++ b/spec/fixtures/expected/js/yarn/v1.1.json
@@ -43,51 +43,51 @@
     },
     {
       "count": 1,
-      "name": "(BSD-2-Clause OR MIT OR Apache-2.0)"
+      "name": "BSD*"
     },
     {
       "count": 1,
-      "name": "(GPL-2.0 OR MIT)"
+      "name": "LIL"
     },
     {
       "count": 1,
-      "name": "(MIT AND BSD-3-Clause)"
+      "name": "MIT, Apache 2.0"
     },
     {
       "count": 1,
-      "name": "(MIT AND Zlib)"
+      "name": "MIT, CC0-1.0"
     },
     {
       "count": 1,
-      "name": "(MIT OR Apache-2.0)"
+      "name": "MIT, GPL-2.0"
     },
     {
       "count": 1,
-      "name": "(MIT OR CC0-1.0)"
+      "name": "Mozilla Public License 2.0"
     },
     {
       "count": 1,
-      "name": "(WTFPL OR MIT)"
+      "name": "New BSD, MIT"
     },
     {
       "count": 1,
-      "name": "BSD*"
+      "name": "Public Domain"
     },
     {
       "count": 1,
-      "name": "LIL"
+      "name": "Simplified BSD, MIT, Apache 2.0"
     },
     {
       "count": 1,
-      "name": "Mozilla Public License 2.0"
+      "name": "UNKNOWN"
     },
     {
       "count": 1,
-      "name": "Public Domain"
+      "name": "WTFPL, MIT"
     },
     {
       "count": 1,
-      "name": "UNKNOWN"
+      "name": "Zlib, MIT"
     }
   ],
   "dependencies": [
@@ -3652,12 +3652,17 @@
     {
       "licenses": [
         {
-          "name": "(MIT OR Apache-2.0)",
-          "url": ""
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
+        {
+          "name": "MIT",
+          "url": "http://opensource.org/licenses/mit-license"
         }
       ],
       "license": {
-        "name": "(MIT OR Apache-2.0)"
+        "name": "MIT, Apache 2.0",
+        "url": "http://opensource.org/licenses/mit-license"
       },
       "dependency": {
         "name": "atob",
@@ -14556,12 +14561,17 @@
     {
       "licenses": [
         {
-          "name": "(WTFPL OR MIT)",
-          "url": ""
+          "name": "MIT",
+          "url": "http://opensource.org/licenses/mit-license"
+        },
+        {
+          "name": "WTFPL",
+          "url": "http://www.wtfpl.net/"
         }
       ],
       "license": {
-        "name": "(WTFPL OR MIT)"
+        "name": "WTFPL, MIT",
+        "url": "http://opensource.org/licenses/mit-license"
       },
       "dependency": {
         "name": "opener",
@@ -14755,12 +14765,17 @@
     {
       "licenses": [
         {
-          "name": "(MIT AND Zlib)",
+          "name": "MIT",
+          "url": "http://opensource.org/licenses/mit-license"
+        },
+        {
+          "name": "Zlib",
           "url": ""
         }
       ],
       "license": {
-        "name": "(MIT AND Zlib)"
+        "name": "Zlib, MIT",
+        "url": "http://opensource.org/licenses/mit-license"
       },
       "dependency": {
         "name": "pako",
@@ -18078,12 +18093,21 @@
     {
       "licenses": [
         {
-          "name": "(BSD-2-Clause OR MIT OR Apache-2.0)",
-          "url": ""
+          "name": "Apache 2.0",
+          "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
+        {
+          "name": "MIT",
+          "url": "http://opensource.org/licenses/mit-license"
+        },
+        {
+          "name": "Simplified BSD",
+          "url": "http://opensource.org/licenses/bsd-license"
         }
       ],
       "license": {
-        "name": "(BSD-2-Clause OR MIT OR Apache-2.0)"
+        "name": "Simplified BSD, MIT, Apache 2.0",
+        "url": "http://opensource.org/licenses/bsd-license"
       },
       "dependency": {
         "name": "rc",
@@ -19197,12 +19221,17 @@
     {
       "licenses": [
         {
-          "name": "(MIT AND BSD-3-Clause)",
-          "url": ""
+          "name": "MIT",
+          "url": "http://opensource.org/licenses/mit-license"
+        },
+        {
+          "name": "New BSD",
+          "url": "http://opensource.org/licenses/BSD-3-Clause"
         }
       ],
       "license": {
-        "name": "(MIT AND BSD-3-Clause)"
+        "name": "New BSD, MIT",
+        "url": "http://opensource.org/licenses/BSD-3-Clause"
       },
       "dependency": {
         "name": "sha.js",
@@ -20955,12 +20984,17 @@
     {
       "licenses": [
         {
-          "name": "(MIT OR CC0-1.0)",
+          "name": "CC0-1.0",
           "url": ""
+        },
+        {
+          "name": "MIT",
+          "url": "http://opensource.org/licenses/mit-license"
         }
       ],
       "license": {
-        "name": "(MIT OR CC0-1.0)"
+        "name": "MIT, CC0-1.0",
+        "url": "http://opensource.org/licenses/mit-license"
       },
       "dependency": {
         "name": "type-fest",
@@ -21014,12 +21048,17 @@
     {
       "licenses": [
         {
-          "name": "(GPL-2.0 OR MIT)",
+          "name": "GPL-2.0",
           "url": ""
+        },
+        {
+          "name": "MIT",
+          "url": "http://opensource.org/licenses/mit-license"
         }
       ],
       "license": {
-        "name": "(GPL-2.0 OR MIT)"
+        "name": "MIT, GPL-2.0",
+        "url": "http://opensource.org/licenses/mit-license"
       },
       "dependency": {
         "name": "ua-parser-js",
@@ -22770,4 +22809,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file