@trustify-da/trustify-da-javascript-client 0.3.0-ea.1684e79 → 0.3.0-ea.212178e

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 (45) 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 +18 -5
  4. package/dist/src/index.d.ts +62 -3
  5. package/dist/src/index.js +73 -6
  6. package/dist/src/provider.d.ts +2 -1
  7. package/dist/src/provider.js +3 -1
  8. package/dist/src/providers/base_java.d.ts +5 -9
  9. package/dist/src/providers/base_java.js +9 -38
  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 +10 -1
  13. package/dist/src/providers/base_pyproject.js +12 -4
  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 +93 -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 +58 -4
  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.js +3 -1
  33. package/dist/src/providers/python_poetry.d.ts +35 -3
  34. package/dist/src/providers/python_poetry.js +73 -10
  35. package/dist/src/providers/python_uv.d.ts +28 -0
  36. package/dist/src/providers/python_uv.js +82 -1
  37. package/dist/src/providers/rust_cargo.d.ts +1 -0
  38. package/dist/src/providers/rust_cargo.js +1 -1
  39. package/dist/src/sbom.d.ts +7 -1
  40. package/dist/src/sbom.js +4 -2
  41. package/dist/src/tools.d.ts +26 -0
  42. package/dist/src/tools.js +58 -0
  43. package/dist/src/workspace.d.ts +9 -0
  44. package/dist/src/workspace.js +1 -1
  45. package/package.json +2 -2
