refactor: explicit internal imports

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

Author: jkowalleck

src/builders/fromNodePackageJson.node.ts

@@ -30,10 +30,10 @@ import type { PackageJson } from '../_helpers/packageJson'
 import { splitNameGroup } from '../_helpers/packageJson'
 import { ComponentType } from '../enums/componentType'
 import type * as Factories from '../factories/index.node'
-import { Tool } from '../models/tool'
-import { ExternalReferenceRepository } from '../models/externalReference'
 import { Component } from '../models/component'
+import { ExternalReferenceRepository } from '../models/externalReference'
 import { LicenseRepository } from '../models/license'
+import { Tool } from '../models/tool'
 
 /**
  * Node-specific ToolBuilder.

src/factories/fromNodePackageJson.node.ts

@@ -32,8 +32,8 @@ import { isNotUndefined } from '../_helpers/notUndefined'
 import type { PackageJson } from '../_helpers/packageJson'
 import { PackageUrlQualifierNames } from '../_helpers/packageUrl'
 import { ExternalReferenceType } from '../enums/externalReferenceType'
+import type { Component } from '../models/component'
 import { ExternalReference } from '../models/externalReference'
-import { Component } from '../models/component'
 import { PackageUrlFactory as PlainPackageUrlFactory } from './packageUrl'
 
 /**

src/factories/license.ts

@@ -17,7 +17,8 @@ SPDX-License-Identifier: Apache-2.0
 Copyright (c) OWASP Foundation. All Rights Reserved.
 */
 
-import { LicenseExpression, NamedLicense, SpdxLicense, type DisjunctiveLicense, type License } from '../models/license'
+import type { DisjunctiveLicense, License } from '../models/license'
+import { LicenseExpression, NamedLicense, SpdxLicense } from '../models/license'
 import { fixupSpdxId, isValidSpdxLicenseExpression } from '../spdx'
 
 export class LicenseFactory {

src/factories/packageUrl.ts

@@ -21,7 +21,7 @@ import { PackageURL } from 'packageurl-js'
 
 import { PackageUrlQualifierNames } from '../_helpers/packageUrl'
 import { ExternalReferenceType } from '../enums/externalReferenceType'
-import type { Component } from '../models'
+import type { Component } from '../models/component'
 
 export class PackageUrlFactory {
   readonly #type: PackageURL['type']

src/models/swid.ts

@@ -17,8 +17,8 @@ SPDX-License-Identifier: Apache-2.0
 Copyright (c) OWASP Foundation. All Rights Reserved.
 */
 
-import type { NonNegativeInteger } from '../types'
-import { isNonNegativeInteger } from '../types'
+import type { NonNegativeInteger } from '../types/integer'
+import { isNonNegativeInteger } from '../types/integer'
 import type { Attachment } from './attachment'
 
 export interface OptionalSWIDProperties {

src/serialize/json/normalize.ts

@@ -23,12 +23,12 @@ import type { Stringable } from '../../_helpers/stringable'
 import { treeIteratorSymbol } from '../../_helpers/tree'
 import { escapeUri } from '../../_helpers/uri'
 import type * as Models from '../../models'
+import { LicenseExpression, NamedLicense, SpdxLicense } from '../../models/license'
 import { NamedLifecycle } from '../../models/lifecycle'
 import { AffectedSingleVersion, AffectedVersionRange } from '../../models/vulnerability/affect'
-import { NamedLicense, SpdxLicense, LicenseExpression } from '../../models/license'
 import { isSupportedSpdxId } from '../../spdx'
-import { Version as SpecVersion } from '../../spec'
 import type { _SpecProtocol as Spec } from '../../spec/_protocol'
+import { Version as SpecVersion } from '../../spec/enums'
 import type { NormalizerOptions } from '../types'
 import type { Normalized } from './types'
 import { JsonSchema } from './types'

src/serialize/xml/normalize.ts

@@ -23,12 +23,12 @@ import type { Stringable } from '../../_helpers/stringable'
 import { treeIteratorSymbol } from '../../_helpers/tree'
 import { escapeUri } from '../../_helpers/uri'
 import type * as Models from '../../models'
-import { NamedLifecycle} from '../../models/lifecycle'
-import { NamedLicense, SpdxLicense, LicenseExpression } from '../../models/license'
+import { LicenseExpression, NamedLicense, SpdxLicense } from '../../models/license'
+import { NamedLifecycle } from '../../models/lifecycle'
 import { AffectedSingleVersion, AffectedVersionRange } from '../../models/vulnerability/affect'
 import { isSupportedSpdxId } from '../../spdx'
-import { Version as SpecVersion } from '../../spec/enums'
 import type { _SpecProtocol as Spec } from '../../spec/_protocol'
+import { Version as SpecVersion } from '../../spec/enums'
 import type { NormalizerOptions } from '../types'
 import type { SimpleXml } from './types'
 import { XmlSchema } from './types'

src/spec/consts.ts

@@ -18,7 +18,7 @@ Copyright (c) OWASP Foundation. All Rights Reserved.
 */
 
 import { ComponentType } from '../enums/componentType'
-import {  ExternalReferenceType } from '../enums/externalReferenceType'
+import { ExternalReferenceType } from '../enums/externalReferenceType'
 import { HashAlgorithm } from '../enums/hashAlogorithm'
 import { RatingMethod as VulnerabilityRatingMethod } from '../enums/vulnerability/ratingMethod'
 import type { _SpecProtocol } from './_protocol'