tests

jkowalleck · jkowalleck · commit 75311d567b30 · 2026-02-18T16:44:31.000+01:00
Signed-off-by: Jan Kowalleck &lt;jan.kowalleck@gmail.com&gt;
diff --git a/HISTORY.md b/HISTORY.md
@@ -9,6 +9,9 @@ All notable changes to this project will be documented in this file.
 * BREAKING changes
   * Removed deprecated symbols
 * Removed
+  * Entrypoint `Builders` (via [#1377])
+  * Entrypoint `Factories` (via [#1377])
+  * Entrypoint `Utils` (via [#1377])
   * Deprecated symbol `Builders` ([#1346] via [#1377])
   * Deprecated symbol `Builders.FromNodePackageJson` ([#1346] via [#1377])
   * Deprecated symbol `Builders.FromNodePackageJson.ToolBuilder` ([#1346] via [#1377])  
diff --git a/package.json b/package.json
@@ -145,18 +145,10 @@
       "default": "./dist.node/index.node.js"
     },
     "./package.json": "./package.json",
-    "./Builders": {
-      "types": "./dist.d/builders/index.node.d.ts",
-      "default": "./dist.node/builders/index.node.js"
-    },
     "./Enums": {
       "types": "./dist.d/enums/index.d.ts",
       "default": "./dist.node/enums/index.js"
     },
-    "./Factories": {
-      "types": "./dist.d/factories/index.node.d.ts",
-      "default": "./dist.node/factories/index.node.js"
-    },
     "./Models": {
       "types": "./dist.d/models/index.d.ts",
       "default": "./dist.node/models/index.js"
@@ -177,10 +169,6 @@
       "types": "./dist.d/types/index.d.ts",
       "default": "./dist.node/types/index.js"
     },
-    "./Utils": {
-      "types": "./dist.d/utils/index.node.d.ts",
-      "default": "./dist.node/utils/index.node.js"
-    },
     "./Validation": {
       "types": "./dist.d/validation/index.node.d.ts",
       "default": "./dist.node/validation/index.node.js"
diff --git a/tests/integration/Builders.FromNodePackageJson.ComponentBuilder.test.js b/tests/integration/Builders.FromNodePackageJson.ComponentBuilder.test.js
@@ -24,17 +24,16 @@ const { suite, test } = require('mocha')
 const {
   Enums,
   Models,
-  Factories,
-  Builders: { FromNodePackageJson: { ComponentBuilder } }
+  Contrib,
 } = require('../../')
 
 suite('integration: Builders.FromNodePackageJson.ComponentBuilder', () => {
   const salt = Math.random()
 
-  const extRefFactory = new Factories.FromNodePackageJson.ExternalReferenceFactory()
-  const licenseFactory = new Factories.LicenseFactory()
+  const extRefFactory = new Contrib.FromNodePackageJson.Factories.ExternalReferenceFactory()
+  const licenseFactory = new Contrib.License.Factories.LicenseFactory()
 
-  const sut = new ComponentBuilder(extRefFactory, licenseFactory);
+  const sut = new Contrib.FromNodePackageJson.Builders.ComponentBuilder(extRefFactory, licenseFactory);
 
   [
     [
diff --git a/tests/integration/Builders.FromNodePackageJson.ToolBuilders.test.js b/tests/integration/Builders.FromNodePackageJson.ToolBuilders.test.js
@@ -24,16 +24,16 @@ const { suite, test } = require('mocha')
 const {
   Models,
   Factories,
-  Builders: { FromNodePackageJson: { ToolBuilder } }
+  Contrib,
 } = require('../../')
 
 suite('integration: Builders.FromNodePackageJson.ToolBuilder', () => {
   const salt = Math.random()
 
-  const extRefFactory = new Factories.FromNodePackageJson.ExternalReferenceFactory()
+  const extRefFactory = new Contrib.FromNodePackageJson.Factories.ExternalReferenceFactory()
   extRefFactory.makeExternalReferences = () => [`FAKE REFERENCES ${salt}`]
 
-  const sut = new ToolBuilder(extRefFactory)
+  const sut = new Contrib.FromNodePackageJson.Builders.ToolBuilder(extRefFactory)
 
   const data = {
     name: '@foo/bar',
diff --git a/tests/integration/Factories.FromNodePackageJson.ExternalReferenceFactory.test.js b/tests/integration/Factories.FromNodePackageJson.ExternalReferenceFactory.test.js
@@ -24,11 +24,11 @@ const { suite, test } = require('mocha')
 const {
   Enums: { ExternalReferenceType, HashAlgorithm },
   Models: { ExternalReference, HashDictionary },
-  Factories: { FromNodePackageJson: { ExternalReferenceFactory } }
+  Contrib,
 } = require('../../')
 
 suite('integration: Factories.FromNodePackageJson.ExternalReferenceFactory', () => {
-  const sut = new ExternalReferenceFactory()
+  const sut = new Contrib.FromNodePackageJson.Factories.ExternalReferenceFactory()
 
   suite('from "homepage"', () => {
     test('is non-empty string', () => {
diff --git a/tests/integration/Factories.FromNodePackageJson.PackageUrlFactory.test.js b/tests/integration/Factories.FromNodePackageJson.PackageUrlFactory.test.js
@@ -25,13 +25,13 @@ const { PackageURL } = require('packageurl-js')
 const {
   Enums,
   Models,
-  Factories: { FromNodePackageJson: { PackageUrlFactory } }
+  Contrib,
 } = require('../../')
 
 suite('integration: Factories.FromNodePackageJson.PackageUrlFactory', () => {
   const salt = Math.random()
 
-  const sut = new PackageUrlFactory('testing')
+  const sut = new Contrib.PackageUrl.Factories.PackageUrlFactory('testing')
 
   suite('makeFromComponent', () => {
     test('no-name-no-purl', () => {
diff --git a/tests/integration/Factories.LicenseFactory.test.js b/tests/integration/Factories.LicenseFactory.test.js
@@ -22,13 +22,13 @@ const assert = require('node:assert')
 const { suite, test } = require('mocha')
 
 const {
-  Factories: { LicenseFactory },
+  Contrib,
   Models: { LicenseExpression, NamedLicense, SpdxLicense }
 } = require('../../')
 
 suite('integration: Factories.LicenseFactory', () => {
   test('makeFromString() -> LicenseExpression', () => {
-    const sut = new LicenseFactory()
+    const sut = new Contrib.License.Factories.LicenseFactory()
     const expression = '(MIT OR Apache-2.0)'
 
     const license = sut.makeFromString(expression)
@@ -38,7 +38,7 @@ suite('integration: Factories.LicenseFactory', () => {
   })
 
   test('makeFromString() -> NamedLicense', () => {
-    const sut = new LicenseFactory()
+    const sut = new Contrib.License.Factories.LicenseFactory()
 
     const license = sut.makeFromString('(c) foo bar')
 
@@ -49,7 +49,7 @@ suite('integration: Factories.LicenseFactory', () => {
   })
 
   test('makeFromString() -> SpdxLicense', () => {
-    const sut = new LicenseFactory()
+    const sut = new Contrib.License.Factories.LicenseFactory()
 
     const license = sut.makeFromString('MIT')
 
diff --git a/tests/integration/Factories.PackageUrlFactory.test.js b/tests/integration/Factories.PackageUrlFactory.test.js
@@ -25,13 +25,13 @@ const { PackageURL } = require('packageurl-js')
 const {
   Enums,
   Models,
-  Factories: { PackageUrlFactory }
+  Contrib,
 } = require('../../')
 
 suite('integration: Factories.PackageUrlFactory', () => {
   const salt = Math.random()
 
-  const sut = new PackageUrlFactory('testing')
+  const sut = new Contrib.PackageUrl.Factories.PackageUrlFactory('testing')
 
   suite('makeFromComponent', () => {
     test('no-name-no-purl', () => {
diff --git a/tests/integration/Utils.LicenseUtility.LicenseEvidenceGatherer.node.test.js b/tests/integration/Utils.LicenseUtility.LicenseEvidenceGatherer.node.test.js
@@ -26,13 +26,13 @@ const { suite, test } = require('mocha')
 const {
   Models: { Attachment },
   Enums: { AttachmentEncoding },
-  Utils: { LicenseUtility: { LicenseEvidenceGatherer } }
+  Contrib,
 } = require('../../')
 
 suite('integration: Utils.LicenseUtility.LicenseEvidenceGatherer', () => {
   test('no path -> throws', () => {
     const { fs } = memfs({ '/': {} })
-    const leg = new LicenseEvidenceGatherer({ fs })
+    const leg = new Contrib.License.Utils.LicenseEvidenceGatherer({ fs })
     assert.throws(
       () => {
         Array.from(
@@ -48,7 +48,7 @@ suite('integration: Utils.LicenseUtility.LicenseEvidenceGatherer', () => {
 
   test('no files', () => {
     const { fs } = memfs({ '/': {} })
-    const leg = new LicenseEvidenceGatherer({ fs })
+    const leg = new Contrib.License.Utils.LicenseEvidenceGatherer({ fs })
     const errors = []
     const found = Array.from(
       leg.getFileAttachments(
@@ -66,7 +66,7 @@ suite('integration: Utils.LicenseUtility.LicenseEvidenceGatherer', () => {
         'GPL-3.0-or-later.txt': 'GPL-3.0-or-later License text here...'
       }
     })
-    const leg = new LicenseEvidenceGatherer({ fs })
+    const leg = new Contrib.License.Utils.LicenseEvidenceGatherer({ fs })
     const found = Array.from(
       leg.getFileAttachments('/'))
     assert.deepEqual(found, [])
@@ -80,7 +80,7 @@ suite('integration: Utils.LicenseUtility.LicenseEvidenceGatherer', () => {
         'GPL-3.0-or-later.txt': 'GPL-3.0-or-later License text here...'
       }
     })
-    const leg = new LicenseEvidenceGatherer({ fs })
+    const leg = new Contrib.License.Utils.LicenseEvidenceGatherer({ fs })
     const found = Array.from(
       leg.getFileAttachments('/'))
     assert.deepEqual(found, [])
@@ -93,7 +93,7 @@ suite('integration: Utils.LicenseUtility.LicenseEvidenceGatherer', () => {
       `skipped license file ${sep}LICENSE`,
       { cause: new Error('Custom read error: Access denied!') })
     fs.readFileSync = function () { throw expectedError.cause }
-    const leg = new LicenseEvidenceGatherer({ fs })
+    const leg = new Contrib.License.Utils.LicenseEvidenceGatherer({ fs })
     const errors = []
     const found = Array.from(
       leg.getFileAttachments(
@@ -132,7 +132,7 @@ suite('integration: Utils.LicenseUtility.LicenseEvidenceGatherer', () => {
 
   test('finds licenses as expected', () => {
     const { fs } = memfs({ '/': mockedLicenses })
-    const leg = new LicenseEvidenceGatherer({ fs })
+    const leg = new Contrib.License.Utils.LicenseEvidenceGatherer({ fs })
     const errors = []
     const found = Array.from(
       leg.getFileAttachments(
@@ -218,7 +218,7 @@ suite('integration: Utils.LicenseUtility.LicenseEvidenceGatherer', () => {
 
   test('does not find licenses in subfolder', () => {
     const { fs } = memfs({ '/foo': mockedLicenses })
-    const leg = new LicenseEvidenceGatherer({ fs })
+    const leg = new Contrib.License.Utils.LicenseEvidenceGatherer({ fs })
     const found = Array.from(
       leg.getFileAttachments('/'))
     assert.deepEqual(found, [])
diff --git a/tests/unit/Builders.FromNodePackageJson.ComponentBuilder.spec.js b/tests/unit/Builders.FromNodePackageJson.ComponentBuilder.spec.js
@@ -22,19 +22,15 @@ const assert = require('node:assert')
 const { suite, test } = require('mocha')
 
 const {
-  Builders: { FromNodePackageJson: { ComponentBuilder } },
-  Factories: {
-    FromNodePackageJson: { ExternalReferenceFactory },
-    LicenseFactory
-  }
+  Contrib,
 } = require('../../')
 
 suite('unit: Builders.FromNodePackageJson.ComponentBuilder', () => {
   test('construct', () => {
-    const extRefFactory = new ExternalReferenceFactory()
-    const licenseFactory = new LicenseFactory()
+    const extRefFactory = new Contrib.FromNodePackageJson.Factories.ExternalReferenceFactory()
+    const licenseFactory = new Contrib.License.Factories.LicenseFactory()
 
-    const actual = new ComponentBuilder(extRefFactory, licenseFactory)
+    const actual = new Contrib.FromNodePackageJson.Builders.ComponentBuilder(extRefFactory, licenseFactory)
 
     assert.strictEqual(actual.extRefFactory, extRefFactory)
     assert.strictEqual(actual.licenseFactory, licenseFactory)
diff --git a/tests/unit/Builders.FromNodePackageJson.ToolBuilder.spec.js b/tests/unit/Builders.FromNodePackageJson.ToolBuilder.spec.js
@@ -22,15 +22,14 @@ const assert = require('node:assert')
 const { suite, test } = require('mocha')
 
 const {
-  Builders: { FromNodePackageJson: { ToolBuilder } },
-  Factories: { FromNodePackageJson: { ExternalReferenceFactory } }
+  Contrib,
 } = require('../../')
 
 suite('unit: Builders.FromNodePackageJson.ToolBuilder', () => {
   test('construct', () => {
-    const extRefFactory = new ExternalReferenceFactory()
+    const extRefFactory = new Contrib.FromNodePackageJson.Factories.ExternalReferenceFactory()
 
-    const actual = new ToolBuilder(extRefFactory)
+    const actual = new Contrib.FromNodePackageJson.Builders.ToolBuilder(extRefFactory)
 
     assert.strictEqual(actual.extRefFactory, extRefFactory)
   })
diff --git a/tests/unit/Factories.PackageUrlFactory.spec.js b/tests/unit/Factories.PackageUrlFactory.spec.js
@@ -22,15 +22,15 @@ const assert = require('node:assert')
 const { suite, test } = require('mocha')
 
 const {
-  Factories: { PackageUrlFactory }
+  Contrib,
 } = require('../../')
 const { randomString } = require('../_helpers/stringFunctions')
 
 suite('unit: Factories.PackageUrlFactory', () => {
   test('construct', () => {
     const type = randomString(5)
 
-    const actual = new PackageUrlFactory(type)
+    const actual = new Contrib.PackageUrl.Factories.PackageUrlFactory(type)
 
     assert.strictEqual(actual.type, type)
   })
diff --git a/tests/unit/Utils.BomUtility.spec.js b/tests/unit/Utils.BomUtility.spec.js
@@ -22,19 +22,17 @@ const assert = require('node:assert')
 const { suite, test } = require('mocha')
 
 const {
-  Utils: {
-    BomUtility
-  }
+  Contrib,
 } = require('../../')
 
 suite('unit: Utils.BomUtility', () => {
   suite('randomSerialNumber()', () => {
     test('has correct format according to XSD', () => {
-      const value = BomUtility.randomSerialNumber()
+      const value = Contrib.Bom.Utils.randomSerialNumber()
       assert.match(value, /^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$|^\\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\\}$/)
     })
     test('has correct format according to JSON schema', () => {
-      const value = BomUtility.randomSerialNumber()
+      const value = Contrib.Bom.Utils.randomSerialNumber()
       assert.match(value, /^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/)
     })
   })
diff --git a/tests/unit/Utils.NpmjsUtility.spec.js b/tests/unit/Utils.NpmjsUtility.spec.js
@@ -25,18 +25,16 @@ const {
   Enums: {
     HashAlgorithm
   },
-  Utils: {
-    NpmjsUtility
-  }
+  Contrib,
 } = require('../../')
 
 suite('unit: Utils.NpmjsUtility.defaultRegistryMatcher', () => {
   test('matches pure domain', () => {
-    const actual = NpmjsUtility.defaultRegistryMatcher.test('https://registry.npmjs.org')
+    const actual = Contrib.FromNodePackageJson.Utils.defaultRegistryMatcher.test('https://registry.npmjs.org')
     assert.strictEqual(actual, true)
   })
   test('matches with path', () => {
-    const actual = NpmjsUtility.defaultRegistryMatcher.test('https://registry.npmjs.org/foo/bar')
+    const actual = Contrib.FromNodePackageJson.Utils.defaultRegistryMatcher.test('https://registry.npmjs.org/foo/bar')
     assert.strictEqual(actual, true)
   })
   suite('not match unexpected', () => {
@@ -46,7 +44,7 @@ suite('unit: Utils.NpmjsUtility.defaultRegistryMatcher', () => {
       'https://registry.npmjs.org.uk/foo/bar'
     ]) {
       test(c, () => {
-        const actual = NpmjsUtility.defaultRegistryMatcher.test(c)
+        const actual = Contrib.FromNodePackageJson.Utils.defaultRegistryMatcher.test(c)
         assert.strictEqual(actual, false)
       })
     }
@@ -74,7 +72,7 @@ suite('unit: Utils.NpmjsUtility.parsePackageIntegrity', () => {
       ],
     ]) {
       test(c, () => {
-        const actual = NpmjsUtility.parsePackageIntegrity(c)
+        const actual = Contrib.FromNodePackageJson.Utils.parsePackageIntegrity(c)
         assert.deepStrictEqual(actual, expected)
       })
     }
