From c78518fb05d66a83b49b64a272b99e13aedd2156 Mon Sep 17 00:00:00 2001 From: Roman Seidelsohn Date: Fri, 30 Aug 2024 11:29:32 +0200 Subject: [PATCH] Fix errors and update formatting --- README.md | 5 + lib/args.js | 2 +- lib/index.js | 20 ++-- package.json | 330 +++++++++++++++++++++++++-------------------------- 4 files changed, 183 insertions(+), 174 deletions(-) diff --git a/README.md b/README.md index dae2336..f1df4e0 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ - [Table of Contents](#table-of-contents) - [Introduction](#introduction) - [Changes](#changes) + - [Version 4.4.1](#Version-4-4-1) - [Version 4.4.0](#Version-4-4-0) - [Version 4.3.1](#Version-4-3-1) - [Version 4.3.0](#Version-4-3-0) @@ -127,6 +128,10 @@ You could see something like this: ## Changes (see a more detailed and always up-to-date list [here](https://github.com/RSeidelsohn/license-checker-rseidelsohn/releases)) +### Version 4.4.1 + +fix: Fix errors that broke the whole new version (sorry for these) + ### Version 4.4.0 chore(deps-dev): bump braces from 3.0.2 to 3.0.3 by @dependabot in https://github.com/RSeidelsohn/license-checker-rseidelsohn/pull/114 diff --git a/lib/args.js b/lib/args.js index e9b696e..3d81736 100644 --- a/lib/args.js +++ b/lib/args.js @@ -10,7 +10,7 @@ import path from 'node:path'; const knownOptions = { angularCli: Boolean, - clarificationsFile: path,clarificationsMatchAll + clarificationsFile: path, clarificationsMatchAll: Boolean, color: Boolean, csv: Boolean, diff --git a/lib/index.js b/lib/index.js index 51cf51f..3a6a2ef 100644 --- a/lib/index.js +++ b/lib/index.js @@ -46,8 +46,10 @@ const recursivelyCollectAllDependencies = (options) => { let licenseData; let licenseFile; let noticeFiles = []; - const clarification = options.clarifications[currentExtendedPackageJson.name]?.find((clarification) => - currentExtendedPackageJson.version == clarification.semverRange || semver.satisfies(currentExtendedPackageJson.version, clarification.semverRange) + const clarification = options.clarifications[currentExtendedPackageJson.name]?.find( + (clarification) => + currentExtendedPackageJson.version == clarification.semverRange || + semver.satisfies(currentExtendedPackageJson.version, clarification.semverRange), ); let passedClarificationCheck = clarification?.checksum ? false : true; if (clarification) { @@ -411,7 +413,7 @@ const init = (args, callback) => { const semverRange = versionString.slice(versionSplit + 1); clarifications[name] ??= []; // keep track for each clarification if it was used, optionally error when not - clarifications[name].push({...clarification, semverRange, used: false}); + clarifications[name].push({ ...clarification, semverRange, used: false }); } } } @@ -449,20 +451,22 @@ const init = (args, callback) => { unknown: args.unknown, currentRecursionDepth: 0, clarifications, - }) + }); if (args.clarificationsMatchAll) { - const unusedClarifications = [] - for (const [package, entries] of Object.entries(clarifications)) { + const unusedClarifications = []; + for (const [packageName, entries] of Object.entries(clarifications)) { for (const clarification of entries) { if (!clarification.used) { - unusedClarifications.push(`${package}@${clarification.semverRange}`); + unusedClarifications.push(`${packageName}@${clarification.semverRange}`); } } } if (unusedClarifications.length) { console.error( - `Some clarifications (${unusedClarifications.join(', ')}) were unused and --clarificationsMatchAll was specified. Exiting.`, + `Some clarifications (${unusedClarifications.join( + ', ', + )}) were unused and --clarificationsMatchAll was specified. Exiting.`, ); process.exit(1); diff --git a/package.json b/package.json index e210ab4..b8393f9 100644 --- a/package.json +++ b/package.json @@ -1,168 +1,168 @@ { - "name": "license-checker-rseidelsohn", - "description": "Extract NPM package licenses - Feature enhanced version of the original license-checker v25.0.1", - "author": "Roman Seidelsohn ", - "version": "4.4.0", - "license": "BSD-3-Clause", - "private": false, - "type": "module", - "engines": { - "npm": ">=8", - "node": ">=18" - }, - "engine-strict": true, - "keywords": [ - "license", - "cli", - "checker", - "oss" - ], - "main": "./lib/index.js", - "types": "./lib/index.d.ts", - "bin": { - "license-checker-rseidelsohn": "./bin/license-checker-rseidelsohn" - }, - "scripts": { - "changes": "github-changes -o RSeidelsohn -r license-checker-rseidelsohn", - "contrib": "node ./scripts/contrib.js", - "pretest": "eslint --fix .", - "test": "jenkins-mocha ./tests/*.js", - "posttest": "nyc check-coverage && nyc report -r lcov -r text -r text-summary", - "lint": "npx eslint --ext js .", - "lint:fix": "npm run lint -- --fix", - "prettier": "npx prettier lib --check && npx prettier bin/license-checker-rseidelsohn --check && npx prettier scripts --check", - "prettier:fix": "npm run prettier -- --write", - "format": "npm run prettier:fix && npm run lint:fix", - "format:dry": "npm run prettier && npm run lint" - }, - "preferGlobal": true, - "bugs": { - "url": "http://github.com/RSeidelsohn/license-checker-rseidelsohn/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/RSeidelsohn/license-checker-rseidelsohn.git" - }, - "nyc": { - "check-coverage": true, - "exclude": [ - "**/tests/*.js" + "name": "license-checker-rseidelsohn", + "description": "Extract NPM package licenses - Feature enhanced version of the original license-checker v25.0.1", + "author": "Roman Seidelsohn ", + "version": "4.4.1", + "license": "BSD-3-Clause", + "private": false, + "type": "module", + "engines": { + "npm": ">=8", + "node": ">=18" + }, + "engine-strict": true, + "keywords": [ + "license", + "cli", + "checker", + "oss" ], - "lines": 80, - "statements": 80, - "functions": 80, - "branches": 80 - }, - "contributors": [ - "Adam Weber ", - "Andrew Couch ", - "Andrii Kostenko ", - "Asharma ", - "Backfighter ", - "Beatrice Guerra ", - "Bryan English ", - "Christoph Werner ", - "Coada <7301477+Coada@users.noreply.github.com>", - "Cory Reed ", - "Damien Larmine ", - "Dan Rumney ", - "Dav Glass ", - "David Langer ", - "Dick Wiggers ", - "Dmitry Semigradsky ", - "Drew Folta ", - "Elijah Insua ", - "Eugene G ", - "Francois Zaninotto ", - "Glen Arrowsmith ", - "Helio Frota <00hf11@gmail.com>", - "Holger Knust ", - "Honza Javorek ", - "Ivan Latunov ", - "James Bloomer ", - "Jonny Reeves ", - "Jonny Reeves ", - "Ladislav Prskavec ", - "Ladislav Prskavec ", - "Linko ", - "Lorenzo Cesana ", - "Marco Biedermann <5244986+marcobiedermann@users.noreply.github.com>", - "Mark Tse ", - "Mark Tse ", - "Markus Maga ", - "Mattias Amnefelt ", - "Mehmet Baker ", - "Michael Kühnel ", - "Michael Williamson ", - "Mikayla Maki ", - "Paul Mandel ", - "Peter Uithoven ", - "Philipp Tusch ", - "Pijus Petkevičius <32205463+cezaris13@users.noreply.github.com>", - "Rasmus Lauridsen ", - "Rasmus Lauridsen ", - "Rogier Schouten ", - "Roman Seidelsohn ", - "Roman Seidelsohn ", - "Stan Senotrusov ", - "Steffen Wenz ", - "Stoyan Revov ", - "Tero Keski-Valkama ", - "Thomas Grainger ", - "Tim Brust ", - "Tim Oxley ", - "Timothée Mazzucotelli ", - "Tobi ", - "Tobias Büschel ", - "Werner Robitza ", - "Yukari Ishibashi ", - "Yuri Zapuchlak ", - "badunk ", - "chris ", - "creising ", - "dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>", - "gdw2 ", - "ktmouk ", - "santiagocanti ", - "tbbstny ", - "zodiac403 " - ], - "files": [ - "bin", - "lib", - "CHANGELOG.md", - "SECURITY.md" - ], - "dependencies": { - "chalk": "4.1.2", - "debug": "^4.3.4", - "lodash.clonedeep": "^4.5.0", - "mkdirp": "^1.0.4", - "nopt": "^7.2.0", - "read-installed-packages": "^2.0.1", - "semver": "^7.3.5", - "spdx-correct": "^3.1.1", - "spdx-expression-parse": "^3.0.1", - "spdx-satisfies": "^5.0.1", - "treeify": "^1.1.0" - }, - "devDependencies": { - "@types/mssql": "8.1.1", - "@types/node": "^16.18.11", - "detectionizr": "*", - "eslint": "^8.32.0", - "eslint-config-prettier": "^8.6.0", - "eslint-plugin-prettier": "^4.2.1", - "format-package-json": "^0.2.0", - "git-contributors": "^0.2.5", - "github-changes": "^2.0.3", - "istanbul": "^0.4.5", - "jenkins-mocha": "^11.0.0", - "lint-staged": "^13.1.0", - "locale": "^0.1.0", - "prettier": "^2.8.3", - "queue": "^6.0.2", - "request": "^2.88.2", - "rimraf": "^3.0.2" - } + "main": "./lib/index.js", + "types": "./lib/index.d.ts", + "bin": { + "license-checker-rseidelsohn": "./bin/license-checker-rseidelsohn" + }, + "scripts": { + "changes": "github-changes -o RSeidelsohn -r license-checker-rseidelsohn", + "contrib": "node ./scripts/contrib.js", + "pretest": "eslint --fix .", + "test": "jenkins-mocha ./tests/*.js", + "posttest": "nyc check-coverage && nyc report -r lcov -r text -r text-summary", + "lint": "npx eslint --ext js .", + "lint:fix": "npm run lint -- --fix", + "prettier": "npx prettier lib --check && npx prettier bin/license-checker-rseidelsohn --check && npx prettier scripts --check", + "prettier:fix": "npm run prettier -- --write", + "format": "npm run prettier:fix && npm run lint:fix", + "format:dry": "npm run prettier && npm run lint" + }, + "preferGlobal": true, + "bugs": { + "url": "http://github.com/RSeidelsohn/license-checker-rseidelsohn/issues" + }, + "repository": { + "type": "git", + "url": "https://github.com/RSeidelsohn/license-checker-rseidelsohn.git" + }, + "nyc": { + "check-coverage": true, + "exclude": [ + "**/tests/*.js" + ], + "lines": 80, + "statements": 80, + "functions": 80, + "branches": 80 + }, + "contributors": [ + "Adam Weber ", + "Andrew Couch ", + "Andrii Kostenko ", + "Asharma ", + "Backfighter ", + "Beatrice Guerra ", + "Bryan English ", + "Christoph Werner ", + "Coada <7301477+Coada@users.noreply.github.com>", + "Cory Reed ", + "Damien Larmine ", + "Dan Rumney ", + "Dav Glass ", + "David Langer ", + "Dick Wiggers ", + "Dmitry Semigradsky ", + "Drew Folta ", + "Elijah Insua ", + "Eugene G ", + "Francois Zaninotto ", + "Glen Arrowsmith ", + "Helio Frota <00hf11@gmail.com>", + "Holger Knust ", + "Honza Javorek ", + "Ivan Latunov ", + "James Bloomer ", + "Jonny Reeves ", + "Jonny Reeves ", + "Ladislav Prskavec ", + "Ladislav Prskavec ", + "Linko ", + "Lorenzo Cesana ", + "Marco Biedermann <5244986+marcobiedermann@users.noreply.github.com>", + "Mark Tse ", + "Mark Tse ", + "Markus Maga ", + "Mattias Amnefelt ", + "Mehmet Baker ", + "Michael Kühnel ", + "Michael Williamson ", + "Mikayla Maki ", + "Paul Mandel ", + "Peter Uithoven ", + "Philipp Tusch ", + "Pijus Petkevičius <32205463+cezaris13@users.noreply.github.com>", + "Rasmus Lauridsen ", + "Rasmus Lauridsen ", + "Rogier Schouten ", + "Roman Seidelsohn ", + "Roman Seidelsohn ", + "Stan Senotrusov ", + "Steffen Wenz ", + "Stoyan Revov ", + "Tero Keski-Valkama ", + "Thomas Grainger ", + "Tim Brust ", + "Tim Oxley ", + "Timothée Mazzucotelli ", + "Tobi ", + "Tobias Büschel ", + "Werner Robitza ", + "Yukari Ishibashi ", + "Yuri Zapuchlak ", + "badunk ", + "chris ", + "creising ", + "dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>", + "gdw2 ", + "ktmouk ", + "santiagocanti ", + "tbbstny ", + "zodiac403 " + ], + "files": [ + "bin", + "lib", + "CHANGELOG.md", + "SECURITY.md" + ], + "dependencies": { + "chalk": "4.1.2", + "debug": "^4.3.4", + "lodash.clonedeep": "^4.5.0", + "mkdirp": "^1.0.4", + "nopt": "^7.2.0", + "read-installed-packages": "^2.0.1", + "semver": "^7.3.5", + "spdx-correct": "^3.1.1", + "spdx-expression-parse": "^3.0.1", + "spdx-satisfies": "^5.0.1", + "treeify": "^1.1.0" + }, + "devDependencies": { + "@types/mssql": "8.1.1", + "@types/node": "^16.18.11", + "detectionizr": "*", + "eslint": "^8.32.0", + "eslint-config-prettier": "^8.6.0", + "eslint-plugin-prettier": "^4.2.1", + "format-package-json": "^0.2.0", + "git-contributors": "^0.2.5", + "github-changes": "^2.0.3", + "istanbul": "^0.4.5", + "jenkins-mocha": "^11.0.0", + "lint-staged": "^13.1.0", + "locale": "^0.1.0", + "prettier": "^2.8.3", + "queue": "^6.0.2", + "request": "^2.88.2", + "rimraf": "^3.0.2" + } }