Skip to content

Commit 285676d

Browse files
chore(deps): update eslint (#412)
This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [@eslint/js](https://eslint.org) ([source](https://redirect.github.com/eslint/eslint/tree/HEAD/packages/js)) | [`9.38.0` -> `9.39.0`](https://renovatebot.com/diffs/npm/@eslint%2fjs/9.38.0/9.39.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@eslint%2fjs/9.39.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@eslint%2fjs/9.38.0/9.39.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [eslint](https://eslint.org) ([source](https://redirect.github.com/eslint/eslint)) | [`9.38.0` -> `9.39.0`](https://renovatebot.com/diffs/npm/eslint/9.38.0/9.39.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/eslint/9.39.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/eslint/9.38.0/9.39.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [eslint-plugin-jsdoc](https://redirect.github.com/gajus/eslint-plugin-jsdoc) | [`61.1.9` -> `61.1.11`](https://renovatebot.com/diffs/npm/eslint-plugin-jsdoc/61.1.9/61.1.11) | [![age](https://developer.mend.io/api/mc/badges/age/npm/eslint-plugin-jsdoc/61.1.11?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/eslint-plugin-jsdoc/61.1.9/61.1.11?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>eslint/eslint (@&#8203;eslint/js)</summary> ### [`v9.39.0`](https://redirect.github.com/eslint/eslint/compare/v9.38.0...2375a6de8263393c129d41cac1b407b40111a73c) [Compare Source](https://redirect.github.com/eslint/eslint/compare/v9.38.0...v9.39.0) </details> <details> <summary>eslint/eslint (eslint)</summary> ### [`v9.39.0`](https://redirect.github.com/eslint/eslint/compare/v9.38.0...ac3a60dffc29d8d4d5031621bc062e77f891532a) [Compare Source](https://redirect.github.com/eslint/eslint/compare/v9.38.0...v9.39.0) </details> <details> <summary>gajus/eslint-plugin-jsdoc (eslint-plugin-jsdoc)</summary> ### [`v61.1.11`](https://redirect.github.com/gajus/eslint-plugin-jsdoc/releases/tag/v61.1.11) [Compare Source](https://redirect.github.com/gajus/eslint-plugin-jsdoc/compare/v61.1.10...v61.1.11) ##### Bug Fixes - fixing of missing parent should go between child and grandparent ([4f2ec35](https://redirect.github.com/gajus/eslint-plugin-jsdoc/commit/4f2ec35a391c6daf2570f927d24bb893ab83baa7)) ### [`v61.1.10`](https://redirect.github.com/gajus/eslint-plugin-jsdoc/releases/tag/v61.1.10) [Compare Source](https://redirect.github.com/gajus/eslint-plugin-jsdoc/compare/v61.1.9...v61.1.10) ##### Bug Fixes - **`imports-as-dependencies`:** check for object-based `types` (or `typings`) ([c9a22b6](https://redirect.github.com/gajus/eslint-plugin-jsdoc/commit/c9a22b6287d7da56043e52b3d49ad36b6e7421db)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - Only on Sunday and Saturday ( * * * * 0,6 ) (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/CycloneDX/cyclonedx-node-yarn). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xNTkuNCIsInVwZGF0ZWRJblZlciI6IjQxLjE1OS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=--> --------- Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jan Kowalleck <jan.kowalleck@gmail.com>
1 parent 53b6632 commit 285676d

File tree

3 files changed

+51
-55
lines changed

3 files changed

+51
-55
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"xmlbuilder2": "4.0.0"
6767
},
6868
"devDependencies": {
69-
"@eslint/js": "9.38.0",
69+
"@eslint/js": "9.39.0",
7070
"@types/hosted-git-info": "^3.0.5",
7171
"@types/mocha": "^10.0.6",
7272
"@types/node": "ts5.8",
@@ -76,11 +76,11 @@
7676
"ajv-formats": "^3.0.1",
7777
"ajv-formats-draft2019": "^1.6.1",
7878
"c8": "^10.1.2",
79-
"eslint": "9.38.0",
79+
"eslint": "9.39.0",
8080
"eslint-config-love": "133.0.0",
8181
"eslint-import-resolver-node": "^0.3.9",
8282
"eslint-plugin-import": "2.32.0",
83-
"eslint-plugin-jsdoc": "61.1.9",
83+
"eslint-plugin-jsdoc": "61.1.11",
8484
"eslint-plugin-license-header": "0.8.0",
8585
"eslint-plugin-n": "17.23.1",
8686
"eslint-plugin-promise": "7.2.1",

src/builders.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,8 @@ export class BomBuilder {
9494
/* eslint-enable no-param-reassign */
9595
}
9696

97-
/* eslint-disable-next-line @typescript-eslint/strict-boolean-expressions, @typescript-eslint/prefer-nullish-coalescing --
98-
* as we need to enforce a proper root component to enable all features of SBOM */
99-
const rootComponent: Component = this.makeComponentFromWorkspace(workspace, this.metaComponentType) ||
100-
new DummyComponent(this.metaComponentType, 'RootComponent')
97+
const rootComponent: Component = this.makeComponentFromWorkspace(workspace, this.metaComponentType)
98+
?? new DummyComponent(this.metaComponentType, 'RootComponent')
10199
rootComponent.licenses.forEach(setLicensesDeclared)
102100

103101
const bom = new Bom()
@@ -149,7 +147,7 @@ export class BomBuilder {
149147
return bom
150148
}
151149

152-
private makeComponentFromWorkspace (workspace: Workspace, type?: ComponentType ): Component | false | undefined {
150+
private makeComponentFromWorkspace (workspace: Workspace, type?: ComponentType ): Component | undefined {
153151
return this.makeComponent(workspace.anchoredLocator, workspace.manifest.raw, type)
154152
}
155153

@@ -220,7 +218,7 @@ export class BomBuilder {
220218
fetchManifest: ManifestFetcher,
221219
fetchLicenseEvidence: LicenseEvidenceFetcher,
222220
type?: ComponentType
223-
): Promise<Component | false | undefined> {
221+
): Promise<Component | undefined> {
224222
/* eslint-disable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
225223
-- not unsafe! is not null nor undefined */
226224
const manifest = await fetchManifest(pkg)
@@ -229,17 +227,20 @@ export class BomBuilder {
229227
manifest.name = pkg.scope ? `@${pkg.scope}/${pkg.name}` : pkg.name
230228
manifest.version = pkg.version
231229
const component = this.makeComponent(pkg, manifest, type)
232-
if (this.gatherLicenseTexts && component instanceof Component) {
230+
if (component === undefined) {
231+
return undefined
232+
}
233+
if (this.gatherLicenseTexts) {
233234
component.evidence = new ComponentEvidence()
234235
for await (const le of fetchLicenseEvidence(pkg)) {
235236
component.evidence.licenses.add(le)
236237
}
237238
}
238-
return component
239239
/* eslint-enable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment */
240+
return component
240241
}
241242

242-
private makeComponent (locator: Locator, manifest: NonNullable<any>, type?: ComponentType ): Component | false | undefined {
243+
private makeComponent (locator: Locator, manifest: NonNullable<any>, type?: ComponentType ): Component | undefined {
243244
// work with a deep copy, because `normalizePackageManifest()` might modify the data
244245
/* eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- ack */
245246
const manifestC = structuredClonePolyfill(manifest)
@@ -370,11 +371,6 @@ export class BomBuilder {
370371
const _depIDN = structUtils.prettyLocatorNoColors(depPkg)
371372
const _depC = await this.makeComponentFromPackage(depPkg,
372373
fetchManifest, fetchLicenseEvidences)
373-
if (_depC === false) {
374-
// shall be skipped
375-
this.console.debug('DEBUG | skip impossible component %j', _depIDN)
376-
continue // for-loop
377-
}
378374
if (_depC === undefined) {
379375
depComponent = new DummyComponent(ComponentType.Library, `InterferedDependency.${_depIDN}`)
380376
this.console.warn('WARN | InterferedDependency %j', _depIDN)

yarn.lock

Lines changed: 38 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)