@trustify-da/trustify-da-javascript-client 0.3.0-ea.ec6824b → 0.3.0-ea.efdc87d

package/dist/src/providers/java_maven.d.ts

@@ -6,11 +6,11 @@
  * @returns {Promise<string[]>} Paths to pom.xml files (absolute)
  */
 export function discoverMavenModules(workspaceRoot: string, opts?: object): Promise<string[]>;
-/** @typedef {import('../provider').Provider} */
-/** @typedef {import('../provider').Provided} Provided */
-/** @typedef {{name: string, version: string}} Package */
-/** @typedef {{groupId: string, artifactId: string, version: string, scope: string, ignore: boolean}} Dependency */
 export default class Java_maven extends Base_java {
+    /** @type {Object<string, string>} Packaging types that produce .jar files despite non-jar packaging names. */
+    static PACKAGING_TO_JAR: {
+        [x: string]: string;
+    };
     constructor();
     /**
      * @param {string} manifestName - the subject manifest name-type
@@ -25,9 +25,9 @@ export default class Java_maven extends Base_java {
      * Provide content and content type for maven-maven stack analysis.
      * @param {string} manifest - the manifest path or name
      * @param {{}} [opts={}] - optional various options to pass along the application
-     * @returns {Provided}
+     * @returns {Promise<Provided>}
      */
-    provideStack(manifest: string, opts?: {}): Provided;
+    provideStack(manifest: string, opts?: {}): Promise<Provided>;
     /**
      * Provide content and content type for maven-maven component analysis.
      * @param {string} manifest - path to the manifest file
@@ -42,16 +42,36 @@ export default class Java_maven extends Base_java {
      */
     readLicenseFromManifest(manifestPath: string): string | null;
     /**
+     * Build a Map of PURL string → CycloneDX hash entries by reading artifact files from the local Maven repository.
+     *
+     * Both the artifact file path and the hash-map key are derived from the
+     * shared {@link Base_java#parseCoordinate} parser: the file path uses the
+     * resolved version and raw classifier, while the key uses the same canonical
+     * PURL builder as {@link Base_java#parseDep}. This guarantees the key always
+     * matches the PURL that {@link Base_java#parseDependencyTree} looks up.
      *
+     * @param {string} depTreeText Raw dependency tree text from mvn dependency:tree
+     * @param {{}} [opts={}] Options bag (may contain TRUSTIFY_DA_MVN_REPO)
+     * @returns {Promise<Map<string, Array<{alg: string, content: string}>>>}
+     */
+    _buildMavenHashMap(depTreeText: string, opts?: {}): Promise<Map<string, Array<{
+        alg: string;
+        content: string;
+    }>>>;
+    /**
      * @param {String} textGraphList Text graph String of the manifest
      * @param {[String]} ignoredDeps List of ignored dependencies to be omitted from sbom
+     * @param {{}} opts Options
      * @param {String} manifestPath Path to the pom.xml manifest
+     * @param {Map<string, Array<{alg: string, content: string}>>} [hashMap] PURL→hashes map
      * @return {String} formatted sbom Json String with all dependencies
      */
-    createSbomFileFromTextFormat(textGraphList: string, ignoredDeps: [string], opts: any, manifestPath: string): string;
+    createSbomFileFromTextFormat(textGraphList: string, ignoredDeps: [string], opts: {}, manifestPath: string, hashMap?: Map<string, Array<{
+        alg: string;
+        content: string;
+    }>>): string;
     #private;
 }
