doc-freshness-checker 2.0.16 → 2.0.18
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/parsers/extractors/dependencyExtractor.js +14 -7
- package/dist/parsers/extractors/dependencyExtractor.js.map +1 -1
- package/dist/parsers/extractors/dependencyExtractor.test.js +23 -1
- package/dist/parsers/extractors/dependencyExtractor.test.js.map +1 -1
- package/dist/parsers/extractors/filePathExtractor.d.ts +1 -1
- package/dist/parsers/extractors/filePathExtractor.js +8 -6
- package/dist/parsers/extractors/filePathExtractor.js.map +1 -1
- package/dist/parsers/extractors/filePathExtractor.test.js +20 -3
- package/dist/parsers/extractors/filePathExtractor.test.js.map +1 -1
- package/dist/test-utils/manifestFixtures.d.ts +43 -0
- package/dist/test-utils/manifestFixtures.js +85 -0
- package/dist/test-utils/manifestFixtures.js.map +1 -0
- package/dist/utils/pythonDependencies.d.ts +3 -0
- package/dist/utils/pythonDependencies.js +114 -0
- package/dist/utils/pythonDependencies.js.map +1 -0
- package/dist/validators/dependencyValidator.d.ts +1 -0
- package/dist/validators/dependencyValidator.js +12 -14
- package/dist/validators/dependencyValidator.js.map +1 -1
- package/dist/validators/dependencyValidator.test.js +43 -5
- package/dist/validators/dependencyValidator.test.js.map +1 -1
- package/dist/validators/fileValidator.test.js +8 -0
- package/dist/validators/fileValidator.test.js.map +1 -1
- package/dist/validators/versionValidator.d.ts +1 -0
- package/dist/validators/versionValidator.js +35 -31
- package/dist/validators/versionValidator.js.map +1 -1
- package/dist/validators/versionValidator.test.js +204 -6
- package/dist/validators/versionValidator.test.js.map +1 -1
- package/package.json +2 -2
|
@@ -11,15 +11,19 @@ export class DependencyExtractor extends BaseExtractor {
|
|
|
11
11
|
}
|
|
12
12
|
extract(document) {
|
|
13
13
|
const references = [];
|
|
14
|
+
const plainPackageEcosystem = this.ecosystems.includes('npm') ? 'npm' : 'pypi';
|
|
15
|
+
const pypiOnly = this.ecosystems.length === 1 && this.ecosystems[0] === 'pypi';
|
|
14
16
|
const patterns = [
|
|
15
17
|
// npm scoped packages: @scope/package-name
|
|
16
18
|
{ regex: /`(@[a-z0-9-]+\/[a-z0-9-]+)`/g, ecosystem: 'npm' },
|
|
17
|
-
//
|
|
18
|
-
{ regex: /`([a-z][a-z0-9-]{2,})`/g, ecosystem: '
|
|
19
|
+
// PyPI names distinguished by underscores or dots
|
|
20
|
+
{ regex: /`([a-z][a-z0-9._-]{2,})`/g, ecosystem: 'pypi', requiresPythonSeparator: true },
|
|
21
|
+
// Plain/hyphen names are npm by default and PyPI when npm is disabled
|
|
22
|
+
{ regex: /`([a-z][a-z0-9-]{2,})`/g, ecosystem: plainPackageEcosystem },
|
|
19
23
|
// Go packages
|
|
20
24
|
{ regex: /`(github\.com\/[a-zA-Z0-9\-_]+\/[a-zA-Z0-9\-_]+)`/g, ecosystem: 'go' },
|
|
21
25
|
];
|
|
22
|
-
for (const { regex, ecosystem } of patterns) {
|
|
26
|
+
for (const { regex, ecosystem, requiresPythonSeparator } of patterns) {
|
|
23
27
|
if (!this.ecosystems.includes(ecosystem)) {
|
|
24
28
|
continue;
|
|
25
29
|
}
|
|
@@ -27,8 +31,11 @@ export class DependencyExtractor extends BaseExtractor {
|
|
|
27
31
|
const re = new RegExp(regex.source, regex.flags);
|
|
28
32
|
while ((match = re.exec(document.content)) !== null) {
|
|
29
33
|
const pkg = match[1];
|
|
34
|
+
if (requiresPythonSeparator && !/[._]/.test(pkg)) {
|
|
35
|
+
continue;
|
|
36
|
+
}
|
|
30
37
|
// Filter out common false positives
|
|
31
|
-
if (this.isFalsePositive(pkg)) {
|
|
38
|
+
if (this.isFalsePositive(pkg, ecosystem === 'pypi' && pypiOnly)) {
|
|
32
39
|
continue;
|
|
33
40
|
}
|
|
34
41
|
references.push({
|
|
@@ -43,7 +50,7 @@ export class DependencyExtractor extends BaseExtractor {
|
|
|
43
50
|
}
|
|
44
51
|
return references;
|
|
45
52
|
}
|
|
46
|
-
isFalsePositive(pkg) {
|
|
53
|
+
isFalsePositive(pkg, allowDottedPyPI) {
|
|
47
54
|
// Skip very short names
|
|
48
55
|
if (pkg.length < 3) {
|
|
49
56
|
return true;
|
|
@@ -87,8 +94,8 @@ export class DependencyExtractor extends BaseExtractor {
|
|
|
87
94
|
if (commonWords.includes(pkg.toLowerCase())) {
|
|
88
95
|
return true;
|
|
89
96
|
}
|
|
90
|
-
//
|
|
91
|
-
if (/\.[a-z]{2,4}
|
|
97
|
+
// Dotted names are ambiguous with file names unless PyPI is the only enabled ecosystem.
|
|
98
|
+
if (!allowDottedPyPI && /\.[a-z]{2,4}$/i.test(pkg)) {
|
|
92
99
|
return true;
|
|
93
100
|
}
|
|
94
101
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencyExtractor.js","sourceRoot":"","sources":["../../../src/parsers/extractors/dependencyExtractor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"dependencyExtractor.js","sourceRoot":"","sources":["../../../src/parsers/extractors/dependencyExtractor.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,28 @@ describe('DependencyExtractor', () => {
|
|
|
23
23
|
expect(values).toContain('express');
|
|
24
24
|
expect(values).toContain('commander');
|
|
25
25
|
});
|
|
26
|
+
it('extracts underscore PyPI names without treating dotted names as packages by default', () => {
|
|
27
|
+
const refs = extractor.extract(makeDoc('Use `foo_bar`, `foo.bar`, and `foo-bar`'));
|
|
28
|
+
expect(refs.map(({ value, ecosystem }) => ({ value, ecosystem }))).toEqual([
|
|
29
|
+
{ value: 'foo_bar', ecosystem: 'pypi' },
|
|
30
|
+
{ value: 'foo-bar', ecosystem: 'npm' },
|
|
31
|
+
]);
|
|
32
|
+
});
|
|
33
|
+
it('assigns ordinary packages to PyPI when npm is disabled', () => {
|
|
34
|
+
const pypiOnly = new DependencyExtractor({ ecosystems: ['pypi'] });
|
|
35
|
+
const refs = pypiOnly.extract(makeDoc('Use `requests`, `pytest-cov`, `foo_bar`, and `foo.bar`'));
|
|
36
|
+
expect(refs.map(({ value, ecosystem }) => ({ value, ecosystem }))).toEqual([
|
|
37
|
+
{ value: 'foo_bar', ecosystem: 'pypi' },
|
|
38
|
+
{ value: 'foo.bar', ecosystem: 'pypi' },
|
|
39
|
+
{ value: 'requests', ecosystem: 'pypi' },
|
|
40
|
+
{ value: 'pytest-cov', ecosystem: 'pypi' },
|
|
41
|
+
]);
|
|
42
|
+
});
|
|
43
|
+
it.each(['go', 'crates'])('filters dotted names when PyPI is combined with %s', (otherEcosystem) => {
|
|
44
|
+
const mixed = new DependencyExtractor({ ecosystems: ['pypi', otherEcosystem] });
|
|
45
|
+
const refs = mixed.extract(makeDoc('Use `foo.bar` and edit `config.mjs`'));
|
|
46
|
+
expect(refs).toHaveLength(0);
|
|
47
|
+
});
|
|
26
48
|
it('extracts Go packages', () => {
|
|
27
49
|
const doc = makeDoc('Import `github.com/gin-gonic/gin`');
|
|
28
50
|
const refs = extractor.extract(doc);
|
|
@@ -34,7 +56,7 @@ describe('DependencyExtractor', () => {
|
|
|
34
56
|
expect(refs).toHaveLength(0);
|
|
35
57
|
});
|
|
36
58
|
it('filters out file extensions', () => {
|
|
37
|
-
const doc = makeDoc('
|
|
59
|
+
const doc = makeDoc('Open `archive.zip`, `config.mjs`, `index.php`, `app.vue`, `schema.sql`, and `package.lock`');
|
|
38
60
|
const refs = extractor.extract(doc);
|
|
39
61
|
expect(refs).toHaveLength(0);
|
|
40
62
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencyExtractor.test.js","sourceRoot":"","sources":["../../../src/parsers/extractors/dependencyExtractor.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAG/D,SAAS,OAAO,CAAC,OAAe;IAC9B,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,YAAY,EAAE,uBAAuB;QACrC,OAAO;QACP,MAAM,EAAE,UAAU;QAClB,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;QAC1B,UAAU,EAAE,EAAE;KACf,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,MAAM,SAAS,GAAG,IAAI,mBAAmB,EAAE,CAAC;IAE5C,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,GAAG,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAC;QACvD,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,GAAG,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;QAC9B,MAAM,GAAG,GAAG,OAAO,CAAC,mCAAmC,CAAC,CAAC;QACzD,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,0BAA0B,IAAI,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtG,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,GAAG,GAAG,OAAO,CAAC,6CAA6C,CAAC,CAAC;QACnE,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACrC,MAAM,GAAG,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"dependencyExtractor.test.js","sourceRoot":"","sources":["../../../src/parsers/extractors/dependencyExtractor.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export declare class FilePathExtractor extends BaseExtractor {
|
|
|
12
12
|
* Examples:
|
|
13
13
|
* "../src/file.ts:1" -> { path: "../src/file.ts", lineRef: "1" }
|
|
14
14
|
* "../src/file.ts:26-38" -> { path: "../src/file.ts", lineRef: "26-38" }
|
|
15
|
-
* "../src/file.ts#L123" -> { path: "../src/file.ts", lineRef: "
|
|
15
|
+
* "../src/file.ts#L123" -> { path: "../src/file.ts", lineRef: "123" }
|
|
16
16
|
*/
|
|
17
17
|
private extractLineReference;
|
|
18
18
|
}
|
|
@@ -24,6 +24,7 @@ export class FilePathExtractor extends BaseExtractor {
|
|
|
24
24
|
asciidoc: /link:([^[\s]+)\[([^\][]*)\]/g,
|
|
25
25
|
};
|
|
26
26
|
const pattern = patterns[document.format] || patterns.markdown;
|
|
27
|
+
const isMarkdownLike = document.format !== 'asciidoc' && document.format !== 'restructuredtext';
|
|
27
28
|
let match;
|
|
28
29
|
while ((match = pattern.exec(document.content)) !== null) {
|
|
29
30
|
const refPath = document.format === 'asciidoc' ? match[1] : match[2];
|
|
@@ -35,16 +36,17 @@ export class FilePathExtractor extends BaseExtractor {
|
|
|
35
36
|
if (refPath.startsWith('#')) {
|
|
36
37
|
continue;
|
|
37
38
|
}
|
|
39
|
+
// Extract line metadata, then strip ordinary Markdown fragments from file paths
|
|
40
|
+
const { path: pathWithoutLineRef, lineRef } = this.extractLineReference(refPath);
|
|
41
|
+
const cleanPath = isMarkdownLike ? pathWithoutLineRef.split('#', 1)[0] : pathWithoutLineRef;
|
|
38
42
|
// For markdown, only accept relative paths or paths with file extensions
|
|
39
|
-
if (
|
|
40
|
-
const isRelative =
|
|
41
|
-
const hasExtension = /^[a-zA-Z0-9_\-/\\]+\.[a-zA-Z]{1,10}$/.test(
|
|
43
|
+
if (isMarkdownLike) {
|
|
44
|
+
const isRelative = cleanPath.startsWith('../') || cleanPath.startsWith('.\\') || cleanPath.startsWith('./');
|
|
45
|
+
const hasExtension = /^[a-zA-Z0-9_\-/\\]+\.[a-zA-Z]{1,10}$/.test(cleanPath);
|
|
42
46
|
if (!isRelative && !hasExtension) {
|
|
43
47
|
continue;
|
|
44
48
|
}
|
|
45
49
|
}
|
|
46
|
-
// Extract and strip line number suffixes
|
|
47
|
-
const { path: cleanPath, lineRef } = this.extractLineReference(refPath);
|
|
48
50
|
references.push({
|
|
49
51
|
type: this.type,
|
|
50
52
|
value: cleanPath,
|
|
@@ -63,7 +65,7 @@ export class FilePathExtractor extends BaseExtractor {
|
|
|
63
65
|
* Examples:
|
|
64
66
|
* "../src/file.ts:1" -> { path: "../src/file.ts", lineRef: "1" }
|
|
65
67
|
* "../src/file.ts:26-38" -> { path: "../src/file.ts", lineRef: "26-38" }
|
|
66
|
-
* "../src/file.ts#L123" -> { path: "../src/file.ts", lineRef: "
|
|
68
|
+
* "../src/file.ts#L123" -> { path: "../src/file.ts", lineRef: "123" }
|
|
67
69
|
*/
|
|
68
70
|
extractLineReference(refPath) {
|
|
69
71
|
for (const pattern of LINE_NUMBER_PATTERNS) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filePathExtractor.js","sourceRoot":"","sources":["../../../src/parsers/extractors/filePathExtractor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAKnD;;;GAGG;AACH,MAAM,oBAAoB,GAAG;IAC3B,sBAAsB,EAAE,mBAAmB;IAC3C,yBAAyB,EAAE,+BAA+B;CAC3D,CAAC;AAEF;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,aAAa;IAClD;QACE,KAAK,CAAC,WAAW,CAAC,CAAC;IACrB,CAAC;IAED,OAAO,CAAC,QAAkB;QACxB,MAAM,UAAU,GAAgB,EAAE,CAAC;QAEnC,2BAA2B;QAC3B,MAAM,QAAQ,GAAe;YAC3B,QAAQ,EAAE,iCAAiC;YAC3C,gBAAgB,EAAE,6BAA6B;YAC/C,QAAQ,EAAE,8BAA8B;SACzC,CAAC;QAEF,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"filePathExtractor.js","sourceRoot":"","sources":["../../../src/parsers/extractors/filePathExtractor.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,10 +41,19 @@ describe('FilePathExtractor', () => {
|
|
|
41
41
|
expect(refs[0].lineRef).toBe('26-38');
|
|
42
42
|
});
|
|
43
43
|
it('handles GitHub-style line references', () => {
|
|
44
|
-
const doc = makeDoc('[
|
|
44
|
+
const doc = makeDoc('[line](README.md#L10) [range](./README.md#L10-L20) [relative](../src/file.ts#L123)');
|
|
45
45
|
const refs = extractor.extract(doc);
|
|
46
|
-
expect(refs
|
|
47
|
-
|
|
46
|
+
expect(refs.map(({ value, lineRef }) => ({ value, lineRef }))).toEqual([
|
|
47
|
+
{ value: 'README.md', lineRef: '10' },
|
|
48
|
+
{ value: './README.md', lineRef: '10-L20' },
|
|
49
|
+
{ value: '../src/file.ts', lineRef: '123' },
|
|
50
|
+
]);
|
|
51
|
+
});
|
|
52
|
+
it('strips ordinary fragments from file links', () => {
|
|
53
|
+
const doc = makeDoc('[readme](README.md#usage) [relative](./README.md#usage)');
|
|
54
|
+
const refs = extractor.extract(doc);
|
|
55
|
+
expect(refs.map((ref) => ref.value)).toEqual(['README.md', './README.md']);
|
|
56
|
+
expect(refs.every((ref) => ref.lineRef === undefined)).toBe(true);
|
|
48
57
|
});
|
|
49
58
|
it('preserves linkText', () => {
|
|
50
59
|
const doc = makeDoc('[My Link Text](./file.ts)');
|
|
@@ -52,6 +61,10 @@ describe('FilePathExtractor', () => {
|
|
|
52
61
|
expect(refs[0].linkText).toBe('My Link Text');
|
|
53
62
|
});
|
|
54
63
|
});
|
|
64
|
+
it('strips fragments from plaintext links parsed as Markdown', () => {
|
|
65
|
+
const refs = extractor.extract(makeDoc('[readme](README.md#usage)', 'plaintext'));
|
|
66
|
+
expect(refs[0].value).toBe('README.md');
|
|
67
|
+
});
|
|
55
68
|
describe('restructuredtext format', () => {
|
|
56
69
|
it('extracts RST link references', () => {
|
|
57
70
|
const doc = makeDoc('`Configuration <../config.rst>`_', 'restructuredtext');
|
|
@@ -68,6 +81,10 @@ describe('FilePathExtractor', () => {
|
|
|
68
81
|
expect(refs[0].value).toBe('./config.adoc');
|
|
69
82
|
expect(refs[0].linkText).toBe('Configuration');
|
|
70
83
|
});
|
|
84
|
+
it('preserves fragments in AsciiDoc links', () => {
|
|
85
|
+
const refs = extractor.extract(makeDoc('link:./config.adoc#usage[Configuration]', 'asciidoc'));
|
|
86
|
+
expect(refs[0].value).toBe('./config.adoc#usage');
|
|
87
|
+
});
|
|
71
88
|
});
|
|
72
89
|
});
|
|
73
90
|
//# sourceMappingURL=filePathExtractor.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filePathExtractor.test.js","sourceRoot":"","sources":["../../../src/parsers/extractors/filePathExtractor.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3D,SAAS,OAAO,CAAC,OAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"filePathExtractor.test.js","sourceRoot":"","sources":["../../../src/parsers/extractors/filePathExtractor.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
export declare const PEP621_PYPROJECT_FIXTURES: readonly [{
|
|
2
|
+
readonly name: "core and optional dependency arrays";
|
|
3
|
+
readonly content: "[project]\nname = \"example\"\ndependencies = [\n \"fastapi>=0.100,<1\",\n \"uvicorn==0.30.1\", # server\n # \"ghost>=9\" ]\n \"typing_extensions[docs]===4.8; python_version < '3.13'\",\n \"direct_dep @ https://example.com/archive.whl#sha256=abc\",\n]\n\n[project.optional-dependencies]\ntest = [\"pytest==8.3.0\", \"httpx[http2]>=0.27\"]\ndocs = [\n # \"ghost-optional==9\" ]\n \"sphinx!=7\",\n \"mkdocs_material==9.5\",\n]\n";
|
|
4
|
+
readonly dependencies: {
|
|
5
|
+
readonly fastapi: "any";
|
|
6
|
+
readonly uvicorn: "0.30.1";
|
|
7
|
+
readonly typing_extensions: "4.8";
|
|
8
|
+
readonly direct_dep: "any";
|
|
9
|
+
readonly pytest: "8.3.0";
|
|
10
|
+
readonly httpx: "any";
|
|
11
|
+
readonly sphinx: "any";
|
|
12
|
+
readonly mkdocs_material: "9.5";
|
|
13
|
+
};
|
|
14
|
+
}, {
|
|
15
|
+
readonly name: "inline arrays with whitespace, pins, and canonical collisions";
|
|
16
|
+
readonly content: "[project]\ndependencies = [\" space_pkg [x] ==3.0 \", \"paren_pkg (==4.0)\", \"compatible_pkg (~= 2.0)\", \"foo_bar==1.0\", \"foo-bar==2.0\", \"reverse-name==2.0\", \"reverse_name==1.0\", \"same.name==5.0\", \"same_name==5.0\", \"epoch_pkg==2!4.2\", \"date_pkg==2024.01\"]\n";
|
|
17
|
+
readonly dependencies: {
|
|
18
|
+
readonly space_pkg: "3.0";
|
|
19
|
+
readonly paren_pkg: "4.0";
|
|
20
|
+
readonly compatible_pkg: "2.0";
|
|
21
|
+
readonly foo_bar: "any";
|
|
22
|
+
readonly 'foo-bar': "any";
|
|
23
|
+
readonly 'reverse-name': "any";
|
|
24
|
+
readonly reverse_name: "any";
|
|
25
|
+
readonly 'same.name': "5.0";
|
|
26
|
+
readonly same_name: "5.0";
|
|
27
|
+
readonly epoch_pkg: "2!4.2";
|
|
28
|
+
readonly date_pkg: "2024.01";
|
|
29
|
+
};
|
|
30
|
+
}, {
|
|
31
|
+
readonly name: "array-of-table boundary after optional dependencies";
|
|
32
|
+
readonly content: "[project]\ndependencies = [\"core_pkg==1.0\"]\n\n[project.optional-dependencies]\ntest = [\"optional_pkg==2.0\"]\n\n[[tool.demo]]\ntags = [\"ghost==9\"]\n";
|
|
33
|
+
readonly dependencies: {
|
|
34
|
+
readonly core_pkg: "1.0";
|
|
35
|
+
readonly optional_pkg: "2.0";
|
|
36
|
+
};
|
|
37
|
+
}, {
|
|
38
|
+
readonly name: "multiline project strings before dependencies";
|
|
39
|
+
readonly content: "[project]\ndescription = \"\"\"\n[not-a-real-section]\n\"ghost==9\"\n\"\"\"\nreadme = '''\ndependencies = [\"evil==9.9.9\"]\n'''\ndependencies = [\"requests==2.0\"]\n";
|
|
40
|
+
readonly dependencies: {
|
|
41
|
+
readonly requests: "2.0";
|
|
42
|
+
};
|
|
43
|
+
}];
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
export const PEP621_PYPROJECT_FIXTURES = [
|
|
2
|
+
{
|
|
3
|
+
name: 'core and optional dependency arrays',
|
|
4
|
+
content: `[project]
|
|
5
|
+
name = "example"
|
|
6
|
+
dependencies = [
|
|
7
|
+
"fastapi>=0.100,<1",
|
|
8
|
+
"uvicorn==0.30.1", # server
|
|
9
|
+
# "ghost>=9" ]
|
|
10
|
+
"typing_extensions[docs]===4.8; python_version < '3.13'",
|
|
11
|
+
"direct_dep @ https://example.com/archive.whl#sha256=abc",
|
|
12
|
+
]
|
|
13
|
+
|
|
14
|
+
[project.optional-dependencies]
|
|
15
|
+
test = ["pytest==8.3.0", "httpx[http2]>=0.27"]
|
|
16
|
+
docs = [
|
|
17
|
+
# "ghost-optional==9" ]
|
|
18
|
+
"sphinx!=7",
|
|
19
|
+
"mkdocs_material==9.5",
|
|
20
|
+
]
|
|
21
|
+
`,
|
|
22
|
+
dependencies: {
|
|
23
|
+
fastapi: 'any',
|
|
24
|
+
uvicorn: '0.30.1',
|
|
25
|
+
typing_extensions: '4.8',
|
|
26
|
+
direct_dep: 'any',
|
|
27
|
+
pytest: '8.3.0',
|
|
28
|
+
httpx: 'any',
|
|
29
|
+
sphinx: 'any',
|
|
30
|
+
mkdocs_material: '9.5',
|
|
31
|
+
},
|
|
32
|
+
},
|
|
33
|
+
{
|
|
34
|
+
name: 'inline arrays with whitespace, pins, and canonical collisions',
|
|
35
|
+
content: `[project]
|
|
36
|
+
dependencies = [" space_pkg [x] ==3.0 ", "paren_pkg (==4.0)", "compatible_pkg (~= 2.0)", "foo_bar==1.0", "foo-bar==2.0", "reverse-name==2.0", "reverse_name==1.0", "same.name==5.0", "same_name==5.0", "epoch_pkg==2!4.2", "date_pkg==2024.01"]
|
|
37
|
+
`,
|
|
38
|
+
dependencies: {
|
|
39
|
+
space_pkg: '3.0',
|
|
40
|
+
paren_pkg: '4.0',
|
|
41
|
+
compatible_pkg: '2.0',
|
|
42
|
+
foo_bar: 'any',
|
|
43
|
+
'foo-bar': 'any',
|
|
44
|
+
'reverse-name': 'any',
|
|
45
|
+
reverse_name: 'any',
|
|
46
|
+
'same.name': '5.0',
|
|
47
|
+
same_name: '5.0',
|
|
48
|
+
epoch_pkg: '2!4.2',
|
|
49
|
+
date_pkg: '2024.01',
|
|
50
|
+
},
|
|
51
|
+
},
|
|
52
|
+
{
|
|
53
|
+
name: 'array-of-table boundary after optional dependencies',
|
|
54
|
+
content: `[project]
|
|
55
|
+
dependencies = ["core_pkg==1.0"]
|
|
56
|
+
|
|
57
|
+
[project.optional-dependencies]
|
|
58
|
+
test = ["optional_pkg==2.0"]
|
|
59
|
+
|
|
60
|
+
[[tool.demo]]
|
|
61
|
+
tags = ["ghost==9"]
|
|
62
|
+
`,
|
|
63
|
+
dependencies: {
|
|
64
|
+
core_pkg: '1.0',
|
|
65
|
+
optional_pkg: '2.0',
|
|
66
|
+
},
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
name: 'multiline project strings before dependencies',
|
|
70
|
+
content: `[project]
|
|
71
|
+
description = """
|
|
72
|
+
[not-a-real-section]
|
|
73
|
+
"ghost==9"
|
|
74
|
+
"""
|
|
75
|
+
readme = '''
|
|
76
|
+
dependencies = ["evil==9.9.9"]
|
|
77
|
+
'''
|
|
78
|
+
dependencies = ["requests==2.0"]
|
|
79
|
+
`,
|
|
80
|
+
dependencies: {
|
|
81
|
+
requests: '2.0',
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
];
|
|
85
|
+
//# sourceMappingURL=manifestFixtures.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"manifestFixtures.js","sourceRoot":"","sources":["../../src/test-utils/manifestFixtures.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC;QACE,IAAI,EAAE,qCAAqC;QAC3C,OAAO,EAAE;;;;;;;;;;;;;;;;;CAiBZ;QACG,YAAY,EAAE;YACZ,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,QAAQ;YACjB,iBAAiB,EAAE,KAAK;YACxB,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,OAAO;YACf,KAAK,EAAE,KAAK;YACZ,MAAM,EAAE,KAAK;YACb,eAAe,EAAE,KAAK;SACvB;KACF;IACD;QACE,IAAI,EAAE,+DAA+D;QACrE,OAAO,EAAE;;CAEZ;QACG,YAAY,EAAE;YACZ,SAAS,EAAE,KAAK;YAChB,SAAS,EAAE,KAAK;YAChB,cAAc,EAAE,KAAK;YACrB,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,KAAK;YAChB,cAAc,EAAE,KAAK;YACrB,YAAY,EAAE,KAAK;YACnB,WAAW,EAAE,KAAK;YAClB,SAAS,EAAE,KAAK;YAChB,SAAS,EAAE,OAAO;YAClB,QAAQ,EAAE,SAAS;SACpB;KACF;IACD;QACE,IAAI,EAAE,qDAAqD;QAC3D,OAAO,EAAE;;;;;;;;CAQZ;QACG,YAAY,EAAE;YACZ,QAAQ,EAAE,KAAK;YACf,YAAY,EAAE,KAAK;SACpB;KACF;IACD;QACE,IAAI,EAAE,+CAA+C;QACrD,OAAO,EAAE;;;;;;;;;CASZ;QACG,YAAY,EAAE;YACZ,QAAQ,EAAE,KAAK;SAChB;KACF;CACO,CAAC"}
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
const QUOTED_STRING = /"((?:\\.|[^"\\])*)"|'([^']*)'/g;
|
|
2
|
+
const TOML_COMMENT = /("(?:\\.|[^"\\])*"|'[^']*')|#[^\r\n]*/g;
|
|
3
|
+
const TOML_ARRAY = /^\[((?:[^"'\]]|"(?:\\.|[^"\\])*"|'[^']*')*)\]/;
|
|
4
|
+
const TOML_MULTILINE_STRING = /"""(?:\\[\s\S]|"{1,2}(?!")|[^"\\])*"""|'''(?:'{1,2}(?!')|[^'])*'''/g;
|
|
5
|
+
export function parsePyprojectDependencies(content) {
|
|
6
|
+
const dependencyGroups = new Map();
|
|
7
|
+
const uncommented = stripComments(content.replace(TOML_MULTILINE_STRING, ''));
|
|
8
|
+
const coreSection = getSection(uncommented, 'project');
|
|
9
|
+
const optionalSection = getSection(uncommented, 'project.optional-dependencies');
|
|
10
|
+
const arrays = [
|
|
11
|
+
...findArrays(coreSection, /^[ \t]*dependencies[ \t]*=[ \t]*\[/gm),
|
|
12
|
+
...findArrays(optionalSection, /^[ \t]*[a-zA-Z0-9._-]+[ \t]*=[ \t]*\[/gm),
|
|
13
|
+
];
|
|
14
|
+
for (const source of arrays) {
|
|
15
|
+
for (const match of source.matchAll(QUOTED_STRING)) {
|
|
16
|
+
const parsed = parsePythonRequirement(match[1] ?? match[2]);
|
|
17
|
+
if (!parsed) {
|
|
18
|
+
continue;
|
|
19
|
+
}
|
|
20
|
+
addDependency(dependencyGroups, parsed.name, parsed.version);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
return flattenDependencyGroups(dependencyGroups);
|
|
24
|
+
}
|
|
25
|
+
export function parseRequirementsDependencies(content) {
|
|
26
|
+
const dependencyGroups = new Map();
|
|
27
|
+
for (const line of content.split('\n')) {
|
|
28
|
+
const parsed = parsePythonRequirement(stripRequirementInlineComment(line));
|
|
29
|
+
if (!parsed) {
|
|
30
|
+
continue;
|
|
31
|
+
}
|
|
32
|
+
addDependency(dependencyGroups, parsed.name, parsed.version);
|
|
33
|
+
}
|
|
34
|
+
return flattenDependencyGroups(dependencyGroups);
|
|
35
|
+
}
|
|
36
|
+
function flattenDependencyGroups(dependencyGroups) {
|
|
37
|
+
const dependencies = new Map();
|
|
38
|
+
for (const group of dependencyGroups.values()) {
|
|
39
|
+
for (const name of group.names) {
|
|
40
|
+
dependencies.set(name, group.version);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return dependencies;
|
|
44
|
+
}
|
|
45
|
+
export function canonicalizePythonPackageName(name) {
|
|
46
|
+
return name.toLowerCase().replace(/[-_.]+/g, '-');
|
|
47
|
+
}
|
|
48
|
+
function stripComments(content) {
|
|
49
|
+
return content.replace(TOML_COMMENT, (_match, quoted) => quoted ?? '');
|
|
50
|
+
}
|
|
51
|
+
function getSection(content, name) {
|
|
52
|
+
const escapedName = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
53
|
+
const header = new RegExp(`^[ \\t]*\\[${escapedName}\\][ \\t]*\\r?$`, 'm').exec(content);
|
|
54
|
+
if (!header) {
|
|
55
|
+
return undefined;
|
|
56
|
+
}
|
|
57
|
+
const remainder = content.slice(header.index + header[0].length);
|
|
58
|
+
const nextSection = remainder.search(/^[ \t]*(?:\[[^\]\r\n]+\]|\[\[[^\]\r\n]+\]\])[ \t]*\r?$/m);
|
|
59
|
+
return nextSection === -1 ? remainder : remainder.slice(0, nextSection);
|
|
60
|
+
}
|
|
61
|
+
function findArrays(section, assignmentPattern) {
|
|
62
|
+
if (!section) {
|
|
63
|
+
return [];
|
|
64
|
+
}
|
|
65
|
+
const arrays = [];
|
|
66
|
+
for (const match of section.matchAll(assignmentPattern)) {
|
|
67
|
+
const openingBracket = match.index + match[0].lastIndexOf('[');
|
|
68
|
+
const array = section.slice(openingBracket).match(TOML_ARRAY)?.[1];
|
|
69
|
+
if (array !== undefined) {
|
|
70
|
+
arrays.push(array);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
return arrays;
|
|
74
|
+
}
|
|
75
|
+
function getComparableVersion(constraint) {
|
|
76
|
+
const version = constraint.match(/^(?:={2,3}|~=)\s*([^,\s*]+)\s*$/) ?? constraint.match(/^\(\s*(?:={2,3}|~=)\s*([^,\s*()]+)\s*\)$/);
|
|
77
|
+
return version?.[1];
|
|
78
|
+
}
|
|
79
|
+
function parsePythonRequirement(requirement) {
|
|
80
|
+
const parsed = requirement.trim().match(/^([a-zA-Z0-9][a-zA-Z0-9._-]*)(?:\s*\[[^\]]+\])?\s*(.*)$/);
|
|
81
|
+
if (!parsed) {
|
|
82
|
+
return undefined;
|
|
83
|
+
}
|
|
84
|
+
const constraint = parsed[2].split(';', 1)[0].trim();
|
|
85
|
+
return { name: parsed[1], version: getComparableVersion(constraint) ?? 'any' };
|
|
86
|
+
}
|
|
87
|
+
function stripRequirementInlineComment(requirement) {
|
|
88
|
+
let quote;
|
|
89
|
+
for (let index = 0; index < requirement.length; index += 1) {
|
|
90
|
+
const character = requirement[index];
|
|
91
|
+
if ((character === '"' || character === "'") && requirement[index - 1] !== '\\') {
|
|
92
|
+
quote = quote === character ? undefined : quote || character;
|
|
93
|
+
}
|
|
94
|
+
else if (character === '#' && !quote && index > 0 && /\s/.test(requirement[index - 1])) {
|
|
95
|
+
return requirement.slice(0, index).trimEnd();
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
return requirement;
|
|
99
|
+
}
|
|
100
|
+
function addDependency(dependencies, name, version) {
|
|
101
|
+
const normalizedName = name.toLowerCase();
|
|
102
|
+
const canonicalName = canonicalizePythonPackageName(normalizedName);
|
|
103
|
+
const existing = dependencies.get(canonicalName);
|
|
104
|
+
if (existing) {
|
|
105
|
+
existing.names.add(normalizedName);
|
|
106
|
+
if (existing.version !== version) {
|
|
107
|
+
existing.version = 'any';
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
dependencies.set(canonicalName, { names: new Set([normalizedName]), version });
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
//# sourceMappingURL=pythonDependencies.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pythonDependencies.js","sourceRoot":"","sources":["../../src/utils/pythonDependencies.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAG,gCAAgC,CAAC;AACvD,MAAM,YAAY,GAAG,wCAAwC,CAAC;AAC9D,MAAM,UAAU,GAAG,+CAA+C,CAAC;AACnE,MAAM,qBAAqB,GAAG,qEAAqE,CAAC;AAIpG,MAAM,UAAU,0BAA0B,CAAC,OAAe;IACxD,MAAM,gBAAgB,GAAqB,IAAI,GAAG,EAAE,CAAC;IACrD,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9E,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACvD,MAAM,eAAe,GAAG,UAAU,CAAC,WAAW,EAAE,+BAA+B,CAAC,CAAC;IACjF,MAAM,MAAM,GAAG;QACb,GAAG,UAAU,CAAC,WAAW,EAAE,sCAAsC,CAAC;QAClE,GAAG,UAAU,CAAC,eAAe,EAAE,yCAAyC,CAAC;KAC1E,CAAC;IAEF,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC;QAC5B,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YACnD,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5D,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,SAAS;YACX,CAAC;YAED,aAAa,CAAC,gBAAgB,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IAED,OAAO,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,OAAe;IAC3D,MAAM,gBAAgB,GAAqB,IAAI,GAAG,EAAE,CAAC;IAErD,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,sBAAsB,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,SAAS;QACX,CAAC;QAED,aAAa,CAAC,gBAAgB,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,OAAO,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,uBAAuB,CAAC,gBAAkC;IACjE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC/C,KAAK,MAAM,KAAK,IAAI,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC;QAC9C,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAC/B,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,IAAY;IACxD,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,aAAa,CAAC,OAAe;IACpC,OAAO,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,MAA0B,EAAE,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;AAC7F,CAAC;AAED,SAAS,UAAU,CAAC,OAAe,EAAE,IAAY;IAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,cAAc,WAAW,iBAAiB,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzF,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACjE,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,yDAAyD,CAAC,CAAC;IAChG,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,UAAU,CAAC,OAA2B,EAAE,iBAAyB;IACxE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACxD,MAAM,cAAc,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACnE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,oBAAoB,CAAC,UAAkB;IAC9C,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,iCAAiC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;IACpI,OAAO,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,sBAAsB,CAAC,WAAmB;IACjD,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;IACnG,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACrD,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,oBAAoB,CAAC,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC;AACjF,CAAC;AAED,SAAS,6BAA6B,CAAC,WAAmB;IACxD,IAAI,KAAyB,CAAC;IAC9B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,WAAW,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC3D,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC,SAAS,KAAK,GAAG,IAAI,SAAS,KAAK,GAAG,CAAC,IAAI,WAAW,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YAChF,KAAK,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,SAAS,CAAC;QAC/D,CAAC;aACI,IAAI,SAAS,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACvF,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;QAC/C,CAAC;IACH,CAAC;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,aAAa,CAAC,YAA8B,EAAE,IAAY,EAAE,OAAe;IAClF,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1C,MAAM,aAAa,GAAG,6BAA6B,CAAC,cAAc,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IACjD,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACnC,IAAI,QAAQ,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YACjC,QAAQ,CAAC,OAAO,GAAG,KAAK,CAAC;QAC3B,CAAC;IACH,CAAC;SACI,CAAC;QACJ,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,IAAI,GAAG,CAAC,CAAC,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACjF,CAAC;AACH,CAAC"}
|
|
@@ -1,14 +1,17 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import { resolveManifestPaths } from '../utils/manifestPaths.js';
|
|
4
|
+
import { canonicalizePythonPackageName, parsePyprojectDependencies, parseRequirementsDependencies } from '../utils/pythonDependencies.js';
|
|
4
5
|
/**
|
|
5
6
|
* Validates that mentioned dependencies exist in manifest files
|
|
6
7
|
*/
|
|
7
8
|
export class DependencyValidator {
|
|
8
9
|
dependencies;
|
|
10
|
+
pythonDependencies;
|
|
9
11
|
loadedFromKey;
|
|
10
12
|
constructor() {
|
|
11
13
|
this.dependencies = null;
|
|
14
|
+
this.pythonDependencies = new Set();
|
|
12
15
|
this.loadedFromKey = null;
|
|
13
16
|
}
|
|
14
17
|
/** @internal */
|
|
@@ -22,6 +25,7 @@ export class DependencyValidator {
|
|
|
22
25
|
return;
|
|
23
26
|
}
|
|
24
27
|
this.dependencies = new Set();
|
|
28
|
+
this.pythonDependencies = new Set();
|
|
25
29
|
this.loadedFromKey = configKey;
|
|
26
30
|
for (const manifestPath of manifestPaths) {
|
|
27
31
|
const fileName = path.basename(manifestPath);
|
|
@@ -30,6 +34,9 @@ export class DependencyValidator {
|
|
|
30
34
|
const deps = await this.parseManifest(fileName, content);
|
|
31
35
|
for (const dep of deps) {
|
|
32
36
|
this.dependencies.add(dep.toLowerCase());
|
|
37
|
+
if (fileName === 'pyproject.toml' || fileName === 'requirements.txt') {
|
|
38
|
+
this.pythonDependencies.add(canonicalizePythonPackageName(dep));
|
|
39
|
+
}
|
|
33
40
|
}
|
|
34
41
|
}
|
|
35
42
|
catch {
|
|
@@ -47,7 +54,9 @@ export class DependencyValidator {
|
|
|
47
54
|
for (const ref of references) {
|
|
48
55
|
const pkg = ref.value.toLowerCase();
|
|
49
56
|
// Check if package exists in dependencies
|
|
50
|
-
const found =
|
|
57
|
+
const found = ref.ecosystem === 'pypi'
|
|
58
|
+
? this.pythonDependencies.has(canonicalizePythonPackageName(pkg))
|
|
59
|
+
: this.dependencies.has(pkg) || (!ref.ecosystem && this.pythonDependencies.has(canonicalizePythonPackageName(pkg)));
|
|
51
60
|
if (found) {
|
|
52
61
|
results.push({
|
|
53
62
|
reference: ref,
|
|
@@ -71,19 +80,8 @@ const manifestDependencyParsers = {
|
|
|
71
80
|
const json = JSON.parse(content);
|
|
72
81
|
return ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'].flatMap((key) => Object.keys(json[key] || {}));
|
|
73
82
|
},
|
|
74
|
-
'requirements.txt': (content) => content
|
|
75
|
-
|
|
76
|
-
.map((line) => line.trim())
|
|
77
|
-
.filter((line) => line && !line.startsWith('#'))
|
|
78
|
-
.map((line) => line.match(/^([a-zA-Z0-9\-_]+)/)?.[1])
|
|
79
|
-
.filter((dep) => Boolean(dep)),
|
|
80
|
-
'pyproject.toml': (content) => {
|
|
81
|
-
const depsMatch = content.match(/\[project\.dependencies\]([\s\S]*?)(?:\[|$)/);
|
|
82
|
-
if (!depsMatch) {
|
|
83
|
-
return [];
|
|
84
|
-
}
|
|
85
|
-
return Array.from(depsMatch[1].matchAll(/"([^"<>=!]+)/g), (match) => match[1].split(/[<>=!]/)[0]);
|
|
86
|
-
},
|
|
83
|
+
'requirements.txt': (content) => Array.from(parseRequirementsDependencies(content).keys()),
|
|
84
|
+
'pyproject.toml': (content) => Array.from(parsePyprojectDependencies(content).keys()),
|
|
87
85
|
'go.mod': (content) => {
|
|
88
86
|
const requireMatch = content.match(/require\s+\(([\s\S]*?)\)/);
|
|
89
87
|
if (!requireMatch) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencyValidator.js","sourceRoot":"","sources":["../../src/validators/dependencyValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"dependencyValidator.js","sourceRoot":"","sources":["../../src/validators/dependencyValidator.ts"],"names":[],"mappings":"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"}
|