Merge pull request #1203 from qtomlinson/qt/update_spdx

Update to @clearlydefined/spdx v0.1.8

package.json

@@ -21,7 +21,7 @@
     "url": "git+https://github.com/clearlydefined/service.git"
   },
   "dependencies": {
-    "@clearlydefined/spdx": "^0.1.7",
+    "@clearlydefined/spdx": "github:clearlydefined/spdx#v0.1.8",
     "@gitbeaker/node": "^29.2.4",
     "@octokit/rest": "^14.0.9",
     "ajv": "^6.12.3",

test/business/aggregatorTest.js

@@ -95,9 +95,7 @@ describe('Aggregation service', () => {
         name: 'slog',
         version: '2.7.0',
         tools: [['clearlydefined', 'licensee', 'scancode']],
-        // Ideally this would be declared without any parentheses, but currently
-        // the SPDX normalization adds them.
-        expected: 'MPL-2.0 OR (MIT OR Apache-2.0)'
+        expected: 'MPL-2.0 OR MIT OR Apache-2.0'
       },
       {
         name: 'quote',

test/lib/spdx.js

@@ -82,7 +82,7 @@ describe('SPDX utility functions', () => {
             right: { left: { license: 'BSD-3-Clause' }, conjunction: 'and', right: { license: 'Unlicense' } }
           }
         },
-        'MIT OR (BSD-2-Clause OR BSD-3-Clause AND Unlicense)'
+        'MIT OR BSD-2-Clause OR BSD-3-Clause AND Unlicense'
       ],
       [
         {
@@ -217,13 +217,17 @@ describe('SPDX utility functions', () => {
       'NOASSERTION': 'NOASSERTION',
       'See license': 'NOASSERTION',
       'MIT OR Apache-2.0': 'MIT OR Apache-2.0',
+      'MIT or Apache-2.0': 'NOASSERTION',
+      'mit AND apache-2.0': 'MIT AND Apache-2.0',
       'MIT AND LGPL-2.1+ AND BSD-3-Clause': 'MIT AND LGPL-2.1+ AND BSD-3-Clause',
       '(MIT AND BSD-3-Clause WITH GCC-exception-3.1) OR (CC-BY-4.0 AND Apache-2.0)': 'MIT AND BSD-3-Clause WITH GCC-exception-3.1 OR CC-BY-4.0 AND Apache-2.0',
       'MIT AND BSD-3-Clause AND CC-BY-4.0': 'MIT AND BSD-3-Clause AND CC-BY-4.0',
       'MIT OR Junk': 'MIT OR NOASSERTION',
       'mit OR Junk': 'MIT OR NOASSERTION',
       'Commercial AND Apache-2.0': 'NOASSERTION AND Apache-2.0',
       'Junk1 OR Junk 2': 'NOASSERTION',
+      'LGPL-2.1-only OR MIT OR BSD-3-Clause': 'LGPL-2.1-only OR MIT OR BSD-3-Clause',
+      'LGPL-2.1-only OR BSD-3-Clause AND MIT': 'LGPL-2.1-only OR BSD-3-Clause AND MIT',
       ' ': null,
       null: null
     }