@cyclonedx/cyclonedx-library 1.3.0 → 1.3.3

package/dist.web/lib.dev.js

@@ -396,7 +396,7 @@ class LicenseFactory {
         try {
             return this.makeExpression(value);
         }
-        catch (Error) {
+        catch {
             return this.makeDisjunctive(value);
         }
     }
@@ -407,7 +407,7 @@ class LicenseFactory {
         try {
             return this.makeDisjunctiveWithId(value);
         }
-        catch (error) {
+        catch {
             return this.makeDisjunctiveWithName(value);
         }
     }
@@ -820,7 +820,7 @@ class BomRef {
         this.value = value;
     }
     compare(other) {
-        return (this.toString()).localeCompare(other.toString());
+        return this.toString().localeCompare(other.toString());
     }
     toString() {
         return this.value ?? '';
@@ -1573,12 +1573,17 @@ class BaseSerializer {
 exports.BaseSerializer = BaseSerializer;
 _BaseSerializer_instances = new WeakSet(), _BaseSerializer_getAllBomRefs = function _BaseSerializer_getAllBomRefs(bom) {
     const bomRefs = new Set();
+    function iterComponents(cs) {
+        for (const { bomRef, components } of cs) {
+            bomRefs.add(bomRef);
+            iterComponents(components);
+        }
+    }
     if (bom.metadata.component !== undefined) {
         bomRefs.add(bom.metadata.component.bomRef);
+        iterComponents(bom.metadata.component.components);
     }
-    for (const { bomRef } of bom.components) {
-        bomRefs.add(bomRef);
-    }
+    iterComponents(bom.components);
     return bomRefs.values();
 };
 
@@ -2108,11 +2113,11 @@ class ComponentNormalizer extends Base {
                 externalReferences: data.externalReferences.size > 0
                     ? this._factory.makeForExternalReference().normalizeRepository(data.externalReferences, options)
                     : undefined,
+                properties: spec.supportsProperties(data) && data.properties.size > 0
+                    ? this._factory.makeForProperty().normalizeRepository(data.properties, options)
+                    : undefined,
                 components: data.components.size > 0
                     ? this.normalizeRepository(data.components, options)
-                    : undefined,
-                properties: data.properties.size > 0
-                    ? this._factory.makeForProperty().normalizeRepository(data.properties, options)
                     : undefined
             }
             : undefined;
@@ -2816,18 +2821,18 @@ class ComponentNormalizer extends Base {
                     .normalizeRepository(data.externalReferences, options, 'reference')
             }
             : undefined;
-        const components = data.components.size > 0
+        const properties = spec.supportsProperties(data) && data.properties.size > 0
             ? {
                 type: 'element',
-                name: 'components',
-                children: this.normalizeRepository(data.components, options, 'component')
+                name: 'properties',
+                children: this._factory.makeForProperty().normalizeRepository(data.properties, options, 'property')
             }
             : undefined;
-        const properties = data.properties.size > 0
+        const components = data.components.size > 0
             ? {
                 type: 'element',
-                name: 'properties',
-                children: this._factory.makeForProperty().normalizeRepository(data.properties, options, 'property')
+                name: 'components',
+                children: this.normalizeRepository(data.components, options, 'component')
             }
             : undefined;
         return {
@@ -2853,8 +2858,8 @@ class ComponentNormalizer extends Base {
                 makeOptionalTextElement(data.purl, 'purl'),
                 swid,
                 extRefs,
-                components,
-                properties
+                properties,
+                components
             ].filter(notUndefined_1.isNotUndefined)
         };
     }
@@ -3114,10 +3119,32 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.XmlSchema = void 0;
 var XmlSchema;
 (function (XmlSchema) {
+    const _anyUriSchemePattern = /^[a-z][a-z0-9+\-.]*$/i;
     function isAnyURI(value) {
-        return typeof value === 'string' &&
-            value.length > 0 &&
-            Array.from(value).filter(c => c === '#').length <= 1;
+        if (typeof value !== 'string') {
+            return false;
+        }
+        if (value.length === 0) {
+            return false;
+        }
+        const fragmentPos = value.indexOf('#');
+        let beforeFragment;
+        if (fragmentPos >= 0) {
+            if (value.includes('#', fragmentPos + 1)) {
+                return false;
+            }
+            beforeFragment = value.slice(undefined, fragmentPos);
+        }
+        else {
+            beforeFragment = value;
+        }
+        const schemePos = beforeFragment.indexOf(':');
+        if (schemePos >= 0) {
+            if (!_anyUriSchemePattern.test(beforeFragment.slice(undefined, schemePos))) {
+                return false;
+            }
+        }
+        return true;
     }
     XmlSchema.isAnyURI = isAnyURI;
 })(XmlSchema = exports.XmlSchema || (exports.XmlSchema = {}));
@@ -3357,7 +3384,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Spec_version, _Spec_formats, _Spec_componentTypes, _Spec_hashAlgorithms, _Spec_hashValuePattern, _Spec_externalReferenceTypes, _Spec_supportsDependencyGraph, _Spec_supportsToolReferences, _Spec_requiresComponentVersion;
+var _Spec_version, _Spec_formats, _Spec_componentTypes, _Spec_hashAlgorithms, _Spec_hashValuePattern, _Spec_externalReferenceTypes, _Spec_supportsDependencyGraph, _Spec_supportsToolReferences, _Spec_requiresComponentVersion, _Spec_supportsProperties;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SpecVersionDict = exports.Spec1dot4 = exports.Spec1dot3 = exports.Spec1dot2 = exports.UnsupportedFormatError = exports.Format = exports.Version = void 0;
 const enums_1 = __webpack_require__(/*! ./enums */ "./src/enums/index.ts");
@@ -3378,7 +3405,7 @@ class UnsupportedFormatError extends Error {
 }
 exports.UnsupportedFormatError = UnsupportedFormatError;
 class Spec {
-    constructor(version, formats, componentTypes, hashAlgorithms, hashValuePattern, externalReferenceTypes, supportsDependencyGraph, supportsToolReferences, requiresComponentVersion) {
+    constructor(version, formats, componentTypes, hashAlgorithms, hashValuePattern, externalReferenceTypes, supportsDependencyGraph, supportsToolReferences, requiresComponentVersion, supportsProperties) {
         _Spec_version.set(this, void 0);
         _Spec_formats.set(this, void 0);
         _Spec_componentTypes.set(this, void 0);
@@ -3388,6 +3415,7 @@ class Spec {
         _Spec_supportsDependencyGraph.set(this, void 0);
         _Spec_supportsToolReferences.set(this, void 0);
         _Spec_requiresComponentVersion.set(this, void 0);
+        _Spec_supportsProperties.set(this, void 0);
         __classPrivateFieldSet(this, _Spec_version, version, "f");
         __classPrivateFieldSet(this, _Spec_formats, new Set(formats), "f");
         __classPrivateFieldSet(this, _Spec_componentTypes, new Set(componentTypes), "f");
@@ -3397,6 +3425,7 @@ class Spec {
         __classPrivateFieldSet(this, _Spec_supportsDependencyGraph, supportsDependencyGraph, "f");
         __classPrivateFieldSet(this, _Spec_supportsToolReferences, supportsToolReferences, "f");
         __classPrivateFieldSet(this, _Spec_requiresComponentVersion, requiresComponentVersion, "f");
+        __classPrivateFieldSet(this, _Spec_supportsProperties, supportsProperties, "f");
     }
     get version() {
         return __classPrivateFieldGet(this, _Spec_version, "f");
@@ -3426,8 +3455,11 @@ class Spec {
     get requiresComponentVersion() {
         return __classPrivateFieldGet(this, _Spec_requiresComponentVersion, "f");
     }
+    supportsProperties() {
+        return __classPrivateFieldGet(this, _Spec_supportsProperties, "f");
+    }
 }
-_Spec_version = new WeakMap(), _Spec_formats = new WeakMap(), _Spec_componentTypes = new WeakMap(), _Spec_hashAlgorithms = new WeakMap(), _Spec_hashValuePattern = new WeakMap(), _Spec_externalReferenceTypes = new WeakMap(), _Spec_supportsDependencyGraph = new WeakMap(), _Spec_supportsToolReferences = new WeakMap(), _Spec_requiresComponentVersion = new WeakMap();
+_Spec_version = new WeakMap(), _Spec_formats = new WeakMap(), _Spec_componentTypes = new WeakMap(), _Spec_hashAlgorithms = new WeakMap(), _Spec_hashValuePattern = new WeakMap(), _Spec_externalReferenceTypes = new WeakMap(), _Spec_supportsDependencyGraph = new WeakMap(), _Spec_supportsToolReferences = new WeakMap(), _Spec_requiresComponentVersion = new WeakMap(), _Spec_supportsProperties = new WeakMap();
 exports.Spec1dot2 = Object.freeze(new Spec(Version.v1dot2, [
     Format.XML,
     Format.JSON
@@ -3469,7 +3501,7 @@ exports.Spec1dot2 = Object.freeze(new Spec(Version.v1dot2, [
     enums_1.ExternalReferenceType.BuildMeta,
     enums_1.ExternalReferenceType.BuildSystem,
     enums_1.ExternalReferenceType.Other
-], true, false, true));
+], true, false, true, false));
 exports.Spec1dot3 = Object.freeze(new Spec(Version.v1dot3, [
     Format.XML,
     Format.JSON
@@ -3511,7 +3543,7 @@ exports.Spec1dot3 = Object.freeze(new Spec(Version.v1dot3, [
     enums_1.ExternalReferenceType.BuildMeta,
     enums_1.ExternalReferenceType.BuildSystem,
     enums_1.ExternalReferenceType.Other
-], true, false, true));
+], true, false, true, true));
 exports.Spec1dot4 = Object.freeze(new Spec(Version.v1dot4, [
     Format.XML,
     Format.JSON
@@ -3554,7 +3586,7 @@ exports.Spec1dot4 = Object.freeze(new Spec(Version.v1dot4, [
     enums_1.ExternalReferenceType.BuildSystem,
     enums_1.ExternalReferenceType.ReleaseNotes,
     enums_1.ExternalReferenceType.Other
-], true, true, false));
+], true, true, false, true));
 exports.SpecVersionDict = Object.freeze(Object.fromEntries([
     [Version.v1dot2, exports.Spec1dot2],
     [Version.v1dot3, exports.Spec1dot3],