Add new input to readme

As we want to use for specific ecosystems.

README.md

@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Component detection
-        uses: advanced-security/component-detection-dependency-submission-action@v0.1.0
+        uses: advanced-security/component-detection-dependency-submission-action@v0.0.3
 ```
 
 ### Configuration options
@@ -34,7 +34,7 @@ directoryExclusionList | Filters out specific directories following a minimatch
 detectorArgs | Comma separated list of properties that can affect the detectors execution, like EnableIfDefaultOff that allows a specific detector that is in beta to run, the format for this property is DetectorId=EnableIfDefaultOff, for example Pip=EnableIfDefaultOff. | `Pip=EnableIfDefaultOff`
 dockerImagesToScan |Comma separated list of docker image names or hashes to execute container scanning on |  ubuntu:16.04,56bab49eef2ef07505f6a1b0d5bd3a601dfc3c76ad4460f24c91d6fa298369ab |
 detectorsFilter | A comma separated list with the identifiers of the specific detectors to be used. | `Pip, RustCrateDetector`
-detectorsCategories | A comma separated list with the categories of components that are going to be scanned. The detectors that are going to run are the ones that belongs to the categories. | `NuGet,Npm`
+detectorsCategories | A comma separated list with the categories of components that are going to be scanned. The detectors that are going to run are the ones that belongs to the categories. The possible values are: Npm, NuGet, Maven, RubyGems, Cargo, Pip, GoMod, CocoaPods, Linux. | `Npm,Maven,Pip`
 correlator | An optional identifier to distinguish between multiple dependency snapshots of the same type. Defaults to the [job_id](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_id) of the current job | `csharp-backend`
 
 For more information: https://github.com/microsoft/component-detection

action.yml

@@ -27,21 +27,6 @@ inputs:
   correlator:
     description: 'An optional identifier to distinguish between multiple dependency snapshots of the same type.'
     required: false
-  detector-name:
-    description: 'The name of the detector. If provided, detector-version and detector-url must also be provided.'
-    required: false
-  detector-version:
-    description: 'The version of the detector. If provided, detector-name and detector-url must also be provided.'
-    required: false
-  detector-url:
-    description: 'The URL of the detector. If provided, detector-name and detector-version must also be provided.'
-    required: false
-  snapshot-sha:
-    description: 'The SHA of the commit to associate with the snapshot. If provided, snapshot-ref must also be provided.'
-    required: false
-  snapshot-ref:
-    description: 'The Git reference to associate with the snapshot. If provided, snapshot-sha must also be provided.'
-    required: false
 runs:
   using: 'node20'
   main: 'dist/index.js'

componentDetection.test.ts

@@ -1,4 +1,4 @@
-import ComponentDetection, { DependencyGraphs } from "./componentDetection";
+import ComponentDetection from "./componentDetection";
 import fs from "fs";
 
 test("Downloads CLI", async () => {
@@ -68,217 +68,3 @@ describe("ComponentDetection.makePackageUrl", () => {
     expect(packageUrl).toBe("");
   });
 });
-
-describe("ComponentDetection.processComponentsToManifests", () => {
-  test("adds package as direct dependency when it is listed as an explicitlyReferencedComponentIds", () => {
-    const componentsFound = [
-      {
-        component: {
-          name: "test-package",
-          version: "1.0.0",
-          packageUrl: {
-            Scheme: "pkg",
-            Type: "npm",
-            Name: "test-package",
-            Version: "1.0.0"
-          },
-          id: "test-package 1.0.0 - npm"
-        },
-        isDevelopmentDependency: false,
-        topLevelReferrers: [], // Empty = direct dependency
-        locationsFoundAt: ["package.json"]
-      }
-    ];
-
-    const dependencyGraphs: DependencyGraphs = {
-      "package.json": {
-        graph: { "test-package": null },
-        explicitlyReferencedComponentIds: ["test-package 1.0.0 - npm"],
-        developmentDependencies: [],
-        dependencies: []
-      }
-    };
-
-    const manifests = ComponentDetection.processComponentsToManifests(componentsFound, dependencyGraphs);
-
-    expect(manifests).toHaveLength(1);
-    expect(manifests[0].name).toBe("package.json");
-    expect(manifests[0].directDependencies()).toHaveLength(1);
-    expect(manifests[0].indirectDependencies()).toHaveLength(0);
-    expect(manifests[0].countDependencies()).toBe(1);
-  });
-
-  test("adds package as indirect dependency when it is not in explicitlyReferencedComponentIds", () => {
-    const componentsFound = [
-      {
-        component: {
-          name: "test-package",
-          version: "1.0.0",
-          packageUrl: {
-            Scheme: "pkg",
-            Type: "npm",
-            Name: "test-package",
-            Version: "1.0.0"
-          },
-          id: "test-package 1.0.0 - npm"
-        },
-        isDevelopmentDependency: false,
-        topLevelReferrers: [
-          {
-            name: "parent-package",
-            version: "1.0.0",
-            packageUrl: {
-              Scheme: "pkg",
-              Type: "npm",
-              Name: "parent-package",
-              Version: "1.0.0"
-            }
-          }
-        ],
-        locationsFoundAt: ["package.json"]
-      }
-    ];
-
-    const dependencyGraphs: DependencyGraphs = {
-      "package.json": {
-        graph: { "parent-package": null },
-        explicitlyReferencedComponentIds: [],
-        developmentDependencies: [],
-        dependencies: []
-      }
-    };
-
-    const manifests = ComponentDetection.processComponentsToManifests(componentsFound, dependencyGraphs);
-
-    expect(manifests).toHaveLength(1);
-    expect(manifests[0].name).toBe("package.json");
-    expect(manifests[0].directDependencies()).toHaveLength(0);
-    expect(manifests[0].indirectDependencies()).toHaveLength(1);
-    expect(manifests[0].countDependencies()).toBe(1);
-  });
-
-  test("un-escapes URL-encoded locationsFoundAt", () => {
-  const componentsFound = [
-      {
-        component: {
-          name: "test-package",
-          version: "1.0.0",
-          packageUrl: {
-            Scheme: "pkg",
-            Type: "nuget",
-            Name: "test-package",
-            Version: "1.0.0"
-          },
-          id: "test-package 1.0.0 - nuget"
-        },
-        isDevelopmentDependency: false,
-        topLevelReferrers: [], // Empty = direct dependency
-        locationsFoundAt: ["/my%20project/my%20project.csproj"]
-      }
-    ];
-
-    const dependencyGraphs: DependencyGraphs = {
-      "my project/my project.csproj": {
-        graph: { "test-package": null },
-        explicitlyReferencedComponentIds: ["test-package 1.0.0 - nuget"],
-        developmentDependencies: [],
-        dependencies: []
-      }
-    };
-
-    const manifests = ComponentDetection.processComponentsToManifests(componentsFound, dependencyGraphs);
-
-    expect(manifests).toHaveLength(1);
-    expect(manifests[0].name).toBe("my project/my project.csproj");
-    expect(manifests[0].directDependencies()).toHaveLength(1);
-    expect(manifests[0].indirectDependencies()).toHaveLength(0);
-    expect(manifests[0].countDependencies()).toBe(1);
-  });
-});
-
-describe('normalizeDependencyGraphPaths', () => {
-  test('converts absolute paths to relative paths based on filePath input', () => {
-    // Simulate a repo at /repo and a scan root at /repo/packages
-    const fakeCwd = '/workspaces';
-    const filePathInput = 'my-super-cool-repo';
-    const absBase = '/workspaces/my-super-cool-repo';
-    const dependencyGraphs: DependencyGraphs = {
-      '/workspaces/my-super-cool-repo/a/package.json': {
-        graph: { 'foo': null },
-        explicitlyReferencedComponentIds: [],
-        developmentDependencies: [],
-        dependencies: []
-      },
-      '/workspaces/my-super-cool-repo/b/package.json': {
-        graph: { 'bar': null },
-        explicitlyReferencedComponentIds: [],
-        developmentDependencies: [],
-        dependencies: []
-      }
-    };
-    // Patch process.cwd for this test
-    const originalCwd = process.cwd;
-    (process as any).cwd = () => fakeCwd;
-    const normalized = ComponentDetection.normalizeDependencyGraphPaths(dependencyGraphs, filePathInput);
-    // Restore process.cwd
-    (process as any).cwd = originalCwd;
-    expect(Object.keys(normalized)).toContain('a/package.json');
-    expect(Object.keys(normalized)).toContain('b/package.json');
-    expect(normalized['a/package.json'].graph).toEqual({ 'foo': null });
-    expect(normalized['b/package.json'].graph).toEqual({ 'bar': null });
-  });
-});
-
-describe('normalizeDependencyGraphPaths with real output.json', () => {
-  test('converts absolute paths in output.json to relative paths using current cwd and filePath', () => {
-    const output = JSON.parse(fs.readFileSync('./output.json', 'utf8'));
-    const dependencyGraphs = output.dependencyGraphs;
-    // Use the same filePath as the action default (".")
-    const normalized = ComponentDetection.normalizeDependencyGraphPaths(dependencyGraphs, 'test');
-
-    // Should contain root level manifests without leading slashes
-    expect(Object.keys(normalized)).toContain('package.json');
-    expect(Object.keys(normalized)).toContain('package-lock.json');
-
-    // Should contain nested manifests with relative paths (no leading slashes)
-    expect(Object.keys(normalized)).toContain('nested/package.json');
-    expect(Object.keys(normalized)).toContain('nested/package-lock.json');
-
-    // All keys should be relative paths without leading slashes
-    for (const key of Object.keys(normalized)) {
-      expect(key.startsWith('/')).toBe(false); // No leading slashes
-      expect(key).not.toMatch(/^\w:\\|^\/\/|^\.{1,2}\//); // Not windows absolute, not network, not relative
-    }
-  });
-});
-
-test('full action scan creates manifests with correct names and file source locations', async () => {
-  await ComponentDetection.downloadLatestRelease();
-  const manifests = await ComponentDetection.scanAndGetManifests('./test');
-
-  expect(manifests).toBeDefined();
-  expect(manifests!.length).toBeGreaterThan(0);
-
-  for (const manifest of manifests!) {
-    expect(manifest.name.startsWith('/')).toBe(false);
-  }
-
-  const expectedManifestNames = [
-    'package.json',
-    'package-lock.json',
-    'nested/package.json',
-    'nested/package-lock.json',
-  ];
-
-  const manifestsByName = manifests!.reduce((acc, manifest) => {
-    acc[manifest.name] = manifest;
-    return acc;
-  }, {} as Record<string, any>);
-
-  for (const expectedName of expectedManifestNames) {
-    const manifest = manifestsByName[expectedName];
-    expect(manifest).toBeDefined();
-    expect(manifest.name).toBe(expectedName);
-    expect(manifest.file?.source_location).toBe(expectedName);
-  }
-}, 15000);

componentDetection.ts

@@ -7,7 +7,7 @@ import {
   Package,
   Snapshot,
   Manifest,
-  submitSnapshot,
+  submitSnapshot
 } from '@github/dependency-submission-toolkit'
 import fetch from 'cross-fetch'
 import tar from 'tar'
@@ -16,7 +16,6 @@ import * as exec from '@actions/exec';
 import dotenv from 'dotenv'
 import { Context } from '@actions/github/lib/context'
 import { unmockedModulePathPatterns } from './jest.config'
-import path from 'path';
 dotenv.config();
 
 export default class ComponentDetection {
@@ -69,18 +68,14 @@ export default class ComponentDetection {
 
   public static async getManifestsFromResults(): Promise<Manifest[] | undefined> {
     core.info("Getting manifests from results");
-    const results = await fs.readFileSync(this.outputPath, 'utf8');
-    var json: any = JSON.parse(results);
-    let dependencyGraphs: DependencyGraphs = this.normalizeDependencyGraphPaths(json.dependencyGraphs, core.getInput('filePath'));
-    return this.processComponentsToManifests(json.componentsFound, dependencyGraphs);
-  }
-
-  public static processComponentsToManifests(componentsFound: any[], dependencyGraphs: DependencyGraphs): Manifest[] {
     // Parse the result file and add the packages to the package cache
     const packageCache = new PackageCache();
     const packages: Array<ComponentDetectionPackage> = [];
 
-    componentsFound.forEach(async (component: any) => {
+    const results = await fs.readFileSync(this.outputPath, 'utf8');
+
+    var json: any = JSON.parse(results);
+    json.componentsFound.forEach(async (component: any) => {
       // Skip components without packageUrl
       if (!component.component.packageUrl) {
         core.debug(`Skipping component detected without packageUrl: ${JSON.stringify({
@@ -118,7 +113,6 @@ export default class ComponentDetection {
         }
 
         const referrerUrl = ComponentDetection.makePackageUrl(referrer.packageUrl);
-        referrer.packageUrlString = referrerUrl
 
         // Skip if the generated packageUrl is empty
         if (!referrerUrl) {
@@ -128,10 +122,6 @@ export default class ComponentDetection {
 
         try {
           const referrerPackage = packageCache.lookupPackage(referrerUrl);
-          if (referrerPackage === pkg) {
-            core.debug(`Skipping self-reference for package: ${pkg.id}`);
-            return; // Skip self-references
-          }
           if (referrerPackage) {
             referrerPackage.dependsOn(pkg);
           }
@@ -145,48 +135,20 @@ export default class ComponentDetection {
     const manifests: Array<Manifest> = [];
 
     // Check the locationsFoundAt for every package and add each as a manifest
-    this.addPackagesToManifests(packages, manifests, dependencyGraphs);
-
-    return manifests;
-  }
-
-  private static addPackagesToManifests(packages: Array<ComponentDetectionPackage>, manifests: Array<Manifest>, dependencyGraphs: DependencyGraphs): void {
-    packages.forEach((pkg: ComponentDetectionPackage) => {
-      pkg.locationsFoundAt.forEach((location: any) => {
-        // Use the normalized path (remove leading slash if present)
-        let normalizedLocation = location.startsWith('/') ? location.substring(1) : location;
-        // Unescape the path, as upstream ComponentDetection emits locationsFoundAt in URL-encoded form
-        normalizedLocation = decodeURIComponent(normalizedLocation);
-
-        if (!manifests.find((manifest: Manifest) => manifest.name == normalizedLocation)) {
-          const manifest = new Manifest(normalizedLocation, normalizedLocation);
+    packages.forEach(async (pkg: ComponentDetectionPackage) => {
+      pkg.locationsFoundAt.forEach(async (location: any) => {
+        if (!manifests.find((manifest: Manifest) => manifest.name == location)) {
+          const manifest = new Manifest(location, location);
           manifests.push(manifest);
         }
-
-        const depGraphEntry = dependencyGraphs[normalizedLocation];
-        if (!depGraphEntry) {
-          core.warning(`No dependency graph entry found for manifest location: ${normalizedLocation}`);
-          return; // Skip this location if not found in dependencyGraphs
-        }
-
-        const directDependencies = depGraphEntry.explicitlyReferencedComponentIds;
-        if (directDependencies.includes(pkg.id)) {
-          manifests
-            .find((manifest: Manifest) => manifest.name == normalizedLocation)
-            ?.addDirectDependency(
-              pkg,
-              ComponentDetection.getDependencyScope(pkg)
-            );
+        if (pkg.topLevelReferrers.length == 0) {
+          manifests.find((manifest: Manifest) => manifest.name == location)?.addDirectDependency(pkg, ComponentDetection.getDependencyScope(pkg));
         } else {
-          manifests
-            .find((manifest: Manifest) => manifest.name == normalizedLocation)
-            ?.addIndirectDependency(
-              pkg,
-              ComponentDetection.getDependencyScope(pkg)
-            );
+          manifests.find((manifest: Manifest) => manifest.name == location)?.addIndirectDependency(pkg, ComponentDetection.getDependencyScope(pkg));
         }
       });
     });
+    return manifests;
   }
 
   private static getDependencyScope(pkg: ComponentDetectionPackage) {
@@ -271,66 +233,16 @@ export default class ComponentDetection {
       throw new Error("Failed to download latest release");
     }
   }
-
-  /**
-   * 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.
-   */
-  public static normalizeDependencyGraphPaths(
-    dependencyGraphs: DependencyGraphs,
-    filePathInput: string
-  ): DependencyGraphs {
-    // Resolve the base directory from filePathInput (relative to cwd if not absolute)
-    const baseDir = path.resolve(process.cwd(), filePathInput);
-    const normalized: DependencyGraphs = {};
-    for (const absPath in dependencyGraphs) {
-      // Make the path relative to the baseDir
-      let relPath = path.relative(baseDir, absPath).replace(/\\/g, '/');
-      normalized[relPath] = dependencyGraphs[absPath];
-    }
-    return normalized;
-  }
 }
 
 class ComponentDetectionPackage extends Package {
-  public packageUrlString: string;
 
   constructor(packageUrl: string, public id: string, public isDevelopmentDependency: boolean, public topLevelReferrers: [],
     public locationsFoundAt: [], public containerDetailIds: [], public containerLayerIds: []) {
     super(packageUrl);
-    this.packageUrlString = packageUrl;
   }
 }
 
-/**
- * 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/componentDetection.d.ts

@@ -7,41 +7,7 @@ export default class ComponentDetection {
     static runComponentDetection(path: string): Promise<void>;
     private static getComponentDetectionParameters;
     static getManifestsFromResults(): Promise<Manifest[] | undefined>;
-    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,7 +36002,6 @@ 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.
@@ -36055,102 +36054,78 @@ class ComponentDetection {
     static getManifestsFromResults() {
         return __awaiter(this, void 0, void 0, function* () {
             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');
             var json = JSON.parse(results);
-            let dependencyGraphs = this.normalizeDependencyGraphPaths(json.dependencyGraphs, core.getInput('filePath'));
-            return this.processComponentsToManifests(json.componentsFound, dependencyGraphs);
-        });
-    }
-    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 = [];
-        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}`);
+            json.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 referrerUrl = ComponentDetection.makePackageUrl(referrer.packageUrl);
-                referrer.packageUrlString = referrerUrl;
-                // Skip if the generated packageUrl is empty
-                if (!referrerUrl) {
-                    core.debug(`Skipping referrer with invalid packageUrl for component: ${pkg.id}`);
+                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;
                 }
-                try {
-                    const referrerPackage = packageCache.lookupPackage(referrerUrl);
-                    if (referrerPackage === pkg) {
-                        core.debug(`Skipping self-reference for package: ${pkg.id}`);
-                        return; // Skip self-references
-                    }
-                    if (referrerPackage) {
-                        referrerPackage.dependsOn(pkg);
-                    }
-                }
-                catch (error) {
-                    core.debug(`Error looking up referrer package: ${error}`);
+                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);
                 }
             }));
-        }));
-        // Create manifests
-        const manifests = [];
-        // Check the locationsFoundAt for every package and add each as a manifest
-        this.addPackagesToManifests(packages, manifests, dependencyGraphs);
-        return manifests;
-    }
-    static addPackagesToManifests(packages, manifests, dependencyGraphs) {
-        packages.forEach((pkg) => {
-            pkg.locationsFoundAt.forEach((location) => {
-                var _a, _b;
-                // Use the normalized path (remove leading slash if present)
-                let normalizedLocation = location.startsWith('/') ? location.substring(1) : location;
-                // Unescape the path, as upstream ComponentDetection emits locationsFoundAt in URL-encoded form
-                normalizedLocation = decodeURIComponent(normalizedLocation);
-                if (!manifests.find((manifest) => manifest.name == normalizedLocation)) {
-                    const manifest = new dependency_submission_toolkit_1.Manifest(normalizedLocation, normalizedLocation);
-                    manifests.push(manifest);
-                }
-                const depGraphEntry = dependencyGraphs[normalizedLocation];
-                if (!depGraphEntry) {
-                    core.warning(`No dependency graph entry found for manifest location: ${normalizedLocation}`);
-                    return; // Skip this location if not found in dependencyGraphs
-                }
-                const directDependencies = depGraphEntry.explicitlyReferencedComponentIds;
-                if (directDependencies.includes(pkg.id)) {
-                    (_a = manifests
-                        .find((manifest) => manifest.name == normalizedLocation)) === null || _a === void 0 ? void 0 : _a.addDirectDependency(pkg, ComponentDetection.getDependencyScope(pkg));
-                }
-                else {
-                    (_b = manifests
-                        .find((manifest) => manifest.name == normalizedLocation)) === null || _b === void 0 ? void 0 : _b.addIndirectDependency(pkg, ComponentDetection.getDependencyScope(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;
+                    }
+                    const referrerUrl = ComponentDetection.makePackageUrl(referrer.packageUrl);
+                    // Skip if the generated packageUrl is empty
+                    if (!referrerUrl) {
+                        core.debug(`Skipping referrer with invalid packageUrl for component: ${pkg.id}`);
+                        return;
+                    }
+                    try {
+                        const referrerPackage = packageCache.lookupPackage(referrerUrl);
+                        if (referrerPackage) {
+                            referrerPackage.dependsOn(pkg);
+                        }
+                    }
+                    catch (error) {
+                        core.debug(`Error looking up referrer package: ${error}`);
+                    }
+                }));
+            }));
+            // 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) {
@@ -36228,23 +36203,6 @@ 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, '/');
-            normalized[relPath] = dependencyGraphs[absPath];
-        }
-        return normalized;
-    }
 }
 exports["default"] = ComponentDetection;
 ComponentDetection.componentDetectionPath = process.platform === "win32" ? './component-detection.exe' : './component-detection';
@@ -36258,7 +36216,6 @@ class ComponentDetectionPackage extends dependency_submission_toolkit_1.Package
         this.locationsFoundAt = locationsFoundAt;
         this.containerDetailIds = containerDetailIds;
         this.containerLayerIds = containerLayerIds;
-        this.packageUrlString = packageUrl;
     }
 }
 
@@ -36310,51 +36267,23 @@ const github = __importStar(__nccwpck_require__(3228));
 const dependency_submission_toolkit_1 = __nccwpck_require__(3323);
 const componentDetection_1 = __importDefault(__nccwpck_require__(3202));
 function run() {
-    var _a, _b, _c, _d, _e, _f;
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        let manifests = yield componentDetection_1.default.scanAndGetManifests(core.getInput("filePath"));
-        const correlatorInput = ((_a = core.getInput("correlator")) === null || _a === void 0 ? void 0 : _a.trim()) || github.context.job;
-        // Get detector configuration inputs
-        const detectorName = (_b = core.getInput("detector-name")) === null || _b === void 0 ? void 0 : _b.trim();
-        const detectorVersion = (_c = core.getInput("detector-version")) === null || _c === void 0 ? void 0 : _c.trim();
-        const detectorUrl = (_d = core.getInput("detector-url")) === null || _d === void 0 ? void 0 : _d.trim();
-        // Validate that if any detector config is provided, all must be provided
-        const hasAnyDetectorInput = detectorName || detectorVersion || detectorUrl;
-        const hasAllDetectorInputs = detectorName && detectorVersion && detectorUrl;
-        if (hasAnyDetectorInput && !hasAllDetectorInputs) {
-            core.setFailed("If any detector configuration is provided (detector-name, detector-version, detector-url), all three must be provided.");
-            return;
-        }
-        // Use provided detector config or defaults
-        const detector = hasAllDetectorInputs
-            ? {
-                name: detectorName,
-                version: detectorVersion,
-                url: detectorUrl,
-            }
-            : {
-                name: "Component Detection",
-                version: "0.0.1",
-                url: "https://github.com/advanced-security/component-detection-dependency-submission-action",
-            };
-        let snapshot = new dependency_submission_toolkit_1.Snapshot(detector, github.context, {
+        let manifests = yield componentDetection_1.default.scanAndGetManifests(core.getInput('filePath'));
+        const correlatorInput = ((_a = core.getInput('correlator')) === null || _a === void 0 ? void 0 : _a.trim()) || github.context.job;
+        let snapshot = new dependency_submission_toolkit_1.Snapshot({
+            name: "Component Detection",
+            version: "0.0.1",
+            url: "https://github.com/advanced-security/component-detection-dependency-submission-action",
+        }, github.context, {
             correlator: correlatorInput,
-            id: github.context.runId.toString(),
+            id: github.context.runId.toString()
         });
         core.debug(`Manifests: ${manifests === null || manifests === void 0 ? void 0 : manifests.length}`);
-        manifests === null || manifests === void 0 ? void 0 : manifests.forEach((manifest) => {
+        manifests === null || manifests === void 0 ? void 0 : manifests.forEach(manifest => {
             core.debug(`Manifest: ${JSON.stringify(manifest)}`);
             snapshot.addManifest(manifest);
         });
-        // Override snapshot ref and sha if provided
-        const snapshotSha = (_e = core.getInput("snapshot-sha")) === null || _e === void 0 ? void 0 : _e.trim();
-        const snapshotRef = (_f = core.getInput("snapshot-ref")) === null || _f === void 0 ? void 0 : _f.trim();
-        if (snapshotSha) {
-            snapshot.sha = snapshotSha;
-        }
-        if (snapshotRef) {
-            snapshot.ref = snapshotRef;
-        }
         (0, dependency_submission_toolkit_1.submitSnapshot)(snapshot);
     });
 }

index.ts

@@ -13,65 +13,27 @@ import {
 import ComponentDetection from './componentDetection';
 
 async function run() {
-  let manifests = await ComponentDetection.scanAndGetManifests(
-    core.getInput("filePath")
-  );
-  const correlatorInput =
-    core.getInput("correlator")?.trim() || github.context.job;
-
-  // Get detector configuration inputs
-  const detectorName = core.getInput("detector-name")?.trim();
-  const detectorVersion = core.getInput("detector-version")?.trim();
-  const detectorUrl = core.getInput("detector-url")?.trim();
-
-  // Validate that if any detector config is provided, all must be provided
-  const hasAnyDetectorInput = detectorName || detectorVersion || detectorUrl;
-  const hasAllDetectorInputs = detectorName && detectorVersion && detectorUrl;
-
-  if (hasAnyDetectorInput && !hasAllDetectorInputs) {
-    core.setFailed(
-      "If any detector configuration is provided (detector-name, detector-version, detector-url), all three must be provided."
-    );
-    return;
-  }
-
-  // Use provided detector config or defaults
-  const detector = hasAllDetectorInputs
-    ? {
-        name: detectorName,
-        version: detectorVersion,
-        url: detectorUrl,
-      }
-    : {
-        name: "Component Detection",
-        version: "0.0.1",
-        url: "https://github.com/advanced-security/component-detection-dependency-submission-action",
-      };
-
-  let snapshot = new Snapshot(detector, github.context, {
+  let manifests = await ComponentDetection.scanAndGetManifests(core.getInput('filePath'));
+  const correlatorInput = core.getInput('correlator')?.trim() || github.context.job;
+  
+  let snapshot = new Snapshot({
+      name: "Component Detection",
+      version: "0.0.1",
+      url: "https://github.com/advanced-security/component-detection-dependency-submission-action",
+  }, 
+  github.context,
+  {
     correlator: correlatorInput,
-    id: github.context.runId.toString(),
+    id: github.context.runId.toString()
   });
 
   core.debug(`Manifests: ${manifests?.length}`);
 
-  manifests?.forEach((manifest) => {
+  manifests?.forEach(manifest => {
     core.debug(`Manifest: ${JSON.stringify(manifest)}`);
     snapshot.addManifest(manifest);
   });
 
-  // Override snapshot ref and sha if provided
-  const snapshotSha = core.getInput("snapshot-sha")?.trim();
-  const snapshotRef = core.getInput("snapshot-ref")?.trim();
-
-  if (snapshotSha) {
-    snapshot.sha = snapshotSha;
-  }
-
-  if (snapshotRef) {
-    snapshot.ref = snapshotRef;
-  }
-
   submitSnapshot(snapshot);
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-detection-action",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "Component detection action",
   "main": "dist/index.js",
   "type": "module",
@@ -30,22 +30,22 @@
     "@actions/github": "^6.0.1",
     "@github/dependency-submission-toolkit": "^2.0.5",
     "cross-fetch": "^4.1.0",
-    "dotenv": "^17.2.3",
+    "dotenv": "^16.5.0",
     "fs": "^0.0.1-security",
-    "octokit": "^5.0.5",
-    "tar": "^7.5.2",
-    "yaml": "^2.8.1"
+    "octokit": "^4.1.3",
+    "tar": "^7.4.3",
+    "yaml": "^2.7.1"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.28.5",
-    "@babel/preset-typescript": "^7.28.5",
-    "@eslint/js": "^9.39.1",
-    "@types/glob": "^9.0.0",
-    "@types/jest": "^30.0.0",
-    "@vercel/ncc": "^0.38.4",
-    "eslint": "^9.39.1",
-    "jest": "^30.2.0",
+    "@babel/preset-env": "^7.27.2",
+    "@babel/preset-typescript": "^7.27.1",
+    "@eslint/js": "^9.26.0",
+    "@types/glob": "^8.1.0",
+    "@types/jest": "^29.5.14",
+    "@vercel/ncc": "^0.38.3",
+    "eslint": "^9.26.0",
+    "jest": "^29.7.0",
     "jest-transform-stub": "^2.0.0",
-    "ts-jest": "^29.4.5"
+    "ts-jest": "^29.3.2"
   }
 }

test/nested/package-lock.json

@@ -1,45 +0,0 @@
-{
-  "name": "nested-test-package",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "nested-test-package",
-      "version": "1.0.0",
-      "dependencies": {
-        "lodash": "^4.17.21"
-      },
-      "devDependencies": {
-        "jest": "^29.0.0"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
-      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
-      "dev": true,
-      "bin": {
-        "jest": "bin/jest.js"
-      }
-    }
-  },
-  "dependencies": {
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
-      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
-      "dev": true
-    }
-  }
-}

test/nested/package.json

@@ -1,12 +0,0 @@
-{
-  "name": "nested-test-package",
-  "version": "1.0.0",
-  "description": "A nested test package for component detection testing",
-  "main": "index.js",
-  "dependencies": {
-    "lodash": "^4.17.21"
-  },
-  "devDependencies": {
-    "jest": "^29.0.0"
-  }
-}

test/package-lock.json

@@ -685,9 +685,9 @@
       "dev": true
     },
     "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
       "dependencies": {
         "argparse": "^2.0.1"
@@ -2273,9 +2273,9 @@
       }
     },
     "node_modules/eslint/node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
       "dependencies": {
         "argparse": "^2.0.1"
@@ -3541,9 +3541,9 @@
       "dev": true
     },
     "node_modules/js-yaml": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
-      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
       "dependencies": {
         "argparse": "^1.0.7",
@@ -5338,9 +5338,9 @@
           "dev": true
         },
         "js-yaml": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-          "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
           "dev": true,
           "requires": {
             "argparse": "^2.0.1"
@@ -6538,9 +6538,9 @@
           }
         },
         "js-yaml": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-          "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
           "dev": true,
           "requires": {
             "argparse": "^2.0.1"
@@ -7525,9 +7525,9 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
-      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",