@trustify-da/trustify-da-javascript-client 0.3.0-ea.1684e79 → 0.3.0-ea.1b02307

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 +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 +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 +5 -1
  38. package/dist/src/providers/rust_cargo.js +31 -4
  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
@@ -4,8 +4,9 @@ import { PackageURL } from 'packageurl-js';
4
4
  import { readLicenseFile } from '../license/license_utils.js';
5
5
  import Sbom from '../sbom.js';
6
6
  import { getCustom, getCustomPath, invokeCommand } from "../tools.js";
7
+ import { filterManifestPathsByDiscoveryIgnore, resolveWorkspaceDiscoveryIgnore } from '../workspace.js';
7
8
  import { getParser, getRequireQuery } from './gomod_parser.js';
8
- export default { isSupported, validateLockFile, provideComponent, provideStack, readLicenseFromManifest };
9
+ export default { isSupported, validateLockFile, provideComponent, provideStack, readLicenseFromManifest, packageManagerName() { return 'go'; } };
9
10
  /** @typedef {import('../provider').Provider} */
10
11
  /** @typedef {import('../provider').Provided} Provided */
11
12
  /** @typedef {{name: string, version: string}} Package */
@@ -328,13 +329,7 @@ function getFinalPackagesVersionsForModule(rows, manifestPath, goBin) {
328
329
  catch (error) {
329
330
  throw new Error('failed to list all modules', { cause: error });
330
331
  }
331
- let finalVersionModules = new Map();
332
- finalVersionsForAllModules.split(getLineSeparatorGolang()).filter(string => string.trim() !== "")
333
- .filter(string => string.trim().split(" ").length === 2)
334
- .forEach((dependency) => {
335
- let dep = dependency.split(" ");
336
- finalVersionModules[dep[0]] = dep[1];
337
- });
332
+ let finalVersionModules = parseModuleVersions(finalVersionsForAllModules);
338
333
  let finalVersionModulesArray = new Array();
339
334
  rows.filter(string => string.trim() !== "").forEach(module => {
340
335
  let child = getChildVertexFromEdge(module);
@@ -395,7 +390,69 @@ function getVersionOfPackage(fullPackage) {
395
390
  let parts = fullPackage.split("@");
396
391
  return parts.length > 1 ? parts[1] : undefined;
397
392
  }
393
+ function parseModuleVersions(goListOutput) {
394
+ let modules = {};
395
+ goListOutput.split(getLineSeparatorGolang()).filter(string => string.trim() !== "")
396
+ .forEach((line) => {
397
+ let parts = line.trim().split(" ");
398
+ if (parts.length === 2) {
399
+ modules[parts[0]] = parts[1];
400
+ }
401
+ else if (parts.length >= 4 && parts[2] === "=>") {
402
+ modules[parts[0]] = parts[parts.length - 1];
403
+ }
404
+ });
405
+ return modules;
406
+ }
398
407
  function getLineSeparatorGolang() {
399
408
  let reg = /\n|\r\n/;
400
409
  return reg;
401
410
  }
411
+ /**
412
+ * Discover all go.mod manifest paths in a Go workspace.
413
+ * Uses `go work edit -json` to get workspace members.
414
+ *
415
+ * @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain go.work)
416
+ * @param {import('../index.js').Options} [opts={}]
417
+ * @returns {Promise<string[]>} Paths to go.mod files (absolute)
418
+ */
419
+ export async function discoverGoWorkspaceModules(workspaceRoot, opts = {}) {
420
+ const root = path.resolve(workspaceRoot);
421
+ const goWork = path.join(root, 'go.work');
422
+ if (!fs.existsSync(goWork)) {
423
+ return [];
424
+ }
425
+ const goBin = getCustomPath('go', opts);
426
+ let output;
427
+ try {
428
+ output = invokeCommand(goBin, ['work', 'edit', '-json', goWork], { cwd: root });
429
+ }
430
+ catch {
431
+ return [];
432
+ }
433
+ let workspace;
434
+ try {
435
+ workspace = JSON.parse(output.toString().trim());
436
+ }
437
+ catch {
438
+ return [];
439
+ }
440
+ const useEntries = workspace.Use || [];
441
+ if (useEntries.length === 0) {
442
+ return [];
443
+ }
444
+ const manifestPaths = [];
445
+ for (const entry of useEntries) {
446
+ const diskPath = entry.DiskPath;
447
+ if (!diskPath) {
448
+ continue;
449
+ }
450
+ const moduleDir = path.resolve(root, diskPath);
451
+ const goMod = path.join(moduleDir, 'go.mod');
452
+ if (fs.existsSync(goMod)) {
453
+ manifestPaths.push(goMod);
454
+ }
455
+ }
456
+ const ignorePatterns = resolveWorkspaceDiscoveryIgnore(opts);
457
+ return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns);
458
+ }
@@ -1,3 +1,22 @@
1
+ /**
2
+ * Discover all build.gradle[.kts] manifest paths in a Gradle multi-project build.
3
+ * Uses a custom init script to get structured project listing.
4
+ *
5
+ * @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain settings.gradle[.kts])
6
+ * @param {import('../index.js').Options} [opts={}]
7
+ * @returns {Promise<string[]>} Paths to build.gradle[.kts] files (absolute)
8
+ */
9
+ export function discoverGradleSubprojects(workspaceRoot: string, opts?: import("../index.js").Options): Promise<string[]>;
10
+ /**
11
+ * Parse the structured output from the Gradle init script.
12
+ *
13
+ * @param {string} raw - Raw stdout from gradle
14
+ * @returns {{ path: string, dir: string }[]}
15
+ */
16
+ export function parseGradleInitScriptOutput(raw: string): {
17
+ path: string;
18
+ dir: string;
19
+ }[];
1
20
  /**
2
21
  * This class provides common functionality for Groovy and Kotlin DSL files.
3
22
  */
@@ -1,9 +1,13 @@
1
+ import crypto from 'node:crypto';
1
2
  import fs from 'node:fs';
3
+ import os from 'node:os';
2
4
  import path from 'node:path';
3
5
  import { EOL } from 'os';
4
- import TOML from 'fast-toml';
6
+ import { parse as parseToml } from 'smol-toml';
5
7
  import { readLicenseFile } from '../license/license_utils.js';
6
8
  import Sbom from '../sbom.js';
9
+ import { invokeCommand } from '../tools.js';
10
+ import { filterManifestPathsByDiscoveryIgnore, resolveWorkspaceDiscoveryIgnore } from '../workspace.js';
7
11
  import Base_java, { ecosystem_gradle } from "./base_java.js";
8
12
  /** @typedef {import('../provider.js').Provider} */
9
13
  /** @typedef {import('../provider.js').Provided} Provided */
@@ -362,7 +366,7 @@ export default class Java_gradle extends Base_java {
362
366
  // Read and parse the TOML file
363
367
  let pathOfToml = path.join(path.dirname(manifestPath), "gradle", "libs.versions.toml");
364
368
  const tomlString = fs.readFileSync(pathOfToml).toString();
365
- let tomlObject = TOML.parse(tomlString);
369
+ let tomlObject = parseToml(tomlString);
366
370
  let groupPlusArtifactObject = tomlObject.libraries[alias];
367
371
  let parts = groupPlusArtifactObject.module.split(":");
368
372
  let groupId = parts[0];
@@ -407,3 +411,113 @@ export default class Java_gradle extends Base_java {
407
411
  return undefined;
408
412
  }
409
413
  }
414
+ const DEFAULT_GRADLE_DISCOVERY_IGNORE = [
415
+ '**/build/**',
416
+ '**/.gradle/**',
417
+ ];
418
+ /** Gradle init script that emits structured project listing. */
419
+ const GRADLE_INIT_SCRIPT = `allprojects {
420
+ task daListProjects {
421
+ doLast {
422
+ println "::DA_PROJECT::\${project.path}::\${project.projectDir}"
423
+ }
424
+ }
425
+ }
426
+ `;
427
+ /**
428
+ * Discover all build.gradle[.kts] manifest paths in a Gradle multi-project build.
429
+ * Uses a custom init script to get structured project listing.
430
+ *
431
+ * @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain settings.gradle[.kts])
432
+ * @param {import('../index.js').Options} [opts={}]
433
+ * @returns {Promise<string[]>} Paths to build.gradle[.kts] files (absolute)
434
+ */
435
+ export async function discoverGradleSubprojects(workspaceRoot, opts = {}) {
436
+ const root = path.resolve(workspaceRoot);
437
+ const hasSettings = fs.existsSync(path.join(root, 'settings.gradle'))
438
+ || fs.existsSync(path.join(root, 'settings.gradle.kts'));
439
+ if (!hasSettings) {
440
+ return [];
441
+ }
442
+ const manifestPaths = [];
443
+ const rootBuildKts = path.join(root, 'build.gradle.kts');
444
+ const rootBuild = path.join(root, 'build.gradle');
445
+ const rootManifest = fs.existsSync(rootBuildKts) ? rootBuildKts : fs.existsSync(rootBuild) ? rootBuild : null;
446
+ if (rootManifest) {
447
+ manifestPaths.push(rootManifest);
448
+ }
449
+ let gradleBin;
450
+ try {
451
+ gradleBin = new Java_gradle().selectToolBinary(rootManifest || rootBuild, opts);
452
+ }
453
+ catch {
454
+ const ignorePatterns = [...resolveWorkspaceDiscoveryIgnore(opts), ...DEFAULT_GRADLE_DISCOVERY_IGNORE];
455
+ return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns);
456
+ }
457
+ const initScriptPath = path.join(os.tmpdir(), `da-list-projects-${crypto.randomUUID()}.gradle`);
458
+ try {
459
+ fs.writeFileSync(initScriptPath, GRADLE_INIT_SCRIPT);
460
+ let output;
461
+ try {
462
+ output = invokeCommand(gradleBin, [
463
+ '-q', '--no-daemon',
464
+ '--init-script', initScriptPath,
465
+ 'daListProjects',
466
+ ], { cwd: root });
467
+ }
468
+ catch {
469
+ const ignorePatterns = [...resolveWorkspaceDiscoveryIgnore(opts), ...DEFAULT_GRADLE_DISCOVERY_IGNORE];
470
+ return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns);
471
+ }
472
+ const projects = parseGradleInitScriptOutput(output.toString());
473
+ for (const proj of projects) {
474
+ if (proj.path === ':') {
475
+ continue;
476
+ }
477
+ const projDir = path.resolve(proj.dir);
478
+ const buildKts = path.join(projDir, 'build.gradle.kts');
479
+ const buildGroovy = path.join(projDir, 'build.gradle');
480
+ if (fs.existsSync(buildKts)) {
481
+ manifestPaths.push(buildKts);
482
+ }
483
+ else if (fs.existsSync(buildGroovy)) {
484
+ manifestPaths.push(buildGroovy);
485
+ }
486
+ }
487
+ }
488
+ finally {
489
+ try {
490
+ fs.unlinkSync(initScriptPath);
491
+ }
492
+ catch { /* ignore */ }
493
+ }
494
+ const ignorePatterns = [...resolveWorkspaceDiscoveryIgnore(opts), ...DEFAULT_GRADLE_DISCOVERY_IGNORE];
495
+ return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns);
496
+ }
497
+ /**
498
+ * Parse the structured output from the Gradle init script.
499
+ *
500
+ * @param {string} raw - Raw stdout from gradle
501
+ * @returns {{ path: string, dir: string }[]}
502
+ */
503
+ export function parseGradleInitScriptOutput(raw) {
504
+ const projects = [];
505
+ for (const rawLine of raw.split('\n')) {
506
+ const line = rawLine.trimEnd();
507
+ if (!line.startsWith('::DA_PROJECT::')) {
508
+ continue;
509
+ }
510
+ const prefix = '::DA_PROJECT::';
511
+ const remainder = line.substring(prefix.length);
512
+ const lastSep = remainder.lastIndexOf('::');
513
+ if (lastSep < 0) {
514
+ continue;
515
+ }
516
+ const projPath = remainder.substring(0, lastSep);
517
+ const dir = remainder.substring(lastSep + 2);
518
+ if (projPath && dir) {
519
+ projects.push({ path: projPath, dir });
520
+ }
521
+ }
522
+ return projects;
523
+ }
@@ -1,3 +1,11 @@
1
+ /**
2
+ * Discover all pom.xml manifest paths in a Maven multi-module project.
3
+ *
4
+ * @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain pom.xml)
5
+ * @param {object} [opts={}]
6
+ * @returns {Promise<string[]>} Paths to pom.xml files (absolute)
7
+ */
8
+ export function discoverMavenModules(workspaceRoot: string, opts?: object): Promise<string[]>;
1
9
  /** @typedef {import('../provider').Provider} */