@@ -0,0 +1,191 @@
1
+ // PEP 508 environment marker evaluator.
2
+ // Filters Python dependencies by platform/version markers so that e.g.
3
+ // "pywin32 ; sys_platform == 'win32'" is excluded on Linux/macOS.
4
+ // See https://peps.python.org/pep-0508/#environment-markers
5
+ import os from 'node:os';
6
+ import { getCustomPath, invokeCommand } from '../tools.js';
7
+ let cachedPythonVersions = undefined;
8
+ function getPythonVersions() {
9
+ if (cachedPythonVersions !== undefined) {
10
+ return cachedPythonVersions;
11
+ }
12
+ try {
13
+ let python = getCustomPath('python3');
14
+ let out = invokeCommand(python, ['-c', "import sys; v=sys.version_info; print(f'{v.major}.{v.minor} {v.major}.{v.minor}.{v.micro}')"], { timeout: 5000 }).toString().trim();
15
+ let [short, full] = out.split(' ');
16
+ cachedPythonVersions = { short, full };
17
+ }
18
+ catch {
19
+ cachedPythonVersions = null;
20
+ }
21
+ return cachedPythonVersions;
22
+ }
23
+ /**
24
+ * Maps Node.js/OS values to PEP 508 marker variables.
25
+ * Example: on Linux, sys_platform='linux', platform_system='Linux', os_name='posix'
26
+ * @returns {Record<string, string>}
27
+ */
28
+ export function getEnvironmentMarkers() {
29
+ let platform = process.platform;
30
+ let systemMap = { win32: 'Windows', linux: 'Linux', darwin: 'Darwin' };
31
+ let machine = typeof os.machine === 'function' ? os.machine() : process.arch;
32
+ let pyVer = getPythonVersions();
33
+ return {
34
+ sys_platform: platform,
35
+ platform_system: systemMap[platform] || platform,
36
+ os_name: platform === 'win32' ? 'nt' : 'posix',
37
+ platform_machine: machine,
38
+ platform_release: os.release(),
39
+ platform_version: os.version?.() || '',
40
+ python_version: pyVer?.short || '',
41
+ python_full_version: pyVer?.full || '',
42
+ implementation_name: 'cpython',
43
+ };
44
+ }
45
+ function compareVersions(left, right) {
46
+ let lParts = left.split('.').map(Number);
47
+ let rParts = right.split('.').map(Number);
48
+ let len = Math.max(lParts.length, rParts.length);
49
+ for (let i = 0; i < len; i++) {
50
+ let l = lParts[i] || 0;
51
+ let r = rParts[i] || 0;
52
+ if (l < r) {
53
+ return -1;
54
+ }
55
+ if (l > r) {
56
+ return 1;
57
+ }
58
+ }
59
+ return 0;
60
+ }
61
+ // Evaluates a single comparison like sys_platform == 'win32' or python_version >= '3.8'.
62
+ // Version-bearing variables (python_version, python_full_version) use numeric comparison;
63
+ // all others use string equality. Returns false when the env value is missing.
64
+ function evaluateComparison(variable, op, value, env) {
65
+ let envVal = env[variable];
66
+ if (envVal === undefined || envVal === '') {
67
+ return false;
68
+ }
69
+ let isVersion = variable.includes('version');
70
+ if (isVersion) {
71
+ let cmp = compareVersions(envVal, value);
72
+ switch (op) {
73
+ case '==': return cmp === 0;
74
+ case '!=': return cmp !== 0;
75
+ case '>=': return cmp >= 0;
76
+ case '<=': return cmp <= 0;
77
+ case '>': return cmp > 0;
78
+ case '<': return cmp < 0;
79
+ case '~=': {
80
+ let parts = value.split('.');
81
+ parts.pop();
82
+ let prefix = parts.join('.');
83
+ return envVal.startsWith(prefix) && cmp >= 0;
84
+ }
85
+ default: return true;
86
+ }
87
+ }
88
+ switch (op) {
89
+ case '==': return envVal === value;
90
+ case '!=': return envVal !== value;
91
+ case 'in': return value.includes(envVal);
92
+ case 'not in': return !value.includes(envVal);
93
+ default: return envVal === value;
94
+ }
95
+ }
96
+ // Parses a single marker comparison into {variable, op, value}.
97
+ // Handles both normal and reversed forms:
98
+ // "sys_platform == 'linux'" → { variable: 'sys_platform', op: '==', value: 'linux' }
99
+ // "'linux' == sys_platform" → { variable: 'sys_platform', op: '==', value: 'linux' }
100
+ function parseAtom(expr) {
101
+ // Normal form: variable op 'value'
102
+ let m = expr.match(/^\s*([\w.]+)\s*(~=|!=|==|>=|<=|>|<|not\s+in|in)\s*["']([^"']*)["']\s*$/);
103
+ if (m) {
104
+ return { variable: m[1], op: m[2].replace(/\s+/g, ' '), value: m[3] };
105
+ }
106
+ // Reversed form: 'value' op variable — reverse directional operators
107
+ let mReverse = expr.match(/^\s*["']([^"']*)['"]\s*(~=|!=|==|>=|<=|>|<|not\s+in|in)\s*([\w.]+)\s*$/);
108
+ if (mReverse) {
109
+ let reverseOp = { '<': '>', '>': '<', '<=': '>=', '>=': '<=' };
110
+ let op = mReverse[2].replace(/\s+/g, ' ');
111
+ return { variable: mReverse[3], op: reverseOp[op] || op, value: mReverse[1] };
112
+ }
113
+ return null;
114
+ }
115
+ /**
116
+ * Evaluates a full PEP 508 marker expression against the current platform.
117
+ * Example: "sys_platform == 'win32' and python_version >= '3.8'" → false on Linux
118
+ * Empty/missing markers return true (unconditional dependency).
119
+ * @param {string} markerExpr
120
+ * @returns {boolean}
121
+ */
122
+ export function evaluateMarker(markerExpr) {
123
+ if (!markerExpr || !markerExpr.trim()) {
124
+ return true;
125
+ }
126
+ let env = getEnvironmentMarkers();
127
+ return evaluateExpr(markerExpr.trim(), env);
128
+ }
129
+ function evaluateExpr(expr, env) {
130
+ let orParts = splitLogical(expr, ' or ');
131
+ if (orParts.length > 1) {
132
+ return orParts.some(part => evaluateExpr(part, env));
133
+ }
134
+ let andParts = splitLogical(expr, ' and ');
135
+ if (andParts.length > 1) {
136
+ return andParts.every(part => evaluateExpr(part, env));
137
+ }
138
+ let trimmed = expr.trim();
139
+ if (trimmed.startsWith('(') && trimmed.endsWith(')')) {
140
+ return evaluateExpr(trimmed.slice(1, -1), env);
141
+ }
142
+ let atom = parseAtom(trimmed);
143
+ if (!atom) {
144
+ return true;
145
+ }
146
+ return evaluateComparison(atom.variable, atom.op, atom.value, env);
147
+ }
148
+ // Splits an expression by " and " or " or " at the top level, skipping
149
+ // separators inside parentheses or quoted strings.
150
+ // Example: splitLogical("a == 'x' and (b == 'y' or c == 'z')", " and ")
151
+ // → ["a == 'x'", "(b == 'y' or c == 'z')"]
152
+ function splitLogical(expr, sep) {
153
+ let parts = [];
154
+ let depth = 0;
155
+ let current = '';
156
+ let i = 0;
157
+ let quoteChar = null;
158
+ while (i < expr.length) {
159
+ let ch = expr[i];
160
+ if (quoteChar) {
161
+ if (ch === quoteChar) {
162
+ quoteChar = null;
163
+ }
164
+ current += ch;
165
+ i++;
166
+ continue;
167
+ }
168
+ if (ch === '"' || ch === "'") {
169
+ quoteChar = ch;
170
+ current += ch;
171
+ i++;
172
+ continue;
173
+ }
174
+ if (ch === '(') {
175
+ depth++;
176
+ }
177
+ if (ch === ')') {
178
+ depth--;
179
+ }
180
+ if (depth === 0 && expr.substring(i, i + sep.length) === sep) {
181
+ parts.push(current);
182
+ current = '';
183
+ i += sep.length;
184
+ continue;
185
+ }
186
+ current += ch;
187
+ i++;
188
+ }
189
+ parts.push(current);
190
+ return parts.filter(p => p.trim());
191
+ }
@@ -15,7 +15,10 @@ export default class Yarn_berry_processor extends Yarn_processor {
15
15
  * @returns {string[]} Command arguments for listing dependencies
16
16
  */
17
17
  listCmdArgs(includeTransitive) {
18
- return ['info', includeTransitive ? '--recursive' : '--all', '--json'];
18
+ // --all is needed to include workspace members in the output
19
+ return includeTransitive
20
+ ? ['info', '--recursive', '--all', '--json']
21
+ : ['info', '--all', '--json'];
19
22
  }
20
23
  /**
21
24
  * Returns the command arguments for updating the lock file
@@ -68,7 +71,8 @@ export default class Yarn_berry_processor extends Yarn_processor {
68
71
  if (!name) {
69
72
  return false;
70
73
  }
71
- return name.endsWith("@workspace:.");
74
+ // Workspace members use paths like "member-a@workspace:packages/member-a", not just "@workspace:."
75
+ return name.startsWith(`${this._manifest.name}@workspace:`);
72
76
  }
73
77
  /**
74
78
  * Adds dependencies to the SBOM
@@ -1,4 +1,4 @@
1
- /** @typedef {{name: string, version: string, dependencies: DependencyEntry[]}} DependencyEntry */
1
+ /** @typedef {{name: string, version: string, dependencies: DependencyEntry[], hashes?: Array<{alg: string, content: string}>}} DependencyEntry */
2
2
  export default class Python_controller {
3
3
  /**
4
4
  * Constructor to create new python controller instance to interact with pip package manager
@@ -31,4 +31,8 @@ export type DependencyEntry = {
31
31
  name: string;
32
32
  version: string;
33
33
  dependencies: DependencyEntry[];
34
+ hashes?: Array<{
35
+ alg: string;
36
+ content: string;
37
+ }>;
34
38
  };
@@ -19,7 +19,54 @@ function getPipShowOutput(depNames) {
19
19
  throw new Error('fail invoking \'pip show\' to fetch metadata for all installed packages in environment', { cause: error });
20
20
  }
21
21
  }
22
- /** @typedef {{name: string, version: string, dependencies: DependencyEntry[]}} DependencyEntry */
22
+ /**
23
+ * Get pip inspect output from env var override or by invoking pip inspect.
24
+ * Returns null if pip inspect is unavailable (pip < 22.2) or if freeze/show
25
+ * env vars are set without an inspect override (to avoid inconsistent data).
26
+ * @return {string|null} pip inspect JSON output, or null on failure
27
+ */
28
+ function getPipInspectOutput() {
29
+ if (environmentVariableIsPopulated("TRUSTIFY_DA_PIP_INSPECT")) {
30
+ return new Buffer.from(process.env["TRUSTIFY_DA_PIP_INSPECT"], 'base64').toString('ascii');
31
+ }
32
+ if (environmentVariableIsPopulated("TRUSTIFY_DA_PIP_FREEZE") || environmentVariableIsPopulated("TRUSTIFY_DA_PIP_SHOW")) {
33
+ return null;
34
+ }
35
+ try {
36
+ return invokeCommand(this.pathToPipBin, ['inspect']).toString();
37
+ }
38
+ catch (error) {
39
+ console.warn('pip inspect is not available (requires pip 22.2+), SBOM will be generated without hashes');
40
+ return null;
41
+ }
42
+ }
43
+ /**
44
+ * Parse pip inspect JSON output and build a hash lookup map.
45
+ * @param {string|null} inspectOutput - raw pip inspect JSON string
46
+ * @return {Map<string, Array<{alg: string, content: string}>>} map of lowercase package name to hashes
47
+ */
48
+ function parsePipInspectHashes(inspectOutput) {
49
+ if (!inspectOutput) {
50
+ return new Map();
51
+ }
52
+ try {
53
+ let inspectData = JSON.parse(inspectOutput);
54
+ let hashMap = new Map();
55
+ for (let pkg of (inspectData.installed || [])) {
56
+ let name = pkg.metadata?.name;
57
+ let sha256 = pkg.download_info?.archive_info?.hashes?.sha256;
58
+ if (name && sha256) {
59
+ hashMap.set(name.toLowerCase(), [{ alg: "SHA-256", content: sha256 }]);
60
+ }
61
+ }
62
+ return hashMap;
63
+ }
64
+ catch (error) {
65
+ console.warn('Failed to parse pip inspect output, SBOM will be generated without hashes');
66
+ return new Map();
67
+ }
68
+ }
69
+ /** @typedef {{name: string, version: string, dependencies: DependencyEntry[], hashes?: Array<{alg: string, content: string}>}} DependencyEntry */
23
70
  export default class Python_controller {
24
71
  pythonEnvDir;
25
72
  pathToPipBin;
@@ -225,6 +272,8 @@ export default class Python_controller {
225
272
  CachedEnvironmentDeps[packageName.replace("_", "-")] = pipDepTreeEntryForCache;
226
273
  });
227
274
  }
275
+ const inspectOutput = getPipInspectOutput.call(this);
276
+ const hashMap = parsePipInspectHashes(inspectOutput);
228
277
  parsedRequirements.forEach(({ name: depName, version: manifestVersion, hasMarker }) => {
229
278
  if (hasMarker && CachedEnvironmentDeps[depName.toLowerCase()] === undefined) {
230
279
  return;
@@ -247,7 +296,7 @@ export default class Python_controller {
247
296
  }
248
297
  let path = [];
249
298
  path.push(depName.toLowerCase());
250
- bringAllDependencies(dependencies, depName, CachedEnvironmentDeps, includeTransitive, path, usePipDepTree);
299
+ bringAllDependencies(dependencies, depName, CachedEnvironmentDeps, includeTransitive, path, usePipDepTree, hashMap);
251
300
  });
252
301
  dependencies.sort((dep1, dep2) => {
253
302
  const DEP1 = dep1.name.toLowerCase();
@@ -327,8 +376,9 @@ function getDepsList(record) {
327
376
  * @param includeTransitive
328
377
  * @param usePipDepTree
329
378
  * @param {[string]}path array representing the path of the current branch in dependency tree, starting with a root dependency - that is - a given dependency in requirements.txt
379
+ * @param {Map<string, Array<{alg: string, content: string}>>} hashMap - map of lowercase package name to hashes
330
380
  */
331
- function bringAllDependencies(dependencies, dependencyName, cachedEnvironmentDeps, includeTransitive, path, usePipDepTree) {
381
+ function bringAllDependencies(dependencies, dependencyName, cachedEnvironmentDeps, includeTransitive, path, usePipDepTree, hashMap) {
332
382
  if (dependencyName?.trim() === "") {
333
383
  return;
334
384
  }
@@ -350,7 +400,11 @@ function bringAllDependencies(dependencies, dependencyName, cachedEnvironmentDep
350
400
  directDeps = record.dependencies;
351
401
  }
352
402
  let targetDeps = [];
403
+ let hashes = hashMap?.get(depName.toLowerCase());
353
404
  let entry = { "name": depName, "version": version, "dependencies": [] };
405
+ if (hashes) {
406
+ entry.hashes = hashes;
407
+ }
354
408
  dependencies.push(entry);
355
409
  directDeps.forEach((dep) => {
356
410
  let depArray = [];
@@ -360,7 +414,7 @@ function bringAllDependencies(dependencies, dependencyName, cachedEnvironmentDep
360
414
  depArray.push(dep.toLowerCase());
361
415
  if (includeTransitive) {
362
416
  // send to recurrsion the array of all deps in path + the current dependency name which is not on the path.
363
- bringAllDependencies(targetDeps, dep, cachedEnvironmentDeps, includeTransitive, path.concat(depArray), usePipDepTree);
417
+ bringAllDependencies(targetDeps, dep, cachedEnvironmentDeps, includeTransitive, path.concat(depArray), usePipDepTree, hashMap);
364
418
  }
365
419
  }
366
420
  // sort ra
@@ -4,12 +4,17 @@ 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 DependencyEntry = {
10
11
  name: string;
11
12
  version: string;
12
13
  dependencies: DependencyEntry[];
14
+ hashes?: Array<{
15
+ alg: string;
16
+ content: string;
17
+ }>;
13
18
  };
14
19
  /**
15
20
  * @param {string} manifestName - the subject manifest name-type
@@ -5,13 +5,14 @@ import Sbom from '../sbom.js';
5
5
  import { environmentVariableIsPopulated, getCustom, getCustomPath, invokeCommand } from "../tools.js";
6
6
  import Python_controller from './python_controller.js';
7
7
  import { getParser, getIgnoreQuery, getPinnedVersionQuery } from './requirements_parser.js';
8
- export default { isSupported, validateLockFile, provideComponent, provideStack, readLicenseFromManifest };
9
- /** @typedef {{name: string, version: string, dependencies: DependencyEntry[]}} DependencyEntry */
8
+ export default { isSupported, validateLockFile, provideComponent, provideStack, readLicenseFromManifest, packageManagerName() { return 'pip'; } };
9
+ /** @typedef {{name: string, version: string, dependencies: DependencyEntry[], hashes?: Array<{alg: string, content: string}>}} DependencyEntry */
10
10
  /**
11
11
  * @type {string} ecosystem for python-pip is 'pip'
12
12
  * @private
13
13
  */
14
14
  const ecosystem = 'pip';
15
+ const NO_SCOPE = undefined;
15
16
  /**
16
17
  * @param {string} manifestName - the subject manifest name-type
17
18
  * @returns {boolean} - return true if `requirements.txt` is the manifest name-type
@@ -56,7 +57,6 @@ async function provideComponent(manifest, opts = {}) {
56
57
  contentType: 'application/vnd.cyclonedx+json'
57
58
  };
58
59
  }
59
- /** @typedef {{name: string, , version: string, dependencies: DependencyEntry[]}} DependencyEntry */
60
60
  /**
61
61
  *
62
62
  * @param {PackageURL}source
@@ -66,7 +66,7 @@ async function provideComponent(manifest, opts = {}) {
66
66
  */
67
67
  function addAllDependencies(source, dep, sbom) {
68
68
  let targetPurl = toPurl(dep["name"], dep["version"]);
69
- sbom.addDependency(source, targetPurl);
69
+ sbom.addDependency(source, targetPurl, NO_SCOPE, dep["hashes"]);
70
70
  let directDeps = dep["dependencies"];
71
71
  if (directDeps !== undefined && directDeps.length > 0) {
72
72
  directDeps.forEach((dependency) => { addAllDependencies(toPurl(dep["name"], dep["version"]), dependency, sbom); });
@@ -202,7 +202,7 @@ async function getSbomForComponentAnalysis(manifest, opts = {}) {
202
202
  const license = readLicenseFromManifest(manifest);
203
203
  sbom.addRoot(rootPurl, license);
204
204
  dependencies.forEach(dep => {
205
- sbom.addDependency(rootPurl, toPurl(dep.name, dep.version));
205
+ sbom.addDependency(rootPurl, toPurl(dep.name, dep.version), NO_SCOPE, dep.hashes);
206
206
  });
207
207
  await handleIgnoredDependencies(manifest, sbom, opts);
208
208
  // In python there is no root component, then we must remove the dummy root we added, so the sbom json will be accepted by the DA backend
@@ -76,7 +76,9 @@ export default class Python_pip_pyproject extends Base_pyproject {
76
76
  let name = pkg.metadata.name;
77
77
  let version = pkg.metadata.version;
78
78
  let key = this._canonicalize(name);
79
- graph.set(key, { name, version, children: [] });
79
+ let sha256 = pkg.download_info?.archive_info?.hashes?.sha256;
80
+ let hashes = sha256 ? [{ alg: "SHA-256", content: sha256 }] : undefined;
81
+ graph.set(key, { name, version, children: [], hashes });
80
82
  }
81
83
  for (let pkg of nonRootPackages) {
82
84
  let key = this._canonicalize(pkg.metadata.name);
@@ -1,4 +1,19 @@
1
1
  export default class Python_poetry extends Base_pyproject {
2
+ /**
3
+ * @param {string} manifestDir
4
+ * @param {string} _workspaceDir - unused (poetry has no workspace support)
5
+ * @param {object} parsed - parsed pyproject.toml
6
+ * @param {Object} opts
7
+ * @returns {Promise<{directDeps: string[], graph: Map<string, {name: string, version: string, children: string[]}>}>}
8
+ */
9
+ _getDependencyData(manifestDir: string, _workspaceDir: string, parsed: object, opts: any): Promise<{
10
+ directDeps: string[];
11
+ graph: Map<string, {
12
+ name: string;
13
+ version: string;
14
+ children: string[];
15
+ }>;
16
+ }>;
2
17
  /**
3
18
  * Get poetry show --tree output.
4
19
  * @param {string} manifestDir
@@ -22,16 +37,33 @@ export default class Python_poetry extends Base_pyproject {
22
37
  * @returns {Map<string, string>} canonical name -> version
23
38
  */
24
39
  _parsePoetryShowAll(output: string): Map<string, string>;
40
+ /**
41
+ * Collects PEP 508 marker expressions for direct and transitive deps.
42
+ * Direct markers come from pyproject.toml dependency strings, e.g.:
43
+ * "pywin32>=311 ; sys_platform == 'win32'" → directMarkers['pywin32'] = "sys_platform == 'win32'"
44
+ * Transitive markers come from poetry.lock [package.dependencies] entries, e.g.:
45
+ * colorama = {version = "*", markers = "sys_platform == 'win32'"}
46
+ * → transitiveMarkers['click']['colorama'] = "sys_platform == 'win32'"
47
+ * @param {string|null} lockDir
48
+ * @param {object} parsed - parsed pyproject.toml
49
+ * @returns {{directMarkers: Map<string, string>, transitiveMarkers: Map<string, Map<string, string>>}}
50
+ */
51
+ _extractMarkerData(lockDir: string | null, parsed: object): {
52
+ directMarkers: Map<string, string>;
53
+ transitiveMarkers: Map<string, Map<string, string>>;
54
+ };
25
55
  /**
26
56
  * Parse poetry show --tree output into a dependency graph structure.
27
- * Top-level lines (no indentation/tree chars) are direct deps: "name version description"
28
- * Indented lines are transitive deps with tree chars: "├── name >=constraint"
29
57
  *
30
58
  * @param {string} treeOutput
31
59
  * @param {Map<string, string>} versionMap - canonical name -> resolved version
60
+ * @param {{directMarkers: Map<string, string>, transitiveMarkers: Map<string, Map<string, string>>}} markerData
32
61
  * @returns {{directDeps: string[], graph: Map<string, {name: string, version: string, children: string[]}>}}
33
62
  */
34
- _parsePoetryTree(treeOutput: string, versionMap: Map<string, string>): {
63
+ _parsePoetryTree(treeOutput: string, versionMap: Map<string, string>, markerData: {
64
+ directMarkers: Map<string, string>;
65
+ transitiveMarkers: Map<string, Map<string, string>>;
66
+ }): {
35
67
  directDeps: string[];
36
68
  graph: Map<string, {
37
69
  name: string;
@@ -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).
@@ -43,7 +45,9 @@ export default class Python_poetry extends Base_pyproject {
43
45
  let treeOutput = this._getPoetryShowTreeOutput(manifestDir, hasDevGroup, opts);
44
46
  let showAllOutput = this._getPoetryShowAllOutput(manifestDir, opts);
45
47
  let versionMap = this._parsePoetryShowAll(showAllOutput);
46
- 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);
47
51
  }
48
52
  /**
49
53
  * Get poetry show --tree output.
@@ -98,16 +102,60 @@ export default class Python_poetry extends Base_pyproject {
98
102
  }
99
103
  return versions;
100
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>>}}
115
+ */
116
+ _extractMarkerData(lockDir, parsed) {
117
+ let directMarkers = new Map();
118
+ let transitiveMarkers = new Map();
119
+ // Extract markers from PEP 621 dependency strings: "name[extras]>=ver ; marker"
120
+ let deps = parsed.project?.dependencies || [];
121
+ for (let dep of deps) {
122
+ let m = dep.match(/^([A-Za-z0-9][A-Za-z0-9._-]*)\s*[^;]*;\s*(.+)$/);
123
+ if (m) {
124
+ directMarkers.set(this._canonicalize(m[1]), m[2].trim());
125
+ }
126
+ }
127
+ if (lockDir) {
128
+ let lockPath = path.join(lockDir, this._lockFileName());
129
+ if (fs.existsSync(lockPath)) {
130
+ let lockContent = fs.readFileSync(lockPath, 'utf-8');
131
+ let lock = parseToml(lockContent);
132
+ let packages = lock.package || [];
133
+ for (let pkg of packages) {
134
+ let pkgKey = this._canonicalize(pkg.name);
135
+ let pkgDeps = pkg.dependencies || {};
136
+ for (let [depName, depSpec] of Object.entries(pkgDeps)) {
137
+ let markers = typeof depSpec === 'object' && depSpec != null ? depSpec.markers : null;
138
+ if (markers) {
139
+ if (!transitiveMarkers.has(pkgKey)) {
140
+ transitiveMarkers.set(pkgKey, new Map());
141
+ }
142
+ transitiveMarkers.get(pkgKey).set(this._canonicalize(depName), markers);
143
+ }
144
+ }
145
+ }
146
+ }
147
+ }
148
+ return { directMarkers, transitiveMarkers };
149
+ }
101
150
  /**
102
151
  * Parse poetry show --tree output into a dependency graph structure.
103
- * Top-level lines (no indentation/tree chars) are direct deps: "name version description"
104
- * Indented lines are transitive deps with tree chars: "├── name >=constraint"
105
152
  *
106
153
  * @param {string} treeOutput
107
154
  * @param {Map<string, string>} versionMap - canonical name -> resolved version
155
+ * @param {{directMarkers: Map<string, string>, transitiveMarkers: Map<string, Map<string, string>>}} markerData
108
156
  * @returns {{directDeps: string[], graph: Map<string, {name: string, version: string, children: string[]}>}}
109
157
  */
110
- _parsePoetryTree(treeOutput, versionMap) {
158
+ _parsePoetryTree(treeOutput, versionMap, markerData) {
111
159
  let lines = treeOutput.split(/\r?\n/);
112
160
  let graph = new Map();
113
161
  let directDeps = [];
@@ -123,6 +171,12 @@ export default class Python_poetry extends Base_pyproject {
123
171
  let name = topMatch[1];
124
172
  let version = topMatch[2];
125
173
  let key = this._canonicalize(name);
174
+ let marker = markerData.directMarkers.get(key);
175
+ if (marker && !evaluateMarker(marker)) {
176
+ currentDirectDep = null;
177
+ stack = [];
178
+ continue;
179
+ }
126
180
  directDeps.push(key);
127
181
  if (!graph.has(key)) {
128
182
  graph.set(key, { name, version, children: [] });
@@ -149,6 +203,20 @@ export default class Python_poetry extends Base_pyproject {
149
203
  // determine depth by counting tree-drawing groups in the prefix
150
204
  let prefix = line.substring(0, nameStart);
151
205
  let depth = (prefix.match(/(?:[├└│ ][\s─]{2} ?)/g) || []).length;
206
+ // pop stack back to find the parent at depth-1
207
+ while (stack.length > 0 && stack[stack.length - 1].depth >= depth) {
208
+ stack.pop();
209
+ }
210
+ let parentKey = stack.length > 0 ? stack[stack.length - 1].key : null;
211
+ if (parentKey) {
212
+ let parentMarkers = markerData.transitiveMarkers.get(parentKey);
213
+ if (parentMarkers) {
214
+ let marker = parentMarkers.get(depKey);
215
+ if (marker && !evaluateMarker(marker)) {
216
+ continue;
217
+ }
218
+ }
219
+ }
152
220
  // resolve version from the version map
153
221
  let version = versionMap.get(depKey) || null;
154
222
  if (!version) {
@@ -157,12 +225,7 @@ export default class Python_poetry extends Base_pyproject {
157
225
  if (!graph.has(depKey)) {
158
226
  graph.set(depKey, { name: depName, version, children: [] });
159
227
  }
160
- // pop stack back to find the parent at depth-1
161
- while (stack.length > 0 && stack[stack.length - 1].depth >= depth) {
162
- stack.pop();
163
- }
164
- if (stack.length > 0) {
165
- let parentKey = stack[stack.length - 1].key;
228
+ if (parentKey) {
166
229
  let parentEntry = graph.get(parentKey);
167
230
  if (parentEntry && !parentEntry.children.includes(depKey)) {
168
231
  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