diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/package-lock-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/project-with-lockfile-expected-output.yml similarity index 99% rename from plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/package-lock-expected-output.yml rename to plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/project-with-lockfile-expected-output.yml index 3c7b6157e39a5..e58b00e8fac39 100644 --- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/package-lock-expected-output.yml +++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/project-with-lockfile-expected-output.yml @@ -1,6 +1,6 @@ --- project: - id: "NPM:::1.0.0" + id: "NPM::npm-package-lock:1.0.0" definition_file_path: "" authors: - "The Author" diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/package-lock/package-lock.json b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/project-with-lockfile/package-lock.json similarity index 100% rename from plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/package-lock/package-lock.json rename to plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/project-with-lockfile/package-lock.json diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/package-lock/package.json b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/project-with-lockfile/package.json similarity index 100% rename from plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/package-lock/package.json rename to plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/project-with-lockfile/package.json index 585813bd2a3d6..a12f48d237a15 100644 --- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/package-lock/package.json +++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm/project-with-lockfile/package.json @@ -10,8 +10,8 @@ "author": "The Author (https://www.the.author.example/index.html)", "private": true, "dependencies": { - "long": "^3.2.0", "cheerio": "1.0.0-rc.1", + "long": "^3.2.0", "web-animations-js": "github:web-animations/web-animations-js#2.3.2" }, "devDependencies": { diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-expected-output.yml index eb30e8c8b7f2f..f32b1d72eb850 100644 --- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-expected-output.yml +++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile-expected-output.yml @@ -2,6 +2,8 @@ project: id: "PNPM::pnpm-package-with-lockfile:1.0.0" definition_file_path: "" + authors: + - "The Author" declared_licenses: - "Apache-2.0" declared_licenses_processed: @@ -71,6 +73,7 @@ project: - id: "NPM::promise:7.3.1" dependencies: - id: "NPM::asap:2.0.6" + - id: "NPM::web-animations-js:2.3.2" - name: "devDependencies" dependencies: - id: "NPM::cson:4.1.0" @@ -1140,6 +1143,34 @@ packages: url: "https://github.com/TooTallNate/util-deprecate.git" revision: "475fb6857cd23fafff20c1be846c1350abf8e6d4" path: "" +- id: "NPM::web-animations-js:2.3.2" + purl: "pkg:npm/web-animations-js@2.3.2" + declared_licenses: + - "Apache-2.0" + declared_licenses_processed: + spdx_expression: "Apache-2.0" + description: "JavaScript implementation of the Web Animations API" + homepage_url: "https://github.com/web-animations" + binary_artifact: + url: "" + hash: + value: "" + algorithm: "" + source_artifact: + url: "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.2.tgz" + hash: + value: "a51963a359c543f97b47c7d4bc2d811f9fc9e153" + algorithm: "SHA-1" + vcs: + type: "Git" + url: "https://github.com/web-animations/web-animations-js.git" + revision: "64d83730282fdbce733460d44be52c132d6c04e9" + path: "" + vcs_processed: + type: "Git" + url: "https://github.com/web-animations/web-animations-js.git" + revision: "64d83730282fdbce733460d44be52c132d6c04e9" + path: "" - id: "NPM:@types:node:18.0.6" purl: "pkg:npm/%40types/node@18.0.6" declared_licenses: diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile/package.json b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile/package.json index 45bed7b6b4326..a0393e8a0f173 100644 --- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile/package.json +++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile/package.json @@ -7,10 +7,12 @@ "url": "https://github.com/oss-review-toolkit/ort.git" }, "license": "Apache-2.0", + "author": "The Author (https://www.the.author.example/index.html)", "private": true, "dependencies": { "cheerio": "1.0.0-rc.1", - "long": "^3.2.0" + "long": "^3.2.0", + "web-animations-js": "github:web-animations/web-animations-js#2.3.2" }, "devDependencies": { "cson": "~4.1.0" diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile/pnpm-lock.yaml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile/pnpm-lock.yaml index 3d590057968e7..a2158e2d4c5f1 100644 --- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile/pnpm-lock.yaml +++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm/project-with-lockfile/pnpm-lock.yaml @@ -14,6 +14,9 @@ importers: long: specifier: ^3.2.0 version: 3.2.0 + web-animations-js: + specifier: github:web-animations/web-animations-js#2.3.2 + version: https://codeload.github.com/web-animations/web-animations-js/tar.gz/64d83730282fdbce733460d44be52c132d6c04e9 optionalDependencies: promise: specifier: ~7.3.1 @@ -146,6 +149,10 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + web-animations-js@https://codeload.github.com/web-animations/web-animations-js/tar.gz/64d83730282fdbce733460d44be52c132d6c04e9: + resolution: {tarball: https://codeload.github.com/web-animations/web-animations-js/tar.gz/64d83730282fdbce733460d44be52c132d6c04e9} + version: 2.3.2 + snapshots: '@types/node@18.0.6': {} @@ -286,3 +293,5 @@ snapshots: editions: 2.3.1 util-deprecate@1.0.2: {} + + web-animations-js@https://codeload.github.com/web-animations/web-animations-js/tar.gz/64d83730282fdbce733460d44be52c132d6c04e9: {} diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile-expected-output.yml index 2f10ac19bc0b0..8e71238754cbc 100644 --- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile-expected-output.yml +++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile-expected-output.yml @@ -2,6 +2,8 @@ project: id: "Yarn::yarn-package-with-lockfile:1.0.0" definition_file_path: "" + authors: + - "The Author" declared_licenses: - "Apache-2.0" declared_licenses_processed: @@ -71,6 +73,7 @@ project: - id: "NPM::promise:7.3.1" dependencies: - id: "NPM::asap:2.0.6" + - id: "NPM::web-animations-js:2.3.2" - name: "devDependencies" dependencies: - id: "NPM::cson:4.1.0" @@ -1132,6 +1135,34 @@ packages: url: "https://github.com/TooTallNate/util-deprecate.git" revision: "475fb6857cd23fafff20c1be846c1350abf8e6d4" path: "" +- id: "NPM::web-animations-js:2.3.2" + purl: "pkg:npm/web-animations-js@2.3.2" + declared_licenses: + - "Apache-2.0" + declared_licenses_processed: + spdx_expression: "Apache-2.0" + description: "JavaScript implementation of the Web Animations API" + homepage_url: "https://github.com/web-animations" + binary_artifact: + url: "" + hash: + value: "" + algorithm: "" + source_artifact: + url: "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.2.tgz" + hash: + value: "a51963a359c543f97b47c7d4bc2d811f9fc9e153" + algorithm: "SHA-1" + vcs: + type: "Git" + url: "https://github.com/web-animations/web-animations-js.git" + revision: "64d83730282fdbce733460d44be52c132d6c04e9" + path: "" + vcs_processed: + type: "Git" + url: "https://github.com/web-animations/web-animations-js.git" + revision: "64d83730282fdbce733460d44be52c132d6c04e9" + path: "" - id: "NPM:@types:node:12.6.8" purl: "pkg:npm/%40types/node@12.6.8" declared_licenses: diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile/package.json b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile/package.json index b26273f5080fa..a89529998e307 100644 --- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile/package.json +++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile/package.json @@ -7,10 +7,12 @@ "url": "https://github.com/oss-review-toolkit/ort.git" }, "license": "Apache-2.0", + "author": "The Author (https://www.the.author.example/index.html)", "private": true, "dependencies": { + "cheerio": "1.0.0-rc.1", "long": "^3.2.0", - "cheerio": "1.0.0-rc.1" + "web-animations-js": "github:web-animations/web-animations-js#2.3.2" }, "devDependencies": { "cson": "~4.1.0" diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile/yarn.lock b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile/yarn.lock index f15dc8bd862e2..618f682c8e691 100644 --- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile/yarn.lock +++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn/project-with-lockfile/yarn.lock @@ -3,258 +3,246 @@ "@types/node@*": - "integrity" "sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg==" - "resolved" "https://registry.npmjs.org/@types/node/-/node-12.6.8.tgz" - "version" "12.6.8" - -"asap@~2.0.3": - "integrity" "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" - "resolved" "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" - "version" "2.0.6" - -"boolbase@~1.0.0": - "integrity" "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" - "resolved" "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz" - "version" "1.0.0" - -"cheerio@1.0.0-rc.1": - "integrity" "sha1-KvNzOeq3E+9rcs3pjO+mcrh2Qf4=" - "resolved" "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.1.tgz" - "version" "1.0.0-rc.1" + version "12.6.8" + resolved "https://registry.npmjs.org/@types/node/-/node-12.6.8.tgz" + integrity sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg== + +asap@~2.0.3: + version "2.0.6" + resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" + integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= + +boolbase@~1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz" + integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= + +cheerio@1.0.0-rc.1: + version "1.0.0-rc.1" + resolved "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.1.tgz" + integrity sha1-KvNzOeq3E+9rcs3pjO+mcrh2Qf4= + dependencies: + css-select "~1.2.0" + dom-serializer "~0.1.0" + entities "~1.1.1" + htmlparser2 "^3.9.1" + lodash "^4.15.0" + parse5 "^3.0.1" + +coffee-script@^1.10.0, coffee-script@^1.12.4: + version "1.12.7" + resolved "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz" + integrity sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw== + +cson-parser@^1.3.4: + version "1.3.5" + resolved "https://registry.npmjs.org/cson-parser/-/cson-parser-1.3.5.tgz" + integrity sha1-fsZ14DkUVTO/KmqFYHPxWZ2cLSQ= + dependencies: + coffee-script "^1.10.0" + +cson@~4.1.0: + version "4.1.0" + resolved "https://registry.npmjs.org/cson/-/cson-4.1.0.tgz" + integrity sha1-sQdTRPqdn+XPiNgPIdk2Ypa4Zcc= + dependencies: + coffee-script "^1.12.4" + cson-parser "^1.3.4" + extract-opts "^3.3.1" + requirefresh "^2.1.0" + safefs "^4.1.0" + +css-select@~1.2.0: + version "1.2.0" + resolved "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz" + integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= + dependencies: + boolbase "~1.0.0" + css-what "2.1" + domutils "1.5.1" + nth-check "~1.0.1" + +css-what@2.1: + version "2.1.3" + resolved "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz" + integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== + +dom-serializer@0, dom-serializer@~0.1.0: + version "0.1.1" + resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz" + integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA== + dependencies: + domelementtype "^1.3.0" + entities "^1.1.1" + +domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: + version "1.3.1" + resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz" + integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== + +domhandler@^2.3.0: + version "2.4.2" + resolved "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz" + integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA== + dependencies: + domelementtype "1" + +domutils@1.5.1, domutils@^1.5.1: + version "1.5.1" + resolved "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz" + integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= + dependencies: + dom-serializer "0" + domelementtype "1" + +eachr@^3.2.0: + version "3.2.0" + resolved "https://registry.npmjs.org/eachr/-/eachr-3.2.0.tgz" + integrity sha1-LDXkPqCGUW95l8+At6pk1VpKRIQ= + dependencies: + editions "^1.1.1" + typechecker "^4.3.0" + +editions@^1.1.1: + version "1.3.4" + resolved "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz" + integrity sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg== + +editions@^2.1.0, editions@^2.1.2, editions@^2.1.3: + version "2.1.3" + resolved "https://registry.npmjs.org/editions/-/editions-2.1.3.tgz" + integrity sha512-xDZyVm0A4nLgMNWVVLJvcwMjI80ShiH/27RyLiCnW1L273TcJIA25C4pwJ33AWV01OX6UriP35Xu+lH4S7HWQw== + dependencies: + errlop "^1.1.1" + semver "^5.6.0" + +entities@^1.1.1, entities@~1.1.1: + version "1.1.2" + resolved "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz" + integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== + +errlop@^1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/errlop/-/errlop-1.1.1.tgz" + integrity sha512-WX7QjiPHhsny7/PQvrhS5VMizXXKoKCS3udaBp8gjlARdbn+XmK300eKBAAN0hGyRaTCtRpOaxK+xFVPUJ3zkw== + dependencies: + editions "^2.1.2" + +extract-opts@^3.3.1: + version "3.3.1" + resolved "https://registry.npmjs.org/extract-opts/-/extract-opts-3.3.1.tgz" + integrity sha1-WrvtyYwNUgLjJ4cn+Rktfghsa+E= + dependencies: + eachr "^3.2.0" + editions "^1.1.1" + typechecker "^4.3.0" + +graceful-fs@^4.1.4: + version "4.2.0" + resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz" + integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg== + +htmlparser2@^3.9.1: + version "3.10.1" + resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz" + integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== + dependencies: + domelementtype "^1.3.1" + domhandler "^2.3.0" + domutils "^1.5.1" + entities "^1.1.1" + inherits "^2.0.1" + readable-stream "^3.1.1" + +inherits@^2.0.1, inherits@^2.0.3: + version "2.0.4" + resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +lodash@^4.15.0: + version "4.17.15" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== + +long@^3.2.0: + version "3.2.0" + resolved "https://registry.npmjs.org/long/-/long-3.2.0.tgz" + integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s= + +nth-check@~1.0.1: + version "1.0.2" + resolved "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz" + integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== + dependencies: + boolbase "~1.0.0" + +parse5@^3.0.1: + version "3.0.3" + resolved "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz" + integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA== dependencies: - "css-select" "~1.2.0" - "dom-serializer" "~0.1.0" - "entities" "~1.1.1" - "htmlparser2" "^3.9.1" - "lodash" "^4.15.0" - "parse5" "^3.0.1" - -"coffee-script@^1.10.0", "coffee-script@^1.12.4": - "integrity" "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==" - "resolved" "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz" - "version" "1.12.7" - -"cson-parser@^1.3.4": - "integrity" "sha1-fsZ14DkUVTO/KmqFYHPxWZ2cLSQ=" - "resolved" "https://registry.npmjs.org/cson-parser/-/cson-parser-1.3.5.tgz" - "version" "1.3.5" - dependencies: - "coffee-script" "^1.10.0" - -"cson@~4.1.0": - "integrity" "sha1-sQdTRPqdn+XPiNgPIdk2Ypa4Zcc=" - "resolved" "https://registry.npmjs.org/cson/-/cson-4.1.0.tgz" - "version" "4.1.0" - dependencies: - "coffee-script" "^1.12.4" - "cson-parser" "^1.3.4" - "extract-opts" "^3.3.1" - "requirefresh" "^2.1.0" - "safefs" "^4.1.0" - -"css-select@~1.2.0": - "integrity" "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=" - "resolved" "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz" - "version" "1.2.0" - dependencies: - "boolbase" "~1.0.0" - "css-what" "2.1" - "domutils" "1.5.1" - "nth-check" "~1.0.1" - -"css-what@2.1": - "integrity" "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" - "resolved" "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz" - "version" "2.1.3" - -"dom-serializer@~0.1.0", "dom-serializer@0": - "integrity" "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==" - "resolved" "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz" - "version" "0.1.1" - dependencies: - "domelementtype" "^1.3.0" - "entities" "^1.1.1" - -"domelementtype@^1.3.0", "domelementtype@^1.3.1", "domelementtype@1": - "integrity" "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" - "resolved" "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz" - "version" "1.3.1" - -"domhandler@^2.3.0": - "integrity" "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==" - "resolved" "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz" - "version" "2.4.2" - dependencies: - "domelementtype" "1" - -"domutils@^1.5.1", "domutils@1.5.1": - "integrity" "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=" - "resolved" "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz" - "version" "1.5.1" - dependencies: - "dom-serializer" "0" - "domelementtype" "1" + "@types/node" "*" -"eachr@^3.2.0": - "integrity" "sha1-LDXkPqCGUW95l8+At6pk1VpKRIQ=" - "resolved" "https://registry.npmjs.org/eachr/-/eachr-3.2.0.tgz" - "version" "3.2.0" - dependencies: - "editions" "^1.1.1" - "typechecker" "^4.3.0" - -"editions@^1.1.1": - "integrity" "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==" - "resolved" "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz" - "version" "1.3.4" - -"editions@^2.1.0": - "integrity" "sha512-xDZyVm0A4nLgMNWVVLJvcwMjI80ShiH/27RyLiCnW1L273TcJIA25C4pwJ33AWV01OX6UriP35Xu+lH4S7HWQw==" - "resolved" "https://registry.npmjs.org/editions/-/editions-2.1.3.tgz" - "version" "2.1.3" +promise@~7.3.1: + version "7.3.1" + resolved "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz" + integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== dependencies: - "errlop" "^1.1.1" - "semver" "^5.6.0" + asap "~2.0.3" -"editions@^2.1.2": - "integrity" "sha512-xDZyVm0A4nLgMNWVVLJvcwMjI80ShiH/27RyLiCnW1L273TcJIA25C4pwJ33AWV01OX6UriP35Xu+lH4S7HWQw==" - "resolved" "https://registry.npmjs.org/editions/-/editions-2.1.3.tgz" - "version" "2.1.3" +readable-stream@^3.1.1: + version "3.4.0" + resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz" + integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ== dependencies: - "errlop" "^1.1.1" - "semver" "^5.6.0" + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" -"editions@^2.1.3": - "integrity" "sha512-xDZyVm0A4nLgMNWVVLJvcwMjI80ShiH/27RyLiCnW1L273TcJIA25C4pwJ33AWV01OX6UriP35Xu+lH4S7HWQw==" - "resolved" "https://registry.npmjs.org/editions/-/editions-2.1.3.tgz" - "version" "2.1.3" +requirefresh@^2.1.0: + version "2.2.0" + resolved "https://registry.npmjs.org/requirefresh/-/requirefresh-2.2.0.tgz" + integrity sha512-gXQWrZkXNZZ6qVEh6PQvoASxLY3r6AR4jH8fFjZ+BfPJpDV6RTI82J4A3tkAn2wikU7rxfzU3sIPj94zEV6xPA== dependencies: - "errlop" "^1.1.1" - "semver" "^5.6.0" - -"entities@^1.1.1", "entities@~1.1.1": - "integrity" "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" - "resolved" "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz" - "version" "1.1.2" - -"errlop@^1.1.1": - "integrity" "sha512-WX7QjiPHhsny7/PQvrhS5VMizXXKoKCS3udaBp8gjlARdbn+XmK300eKBAAN0hGyRaTCtRpOaxK+xFVPUJ3zkw==" - "resolved" "https://registry.npmjs.org/errlop/-/errlop-1.1.1.tgz" - "version" "1.1.1" - dependencies: - "editions" "^2.1.2" + editions "^2.1.3" -"extract-opts@^3.3.1": - "integrity" "sha1-WrvtyYwNUgLjJ4cn+Rktfghsa+E=" - "resolved" "https://registry.npmjs.org/extract-opts/-/extract-opts-3.3.1.tgz" - "version" "3.3.1" - dependencies: - "eachr" "^3.2.0" - "editions" "^1.1.1" - "typechecker" "^4.3.0" - -"graceful-fs@^4.1.4": - "integrity" "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==" - "resolved" "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz" - "version" "4.2.0" - -"htmlparser2@^3.9.1": - "integrity" "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==" - "resolved" "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz" - "version" "3.10.1" - dependencies: - "domelementtype" "^1.3.1" - "domhandler" "^2.3.0" - "domutils" "^1.5.1" - "entities" "^1.1.1" - "inherits" "^2.0.1" - "readable-stream" "^3.1.1" - -"inherits@^2.0.1", "inherits@^2.0.3": - "integrity" "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - "resolved" "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" - "version" "2.0.4" - -"lodash@^4.15.0": - "integrity" "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" - "resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz" - "version" "4.17.15" - -"long@^3.2.0": - "integrity" "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" - "resolved" "https://registry.npmjs.org/long/-/long-3.2.0.tgz" - "version" "3.2.0" - -"nth-check@~1.0.1": - "integrity" "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==" - "resolved" "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz" - "version" "1.0.2" - dependencies: - "boolbase" "~1.0.0" +safe-buffer@~5.1.0: + version "5.1.2" + resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -"parse5@^3.0.1": - "integrity" "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==" - "resolved" "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz" - "version" "3.0.3" +safefs@^4.1.0: + version "4.1.0" + resolved "https://registry.npmjs.org/safefs/-/safefs-4.1.0.tgz" + integrity sha1-+CrrS9165R9lPrIPZyizBYyNZEU= dependencies: - "@types/node" "*" + editions "^1.1.1" + graceful-fs "^4.1.4" -"promise@~7.3.1": - "integrity" "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==" - "resolved" "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz" - "version" "7.3.1" - dependencies: - "asap" "~2.0.3" +semver@^5.6.0: + version "5.7.0" + resolved "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz" + integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== -"readable-stream@^3.1.1": - "integrity" "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==" - "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz" - "version" "3.4.0" - dependencies: - "inherits" "^2.0.3" - "string_decoder" "^1.1.1" - "util-deprecate" "^1.0.1" - -"requirefresh@^2.1.0": - "integrity" "sha512-gXQWrZkXNZZ6qVEh6PQvoASxLY3r6AR4jH8fFjZ+BfPJpDV6RTI82J4A3tkAn2wikU7rxfzU3sIPj94zEV6xPA==" - "resolved" "https://registry.npmjs.org/requirefresh/-/requirefresh-2.2.0.tgz" - "version" "2.2.0" +string_decoder@^1.1.1: + version "1.2.0" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz" + integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w== dependencies: - "editions" "^2.1.3" - -"safe-buffer@~5.1.0": - "integrity" "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - "resolved" "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" - "version" "5.1.2" + safe-buffer "~5.1.0" -"safefs@^4.1.0": - "integrity" "sha1-+CrrS9165R9lPrIPZyizBYyNZEU=" - "resolved" "https://registry.npmjs.org/safefs/-/safefs-4.1.0.tgz" - "version" "4.1.0" +typechecker@^4.3.0: + version "4.7.0" + resolved "https://registry.npmjs.org/typechecker/-/typechecker-4.7.0.tgz" + integrity sha512-4LHc1KMNJ6NDGO+dSM/yNfZQRtp8NN7psYrPHUblD62Dvkwsp3VShsbM78kOgpcmMkRTgvwdKOTjctS+uMllgQ== dependencies: - "editions" "^1.1.1" - "graceful-fs" "^4.1.4" - -"semver@^5.6.0": - "integrity" "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" - "resolved" "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz" - "version" "5.7.0" - -"string_decoder@^1.1.1": - "integrity" "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==" - "resolved" "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz" - "version" "1.2.0" - dependencies: - "safe-buffer" "~5.1.0" + editions "^2.1.0" -"typechecker@^4.3.0": - "integrity" "sha512-4LHc1KMNJ6NDGO+dSM/yNfZQRtp8NN7psYrPHUblD62Dvkwsp3VShsbM78kOgpcmMkRTgvwdKOTjctS+uMllgQ==" - "resolved" "https://registry.npmjs.org/typechecker/-/typechecker-4.7.0.tgz" - "version" "4.7.0" - dependencies: - "editions" "^2.1.0" +util-deprecate@^1.0.1: + version "1.0.2" + resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= -"util-deprecate@^1.0.1": - "integrity" "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - "resolved" "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" - "version" "1.0.2" +"web-animations-js@github:web-animations/web-animations-js#2.3.2": + version "2.3.2" + resolved "https://codeload.github.com/web-animations/web-animations-js/tar.gz/64d83730282fdbce733460d44be52c132d6c04e9" diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-expected-output.yml index 4bc90d37aaf70..2963a66ec409d 100644 --- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-expected-output.yml +++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-expected-output.yml @@ -2,6 +2,8 @@ project: id: "Yarn2::yarn2-package-with-lockfile:1.0.0" definition_file_path: "" + authors: + - "The Author" declared_licenses: - "Apache-2.0" declared_licenses_processed: diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-skip-excluded-scopes-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-skip-excluded-scopes-expected-output.yml index 560dcf5e52b93..9b995984ca19b 100644 --- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-skip-excluded-scopes-expected-output.yml +++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile-skip-excluded-scopes-expected-output.yml @@ -2,6 +2,8 @@ project: id: "Yarn2::yarn2-package-with-lockfile:1.0.0" definition_file_path: "" + authors: + - "The Author" declared_licenses: - "Apache-2.0" declared_licenses_processed: diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile/package.json b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile/package.json index 6741a6def0420..b267c64bee14a 100644 --- a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile/package.json +++ b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2/project-with-lockfile/package.json @@ -7,6 +7,7 @@ "url": "https://github.com/oss-review-toolkit/ort.git" }, "license": "Apache-2.0", + "author": "The Author (https://www.the.author.example/index.html)", "private": true, "dependencies": { "cheerio": "1.0.0-rc.1", diff --git a/plugins/package-managers/node/src/funTest/kotlin/npm/NpmFunTest.kt b/plugins/package-managers/node/src/funTest/kotlin/npm/NpmFunTest.kt index 6ed7b346c40db..0c6e8d45d8683 100644 --- a/plugins/package-managers/node/src/funTest/kotlin/npm/NpmFunTest.kt +++ b/plugins/package-managers/node/src/funTest/kotlin/npm/NpmFunTest.kt @@ -68,9 +68,9 @@ class NpmFunTest : WordSpec({ patchActualResult(result.toYaml()) should matchExpectedResult(expectedResultFile, definitionFile) } - "resolve package-lock dependencies correctly" { - val definitionFile = getAssetFile("projects/synthetic/npm/package-lock/package.json") - val expectedResultFile = getAssetFile("projects/synthetic/npm/package-lock-expected-output.yml") + "resolve dependencies for a project with lockfile correctly" { + val definitionFile = getAssetFile("projects/synthetic/npm/project-with-lockfile/package.json") + val expectedResultFile = getAssetFile("projects/synthetic/npm/project-with-lockfile-expected-output.yml") val result = create("NPM").resolveSingleProject(definitionFile, resolveScopes = true) diff --git a/plugins/package-managers/node/src/funTest/kotlin/yarn/YarnFunTest.kt b/plugins/package-managers/node/src/funTest/kotlin/yarn/YarnFunTest.kt index 8449c84c533c6..1877a37507fa5 100644 --- a/plugins/package-managers/node/src/funTest/kotlin/yarn/YarnFunTest.kt +++ b/plugins/package-managers/node/src/funTest/kotlin/yarn/YarnFunTest.kt @@ -31,7 +31,7 @@ import org.ossreviewtoolkit.utils.test.matchExpectedResult class YarnFunTest : WordSpec({ "yarn" should { - "resolve dependencies correctly" { + "resolve dependencies for a project with lockfile correctly" { val definitionFile = getAssetFile("projects/synthetic/yarn/project-with-lockfile/package.json") val expectedResultFile = getAssetFile("projects/synthetic/yarn/project-with-lockfile-expected-output.yml") diff --git a/plugins/package-managers/node/src/main/kotlin/yarn2/Yarn2.kt b/plugins/package-managers/node/src/main/kotlin/yarn2/Yarn2.kt index 0da767d8be1e3..4424294a51e35 100644 --- a/plugins/package-managers/node/src/main/kotlin/yarn2/Yarn2.kt +++ b/plugins/package-managers/node/src/main/kotlin/yarn2/Yarn2.kt @@ -405,6 +405,9 @@ class Yarn2( val projectFile = definitionFile.resolveSibling(header.version).resolve(definitionFile.name) val packageJson = parsePackageJson(projectFile) val additionalData = processAdditionalPackageInfo(packageJson) + val authors = packageJson.authors + .flatMap { parseAuthorString(it.name) } + .mapNotNullTo(mutableSetOf()) { it.name } val id = Identifier("Yarn2", namespace, name, version) allProjects += id to Project( @@ -413,7 +416,8 @@ class Yarn2( declaredLicenses = declaredLicenses, vcs = additionalData.vcsFromPackage, vcsProcessed = processProjectVcs(definitionFile.parentFile, additionalData.vcsFromPackage, homepageUrl), - homepageUrl = homepageUrl + homepageUrl = homepageUrl, + authors = authors ) id } else { diff --git a/plugins/package-managers/node/src/test/kotlin/NpmDetectionTest.kt b/plugins/package-managers/node/src/test/kotlin/NpmDetectionTest.kt index c9c9a82f4f73e..0a28761ad9f97 100644 --- a/plugins/package-managers/node/src/test/kotlin/NpmDetectionTest.kt +++ b/plugins/package-managers/node/src/test/kotlin/NpmDetectionTest.kt @@ -160,7 +160,7 @@ class NpmDetectionTest : WordSpec({ filteredFiles.map { it.toRelativeString(projectDir) } shouldContainExactlyInAnyOrder listOf( "npm/no-lockfile/package.json", "npm/node-modules/package.json", - "npm/package-lock/package.json", + "npm/project-with-lockfile/package.json", "npm/shrinkwrap/package.json", "npm/babel/package.json", "npm/version-urls/package.json",