2
10
  /** @typedef {import('../provider').Provided} Provided */
3
11
  /** @typedef {{name: string, version: string}} Package */
@@ -5,7 +5,8 @@ import { EOL } from 'os';
5
5
  import { XMLParser } from 'fast-xml-parser';
6
6
  import { getLicense } from '../license/license_utils.js';
7
7
  import Sbom from '../sbom.js';
8
- import { getCustom } from '../tools.js';
8
+ import { getCustom, invokeCommand } from '../tools.js';
9
+ import { filterManifestPathsByDiscoveryIgnore, resolveWorkspaceDiscoveryIgnore } from '../workspace.js';
9
10
  import Base_java, { ecosystem_maven } from "./base_java.js";
10
11
  /** @typedef {import('../provider').Provider} */
11
12
  /** @typedef {import('../provider').Provided} Provided */
@@ -289,3 +290,94 @@ export default class Java_maven extends Base_java {
289
290
  return deps.filter(d => dep.artifactId === d.artifactId && dep.groupId === d.groupId && dep.scope === d.scope).length > 0;
290
291
  }
291
292
  }
293
+ const DEFAULT_MAVEN_DISCOVERY_IGNORE = [
294
+ '**/target/**',
295
+ ];
296
+ /**
297
+ * Discover all pom.xml manifest paths in a Maven multi-module project.
298
+ *
299
+ * @param {string} workspaceRoot - Absolute or relative path to workspace root (must contain pom.xml)
300
+ * @param {object} [opts={}]
301
+ * @returns {Promise<string[]>} Paths to pom.xml files (absolute)
302
+ */
303
+ export async function discoverMavenModules(workspaceRoot, opts = {}) {
304
+ const root = path.resolve(workspaceRoot);
305
+ const rootPom = path.join(root, 'pom.xml');
306
+ if (!fs.existsSync(rootPom)) {
307
+ return [];
308
+ }
309
+ let mvnBin;
310
+ try {
311
+ mvnBin = new Java_maven().selectToolBinary(rootPom, opts);
312
+ }
313
+ catch {
314
+ return [rootPom];
315
+ }
316
+ const visited = new Set();
317
+ const manifestPaths = [rootPom];
318
+ collectMavenModules(root, mvnBin, visited, manifestPaths);
319
+ const ignorePatterns = [...resolveWorkspaceDiscoveryIgnore(opts), ...DEFAULT_MAVEN_DISCOVERY_IGNORE];
320
+ return filterManifestPathsByDiscoveryIgnore(manifestPaths, root, ignorePatterns);
321
+ }
322
+ /**
323
+ * @param {string} dir - Absolute path to directory containing pom.xml
324
+ * @param {string} mvnBin - Maven binary path
325
+ * @param {Set<string>} visited - Already-visited directories (cycle guard)
326
+ * @param {string[]} manifestPaths - Accumulator for discovered pom.xml paths
327
+ */
328
+ function collectMavenModules(dir, mvnBin, visited, manifestPaths) {
329
+ const resolvedDir = path.resolve(dir);
330
+ if (visited.has(resolvedDir)) {
331
+ return;
332
+ }
333
+ visited.add(resolvedDir);
334
+ const modules = listMavenModules(resolvedDir, mvnBin);
335
+ for (const mod of modules) {
336
+ const moduleDir = path.resolve(resolvedDir, mod);
337
+ const modulePom = path.join(moduleDir, 'pom.xml');
338
+ if (fs.existsSync(modulePom)) {
339
+ manifestPaths.push(modulePom);
340
+ collectMavenModules(moduleDir, mvnBin, visited, manifestPaths);
341
+ }
342
+ }
343
+ }
344
+ /**
345
+ * @param {string} dir - Directory containing pom.xml
346
+ * @param {string} mvnBin - Maven binary path
347
+ * @returns {string[]} Module directory names (relative to `dir`)
348
+ */
349
+ function listMavenModules(dir, mvnBin) {
350
+ let output;
351
+ try {
352
+ output = invokeCommand(mvnBin, [
353
+ 'help:evaluate',
354
+ '-Dexpression=project.modules',
355
+ '-q',
356
+ '-DforceStdout',
357
+ '-f', path.join(dir, 'pom.xml'),
358
+ '--batch-mode',
359
+ ], { cwd: dir });
360
+ }
361
+ catch {
362
+ return [];
363
+ }
364
+ const raw = output.toString().trim();
365
+ if (!raw || raw.startsWith('<modules')) {
366
+ return [];
367
+ }
368
+ return parseMavenModuleList(raw);
369
+ }
370
+ /**
371
+ * @param {string} raw - Raw stdout from mvn help:evaluate -DforceStdout
372
+ * @returns {string[]}
373
+ */
374
+ function parseMavenModuleList(raw) {
375
+ const parser = new XMLParser();
376
+ const parsed = parser.parse(raw);
377
+ const entries = parsed?.strings?.string;
378
+ if (!entries) {
379
+ return [];
380
+ }
381
+ const list = Array.isArray(entries) ? entries : [entries];
382
+ return list.map(s => String(s).trim()).filter(Boolean);
383
+ }
@@ -0,0 +1,10 @@
1
+ export default class Javascript_bun extends Base_javascript {
2
+ _listCmdArgs(): void;
3
+ _buildDependencyTree(includeTransitive: any, opts?: {}): {
4
+ name: any;
5
+ version: any;
6
+ dependencies: {};
7
+ };
8
+ #private;
9
+ }
10
+ import Base_javascript from './base_javascript.js';
@@ -0,0 +1,100 @@
1
+ import fs from 'node:fs';
2
+ import path from 'node:path';
3
+ import { parse } from 'jsonc-parser';
4
+ import Base_javascript from './base_javascript.js';
5
+ export default class Javascript_bun extends Base_javascript {
6
+ _lockFileName() {
7
+ return "bun.lock";
8
+ }
9
+ _cmdName() {
10
+ return "bun";
11
+ }
12
+ _listCmdArgs() {
13
+ throw new Error("not supported by Bun");
14
+ }
15
+ _updateLockFileCmdArgs() {
16
+ return ['install', '--lockfile-only'];
17
+ }
18
+ _buildDependencyTree(includeTransitive, opts = {}) {
19
+ this._version();
20
+ const manifestDir = path.dirname(this._getManifest().manifestPath);
21
+ const lockDir = this._findLockFileDir(manifestDir, opts) || manifestDir;
22
+ this._createLockFile(lockDir);
23
+ const lockContent = fs.readFileSync(path.join(lockDir, 'bun.lock'), 'utf-8');
24
+ const lockData = parse(lockContent);
25
+ const packages = lockData.packages || {};
26
+ const memberName = this._getManifest().name;
27
+ const workspaceEntry = this.#findWorkspaceEntry(lockData, lockDir, manifestDir, memberName);
28
+ const directDeps = workspaceEntry?.dependencies || {};
29
+ const tree = { name: memberName, version: this._getManifest().version, dependencies: {} };
30
+ const visited = new Set();
31
+ for (const depName of Object.keys(directDeps)) {
32
+ const resolved = this.#resolvePackage(depName, '', packages);
33
+ if (resolved) {
34
+ tree.dependencies[depName] = this.#buildNode(depName, resolved, packages, includeTransitive, visited);
35
+ }
36
+ }
37
+ return tree;
38
+ }
39
+ #findWorkspaceEntry(lockData, lockDir, manifestDir, memberName) {
40
+ const workspaces = lockData.workspaces || {};
41
+ const relPath = path.relative(lockDir, path.resolve(manifestDir));
42
+ if (!relPath || relPath === '.') {
43
+ return workspaces[''] || {};
44
+ }
45
+ const normalised = relPath.split(path.sep).join('/');
46
+ if (workspaces[normalised]) {
47
+ return workspaces[normalised];
48
+ }
49
+ for (const [wsPath, entry] of Object.entries(workspaces)) {
50
+ if (entry.name === memberName && wsPath !== '') {
51
+ return entry;
52
+ }
53
+ }
54
+ return workspaces[''] || {};
55
+ }
56
+ #resolvePackage(depName, parentKey, packages) {
57
+ if (parentKey) {
58
+ const scopedKey = `${parentKey}/${depName}`;
59
+ if (packages[scopedKey]) {
60
+ return packages[scopedKey];
61
+ }
62
+ }
63
+ return packages[depName] || null;
64
+ }
65
+ #buildNode(depName, resolved, packages, includeTransitive, visited) {
66
+ const resolvedId = Array.isArray(resolved) ? resolved[0] : resolved;
67
+ const version = this.#extractVersion(resolvedId);
68
+ const node = { version };
69
+ if (!includeTransitive) {
70
+ return node;
71
+ }
72
+ const metadata = Array.isArray(resolved) ? (resolved[2] || {}) : {};
73
+ const subDeps = metadata.dependencies || {};
74
+ if (Object.keys(subDeps).length > 0) {
75
+ const visitKey = `${depName}@${version}`;
76
+ if (visited.has(visitKey)) {
77
+ return node;
78
+ }
79
+ visited.add(visitKey);
80
+ node.dependencies = {};
81
+ for (const subName of Object.keys(subDeps)) {
82
+ const subResolved = this.#resolvePackage(subName, depName, packages);
83
+ if (subResolved) {
84
+ node.dependencies[subName] = this.#buildNode(subName, subResolved, packages, true, visited);
85
+ }
86
+ }
87
+ }
88
+ return node;
89
+ }
90
+ #extractVersion(resolvedId) {
91
+ if (typeof resolvedId !== 'string') {
92
+ return '0.0.0';
93
+ }
94
+ const atIdx = resolvedId.lastIndexOf('@');
95
+ if (atIdx > 0) {
96
+ return resolvedId.substring(atIdx + 1);
97
+ }
98
+ return '0.0.0';
99
+ }
100
+ }
@@ -1,4 +1,5 @@
1
1
  export default class Javascript_npm extends Base_javascript {
2
2
  _listCmdArgs(includeTransitive: any): string[];
3
+ _buildDependencyTree(includeTransitive: any, opts?: {}): any;
3
4
  }
