@trustify-da/trustify-da-javascript-client 0.3.0-ea.d84439a → 0.3.0-ea.d9c1ae4
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.
- package/dist/src/provider.js +2 -0
- package/dist/src/providers/base_pyproject.d.ts +4 -25
- package/dist/src/providers/base_pyproject.js +48 -72
- package/dist/src/providers/javascript_npm.d.ts +1 -0
- package/dist/src/providers/javascript_npm.js +21 -0
- package/dist/src/providers/javascript_pnpm.js +6 -2
- package/dist/src/providers/processors/yarn_berry_processor.js +6 -2
- package/dist/src/providers/python_controller.js +7 -3
- package/dist/src/providers/python_pip_pyproject.d.ts +61 -0
- package/dist/src/providers/python_pip_pyproject.js +144 -0
- package/dist/src/providers/python_poetry.d.ts +2 -1
- package/dist/src/providers/python_poetry.js +9 -3
- package/dist/src/providers/python_uv.js +4 -1
- package/package.json +1 -1
package/dist/src/provider.js
CHANGED
|
@@ -7,6 +7,7 @@ import Javascript_npm from './providers/javascript_npm.js';
|
|
|
7
7
|
import Javascript_pnpm from './providers/javascript_pnpm.js';
|
|
8
8
|
import Javascript_yarn from './providers/javascript_yarn.js';
|
|
9
9
|
import pythonPipProvider from './providers/python_pip.js';
|
|
10
|
+
import Python_pip_pyproject from './providers/python_pip_pyproject.js';
|
|
10
11
|
import Python_poetry from './providers/python_poetry.js';
|
|
11
12
|
import Python_uv from './providers/python_uv.js';
|
|
12
13
|
import rustCargoProvider from './providers/rust_cargo.js';
|
|
@@ -27,6 +28,7 @@ export const availableProviders = [
|
|
|
27
28
|
pythonPipProvider,
|
|
28
29
|
new Python_poetry(),
|
|
29
30
|
new Python_uv(),
|
|
31
|
+
new Python_pip_pyproject(),
|
|
30
32
|
rustCargoProvider
|
|
31
33
|
];
|
|
32
34
|
/**
|
|
@@ -102,26 +102,14 @@ export default class Base_pyproject {
|
|
|
102
102
|
*/
|
|
103
103
|
protected _getIgnoredDeps(manifestPath: string): Set<string>;
|
|
104
104
|
/**
|
|
105
|
-
*
|
|
105
|
+
* Compute the set of graph nodes reachable from direct deps, excluding ignored.
|
|
106
106
|
* @param {Map<string, GraphEntry>} graph
|
|
107
|
-
* @param {string[]} directDeps
|
|
107
|
+
* @param {string[]} directDeps
|
|
108
108
|
* @param {Set<string>} ignoredDeps
|
|
109
|
-
* @
|
|
110
|
-
* @returns {DepTreeEntry[]}
|
|
111
|
-
* @protected
|
|
112
|
-
*/
|
|
113
|
-
protected _buildDependencyTree(graph: Map<string, GraphEntry>, directDeps: string[], ignoredDeps: Set<string>, includeTransitive: boolean): DepTreeEntry[];
|
|
114
|
-
/**
|
|
115
|
-
* Recursively collect transitive dependencies.
|
|
116
|
-
* @param {Map<string, GraphEntry>} graph
|
|
117
|
-
* @param {string[]} childKeys
|
|
118
|
-
* @param {DepTreeEntry[]} result - mutated in place
|
|
119
|
-
* @param {Set<string>} ignoredDeps
|
|
120
|
-
* @param {Set<string>} visited
|
|
121
|
-
* @returns {void}
|
|
109
|
+
* @returns {Set<string>}
|
|
122
110
|
* @protected
|
|
123
111
|
*/
|
|
124
|
-
protected
|
|
112
|
+
protected _reachableNodes(graph: Map<string, GraphEntry>, directDeps: string[], ignoredDeps: Set<string>): Set<string>;
|
|
125
113
|
/**
|
|
126
114
|
* @param {string} name
|
|
127
115
|
* @param {string} version
|
|
@@ -129,15 +117,6 @@ export default class Base_pyproject {
|
|
|
129
117
|
* @protected
|
|
130
118
|
*/
|
|
131
119
|
protected _toPurl(name: string, version: string): PackageURL;
|
|
132
|
-
/**
|
|
133
|
-
* Recursively add a dependency and its transitive deps to the SBOM.
|
|
134
|
-
* @param {PackageURL} source
|
|
135
|
-
* @param {DepTreeEntry} dep
|
|
136
|
-
* @param {Sbom} sbom
|
|
137
|
-
* @returns {void}
|
|
138
|
-
* @private
|
|
139
|
-
*/
|
|
140
|
-
private _addAllDependencies;
|
|
141
120
|
/**
|
|
142
121
|
* Create SBOM json string for a pyproject.toml project.
|
|
143
122
|
* @param {string} manifest - path to pyproject.toml
|
|
@@ -220,64 +220,29 @@ export default class Base_pyproject {
|
|
|
220
220
|
return ignored;
|
|
221
221
|
}
|
|
222
222
|
/**
|
|
223
|
-
*
|
|
223
|
+
* Compute the set of graph nodes reachable from direct deps, excluding ignored.
|
|
224
224
|
* @param {Map<string, GraphEntry>} graph
|
|
225
|
-
* @param {string[]} directDeps
|
|
225
|
+
* @param {string[]} directDeps
|
|
226
226
|
* @param {Set<string>} ignoredDeps
|
|
227
|
-
* @
|
|
228
|
-
* @returns {DepTreeEntry[]}
|
|
229
|
-
* @protected
|
|
230
|
-
*/
|
|
231
|
-
_buildDependencyTree(graph, directDeps, ignoredDeps, includeTransitive) {
|
|
232
|
-
let result = [];
|
|
233
|
-
for (let key of directDeps) {
|
|
234
|
-
if (ignoredDeps.has(key)) {
|
|
235
|
-
continue;
|
|
236
|
-
}
|
|
237
|
-
let entry = graph.get(key);
|
|
238
|
-
if (!entry) {
|
|
239
|
-
continue;
|
|
240
|
-
}
|
|
241
|
-
let depTree = [];
|
|
242
|
-
if (includeTransitive) {
|
|
243
|
-
let visited = new Set();
|
|
244
|
-
visited.add(key);
|
|
245
|
-
this._collectTransitive(graph, entry.children, depTree, ignoredDeps, visited);
|
|
246
|
-
}
|
|
247
|
-
result.push({ name: entry.name, version: entry.version, dependencies: depTree });
|
|
248
|
-
}
|
|
249
|
-
result.sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()));
|
|
250
|
-
return result;
|
|
251
|
-
}
|
|
252
|
-
/**
|
|
253
|
-
* Recursively collect transitive dependencies.
|
|
254
|
-
* @param {Map<string, GraphEntry>} graph
|
|
255
|
-
* @param {string[]} childKeys
|
|
256
|
-
* @param {DepTreeEntry[]} result - mutated in place
|
|
257
|
-
* @param {Set<string>} ignoredDeps
|
|
258
|
-
* @param {Set<string>} visited
|
|
259
|
-
* @returns {void}
|
|
227
|
+
* @returns {Set<string>}
|
|
260
228
|
* @protected
|
|
261
229
|
*/
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
if (visited.has(canonKey)) {
|
|
230
|
+
_reachableNodes(graph, directDeps, ignoredDeps) {
|
|
231
|
+
let reachable = new Set();
|
|
232
|
+
let queue = directDeps.filter(k => !ignoredDeps.has(k) && graph.has(k));
|
|
233
|
+
while (queue.length > 0) {
|
|
234
|
+
let key = queue.shift();
|
|
235
|
+
if (reachable.has(key)) {
|
|
269
236
|
continue;
|
|
270
237
|
}
|
|
271
|
-
|
|
272
|
-
let
|
|
273
|
-
|
|
274
|
-
|
|
238
|
+
reachable.add(key);
|
|
239
|
+
for (let child of graph.get(key).children) {
|
|
240
|
+
if (!ignoredDeps.has(child) && graph.has(child) && !reachable.has(child)) {
|
|
241
|
+
queue.push(child);
|
|
242
|
+
}
|
|
275
243
|
}
|
|
276
|
-
let childDeps = [];
|
|
277
|
-
this._collectTransitive(graph, entry.children, childDeps, ignoredDeps, visited);
|
|
278
|
-
result.push({ name: entry.name, version: entry.version, dependencies: childDeps });
|
|
279
244
|
}
|
|
280
|
-
|
|
245
|
+
return reachable;
|
|
281
246
|
}
|
|
282
247
|
/**
|
|
283
248
|
* @param {string} name
|
|
@@ -288,21 +253,6 @@ export default class Base_pyproject {
|
|
|
288
253
|
_toPurl(name, version) {
|
|
289
254
|
return new PackageURL('pypi', undefined, name, version, undefined, undefined);
|
|
290
255
|
}
|
|
291
|
-
/**
|
|
292
|
-
* Recursively add a dependency and its transitive deps to the SBOM.
|
|
293
|
-
* @param {PackageURL} source
|
|
294
|
-
* @param {DepTreeEntry} dep
|
|
295
|
-
* @param {Sbom} sbom
|
|
296
|
-
* @returns {void}
|
|
297
|
-
* @private
|
|
298
|
-
*/
|
|
299
|
-
_addAllDependencies(source, dep, sbom) {
|
|
300
|
-
let targetPurl = this._toPurl(dep.name, dep.version);
|
|
301
|
-
sbom.addDependency(source, targetPurl);
|
|
302
|
-
if (dep.dependencies && dep.dependencies.length > 0) {
|
|
303
|
-
dep.dependencies.forEach(child => this._addAllDependencies(this._toPurl(dep.name, dep.version), child, sbom));
|
|
304
|
-
}
|
|
305
|
-
}
|
|
306
256
|
/**
|
|
307
257
|
* Create SBOM json string for a pyproject.toml project.
|
|
308
258
|
* @param {string} manifest - path to pyproject.toml
|
|
@@ -318,21 +268,47 @@ export default class Base_pyproject {
|
|
|
318
268
|
let workspaceDir = this._findLockFileDir(manifestDir, opts) || manifestDir;
|
|
319
269
|
let { directDeps, graph } = await this._getDependencyData(manifestDir, workspaceDir, parsed, opts);
|
|
320
270
|
let ignoredDeps = this._getIgnoredDeps(manifest);
|
|
321
|
-
let dependencies = this._buildDependencyTree(graph, directDeps, ignoredDeps, includeTransitive);
|
|
322
271
|
let sbom = new Sbom();
|
|
323
272
|
let rootName = this._getProjectName(parsed) || DEFAULT_ROOT_NAME;
|
|
324
273
|
let rootVersion = this._getProjectVersion(parsed) || DEFAULT_ROOT_VERSION;
|
|
325
274
|
let rootPurl = this._toPurl(rootName, rootVersion);
|
|
326
275
|
let license = this.readLicenseFromManifest(manifest);
|
|
327
276
|
sbom.addRoot(rootPurl, license);
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
277
|
+
if (includeTransitive) {
|
|
278
|
+
let reachable = this._reachableNodes(graph, directDeps, ignoredDeps);
|
|
279
|
+
for (let key of directDeps) {
|
|
280
|
+
if (!reachable.has(key)) {
|
|
281
|
+
continue;
|
|
282
|
+
}
|
|
283
|
+
let entry = graph.get(key);
|
|
284
|
+
sbom.addDependency(rootPurl, this._toPurl(entry.name, entry.version));
|
|
331
285
|
}
|
|
332
|
-
|
|
333
|
-
|
|
286
|
+
for (let [key, entry] of graph) {
|
|
287
|
+
if (!reachable.has(key)) {
|
|
288
|
+
continue;
|
|
289
|
+
}
|
|
290
|
+
let parentPurl = this._toPurl(entry.name, entry.version);
|
|
291
|
+
for (let child of entry.children) {
|
|
292
|
+
if (!reachable.has(child)) {
|
|
293
|
+
continue;
|
|
294
|
+
}
|
|
295
|
+
let childEntry = graph.get(child);
|
|
296
|
+
sbom.addDependency(parentPurl, this._toPurl(childEntry.name, childEntry.version));
|
|
297
|
+
}
|
|
334
298
|
}
|
|
335
|
-
}
|
|
299
|
+
}
|
|
300
|
+
else {
|
|
301
|
+
for (let key of directDeps) {
|
|
302
|
+
if (ignoredDeps.has(key)) {
|
|
303
|
+
continue;
|
|
304
|
+
}
|
|
305
|
+
let entry = graph.get(key);
|
|
306
|
+
if (!entry) {
|
|
307
|
+
continue;
|
|
308
|
+
}
|
|
309
|
+
sbom.addDependency(rootPurl, this._toPurl(entry.name, entry.version));
|
|
310
|
+
}
|
|
311
|
+
}
|
|
336
312
|
return sbom.getAsJsonString(opts);
|
|
337
313
|
}
|
|
338
314
|
}
|
|
@@ -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
|
-
|
|
21
|
+
const memberName = this._getManifest().name;
|
|
22
|
+
return tree.find(pkg => pkg.name === memberName) || tree[0];
|
|
19
23
|
}
|
|
20
24
|
return {};
|
|
21
25
|
}
|
|
@@ -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
|
-
|
|
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
|
-
|
|
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
|
|
@@ -95,7 +95,7 @@ export default class Python_controller {
|
|
|
95
95
|
}
|
|
96
96
|
/**
|
|
97
97
|
* Parse the requirements.txt file using tree-sitter and return structured requirement data.
|
|
98
|
-
* @return {Promise<{name: string, version: string|null}[]>}
|
|
98
|
+
* @return {Promise<{name: string, version: string|null, hasMarker: boolean}[]>}
|
|
99
99
|
*/
|
|
100
100
|
async #parseRequirements() {
|
|
101
101
|
const content = fs.readFileSync(this.pathToRequirements).toString();
|
|
@@ -107,7 +107,8 @@ export default class Python_controller {
|
|
|
107
107
|
const version = versionMatches.length > 0
|
|
108
108
|
? versionMatches[0].captures.find(c => c.name === 'version').node.text
|
|
109
109
|
: null;
|
|
110
|
-
|
|
110
|
+
const hasMarker = reqNode.children.some(c => c.type === 'marker_spec');
|
|
111
|
+
return { name, version, hasMarker };
|
|
111
112
|
}));
|
|
112
113
|
}
|
|
113
114
|
#decideIfWindowsOrLinuxPath(fileName) {
|
|
@@ -224,7 +225,10 @@ export default class Python_controller {
|
|
|
224
225
|
CachedEnvironmentDeps[packageName.replace("_", "-")] = pipDepTreeEntryForCache;
|
|
225
226
|
});
|
|
226
227
|
}
|
|
227
|
-
parsedRequirements.forEach(({ name: depName, version: manifestVersion }) => {
|
|
228
|
+
parsedRequirements.forEach(({ name: depName, version: manifestVersion, hasMarker }) => {
|
|
229
|
+
if (hasMarker && CachedEnvironmentDeps[depName.toLowerCase()] === undefined) {
|
|
230
|
+
return;
|
|
231
|
+
}
|
|
228
232
|
if (matchManifestVersions === "true" && manifestVersion != null) {
|
|
229
233
|
let installedVersion;
|
|
230
234
|
if (CachedEnvironmentDeps[depName.toLowerCase()] !== undefined) {
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Python provider for pyproject.toml files using PEP 621 format without a lock file.
|
|
3
|
+
* Uses `pip install --dry-run --ignore-installed --report` to resolve the full dependency tree.
|
|
4
|
+
* Acts as the fallback provider when no lock file (uv.lock/poetry.lock) is found.
|
|
5
|
+
*/
|
|
6
|
+
export default class Python_pip_pyproject extends Base_pyproject {
|
|
7
|
+
/**
|
|
8
|
+
* Always returns true — pip provider is the fallback when no lock file is found.
|
|
9
|
+
* @param {string} manifestDir
|
|
10
|
+
* @param {{}} [opts={}]
|
|
11
|
+
* @returns {boolean}
|
|
12
|
+
*/
|
|
13
|
+
validateLockFile(manifestDir: string, opts?: {}): boolean;
|
|
14
|
+
/**
|
|
15
|
+
* Get pip report output from env var override or by running pip.
|
|
16
|
+
* @param {string} manifestDir - directory containing pyproject.toml
|
|
17
|
+
* @param {{}} [opts={}]
|
|
18
|
+
* @returns {string} pip report JSON string
|
|
19
|
+
*/
|
|
20
|
+
_getPipReportOutput(manifestDir: string, opts?: {}): string;
|
|
21
|
+
/**
|
|
22
|
+
* Parse pip report JSON and build dependency graph.
|
|
23
|
+
* @param {string} reportJson - pip report JSON string
|
|
24
|
+
* @returns {{directDeps: string[], graph: Map<string, {name: string, version: string, children: string[]}>}}
|
|
25
|
+
*/
|
|
26
|
+
_parsePipReport(reportJson: string): {
|
|
27
|
+
directDeps: string[];
|
|
28
|
+
graph: Map<string, {
|
|
29
|
+
name: string;
|
|
30
|
+
version: string;
|
|
31
|
+
children: string[];
|
|
32
|
+
}>;
|
|
33
|
+
};
|
|
34
|
+
/**
|
|
35
|
+
* Check if a requires_dist entry is an extras-only dependency.
|
|
36
|
+
* @param {string} req - e.g. "PySocks!=1.5.7,>=1.5.6; extra == \"socks\""
|
|
37
|
+
* @returns {boolean}
|
|
38
|
+
*/
|
|
39
|
+
_hasExtraMarker(req: string): boolean;
|
|
40
|
+
/**
|
|
41
|
+
* Extract package name from a requires_dist entry.
|
|
42
|
+
* @param {string} req - e.g. "charset_normalizer<4,>=2"
|
|
43
|
+
* @returns {string|null}
|
|
44
|
+
*/
|
|
45
|
+
_extractDepName(req: string): string | null;
|
|
46
|
+
/**
|
|
47
|
+
* Resolve dependencies using pip install --dry-run --report.
|
|
48
|
+
* @param {string} manifestDir
|
|
49
|
+
* @param {string} _workspaceDir - unused (pip resolves from manifest directory)
|
|
50
|
+
* @param {object} parsed - parsed pyproject.toml
|
|
51
|
+
* @param {{}} [opts={}]
|
|
52
|
+
* @returns {Promise<{directDeps: string[], graph: Map}>}
|
|
53
|
+
*/
|
|
54
|
+
_getDependencyData(manifestDir: string, _workspaceDir: string, parsed: object, opts?: {}): Promise<{
|
|
55
|
+
directDeps: string[];
|
|
56
|
+
graph: Map<any, any>;
|
|
57
|
+
}>;
|
|
58
|
+
_findEggInfoDirs(dir: any): string[];
|
|
59
|
+
_cleanupEggInfo(dir: any, existing: any): void;
|
|
60
|
+
}
|
|
61
|
+
import Base_pyproject from './base_pyproject.js';
|
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { environmentVariableIsPopulated, getCustomPath, invokeCommand } from '../tools.js';
|
|
4
|
+
import Base_pyproject from './base_pyproject.js';
|
|
5
|
+
/**
|
|
6
|
+
* Python provider for pyproject.toml files using PEP 621 format without a lock file.
|
|
7
|
+
* Uses `pip install --dry-run --ignore-installed --report` to resolve the full dependency tree.
|
|
8
|
+
* Acts as the fallback provider when no lock file (uv.lock/poetry.lock) is found.
|
|
9
|
+
*/
|
|
10
|
+
export default class Python_pip_pyproject extends Base_pyproject {
|
|
11
|
+
/** @returns {string} */
|
|
12
|
+
_lockFileName() {
|
|
13
|
+
return '.pip-lock-nonexistent';
|
|
14
|
+
}
|
|
15
|
+
/** @returns {string} */
|
|
16
|
+
_cmdName() {
|
|
17
|
+
return 'pip';
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Always returns true — pip provider is the fallback when no lock file is found.
|
|
21
|
+
* @param {string} manifestDir
|
|
22
|
+
* @param {{}} [opts={}]
|
|
23
|
+
* @returns {boolean}
|
|
24
|
+
*/
|
|
25
|
+
// eslint-disable-next-line no-unused-vars
|
|
26
|
+
validateLockFile(manifestDir, opts = {}) {
|
|
27
|
+
return true;
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Get pip report output from env var override or by running pip.
|
|
31
|
+
* @param {string} manifestDir - directory containing pyproject.toml
|
|
32
|
+
* @param {{}} [opts={}]
|
|
33
|
+
* @returns {string} pip report JSON string
|
|
34
|
+
*/
|
|
35
|
+
_getPipReportOutput(manifestDir, opts) {
|
|
36
|
+
if (environmentVariableIsPopulated('TRUSTIFY_DA_PIP_REPORT')) {
|
|
37
|
+
return Buffer.from(process.env['TRUSTIFY_DA_PIP_REPORT'], 'base64').toString('ascii');
|
|
38
|
+
}
|
|
39
|
+
let pipBin = getCustomPath('pip3', opts);
|
|
40
|
+
try {
|
|
41
|
+
invokeCommand(pipBin, ['--version']);
|
|
42
|
+
}
|
|
43
|
+
catch {
|
|
44
|
+
pipBin = getCustomPath('pip', opts);
|
|
45
|
+
}
|
|
46
|
+
let eggInfoDirs = this._findEggInfoDirs(manifestDir);
|
|
47
|
+
let result = invokeCommand(pipBin, [
|
|
48
|
+
'install', '--dry-run', '--ignore-installed', '--quiet', '--report', '-', '.'
|
|
49
|
+
], { cwd: manifestDir }).toString();
|
|
50
|
+
this._cleanupEggInfo(manifestDir, eggInfoDirs);
|
|
51
|
+
return result;
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Parse pip report JSON and build dependency graph.
|
|
55
|
+
* @param {string} reportJson - pip report JSON string
|
|
56
|
+
* @returns {{directDeps: string[], graph: Map<string, {name: string, version: string, children: string[]}>}}
|
|
57
|
+
*/
|
|
58
|
+
_parsePipReport(reportJson) {
|
|
59
|
+
let report = JSON.parse(reportJson);
|
|
60
|
+
let packages = report.install || [];
|
|
61
|
+
let rootEntry = packages.find(p => p.download_info?.dir_info !== undefined);
|
|
62
|
+
let rootRequires = rootEntry?.metadata?.requires_dist || [];
|
|
63
|
+
let directDepNames = new Set();
|
|
64
|
+
for (let req of rootRequires) {
|
|
65
|
+
if (this._hasExtraMarker(req)) {
|
|
66
|
+
continue;
|
|
67
|
+
}
|
|
68
|
+
let name = this._extractDepName(req);
|
|
69
|
+
if (name) {
|
|
70
|
+
directDepNames.add(this._canonicalize(name));
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
let graph = new Map();
|
|
74
|
+
let nonRootPackages = packages.filter(p => p !== rootEntry);
|
|
75
|
+
for (let pkg of nonRootPackages) {
|
|
76
|
+
let name = pkg.metadata.name;
|
|
77
|
+
let version = pkg.metadata.version;
|
|
78
|
+
let key = this._canonicalize(name);
|
|
79
|
+
graph.set(key, { name, version, children: [] });
|
|
80
|
+
}
|
|
81
|
+
for (let pkg of nonRootPackages) {
|
|
82
|
+
let key = this._canonicalize(pkg.metadata.name);
|
|
83
|
+
let entry = graph.get(key);
|
|
84
|
+
let requires = pkg.metadata.requires_dist || [];
|
|
85
|
+
for (let req of requires) {
|
|
86
|
+
let depName = this._extractDepName(req);
|
|
87
|
+
if (!depName) {
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
90
|
+
let depKey = this._canonicalize(depName);
|
|
91
|
+
if (graph.has(depKey)) {
|
|
92
|
+
entry.children.push(depKey);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
let directDeps = [...directDepNames].filter(key => graph.has(key));
|
|
97
|
+
return { directDeps, graph };
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* Check if a requires_dist entry is an extras-only dependency.
|
|
101
|
+
* @param {string} req - e.g. "PySocks!=1.5.7,>=1.5.6; extra == \"socks\""
|
|
102
|
+
* @returns {boolean}
|
|
103
|
+
*/
|
|
104
|
+
_hasExtraMarker(req) {
|
|
105
|
+
return /;\s*.*extra\s*==/.test(req);
|
|
106
|
+
}
|
|
107
|
+
/**
|
|
108
|
+
* Extract package name from a requires_dist entry.
|
|
109
|
+
* @param {string} req - e.g. "charset_normalizer<4,>=2"
|
|
110
|
+
* @returns {string|null}
|
|
111
|
+
*/
|
|
112
|
+
_extractDepName(req) {
|
|
113
|
+
let match = req.match(/^([A-Za-z0-9]([A-Za-z0-9._-]*[A-Za-z0-9])?)/);
|
|
114
|
+
return match ? match[1] : null;
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* Resolve dependencies using pip install --dry-run --report.
|
|
118
|
+
* @param {string} manifestDir
|
|
119
|
+
* @param {string} _workspaceDir - unused (pip resolves from manifest directory)
|
|
120
|
+
* @param {object} parsed - parsed pyproject.toml
|
|
121
|
+
* @param {{}} [opts={}]
|
|
122
|
+
* @returns {Promise<{directDeps: string[], graph: Map}>}
|
|
123
|
+
*/
|
|
124
|
+
// eslint-disable-next-line no-unused-vars
|
|
125
|
+
async _getDependencyData(manifestDir, _workspaceDir, parsed, opts) {
|
|
126
|
+
let reportOutput = this._getPipReportOutput(manifestDir, opts);
|
|
127
|
+
return this._parsePipReport(reportOutput);
|
|
128
|
+
}
|
|
129
|
+
_findEggInfoDirs(dir) {
|
|
130
|
+
try {
|
|
131
|
+
return fs.readdirSync(dir).filter(f => f.endsWith('.egg-info'));
|
|
132
|
+
}
|
|
133
|
+
catch {
|
|
134
|
+
return [];
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
_cleanupEggInfo(dir, existing) {
|
|
138
|
+
for (let entry of this._findEggInfoDirs(dir)) {
|
|
139
|
+
if (!existing.includes(entry)) {
|
|
140
|
+
fs.rmSync(path.join(dir, entry), { recursive: true, force: true });
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
@@ -2,10 +2,11 @@ export default class Python_poetry extends Base_pyproject {
|
|
|
2
2
|
/**
|
|
3
3
|
* Get poetry show --tree output.
|
|
4
4
|
* @param {string} manifestDir
|
|
5
|
+
* @param {boolean} hasDevGroup
|
|
5
6
|
* @param {Object} opts
|
|
6
7
|
* @returns {string}
|
|
7
8
|
*/
|
|
8
|
-
_getPoetryShowTreeOutput(manifestDir: string, opts: any): string;
|
|
9
|
+
_getPoetryShowTreeOutput(manifestDir: string, hasDevGroup: boolean, opts: any): string;
|
|
9
10
|
/**
|
|
10
11
|
* Get poetry show --all output (flat list with resolved versions).
|
|
11
12
|
* @param {string} manifestDir
|
|
@@ -39,7 +39,8 @@ export default class Python_poetry extends Base_pyproject {
|
|
|
39
39
|
*/
|
|
40
40
|
// eslint-disable-next-line no-unused-vars
|
|
41
41
|
async _getDependencyData(manifestDir, _workspaceDir, parsed, opts) {
|
|
42
|
-
let
|
|
42
|
+
let hasDevGroup = !!(parsed.tool?.poetry?.group?.dev || parsed.tool?.poetry?.['dev-dependencies']);
|
|
43
|
+
let treeOutput = this._getPoetryShowTreeOutput(manifestDir, hasDevGroup, opts);
|
|
43
44
|
let showAllOutput = this._getPoetryShowAllOutput(manifestDir, opts);
|
|
44
45
|
let versionMap = this._parsePoetryShowAll(showAllOutput);
|
|
45
46
|
return this._parsePoetryTree(treeOutput, versionMap);
|
|
@@ -47,15 +48,20 @@ export default class Python_poetry extends Base_pyproject {
|
|
|
47
48
|
/**
|
|
48
49
|
* Get poetry show --tree output.
|
|
49
50
|
* @param {string} manifestDir
|
|
51
|
+
* @param {boolean} hasDevGroup
|
|
50
52
|
* @param {Object} opts
|
|
51
53
|
* @returns {string}
|
|
52
54
|
*/
|
|
53
|
-
_getPoetryShowTreeOutput(manifestDir, opts) {
|
|
55
|
+
_getPoetryShowTreeOutput(manifestDir, hasDevGroup, opts) {
|
|
54
56
|
if (environmentVariableIsPopulated('TRUSTIFY_DA_POETRY_SHOW_TREE')) {
|
|
55
57
|
return Buffer.from(process.env['TRUSTIFY_DA_POETRY_SHOW_TREE'], 'base64').toString('utf-8');
|
|
56
58
|
}
|
|
57
59
|
let poetryBin = getCustomPath('poetry', opts);
|
|
58
|
-
|
|
60
|
+
let args = ['show', '--tree', '--no-ansi'];
|
|
61
|
+
if (hasDevGroup) {
|
|
62
|
+
args.push('--without', 'dev');
|
|
63
|
+
}
|
|
64
|
+
return invokeCommand(poetryBin, args, { cwd: manifestDir }).toString();
|
|
59
65
|
}
|
|
60
66
|
/**
|
|
61
67
|
* Get poetry show --all output (flat list with resolved versions).
|
|
@@ -36,7 +36,7 @@ export default class Python_uv extends Base_pyproject {
|
|
|
36
36
|
return Buffer.from(process.env['TRUSTIFY_DA_UV_EXPORT'], 'base64').toString('ascii');
|
|
37
37
|
}
|
|
38
38
|
let uvBin = getCustomPath('uv', opts);
|
|
39
|
-
return invokeCommand(uvBin, ['export', '--format', 'requirements.txt', '--frozen', '--no-hashes'], { cwd: manifestDir }).toString();
|
|
39
|
+
return invokeCommand(uvBin, ['export', '--format', 'requirements.txt', '--frozen', '--no-hashes', '--no-dev', '--no-emit-project'], { cwd: manifestDir }).toString();
|
|
40
40
|
}
|
|
41
41
|
/**
|
|
42
42
|
* Parse uv export output into a dependency graph using tree-sitter-requirements
|
|
@@ -70,6 +70,9 @@ export default class Python_uv extends Base_pyproject {
|
|
|
70
70
|
let version = memberParsed.project?.version || memberParsed.tool?.poetry?.version;
|
|
71
71
|
if (name && version) {
|
|
72
72
|
let key = this._canonicalize(name);
|
|
73
|
+
if (key === canonProjectName) {
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
73
76
|
currentPkg = { name, version, parents: new Set() };
|
|
74
77
|
packages.set(key, currentPkg);
|
|
75
78
|
collectingVia = false;
|
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.
|
|
3
|
+
"version": "0.3.0-ea.d9c1ae4",
|
|
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",
|