This commit is contained in:
David Kale
2020-09-08 13:25:36 -04:00
parent e4246d2b5b
commit 91fcbb0108
4227 changed files with 416837 additions and 457884 deletions

View File

@@ -39,7 +39,7 @@ The syntax comes from the [Software Package Data eXchange (SPDX)](https://spdx.o
The bulk of the SPDX standard describes syntax and semantics of XML metadata files. This package implements two lightweight, plain-text components of that larger standard:
1. The [license list](https://spdx.org/licenses), a mapping from specific string identifiers, like `Apache-2.0`, to standard form license texts and bolt-on license exceptions. The [spdx-license-ids](https://www.npmjs.com/package/spdx-exceptions) and [spdx-exceptions](https://www.npmjs.com/package/spdx-license-ids) packages implement the license list. `spdx-expression-parse` depends on and `require()`s them.
1. The [license list](https://spdx.org/licenses), a mapping from specific string identifiers, like `Apache-2.0`, to standard form license texts and bolt-on license exceptions. The [spdx-license-ids](https://www.npmjs.com/package/spdx-license-ids) and [spdx-exceptions](https://www.npmjs.com/package/spdx-exceptions) packages implement the license list. `spdx-expression-parse` depends on and `require()`s them.
Any license identifier from the license list is a valid license expression:

View File

@@ -1,42 +1,37 @@
{
"_args": [
[
"spdx-expression-parse@3.0.0",
"/Users/pjquirk/Source/GitHub/actions/labeler"
]
],
"_development": true,
"_from": "spdx-expression-parse@3.0.0",
"_id": "spdx-expression-parse@3.0.0",
"_from": "spdx-expression-parse@^3.0.0",
"_id": "spdx-expression-parse@3.0.1",
"_inBundle": false,
"_integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
"_integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
"_location": "/spdx-expression-parse",
"_phantomChildren": {},
"_requested": {
"type": "version",
"type": "range",
"registry": true,
"raw": "spdx-expression-parse@3.0.0",
"raw": "spdx-expression-parse@^3.0.0",
"name": "spdx-expression-parse",
"escapedName": "spdx-expression-parse",
"rawSpec": "3.0.0",
"rawSpec": "^3.0.0",
"saveSpec": null,
"fetchSpec": "3.0.0"
"fetchSpec": "^3.0.0"
},
"_requiredBy": [
"/spdx-correct",
"/validate-npm-package-license"
],
"_resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
"_spec": "3.0.0",
"_where": "/Users/pjquirk/Source/GitHub/actions/labeler",
"_resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
"_shasum": "cf70f50482eefdc98e3ce0a6833e4a53ceeba679",
"_spec": "spdx-expression-parse@^3.0.0",
"_where": "/Users/dakale/dev/GitHub/actions/labeler/node_modules/validate-npm-package-license",
"author": {
"name": "Kyle E. Mitchell",
"email": "kyle@kemitchell.com",
"url": "http://kemitchell.com"
"url": "https://kemitchell.com"
},
"bugs": {
"url": "https://github.com/jslicense/spdx-expression-parse.js/issues"
},
"bundleDependencies": false,
"contributors": [
{
"name": "C. Scott Ananian",
@@ -61,12 +56,12 @@
"spdx-exceptions": "^2.1.0",
"spdx-license-ids": "^3.0.0"
},
"deprecated": false,
"description": "parse SPDX license expressions",
"devDependencies": {
"defence-cli": "^2.0.1",
"mocha": "^3.4.2",
"defence-cli": "^3.0.1",
"replace-require-self": "^1.0.0",
"standard": "^10.0.2"
"standard": "^14.1.0"
},
"files": [
"AUTHORS",
@@ -93,9 +88,9 @@
},
"scripts": {
"lint": "standard",
"test": "npm run test:mocha && npm run test:readme",
"test:mocha": "mocha test/index.js",
"test:readme": "defence -i javascript README.md | replace-require-self | node"
"test": "npm run test:suite && npm run test:readme",
"test:readme": "defence -i javascript README.md | replace-require-self | node",
"test:suite": "node test.js"
},
"version": "3.0.0"
"version": "3.0.1"
}

View File

@@ -60,7 +60,7 @@ module.exports = function (tokens) {
if (t.type === 'LICENSEREF') {
next()
string += 'LicenseRef-' + t.string
return {license: string}
return { license: string }
}
index = begin
}
@@ -69,7 +69,7 @@ module.exports = function (tokens) {
var t = token()
if (t && t.type === 'LICENSE') {
next()
var node = {license: t.string}
var node = { license: t.string }
if (parseOperator('+')) {
node.plus = true
}

View File

@@ -70,14 +70,14 @@ module.exports = function (source) {
function documentRef () {
if (read('DocumentRef-')) {
var string = expectIdstring()
return {type: 'DOCUMENTREF', string: string}
return { type: 'DOCUMENTREF', string: string }
}
}
function licenseRef () {
if (read('LicenseRef-')) {
var string = expectIdstring()
return {type: 'LICENSEREF', string: string}
return { type: 'LICENSEREF', string: string }
}
}