4
5
  import Base_javascript from './base_javascript.js';
@@ -12,4 +12,25 @@ export default class Javascript_npm extends Base_javascript {
12
12
  _updateLockFileCmdArgs() {
13
13
  return ['install', '--package-lock-only'];
14
14
  }
15
+ _buildDependencyTree(includeTransitive, opts = {}) {
16
+ // npm ls --json returns a single tree rooted at the workspace root.
17
+ // When analyzing a workspace member, its deps are nested under the
18
+ // root's dependencies keyed by the member name — extract that subtree
19
+ // so downstream analysis sees only the member's dependencies.
20
+ const tree = super._buildDependencyTree(includeTransitive, opts);
21
+ const memberName = this._getManifest().name;
22
+ if (tree.name === memberName) {
23
+ return tree;
24
+ }
25
+ const memberEntry = tree.dependencies?.[memberName];
26
+ if (memberEntry) {
27
+ return {
28
+ name: memberName,
29
+ version: memberEntry.version || this._getManifest().version,
30
+ dependencies: memberEntry.dependencies,
31
+ optionalDependencies: memberEntry.optionalDependencies,
32
+ };
33
+ }
34
+ return tree;
35
+ }
15
36
  }
@@ -7,15 +7,19 @@ export default class Javascript_pnpm extends Base_javascript {
7
7
  return "pnpm";
8
8
  }
