wip

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

src/_helpers/packageJson.ts

@@ -25,7 +25,7 @@ Copyright (c) OWASP Foundation. All Rights Reserved.
  * Having multiple slashes(`/`) is basically no issue.
  */
 export function splitNameGroup (data: string): [string, string?] {
-  const delimGroup = data[0] === '@'
+  const delimGroup = data.startsWith('@')
     ? data.indexOf('/', 2)
     : 0
   return delimGroup > 0

src/_optPlug.node/jsonValidator.ts

@@ -24,8 +24,8 @@ export type Validator = (data: string) => null | ValidationError
 export type Functionality = (schemaPath: string, schemaMap: Record<string, string>) => Promise<Validator>
 
 export default opWrapper<Functionality>('JsonValidator', [
-  /* eslint-disable @typescript-eslint/no-var-requires */
+
   ['( ajv && ajv-formats && ajv-formats-draft2019 )', () => require('./__jsonValidators/ajv').default]
   // ... add others here, pull-requests welcome!
-  /* eslint-enable @typescript-eslint/no-var-requires */
+
 ]) satisfies Functionality | WillThrow

src/_optPlug.node/xmlStringify.ts

@@ -24,8 +24,8 @@ import opWrapper, { type WillThrow } from './_wrapper'
 export type Functionality = (element: SimpleXml.Element, options?: SerializerOptions) => string
 
 export default opWrapper<Functionality>('XmlStringifier', [
-  /* eslint-disable @typescript-eslint/no-var-requires */
+
   ['xmlbuilder2', () => require('./__xmlStringifiers/xmlbuilder2').default]
   // ... add others here, pull-requests welcome!
-  /* eslint-enable @typescript-eslint/no-var-requires */
+
 ]) satisfies Functionality | WillThrow

src/_optPlug.node/xmlValidator.ts

@@ -24,8 +24,8 @@ export type Validator = (data: string) => null | ValidationError
 export type Functionality = (schemaPath: string) => Promise<Validator>
 
 export default opWrapper<Functionality>('XmlValidator', [
-  /* eslint-disable @typescript-eslint/no-var-requires */
+
   ['libxmljs2', () => require('./__xmlValidators/libxmljs2').default]
   // ... add others here, pull-requests welcome!
-  /* eslint-enable @typescript-eslint/no-var-requires */
+
 ]) satisfies Functionality | WillThrow

src/builders/fromNodePackageJson.node.ts

@@ -127,7 +127,7 @@ export class ComponentBuilder {
     if (Array.isArray(data.licenses)) {
       /* see https://github.com/SchemaStore/schemastore/blob/master/src/schemas/json/package.json */
       for (const licenseData of data.licenses) {
-        if (typeof licenseData?.type === 'string') {
+        if (typeof licenseData.type === 'string') {
           const license = this.#licenseFactory.makeDisjunctive(licenseData.type)
           license.url = typeof licenseData.url === 'string'
             ? licenseData.url

src/factories/fromNodePackageJson.node.ts

@@ -53,7 +53,7 @@ export class ExternalReferenceFactory {
 
   makeVcs (data: PackageJson): ExternalReference | undefined {
     /* see https://docs.npmjs.com/cli/v9/configuring-npm/package-json#repositoryc */
-    const repository = data.repository
+    const {repository} = data
     let url
     let comment: string | undefined
     if (typeof repository === 'object') {
@@ -86,7 +86,7 @@ export class ExternalReferenceFactory {
 
   makeIssueTracker (data: PackageJson): ExternalReference | undefined {
     /* see https://docs.npmjs.com/cli/v9/configuring-npm/package-json#bugs */
-    const bugs = data.bugs
+    const {bugs} = data
     let url
     let comment: string | undefined
     if (typeof bugs === 'object') {
@@ -113,7 +113,7 @@ const npmDefaultRepositoryMatcher = /^https?:\/\/registry\.npmjs\.org(:?\/|$)/
  * @see {@link https://github.com/package-url/purl-spec/blob/master/PURL-TYPES.rst#npm}
  */
 export class PackageUrlFactory extends PlainPackageUrlFactory<'npm'> {
-  override makeFromComponent (component: Component, sort: boolean = false): PackageURL | undefined {
+  override makeFromComponent (component: Component, sort = false): PackageURL | undefined {
     const purl = super.makeFromComponent(component, sort)
     return purl === undefined
       ? undefined

src/serialize/json/types.ts

@@ -22,7 +22,7 @@ import type { HashContent } from '../../models'
 import type { SpdxId } from '../../spdx'
 import type { CPE, CWE, Integer } from '../../types'
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
+/* eslint-disable-next-line @typescript-eslint/no-namespace -- needed */
 export namespace JsonSchema {
 
   /**
@@ -62,7 +62,7 @@ export namespace JsonSchema {
 
 }
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
+/* eslint-disable-next-line @typescript-eslint/no-namespace -- needed */
 export namespace Normalized {
 
   export type RefType = string
@@ -261,7 +261,7 @@ export namespace Normalized {
     properties?: Property[]
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-namespace
+  /* eslint-disable-next-line @typescript-eslint/no-namespace -- needed */
   export namespace Vulnerability {
     export interface Source {
       name?: string

src/serialize/xml/normalize.ts

@@ -221,9 +221,7 @@ export class BomNormalizer extends BaseXmlNormalizer<Models.Bom> {
           : undefined
       },
       children: [
-        data.metadata
-          ? this._factory.makeForMetadata().normalize(data.metadata, options, 'metadata')
-          : undefined,
+        this._factory.makeForMetadata().normalize(data.metadata, options, 'metadata'),
         components,
         services,
         this._factory.spec.supportsDependencyGraph

src/serialize/xml/types.ts

@@ -47,15 +47,13 @@ export namespace XmlSchema {
     }
 
     const fragmentPos = value.indexOf('#')
-    let beforeFragment: string
+    let beforeFragment = value
     if (fragmentPos >= 0) {
       if (value.includes('#', fragmentPos + 1)) {
         // has a second fragment marker
         return false
       }
       beforeFragment = value.slice(undefined, fragmentPos)
-    } else {
-      beforeFragment = value
     }
 
     const schemePos = beforeFragment.indexOf(':')
@@ -71,7 +69,7 @@ export namespace XmlSchema {
 
 }
 
-// eslint-disable-next-line @typescript-eslint/no-namespace
+/* eslint-disable-next-line @typescript-eslint/no-namespace -- needed */
 export namespace SimpleXml {
 
   /**

src/spdx.ts

@@ -38,7 +38,7 @@ const spdxLowerToActual: Readonly<Record<string, SpdxId>> = Object.freeze(Object
 ))
 
 export function isSupportedSpdxId (value: SpdxId | any): value is SpdxId {
-  /* eslint-disable-next-line @typescript-eslint/no-unsafe-argument */
+  /* eslint-disable-next-line @typescript-eslint/no-unsafe-argument -- fix */
   return spdxIds.has(value)
 }