@cyclonedx/cyclonedx-library 1.3.2 → 1.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist.node/serialize/xml/types.js +25 -3
  2. package/dist.node/serialize/xml/types.js.map +1 -1
  3. package/dist.web/lib.dev.js +25 -3
  4. package/dist.web/lib.dev.js.map +1 -1
  5. package/dist.web/lib.js +1 -1
  6. package/package.json +1 -1
  7. package/src/serialize/xml/types.ts +36 -5
package/dist.node/serialize/xml/types.js CHANGED
@@ -21,10 +21,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
21
21
  exports.XmlSchema = void 0;
22
22
  var XmlSchema;
23
23
  (function (XmlSchema) {
24
+ const _anyUriSchemePattern = /^[a-z][a-z0-9+\-.]*$/i;
24
25
  function isAnyURI(value) {
25
- return typeof value === 'string' &&
26
- value.length > 0 &&
27
- Array.from(value).filter(c => c === '#').length <= 1;
26
+ if (typeof value !== 'string') {
27
+ return false;
28
+ }
29
+ if (value.length === 0) {
30
+ return false;
31
+ }
32
+ const fragmentPos = value.indexOf('#');
33
+ let beforeFragment;
34
+ if (fragmentPos >= 0) {
35
+ if (value.includes('#', fragmentPos + 1)) {
36
+ return false;
37
+ }
38
+ beforeFragment = value.slice(undefined, fragmentPos);
39
+ }
40
+ else {
41
+ beforeFragment = value;
42
+ }
43
+ const schemePos = beforeFragment.indexOf(':');
44
+ if (schemePos >= 0) {
45
+ if (!_anyUriSchemePattern.test(beforeFragment.slice(undefined, schemePos))) {
46
+ return false;
47
+ }
48
+ }
49
+ return true;
28
50
  }
29
51
  XmlSchema.isAnyURI = isAnyURI;
30
52
  })(XmlSchema = exports.XmlSchema || (exports.XmlSchema = {}));
package/dist.node/serialize/xml/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/serialize/xml/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;EAiBE;;;AAGF,IAAiB,SAAS,CAmBzB;AAnBD,WAAiB,SAAS;IAYxB,SAAgB,QAAQ,CAAE,KAAmB;QAC3C,OAAO,OAAO,KAAK,KAAK,QAAQ;YAC9B,KAAK,CAAC,MAAM,GAAG,CAAC;YAChB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAA;IAExD,CAAC;IALe,kBAAQ,WAKvB,CAAA;AAEH,CAAC,EAnBgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAmBzB"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/serialize/xml/types.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;EAiBE;;;AAGF,IAAiB,SAAS,CAkDzB;AAlDD,WAAiB,SAAS;IAExB,MAAM,oBAAoB,GAAG,uBAAuB,CAAA;IAapD,SAAgB,QAAQ,CAAE,KAAmB;QAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAE7B,OAAO,KAAK,CAAA;SACb;QACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAEtB,OAAO,KAAK,CAAA;SACb;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QACtC,IAAI,cAAsB,CAAA;QAC1B,IAAI,WAAW,IAAI,CAAC,EAAE;YACpB,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,GAAG,CAAC,CAAC,EAAE;gBAExC,OAAO,KAAK,CAAA;aACb;YACD,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;SACrD;aAAM;YACL,cAAc,GAAG,KAAK,CAAA;SACvB;QAED,MAAM,SAAS,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAC7C,IAAI,SAAS,IAAI,CAAC,EAAE;YAClB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,EAAE;gBAE1E,OAAO,KAAK,CAAA;aACb;SACF;QAID,OAAO,IAAI,CAAA;IACb,CAAC;IAjCe,kBAAQ,WAiCvB,CAAA;AAEH,CAAC,EAlDgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAkDzB"}
package/dist.web/lib.dev.js CHANGED
@@ -3119,10 +3119,32 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
3119
3119
  exports.XmlSchema = void 0;
3120
3120
  var XmlSchema;
3121
3121
  (function (XmlSchema) {
3122
+ const _anyUriSchemePattern = /^[a-z][a-z0-9+\-.]*$/i;
3122
3123
  function isAnyURI(value) {
3123
- return typeof value === 'string' &&
3124
- value.length > 0 &&
3125
- Array.from(value).filter(c => c === '#').length <= 1;
3124
+ if (typeof value !== 'string') {
3125
+ return false;
3126
+ }
3127
+ if (value.length === 0) {
3128
+ return false;
3129
+ }
3130
+ const fragmentPos = value.indexOf('#');
3131
+ let beforeFragment;
3132
+ if (fragmentPos >= 0) {
3133
+ if (value.includes('#', fragmentPos + 1)) {
3134
+ return false;
3135
+ }
3136
+ beforeFragment = value.slice(undefined, fragmentPos);
3137
+ }
3138
+ else {
3139
+ beforeFragment = value;
3140
+ }
3141
+ const schemePos = beforeFragment.indexOf(':');
3142
+ if (schemePos >= 0) {
3143
+ if (!_anyUriSchemePattern.test(beforeFragment.slice(undefined, schemePos))) {
3144
+ return false;
3145
+ }
3146
+ }
3147
+ return true;
3126
3148
  }
3127
3149
  XmlSchema.isAnyURI = isAnyURI;
3128
3150
  })(XmlSchema = exports.XmlSchema || (exports.XmlSchema = {}));