9
9
  _listCmdArgs(includeTransitive) {
10
- return ['ls', includeTransitive ? '--depth=Infinity' : '--depth=0', '--prod', '--json'];
10
+ return ['ls', includeTransitive ? '--depth=Infinity' : '--depth=0', '--prod', '--json', '-r'];
11
11
  }
12
12
  _updateLockFileCmdArgs() {
13
13
  return ['install', '--frozen-lockfile'];
14
14
  }
15
15
  _buildDependencyTree(includeTransitive, opts = {}) {
16
+ // pnpm ls --json returns an array with one entry per workspace package.
17
+ // When analyzing a workspace member, find its entry by name instead of
18
+ // blindly taking the first element (which is the workspace root).
16
19
  const tree = super._buildDependencyTree(includeTransitive, opts);
17
20
  if (Array.isArray(tree) && tree.length > 0) {
18
- return tree[0];
21
+ const memberName = this._getManifest().name;
22
+ return tree.find(pkg => pkg.name === memberName) || tree[0];
19
23
  }
20
24
  return {};
21
25
  }
@@ -0,0 +1,14 @@
1
+ /**
2
+ * Maps Node.js/OS values to PEP 508 marker variables.
3
+ * Example: on Linux, sys_platform='linux', platform_system='Linux', os_name='posix'
4
+ * @returns {Record<string, string>}
5
+ */
6
+ export function getEnvironmentMarkers(): Record<string, string>;
7
+ /**
8
+ * Evaluates a full PEP 508 marker expression against the current platform.
9
+ * Example: "sys_platform == 'win32' and python_version >= '3.8'" → false on Linux
10
+ * Empty/missing markers return true (unconditional dependency).
11
+ * @param {string} markerExpr
12
+ * @returns {boolean}
13
+ */
14
+ export function evaluateMarker(markerExpr: string): boolean;