@rsdk/depdoc.cli 6.0.0-next.43 → 6.0.0-next.45
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/DEPDOC_MODEL.md +42 -6
- package/__tests__/config-validation.test.ts +30 -0
- package/__tests__/engine.test.ts +110 -2
- package/__tests__/fixtures/imports/plain-root-file.ts +3 -0
- package/__tests__/fixtures/imports/sidebars.ts +5 -0
- package/__tests__/fixtures/imports/vite.config.ts +3 -0
- package/__tests__/imports.test.ts +42 -1
- package/__tests__/peer-requirements.test.ts +158 -0
- package/dist/bin/depdoc.js +18 -8
- package/dist/bin/depdoc.js.map +1 -1
- package/dist/collectors/workspaces.d.ts +2 -2
- package/dist/collectors/workspaces.js +12 -4
- package/dist/collectors/workspaces.js.map +1 -1
- package/dist/lib/imports.d.ts +4 -2
- package/dist/lib/imports.js +40 -3
- package/dist/lib/imports.js.map +1 -1
- package/dist/lib/peer-requirements.d.ts +36 -0
- package/dist/lib/peer-requirements.js +85 -0
- package/dist/lib/peer-requirements.js.map +1 -0
- package/dist/model/config-validation.d.ts +1 -0
- package/dist/model/config-validation.js +29 -0
- package/dist/model/config-validation.js.map +1 -1
- package/dist/model/diagnostics.js +4 -1
- package/dist/model/diagnostics.js.map +1 -1
- package/dist/model/placement.js +12 -1
- package/dist/model/placement.js.map +1 -1
- package/dist/model/types.d.ts +6 -0
- package/dist/model/types.js.map +1 -1
- package/dist/runner.js +1 -1
- package/dist/runner.js.map +1 -1
- package/package.json +2 -2
- package/src/bin/depdoc.ts +36 -8
- package/src/collectors/workspaces.ts +34 -4
- package/src/lib/imports.ts +57 -2
- package/src/lib/peer-requirements.ts +117 -0
- package/src/model/config-validation.ts +45 -2
- package/src/model/diagnostics.ts +6 -1
- package/src/model/placement.ts +19 -1
- package/src/model/types.ts +14 -0
- package/src/runner.ts +1 -0
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.validateDependencyRules = validateDependencyRules;
|
|
4
4
|
exports.validateIgnoredImports = validateIgnoredImports;
|
|
5
|
+
exports.validateToolingFiles = validateToolingFiles;
|
|
5
6
|
exports.assertValidDependencyModelConfig = assertValidDependencyModelConfig;
|
|
6
7
|
function getRuleMatches(rule) {
|
|
7
8
|
return Array.isArray(rule.match) ? rule.match : [rule.match];
|
|
@@ -33,10 +34,38 @@ function validateIgnoredImports(ignoredImports) {
|
|
|
33
34
|
? []
|
|
34
35
|
: [`ignoredImports[${index}] must be a string`]);
|
|
35
36
|
}
|
|
37
|
+
function isStringOrStringArray(value) {
|
|
38
|
+
return (typeof value === 'string' ||
|
|
39
|
+
(Array.isArray(value) && value.every((item) => typeof item === 'string')));
|
|
40
|
+
}
|
|
41
|
+
function validateToolingFiles(toolingFiles) {
|
|
42
|
+
if (toolingFiles === undefined)
|
|
43
|
+
return [];
|
|
44
|
+
if (!Array.isArray(toolingFiles)) {
|
|
45
|
+
return ['toolingFiles must be an array of { match, workspace? } rules'];
|
|
46
|
+
}
|
|
47
|
+
return toolingFiles.flatMap((item, index) => {
|
|
48
|
+
const label = `toolingFiles[${index}]`;
|
|
49
|
+
if (typeof item !== 'object' || item === null) {
|
|
50
|
+
return [`${label} must be an object with a match field`];
|
|
51
|
+
}
|
|
52
|
+
const rule = item;
|
|
53
|
+
const errors = [];
|
|
54
|
+
if (!isStringOrStringArray(rule.match)) {
|
|
55
|
+
errors.push(`${label}.match must be a string or an array of strings`);
|
|
56
|
+
}
|
|
57
|
+
if (rule.workspace !== undefined &&
|
|
58
|
+
!isStringOrStringArray(rule.workspace)) {
|
|
59
|
+
errors.push(`${label}.workspace must be a string or an array of strings`);
|
|
60
|
+
}
|
|
61
|
+
return errors;
|
|
62
|
+
});
|
|
63
|
+
}
|
|
36
64
|
function assertValidDependencyModelConfig(config) {
|
|
37
65
|
const errors = [
|
|
38
66
|
...validateDependencyRules(config.rules ?? []),
|
|
39
67
|
...validateIgnoredImports(config.ignoredImports),
|
|
68
|
+
...validateToolingFiles(config.toolingFiles),
|
|
40
69
|
];
|
|
41
70
|
if (errors.length === 0)
|
|
42
71
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-validation.js","sourceRoot":"","sources":["../../src/model/config-validation.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"config-validation.js","sourceRoot":"","sources":["../../src/model/config-validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -191,7 +191,10 @@ function validateBasicShape(workspaces, expectedByLocation, rules, violations, w
|
|
|
191
191
|
message: `no package imports were collected from ${workspace.sourceFileCount} source file(s) despite declared dependencies; check source roots and entrypoints before trusting autofix`,
|
|
192
192
|
});
|
|
193
193
|
}
|
|
194
|
-
if (workspace.
|
|
194
|
+
if (workspace.role === 'library' &&
|
|
195
|
+
workspace.hasSrc &&
|
|
196
|
+
!workspace.hasDist &&
|
|
197
|
+
withDts) {
|
|
195
198
|
violations.push({
|
|
196
199
|
code: 'dist-missing',
|
|
197
200
|
workspace: getWorkspaceLabel(workspace),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../src/model/diagnostics.ts"],"names":[],"mappings":";;AA+FA,0CAiGC;AAED,gDA2LC;AAED,gEAmDC;AAED,4CAqBC;AAzcD;;;;;;GAMG;AACH,yCAKoB;AACpB,2CAAyC;AACzC,mCAA6E;AAQ7E,mCAAmC;AAEnC,SAAS,iBAAiB,CAAC,SAAyB;IAClD,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC;AACtD,CAAC;AAED,SAAS,4BAA4B,CAAC,SAAyB;IAC7D,OAAO,IAAI,GAAG,CACZ,gBAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CACzE,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAAC,SAAyB;IACxD,OAAO,gBAAQ,CAAC,IAAI,CAClB,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAClE,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,SAAyB;IACzD,OAAO,SAAS,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;AACzE,CAAC;AAED,SAAS,cAAc,CAAC,IAAoB;IAC1C,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAoB;IAClD,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAoB;IACpD,IAAI,CAAC,IAAI,CAAC,SAAS;QAAE,OAAO,OAAO,CAAC;IAEpC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC;QAClC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;QAC3B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,uBAAuB,CAC9B,IAAoB,EACpB,UAA4B;IAE5B,IAAI,CAAC,IAAI,CAAC,SAAS;QAAE,OAAO,UAAU,CAAC;IAEvC,OAAO,UAAU,CAAC,MAAM,CACtB,CAAC,SAAS,EAAE,EAAE,CACZ,IAAA,uBAAe,EAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAU,CAAC;QAChD,IAAA,uBAAe,EAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAU,CAAC,CACvD,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAC5B,QAAuC,EACvC,QAAgB;IAEhB,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE5B,OAAO,gBAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,4BAA4B,CACnC,SAAyB,EACzB,QAAuC,EACvC,QAAgB;IAEhB,OAAO,CACL,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClC,4BAA4B,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;QACrD,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAC1C,CAAC;AACJ,CAAC;AAED,SAAgB,eAAe,CAC7B,QAA2B,EAC3B,UAAiC;IAEjC,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IACrC,MAAM,WAAW,GAAG,4BAA4B,CAAC,SAAS,CAAC,CAAC;IAC5D,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IAExC,KAAK,MAAM,OAAO,IAAI,gBAAQ,EAAE,CAAC;QAC/B,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YACzD,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,IAAA,6BAAkB,EAAC,QAAQ,EAAE,QAAQ,CAAE,CAAC;QAChE,MAAM,aAAa,GAAG,IAAA,2BAAgB,EAAC,QAAQ,EAAE,QAAQ,CAAE,CAAC;QAC5D,MAAM,aAAa,GAAG,IAAA,6BAAkB,EAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,IAAA,2BAAgB,EAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAE9D,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,UAAU,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE,SAAS;gBACf,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;gBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;gBACrC,UAAU,EAAE,QAAQ;gBACpB,eAAe;gBACf,aAAa;gBACb,OAAO,EAAE,GAAG,QAAQ,oBAAoB,eAAe,EAAE;aAC1D,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,IAAI,aAAa,KAAK,eAAe,EAAE,CAAC;YACtC,UAAU,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe;gBAClE,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;gBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;gBACrC,UAAU,EAAE,QAAQ;gBACpB,aAAa;gBACb,eAAe;gBACf,WAAW,EAAE,WAAW,IAAI,SAAS;gBACrC,aAAa;gBACb,OAAO,EAAE,GAAG,QAAQ,UAAU,aAAa,cAAc,eAAe,EAAE;aAC3E,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;YAClC,UAAU,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE,aAAa;gBACnB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;gBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;gBACrC,UAAU,EAAE,QAAQ;gBACpB,aAAa;gBACb,eAAe;gBACf,WAAW,EAAE,WAAW,IAAI,SAAS;gBACrC,aAAa;gBACb,OAAO,EAAE,GAAG,QAAQ,aAAa,WAAW,cAAc,aAAa,EAAE;aAC1E,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,WAAW,EAAE,CAAC;QACnC,IAAI,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,SAAS;QAC1C,MAAM,aAAa,GAAG,IAAA,6BAAkB,EAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,IAAA,2BAAgB,EAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC9D,MAAM,sBAAsB,GAC1B,SAAS,CAAC,MAAM,IAAI,aAAa,IAAI,aAAa,KAAK,iBAAiB,CAAC;QAE3E,UAAU,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO;YACvD,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;YACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;YACrC,UAAU,EAAE,QAAQ;YACpB,aAAa,EAAE,aAAa,IAAI,SAAS;YACzC,WAAW,EAAE,WAAW,IAAI,SAAS;YACrC,OAAO,EAAE,sBAAsB;gBAC7B,CAAC,CAAC,GAAG,QAAQ,wBAAwB,aAAa,sDAAsD;gBACxG,CAAC,CAAC,GAAG,QAAQ,oDAAoD;SACpE,CAAC,CAAC;IACL,CAAC;IAED,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAChC,SAAS,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CACzC,EAAE,CAAC;QACF,IAAI,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,SAAS;QAE/D,UAAU,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;YACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;YACrC,UAAU,EAAE,QAAQ;YACpB,OAAO,EACL,GAAG,QAAQ,mEAAmE;SACjF,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,SAAgB,kBAAkB,CAChC,UAA4B,EAC5B,kBAAkD,EAClD,KAAuB,EACvB,UAAiC,EACjC,QAA6B,EAC7B,OAAgB;IAEhB,MAAM,cAAc,GAAG,IAAI,GAAG,CAC5B,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAC3D,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACrB,IAAI,SAAS,CAAC,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;gBACnC,UAAU,CAAC,IAAI,CAAC;oBACd,IAAI,EAAE,cAAc;oBACpB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;oBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;oBACrC,OAAO,EAAE,2CAA2C;iBACrD,CAAC,CAAC;YACL,CAAC;YACD,SAAS;QACX,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACxB,UAAU,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE,cAAc;gBACpB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;gBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;gBACrC,OAAO,EAAE,0CAA0C;aACpD,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,CAAC,IAAA,uBAAe,EAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAChD,UAAU,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE,cAAc;gBACpB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;gBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;gBACrC,OAAO,EAAE,wDAAwD,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE;aACtF,CAAC,CAAC;QACL,CAAC;QAED,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,SAAS,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAClD,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,mBAAmB;gBACzB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;gBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;gBACrC,OAAO,EAAE,4CAA4C;aACtD,CAAC,CAAC;QACL,CAAC;QAED,IACE,SAAS,CAAC,IAAI;YACd,SAAS,CAAC,eAAe,KAAK,SAAS;YACvC,SAAS,CAAC,eAAe,GAAG,CAAC;YAC7B,uBAAuB,CAAC,SAAS,CAAC;YAClC,CAAC,wBAAwB,CAAC,SAAS,CAAC,EACpC,CAAC;YACD,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,4BAA4B;gBAClC,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;gBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;gBACrC,OAAO,EACL,0CAA0C,SAAS,CAAC,eAAe,2GAA2G;aACjL,CAAC,CAAC;QACL,CAAC;QAED,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,IAAI,OAAO,EAAE,CAAC;YACtD,UAAU,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE,cAAc;gBACpB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;gBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;gBACrC,OAAO,EAAE,yDAAyD;aACnE,CAAC,CAAC;QACL,CAAC;QAED,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,IAAI,SAAS,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAC7D,KAAK,MAAM,OAAO,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAU,EAAE,CAAC;gBACvE,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;oBACjE,UAAU,CAAC,IAAI,CAAC;wBACd,IAAI,EAAE,mBAAmB;wBACzB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;wBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;wBACrC,UAAU,EAAE,QAAQ;wBACpB,aAAa,EAAE,OAAO;wBACtB,eAAe,EACb,OAAO,KAAK,kBAAkB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS;wBAC7D,OAAO,EAAE,GAAG,OAAO,sBAAsB,SAAS,CAAC,IAAI,aAAa;qBACrE,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YACjC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,CAAC;gBACrE,IAAI,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE,CAAC;oBAC7D,UAAU,CAAC,IAAI,CAAC;wBACd,IAAI,EAAE,mBAAmB;wBACzB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;wBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;wBACrC,UAAU,EAAE,QAAQ;wBACpB,aAAa,EAAE,cAAc;wBAC7B,eAAe,EAAE,kBAAkB;wBACnC,OAAO,EAAE,GAAG,QAAQ,wDAAwD;qBAC7E,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC5D,IAAI,QAAQ,EAAE,CAAC;gBACb,KAAK,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,QAAQ,CAAC,QAAQ;qBAClD,gBAAgB,EAAE,CAAC;oBACpB,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,QAAQ,CAAC,CAAC;oBAC3D,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;wBAC3B,UAAU,CAAC,IAAI,CAAC;4BACd,IAAI,EAAE,QAAQ;4BACd,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;4BACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;4BACrC,UAAU,EAAE,QAAQ;4BACpB,aAAa,EAAE,iBAAiB;4BAChC,eAAe,EAAE,iBAAiB;4BAClC,WAAW,EAAE,QAAQ;4BACrB,aAAa,EAAE,SAAS;4BACxB,OAAO,EAAE,GAAG,QAAQ,4DAA4D;yBACjF,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC,EAAE,CAAC;YACxE,IAAI,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE,CAAC;gBACzD,UAAU,CAAC,IAAI,CAAC;oBACd,IAAI,EAAE,mBAAmB;oBACzB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;oBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;oBACrC,UAAU,EAAE,QAAQ;oBACpB,aAAa,EAAE,iBAAiB;oBAChC,eAAe,EAAE,cAAc;oBAC/B,OAAO,EAAE,GAAG,QAAQ,uDAAuD;iBAC5E,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,KAAK,MAAM,OAAO,IAAI,gBAAQ,EAAE,CAAC;YAC/B,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;gBACjE,MAAM,IAAI,GAAG,IAAA,wBAAgB,EAC3B,KAAK,EACL,QAAQ,EACR,SAAS,CAAC,IAAI,EACd,SAAS,CAAC,QAAQ,CACnB,CAAC;gBACF,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAC5D,IACE,IAAI,CAAC,QAAQ;oBACb,IAAA,sBAAU,EAAC,QAAQ,EAAE,cAAc,CAAC;oBACpC,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAC1C,CAAC;oBACD,UAAU,CAAC,IAAI,CAAC;wBACd,IAAI,EAAE,WAAW;wBACjB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;wBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;wBACrC,UAAU,EAAE,QAAQ;wBACpB,aAAa,EAAE,OAAO;wBACtB,eAAe,EAAE,iBAAiB;wBAClC,OAAO,EAAE,GAAG,QAAQ,iEAAiE;qBACtF,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACnD,IAAI,CAAC,IAAA,sBAAU,EAAC,QAAQ,EAAE,cAAc,CAAC;oBAAE,SAAS;gBACpD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW,CAAC;oBAAE,SAAS;gBAErE,UAAU,CAAC,IAAI,CAAC;oBACd,IAAI,EAAE,iBAAiB;oBACvB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;oBACvC,iBAAiB,EAAE,SAAS,CAAC,QAAQ;oBACrC,UAAU,EAAE,QAAQ;oBACpB,eAAe,EAAE,iBAAiB;oBAClC,OAAO,EAAE,GAAG,QAAQ,uEAAuE;iBAC5F,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAgB,0BAA0B,CACxC,UAA4B,EAC5B,kBAAkD,EAClD,KAAuB;IAEvB,MAAM,UAAU,GAA0B,EAAE,CAAC;IAE7C,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,eAAe,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEzC,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnE,MAAM,cAAc,GAAG,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAEtD,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE,CAAC;YACvC,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAClC,UAAU,CAAC,IAAI,CAAC;oBACd,IAAI,EAAE,YAAY;oBAClB,SAAS,EAAE,QAAQ;oBACnB,iBAAiB,EAAE,GAAG;oBACtB,UAAU,EAAE,QAAQ;oBACpB,OAAO,EACL,GAAG,QAAQ,qEAAqE,cAAc,EAAE;iBACnG,CAAC,CAAC;gBACH,SAAS;YACX,CAAC;YAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CACjD,4BAA4B,CAC1B,SAAS,EACT,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,EAC1C,QAAQ,CACT,CACF,CAAC;YACF,IAAI,MAAM;gBAAE,SAAS;YAErB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC;YAEzE,UAAU,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE,YAAY;gBAClB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ;gBACnE,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG;gBAC5D,UAAU,EAAE,QAAQ;gBACpB,OAAO,EAAE,IAAI,CAAC,SAAS;oBACrB,CAAC,CAAC,GAAG,QAAQ,oCAAoC,cAAc,kDAAkD;oBACjH,CAAC,CAAC,GAAG,QAAQ,wEAAwE;aACxF,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAgB,gBAAgB,CAC9B,UAAiC;IAEjC,MAAM,MAAM,GAA0B,EAAE,CAAC;IACzC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,GAAG,GAAG;YACV,SAAS,CAAC,IAAI;YACd,SAAS,CAAC,iBAAiB;YAC3B,SAAS,CAAC,UAAU,IAAI,EAAE;YAC1B,SAAS,CAAC,aAAa,IAAI,EAAE;YAC7B,SAAS,CAAC,eAAe,IAAI,EAAE;YAC/B,SAAS,CAAC,aAAa,IAAI,EAAE;SAC9B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
1
|
+
{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../src/model/diagnostics.ts"],"names":[],"mappings":"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"}
|
package/dist/model/placement.js
CHANGED
|
@@ -18,6 +18,16 @@ const rules_1 = require("./rules");
|
|
|
18
18
|
function isTestFile(file) {
|
|
19
19
|
return /(^|[/.])(__test__|__tests__|test|tests|spec|e2e)([/.]|$)|\.(spec|test|e2e)\.[cm]?[tj]sx?$/.test(file);
|
|
20
20
|
}
|
|
21
|
+
// Build-tool config files (vite.config.ts, eslint.config.js, ...) import
|
|
22
|
+
// real packages, but those imports are tooling usage, not the workspace's
|
|
23
|
+
// own runtime surface — treat them like test files for placement purposes
|
|
24
|
+
// so they don't get forced into dependencies/peerDependencies. Matched by
|
|
25
|
+
// exact path against the workspace's collected tooling files (not by name
|
|
26
|
+
// pattern), so an app module that merely happens to be named e.g.
|
|
27
|
+
// src/auth.config.ts is never misclassified.
|
|
28
|
+
function isPrivateUsageFile(file, toolingFiles) {
|
|
29
|
+
return isTestFile(file) || toolingFiles.has(file);
|
|
30
|
+
}
|
|
21
31
|
function isExternal(depIdent, workspaceNames) {
|
|
22
32
|
return !workspaceNames.has(depIdent);
|
|
23
33
|
}
|
|
@@ -124,9 +134,10 @@ function addUsageDependencies(expectedByLocation, root, workspaceNames, rules, e
|
|
|
124
134
|
const workspace = expected.workspace;
|
|
125
135
|
if (workspace.isRoot)
|
|
126
136
|
continue;
|
|
137
|
+
const toolingFiles = workspace.toolingFiles ?? new Set();
|
|
127
138
|
for (const [depIdent, usage] of workspace.sourceUsage) {
|
|
128
139
|
const publicType = workspace.dtsImports.has(depIdent);
|
|
129
|
-
const runtime = [...usage.runtimeFiles].some((file) => !
|
|
140
|
+
const runtime = [...usage.runtimeFiles].some((file) => !isPrivateUsageFile(file, toolingFiles));
|
|
130
141
|
const allTestOnly = [...usage.files].every(isTestFile);
|
|
131
142
|
if (runtime || publicType) {
|
|
132
143
|
addPublicDependency(expected, rootExpected, root, workspaceNames, rules, depIdent, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"placement.js","sourceRoot":"","sources":["../../src/model/placement.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"placement.js","sourceRoot":"","sources":["../../src/model/placement.ts"],"names":[],"mappings":"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"}
|
package/dist/model/types.d.ts
CHANGED
|
@@ -16,9 +16,14 @@ export interface DependencyRule {
|
|
|
16
16
|
rootOnly?: boolean;
|
|
17
17
|
required?: boolean;
|
|
18
18
|
}
|
|
19
|
+
export interface ToolingFileRule {
|
|
20
|
+
match: string | string[];
|
|
21
|
+
workspace?: string | string[];
|
|
22
|
+
}
|
|
19
23
|
export interface DependencyModelConfig {
|
|
20
24
|
version?: number;
|
|
21
25
|
ignoredImports?: string[];
|
|
26
|
+
toolingFiles?: ToolingFileRule[];
|
|
22
27
|
rules?: DependencyRule[];
|
|
23
28
|
doctor?: DoctorConfig;
|
|
24
29
|
}
|
|
@@ -67,6 +72,7 @@ export interface WorkspaceFacts {
|
|
|
67
72
|
hasSrc: boolean;
|
|
68
73
|
hasDist: boolean;
|
|
69
74
|
sourceFileCount?: number;
|
|
75
|
+
toolingFiles?: Set<string>;
|
|
70
76
|
}
|
|
71
77
|
export interface WorkspaceContext extends WorkspaceFacts {
|
|
72
78
|
dir: string;
|
package/dist/model/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/model/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/model/types.ts"],"names":[],"mappings":";;;AAgLa,QAAA,QAAQ,GAAkB;IACrC,cAAc;IACd,kBAAkB;IAClB,iBAAiB;CAClB,CAAC"}
|
package/dist/runner.js
CHANGED
|
@@ -24,7 +24,7 @@ function runDependencyModel(options = {}) {
|
|
|
24
24
|
const config = (0, config_1.loadConfig)(rootDir, options.depdocYamlPath);
|
|
25
25
|
const rules = config.rules ?? [];
|
|
26
26
|
const withDts = options.withDts === true;
|
|
27
|
-
const contexts = (0, workspaces_1.loadWorkspaces)(rootDir, withDts, config.ignoredImports ?? []);
|
|
27
|
+
const contexts = (0, workspaces_1.loadWorkspaces)(rootDir, withDts, config.ignoredImports ?? [], config.toolingFiles ?? []);
|
|
28
28
|
const packageExtensions = (0, package_extensions_1.loadPackageExtensions)(rootDir);
|
|
29
29
|
const workspaceNames = new Set(contexts.filter((ws) => !ws.isRoot).map((ws) => ws.name));
|
|
30
30
|
const typeProviderPackages = (0, type_providers_1.collectTypeProviderPackages)(rootDir, contexts[0].pkg, rules);
|
package/dist/runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":";;AAwBA,
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/depdoc.cli",
|
|
3
3
|
"role": "cli",
|
|
4
|
-
"version": "6.0.0-next.
|
|
4
|
+
"version": "6.0.0-next.45",
|
|
5
5
|
"description": "CLI for monorepo dependency management",
|
|
6
6
|
"license": "Apache License 2.0",
|
|
7
7
|
"publishConfig": {
|
|
@@ -18,5 +18,5 @@
|
|
|
18
18
|
"typescript": "5.7.3",
|
|
19
19
|
"yaml": "^2.6.1"
|
|
20
20
|
},
|
|
21
|
-
"gitHead": "
|
|
21
|
+
"gitHead": "6f40a4b06416833bec72e305048d460329827f9e"
|
|
22
22
|
}
|
package/src/bin/depdoc.ts
CHANGED
|
@@ -16,6 +16,10 @@ import {
|
|
|
16
16
|
formatDependencyModelResult,
|
|
17
17
|
runDependencyModel,
|
|
18
18
|
} from '../dependency-model';
|
|
19
|
+
import {
|
|
20
|
+
classifyPeerFailures,
|
|
21
|
+
suggestPackageExtensionsFix,
|
|
22
|
+
} from '../lib/peer-requirements';
|
|
19
23
|
|
|
20
24
|
function printUsage(): void {
|
|
21
25
|
console.error(`${ansi.bold('Usage:')}
|
|
@@ -31,7 +35,10 @@ function spawnStep(label: string, cmd: string, cwd: string): void {
|
|
|
31
35
|
execSync(cmd, { cwd, stdio: 'inherit' });
|
|
32
36
|
}
|
|
33
37
|
|
|
34
|
-
function checkPeerRequirements(
|
|
38
|
+
function checkPeerRequirements(
|
|
39
|
+
cwd: string,
|
|
40
|
+
workspaceNames: ReadonlySet<string>,
|
|
41
|
+
): boolean {
|
|
35
42
|
const cmd = 'yarn explain peer-requirements';
|
|
36
43
|
|
|
37
44
|
console.error(`\n${ansi.cyan('──')} ${ansi.bold('yarn peer requirements')}`);
|
|
@@ -44,6 +51,8 @@ function checkPeerRequirements(cwd: string): boolean {
|
|
|
44
51
|
cwd,
|
|
45
52
|
encoding: 'utf8',
|
|
46
53
|
maxBuffer: 32 * 1024 * 1024,
|
|
54
|
+
// Force plain text: parsing must not depend on the caller's terminal.
|
|
55
|
+
env: { ...process.env, FORCE_COLOR: '0', NO_COLOR: '1' },
|
|
47
56
|
});
|
|
48
57
|
} catch (error) {
|
|
49
58
|
const childError = error as { stdout?: string; stderr?: string };
|
|
@@ -52,19 +61,35 @@ function checkPeerRequirements(cwd: string): boolean {
|
|
|
52
61
|
return false;
|
|
53
62
|
}
|
|
54
63
|
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
|
|
64
|
+
const { vendorFailures, ownershipFailures } = classifyPeerFailures(
|
|
65
|
+
output,
|
|
66
|
+
workspaceNames,
|
|
67
|
+
);
|
|
58
68
|
|
|
59
|
-
if (
|
|
69
|
+
if (vendorFailures.length === 0 && ownershipFailures.length === 0) {
|
|
60
70
|
console.error(ansi.green('✓ peer requirements are satisfied'));
|
|
61
71
|
return true;
|
|
62
72
|
}
|
|
63
73
|
|
|
64
|
-
|
|
74
|
+
if (vendorFailures.length > 0) {
|
|
75
|
+
console.error(
|
|
76
|
+
ansi.yellow(
|
|
77
|
+
`${vendorFailures.length} peer requirement warning(s) between third-party packages only — not fixable by editing this repo's manifests:`,
|
|
78
|
+
),
|
|
79
|
+
);
|
|
80
|
+
console.error(vendorFailures.map((f) => f.raw).join('\n'));
|
|
81
|
+
console.error(
|
|
82
|
+
`\n${ansi.dim('Example fix — add to .yarnrc.yml (adjust names/ranges as needed):')}`,
|
|
83
|
+
);
|
|
84
|
+
console.error(ansi.dim(suggestPackageExtensionsFix(vendorFailures)));
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
if (ownershipFailures.length === 0) return true;
|
|
88
|
+
|
|
65
89
|
console.error(
|
|
66
|
-
ansi.red(
|
|
90
|
+
ansi.red(`\n${ownershipFailures.length} peer requirement(s) failed:`),
|
|
67
91
|
);
|
|
92
|
+
console.error(ownershipFailures.map((f) => f.raw).join('\n'));
|
|
68
93
|
console.error(
|
|
69
94
|
ansi.dim('Run `yarn explain peer-requirements <hash>` for details.'),
|
|
70
95
|
);
|
|
@@ -190,7 +215,10 @@ function runDoctor(): void {
|
|
|
190
215
|
spawnStep('yarn install (post-dts-fix)', 'yarn install', rootDir);
|
|
191
216
|
}
|
|
192
217
|
|
|
193
|
-
|
|
218
|
+
const workspaceNames = new Set(
|
|
219
|
+
afterDtsFix.contexts.map((ctx) => ctx.name),
|
|
220
|
+
);
|
|
221
|
+
if (!checkPeerRequirements(rootDir, workspaceNames)) process.exit(1);
|
|
194
222
|
|
|
195
223
|
if (config.doctor?.lintCmd) {
|
|
196
224
|
spawnStep('lint', config.doctor.lintCmd, rootDir);
|
|
@@ -11,12 +11,13 @@ import path from 'node:path';
|
|
|
11
11
|
|
|
12
12
|
import {
|
|
13
13
|
collectDtsImports,
|
|
14
|
+
collectRootConfigFiles,
|
|
14
15
|
collectSourceFiles,
|
|
15
16
|
collectSourceImportsFromFiles,
|
|
16
17
|
} from '../lib/imports';
|
|
17
18
|
import { readPackageJson } from '../lib/package-json';
|
|
18
|
-
import { isWorkspaceRole } from '../model/rules';
|
|
19
|
-
import type { WorkspaceContext } from '../model/types';
|
|
19
|
+
import { isWorkspaceRole, matchesPatterns } from '../model/rules';
|
|
20
|
+
import type { ToolingFileRule, WorkspaceContext } from '../model/types';
|
|
20
21
|
|
|
21
22
|
import { collectTsConfigPathAliases } from './tsconfig-aliases';
|
|
22
23
|
|
|
@@ -25,18 +26,41 @@ interface YarnWorkspaceInfo {
|
|
|
25
26
|
name: string | null;
|
|
26
27
|
}
|
|
27
28
|
|
|
29
|
+
function getToolingPatternsForWorkspace(
|
|
30
|
+
toolingFileRules: readonly ToolingFileRule[],
|
|
31
|
+
wsName: string,
|
|
32
|
+
wsLocation: string,
|
|
33
|
+
): string[] {
|
|
34
|
+
return toolingFileRules
|
|
35
|
+
.filter(
|
|
36
|
+
(rule) =>
|
|
37
|
+
!rule.workspace ||
|
|
38
|
+
matchesPatterns(wsName, rule.workspace) ||
|
|
39
|
+
matchesPatterns(wsLocation, rule.workspace),
|
|
40
|
+
)
|
|
41
|
+
.flatMap((rule) => (Array.isArray(rule.match) ? rule.match : [rule.match]));
|
|
42
|
+
}
|
|
43
|
+
|
|
28
44
|
function collectUsage(
|
|
29
45
|
workspace: WorkspaceContext,
|
|
30
46
|
withDts: boolean,
|
|
31
47
|
ignoredImports: readonly string[],
|
|
48
|
+
toolingFilePatterns: readonly string[],
|
|
32
49
|
): void {
|
|
33
|
-
const sourceFiles = collectSourceFiles(
|
|
50
|
+
const sourceFiles = collectSourceFiles(
|
|
51
|
+
workspace.dir,
|
|
52
|
+
workspace.pkg,
|
|
53
|
+
toolingFilePatterns,
|
|
54
|
+
);
|
|
34
55
|
const ignoredSpecifiers = [
|
|
35
56
|
...ignoredImports,
|
|
36
57
|
...collectTsConfigPathAliases(workspace.dir),
|
|
37
58
|
];
|
|
38
59
|
|
|
39
60
|
workspace.sourceFileCount = sourceFiles.length;
|
|
61
|
+
workspace.toolingFiles = new Set(
|
|
62
|
+
collectRootConfigFiles(workspace.dir, toolingFilePatterns),
|
|
63
|
+
);
|
|
40
64
|
|
|
41
65
|
for (const entry of collectSourceImportsFromFiles(sourceFiles, {
|
|
42
66
|
ignoredSpecifiers,
|
|
@@ -68,6 +92,7 @@ export function loadWorkspaces(
|
|
|
68
92
|
rootDir: string,
|
|
69
93
|
withDts: boolean,
|
|
70
94
|
ignoredImports: readonly string[] = [],
|
|
95
|
+
toolingFileRules: readonly ToolingFileRule[] = [],
|
|
71
96
|
): WorkspaceContext[] {
|
|
72
97
|
const rootPkg = readPackageJson(rootDir);
|
|
73
98
|
const raw = execSync('yarn workspaces list --json', {
|
|
@@ -112,7 +137,12 @@ export function loadWorkspaces(
|
|
|
112
137
|
hasDist: existsSync(path.join(dir, 'dist')),
|
|
113
138
|
};
|
|
114
139
|
|
|
115
|
-
collectUsage(
|
|
140
|
+
collectUsage(
|
|
141
|
+
ctx,
|
|
142
|
+
withDts,
|
|
143
|
+
ignoredImports,
|
|
144
|
+
getToolingPatternsForWorkspace(toolingFileRules, ctx.name, ctx.location),
|
|
145
|
+
);
|
|
116
146
|
workspaces.push(ctx);
|
|
117
147
|
}
|
|
118
148
|
|
package/src/lib/imports.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* import facts. They do not decide dependency placement; they only normalize
|
|
6
6
|
* specifiers and classify imports as runtime or type-only.
|
|
7
7
|
*/
|
|
8
|
-
import { existsSync, readdirSync, readFileSync } from 'node:fs';
|
|
8
|
+
import { type Dirent,existsSync, readdirSync, readFileSync } from 'node:fs';
|
|
9
9
|
import { builtinModules } from 'node:module';
|
|
10
10
|
import path from 'node:path';
|
|
11
11
|
import ts = require('typescript');
|
|
@@ -45,6 +45,23 @@ const SOURCE_EXTENSIONS = new Set([
|
|
|
45
45
|
|
|
46
46
|
const DTS_RE = /\.d\.(?:c|m)?ts$/;
|
|
47
47
|
const DEFAULT_SOURCE_ROOTS = ['src', 'test', 'tests', '__tests__'];
|
|
48
|
+
|
|
49
|
+
// Build-tool config files conventionally live at the workspace root, outside
|
|
50
|
+
// src/, but still import real runtime dependencies (e.g. vite.config.ts,
|
|
51
|
+
// docusaurus.config.ts). They are scanned non-recursively so unrelated root
|
|
52
|
+
// files aren't picked up. Filenames that don't follow this convention (e.g.
|
|
53
|
+
// Docusaurus' sidebars.ts) aren't matched by default — declare them via
|
|
54
|
+
// depdoc.yml's `toolingFiles` instead.
|
|
55
|
+
const ROOT_CONFIG_FILE_SUFFIXES = [
|
|
56
|
+
'.config.ts',
|
|
57
|
+
'.config.tsx',
|
|
58
|
+
'.config.js',
|
|
59
|
+
'.config.jsx',
|
|
60
|
+
'.config.mjs',
|
|
61
|
+
'.config.cjs',
|
|
62
|
+
'.config.mts',
|
|
63
|
+
'.config.cts',
|
|
64
|
+
];
|
|
48
65
|
const IGNORED_ENTRYPOINT_DIRS = new Set([
|
|
49
66
|
'node_modules',
|
|
50
67
|
'dist',
|
|
@@ -422,9 +439,39 @@ function collectEntrypointGraphFiles(
|
|
|
422
439
|
return [...result];
|
|
423
440
|
}
|
|
424
441
|
|
|
442
|
+
export function isRootConfigFile(
|
|
443
|
+
name: string,
|
|
444
|
+
extraPatterns: readonly string[] = [],
|
|
445
|
+
): boolean {
|
|
446
|
+
return (
|
|
447
|
+
ROOT_CONFIG_FILE_SUFFIXES.some((suffix) => name.endsWith(suffix)) ||
|
|
448
|
+
extraPatterns.some((pattern) => matchesSpecifierPattern(name, pattern))
|
|
449
|
+
);
|
|
450
|
+
}
|
|
451
|
+
|
|
452
|
+
export function collectRootConfigFiles(
|
|
453
|
+
workspaceDir: string,
|
|
454
|
+
extraPatterns: readonly string[] = [],
|
|
455
|
+
): string[] {
|
|
456
|
+
let entries: Dirent[];
|
|
457
|
+
|
|
458
|
+
try {
|
|
459
|
+
entries = readdirSync(workspaceDir, { withFileTypes: true });
|
|
460
|
+
} catch {
|
|
461
|
+
return [];
|
|
462
|
+
}
|
|
463
|
+
|
|
464
|
+
return entries
|
|
465
|
+
.filter(
|
|
466
|
+
(entry) => entry.isFile() && isRootConfigFile(entry.name, extraPatterns),
|
|
467
|
+
)
|
|
468
|
+
.map((entry) => path.join(workspaceDir, entry.name));
|
|
469
|
+
}
|
|
470
|
+
|
|
425
471
|
export function collectSourceFiles(
|
|
426
472
|
srcDirOrWorkspaceDir: string,
|
|
427
473
|
pkg?: PackageJson,
|
|
474
|
+
toolingFilePatterns: readonly string[] = [],
|
|
428
475
|
): string[] {
|
|
429
476
|
if (!pkg) return walkFiles(srcDirOrWorkspaceDir, (name) => isSourceFile(name));
|
|
430
477
|
|
|
@@ -439,6 +486,13 @@ export function collectSourceFiles(
|
|
|
439
486
|
}
|
|
440
487
|
}
|
|
441
488
|
|
|
489
|
+
for (const file of collectRootConfigFiles(
|
|
490
|
+
srcDirOrWorkspaceDir,
|
|
491
|
+
toolingFilePatterns,
|
|
492
|
+
)) {
|
|
493
|
+
files.add(file);
|
|
494
|
+
}
|
|
495
|
+
|
|
442
496
|
for (const file of collectEntrypointGraphFiles(srcDirOrWorkspaceDir, pkg)) {
|
|
443
497
|
files.add(file);
|
|
444
498
|
}
|
|
@@ -459,9 +513,10 @@ export function collectSourceImports(
|
|
|
459
513
|
srcDirOrWorkspaceDir: string,
|
|
460
514
|
pkg?: PackageJson,
|
|
461
515
|
options: ImportCollectionOptions = {},
|
|
516
|
+
toolingFilePatterns: readonly string[] = [],
|
|
462
517
|
): ImportEntry[] {
|
|
463
518
|
return collectSourceImportsFromFiles(
|
|
464
|
-
collectSourceFiles(srcDirOrWorkspaceDir, pkg),
|
|
519
|
+
collectSourceFiles(srcDirOrWorkspaceDir, pkg, toolingFilePatterns),
|
|
465
520
|
options,
|
|
466
521
|
);
|
|
467
522
|
}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Parsing and classification for `yarn explain peer-requirements` output.
|
|
3
|
+
*
|
|
4
|
+
* This lives outside `bin/depdoc.ts` so the parsing/classification logic is
|
|
5
|
+
* unit-testable without spawning Yarn.
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
export interface PeerFailure {
|
|
9
|
+
raw: string;
|
|
10
|
+
provider: string | null;
|
|
11
|
+
peer: string;
|
|
12
|
+
consumer: string | null;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Strips a peer-requirement locator token down to a bare package name:
|
|
17
|
+
* `@scope/name@npm:1.2.3 [hash] and 1 other dependency` -> `@scope/name`.
|
|
18
|
+
* Local workspaces use a `@workspace:` reference instead of `@npm:`.
|
|
19
|
+
*/
|
|
20
|
+
export function extractPackageIdent(token: string): string {
|
|
21
|
+
const withoutSuffix = token.replace(
|
|
22
|
+
/\s+and\s+\d+\s+other\s+dependenc(?:y|ies)\s*$/,
|
|
23
|
+
'',
|
|
24
|
+
);
|
|
25
|
+
const withoutHash = withoutSuffix.replace(/\s*\[[0-9a-f]+\]\s*$/, '');
|
|
26
|
+
const protocolMatch = withoutHash.match(
|
|
27
|
+
/@(?:npm|workspace|patch|portal|link):/,
|
|
28
|
+
);
|
|
29
|
+
|
|
30
|
+
return (
|
|
31
|
+
protocolMatch
|
|
32
|
+
? withoutHash.slice(0, protocolMatch.index)
|
|
33
|
+
: withoutHash
|
|
34
|
+
).trim();
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
export function parsePeerFailureLine(line: string): PeerFailure {
|
|
38
|
+
const match = line.match(/✘\s+(.+?)\s+doesn't provide\s+(\S+)\s+to\s+(.+)$/);
|
|
39
|
+
|
|
40
|
+
if (!match) return { raw: line, provider: null, peer: '', consumer: null };
|
|
41
|
+
|
|
42
|
+
const [, providerToken, peer, consumerToken] = match;
|
|
43
|
+
|
|
44
|
+
return {
|
|
45
|
+
raw: line,
|
|
46
|
+
provider: extractPackageIdent(providerToken!),
|
|
47
|
+
peer: peer!,
|
|
48
|
+
consumer: extractPackageIdent(consumerToken!),
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* A failure only qualifies as vendor-only when both sides were parsed and
|
|
54
|
+
* neither is a workspace of this repo. Unparseable lines default to
|
|
55
|
+
* ownership-related (blocking) rather than being silently downgraded.
|
|
56
|
+
*/
|
|
57
|
+
export function isVendorOnly(
|
|
58
|
+
failure: PeerFailure,
|
|
59
|
+
workspaceNames: ReadonlySet<string>,
|
|
60
|
+
): boolean {
|
|
61
|
+
return (
|
|
62
|
+
failure.provider !== null &&
|
|
63
|
+
failure.consumer !== null &&
|
|
64
|
+
!workspaceNames.has(failure.provider) &&
|
|
65
|
+
!workspaceNames.has(failure.consumer)
|
|
66
|
+
);
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
export interface ClassifiedPeerFailures {
|
|
70
|
+
vendorFailures: PeerFailure[];
|
|
71
|
+
ownershipFailures: PeerFailure[];
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
export function classifyPeerFailures(
|
|
75
|
+
output: string,
|
|
76
|
+
workspaceNames: ReadonlySet<string>,
|
|
77
|
+
): ClassifiedPeerFailures {
|
|
78
|
+
const failures = output
|
|
79
|
+
.split(/\r?\n/)
|
|
80
|
+
.filter((line) => line.includes('✘'))
|
|
81
|
+
.map(parsePeerFailureLine);
|
|
82
|
+
|
|
83
|
+
return {
|
|
84
|
+
vendorFailures: failures.filter((f) => isVendorOnly(f, workspaceNames)),
|
|
85
|
+
ownershipFailures: failures.filter((f) => !isVendorOnly(f, workspaceNames)),
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/**
|
|
90
|
+
* Renders an illustrative `packageExtensions` block for `.yarnrc.yml` showing
|
|
91
|
+
* the shape of the canonical fix (see P3): declare the missing peer as a
|
|
92
|
+
* `dependencies` override on the package that should have provided it.
|
|
93
|
+
*/
|
|
94
|
+
export function suggestPackageExtensionsFix(
|
|
95
|
+
failures: readonly PeerFailure[],
|
|
96
|
+
): string {
|
|
97
|
+
const peersByProvider = new Map<string, Set<string>>();
|
|
98
|
+
|
|
99
|
+
for (const failure of failures) {
|
|
100
|
+
if (!failure.provider || !failure.peer) continue;
|
|
101
|
+
if (!peersByProvider.has(failure.provider)) {
|
|
102
|
+
peersByProvider.set(failure.provider, new Set());
|
|
103
|
+
}
|
|
104
|
+
peersByProvider.get(failure.provider)!.add(failure.peer);
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
const lines = ['packageExtensions:'];
|
|
108
|
+
|
|
109
|
+
for (const [provider, peers] of peersByProvider) {
|
|
110
|
+
lines.push(` "${provider}@*":`);
|
|
111
|
+
lines.push(' dependencies:');
|
|
112
|
+
for (const peer of peers) {
|
|
113
|
+
lines.push(` "${peer}": "*"`);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return lines.join('\n');
|
|
117
|
+
}
|