Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jslicense/spdx-expression-parse.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: clearlydefined/spdx-expression-parse.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 7 commits
  • 4 files changed
  • 5 contributors

Commits on Apr 1, 2021

  1. Update spdx-license-ids from 3.0.2 to 3.0.7

    There is an license spdx valiation error for PSF-2.0 because [email protected]
    doesn't include PSF-2.0
    MichaelTsengLZ committed Apr 1, 2021
    Copy the full SHA
    b11e982 View commit details

Commits on Apr 19, 2021

  1. Merge pull request #2 from MichaelTsengLZ/miczeng/updateLicenses

    Update spdx-license-ids from 3.0.2 to 3.0.7
    nellshamrell authored Apr 19, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7c164a6 View commit details
  2. Copy the full SHA
    f5ab45a View commit details
  3. cleans up whitespace, adds more clarification

    Signed-off-by: Nell Shamrell <[email protected]>
    nellshamrell committed Apr 19, 2021
    Copy the full SHA
    80ea48b View commit details
  4. Merge pull request #4 from clearlydefined/nell/add-documentation

    Nell/add documentation
    nellshamrell authored Apr 19, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c8f45e1 View commit details

Commits on Feb 6, 2023

  1. Update spdx-license-ids

    qtomlinson committed Feb 6, 2023
    Copy the full SHA
    9a97964 View commit details

Commits on Apr 12, 2023

  1. Merge pull request #5 from qtomlinson/qt/update_spdx-license-ids

    Update spdx-license-ids
    mpcen authored Apr 12, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    da85af1 View commit details
Showing with 29 additions and 4 deletions.
  1. +19 −0 README.md
  2. +3 −3 package-lock.json
  3. +1 −1 package.json
  4. +6 −0 test/index.js
19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
# spx-expression-parse.js

## Notes
* This is a fork of https://github.com/jslicense/spdx-expression-parse.js
* This fork is used by [clearlydefined/service](https://github.com/clearlydefined/service)
* This fork has some additional license strings that are used by ClearlyDefined

## Deploying a change
* Make the change in a pull request to this repo
* After review, merge the pull request here
* Go to the [ClearlyDefined Azure DevOps Pipeline Page](https://dev.azure.com/clearlydefined/ClearlyDefined/_build) (if you need access, reach out to @nellshamrell)
* Do a new build of the service-master pipeline
* If that build passes, do a new build of the service-prod pipeline

## Adding a license string
* If you are adding a new license string (like in [this pull request](https://github.com/clearlydefined/spdx-expression-parse.js/pull/1), you will also need to add the license string to the [clearlydefined/spdx](https://github.com/clearlydefined/spdx) repo

## Original README text

This package parses [SPDX license expression](https://spdx.org/spdx-specification-21-web-version#h.jxpfx0ykyb60) strings describing license terms, like [package.json license strings](https://docs.npmjs.com/files/package.json#license), into consistently structured ECMAScript objects. The npm command-line interface depends on this package, as do many automatic license-audit tools.

In a nutshell:
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
],
"dependencies": {
"spdx-exceptions": "^2.1.0",
"spdx-license-ids": "^3.0.0"
"spdx-license-ids": "^3.0.12"
},
"devDependencies": {
"defence-cli": "^2.0.1",
6 changes: 6 additions & 0 deletions test/index.js
Original file line number Diff line number Diff line change
@@ -83,3 +83,9 @@ it('parses `AND`, `OR` and `WITH` with the correct precedence', function () {
}
)
})

it('should parse BSD-3-Clause-Modification', function () {
assert.deepEqual(
p('BSD-3-Clause-Modification'),
{license: 'BSD-3-Clause-Modification'})
})