fix(check-values): check for whole SPDX expression, not only single identifiers

Author: brettz9

README.md

@@ -3212,7 +3212,7 @@ function quux (foo) {
 function quux (foo) {
 
 }
-// Message: Invalid JSDoc @license: "FOO"; expected SPDX identifier: https://spdx.org/licenses/.
+// Message: Invalid JSDoc @license: "FOO"; expected SPDX expression: https://spdx.org/licenses/.
 
 /**
  * @license FOO
@@ -3223,6 +3223,14 @@ function quux (foo) {
 // Options: [{"allowedLicenses":["BAR","BAX"]}]
 // Message: Invalid JSDoc @license: "FOO"; expected one of BAR, BAX.
 
+/**
+ * @license (MIT OR GPL-2.5)
+ */
+function quux (foo) {
+
+}
+// Message: Invalid JSDoc @license: "(MIT OR GPL-2.5)"; expected SPDX expression: https://spdx.org/licenses/.
+
 /**
  * @author
  */
@@ -3265,6 +3273,13 @@ function quux (foo) {
 
 }
 
+/**
+ * @license (MIT OR GPL-2.0)
+ */
+function quux (foo) {
+
+}
+
 /**
  * @license FOO
  */

package.json

@@ -12,7 +12,7 @@
     "object.entries-ponyfill": "^1.0.1",
     "regextras": "^0.6.1",
     "semver": "^6.3.0",
-    "spdx-license-list": "^6.1.0"
+    "spdx-expression-parse": "^3.0.0"
   },
   "description": "JSDoc linting rules for ESLint.",
   "devDependencies": {

src/rules/checkValues.js

@@ -1,5 +1,5 @@
 import semver from 'semver';
-import spdxLicenseList from 'spdx-license-list/simple';
+import spdxExpressionParse from 'spdx-expression-parse';
 import iterateJsdoc from '../iterateJsdoc';
 
 export default iterateJsdoc(({
@@ -56,17 +56,21 @@ export default iterateJsdoc(({
     } else if (allowedLicenses) {
       if (allowedLicenses !== true && !allowedLicenses.includes(license)) {
         report(
-          `Invalid JSDoc @${targetTagName}: "${jsdocParameter.description}"; expected one of ${allowedLicenses.join(', ')}.`,
+          `Invalid JSDoc @${targetTagName}: "${license}"; expected one of ${allowedLicenses.join(', ')}.`,
+          null,
+          jsdocParameter,
+        );
+      }
+    } else {
+      try {
+        spdxExpressionParse(license);
+      } catch (error) {
+        report(
+          `Invalid JSDoc @${targetTagName}: "${license}"; expected SPDX expression: https://spdx.org/licenses/.`,
           null,
           jsdocParameter,
         );
       }
-    } else if (!spdxLicenseList.has(license)) {
-      report(
-        `Invalid JSDoc @${targetTagName}: "${jsdocParameter.description}"; expected SPDX identifier: https://spdx.org/licenses/.`,
-        null,
-        jsdocParameter,
-      );
     }
   });
 
@@ -114,6 +118,9 @@ export default iterateJsdoc(({
               },
             ],
           },
+          licensePattern: {
+            type: 'string',
+          },
         },
         type: 'object',
       },

test/rules/assertions/checkValues.js

@@ -92,7 +92,7 @@ export default {
       errors: [
         {
           line: 3,
-          message: 'Invalid JSDoc @license: "FOO"; expected SPDX identifier: https://spdx.org/licenses/.',
+          message: 'Invalid JSDoc @license: "FOO"; expected SPDX expression: https://spdx.org/licenses/.',
         },
       ],
     },
@@ -117,6 +117,21 @@ export default {
         },
       ],
     },
+    {
+      code: `
+      /**
+       * @license (MIT OR GPL-2.5)
+       */
+      function quux (foo) {
+
+      }
+      `,
+      errors: [
+        {
+          message: 'Invalid JSDoc @license: "(MIT OR GPL-2.5)"; expected SPDX expression: https://spdx.org/licenses/.',
+        },
+      ],
+    },
     {
       code: `
       /**
@@ -186,6 +201,16 @@ export default {
       }
       `,
     },
+    {
+      code: `
+      /**
+       * @license (MIT OR GPL-2.0)
+       */
+      function quux (foo) {
+
+      }
+      `,
+    },
     {
       code: `
       /**