-export type Java_maven = any;
 export type Provided = any;
 export type Package = {
     name: string;

package/dist/src/providers/java_maven.js

@@ -1,3 +1,4 @@
+import crypto from 'node:crypto';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -12,6 +13,10 @@ import Base_java, { ecosystem_maven } from "./base_java.js";
 /** @typedef {import('../provider').Provided} Provided */
 /** @typedef {{name: string, version: string}} Package */
 /** @typedef {{groupId: string, artifactId: string, version: string, scope: string, ignore: boolean}} Dependency */
+// Matches the legacy `exhortignore` and new `trustify-da-ignore` markers as whole
+// tokens. The trailing `(?![\w-])` boundary prevents lookalikes such as
+// `trustify-da-ignore-disabled` from being treated as ignore directives.
+const IGNORE_MARKER_REGEX = /(exhortignore|trustify-da-ignore)(?![\w-])/;
 export default class Java_maven extends Base_java {
     constructor() {
         super('mvn', 'mvnw' + (process.platform === 'win32' ? '.cmd' : ''));
@@ -31,12 +36,12 @@ export default class Java_maven extends Base_java {
      * Provide content and content type for maven-maven stack analysis.
      * @param {string} manifest - the manifest path or name
      * @param {{}} [opts={}] - optional various options to pass along the application
-     * @returns {Provided}
+     * @returns {Promise<Provided>}
      */
-    provideStack(manifest, opts = {}) {
+    async provideStack(manifest, opts = {}) {
         return {
             ecosystem: ecosystem_maven,
-            content: this.#createSbomStackAnalysis(manifest, opts),
+            content: await this.#createSbomStackAnalysis(manifest, opts),
             contentType: 'application/vnd.cyclonedx+json'
         };
     }
@@ -81,10 +86,10 @@ export default class Java_maven extends Base_java {
      * Create a Dot Graph dependency tree for a manifest path.
      * @param {string} manifest - path for pom.xml
      * @param {{}} [opts={}] - optional various options to pass along the application
-     * @returns {string} the Dot Graph content
+     * @returns {Promise<string>} the Dot Graph content
      * @private
      */
-    #createSbomStackAnalysis(manifest, opts = {}) {
+    async #createSbomStackAnalysis(manifest, opts = {}) {
         const manifestDir = path.dirname(manifest);
         const mvn = this.selectToolBinary(manifest, opts);
         const mvnArgs = JSON.parse(getCustom('TRUSTIFY_DA_MVN_ARGS', '[]', opts));
@@ -131,20 +136,105 @@ export default class Java_maven extends Base_java {
         if (process.env["TRUSTIFY_DA_DEBUG"] === "true") {
             console.error("Dependency tree that will be used as input for creating the BOM =>" + EOL + EOL + content.toString());
         }
-        let sbom = this.createSbomFileFromTextFormat(content.toString(), ignoredDeps, opts, manifest);
+        const depTreeContent = content.toString();
+        const hashMap = await this._buildMavenHashMap(depTreeContent, opts);
+        let sbom = this.createSbomFileFromTextFormat(depTreeContent, ignoredDeps, opts, manifest, hashMap);
         // delete temp file and directory
         fs.rmSync(tmpDir, { recursive: true, force: true });
         // return dependency graph as string
         return sbom;
     }
+    /** @type {Object<string, string>} Packaging types that produce .jar files despite non-jar packaging names. */
+    static PACKAGING_TO_JAR = { 'bundle': 'jar', 'eclipse-plugin': 'jar' };
     /**
+     * Build a Map of PURL string → CycloneDX hash entries by reading artifact files from the local Maven repository.
+     *
+     * Both the artifact file path and the hash-map key are derived from the
+     * shared {@link Base_java#parseCoordinate} parser: the file path uses the
+     * resolved version and raw classifier, while the key uses the same canonical
+     * PURL builder as {@link Base_java#parseDep}. This guarantees the key always
+     * matches the PURL that {@link Base_java#parseDependencyTree} looks up.
      *
+     * @param {string} depTreeText Raw dependency tree text from mvn dependency:tree
+     * @param {{}} [opts={}] Options bag (may contain TRUSTIFY_DA_MVN_REPO)
+     * @returns {Promise<Map<string, Array<{alg: string, content: string}>>>}
+     */
+    async _buildMavenHashMap(depTreeText, opts = {}) {
+        const m2Repo = getCustom('TRUSTIFY_DA_MVN_REPO', path.join(os.homedir(), '.m2', 'repository'), opts);
+        const hashMap = new Map();
+        const lines = depTreeText.split(EOL);
+        // Track hash coverage so an incomplete .m2 cache (e.g. ephemeral CI
+        // containers or resolve-only phases) surfaces a summary warning instead
+        // of silently producing an SBOM with missing hashes.
+        let attempted = 0;
+        let missed = 0;
+        for (const rawLine of lines) {
+            const trimmed = rawLine.trim();
+            // Strip leading tree-drawing characters (e.g. "\-", "+-", "|") so the
+            // parenthesized-line check sees the coordinate itself. Omitted
+            // duplicate/conflict lines start with these characters after trim(),
+            // then an opening "(" — without stripping, the "(" check never fires.
+            const cleaned = trimmed.replace(/^[|+\\\- ]+/, '');
+            if (!cleaned || cleaned.startsWith('(')) {
+                continue;
+            }
+            const coord = this.parseCoordinate(rawLine);
+            if (!coord.groupId || !coord.artifactId || !coord.packaging) {
+                continue;
+            }
+            if (coord.packaging === 'pom') {
+                continue;
+            }
+            // Key by the exact PURL parseDep() produces, so the lookup in
+            // parseDependencyTree (hashMap.get(to.toString())) always hits.
+            const purl = this._coordinateToPurl(coord).toString();
+            // The same artifact recurs across dependency-tree branches — notably in
+            // multi-module reactor builds, where every module re-lists shared deps.
+            // The digest is deterministic per PURL, so skip the redundant file read
+            // and SHA-256 computation once this PURL is already hashed.
+            if (hashMap.has(purl)) {
+                continue;
+            }
+            const ext = Java_maven.PACKAGING_TO_JAR[coord.packaging] || coord.packaging;
+            const groupPath = coord.groupId.replaceAll('.', path.sep);
+            const fileName = coord.classifier
+                ? `${coord.artifactId}-${coord.version}-${coord.classifier}.${ext}`
+                : `${coord.artifactId}-${coord.version}.${ext}`;
+            const artifactPath = path.join(m2Repo, groupPath, coord.artifactId, coord.version, fileName);
+            attempted++;
+            try {
+                const stream = fs.createReadStream(artifactPath);
+                const hash = crypto.createHash('sha256');
+                for await (const chunk of stream) {
+                    hash.update(chunk);
+                }
+                const digest = hash.digest('hex');
+                hashMap.set(purl, [{ alg: 'SHA-256', content: digest }]);
+            }
+            catch {
+                missed++;
+                if (process.env['TRUSTIFY_DA_DEBUG'] === 'true') {
+                    console.error(`Maven hash: artifact not found at ${artifactPath}, omitting hash`);
+                }
+            }
+        }
+        // Mirror the pip provider's convention (python_controller.js): surface an
+        // unconditional warning when hashes could not be computed, so incomplete
+        // hash coverage is visible even without TRUSTIFY_DA_DEBUG.
+        if (missed > 0) {
+            console.warn(`Maven hash: ${missed} of ${attempted} artifacts could not be read from the local .m2 cache; SBOM will be generated without hashes for those components.`);
+        }
+        return hashMap;
+    }
+    /**
      * @param {String} textGraphList Text graph String of the manifest
      * @param {[String]} ignoredDeps List of ignored dependencies to be omitted from sbom
+     * @param {{}} opts Options
      * @param {String} manifestPath Path to the pom.xml manifest
+     * @param {Map<string, Array<{alg: string, content: string}>>} [hashMap] PURL→hashes map
      * @return {String} formatted sbom Json String with all dependencies
      */
-    createSbomFileFromTextFormat(textGraphList, ignoredDeps, opts, manifestPath) {
+    createSbomFileFromTextFormat(textGraphList, ignoredDeps, opts, manifestPath, hashMap) {
         let lines = textGraphList.split(EOL);
         // get root component
         let root = lines[0];
@@ -153,6 +243,9 @@ export default class Java_maven extends Base_java {
         let sbom = new Sbom();
         sbom.addRoot(rootPurl, license);
         this.parseDependencyTree(root, 0, lines.slice(1), sbom);
+        // Attach Maven artifact hashes as a post-processing step, keeping this
+        // Maven-specific concern out of the shared dependency-tree parser.
+        sbom.attachHashes(hashMap);
         return sbom.filterIgnoredDeps(ignoredDeps).getAsJsonString(opts);
     }
     /**
@@ -229,7 +322,8 @@ export default class Java_maven extends Base_java {
         return rootDependency;
     }
     /**
-     * Get a list of dependencies with marking of dependencies commented with <!--exhortignore-->.
+     * Get a list of dependencies with marking of dependencies commented with
+     * <!--exhortignore--> or <!--trustify-da-ignore-->.
      * @param {string} manifest - path for pom.xml
      * @returns {[Dependency]} an array of dependencies
      * @private
@@ -247,7 +341,7 @@ export default class Java_maven extends Base_java {
         let buf = fs.readFileSync(manifest);
         // parse manifest pom.xml to json
         let pomJson = parser.parse(buf.toString());
-        // iterate over all dependencies and chery pick dependencies with a exhortignore comment
+        // iterate over all dependencies and chery pick dependencies with an ignore comment
         let pomXml;
         // project without modules
         if (pomJson['project']) {
@@ -263,7 +357,7 @@ export default class Java_maven extends Base_java {
         }
         pomXml.forEach(dep => {
             let ignore = false;
-            if (dep['#comment'] && dep['#comment'].includes('exhortignore')) { // #comment is an array or a string
+            if (dep['#comment'] && [].concat(dep['#comment']).some(comment => IGNORE_MARKER_REGEX.test(comment))) { // #comment is an array or a string
                 ignore = true;
             }
             if (dep['scope'] !== 'test') {

package/dist/src/providers/javascript_bun.d.ts

@@ -1,4 +1,16 @@
 export default class Javascript_bun extends Base_javascript {
+    /**
+     * Parses `bun.lock` into a hash map keyed by `name@version`. Each entry in
+     * the `packages` section is an array whose first element is the resolved id
+     * (`name@version`) and whose fourth element is the SRI integrity string.
+     * @param {string} lockDir - Directory containing bun.lock
+     * @returns {Map<string, Array<{alg: string, content: string}>>} Hash map
+     * @protected
+     */
+    protected _parseLockFileHashes(lockDir: string): Map<string, Array<{
+        alg: string;
+        content: string;
+    }>>;
     _listCmdArgs(): void;
     _buildDependencyTree(includeTransitive: any, opts?: {}): {
         name: any;

package/dist/src/providers/javascript_bun.js

@@ -1,11 +1,51 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { parse } from 'jsonc-parser';
-import Base_javascript from './base_javascript.js';
+import Base_javascript, { sriToHash } from './base_javascript.js';
 export default class Javascript_bun extends Base_javascript {
     _lockFileName() {
         return "bun.lock";
     }
+    /**
+     * Parses `bun.lock` into a hash map keyed by `name@version`. Each entry in
+     * the `packages` section is an array whose first element is the resolved id
+     * (`name@version`) and whose fourth element is the SRI integrity string.
+     * @param {string} lockDir - Directory containing bun.lock
+     * @returns {Map<string, Array<{alg: string, content: string}>>} Hash map
+     * @protected
+     */
+    _parseLockFileHashes(lockDir) {
+        const map = new Map();
+        const lockPath = path.join(lockDir, this._lockFileName());
+        if (!fs.existsSync(lockPath)) {
+            return map;
+        }
+        let lockData;
+        try {
+            lockData = parse(fs.readFileSync(lockPath, 'utf-8'));
+        }
+        catch (_) {
+            return map;
+        }
+        const packages = lockData?.packages || {};
+        for (const entry of Object.values(packages)) {
+            if (!Array.isArray(entry) || typeof entry[0] !== 'string' || typeof entry[3] !== 'string') {
+                continue;
+            }
+            const id = entry[0];
+            const at = id.lastIndexOf('@');
+            if (at <= 0) {
+                continue;
+            }
+            const name = id.slice(0, at);
+            const version = id.slice(at + 1);
+            const hash = sriToHash(entry[3]);
+            if (name && version && hash) {
+                map.set(`${name}@${version}`, [hash]);
+            }
+        }
+        return map;
+    }
     _cmdName() {
         return "bun";
     }
@@ -20,6 +60,7 @@ export default class Javascript_bun extends Base_javascript {
         const manifestDir = path.dirname(this._getManifest().manifestPath);
         const lockDir = this._findLockFileDir(manifestDir, opts) || manifestDir;
         this._createLockFile(lockDir);
+        this._loadHashes(lockDir);
         const lockContent = fs.readFileSync(path.join(lockDir, 'bun.lock'), 'utf-8');
         const lockData = parse(lockContent);
         const packages = lockData.packages || {};

package/dist/src/providers/javascript_npm.d.ts

@@ -1,4 +1,17 @@
 export default class Javascript_npm extends Base_javascript {
+    /**
+     * Parses `package-lock.json` (lockfileVersion 2/3) into a hash map keyed by
+     * `name@version`. Each `packages` entry is keyed by its install path
+     * (e.g. `node_modules/@hapi/joi`); the package name is the segment after the
+     * final `node_modules/`. The `integrity` field holds an SRI string.
+     * @param {string} lockDir - Directory containing package-lock.json
+     * @returns {Map<string, Array<{alg: string, content: string}>>} Hash map
+     * @protected
+     */
+    protected _parseLockFileHashes(lockDir: string): Map<string, Array<{
+        alg: string;
+        content: string;
+    }>>;
     _listCmdArgs(includeTransitive: any): string[];
     _buildDependencyTree(includeTransitive: any, opts?: {}): Object | {
         name: any;

package/dist/src/providers/javascript_npm.js

@@ -1,8 +1,47 @@
-import Base_javascript from './base_javascript.js';
+import fs from 'node:fs';
+import path from 'node:path';
+import Base_javascript, { sriToHash } from './base_javascript.js';
 export default class Javascript_npm extends Base_javascript {
     _lockFileName() {
         return "package-lock.json";
     }
+    /**
+     * Parses `package-lock.json` (lockfileVersion 2/3) into a hash map keyed by
+     * `name@version`. Each `packages` entry is keyed by its install path
+     * (e.g. `node_modules/@hapi/joi`); the package name is the segment after the
+     * final `node_modules/`. The `integrity` field holds an SRI string.
+     * @param {string} lockDir - Directory containing package-lock.json
+     * @returns {Map<string, Array<{alg: string, content: string}>>} Hash map
+     * @protected
+     */
+    _parseLockFileHashes(lockDir) {
+        const map = new Map();
+        const lockPath = path.join(lockDir, this._lockFileName());
+        if (!fs.existsSync(lockPath)) {
+            return map;
+        }
+        let lock;
+        try {
+            lock = JSON.parse(fs.readFileSync(lockPath, 'utf-8'));
+        }
+        catch (_) {
+            return map;
+        }
+        const packages = lock.packages || {};
+        for (const [pkgPath, entry] of Object.entries(packages)) {
+            if (!pkgPath || !entry || !entry.integrity || !entry.version) {
+                continue;
+            }
+            const marker = 'node_modules/';
+            const idx = pkgPath.lastIndexOf(marker);
+            const name = idx < 0 ? pkgPath : pkgPath.slice(idx + marker.length);
+            const hash = sriToHash(entry.integrity);
+            if (name && hash) {
+                map.set(`${name}@${entry.version}`, [hash]);
+            }
+        }
+        return map;
+    }
     _cmdName() {
         return "npm";
     }

package/dist/src/providers/javascript_pnpm.d.ts

@@ -1,4 +1,17 @@
 export default class Javascript_pnpm extends Base_javascript {
+    /**
+     * Parses `pnpm-lock.yaml` (lockfileVersion 9) into a hash map keyed by
+     * `name@version`. Entries in the `packages` section are keyed by
+     * `<name>@<version>` (optionally followed by a `(peer@x)` suffix); the
+     * `resolution.integrity` field holds an SRI string.
+     * @param {string} lockDir - Directory containing pnpm-lock.yaml
+     * @returns {Map<string, Array<{alg: string, content: string}>>} Hash map
+     * @protected
+     */
+    protected _parseLockFileHashes(lockDir: string): Map<string, Array<{
+        alg: string;
+        content: string;
+    }>>;
     _listCmdArgs(includeTransitive: any): string[];
     _buildDependencyTree(includeTransitive: any, opts?: {}): any;
 }

package/dist/src/providers/javascript_pnpm.js

@@ -1,8 +1,54 @@
-import Base_javascript from './base_javascript.js';
+import fs from 'node:fs';
+import path from 'node:path';
+import { load as yamlLoad } from 'js-yaml';
+import Base_javascript, { sriToHash } from './base_javascript.js';
 export default class Javascript_pnpm extends Base_javascript {
     _lockFileName() {
         return "pnpm-lock.yaml";
     }
+    /**
+     * Parses `pnpm-lock.yaml` (lockfileVersion 9) into a hash map keyed by
+     * `name@version`. Entries in the `packages` section are keyed by
+     * `<name>@<version>` (optionally followed by a `(peer@x)` suffix); the
+     * `resolution.integrity` field holds an SRI string.
+     * @param {string} lockDir - Directory containing pnpm-lock.yaml
+     * @returns {Map<string, Array<{alg: string, content: string}>>} Hash map
+     * @protected
+     */
+    _parseLockFileHashes(lockDir) {
+        const map = new Map();
+        const lockPath = path.join(lockDir, this._lockFileName());
+        if (!fs.existsSync(lockPath)) {
+            return map;
+        }
+        let lock;
+        try {
+            lock = yamlLoad(fs.readFileSync(lockPath, 'utf-8'));
+        }
+        catch (_) {
+            return map;
+        }
+        const packages = lock?.packages || {};
+        for (const [key, entry] of Object.entries(packages)) {
+            const integrity = entry?.resolution?.integrity;
+            if (!key || !integrity) {
+                continue;
+            }
+            // Strip any peer-dependency suffix, then split name from version
+            const base = key.split('(')[0];
+            const at = base.lastIndexOf('@');
+            if (at <= 0) {
+                continue;
+            }
+            const name = base.slice(0, at);
+            const version = base.slice(at + 1);
+            const hash = sriToHash(integrity);
+            if (name && version && hash) {
+                map.set(`${name}@${version}`, [hash]);
+            }
+        }
+        return map;
+    }
     _cmdName() {
         return "pnpm";
     }

package/dist/src/providers/javascript_yarn.d.ts

@@ -1,5 +1,17 @@
 export default class Javascript_yarn extends Base_javascript {
     static VERSION_PATTERN: RegExp;
+    /**
+     * Parses `yarn.lock` into a hash map keyed by `name@version`. Supports both
+     * Yarn Classic (v1) entries with an `integrity` SRI field and Yarn Berry
+     * (v2+) entries with a `checksum` field.
+     * @param {string} lockDir - Directory containing yarn.lock
+     * @returns {Map<string, Array<{alg: string, content: string}>>} Hash map
+     * @protected
+     */
+    protected _parseLockFileHashes(lockDir: string): Map<string, Array<{
+        alg: string;
+        content: string;
+    }>>;
     _listCmdArgs(includeTransitive: any, manifestDir: any): any;
     _updateLockFileCmdArgs(manifestDir: any): any;
     _setUp(manifestPath: any, opts: any): void;

package/dist/src/providers/javascript_yarn.js

@@ -1,12 +1,85 @@
-import Base_javascript from './base_javascript.js';
+import fs from 'node:fs';
+import path from 'node:path';
+import { parseSyml } from '@yarnpkg/parsers';
+import Base_javascript, { sriToHash } from './base_javascript.js';
 import Yarn_berry_processor from './processors/yarn_berry_processor.js';
 import Yarn_classic_processor from './processors/yarn_classic_processor.js';
+/**
+ * Converts a Yarn Berry `checksum` value to a CycloneDX hash object. Berry
+ * checksums are formatted as `<cacheKey>/<hex-sha512>`; the digest is the
+ * hex-encoded SHA-512 following the final slash.
+ * @param {string} checksum - The checksum field value
+ * @returns {{alg: string, content: string}|null} CycloneDX hash, or null
+ */
+function berryChecksumToHash(checksum) {
+    if (typeof checksum !== 'string') {
+        return null;
+    }
+    const slash = checksum.lastIndexOf('/');
+    const hex = (slash >= 0 ? checksum.slice(slash + 1) : checksum).trim();
+    if (!/^[0-9a-f]+$/i.test(hex)) {
+        return null;
+    }
+    return { alg: 'SHA-512', content: hex.toLowerCase() };
+}
 export default class Javascript_yarn extends Base_javascript {
     static VERSION_PATTERN = /^([0-9]+)\./;
     #processor;
     _lockFileName() {
         return "yarn.lock";
     }
+    /**
+     * Parses `yarn.lock` into a hash map keyed by `name@version`. Supports both
+     * Yarn Classic (v1) entries with an `integrity` SRI field and Yarn Berry
+     * (v2+) entries with a `checksum` field.
+     * @param {string} lockDir - Directory containing yarn.lock
+     * @returns {Map<string, Array<{alg: string, content: string}>>} Hash map
+     * @protected
+     */
+    _parseLockFileHashes(lockDir) {
+        const map = new Map();
+        const lockPath = path.join(lockDir, this._lockFileName());
+        if (!fs.existsSync(lockPath)) {
+            return map;
+        }
+        let content;
+        try {
+            content = fs.readFileSync(lockPath, 'utf-8');
+        }
+        catch (_) {
+            return map;
+        }
+        const parsed = parseSyml(content);
+        for (const [spec, entry] of Object.entries(parsed)) {
+            if (spec === '__metadata') {
+                continue;
+            }
+            const version = entry.version;
+            if (!version) {
+                continue;
+            }
+            let hash = null;
+            if (entry.integrity) {
+                hash = sriToHash(entry.integrity);
+            }
+            else if (entry.checksum) {
+                hash = berryChecksumToHash(entry.checksum);
+            }
+            if (!hash) {
+                continue;
+            }
+            // Handle comma-separated specifiers (e.g., "pkg@^1.0.0, pkg@^2.0.0")
+            for (const rawSpec of spec.split(',')) {
+                const trimmed = rawSpec.trim();
+                const atIndex = trimmed.lastIndexOf('@');
+                if (atIndex > 0) {
+                    const name = trimmed.slice(0, atIndex);
+                    map.set(`${name}@${version}`, [hash]);
+                }
+            }
+        }
+        return map;
+    }
     _cmdName() {
         return "yarn";
     }
@@ -34,6 +107,6 @@ export default class Javascript_yarn extends Base_javascript {
         return this.#processor.parseDepTreeOutput(output);
     }
     _addDependenciesToSbom(sbom, depTree) {
-        this.#processor.addDependenciesToSbom(sbom, depTree);
+        this.#processor.addDependenciesToSbom(sbom, depTree, purl => this._hashesForPurl(purl));
     }
 }

package/dist/src/providers/manifest.js

@@ -55,11 +55,14 @@ export default class Manifest {
     }
     loadIgnored(content) {
         let deps = [];
-        if (!content.exhortignore) {
+        // Prefer the new 'trustify-da-ignore' key, falling back to the legacy
+        // 'exhortignore' key for backwards compatibility.
+        let ignored = content['trustify-da-ignore'] || content.exhortignore;
+        if (!ignored) {
             return deps;
         }
-        for (let i = 0; i < content.exhortignore.length; i++) {
-            deps.push(toPurl("npm", content.exhortignore[i]));
+        for (let i = 0; i < ignored.length; i++) {
+            deps.push(toPurl("npm", ignored[i]));
         }
         return deps;
     }

package/dist/src/providers/oci_dockerfile.d.ts

@@ -0,0 +1,51 @@
+/**
+ * Parse all FROM instructions from a Dockerfile using tree-sitter to extract base image references.
+ * In multi-stage builds, every FROM line is returned so each image can be analyzed independently.
+ * ARG substitutions are resolved using declared default values. FROM lines with unresolvable
+ * variables (ARGs without defaults) are silently skipped.
+ * @param {string} manifestContent the content of the Dockerfile
+ * @returns {Promise<string[]>} array of image references from all resolvable FROM instructions
+ * @throws {Error} when no FROM instruction is found or when no FROM lines can be resolved
+ */
+export function parseAllFromImages(manifestContent: string): Promise<string[]>;
+declare namespace _default {
+    export { isSupported };
+    export { validateLockFile };
+    export { provideComponent };
+    export { provideStack };
+    export { readLicenseFromManifest };
+    export function packageManagerName(): string;
+}
+export default _default;
+export type Provided = any;
+/**
+ * Check if the given manifest name is a Dockerfile or Containerfile.
+ * Supports dot-suffixed variants such as Dockerfile.dev or Containerfile.prod.
+ * @param {string} manifestName the manifest file name to check
+ * @returns {boolean} true if the manifest is a Dockerfile or Containerfile
+ */
+declare function isSupported(manifestName: string): boolean;
+/**
+ * Dockerfiles have no lock file, so validation always passes.
+ * @returns {boolean} always true
+ */
+declare function validateLockFile(): boolean;
+/**
+ * Provide content and content type for Dockerfile component analysis.
+ * @param {string} manifest path to the Dockerfile
+ * @param {{}} [opts={}] optional various options to pass along the application
+ * @returns {Promise<Provided>}
+ */
+declare function provideComponent(manifest: string, opts?: {}): Promise<Provided>;
+/**
+ * Provide content and content type for Dockerfile stack analysis.
+ * @param {string} manifest path to the Dockerfile
+ * @param {{}} [opts={}] optional various options to pass along the application
+ * @returns {Promise<Provided>}
+ */
+declare function provideStack(manifest: string, opts?: {}): Promise<Provided>;
+/**
+ * Dockerfiles contain no license information.
+ * @returns {null} always null
+ */
+declare function readLicenseFromManifest(): null;