@cyclonedx/cdxgen 10.8.2 → 10.8.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.
- package/evinser.js +7 -2
- package/package.json +6 -6
- package/types/evinser.d.ts.map +1 -1
- package/utils.test.js +2 -2
package/evinser.js
CHANGED
|
@@ -335,7 +335,8 @@ export const initFromSbom = (components, language) => {
|
|
|
335
335
|
*/
|
|
336
336
|
export const analyzeProject = async (dbObjMap, options) => {
|
|
337
337
|
const dirPath = options._[0] || ".";
|
|
338
|
-
const
|
|
338
|
+
const languages = options.language;
|
|
339
|
+
const language = Array.isArray(languages) ? languages[0] : languages;
|
|
339
340
|
let usageSlice = undefined;
|
|
340
341
|
let dataFlowSlice = undefined;
|
|
341
342
|
let reachablesSlice = undefined;
|
|
@@ -764,7 +765,8 @@ export const isFilterableType = (
|
|
|
764
765
|
if (
|
|
765
766
|
typeFullName.startsWith("tmp") ||
|
|
766
767
|
typeFullName.startsWith("self.") ||
|
|
767
|
-
typeFullName.startsWith("_")
|
|
768
|
+
typeFullName.startsWith("_") ||
|
|
769
|
+
typeFullName.startsWith("def ")
|
|
768
770
|
) {
|
|
769
771
|
return true;
|
|
770
772
|
}
|
|
@@ -1403,6 +1405,9 @@ export const getClassTypeFromSignature = (language, typeFullName) => {
|
|
|
1403
1405
|
typeFullName = tmpA.join("/");
|
|
1404
1406
|
}
|
|
1405
1407
|
} else if (["python", "py"].includes(language)) {
|
|
1408
|
+
if (typeFullName.includes("/")) {
|
|
1409
|
+
typeFullName = typeFullName.split("/").pop();
|
|
1410
|
+
}
|
|
1406
1411
|
typeFullName = typeFullName
|
|
1407
1412
|
.replace(".py:<module>", "")
|
|
1408
1413
|
.replace(/\//g, ".")
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cyclonedx/cdxgen",
|
|
3
|
-
"version": "10.8.
|
|
3
|
+
"version": "10.8.3",
|
|
4
4
|
"description": "Creates CycloneDX Software Bill of Materials (SBOM) from source or container image",
|
|
5
5
|
"homepage": "http://github.com/cyclonedx/cdxgen",
|
|
6
6
|
"author": "Prabhu Subramanian <prabhu@appthreat.com>",
|
|
@@ -58,15 +58,15 @@
|
|
|
58
58
|
"url": "https://github.com/cyclonedx/cdxgen/issues"
|
|
59
59
|
},
|
|
60
60
|
"dependencies": {
|
|
61
|
-
"@babel/parser": "^7.24.
|
|
62
|
-
"@babel/traverse": "^7.24.
|
|
63
|
-
"@npmcli/arborist": "7.5.
|
|
61
|
+
"@babel/parser": "^7.24.8",
|
|
62
|
+
"@babel/traverse": "^7.24.8",
|
|
63
|
+
"@npmcli/arborist": "7.5.4",
|
|
64
64
|
"ajv": "^8.16.0",
|
|
65
65
|
"ajv-formats": "^3.0.1",
|
|
66
66
|
"cheerio": "^1.0.0-rc.12",
|
|
67
67
|
"edn-data": "1.1.2",
|
|
68
68
|
"find-up": "7.0.0",
|
|
69
|
-
"glob": "^
|
|
69
|
+
"glob": "^11.0.0",
|
|
70
70
|
"global-agent": "^3.0.0",
|
|
71
71
|
"got": "14.4.1",
|
|
72
72
|
"iconv-lite": "^0.6.3",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"validate-iri": "^1.0.1"
|
|
87
87
|
},
|
|
88
88
|
"optionalDependencies": {
|
|
89
|
-
"@appthreat/atom": "2.0.
|
|
89
|
+
"@appthreat/atom": "2.0.17",
|
|
90
90
|
"@appthreat/cdx-proto": "1.0.1",
|
|
91
91
|
"@cyclonedx/cdxgen-plugins-bin": "1.6.2",
|
|
92
92
|
"@cyclonedx/cdxgen-plugins-bin-arm64": "1.6.2",
|
package/types/evinser.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evinser.d.ts","sourceRoot":"","sources":["../evinser.js"],"names":[],"mappings":"AA0BO;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"evinser.d.ts","sourceRoot":"","sources":["../evinser.js"],"names":[],"mappings":"AA0BO;;;;;;;;;;;;;qBAs4CqylD,CAAC;qBAAgB,CAAC;;;qBAA4F,CAAC;qBAAgB,CAAC;;;qBAAkE,CAAC;qBAAgB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wGAAr3wC,QAAa;;;;;;;;;;;;;;sHAAq3M,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wJAAmkY,CAAC;;;wJAA2rB,CAAC;qUAAg+C,CAAC;2JAAqH,CAAC,kJAAgH,CAAC;qUAA8wB,CAAC;2JAAqH,CAAC,kJAAgH,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAA81kB,CAAC;qBAAgB,CAAC;;;qBAA4F,CAAC;qBAAgB,CAAC;;;qBAAkE,CAAC;qBAAgB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wGAAr3wC,QAAa;;;;;;;;;;;;;;sHAAq3M,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wJAAmkY,CAAC;;;wJAA2rB,CAAC;qUAAg+C,CAAC;2JAAqH,CAAC,kJAAgH,CAAC;qUAA8wB,CAAC;2JAAqH,CAAC,kJAAgH,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAA81kB,CAAC;qBAAgB,CAAC;;;qBAA4F,CAAC;qBAAgB,CAAC;;;qBAAkE,CAAC;qBAAgB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wGAAr3wC,QAAa;;;;;;;;;;;;;;sHAAq3M,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wJAAmkY,CAAC;;;wJAA2rB,CAAC;qUAAg+C,CAAC;2JAAqH,CAAC,kJAAgH,CAAC;qUAA8wB,CAAC;2JAAqH,CAAC,kJAAgH,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAr0C78gC;AAEM,6GAiDN;AAEM,gGAkCN;AAEM,wGAqBN;AAEM;;;;EAsEN;AAEM,iEAoBN;AAEM;;;EA8BN;AAQM;;;;;;;;;;;;GAkHN;AAEM,2JA4CN;AAcM,2CARI,MAAM,iHAkNhB;AAEM,sGAqEN;AASM,mDAJI,MAAM,wCA6DhB;AASM,gDAJI,MAAM,mDA8DhB;AAEM,wEAWN;AAEM,gEAmDN;AASM,yEA+IN;AAaM,gDAPI,MAAM,uHAyHhB;AAUM,iDAHI,MAAM;;;;;;;;;;;;;EA2FhB;AAQM,kDAaN;AAQM,2CAHI,MAAM,UAKhB;AAEM,oFAyCN"}
|
package/utils.test.js
CHANGED
|
@@ -2839,8 +2839,8 @@ test("parsePnpmLock", async () => {
|
|
|
2839
2839
|
expect(parsedList.dependenciesList).toHaveLength(462);
|
|
2840
2840
|
expect(parsedList.pkgList.filter((pkg) => !pkg.scope)).toHaveLength(3);
|
|
2841
2841
|
parsedList = await parsePnpmLock("./pnpm-lock.yaml");
|
|
2842
|
-
expect(parsedList.pkgList.length).toEqual(
|
|
2843
|
-
expect(parsedList.dependenciesList.length).toEqual(
|
|
2842
|
+
expect(parsedList.pkgList.length).toEqual(653);
|
|
2843
|
+
expect(parsedList.dependenciesList.length).toEqual(653);
|
|
2844
2844
|
expect(parsedList.pkgList[0]).toEqual({
|
|
2845
2845
|
group: "@ampproject",
|
|
2846
2846
|
name: "remapping",
|