@paretools/cargo 0.8.4 → 0.9.0
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/lib/cargo-runner.d.ts +1 -1
- package/dist/lib/cargo-runner.d.ts.map +1 -1
- package/dist/lib/cargo-runner.js +2 -2
- package/dist/lib/cargo-runner.js.map +1 -1
- package/dist/lib/formatters.d.ts +29 -8
- package/dist/lib/formatters.d.ts.map +1 -1
- package/dist/lib/formatters.js +166 -45
- package/dist/lib/formatters.js.map +1 -1
- package/dist/lib/parsers.d.ts +78 -18
- package/dist/lib/parsers.d.ts.map +1 -1
- package/dist/lib/parsers.js +613 -60
- package/dist/lib/parsers.js.map +1 -1
- package/dist/schemas/index.d.ts +94 -9
- package/dist/schemas/index.d.ts.map +1 -1
- package/dist/schemas/index.js +88 -11
- package/dist/schemas/index.js.map +1 -1
- package/dist/tools/add.d.ts.map +1 -1
- package/dist/tools/add.js +71 -4
- package/dist/tools/add.js.map +1 -1
- package/dist/tools/audit.d.ts.map +1 -1
- package/dist/tools/audit.js +80 -4
- package/dist/tools/audit.js.map +1 -1
- package/dist/tools/build.d.ts.map +1 -1
- package/dist/tools/build.js +91 -2
- package/dist/tools/build.js.map +1 -1
- package/dist/tools/check.d.ts.map +1 -1
- package/dist/tools/check.js +84 -1
- package/dist/tools/check.js.map +1 -1
- package/dist/tools/clippy.d.ts.map +1 -1
- package/dist/tools/clippy.js +139 -3
- package/dist/tools/clippy.js.map +1 -1
- package/dist/tools/doc.d.ts.map +1 -1
- package/dist/tools/doc.js +81 -3
- package/dist/tools/doc.js.map +1 -1
- package/dist/tools/fmt.d.ts.map +1 -1
- package/dist/tools/fmt.js +66 -2
- package/dist/tools/fmt.js.map +1 -1
- package/dist/tools/remove.d.ts.map +1 -1
- package/dist/tools/remove.js +59 -4
- package/dist/tools/remove.js.map +1 -1
- package/dist/tools/run.d.ts.map +1 -1
- package/dist/tools/run.js +103 -3
- package/dist/tools/run.js.map +1 -1
- package/dist/tools/test.d.ts.map +1 -1
- package/dist/tools/test.js +108 -3
- package/dist/tools/test.js.map +1 -1
- package/dist/tools/tree.d.ts.map +1 -1
- package/dist/tools/tree.js +119 -9
- package/dist/tools/tree.js.map +1 -1
- package/dist/tools/update.d.ts.map +1 -1
- package/dist/tools/update.js +64 -5
- package/dist/tools/update.js.map +1 -1
- package/package.json +2 -2
package/dist/tools/doc.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
-
import { compactDualOutput, INPUT_LIMITS } from "@paretools/shared";
|
|
2
|
+
import { compactDualOutput, assertNoFlagInjection, INPUT_LIMITS } from "@paretools/shared";
|
|
3
3
|
import { cargo } from "../lib/cargo-runner.js";
|
|
4
4
|
import { parseCargoDocOutput } from "../lib/parsers.js";
|
|
5
5
|
import { formatCargoDoc, compactDocMap, formatDocCompact } from "../lib/formatters.js";
|
|
@@ -25,6 +25,56 @@ export function registerDocTool(server) {
|
|
|
25
25
|
.optional()
|
|
26
26
|
.default(false)
|
|
27
27
|
.describe("Skip building documentation for dependencies (--no-deps)"),
|
|
28
|
+
documentPrivateItems: z
|
|
29
|
+
.boolean()
|
|
30
|
+
.optional()
|
|
31
|
+
.default(false)
|
|
32
|
+
.describe("Include private items in the generated documentation (--document-private-items)"),
|
|
33
|
+
workspace: z
|
|
34
|
+
.boolean()
|
|
35
|
+
.optional()
|
|
36
|
+
.default(false)
|
|
37
|
+
.describe("Generate documentation for all packages in the workspace (--workspace)"),
|
|
38
|
+
package: z
|
|
39
|
+
.string()
|
|
40
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
41
|
+
.optional()
|
|
42
|
+
.describe("Package to document in a workspace (-p <SPEC>)"),
|
|
43
|
+
features: z
|
|
44
|
+
.array(z.string().max(INPUT_LIMITS.SHORT_STRING_MAX))
|
|
45
|
+
.max(INPUT_LIMITS.ARRAY_MAX)
|
|
46
|
+
.optional()
|
|
47
|
+
.describe("Space or comma separated list of features to activate (--features)"),
|
|
48
|
+
allFeatures: z
|
|
49
|
+
.boolean()
|
|
50
|
+
.optional()
|
|
51
|
+
.default(false)
|
|
52
|
+
.describe("Activate all available features (--all-features)"),
|
|
53
|
+
noDefaultFeatures: z
|
|
54
|
+
.boolean()
|
|
55
|
+
.optional()
|
|
56
|
+
.default(false)
|
|
57
|
+
.describe("Do not activate the default feature (--no-default-features)"),
|
|
58
|
+
target: z
|
|
59
|
+
.string()
|
|
60
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
61
|
+
.optional()
|
|
62
|
+
.describe("Generate docs for the target triple (--target <TRIPLE>)"),
|
|
63
|
+
locked: z
|
|
64
|
+
.boolean()
|
|
65
|
+
.optional()
|
|
66
|
+
.default(false)
|
|
67
|
+
.describe("Require Cargo.lock is up to date (--locked)"),
|
|
68
|
+
frozen: z
|
|
69
|
+
.boolean()
|
|
70
|
+
.optional()
|
|
71
|
+
.default(false)
|
|
72
|
+
.describe("Require Cargo.lock and cache are up to date (--frozen)"),
|
|
73
|
+
offline: z
|
|
74
|
+
.boolean()
|
|
75
|
+
.optional()
|
|
76
|
+
.default(false)
|
|
77
|
+
.describe("Run without accessing the network (--offline)"),
|
|
28
78
|
compact: z
|
|
29
79
|
.boolean()
|
|
30
80
|
.optional()
|
|
@@ -32,15 +82,43 @@ export function registerDocTool(server) {
|
|
|
32
82
|
.describe("Auto-compact when structured output exceeds raw CLI tokens. Set false to always get full schema."),
|
|
33
83
|
},
|
|
34
84
|
outputSchema: CargoDocResultSchema,
|
|
35
|
-
}, async ({ path, open, noDeps, compact }) => {
|
|
85
|
+
}, async ({ path, open, noDeps, documentPrivateItems, workspace, package: pkg, features, allFeatures, noDefaultFeatures, target, locked, frozen, offline, compact, }) => {
|
|
36
86
|
const cwd = path || process.cwd();
|
|
87
|
+
if (pkg)
|
|
88
|
+
assertNoFlagInjection(pkg, "package");
|
|
89
|
+
if (target)
|
|
90
|
+
assertNoFlagInjection(target, "target");
|
|
37
91
|
const args = ["doc"];
|
|
38
92
|
if (noDeps)
|
|
39
93
|
args.push("--no-deps");
|
|
40
94
|
if (open)
|
|
41
95
|
args.push("--open");
|
|
96
|
+
if (documentPrivateItems)
|
|
97
|
+
args.push("--document-private-items");
|
|
98
|
+
if (workspace)
|
|
99
|
+
args.push("--workspace");
|
|
100
|
+
if (pkg)
|
|
101
|
+
args.push("-p", pkg);
|
|
102
|
+
if (features && features.length > 0) {
|
|
103
|
+
for (const f of features) {
|
|
104
|
+
assertNoFlagInjection(f, "features");
|
|
105
|
+
}
|
|
106
|
+
args.push("--features", features.join(","));
|
|
107
|
+
}
|
|
108
|
+
if (allFeatures)
|
|
109
|
+
args.push("--all-features");
|
|
110
|
+
if (noDefaultFeatures)
|
|
111
|
+
args.push("--no-default-features");
|
|
112
|
+
if (target)
|
|
113
|
+
args.push("--target", target);
|
|
114
|
+
if (locked)
|
|
115
|
+
args.push("--locked");
|
|
116
|
+
if (frozen)
|
|
117
|
+
args.push("--frozen");
|
|
118
|
+
if (offline)
|
|
119
|
+
args.push("--offline");
|
|
42
120
|
const result = await cargo(args, cwd);
|
|
43
|
-
const data = parseCargoDocOutput(result.stderr, result.exitCode);
|
|
121
|
+
const data = parseCargoDocOutput(result.stderr, result.exitCode, cwd);
|
|
44
122
|
return compactDualOutput(data, result.stderr, formatCargoDoc, compactDocMap, formatDocCompact, compact === false);
|
|
45
123
|
});
|
|
46
124
|
}
|
package/dist/tools/doc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doc.js","sourceRoot":"","sources":["../../src/tools/doc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"doc.js","sourceRoot":"","sources":["../../src/tools/doc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,wDAAwD;AACxD,MAAM,UAAU,eAAe,CAAC,MAAiB;IAC/C,MAAM,CAAC,YAAY,CACjB,KAAK,EACL;QACE,KAAK,EAAE,WAAW;QAClB,WAAW,EACT,oIAAoI;QACtI,WAAW,EAAE;YACX,IAAI,EAAE,CAAC;iBACJ,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC;iBAC1B,QAAQ,EAAE;iBACV,QAAQ,CAAC,kCAAkC,CAAC;YAC/C,IAAI,EAAE,CAAC;iBACJ,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,uCAAuC,CAAC;YACpD,MAAM,EAAE,CAAC;iBACN,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,0DAA0D,CAAC;YACvE,oBAAoB,EAAE,CAAC;iBACpB,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CACP,iFAAiF,CAClF;YACH,SAAS,EAAE,CAAC;iBACT,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,wEAAwE,CAAC;YACrF,OAAO,EAAE,CAAC;iBACP,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC;iBAClC,QAAQ,EAAE;iBACV,QAAQ,CAAC,gDAAgD,CAAC;YAC7D,QAAQ,EAAE,CAAC;iBACR,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;iBACpD,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC;iBAC3B,QAAQ,EAAE;iBACV,QAAQ,CAAC,oEAAoE,CAAC;YACjF,WAAW,EAAE,CAAC;iBACX,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,kDAAkD,CAAC;YAC/D,iBAAiB,EAAE,CAAC;iBACjB,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,6DAA6D,CAAC;YAC1E,MAAM,EAAE,CAAC;iBACN,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC;iBAClC,QAAQ,EAAE;iBACV,QAAQ,CAAC,yDAAyD,CAAC;YACtE,MAAM,EAAE,CAAC;iBACN,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,6CAA6C,CAAC;YAC1D,MAAM,EAAE,CAAC;iBACN,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,wDAAwD,CAAC;YACrE,OAAO,EAAE,CAAC;iBACP,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,+CAA+C,CAAC;YAC5D,OAAO,EAAE,CAAC;iBACP,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,IAAI,CAAC;iBACb,QAAQ,CACP,kGAAkG,CACnG;SACJ;QACD,YAAY,EAAE,oBAAoB;KACnC,EACD,KAAK,EAAE,EACL,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,oBAAoB,EACpB,SAAS,EACT,OAAO,EAAE,GAAG,EACZ,QAAQ,EACR,WAAW,EACX,iBAAiB,EACjB,MAAM,EACN,MAAM,EACN,MAAM,EACN,OAAO,EACP,OAAO,GACR,EAAE,EAAE;QACH,MAAM,GAAG,GAAG,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAClC,IAAI,GAAG;YAAE,qBAAqB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAC/C,IAAI,MAAM;YAAE,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAEpD,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QACrB,IAAI,MAAM;YAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACnC,IAAI,IAAI;YAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,oBAAoB;YAAE,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAChE,IAAI,SAAS;YAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACxC,IAAI,GAAG;YAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC9B,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;gBACzB,qBAAqB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;YACvC,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,WAAW;YAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC7C,IAAI,iBAAiB;YAAE,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC1D,IAAI,MAAM;YAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC1C,IAAI,MAAM;YAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,IAAI,MAAM;YAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,IAAI,OAAO;YAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEpC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACtC,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACtE,OAAO,iBAAiB,CACtB,IAAI,EACJ,MAAM,CAAC,MAAM,EACb,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,OAAO,KAAK,KAAK,CAClB,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC"}
|
package/dist/tools/fmt.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fmt.d.ts","sourceRoot":"","sources":["../../src/tools/fmt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,wDAAwD;AACxD,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"fmt.d.ts","sourceRoot":"","sources":["../../src/tools/fmt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,wDAAwD;AACxD,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,QAgHhD"}
|
package/dist/tools/fmt.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
-
import { compactDualOutput, INPUT_LIMITS } from "@paretools/shared";
|
|
2
|
+
import { compactDualOutput, assertNoFlagInjection, INPUT_LIMITS } from "@paretools/shared";
|
|
3
3
|
import { cargo } from "../lib/cargo-runner.js";
|
|
4
4
|
import { parseCargoFmtOutput } from "../lib/parsers.js";
|
|
5
5
|
import { formatCargoFmt, compactFmtMap, formatFmtCompact } from "../lib/formatters.js";
|
|
@@ -20,6 +20,39 @@ export function registerFmtTool(server) {
|
|
|
20
20
|
.optional()
|
|
21
21
|
.default(false)
|
|
22
22
|
.describe("Check only without modifying files (--check)"),
|
|
23
|
+
all: z
|
|
24
|
+
.boolean()
|
|
25
|
+
.optional()
|
|
26
|
+
.default(false)
|
|
27
|
+
.describe("Format all packages in the workspace (--all)"),
|
|
28
|
+
backup: z
|
|
29
|
+
.boolean()
|
|
30
|
+
.optional()
|
|
31
|
+
.default(false)
|
|
32
|
+
.describe("Create backup files before formatting (--backup)"),
|
|
33
|
+
package: z
|
|
34
|
+
.string()
|
|
35
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
36
|
+
.optional()
|
|
37
|
+
.describe("Package to format in a workspace (-p <NAME>)"),
|
|
38
|
+
edition: z
|
|
39
|
+
.enum(["2015", "2018", "2021", "2024"])
|
|
40
|
+
.optional()
|
|
41
|
+
.describe("Rust edition for formatting rules (-- --edition <EDITION>)"),
|
|
42
|
+
config: z
|
|
43
|
+
.string()
|
|
44
|
+
.max(INPUT_LIMITS.STRING_MAX)
|
|
45
|
+
.optional()
|
|
46
|
+
.describe("Rustfmt configuration options (-- --config <KEY=VALUE>)"),
|
|
47
|
+
configPath: z
|
|
48
|
+
.string()
|
|
49
|
+
.max(INPUT_LIMITS.PATH_MAX)
|
|
50
|
+
.optional()
|
|
51
|
+
.describe("Path to rustfmt config file (-- --config-path <PATH>)"),
|
|
52
|
+
emit: z
|
|
53
|
+
.enum(["files", "stdout"])
|
|
54
|
+
.optional()
|
|
55
|
+
.describe("Output mode for rustfmt (-- --emit <MODE>)"),
|
|
23
56
|
compact: z
|
|
24
57
|
.boolean()
|
|
25
58
|
.optional()
|
|
@@ -27,11 +60,42 @@ export function registerFmtTool(server) {
|
|
|
27
60
|
.describe("Auto-compact when structured output exceeds raw CLI tokens. Set false to always get full schema."),
|
|
28
61
|
},
|
|
29
62
|
outputSchema: CargoFmtResultSchema,
|
|
30
|
-
}, async ({ path, check, compact }) => {
|
|
63
|
+
}, async ({ path, check, all, backup, package: pkg, edition, config, configPath, emit, compact, }) => {
|
|
31
64
|
const cwd = path || process.cwd();
|
|
65
|
+
if (pkg)
|
|
66
|
+
assertNoFlagInjection(pkg, "package");
|
|
67
|
+
if (configPath)
|
|
68
|
+
assertNoFlagInjection(configPath, "configPath");
|
|
32
69
|
const args = ["fmt"];
|
|
70
|
+
if (pkg)
|
|
71
|
+
args.push("-p", pkg);
|
|
33
72
|
if (check)
|
|
34
73
|
args.push("--check");
|
|
74
|
+
if (all)
|
|
75
|
+
args.push("--all");
|
|
76
|
+
// Rustfmt args go after --
|
|
77
|
+
const rustfmtArgs = [];
|
|
78
|
+
if (backup)
|
|
79
|
+
rustfmtArgs.push("--backup");
|
|
80
|
+
if (edition)
|
|
81
|
+
rustfmtArgs.push("--edition", edition);
|
|
82
|
+
if (config)
|
|
83
|
+
rustfmtArgs.push("--config", config);
|
|
84
|
+
if (configPath)
|
|
85
|
+
rustfmtArgs.push("--config-path", configPath);
|
|
86
|
+
if (emit)
|
|
87
|
+
rustfmtArgs.push("--emit", emit);
|
|
88
|
+
// Gap #92: In check mode, use --files-with-diff for more reliable file detection
|
|
89
|
+
// In non-check mode, pass -l (--files-with-diff) to get list of reformatted files
|
|
90
|
+
if (check) {
|
|
91
|
+
rustfmtArgs.push("--files-with-diff");
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
rustfmtArgs.push("-l");
|
|
95
|
+
}
|
|
96
|
+
if (rustfmtArgs.length > 0) {
|
|
97
|
+
args.push("--", ...rustfmtArgs);
|
|
98
|
+
}
|
|
35
99
|
const result = await cargo(args, cwd);
|
|
36
100
|
const data = parseCargoFmtOutput(result.stdout, result.stderr, result.exitCode, !!check);
|
|
37
101
|
return compactDualOutput(data, result.stdout + result.stderr, formatCargoFmt, compactFmtMap, formatFmtCompact, compact === false);
|
package/dist/tools/fmt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fmt.js","sourceRoot":"","sources":["../../src/tools/fmt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"fmt.js","sourceRoot":"","sources":["../../src/tools/fmt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../../src/tools/remove.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,2DAA2D;AAC3D,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../../src/tools/remove.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,2DAA2D;AAC3D,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,SAAS,QA6GnD"}
|
package/dist/tools/remove.js
CHANGED
|
@@ -20,6 +20,41 @@ export function registerRemoveTool(server) {
|
|
|
20
20
|
.max(INPUT_LIMITS.ARRAY_MAX)
|
|
21
21
|
.describe("Package names to remove"),
|
|
22
22
|
dev: z.boolean().optional().default(false).describe("Remove from dev dependencies (--dev)"),
|
|
23
|
+
build: z
|
|
24
|
+
.boolean()
|
|
25
|
+
.optional()
|
|
26
|
+
.default(false)
|
|
27
|
+
.describe("Remove from build dependencies (--build)"),
|
|
28
|
+
dryRun: z
|
|
29
|
+
.boolean()
|
|
30
|
+
.optional()
|
|
31
|
+
.default(false)
|
|
32
|
+
.describe("Preview what would be removed without modifying Cargo.toml (--dry-run)"),
|
|
33
|
+
package: z
|
|
34
|
+
.string()
|
|
35
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
36
|
+
.optional()
|
|
37
|
+
.describe("Package to target in a workspace (-p <SPEC>)"),
|
|
38
|
+
locked: z
|
|
39
|
+
.boolean()
|
|
40
|
+
.optional()
|
|
41
|
+
.default(false)
|
|
42
|
+
.describe("Require Cargo.lock is up to date (--locked)"),
|
|
43
|
+
frozen: z
|
|
44
|
+
.boolean()
|
|
45
|
+
.optional()
|
|
46
|
+
.default(false)
|
|
47
|
+
.describe("Require Cargo.lock and cache are up to date (--frozen)"),
|
|
48
|
+
offline: z
|
|
49
|
+
.boolean()
|
|
50
|
+
.optional()
|
|
51
|
+
.default(false)
|
|
52
|
+
.describe("Run without accessing the network (--offline)"),
|
|
53
|
+
manifestPath: z
|
|
54
|
+
.string()
|
|
55
|
+
.max(INPUT_LIMITS.PATH_MAX)
|
|
56
|
+
.optional()
|
|
57
|
+
.describe("Path to Cargo.toml (--manifest-path <PATH>)"),
|
|
23
58
|
compact: z
|
|
24
59
|
.boolean()
|
|
25
60
|
.optional()
|
|
@@ -27,16 +62,36 @@ export function registerRemoveTool(server) {
|
|
|
27
62
|
.describe("Auto-compact when structured output exceeds raw CLI tokens. Set false to always get full schema."),
|
|
28
63
|
},
|
|
29
64
|
outputSchema: CargoRemoveResultSchema,
|
|
30
|
-
}, async ({ path, packages, dev, compact }) => {
|
|
65
|
+
}, async ({ path, packages, dev, build, dryRun, package: pkg, locked, frozen, offline, manifestPath, compact, }) => {
|
|
31
66
|
const cwd = path || process.cwd();
|
|
32
|
-
for (const
|
|
33
|
-
assertNoFlagInjection(
|
|
67
|
+
for (const p of packages) {
|
|
68
|
+
assertNoFlagInjection(p, "packages");
|
|
34
69
|
}
|
|
70
|
+
if (pkg)
|
|
71
|
+
assertNoFlagInjection(pkg, "package");
|
|
72
|
+
if (manifestPath)
|
|
73
|
+
assertNoFlagInjection(manifestPath, "manifestPath");
|
|
35
74
|
const args = ["remove", ...packages];
|
|
36
75
|
if (dev)
|
|
37
76
|
args.push("--dev");
|
|
77
|
+
if (build)
|
|
78
|
+
args.push("--build");
|
|
79
|
+
if (dryRun)
|
|
80
|
+
args.push("--dry-run");
|
|
81
|
+
if (pkg)
|
|
82
|
+
args.push("-p", pkg);
|
|
83
|
+
if (locked)
|
|
84
|
+
args.push("--locked");
|
|
85
|
+
if (frozen)
|
|
86
|
+
args.push("--frozen");
|
|
87
|
+
if (offline)
|
|
88
|
+
args.push("--offline");
|
|
89
|
+
if (manifestPath)
|
|
90
|
+
args.push("--manifest-path", manifestPath);
|
|
91
|
+
// Gap #93: Determine dependency type from flags
|
|
92
|
+
const depType = dev ? "dev" : build ? "build" : "normal";
|
|
38
93
|
const result = await cargo(args, cwd);
|
|
39
|
-
const data = parseCargoRemoveOutput(result.stdout, result.stderr, result.exitCode);
|
|
94
|
+
const data = parseCargoRemoveOutput(result.stdout, result.stderr, result.exitCode, depType);
|
|
40
95
|
return compactDualOutput(data, result.stdout + result.stderr, formatCargoRemove, compactRemoveMap, formatRemoveCompact, compact === false);
|
|
41
96
|
});
|
|
42
97
|
}
|
package/dist/tools/remove.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../src/tools/remove.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChG,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,2DAA2D;AAC3D,MAAM,UAAU,kBAAkB,CAAC,MAAiB;IAClD,MAAM,CAAC,YAAY,CACjB,QAAQ,EACR;QACE,KAAK,EAAE,cAAc;QACrB,WAAW,EACT,gIAAgI;QAClI,WAAW,EAAE;YACX,IAAI,EAAE,CAAC;iBACJ,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC;iBAC1B,QAAQ,EAAE;iBACV,QAAQ,CAAC,kCAAkC,CAAC;YAC/C,QAAQ,EAAE,CAAC;iBACR,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;iBACpD,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC;iBAC3B,QAAQ,CAAC,yBAAyB,CAAC;YACtC,GAAG,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,sCAAsC,CAAC;YAC3F,OAAO,EAAE,CAAC;iBACP,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,IAAI,CAAC;iBACb,QAAQ,CACP,kGAAkG,CACnG;SACJ;QACD,YAAY,EAAE,uBAAuB;KACtC,EACD,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../src/tools/remove.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/run.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/tools/run.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,wDAAwD;AACxD,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/tools/run.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,wDAAwD;AACxD,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,QAmLhD"}
|
package/dist/tools/run.js
CHANGED
|
@@ -26,6 +26,72 @@ export function registerRunTool(server) {
|
|
|
26
26
|
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
27
27
|
.optional()
|
|
28
28
|
.describe("Package to run in a workspace"),
|
|
29
|
+
bin: z
|
|
30
|
+
.string()
|
|
31
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
32
|
+
.optional()
|
|
33
|
+
.describe("Name of the binary to run (--bin <NAME>) for multi-binary crates"),
|
|
34
|
+
example: z
|
|
35
|
+
.string()
|
|
36
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
37
|
+
.optional()
|
|
38
|
+
.describe("Name of the example to run (--example <NAME>)"),
|
|
39
|
+
features: z
|
|
40
|
+
.array(z.string().max(INPUT_LIMITS.SHORT_STRING_MAX))
|
|
41
|
+
.max(INPUT_LIMITS.ARRAY_MAX)
|
|
42
|
+
.optional()
|
|
43
|
+
.describe("Space or comma separated list of features to activate (--features)"),
|
|
44
|
+
allFeatures: z
|
|
45
|
+
.boolean()
|
|
46
|
+
.optional()
|
|
47
|
+
.default(false)
|
|
48
|
+
.describe("Activate all available features (--all-features)"),
|
|
49
|
+
noDefaultFeatures: z
|
|
50
|
+
.boolean()
|
|
51
|
+
.optional()
|
|
52
|
+
.default(false)
|
|
53
|
+
.describe("Do not activate the default feature (--no-default-features)"),
|
|
54
|
+
timeout: z
|
|
55
|
+
.number()
|
|
56
|
+
.int()
|
|
57
|
+
.min(1000)
|
|
58
|
+
.max(600000)
|
|
59
|
+
.optional()
|
|
60
|
+
.describe("Execution timeout in milliseconds. Overrides the default 300s. " +
|
|
61
|
+
"Min: 1000 (1s), Max: 600000 (10m)."),
|
|
62
|
+
profile: z
|
|
63
|
+
.string()
|
|
64
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
65
|
+
.optional()
|
|
66
|
+
.describe("Build with a custom profile (--profile <NAME>)"),
|
|
67
|
+
target: z
|
|
68
|
+
.string()
|
|
69
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
70
|
+
.optional()
|
|
71
|
+
.describe("Run for the target triple (--target <TRIPLE>)"),
|
|
72
|
+
locked: z
|
|
73
|
+
.boolean()
|
|
74
|
+
.optional()
|
|
75
|
+
.default(false)
|
|
76
|
+
.describe("Require Cargo.lock is up to date (--locked)"),
|
|
77
|
+
frozen: z
|
|
78
|
+
.boolean()
|
|
79
|
+
.optional()
|
|
80
|
+
.default(false)
|
|
81
|
+
.describe("Require Cargo.lock and cache are up to date (--frozen)"),
|
|
82
|
+
offline: z
|
|
83
|
+
.boolean()
|
|
84
|
+
.optional()
|
|
85
|
+
.default(false)
|
|
86
|
+
.describe("Run without accessing the network (--offline)"),
|
|
87
|
+
maxOutputSize: z
|
|
88
|
+
.number()
|
|
89
|
+
.int()
|
|
90
|
+
.min(1024)
|
|
91
|
+
.max(10485760)
|
|
92
|
+
.optional()
|
|
93
|
+
.default(1048576)
|
|
94
|
+
.describe("Maximum size in bytes for stdout/stderr before truncation. Default: 1048576 (1MB). Min: 1024, Max: 10485760 (10MB)."),
|
|
29
95
|
compact: z
|
|
30
96
|
.boolean()
|
|
31
97
|
.optional()
|
|
@@ -33,10 +99,18 @@ export function registerRunTool(server) {
|
|
|
33
99
|
.describe("Auto-compact when structured output exceeds raw CLI tokens. Set false to always get full schema."),
|
|
34
100
|
},
|
|
35
101
|
outputSchema: CargoRunResultSchema,
|
|
36
|
-
}, async ({ path, args, release, package: pkg, compact }) => {
|
|
102
|
+
}, async ({ path, args, release, package: pkg, bin, example, features, allFeatures, noDefaultFeatures, timeout, profile, target, locked, frozen, offline, maxOutputSize, compact, }) => {
|
|
37
103
|
const cwd = path || process.cwd();
|
|
38
104
|
if (pkg)
|
|
39
105
|
assertNoFlagInjection(pkg, "package");
|
|
106
|
+
if (bin)
|
|
107
|
+
assertNoFlagInjection(bin, "bin");
|
|
108
|
+
if (example)
|
|
109
|
+
assertNoFlagInjection(example, "example");
|
|
110
|
+
if (profile)
|
|
111
|
+
assertNoFlagInjection(profile, "profile");
|
|
112
|
+
if (target)
|
|
113
|
+
assertNoFlagInjection(target, "target");
|
|
40
114
|
// Defense-in-depth: validate args even though they come after "--" separator
|
|
41
115
|
for (const a of args ?? []) {
|
|
42
116
|
assertNoFlagInjection(a, "args");
|
|
@@ -46,12 +120,38 @@ export function registerRunTool(server) {
|
|
|
46
120
|
cargoArgs.push("--release");
|
|
47
121
|
if (pkg)
|
|
48
122
|
cargoArgs.push("-p", pkg);
|
|
123
|
+
if (bin)
|
|
124
|
+
cargoArgs.push("--bin", bin);
|
|
125
|
+
if (example)
|
|
126
|
+
cargoArgs.push("--example", example);
|
|
127
|
+
if (features && features.length > 0) {
|
|
128
|
+
for (const f of features) {
|
|
129
|
+
assertNoFlagInjection(f, "features");
|
|
130
|
+
}
|
|
131
|
+
cargoArgs.push("--features", features.join(","));
|
|
132
|
+
}
|
|
133
|
+
if (allFeatures)
|
|
134
|
+
cargoArgs.push("--all-features");
|
|
135
|
+
if (noDefaultFeatures)
|
|
136
|
+
cargoArgs.push("--no-default-features");
|
|
137
|
+
if (profile)
|
|
138
|
+
cargoArgs.push("--profile", profile);
|
|
139
|
+
if (target)
|
|
140
|
+
cargoArgs.push("--target", target);
|
|
141
|
+
if (locked)
|
|
142
|
+
cargoArgs.push("--locked");
|
|
143
|
+
if (frozen)
|
|
144
|
+
cargoArgs.push("--frozen");
|
|
145
|
+
if (offline)
|
|
146
|
+
cargoArgs.push("--offline");
|
|
49
147
|
if (args && args.length > 0) {
|
|
50
148
|
cargoArgs.push("--");
|
|
51
149
|
cargoArgs.push(...args);
|
|
52
150
|
}
|
|
53
|
-
const result = await cargo(cargoArgs, cwd);
|
|
54
|
-
|
|
151
|
+
const result = await cargo(cargoArgs, cwd, timeout);
|
|
152
|
+
// Gap #94: Detect timeout from the runner result
|
|
153
|
+
const timedOut = result.exitCode !== 0 && result.stderr?.includes("timed out");
|
|
154
|
+
const data = parseCargoRunOutput(result.stdout, result.stderr, result.exitCode, maxOutputSize, timedOut);
|
|
55
155
|
return compactDualOutput(data, result.stdout + result.stderr, formatCargoRun, compactRunMap, formatRunCompact, compact === false);
|
|
56
156
|
});
|
|
57
157
|
}
|
package/dist/tools/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/tools/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,wDAAwD;AACxD,MAAM,UAAU,eAAe,CAAC,MAAiB;IAC/C,MAAM,CAAC,YAAY,CACjB,KAAK,EACL;QACE,KAAK,EAAE,WAAW;QAClB,WAAW,EACT,oIAAoI;QACtI,WAAW,EAAE;YACX,IAAI,EAAE,CAAC;iBACJ,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC;iBAC1B,QAAQ,EAAE;iBACV,QAAQ,CAAC,kCAAkC,CAAC;YAC/C,IAAI,EAAE,CAAC;iBACJ,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;iBAC9C,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC;iBAC3B,QAAQ,EAAE;iBACV,QAAQ,CAAC,4CAA4C,CAAC;YACzD,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YAC9E,OAAO,EAAE,CAAC;iBACP,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC;iBAClC,QAAQ,EAAE;iBACV,QAAQ,CAAC,+BAA+B,CAAC;YAC5C,OAAO,EAAE,CAAC;iBACP,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,IAAI,CAAC;iBACb,QAAQ,CACP,kGAAkG,CACnG;SACJ;QACD,YAAY,EAAE,oBAAoB;KACnC,EACD,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/tools/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D,wDAAwD;AACxD,MAAM,UAAU,eAAe,CAAC,MAAiB;IAC/C,MAAM,CAAC,YAAY,CACjB,KAAK,EACL;QACE,KAAK,EAAE,WAAW;QAClB,WAAW,EACT,oIAAoI;QACtI,WAAW,EAAE;YACX,IAAI,EAAE,CAAC;iBACJ,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC;iBAC1B,QAAQ,EAAE;iBACV,QAAQ,CAAC,kCAAkC,CAAC;YAC/C,IAAI,EAAE,CAAC;iBACJ,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;iBAC9C,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC;iBAC3B,QAAQ,EAAE;iBACV,QAAQ,CAAC,4CAA4C,CAAC;YACzD,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YAC9E,OAAO,EAAE,CAAC;iBACP,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC;iBAClC,QAAQ,EAAE;iBACV,QAAQ,CAAC,+BAA+B,CAAC;YAC5C,GAAG,EAAE,CAAC;iBACH,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC;iBAClC,QAAQ,EAAE;iBACV,QAAQ,CAAC,kEAAkE,CAAC;YAC/E,OAAO,EAAE,CAAC;iBACP,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC;iBAClC,QAAQ,EAAE;iBACV,QAAQ,CAAC,+CAA+C,CAAC;YAC5D,QAAQ,EAAE,CAAC;iBACR,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;iBACpD,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC;iBAC3B,QAAQ,EAAE;iBACV,QAAQ,CAAC,oEAAoE,CAAC;YACjF,WAAW,EAAE,CAAC;iBACX,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,kDAAkD,CAAC;YAC/D,iBAAiB,EAAE,CAAC;iBACjB,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,6DAA6D,CAAC;YAC1E,OAAO,EAAE,CAAC;iBACP,MAAM,EAAE;iBACR,GAAG,EAAE;iBACL,GAAG,CAAC,IAAI,CAAC;iBACT,GAAG,CAAC,MAAM,CAAC;iBACX,QAAQ,EAAE;iBACV,QAAQ,CACP,iEAAiE;gBAC/D,oCAAoC,CACvC;YACH,OAAO,EAAE,CAAC;iBACP,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC;iBAClC,QAAQ,EAAE;iBACV,QAAQ,CAAC,gDAAgD,CAAC;YAC7D,MAAM,EAAE,CAAC;iBACN,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC;iBAClC,QAAQ,EAAE;iBACV,QAAQ,CAAC,+CAA+C,CAAC;YAC5D,MAAM,EAAE,CAAC;iBACN,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,6CAA6C,CAAC;YAC1D,MAAM,EAAE,CAAC;iBACN,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,wDAAwD,CAAC;YACrE,OAAO,EAAE,CAAC;iBACP,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,+CAA+C,CAAC;YAC5D,aAAa,EAAE,CAAC;iBACb,MAAM,EAAE;iBACR,GAAG,EAAE;iBACL,GAAG,CAAC,IAAI,CAAC;iBACT,GAAG,CAAC,QAAQ,CAAC;iBACb,QAAQ,EAAE;iBACV,OAAO,CAAC,OAAO,CAAC;iBAChB,QAAQ,CACP,qHAAqH,CACtH;YACH,OAAO,EAAE,CAAC;iBACP,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,IAAI,CAAC;iBACb,QAAQ,CACP,kGAAkG,CACnG;SACJ;QACD,YAAY,EAAE,oBAAoB;KACnC,EACD,KAAK,EAAE,EACL,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,OAAO,EAAE,GAAG,EACZ,GAAG,EACH,OAAO,EACP,QAAQ,EACR,WAAW,EACX,iBAAiB,EACjB,OAAO,EACP,OAAO,EACP,MAAM,EACN,MAAM,EACN,MAAM,EACN,OAAO,EACP,aAAa,EACb,OAAO,GACR,EAAE,EAAE;QACH,MAAM,GAAG,GAAG,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAClC,IAAI,GAAG;YAAE,qBAAqB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAC/C,IAAI,GAAG;YAAE,qBAAqB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAI,OAAO;YAAE,qBAAqB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACvD,IAAI,OAAO;YAAE,qBAAqB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACvD,IAAI,MAAM;YAAE,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACpD,6EAA6E;QAC7E,KAAK,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;YAC3B,qBAAqB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC;QAED,MAAM,SAAS,GAAG,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,OAAO;YAAE,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACzC,IAAI,GAAG;YAAE,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACnC,IAAI,GAAG;YAAE,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACtC,IAAI,OAAO;YAAE,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;gBACzB,qBAAqB,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;YACvC,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,WAAW;YAAE,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAClD,IAAI,iBAAiB;YAAE,SAAS,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC/D,IAAI,OAAO;YAAE,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,MAAM;YAAE,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC/C,IAAI,MAAM;YAAE,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,MAAM;YAAE,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,OAAO;YAAE,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACzC,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrB,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;QAC1B,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QAEpD,iDAAiD;QACjD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;QAE/E,MAAM,IAAI,GAAG,mBAAmB,CAC9B,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,QAAQ,EACf,aAAa,EACb,QAAQ,CACT,CAAC;QACF,OAAO,iBAAiB,CACtB,IAAI,EACJ,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAC7B,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,OAAO,KAAK,KAAK,CAClB,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC"}
|
package/dist/tools/test.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../src/tools/test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,yDAAyD;AACzD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../src/tools/test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,yDAAyD;AACzD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,QAiKjD"}
|
package/dist/tools/test.js
CHANGED
|
@@ -20,6 +20,63 @@ export function registerTestTool(server) {
|
|
|
20
20
|
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
21
21
|
.optional()
|
|
22
22
|
.describe("Test name filter pattern"),
|
|
23
|
+
noFailFast: z
|
|
24
|
+
.boolean()
|
|
25
|
+
.optional()
|
|
26
|
+
.default(false)
|
|
27
|
+
.describe("Run all tests regardless of failures (--no-fail-fast)"),
|
|
28
|
+
noRun: z
|
|
29
|
+
.boolean()
|
|
30
|
+
.optional()
|
|
31
|
+
.default(false)
|
|
32
|
+
.describe("Compile tests but do not run them (--no-run)"),
|
|
33
|
+
release: z
|
|
34
|
+
.boolean()
|
|
35
|
+
.optional()
|
|
36
|
+
.default(false)
|
|
37
|
+
.describe("Test in release mode with optimizations (--release)"),
|
|
38
|
+
doc: z.boolean().optional().default(false).describe("Run only documentation tests (--doc)"),
|
|
39
|
+
package: z
|
|
40
|
+
.string()
|
|
41
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
42
|
+
.optional()
|
|
43
|
+
.describe("Package to test in a workspace (-p <SPEC>)"),
|
|
44
|
+
features: z
|
|
45
|
+
.array(z.string().max(INPUT_LIMITS.SHORT_STRING_MAX))
|
|
46
|
+
.max(INPUT_LIMITS.ARRAY_MAX)
|
|
47
|
+
.optional()
|
|
48
|
+
.describe("Space or comma separated list of features to activate (--features)"),
|
|
49
|
+
allFeatures: z
|
|
50
|
+
.boolean()
|
|
51
|
+
.optional()
|
|
52
|
+
.default(false)
|
|
53
|
+
.describe("Activate all available features (--all-features)"),
|
|
54
|
+
noDefaultFeatures: z
|
|
55
|
+
.boolean()
|
|
56
|
+
.optional()
|
|
57
|
+
.default(false)
|
|
58
|
+
.describe("Do not activate the default feature (--no-default-features)"),
|
|
59
|
+
testArgs: z
|
|
60
|
+
.array(z.string().max(INPUT_LIMITS.SHORT_STRING_MAX))
|
|
61
|
+
.max(INPUT_LIMITS.ARRAY_MAX)
|
|
62
|
+
.optional()
|
|
63
|
+
.describe("Arguments to pass to the test harness (after --). " +
|
|
64
|
+
"Example: ['--test-threads=1', '--nocapture', '--ignored', '--include-ignored', '--exact']"),
|
|
65
|
+
locked: z
|
|
66
|
+
.boolean()
|
|
67
|
+
.optional()
|
|
68
|
+
.default(false)
|
|
69
|
+
.describe("Require Cargo.lock is up to date (--locked)"),
|
|
70
|
+
frozen: z
|
|
71
|
+
.boolean()
|
|
72
|
+
.optional()
|
|
73
|
+
.default(false)
|
|
74
|
+
.describe("Require Cargo.lock and cache are up to date (--frozen)"),
|
|
75
|
+
offline: z
|
|
76
|
+
.boolean()
|
|
77
|
+
.optional()
|
|
78
|
+
.default(false)
|
|
79
|
+
.describe("Run without accessing the network (--offline)"),
|
|
23
80
|
compact: z
|
|
24
81
|
.boolean()
|
|
25
82
|
.optional()
|
|
@@ -27,15 +84,63 @@ export function registerTestTool(server) {
|
|
|
27
84
|
.describe("Auto-compact when structured output exceeds raw CLI tokens. Set false to always get full schema."),
|
|
28
85
|
},
|
|
29
86
|
outputSchema: CargoTestResultSchema,
|
|
30
|
-
}, async ({ path, filter, compact }) => {
|
|
87
|
+
}, async ({ path, filter, noFailFast, noRun, release, doc, package: pkg, features, allFeatures, noDefaultFeatures, testArgs, locked, frozen, offline, compact, }) => {
|
|
31
88
|
const cwd = path || process.cwd();
|
|
32
89
|
if (filter)
|
|
33
90
|
assertNoFlagInjection(filter, "filter");
|
|
34
|
-
|
|
91
|
+
if (pkg)
|
|
92
|
+
assertNoFlagInjection(pkg, "package");
|
|
93
|
+
// Gap #95: Run with --message-format=json to capture compilation diagnostics
|
|
94
|
+
const args = ["test", "--message-format=json"];
|
|
95
|
+
if (pkg)
|
|
96
|
+
args.push("-p", pkg);
|
|
97
|
+
if (noFailFast)
|
|
98
|
+
args.push("--no-fail-fast");
|
|
99
|
+
if (noRun)
|
|
100
|
+
args.push("--no-run");
|
|
101
|
+
if (release)
|
|
102
|
+
args.push("--release");
|
|
103
|
+
if (doc)
|
|
104
|
+
args.push("--doc");
|
|
105
|
+
if (features && features.length > 0) {
|
|
106
|
+
for (const f of features) {
|
|
107
|
+
assertNoFlagInjection(f, "features");
|
|
108
|
+
}
|
|
109
|
+
args.push("--features", features.join(","));
|
|
110
|
+
}
|
|
111
|
+
if (allFeatures)
|
|
112
|
+
args.push("--all-features");
|
|
113
|
+
if (noDefaultFeatures)
|
|
114
|
+
args.push("--no-default-features");
|
|
115
|
+
if (locked)
|
|
116
|
+
args.push("--locked");
|
|
117
|
+
if (frozen)
|
|
118
|
+
args.push("--frozen");
|
|
119
|
+
if (offline)
|
|
120
|
+
args.push("--offline");
|
|
35
121
|
if (filter)
|
|
36
122
|
args.push(filter);
|
|
123
|
+
if (testArgs && testArgs.length > 0) {
|
|
124
|
+
args.push("--", ...testArgs);
|
|
125
|
+
}
|
|
37
126
|
const result = await cargo(args, cwd);
|
|
38
|
-
|
|
127
|
+
// Gap #95: The stdout contains both JSON messages and human-readable test output.
|
|
128
|
+
// JSON lines are those starting with '{', human output is everything else.
|
|
129
|
+
// We separate them to parse diagnostics from JSON and tests from human output.
|
|
130
|
+
const lines = result.stdout.split("\n");
|
|
131
|
+
const jsonLines = [];
|
|
132
|
+
const humanLines = [];
|
|
133
|
+
for (const line of lines) {
|
|
134
|
+
if (line.trim().startsWith("{")) {
|
|
135
|
+
jsonLines.push(line);
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
humanLines.push(line);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
const humanOutput = humanLines.join("\n");
|
|
142
|
+
const jsonOutput = jsonLines.length > 0 ? jsonLines.join("\n") : undefined;
|
|
143
|
+
const data = parseCargoTestOutput(humanOutput, result.exitCode, jsonOutput);
|
|
39
144
|
return compactDualOutput(data, result.stdout, formatCargoTest, compactTestMap, formatTestCompact, compact === false);
|
|
40
145
|
});
|
|
41
146
|
}
|
package/dist/tools/test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/tools/test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,yDAAyD;AACzD,MAAM,UAAU,gBAAgB,CAAC,MAAiB;IAChD,MAAM,CAAC,YAAY,CACjB,MAAM,EACN;QACE,KAAK,EAAE,YAAY;QACnB,WAAW,EACT,4IAA4I;QAC9I,WAAW,EAAE;YACX,IAAI,EAAE,CAAC;iBACJ,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC;iBAC1B,QAAQ,EAAE;iBACV,QAAQ,CAAC,kCAAkC,CAAC;YAC/C,MAAM,EAAE,CAAC;iBACN,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC;iBAClC,QAAQ,EAAE;iBACV,QAAQ,CAAC,0BAA0B,CAAC;YACvC,OAAO,EAAE,CAAC;iBACP,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,IAAI,CAAC;iBACb,QAAQ,CACP,kGAAkG,CACnG;SACJ;QACD,YAAY,EAAE,qBAAqB;KACpC,EACD,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/tools/test.ts"],"names":[],"mappings":"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"}
|