avancement planning

node_modules/spdx-expression-parse/README.md

@@ -47,6 +47,7 @@ The bulk of the SPDX standard describes syntax and semantics of XML metadata fil
     var identifiers = []
       .concat(require('spdx-license-ids'))
       .concat(require('spdx-license-ids/deprecated'))
+      .filter(function (id) { return id[id.length - 1] !== '+' })
 
     identifiers.forEach(function (id) {
       assert.deepEqual(parse(id), {license: id})
@@ -88,4 +89,17 @@ The bulk of the SPDX standard describes syntax and semantics of XML metadata fil
     )
     ```
 
+This package differs slightly from the SPDX standard in allowing lower- and mixed-case `AND`, `OR`, and `WITH` operators:
+
+```javascript
+assert.deepEqual(
+  parse('MIT or BSD-2-Clause'),
+  { left: { license: 'MIT' }, conjunction: 'or', right: { license: 'BSD-2-Clause' } }
+)
+assert.deepEqual(
+  parse('GPL-2.0 with GCC-exception-2.0'),
+  { license: 'GPL-2.0', exception: 'GCC-exception-2.0' }
+)
+```
+
 The Linux Foundation and its contributors license the SPDX standard under the terms of [the Creative Commons Attribution License 3.0 Unported (SPDX: "CC-BY-3.0")](http://spdx.org/licenses/CC-BY-3.0).  "SPDX" is a United States federally registered trademark of the Linux Foundation.  The authors of this package license their work under the terms of the MIT License.

node_modules/spdx-expression-parse/package.json

@@ -1,7 +1,7 @@
 {
   "name": "spdx-expression-parse",
   "description": "parse SPDX license expressions",
-  "version": "3.0.1",
+  "version": "4.0.0",
   "author": "Kyle E. Mitchell <kyle@kemitchell.com> (https://kemitchell.com)",
   "files": [
     "AUTHORS",

node_modules/spdx-expression-parse/scan.js

@@ -37,7 +37,7 @@ module.exports = function (source) {
 
   function operator () {
     var string
-    var possibilities = ['WITH', 'AND', 'OR', '(', ')', ':', '+']
+    var possibilities = [/^WITH/i, /^AND/i, /^OR/i, '(', ')', ':', '+']
     for (var i = 0; i < possibilities.length; i++) {
       string = read(possibilities[i])
       if (string) {
@@ -51,7 +51,7 @@ module.exports = function (source) {
 
     return string && {
       type: 'OPERATOR',
-      string: string
+      string: string.toUpperCase()
     }
   }