@trustify-da/trustify-da-javascript-client 0.3.0-ea.d84439a → 0.3.0-ea.d8ec262

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.
Files changed (46) hide show
  1. package/dist/package.json +1 -1
  2. package/dist/src/cyclone_dx_sbom.d.ts +7 -1
  3. package/dist/src/cyclone_dx_sbom.js +29 -8
  4. package/dist/src/index.d.ts +62 -3
  5. package/dist/src/index.js +73 -6
  6. package/dist/src/provider.d.ts +3 -2
  7. package/dist/src/provider.js +5 -1
  8. package/dist/src/providers/base_java.d.ts +12 -10
  9. package/dist/src/providers/base_java.js +18 -44
  10. package/dist/src/providers/base_javascript.d.ts +11 -0
  11. package/dist/src/providers/base_javascript.js +10 -3
  12. package/dist/src/providers/base_pyproject.d.ts +14 -26
  13. package/dist/src/providers/base_pyproject.js +57 -73
  14. package/dist/src/providers/golang_gomodules.d.ts +10 -0
  15. package/dist/src/providers/golang_gomodules.js +65 -8
  16. package/dist/src/providers/java_gradle.d.ts +19 -0
  17. package/dist/src/providers/java_gradle.js +116 -2
  18. package/dist/src/providers/java_maven.d.ts +8 -0
  19. package/dist/src/providers/java_maven.js +165 -1
  20. package/dist/src/providers/javascript_bun.d.ts +10 -0
  21. package/dist/src/providers/javascript_bun.js +100 -0
  22. package/dist/src/providers/javascript_npm.d.ts +1 -0
  23. package/dist/src/providers/javascript_npm.js +21 -0
  24. package/dist/src/providers/javascript_pnpm.js +6 -2
  25. package/dist/src/providers/marker_evaluator.d.ts +14 -0
  26. package/dist/src/providers/marker_evaluator.js +191 -0
  27. package/dist/src/providers/processors/yarn_berry_processor.js +6 -2
  28. package/dist/src/providers/python_controller.d.ts +5 -1
  29. package/dist/src/providers/python_controller.js +65 -7
  30. package/dist/src/providers/python_pip.d.ts +5 -0
  31. package/dist/src/providers/python_pip.js +5 -5
  32. package/dist/src/providers/python_pip_pyproject.d.ts +61 -0
  33. package/dist/src/providers/python_pip_pyproject.js +146 -0
  34. package/dist/src/providers/python_poetry.d.ts +60 -5
  35. package/dist/src/providers/python_poetry.js +118 -16
  36. package/dist/src/providers/python_uv.d.ts +28 -0
  37. package/dist/src/providers/python_uv.js +82 -1
  38. package/dist/src/providers/rust_cargo.d.ts +5 -1
  39. package/dist/src/providers/rust_cargo.js +31 -4
  40. package/dist/src/sbom.d.ts +7 -1
  41. package/dist/src/sbom.js +4 -2
  42. package/dist/src/tools.d.ts +26 -0
  43. package/dist/src/tools.js +58 -0
  44. package/dist/src/workspace.d.ts +9 -0
  45. package/dist/src/workspace.js +1 -1
  46. package/package.json +2 -2
@@ -1,7 +1,9 @@
1
1
  import fs from 'node:fs';
2
2
  import path from 'node:path';
3
+ import { parse as parseToml } from 'smol-toml';
3
4
  import { environmentVariableIsPopulated, getCustom, getCustomPath, invokeCommand } from '../tools.js';
4
5
  import Base_pyproject from './base_pyproject.js';
