Update dist

dist/componentDetection.d.ts

@@ -7,9 +7,41 @@ export default class ComponentDetection {
     static runComponentDetection(path: string): Promise<void>;
     private static getComponentDetectionParameters;
     static getManifestsFromResults(): Promise<Manifest[] | undefined>;
-    static processComponentsToManifests(componentsFound: any[]): Manifest[];
+    static processComponentsToManifests(componentsFound: any[], dependencyGraphs: DependencyGraphs): Manifest[];
     private static addPackagesToManifests;
     private static getDependencyScope;
     static makePackageUrl(packageUrlJson: any): string;
     private static getLatestReleaseURL;
+    /**
+     * Normalizes the keys of a DependencyGraphs object to be relative paths from the resolved filePath input.
+     * @param dependencyGraphs The DependencyGraphs object to normalize.
+     * @param filePathInput The filePath input (relative or absolute) from the action configuration.
+     * @returns A new DependencyGraphs object with relative path keys.
+     */
+    static normalizeDependencyGraphPaths(dependencyGraphs: DependencyGraphs, filePathInput: string): DependencyGraphs;
 }
+/**
+ * Types for the dependencyGraphs section of output.json
+ */
+export type DependencyGraph = {
+    /**
+     * The dependency graph: keys are component IDs, values are either null (no dependencies) or an array of component IDs (dependencies)
+     */
+    graph: Record<string, string[] | null>;
+    /**
+     * Explicitly referenced component IDs
+     */
+    explicitlyReferencedComponentIds: string[];
+    /**
+     * Development dependencies
+     */
+    developmentDependencies: string[];
+    /**
+     * Regular dependencies
+     */
+    dependencies: string[];
+};
+/**
+ * The top-level dependencyGraphs object: keys are manifest file paths, values are DependencyGraph objects
+ */
+export type DependencyGraphs = Record<string, DependencyGraph>;

dist/index.js

@@ -36002,6 +36002,7 @@ const cross_fetch_1 = __importDefault(__nccwpck_require__(3304));
 const fs_1 = __importDefault(__nccwpck_require__(9896));
 const exec = __importStar(__nccwpck_require__(5236));
 const dotenv_1 = __importDefault(__nccwpck_require__(8889));
+const path_1 = __importDefault(__nccwpck_require__(6928));
 dotenv_1.default.config();
 class ComponentDetection {
     // This is the default entry point for this class.
@@ -36056,10 +36057,11 @@ class ComponentDetection {
             core.info("Getting manifests from results");
             const results = yield fs_1.default.readFileSync(this.outputPath, 'utf8');
             var json = JSON.parse(results);
-            return this.processComponentsToManifests(json.componentsFound);
+            let dependencyGraphs = this.normalizeDependencyGraphPaths(json.dependencyGraphs, core.getInput('filePath'));
+            return this.processComponentsToManifests(json.componentsFound, dependencyGraphs);
         });
     }
-    static processComponentsToManifests(componentsFound) {
+    static processComponentsToManifests(componentsFound, dependencyGraphs) {
         // Parse the result file and add the packages to the package cache
         const packageCache = new dependency_submission_toolkit_1.PackageCache();
         const packages = [];
@@ -36115,10 +36117,10 @@ class ComponentDetection {
         // Create manifests
         const manifests = [];
         // Check the locationsFoundAt for every package and add each as a manifest
-        this.addPackagesToManifests(packages, manifests);
+        this.addPackagesToManifests(packages, manifests, dependencyGraphs);
         return manifests;
     }
-    static addPackagesToManifests(packages, manifests) {
+    static addPackagesToManifests(packages, manifests, dependencyGraphs) {
         packages.forEach((pkg) => {
             pkg.locationsFoundAt.forEach((location) => {
                 var _a, _b;
@@ -36126,17 +36128,19 @@ class ComponentDetection {
                     const manifest = new dependency_submission_toolkit_1.Manifest(location, location);
                     manifests.push(manifest);
                 }
-                // Filter out self-references from topLevelReferrers
-                const nonSelfReferrers = pkg.topLevelReferrers.filter((referrer) => {
-                    if (!referrer.packageUrlString)
-                        return false;
-                    return referrer.packageUrlString !== pkg.packageUrlString;
-                });
-                if (nonSelfReferrers.length == 0) {
-                    (_a = manifests.find((manifest) => manifest.name == location)) === null || _a === void 0 ? void 0 : _a.addDirectDependency(pkg, ComponentDetection.getDependencyScope(pkg));
+                const depGraphEntry = dependencyGraphs[location];
+                if (!depGraphEntry) {
+                    core.warning(`No dependency graph entry found for manifest location: ${location}`);
+                    return; // Skip this location if not found in dependencyGraphs
+                }
+                const directDependencies = depGraphEntry.explicitlyReferencedComponentIds;
+                if (directDependencies.includes(pkg.id)) {
+                    (_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));
+                    (_b = manifests
+                        .find((manifest) => manifest.name == location)) === null || _b === void 0 ? void 0 : _b.addIndirectDependency(pkg, ComponentDetection.getDependencyScope(pkg));
                 }
             });
         });
@@ -36216,6 +36220,26 @@ class ComponentDetection {
             }
         });
     }
+    /**
+     * Normalizes the keys of a DependencyGraphs object to be relative paths from the resolved filePath input.
+     * @param dependencyGraphs The DependencyGraphs object to normalize.
+     * @param filePathInput The filePath input (relative or absolute) from the action configuration.
+     * @returns A new DependencyGraphs object with relative path keys.
+     */
+    static normalizeDependencyGraphPaths(dependencyGraphs, filePathInput) {
+        // Resolve the base directory from filePathInput (relative to cwd if not absolute)
+        const baseDir = path_1.default.resolve(process.cwd(), filePathInput);
+        const normalized = {};
+        for (const absPath in dependencyGraphs) {
+            // Make the path relative to the baseDir
+            let relPath = path_1.default.relative(baseDir, absPath).replace(/\\/g, '/');
+            // Ensure leading slash to represent repo root
+            if (!relPath.startsWith('/'))
+                relPath = '/' + relPath;
+            normalized[relPath] = dependencyGraphs[absPath];
+        }
+        return normalized;
+    }
 }
 exports["default"] = ComponentDetection;
 ComponentDetection.componentDetectionPath = process.platform === "win32" ? './component-detection.exe' : './component-detection';