Generated dist

This commit is contained in:
Lewis Jones
2025-06-19 15:22:04 +01:00
parent 2517c7a607
commit 3349f8c032
2 changed files with 79 additions and 65 deletions
Generated Vendored
+78 -64
View File
@@ -36054,78 +36054,91 @@ class ComponentDetection {
static getManifestsFromResults() { static getManifestsFromResults() {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
core.info("Getting manifests from results"); core.info("Getting manifests from results");
// Parse the result file and add the packages to the package cache
const packageCache = new dependency_submission_toolkit_1.PackageCache();
const packages = [];
const results = yield fs_1.default.readFileSync(this.outputPath, 'utf8'); const results = yield fs_1.default.readFileSync(this.outputPath, 'utf8');
var json = JSON.parse(results); var json = JSON.parse(results);
json.componentsFound.forEach((component) => __awaiter(this, void 0, void 0, function* () { return this.processComponentsToManifests(json.componentsFound);
// Skip components without packageUrl });
if (!component.component.packageUrl) { }
core.debug(`Skipping component detected without packageUrl: ${JSON.stringify({ static processComponentsToManifests(componentsFound) {
id: component.component.id, // Parse the result file and add the packages to the package cache
name: component.component.name || 'unnamed', const packageCache = new dependency_submission_toolkit_1.PackageCache();
type: component.component.type || 'unknown' const packages = [];
}, null, 2)}`); componentsFound.forEach((component) => __awaiter(this, void 0, void 0, function* () {
// Skip components without packageUrl
if (!component.component.packageUrl) {
core.debug(`Skipping component detected without packageUrl: ${JSON.stringify({
id: component.component.id,
name: component.component.name || 'unnamed',
type: component.component.type || 'unknown'
}, null, 2)}`);
return;
}
const packageUrl = ComponentDetection.makePackageUrl(component.component.packageUrl);
// Skip if the packageUrl is empty (indicates an invalid or missing packageUrl)
if (!packageUrl) {
core.debug(`Skipping component with invalid packageUrl: ${component.component.id}`);
return;
}
if (!packageCache.hasPackage(packageUrl)) {
const pkg = new ComponentDetectionPackage(packageUrl, component.component.id, component.isDevelopmentDependency, component.topLevelReferrers, component.locationsFoundAt, component.containerDetailIds, component.containerLayerIds);
packageCache.addPackage(pkg);
packages.push(pkg);
}
}));
// Set the transitive dependencies
core.debug("Sorting out transitive dependencies");
packages.forEach((pkg) => __awaiter(this, void 0, void 0, function* () {
pkg.topLevelReferrers.forEach((referrer) => __awaiter(this, void 0, void 0, function* () {
// Skip if referrer doesn't have a valid packageUrl
if (!referrer.packageUrl) {
core.debug(`Skipping referrer without packageUrl for component: ${pkg.id}`);
return; return;
} }
const packageUrl = ComponentDetection.makePackageUrl(component.component.packageUrl); const referrerUrl = ComponentDetection.makePackageUrl(referrer.packageUrl);
// Skip if the packageUrl is empty (indicates an invalid or missing packageUrl) referrer.packageUrlString = referrerUrl;
if (!packageUrl) { // Skip if the generated packageUrl is empty
core.debug(`Skipping component with invalid packageUrl: ${component.component.id}`); if (!referrerUrl) {
core.debug(`Skipping referrer with invalid packageUrl for component: ${pkg.id}`);
return; return;
} }
if (!packageCache.hasPackage(packageUrl)) { try {
const pkg = new ComponentDetectionPackage(packageUrl, component.component.id, component.isDevelopmentDependency, component.topLevelReferrers, component.locationsFoundAt, component.containerDetailIds, component.containerLayerIds); const referrerPackage = packageCache.lookupPackage(referrerUrl);
packageCache.addPackage(pkg); if (referrerPackage) {
packages.push(pkg); referrerPackage.dependsOn(pkg);
}
}
catch (error) {
core.debug(`Error looking up referrer package: ${error}`);
} }
})); }));
// Set the transitive dependencies }));
core.debug("Sorting out transitive dependencies"); // Create manifests
packages.forEach((pkg) => __awaiter(this, void 0, void 0, function* () { const manifests = [];
pkg.topLevelReferrers.forEach((referrer) => __awaiter(this, void 0, void 0, function* () { // Check the locationsFoundAt for every package and add each as a manifest
// Skip if referrer doesn't have a valid packageUrl this.addPackagesToManifests(packages, manifests);
if (!referrer.packageUrl) { return manifests;
core.debug(`Skipping referrer without packageUrl for component: ${pkg.id}`); }
return; static addPackagesToManifests(packages, manifests) {
} packages.forEach((pkg) => {
const referrerUrl = ComponentDetection.makePackageUrl(referrer.packageUrl); pkg.locationsFoundAt.forEach((location) => {
// Skip if the generated packageUrl is empty var _a, _b;
if (!referrerUrl) { if (!manifests.find((manifest) => manifest.name == location)) {
core.debug(`Skipping referrer with invalid packageUrl for component: ${pkg.id}`); const manifest = new dependency_submission_toolkit_1.Manifest(location, location);
return; manifests.push(manifest);
} }
try { // Filter out self-references from topLevelReferrers
const referrerPackage = packageCache.lookupPackage(referrerUrl); const nonSelfReferrers = pkg.topLevelReferrers.filter((referrer) => {
if (referrerPackage) { if (!referrer.packageUrlString)
referrerPackage.dependsOn(pkg); return false;
} return referrer.packageUrlString !== pkg.packageUrlString;
} });
catch (error) { if (nonSelfReferrers.length == 0) {
core.debug(`Error looking up referrer package: ${error}`); (_a = manifests.find((manifest) => manifest.name == location)) === null || _a === void 0 ? void 0 : _a.addDirectDependency(pkg, ComponentDetection.getDependencyScope(pkg));
} }
})); else {
})); (_b = manifests.find((manifest) => manifest.name == location)) === null || _b === void 0 ? void 0 : _b.addIndirectDependency(pkg, ComponentDetection.getDependencyScope(pkg));
// Create manifests }
const manifests = []; });
// Check the locationsFoundAt for every package and add each as a manifest
packages.forEach((pkg) => __awaiter(this, void 0, void 0, function* () {
pkg.locationsFoundAt.forEach((location) => __awaiter(this, void 0, void 0, function* () {
var _a, _b;
if (!manifests.find((manifest) => manifest.name == location)) {
const manifest = new dependency_submission_toolkit_1.Manifest(location, location);
manifests.push(manifest);
}
if (pkg.topLevelReferrers.length == 0) {
(_a = manifests.find((manifest) => manifest.name == location)) === null || _a === void 0 ? void 0 : _a.addDirectDependency(pkg, ComponentDetection.getDependencyScope(pkg));
}
else {
(_b = manifests.find((manifest) => manifest.name == location)) === null || _b === void 0 ? void 0 : _b.addIndirectDependency(pkg, ComponentDetection.getDependencyScope(pkg));
}
}));
}));
return manifests;
}); });
} }
static getDependencyScope(pkg) { static getDependencyScope(pkg) {
@@ -36216,6 +36229,7 @@ class ComponentDetectionPackage extends dependency_submission_toolkit_1.Package
this.locationsFoundAt = locationsFoundAt; this.locationsFoundAt = locationsFoundAt;
this.containerDetailIds = containerDetailIds; this.containerDetailIds = containerDetailIds;
this.containerLayerIds = containerLayerIds; this.containerLayerIds = containerLayerIds;
this.packageUrlString = packageUrl;
} }
} }
Generated Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long