6
+ import { evaluateMarker } from './marker_evaluator.js';
5
7
  export default class Python_poetry extends Base_pyproject {
6
8
  /**
7
9
  * Poetry has no native workspace/monorepo support (python-poetry/poetry#2270).
@@ -39,23 +41,31 @@ export default class Python_poetry extends Base_pyproject {
39
41
  */
40
42
  // eslint-disable-next-line no-unused-vars
41
43
  async _getDependencyData(manifestDir, _workspaceDir, parsed, opts) {
42
- let treeOutput = this._getPoetryShowTreeOutput(manifestDir, opts);
44
+ let hasDevGroup = !!(parsed.tool?.poetry?.group?.dev || parsed.tool?.poetry?.['dev-dependencies']);
45
+ let treeOutput = this._getPoetryShowTreeOutput(manifestDir, hasDevGroup, opts);
43
46
  let showAllOutput = this._getPoetryShowAllOutput(manifestDir, opts);
44
47
  let versionMap = this._parsePoetryShowAll(showAllOutput);
45
- return this._parsePoetryTree(treeOutput, versionMap);
48
+ let lockDir = this._findLockFileDir(manifestDir, opts);
49
+ let markerData = this._extractMarkerData(lockDir, parsed);
50
+ return this._parsePoetryTree(treeOutput, versionMap, markerData);
46
51
  }
47
52
  /**
48
53
  * Get poetry show --tree output.
49
54
  * @param {string} manifestDir
55
+ * @param {boolean} hasDevGroup
50
56
  * @param {Object} opts
51
57
  * @returns {string}
52
58
  */
53
- _getPoetryShowTreeOutput(manifestDir, opts) {
59
+ _getPoetryShowTreeOutput(manifestDir, hasDevGroup, opts) {
54
60
  if (environmentVariableIsPopulated('TRUSTIFY_DA_POETRY_SHOW_TREE')) {
55
61
  return Buffer.from(process.env['TRUSTIFY_DA_POETRY_SHOW_TREE'], 'base64').toString('utf-8');
56
62
  }
57
63
  let poetryBin = getCustomPath('poetry', opts);
58
- return invokeCommand(poetryBin, ['show', '--tree', '--no-ansi'], { cwd: manifestDir }).toString();
64
+ let args = ['show', '--tree', '--no-ansi'];
65
+ if (hasDevGroup) {
66
+ args.push('--without', 'dev');
67
+ }
68
+ return invokeCommand(poetryBin, args, { cwd: manifestDir }).toString();
59
69
  }
60
70
  /**
61
71
  * Get poetry show --all output (flat list with resolved versions).
@@ -92,16 +102,83 @@ export default class Python_poetry extends Base_pyproject {
92
102
  }
93
103
  return versions;
94
104
  }
105
+ /**
106
+ * Collects PEP 508 marker expressions for direct and transitive deps.
107
+ * Direct markers come from pyproject.toml dependency strings, e.g.:
108
+ * "pywin32>=311 ; sys_platform == 'win32'" → directMarkers['pywin32'] = "sys_platform == 'win32'"
109
+ * Transitive markers come from poetry.lock [package.dependencies] entries, e.g.:
110
+ * colorama = {version = "*", markers = "sys_platform == 'win32'"}
111
+ * → transitiveMarkers['click']['colorama'] = "sys_platform == 'win32'"
112
+ * @param {string|null} lockDir
113
+ * @param {object} parsed - parsed pyproject.toml
114
+ * @returns {{directMarkers: Map<string, string>, transitiveMarkers: Map<string, Map<string, string>>, hashMap: Map<string, Array<{alg: string, content: string}>>}}
115
+ */
116
+ _extractMarkerData(lockDir, parsed) {
117
+ let directMarkers = new Map();
118
+ let transitiveMarkers = new Map();
119
+ let hashMap = new Map();
120
+ // Extract markers from PEP 621 dependency strings: "name[extras]>=ver ; marker"
121
+ let deps = parsed.project?.dependencies || [];
122
+ for (let dep of deps) {
123
+ let m = dep.match(/^([A-Za-z0-9][A-Za-z0-9._-]*)\s*[^;]*;\s*(.+)$/);
124
+ if (m) {
125
+ directMarkers.set(this._canonicalize(m[1]), m[2].trim());
126
+ }
127
+ }
128
+ if (lockDir) {
129
+ let lockPath = path.join(lockDir, this._lockFileName());
130
+ if (fs.existsSync(lockPath)) {
131
+ let lockContent = fs.readFileSync(lockPath, 'utf-8');
132
+ let lock = parseToml(lockContent);
133
+ let packages = lock.package || [];
134
+ for (let pkg of packages) {
135
+ let pkgKey = this._canonicalize(pkg.name);
136
+ let pkgDeps = pkg.dependencies || {};
137
+ for (let [depName, depSpec] of Object.entries(pkgDeps)) {
138
+ let markers = typeof depSpec === 'object' && depSpec != null ? depSpec.markers : null;
139
+ if (markers) {
140
+ if (!transitiveMarkers.has(pkgKey)) {
141
+ transitiveMarkers.set(pkgKey, new Map());
142
+ }
143
+ transitiveMarkers.get(pkgKey).set(this._canonicalize(depName), markers);
144
+ }
145
+ }
146
+ let sha256Hex = this._extractSha256FromFiles(pkg.files);
147
+ if (sha256Hex) {
148
+ hashMap.set(pkgKey, [{ alg: "SHA-256", content: sha256Hex }]);
149
+ }
150
+ }
151
+ }
152
+ }
153
+ return { directMarkers, transitiveMarkers, hashMap };
154
+ }
155
+ /**
156
+ * Extract a SHA-256 hex digest from poetry.lock files array.
157
+ * Prefers the sdist (.tar.gz) hash; falls back to the first wheel hash.
158
+ * @param {Array<{file: string, hash: string}>} [files]
159
+ * @returns {string|null}
160
+ */
161
+ _extractSha256FromFiles(files) {
162
+ if (!Array.isArray(files) || files.length === 0) {
163
+ return null;
164
+ }
165
+ let sdist = files.find(f => f.file.endsWith('.tar.gz'));
166
+ let entry = sdist || files[0];
167
+ let hash = entry.hash;
168
+ if (hash && hash.startsWith('sha256:')) {
169
+ return hash.slice(7);
170
+ }
171
+ return null;
172
+ }
95
173
  /**
96
174
  * Parse poetry show --tree output into a dependency graph structure.
97
- * Top-level lines (no indentation/tree chars) are direct deps: "name version description"
98
- * Indented lines are transitive deps with tree chars: "├── name >=constraint"
99
175
  *
100
176
  * @param {string} treeOutput
101
177
  * @param {Map<string, string>} versionMap - canonical name -> resolved version
102
- * @returns {{directDeps: string[], graph: Map<string, {name: string, version: string, children: string[]}>}}
178
+ * @param {{directMarkers: Map<string, string>, transitiveMarkers: Map<string, Map<string, string>>, hashMap: Map<string, Array<{alg: string, content: string}>>}} markerData
179
+ * @returns {{directDeps: string[], graph: Map<string, {name: string, version: string, children: string[], hashes?: Array<{alg: string, content: string}>}>}}
103
180
  */
104
- _parsePoetryTree(treeOutput, versionMap) {
181
+ _parsePoetryTree(treeOutput, versionMap, markerData) {
105
182
  let lines = treeOutput.split(/\r?\n/);
106
183
  let graph = new Map();
107
184
  let directDeps = [];
@@ -117,9 +194,20 @@ export default class Python_poetry extends Base_pyproject {
117
194
  let name = topMatch[1];
118
195
  let version = topMatch[2];
119
196
  let key = this._canonicalize(name);
197
+ let marker = markerData.directMarkers.get(key);
198
+ if (marker && !evaluateMarker(marker)) {
199
+ currentDirectDep = null;
200
+ stack = [];
201
+ continue;
202
+ }
120
203
  directDeps.push(key);
121
204
  if (!graph.has(key)) {
122
- graph.set(key, { name, version, children: [] });
205
+ let entry = { name, version, children: [] };
206
+ let hashes = markerData.hashMap.get(key);
207
+ if (hashes) {
208
+ entry.hashes = hashes;
209
+ }
210
+ graph.set(key, entry);
123
211
  }
124
212
  currentDirectDep = key;
125
213
  stack = [{ key, depth: -1 }];
@@ -143,20 +231,34 @@ export default class Python_poetry extends Base_pyproject {
143
231
  // determine depth by counting tree-drawing groups in the prefix
144
232
  let prefix = line.substring(0, nameStart);
145
233
  let depth = (prefix.match(/(?:[├└│ ][\s─]{2} ?)/g) || []).length;
234
+ // pop stack back to find the parent at depth-1
235
+ while (stack.length > 0 && stack[stack.length - 1].depth >= depth) {
236
+ stack.pop();
237
+ }
238
+ let parentKey = stack.length > 0 ? stack[stack.length - 1].key : null;
239
+ if (parentKey) {
240
+ let parentMarkers = markerData.transitiveMarkers.get(parentKey);
241
+ if (parentMarkers) {
242
+ let marker = parentMarkers.get(depKey);
243
+ if (marker && !evaluateMarker(marker)) {
244
+ continue;
245
+ }
246
+ }
247
+ }
146
248
  // resolve version from the version map
147
249
  let version = versionMap.get(depKey) || null;
148
250
  if (!version) {
149
251
  throw new Error(`poetry: package '${depName}' has no resolved version`);
150
252
  }
151
253
  if (!graph.has(depKey)) {
152
- graph.set(depKey, { name: depName, version, children: [] });
153
- }
154
- // pop stack back to find the parent at depth-1
155
- while (stack.length > 0 && stack[stack.length - 1].depth >= depth) {
156
- stack.pop();
254
+ let entry = { name: depName, version, children: [] };
255
+ let hashes = markerData.hashMap.get(depKey);
256
+ if (hashes) {
257
+ entry.hashes = hashes;
258
+ }
259
+ graph.set(depKey, entry);
157
260
  }
158
- if (stack.length > 0) {
159
- let parentKey = stack[stack.length - 1].key;
261
+ if (parentKey) {
160
262
  let parentEntry = graph.get(parentKey);
161
263
  if (parentEntry && !parentEntry.children.includes(depKey)) {
162
264
  parentEntry.children.push(depKey);
@@ -1,4 +1,32 @@
1
+ /**
2
+ * Discover all pyproject.toml manifest paths in a uv workspace.
3
+ * Parses `[tool.uv.workspace]` from root pyproject.toml and glob-expands member patterns.
4
+ *
5
+ * @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain pyproject.toml and uv.lock)
6
+ * @param {{ workspaceDiscoveryIgnore?: string[], TRUSTIFY_DA_WORKSPACE_DISCOVERY_IGNORE?: string, [key: string]: unknown }} [opts={}]
7
+ * @returns {Promise<string[]>} Paths to pyproject.toml files (absolute)
8
+ */
9
+ export function discoverUvWorkspaceMembers(workspaceRoot: string, opts?: {
10
+ workspaceDiscoveryIgnore?: string[];
11
+ TRUSTIFY_DA_WORKSPACE_DISCOVERY_IGNORE?: string;
12
+ [key: string]: unknown;
13
+ }): Promise<string[]>;
1
14
  export default class Python_uv extends Base_pyproject {
15
+ /**
16
+ * @param {string} manifestDir - directory containing the target pyproject.toml
17
+ * @param {string} workspaceDir - workspace root (for resolving editable install paths)
18
+ * @param {object} parsed - parsed pyproject.toml
19
+ * @param {Object} opts
20
+ * @returns {Promise<{directDeps: string[], graph: Map<string, {name: string, version: string, children: string[]}>}>}
21
+ */
22
+ _getDependencyData(manifestDir: string, workspaceDir: string, parsed: object, opts: any): Promise<{
23
+ directDeps: string[];
24
+ graph: Map<string, {
25
+ name: string;
26
+ version: string;
27
+ children: string[];
28
+ }>;
29
+ }>;
2
30
  /**
3
31
  * Get the uv export output, either from env var or by running the command.
4
32
  * @param {string} manifestDir
@@ -1,8 +1,11 @@
1
1
  import fs from 'node:fs';
2
2
  import path from 'node:path';
3
+ import fg from 'fast-glob';
3
4
  import { parse as parseToml } from 'smol-toml';
4
5
  import { environmentVariableIsPopulated, getCustomPath, invokeCommand } from '../tools.js';
6
+ import { filterManifestPathsByDiscoveryIgnore, resolveWorkspaceDiscoveryIgnore, toManifestGlobPatterns } from '../workspace.js';
5
7
  import Base_pyproject from './base_pyproject.js';
8
+ import { evaluateMarker } from './marker_evaluator.js';
6
9
  import { getParser, getPinnedVersionQuery } from './requirements_parser.js';
7
10
  export default class Python_uv extends Base_pyproject {
8
11
  /** @returns {string} */
@@ -36,7 +39,7 @@ export default class Python_uv extends Base_pyproject {
36
39
  return Buffer.from(process.env['TRUSTIFY_DA_UV_EXPORT'], 'base64').toString('ascii');
37
40
  }
38
41
  let uvBin = getCustomPath('uv', opts);
39
- return invokeCommand(uvBin, ['export', '--format', 'requirements.txt', '--frozen', '--no-hashes'], { cwd: manifestDir }).toString();
42
+ return invokeCommand(uvBin, ['export', '--format', 'requirements.txt', '--frozen', '--no-hashes', '--no-dev', '--no-emit-project'], { cwd: manifestDir }).toString();
40
43
  }
41
44
  /**
42
45
  * Parse uv export output into a dependency graph using tree-sitter-requirements
@@ -70,6 +73,9 @@ export default class Python_uv extends Base_pyproject {
70
73
  let version = memberParsed.project?.version || memberParsed.tool?.poetry?.version;
71
74
  if (name && version) {
72
75
  let key = this._canonicalize(name);
76
+ if (key === canonProjectName) {
77
+ continue;
78
+ }
73
79
  currentPkg = { name, version, parents: new Set() };
74
80
  packages.set(key, currentPkg);
75
81
  collectingVia = false;
@@ -86,6 +92,16 @@ export default class Python_uv extends Base_pyproject {
86
92
  if (!nameNode) {
87
93
  continue;
88
94
  }
95
+ // Skip packages with non-matching PEP 508 markers, e.g. "pywin32==311 ; sys_platform == 'win32'"
96
+ let markerNode = child.children.find(c => c.type === 'marker_spec');
97
+ if (markerNode) {
98
+ let markerText = markerNode.text.replace(/^\s*;\s*/, '');
99
+ if (!evaluateMarker(markerText)) {
100
+ currentPkg = null;
101
+ collectingVia = false;
102
+ continue;
103
+ }
104
+ }
89
105
  let name = nameNode.text;
90
106
  let version = null;
91
107
  let versionMatches = pinnedVersionQuery.matches(child);
@@ -144,3 +160,68 @@ export default class Python_uv extends Base_pyproject {
144
160
  return { directDeps, graph };
145
161
  }
146
162
  }
163
+ const DEFAULT_UV_DISCOVERY_IGNORE = [
164
+ '**/__pycache__/**',
165
+ '**/.venv/**',
166
+ ];
167
+ /**
168
+ * Discover all pyproject.toml manifest paths in a uv workspace.
169
+ * Parses `[tool.uv.workspace]` from root pyproject.toml and glob-expands member patterns.
170
+ *
171
+ * @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain pyproject.toml and uv.lock)
172
+ * @param {{ workspaceDiscoveryIgnore?: string[], TRUSTIFY_DA_WORKSPACE_DISCOVERY_IGNORE?: string, [key: string]: unknown }} [opts={}]
173
+ * @returns {Promise<string[]>} Paths to pyproject.toml files (absolute)
174
+ */
175
+ export async function discoverUvWorkspaceMembers(workspaceRoot, opts = {}) {
176
+ const root = path.resolve(workspaceRoot);
177
+ const rootPyproject = path.join(root, 'pyproject.toml');
178
+ const uvLock = path.join(root, 'uv.lock');
179
+ if (!fs.existsSync(rootPyproject) || !fs.existsSync(uvLock)) {
180
+ return [];
181
+ }
182
+ let parsed;
183
+ try {
184
+ parsed = parseToml(fs.readFileSync(rootPyproject, 'utf-8'));
185
+ }
186
+ catch {
187
+ return [];
188
+ }
189
+ const workspaceConfig = parsed?.tool?.uv?.workspace;
190
+ if (!workspaceConfig) {
191
+ return [];
192
+ }
193
+ const memberPatterns = workspaceConfig.members;
194
+ if (!Array.isArray(memberPatterns) || memberPatterns.length === 0) {
195
+ return [];
196
+ }
197
+ const excludePatterns = Array.isArray(workspaceConfig.exclude) ? workspaceConfig.exclude : [];
198
+ const excludeGlobs = excludePatterns
199
+ .filter(p => typeof p === 'string' && p.trim())
200
+ .map(p => `${p.trim()}/pyproject.toml`);
201
+ const ignorePatterns = [...resolveWorkspaceDiscoveryIgnore(opts), ...DEFAULT_UV_DISCOVERY_IGNORE];
202
+ const globOpts = {
203
+ cwd: root,
204
+ absolute: true,
205
+ onlyFiles: true,
206
+ ignore: [...ignorePatterns, ...excludeGlobs],
207
+ followSymbolicLinks: false,
208
+ };
209
+ const patterns = toManifestGlobPatterns(memberPatterns.filter(p => typeof p === 'string'), 'pyproject.toml');
210
+ const manifestPaths = await fg(patterns, globOpts);
211
+ if (!manifestPaths.includes(rootPyproject) && hasProjectMetadata(parsed)) {
212
+ manifestPaths.unshift(rootPyproject);
213
+ }
214
+ return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns);
215
+ }
216
+ /**
217
+ * @param {import('smol-toml').TomlTable} parsedPyProject
218
+ * @returns {boolean}
219
+ */
220
+ function hasProjectMetadata(parsedPyProject) {
221
+ try {
222
+ return typeof parsedPyProject?.project?.name === 'string' && parsedPyProject.project.name.trim() !== '';
223
+ }
224
+ catch {
225
+ return false;
226
+ }
227
+ }
@@ -4,6 +4,7 @@ declare namespace _default {
4
4
  export { provideComponent };
5
5
  export { provideStack };
6
6
  export { readLicenseFromManifest };
7
+ export function packageManagerName(): string;
7
8
  }
8
9
  export default _default;
9
10
  export type Provided = import("../provider").Provided;
@@ -46,7 +47,10 @@ declare function provideStack(manifest: string, opts?: {}): Provided;
46
47
  * Read project license from Cargo.toml, with fallback to LICENSE file.
47
48
  * Supports the `license` field under `[package]` (single crate / workspace
48
49
  * with root) and under `[workspace.package]` (virtual workspaces).
50
+ * When a member crate uses `license = { workspace = true }`, the actual
51
+ * license is resolved from the workspace root Cargo.toml.
49
52
  * @param {string} manifestPath - path to Cargo.toml
53
+ * @param {object} [metadata] - cargo metadata output (needed for workspace license resolution)
50
54
  * @returns {string|null} SPDX identifier or null
51
55
  */
52
- declare function readLicenseFromManifest(manifestPath: string): string | null;
56
+ declare function readLicenseFromManifest(manifestPath: string, metadata?: object): string | null;
@@ -5,7 +5,7 @@ import { parse as parseToml } from 'smol-toml';
5
5
  import { getLicense } from '../license/license_utils.js';
6
6
  import Sbom from '../sbom.js';
7
7
  import { getCustom, getCustomPath, invokeCommand } from '../tools.js';
8
- export default { isSupported, validateLockFile, provideComponent, provideStack, readLicenseFromManifest };
8
+ export default { isSupported, validateLockFile, provideComponent, provideStack, readLicenseFromManifest, packageManagerName() { return 'cargo'; } };
9
9
  /** @typedef {import('../provider').Provider} */
10
10
  /** @typedef {import('../provider').Provided} Provided */
11
11
  /**
@@ -71,15 +71,22 @@ function isSupported(manifestName) {
71
71
  * Read project license from Cargo.toml, with fallback to LICENSE file.
72
72
  * Supports the `license` field under `[package]` (single crate / workspace
73
73
  * with root) and under `[workspace.package]` (virtual workspaces).
74
+ * When a member crate uses `license = { workspace = true }`, the actual
75
+ * license is resolved from the workspace root Cargo.toml.
74
76
  * @param {string} manifestPath - path to Cargo.toml
77
+ * @param {object} [metadata] - cargo metadata output (needed for workspace license resolution)
75
78
  * @returns {string|null} SPDX identifier or null
76
79
  */
77
- function readLicenseFromManifest(manifestPath) {
80
+ function readLicenseFromManifest(manifestPath, metadata) {
78
81
  let fromManifest = null;
79
82
  try {
80
83
  let content = fs.readFileSync(manifestPath, 'utf-8');
81
84
  let parsed = parseToml(content);
82
- fromManifest = parsed.package?.license
85
+ let packageLicense = parsed.package?.license;
86
+ if (typeof packageLicense === 'object' && packageLicense?.workspace === true) {
87
+ packageLicense = resolveWorkspaceLicense(parsed, metadata);
88
+ }
89
+ fromManifest = packageLicense
83
90
  || parsed.workspace?.package?.license
84
91
  || null;
85
92
  }
@@ -88,6 +95,26 @@ function readLicenseFromManifest(manifestPath) {
88
95
  }
89
96
  return getLicense(fromManifest, manifestPath);
90
97
  }
98
+ /**
99
+ * Resolve a workspace-inherited license from the workspace root Cargo.toml.
100
+ * @param {object} parsed - the parsed member crate Cargo.toml
101
+ * @param {object} [metadata] - cargo metadata output with workspace_root
102
+ * @returns {string|null} resolved license string or null
103
+ */
104
+ function resolveWorkspaceLicense(parsed, metadata) {
105
+ if (metadata?.workspace_root) {
106
+ let cargoTomlPath = path.join(metadata.workspace_root, 'Cargo.toml');
107
+ try {
108
+ let content = fs.readFileSync(cargoTomlPath, 'utf-8');
109
+ let workspaceParsed = parseToml(content);
110
+ return workspaceParsed.workspace?.package?.license || null;
111
+ }
112
+ catch (_) {
113
+ // fall through
114
+ }
115
+ }
116
+ return parsed.workspace?.package?.license || null;
117
+ }
91
118
  /**
92
119
  * Validates that Cargo.lock exists in the manifest directory or in a parent
93
120
  * workspace root directory. In Cargo workspaces the lock file always lives at
@@ -173,7 +200,7 @@ function getSBOM(manifest, opts = {}, includeTransitive) {
173
200
  let metadata = executeCargoMetadata(cargoBin, manifestDir);
174
201
  let ignoredDeps = getIgnoredDeps(manifest, metadata);
175
202
  let crateType = detectCrateType(metadata);
176
- let license = readLicenseFromManifest(manifest);
203
+ let license = readLicenseFromManifest(manifest, metadata);
177
204
  let sbom;
178
205
  if (crateType === CrateType.WORKSPACE_VIRTUAL) {
179
206
  sbom = handleVirtualWorkspace(manifest, metadata, ignoredDeps, includeTransitive, opts, license);
@@ -25,9 +25,14 @@ export default class Sbom {
25
25
  /**
26
26
  * @param {component} sourceRef current source Component ( Starting from root component by clients)
27
27
  * @param {PackageURL} targetRef current dependency to add to Dependencies list of component sourceRef
28
+ * @param {string} [scope] - Scope of the dependency
29
+ * @param {Array<{alg: string, content: string}>} [targetHashes] - Optional hashes for the target component
28
30
  * @return Sbom
29
31
  */
30
- addDependency(sourceRef: component, targetRef: PackageURL, scope: any): CycloneDxSbom;
32
+ addDependency(sourceRef: component, targetRef: PackageURL, scope?: string, targetHashes?: Array<{
33
+ alg: string;
34
+ content: string;
35
+ }>): CycloneDxSbom;
31
36
  /**
32
37
  * @return String sbom json in a string format
33
38
  */
@@ -45,6 +50,7 @@ export default class Sbom {
45
50
  version: any;
46
51
  scope: any;
47
52
  licenses?: any;
53
+ hashes?: any;
48
54
  };
49
55
  /** This method gets a component object, and a string name, and checks if the name is a substring of the component' purl.
50
56
  * @param {} component to search in its dependencies
package/dist/src/sbom.js CHANGED
@@ -43,10 +43,12 @@ export default class Sbom {
43
43
  /**
44
44
  * @param {component} sourceRef current source Component ( Starting from root component by clients)
45
45
  * @param {PackageURL} targetRef current dependency to add to Dependencies list of component sourceRef
46
+ * @param {string} [scope] - Scope of the dependency
47
+ * @param {Array<{alg: string, content: string}>} [targetHashes] - Optional hashes for the target component
46
48
  * @return Sbom
47
49
  */
48
- addDependency(sourceRef, targetRef, scope) {
49
- return this.sbomModel.addDependency(sourceRef, targetRef, scope);
50
+ addDependency(sourceRef, targetRef, scope, targetHashes) {
51
+ return this.sbomModel.addDependency(sourceRef, targetRef, scope, targetHashes);
50
52
  }
51
53
  /**
52
54
  * @return String sbom json in a string format
@@ -61,6 +61,32 @@ export function toPurlFromString(strPurl: any): PackageURL | null;
61
61
  * @param {string} cwd - directory for which to find the root of the git repository.
62
62
  */
63
63
  export function getGitRootDir(cwd: string): string | undefined;
64
+ /**
65
+ * Normalize a filesystem path, lowercasing on Windows for case-insensitive comparison.
66
+ *
67
+ * @param {string} thePath
68
+ * @returns {string}
69
+ */
70
+ export function normalizePath(thePath: string): string;
71
+ /**
72
+ * Walk up from `startDir` to `repoRoot` looking for an executable wrapper script.
73
+ *
74
+ * @param {string} startDir - Absolute directory to start from
75
+ * @param {string} wrapperName - Wrapper filename (e.g. `mvnw`, `gradlew`)
76
+ * @param {string} [repoRoot] - Stop boundary (defaults to git root or filesystem root)
77
+ * @returns {string | undefined}
78
+ */
79
+ export function traverseForWrapper(startDir: string, wrapperName: string, repoRoot?: string): string | undefined;
80
+ /**
81
+ * Resolve a build-tool binary, preferring a wrapper when configured.
82
+ *
83
+ * @param {string} globalBinary - Global binary name (e.g. `mvn`, `gradle`)
84
+ * @param {string} localWrapper - Wrapper filename (e.g. `mvnw`, `gradlew.bat`)
85
+ * @param {string} startDir - Directory from which to start the wrapper search
86
+ * @param {import('./index.js').Options} [opts={}]
87
+ * @returns {string} Path to the resolved binary
88
+ */
89
+ export function resolveBinary(globalBinary: string, localWrapper: string, startDir: string, opts?: import("./index.js").Options): string;
64
90
  /** this method invokes command string in a process in a synchronous way.
65
91
  * @param {string} bin - the command to be invoked
66
92
  * @param {Array<string>} args - the args to pass to the binary
package/dist/src/tools.js CHANGED
@@ -1,4 +1,6 @@
1
1
  import { execFileSync } from "child_process";
2
+ import fs from 'node:fs';
3
+ import path from 'node:path';
2
4
  import { EOL } from "os";
3
5
  import { HttpsProxyAgent } from "https-proxy-agent";
4
6
  import { PackageURL } from "packageurl-js";
@@ -128,6 +130,62 @@ export function getGitRootDir(cwd) {
128
130
  return undefined;
129
131
  }
130
132
  }
133
+ /**
134
+ * Normalize a filesystem path, lowercasing on Windows for case-insensitive comparison.
135
+ *
136
+ * @param {string} thePath
137
+ * @returns {string}
138
+ */
139
+ export function normalizePath(thePath) {
140
+ const normalized = path.resolve(thePath).normalize();
141
+ return process.platform === 'win32' ? normalized.toLowerCase() : normalized;
142
+ }
143
+ /**
144
+ * Walk up from `startDir` to `repoRoot` looking for an executable wrapper script.
145
+ *
146
+ * @param {string} startDir - Absolute directory to start from
147
+ * @param {string} wrapperName - Wrapper filename (e.g. `mvnw`, `gradlew`)
148
+ * @param {string} [repoRoot] - Stop boundary (defaults to git root or filesystem root)
149
+ * @returns {string | undefined}
150
+ */
151
+ export function traverseForWrapper(startDir, wrapperName, repoRoot = undefined) {
152
+ const currentDir = normalizePath(startDir);
153
+ repoRoot = repoRoot || getGitRootDir(currentDir) || path.parse(currentDir).root;
154
+ const wrapperPath = path.join(currentDir, wrapperName);
155
+ try {
156
+ fs.accessSync(wrapperPath, fs.constants.X_OK);
157
+ return wrapperPath;
158
+ }
159
+ catch {
160
+ const rootDir = path.parse(currentDir).root;
161
+ if (currentDir === repoRoot || currentDir === rootDir) {
162
+ return undefined;
163
+ }
164
+ const parentDir = path.dirname(currentDir);
165
+ if (parentDir === currentDir || parentDir === rootDir) {
166
+ return undefined;
167
+ }
168
+ return traverseForWrapper(parentDir, wrapperName, repoRoot);
169
+ }
170
+ }
171
+ /**
172
+ * Resolve a build-tool binary, preferring a wrapper when configured.
173
+ *
174
+ * @param {string} globalBinary - Global binary name (e.g. `mvn`, `gradle`)
175
+ * @param {string} localWrapper - Wrapper filename (e.g. `mvnw`, `gradlew.bat`)
176
+ * @param {string} startDir - Directory from which to start the wrapper search
177
+ * @param {import('./index.js').Options} [opts={}]
178
+ * @returns {string} Path to the resolved binary
179
+ */
180
+ export function resolveBinary(globalBinary, localWrapper, startDir, opts = {}) {
181
+ if (getWrapperPreference(globalBinary, opts)) {
182
+ const wrapper = traverseForWrapper(startDir, localWrapper);
183
+ if (wrapper !== undefined) {
184
+ return wrapper;
185
+ }
186
+ }
187
+ return getCustomPath(globalBinary, opts);
188
+ }
131
189
  /** this method invokes command string in a process in a synchronous way.
132
190
  * @param {string} bin - the command to be invoked
133
191
  * @param {Array<string>} args - the args to pass to the binary
@@ -42,6 +42,15 @@ export function discoverWorkspacePackages(workspaceRoot: string, opts?: {
42
42
  TRUSTIFY_DA_WORKSPACE_DISCOVERY_IGNORE?: string;
43
43
  [key: string]: unknown;
44
44
  }): Promise<string[]>;
45
+ /**
46
+ * Convert workspace glob patterns to manifest-file glob patterns,
47
+ * correctly handling negation prefixes.
48
+ *
49
+ * @param {string[]} patterns - Workspace glob patterns (may include negations)
50
+ * @param {string} manifestFileName - e.g. 'package.json' or 'Cargo.toml'
51
+ * @returns {string[]}
52
+ */
53
+ export function toManifestGlobPatterns(patterns: string[], manifestFileName: string): string[];
45
54
  /**
46
55
  * Discover all Cargo.toml manifest paths in a Cargo workspace.
47
56
  * Uses `cargo metadata` to get workspace members.
@@ -172,7 +172,7 @@ function parsePnpmPackages(content) {
172
172
  * @param {string} manifestFileName - e.g. 'package.json' or 'Cargo.toml'
173
173
  * @returns {string[]}
174
174
  */
175
- function toManifestGlobPatterns(patterns, manifestFileName) {
175
+ export function toManifestGlobPatterns(patterns, manifestFileName) {
176
176
  return patterns.map(p => {
177
177
  if (p.startsWith('!')) {
178
178
  return `!${p.slice(1)}/${manifestFileName}`;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trustify-da/trustify-da-javascript-client",
3
- "version": "0.3.0-ea.d84439a",
3
+ "version": "0.3.0-ea.d8ec262",
4
4
  "description": "Code-Ready Dependency Analytics JavaScript API.",
5
5
  "license": "Apache-2.0",
6
6
  "homepage": "https://github.com/guacsec/trustify-da-javascript-client#README.md",
@@ -51,11 +51,11 @@
51
51
  "@cyclonedx/cyclonedx-library": "^6.13.0",
52
52
  "eslint-import-resolver-typescript": "^4.4.4",
53
53
  "fast-glob": "^3.3.3",
54
- "fast-toml": "^0.5.4",
55
54
  "fast-xml-parser": "^5.3.4",
56
55
  "help": "^3.0.2",
57
56
  "https-proxy-agent": "^7.0.6",
58
57
  "js-yaml": "^4.1.1",
58
+ "jsonc-parser": "^3.3.1",
59
59
  "micromatch": "^4.0.8",
60
60
  "node-fetch": "^3.3.2",
61
61
  "p-limit": "^4.0.0",