@paretools/cargo 0.8.5 → 0.10.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/README.md +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- 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 +32 -7
- package/dist/lib/formatters.d.ts.map +1 -1
- package/dist/lib/formatters.js +192 -45
- package/dist/lib/formatters.js.map +1 -1
- package/dist/lib/parsers.d.ts +84 -20
- package/dist/lib/parsers.d.ts.map +1 -1
- package/dist/lib/parsers.js +758 -70
- package/dist/lib/parsers.js.map +1 -1
- package/dist/schemas/index.d.ts +147 -9
- package/dist/schemas/index.d.ts.map +1 -1
- package/dist/schemas/index.js +123 -11
- package/dist/schemas/index.js.map +1 -1
- package/dist/tools/add.d.ts.map +1 -1
- package/dist/tools/add.js +123 -16
- package/dist/tools/add.js.map +1 -1
- package/dist/tools/audit.d.ts.map +1 -1
- package/dist/tools/audit.js +102 -10
- package/dist/tools/audit.js.map +1 -1
- package/dist/tools/build.d.ts.map +1 -1
- package/dist/tools/build.js +101 -12
- package/dist/tools/build.js.map +1 -1
- package/dist/tools/check.d.ts.map +1 -1
- package/dist/tools/check.js +90 -15
- package/dist/tools/check.js.map +1 -1
- package/dist/tools/clippy.d.ts.map +1 -1
- package/dist/tools/clippy.js +138 -10
- package/dist/tools/clippy.js.map +1 -1
- package/dist/tools/doc.d.ts.map +1 -1
- package/dist/tools/doc.js +84 -14
- package/dist/tools/doc.js.map +1 -1
- package/dist/tools/fmt.d.ts.map +1 -1
- package/dist/tools/fmt.js +74 -11
- package/dist/tools/fmt.js.map +1 -1
- package/dist/tools/remove.d.ts.map +1 -1
- package/dist/tools/remove.js +60 -13
- package/dist/tools/remove.js.map +1 -1
- package/dist/tools/run.d.ts.map +1 -1
- package/dist/tools/run.js +104 -16
- package/dist/tools/run.js.map +1 -1
- package/dist/tools/test.d.ts.map +1 -1
- package/dist/tools/test.js +109 -12
- package/dist/tools/test.js.map +1 -1
- package/dist/tools/tree.d.ts.map +1 -1
- package/dist/tools/tree.js +120 -19
- package/dist/tools/tree.js.map +1 -1
- package/dist/tools/update.d.ts.map +1 -1
- package/dist/tools/update.js +65 -15
- package/dist/tools/update.js.map +1 -1
- package/package.json +2 -2
package/dist/tools/check.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/tools/check.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,gBAAgB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,0DAA0D;AAC1D,MAAM,UAAU,iBAAiB,CAAC,MAAiB;IACjD,MAAM,CAAC,YAAY,CACjB,OAAO,EACP;QACE,KAAK,EAAE,aAAa;QACpB,WAAW,EACT,
|
|
1
|
+
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/tools/check.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,gBAAgB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,0DAA0D;AAC1D,MAAM,UAAU,iBAAiB,CAAC,MAAiB;IACjD,MAAM,CAAC,YAAY,CACjB,OAAO,EACP;QACE,KAAK,EAAE,aAAa;QACpB,WAAW,EACT,4HAA4H;QAC9H,WAAW,EAAE;YACX,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC;YACpF,OAAO,EAAE,CAAC;iBACP,MAAM,EAAE;iBACR,GAAG,CAAC,YAAY,CAAC,gBAAgB,CAAC;iBAClC,QAAQ,EAAE;iBACV,QAAQ,CAAC,iCAAiC,CAAC;YAC9C,SAAS,EAAE,CAAC;iBACT,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CACP,sHAAsH,CACvH;YACH,UAAU,EAAE,CAAC;iBACV,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,yEAAyE,CAAC;YACtF,OAAO,EAAE,CAAC;iBACP,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,sDAAsD,CAAC;YACnE,SAAS,EAAE,CAAC;iBACT,OAAO,EAAE;iBACT,QAAQ,EAAE;iBACV,OAAO,CAAC,KAAK,CAAC;iBACd,QAAQ,CAAC,mDAAmD,CAAC;YAChE,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,iDAAiD,CAAC;YAC9D,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,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,uBAAuB,CAAC;SAChF;QACD,YAAY,EAAE,sBAAsB;KACrC,EACD,KAAK,EAAE,EACL,IAAI,EACJ,OAAO,EAAE,GAAG,EACZ,SAAS,EACT,UAAU,EACV,OAAO,EACP,SAAS,EACT,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,OAAO,EAAE,uBAAuB,CAAC,CAAC;QAChD,IAAI,GAAG;YAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC9B,IAAI,SAAS;YAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACzC,IAAI,UAAU;YAAE,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC3C,IAAI,OAAO;YAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACpC,IAAI,SAAS;YAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACxC,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,MAAM,CAAC,MAAM,CAAC,CAAC;QAChF,OAAO,iBAAiB,CACtB,IAAI,EACJ,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAC7B,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,OAAO,KAAK,KAAK,CAClB,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clippy.d.ts","sourceRoot":"","sources":["../../src/tools/clippy.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":"clippy.d.ts","sourceRoot":"","sources":["../../src/tools/clippy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,2DAA2D;AAC3D,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,SAAS,QAuLnD"}
|
package/dist/tools/clippy.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 { parseCargoClippyJson } from "../lib/parsers.js";
|
|
5
5
|
import { formatCargoClippy, compactClippyMap, formatClippyCompact } from "../lib/formatters.js";
|
|
@@ -8,25 +8,153 @@ import { CargoClippyResultSchema } from "../schemas/index.js";
|
|
|
8
8
|
export function registerClippyTool(server) {
|
|
9
9
|
server.registerTool("clippy", {
|
|
10
10
|
title: "Cargo Clippy",
|
|
11
|
-
description: "Runs cargo clippy and returns structured lint diagnostics.
|
|
11
|
+
description: "Runs cargo clippy and returns structured lint diagnostics.",
|
|
12
12
|
inputSchema: {
|
|
13
|
-
path: z
|
|
13
|
+
path: z.string().max(INPUT_LIMITS.PATH_MAX).optional().describe("Project root path"),
|
|
14
|
+
noDeps: z
|
|
15
|
+
.boolean()
|
|
16
|
+
.optional()
|
|
17
|
+
.default(false)
|
|
18
|
+
.describe("Run clippy only on the specified package, not its dependencies (--no-deps)"),
|
|
19
|
+
allTargets: z
|
|
20
|
+
.boolean()
|
|
21
|
+
.optional()
|
|
22
|
+
.default(false)
|
|
23
|
+
.describe("Check all targets (lib, bins, tests, benches, examples) (--all-targets)"),
|
|
24
|
+
release: z
|
|
25
|
+
.boolean()
|
|
26
|
+
.optional()
|
|
27
|
+
.default(false)
|
|
28
|
+
.describe("Run clippy in release mode with optimizations (--release)"),
|
|
29
|
+
package: z
|
|
14
30
|
.string()
|
|
15
|
-
.max(INPUT_LIMITS.
|
|
31
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
32
|
+
.optional()
|
|
33
|
+
.describe("Package to lint in a workspace (-p <SPEC>)"),
|
|
34
|
+
fix: z
|
|
35
|
+
.boolean()
|
|
36
|
+
.optional()
|
|
37
|
+
.default(false)
|
|
38
|
+
.describe("Automatically apply clippy suggestions (--fix --allow-dirty). " +
|
|
39
|
+
"Implies --allow-dirty to work with uncommitted changes."),
|
|
40
|
+
features: z
|
|
41
|
+
.array(z.string().max(INPUT_LIMITS.SHORT_STRING_MAX))
|
|
42
|
+
.max(INPUT_LIMITS.ARRAY_MAX)
|
|
43
|
+
.optional()
|
|
44
|
+
.describe("Space or comma separated list of features to activate (--features)"),
|
|
45
|
+
allFeatures: z
|
|
46
|
+
.boolean()
|
|
47
|
+
.optional()
|
|
48
|
+
.default(false)
|
|
49
|
+
.describe("Activate all available features (--all-features)"),
|
|
50
|
+
noDefaultFeatures: z
|
|
51
|
+
.boolean()
|
|
52
|
+
.optional()
|
|
53
|
+
.default(false)
|
|
54
|
+
.describe("Do not activate the default feature (--no-default-features)"),
|
|
55
|
+
warn: z
|
|
56
|
+
.array(z.string().max(INPUT_LIMITS.SHORT_STRING_MAX))
|
|
57
|
+
.max(INPUT_LIMITS.ARRAY_MAX)
|
|
58
|
+
.optional()
|
|
59
|
+
.describe("Lint names to set to warn level (-- -W <lint>). " +
|
|
60
|
+
'Example: ["clippy::unwrap_used", "clippy::expect_used"]'),
|
|
61
|
+
allow: z
|
|
62
|
+
.array(z.string().max(INPUT_LIMITS.SHORT_STRING_MAX))
|
|
63
|
+
.max(INPUT_LIMITS.ARRAY_MAX)
|
|
64
|
+
.optional()
|
|
65
|
+
.describe("Lint names to allow/suppress (-- -A <lint>). " +
|
|
66
|
+
'Example: ["clippy::needless_return"]'),
|
|
67
|
+
deny: z
|
|
68
|
+
.array(z.string().max(INPUT_LIMITS.SHORT_STRING_MAX))
|
|
69
|
+
.max(INPUT_LIMITS.ARRAY_MAX)
|
|
70
|
+
.optional()
|
|
71
|
+
.describe("Lint names to set to deny level (-- -D <lint>). " + 'Example: ["clippy::unwrap_used"]'),
|
|
72
|
+
forbid: z
|
|
73
|
+
.array(z.string().max(INPUT_LIMITS.SHORT_STRING_MAX))
|
|
74
|
+
.max(INPUT_LIMITS.ARRAY_MAX)
|
|
75
|
+
.optional()
|
|
76
|
+
.describe("Lint names to forbid (-- -F <lint>). Cannot be overridden. " +
|
|
77
|
+
'Example: ["unsafe_code"]'),
|
|
78
|
+
locked: z
|
|
79
|
+
.boolean()
|
|
80
|
+
.optional()
|
|
81
|
+
.default(false)
|
|
82
|
+
.describe("Require Cargo.lock is up to date (--locked)"),
|
|
83
|
+
frozen: z
|
|
84
|
+
.boolean()
|
|
16
85
|
.optional()
|
|
17
|
-
.
|
|
18
|
-
|
|
86
|
+
.default(false)
|
|
87
|
+
.describe("Require Cargo.lock and cache are up to date (--frozen)"),
|
|
88
|
+
offline: z
|
|
19
89
|
.boolean()
|
|
20
90
|
.optional()
|
|
21
|
-
.default(
|
|
22
|
-
.describe("
|
|
91
|
+
.default(false)
|
|
92
|
+
.describe("Run without accessing the network (--offline)"),
|
|
93
|
+
compact: z.boolean().optional().default(true).describe("Prefer compact output"),
|
|
23
94
|
},
|
|
24
95
|
outputSchema: CargoClippyResultSchema,
|
|
25
|
-
}, async ({ path, compact }) => {
|
|
96
|
+
}, async ({ path, noDeps, allTargets, release, package: pkg, fix, features, allFeatures, noDefaultFeatures, warn, allow, deny, forbid, locked, frozen, offline, compact, }) => {
|
|
26
97
|
const cwd = path || process.cwd();
|
|
98
|
+
if (pkg)
|
|
99
|
+
assertNoFlagInjection(pkg, "package");
|
|
27
100
|
const args = ["clippy", "--message-format=json"];
|
|
101
|
+
if (noDeps)
|
|
102
|
+
args.push("--no-deps");
|
|
103
|
+
if (allTargets)
|
|
104
|
+
args.push("--all-targets");
|
|
105
|
+
if (release)
|
|
106
|
+
args.push("--release");
|
|
107
|
+
if (pkg)
|
|
108
|
+
args.push("-p", pkg);
|
|
109
|
+
if (fix)
|
|
110
|
+
args.push("--fix", "--allow-dirty");
|
|
111
|
+
if (features && features.length > 0) {
|
|
112
|
+
for (const f of features) {
|
|
113
|
+
assertNoFlagInjection(f, "features");
|
|
114
|
+
}
|
|
115
|
+
args.push("--features", features.join(","));
|
|
116
|
+
}
|
|
117
|
+
if (allFeatures)
|
|
118
|
+
args.push("--all-features");
|
|
119
|
+
if (noDefaultFeatures)
|
|
120
|
+
args.push("--no-default-features");
|
|
121
|
+
if (locked)
|
|
122
|
+
args.push("--locked");
|
|
123
|
+
if (frozen)
|
|
124
|
+
args.push("--frozen");
|
|
125
|
+
if (offline)
|
|
126
|
+
args.push("--offline");
|
|
127
|
+
// Gap #91: Add lint level configuration flags after "--"
|
|
128
|
+
const lintArgs = [];
|
|
129
|
+
if (warn && warn.length > 0) {
|
|
130
|
+
for (const lint of warn) {
|
|
131
|
+
assertNoFlagInjection(lint, "warn");
|
|
132
|
+
lintArgs.push("-W", lint);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
if (allow && allow.length > 0) {
|
|
136
|
+
for (const lint of allow) {
|
|
137
|
+
assertNoFlagInjection(lint, "allow");
|
|
138
|
+
lintArgs.push("-A", lint);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
if (deny && deny.length > 0) {
|
|
142
|
+
for (const lint of deny) {
|
|
143
|
+
assertNoFlagInjection(lint, "deny");
|
|
144
|
+
lintArgs.push("-D", lint);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
if (forbid && forbid.length > 0) {
|
|
148
|
+
for (const lint of forbid) {
|
|
149
|
+
assertNoFlagInjection(lint, "forbid");
|
|
150
|
+
lintArgs.push("-F", lint);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
if (lintArgs.length > 0) {
|
|
154
|
+
args.push("--", ...lintArgs);
|
|
155
|
+
}
|
|
28
156
|
const result = await cargo(args, cwd);
|
|
29
|
-
const data = parseCargoClippyJson(result.stdout);
|
|
157
|
+
const data = parseCargoClippyJson(result.stdout, result.exitCode);
|
|
30
158
|
return compactDualOutput(data, result.stdout, formatCargoClippy, compactClippyMap, formatClippyCompact, compact === false);
|
|
31
159
|
});
|
|
32
160
|
}
|
package/dist/tools/clippy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clippy.js","sourceRoot":"","sources":["../../src/tools/clippy.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":"clippy.js","sourceRoot":"","sources":["../../src/tools/clippy.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/doc.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doc.d.ts","sourceRoot":"","sources":["../../src/tools/doc.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":"doc.d.ts","sourceRoot":"","sources":["../../src/tools/doc.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAOzE,wDAAwD;AACxD,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,QA6HhD"}
|
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";
|
|
@@ -8,13 +8,9 @@ import { CargoDocResultSchema } from "../schemas/index.js";
|
|
|
8
8
|
export function registerDocTool(server) {
|
|
9
9
|
server.registerTool("doc", {
|
|
10
10
|
title: "Cargo Doc",
|
|
11
|
-
description: "Generates Rust documentation and returns structured output with warning count.
|
|
11
|
+
description: "Generates Rust documentation and returns structured output with warning count.",
|
|
12
12
|
inputSchema: {
|
|
13
|
-
path: z
|
|
14
|
-
.string()
|
|
15
|
-
.max(INPUT_LIMITS.PATH_MAX)
|
|
16
|
-
.optional()
|
|
17
|
-
.describe("Project root path (default: cwd)"),
|
|
13
|
+
path: z.string().max(INPUT_LIMITS.PATH_MAX).optional().describe("Project root path"),
|
|
18
14
|
open: z
|
|
19
15
|
.boolean()
|
|
20
16
|
.optional()
|
|
@@ -25,23 +21,97 @@ export function registerDocTool(server) {
|
|
|
25
21
|
.optional()
|
|
26
22
|
.default(false)
|
|
27
23
|
.describe("Skip building documentation for dependencies (--no-deps)"),
|
|
28
|
-
|
|
24
|
+
documentPrivateItems: z
|
|
25
|
+
.boolean()
|
|
26
|
+
.optional()
|
|
27
|
+
.default(false)
|
|
28
|
+
.describe("Include private items in the generated documentation (--document-private-items)"),
|
|
29
|
+
workspace: z
|
|
30
|
+
.boolean()
|
|
31
|
+
.optional()
|
|
32
|
+
.default(false)
|
|
33
|
+
.describe("Generate documentation for all packages in the workspace (--workspace)"),
|
|
34
|
+
package: z
|
|
35
|
+
.string()
|
|
36
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
37
|
+
.optional()
|
|
38
|
+
.describe("Package to document in a workspace (-p <SPEC>)"),
|
|
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
|
|
29
50
|
.boolean()
|
|
30
51
|
.optional()
|
|
31
|
-
.default(
|
|
32
|
-
.describe("
|
|
52
|
+
.default(false)
|
|
53
|
+
.describe("Do not activate the default feature (--no-default-features)"),
|
|
54
|
+
target: z
|
|
55
|
+
.string()
|
|
56
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
57
|
+
.optional()
|
|
58
|
+
.describe("Generate docs for the target triple (--target <TRIPLE>)"),
|
|
59
|
+
locked: z
|
|
60
|
+
.boolean()
|
|
61
|
+
.optional()
|
|
62
|
+
.default(false)
|
|
63
|
+
.describe("Require Cargo.lock is up to date (--locked)"),
|
|
64
|
+
frozen: z
|
|
65
|
+
.boolean()
|
|
66
|
+
.optional()
|
|
67
|
+
.default(false)
|
|
68
|
+
.describe("Require Cargo.lock and cache are up to date (--frozen)"),
|
|
69
|
+
offline: z
|
|
70
|
+
.boolean()
|
|
71
|
+
.optional()
|
|
72
|
+
.default(false)
|
|
73
|
+
.describe("Run without accessing the network (--offline)"),
|
|
74
|
+
compact: z.boolean().optional().default(true).describe("Prefer compact output"),
|
|
33
75
|
},
|
|
34
76
|
outputSchema: CargoDocResultSchema,
|
|
35
|
-
}, async ({ path, open, noDeps, compact }) => {
|
|
77
|
+
}, async ({ path, open, noDeps, documentPrivateItems, workspace, package: pkg, features, allFeatures, noDefaultFeatures, target, locked, frozen, offline, compact, }) => {
|
|
36
78
|
const cwd = path || process.cwd();
|
|
37
|
-
|
|
79
|
+
if (pkg)
|
|
80
|
+
assertNoFlagInjection(pkg, "package");
|
|
81
|
+
if (target)
|
|
82
|
+
assertNoFlagInjection(target, "target");
|
|
83
|
+
const args = ["doc", "--message-format=json"];
|
|
38
84
|
if (noDeps)
|
|
39
85
|
args.push("--no-deps");
|
|
40
86
|
if (open)
|
|
41
87
|
args.push("--open");
|
|
88
|
+
if (documentPrivateItems)
|
|
89
|
+
args.push("--document-private-items");
|
|
90
|
+
if (workspace)
|
|
91
|
+
args.push("--workspace");
|
|
92
|
+
if (pkg)
|
|
93
|
+
args.push("-p", pkg);
|
|
94
|
+
if (features && features.length > 0) {
|
|
95
|
+
for (const f of features) {
|
|
96
|
+
assertNoFlagInjection(f, "features");
|
|
97
|
+
}
|
|
98
|
+
args.push("--features", features.join(","));
|
|
99
|
+
}
|
|
100
|
+
if (allFeatures)
|
|
101
|
+
args.push("--all-features");
|
|
102
|
+
if (noDefaultFeatures)
|
|
103
|
+
args.push("--no-default-features");
|
|
104
|
+
if (target)
|
|
105
|
+
args.push("--target", target);
|
|
106
|
+
if (locked)
|
|
107
|
+
args.push("--locked");
|
|
108
|
+
if (frozen)
|
|
109
|
+
args.push("--frozen");
|
|
110
|
+
if (offline)
|
|
111
|
+
args.push("--offline");
|
|
42
112
|
const result = await cargo(args, cwd);
|
|
43
|
-
const data = parseCargoDocOutput(result.stderr, result.exitCode);
|
|
44
|
-
return compactDualOutput(data, result.stderr, formatCargoDoc, compactDocMap, formatDocCompact, compact === false);
|
|
113
|
+
const data = parseCargoDocOutput(result.stdout, result.stderr, result.exitCode, cwd);
|
|
114
|
+
return compactDualOutput(data, result.stdout + result.stderr, formatCargoDoc, compactDocMap, formatDocCompact, compact === false);
|
|
45
115
|
});
|
|
46
116
|
}
|
|
47
117
|
//# sourceMappingURL=doc.js.map
|
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":"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"}
|
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,QA6GhD"}
|
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";
|
|
@@ -8,30 +8,93 @@ import { CargoFmtResultSchema } from "../schemas/index.js";
|
|
|
8
8
|
export function registerFmtTool(server) {
|
|
9
9
|
server.registerTool("fmt", {
|
|
10
10
|
title: "Cargo Fmt",
|
|
11
|
-
description: "Checks or fixes Rust formatting and returns structured output.
|
|
11
|
+
description: "Checks or fixes Rust formatting and returns structured output.",
|
|
12
12
|
inputSchema: {
|
|
13
|
-
path: z
|
|
14
|
-
.string()
|
|
15
|
-
.max(INPUT_LIMITS.PATH_MAX)
|
|
16
|
-
.optional()
|
|
17
|
-
.describe("Project root path (default: cwd)"),
|
|
13
|
+
path: z.string().max(INPUT_LIMITS.PATH_MAX).optional().describe("Project root path"),
|
|
18
14
|
check: z
|
|
19
15
|
.boolean()
|
|
20
16
|
.optional()
|
|
21
17
|
.default(false)
|
|
22
18
|
.describe("Check only without modifying files (--check)"),
|
|
23
|
-
|
|
19
|
+
includeDiff: z
|
|
20
|
+
.boolean()
|
|
21
|
+
.optional()
|
|
22
|
+
.default(false)
|
|
23
|
+
.describe("In check mode, preserve rustfmt unified diff output in response"),
|
|
24
|
+
all: z
|
|
24
25
|
.boolean()
|
|
25
26
|
.optional()
|
|
26
|
-
.default(
|
|
27
|
-
.describe("
|
|
27
|
+
.default(false)
|
|
28
|
+
.describe("Format all packages in the workspace (--all)"),
|
|
29
|
+
backup: z
|
|
30
|
+
.boolean()
|
|
31
|
+
.optional()
|
|
32
|
+
.default(false)
|
|
33
|
+
.describe("Create backup files before formatting (--backup)"),
|
|
34
|
+
package: z
|
|
35
|
+
.string()
|
|
36
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
37
|
+
.optional()
|
|
38
|
+
.describe("Package to format in a workspace (-p <NAME>)"),
|
|
39
|
+
edition: z
|
|
40
|
+
.enum(["2015", "2018", "2021", "2024"])
|
|
41
|
+
.optional()
|
|
42
|
+
.describe("Rust edition for formatting rules (-- --edition <EDITION>)"),
|
|
43
|
+
config: z
|
|
44
|
+
.string()
|
|
45
|
+
.max(INPUT_LIMITS.STRING_MAX)
|
|
46
|
+
.optional()
|
|
47
|
+
.describe("Rustfmt configuration options (-- --config <KEY=VALUE>)"),
|
|
48
|
+
configPath: z
|
|
49
|
+
.string()
|
|
50
|
+
.max(INPUT_LIMITS.PATH_MAX)
|
|
51
|
+
.optional()
|
|
52
|
+
.describe("Path to rustfmt config file (-- --config-path <PATH>)"),
|
|
53
|
+
emit: z
|
|
54
|
+
.enum(["files", "stdout"])
|
|
55
|
+
.optional()
|
|
56
|
+
.describe("Output mode for rustfmt (-- --emit <MODE>)"),
|
|
57
|
+
compact: z.boolean().optional().default(true).describe("Prefer compact output"),
|
|
28
58
|
},
|
|
29
59
|
outputSchema: CargoFmtResultSchema,
|
|
30
|
-
}, async ({ path, check, compact }) => {
|
|
60
|
+
}, async ({ path, check, includeDiff, all, backup, package: pkg, edition, config, configPath, emit, compact, }) => {
|
|
31
61
|
const cwd = path || process.cwd();
|
|
62
|
+
if (pkg)
|
|
63
|
+
assertNoFlagInjection(pkg, "package");
|
|
64
|
+
if (configPath)
|
|
65
|
+
assertNoFlagInjection(configPath, "configPath");
|
|
32
66
|
const args = ["fmt"];
|
|
67
|
+
if (pkg)
|
|
68
|
+
args.push("-p", pkg);
|
|
33
69
|
if (check)
|
|
34
70
|
args.push("--check");
|
|
71
|
+
if (all)
|
|
72
|
+
args.push("--all");
|
|
73
|
+
// Rustfmt args go after --
|
|
74
|
+
const rustfmtArgs = [];
|
|
75
|
+
if (backup)
|
|
76
|
+
rustfmtArgs.push("--backup");
|
|
77
|
+
if (edition)
|
|
78
|
+
rustfmtArgs.push("--edition", edition);
|
|
79
|
+
if (config)
|
|
80
|
+
rustfmtArgs.push("--config", config);
|
|
81
|
+
if (configPath)
|
|
82
|
+
rustfmtArgs.push("--config-path", configPath);
|
|
83
|
+
if (emit)
|
|
84
|
+
rustfmtArgs.push("--emit", emit);
|
|
85
|
+
// Gap #92: In check mode, use --files-with-diff for more reliable file detection
|
|
86
|
+
// In non-check mode, pass -l (--files-with-diff) to get list of reformatted files
|
|
87
|
+
if (check && !includeDiff) {
|
|
88
|
+
rustfmtArgs.push("--files-with-diff");
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
if (!check) {
|
|
92
|
+
rustfmtArgs.push("-l");
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
if (rustfmtArgs.length > 0) {
|
|
96
|
+
args.push("--", ...rustfmtArgs);
|
|
97
|
+
}
|
|
35
98
|
const result = await cargo(args, cwd);
|
|
36
99
|
const data = parseCargoFmtOutput(result.stdout, result.stderr, result.exitCode, !!check);
|
|
37
100
|
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,QAkGnD"}
|
package/dist/tools/remove.js
CHANGED
|
@@ -8,35 +8,82 @@ import { CargoRemoveResultSchema } from "../schemas/index.js";
|
|
|
8
8
|
export function registerRemoveTool(server) {
|
|
9
9
|
server.registerTool("remove", {
|
|
10
10
|
title: "Cargo Remove",
|
|
11
|
-
description: "Removes dependencies from a Rust project and returns structured output.
|
|
11
|
+
description: "Removes dependencies from a Rust project and returns structured output.",
|
|
12
12
|
inputSchema: {
|
|
13
|
-
path: z
|
|
14
|
-
.string()
|
|
15
|
-
.max(INPUT_LIMITS.PATH_MAX)
|
|
16
|
-
.optional()
|
|
17
|
-
.describe("Project root path (default: cwd)"),
|
|
13
|
+
path: z.string().max(INPUT_LIMITS.PATH_MAX).optional().describe("Project root path"),
|
|
18
14
|
packages: z
|
|
19
15
|
.array(z.string().max(INPUT_LIMITS.SHORT_STRING_MAX))
|
|
20
16
|
.max(INPUT_LIMITS.ARRAY_MAX)
|
|
21
17
|
.describe("Package names to remove"),
|
|
22
18
|
dev: z.boolean().optional().default(false).describe("Remove from dev dependencies (--dev)"),
|
|
23
|
-
|
|
19
|
+
build: z
|
|
20
|
+
.boolean()
|
|
21
|
+
.optional()
|
|
22
|
+
.default(false)
|
|
23
|
+
.describe("Remove from build dependencies (--build)"),
|
|
24
|
+
dryRun: z
|
|
25
|
+
.boolean()
|
|
26
|
+
.optional()
|
|
27
|
+
.default(false)
|
|
28
|
+
.describe("Preview what would be removed without modifying Cargo.toml (--dry-run)"),
|
|
29
|
+
package: z
|
|
30
|
+
.string()
|
|
31
|
+
.max(INPUT_LIMITS.SHORT_STRING_MAX)
|
|
32
|
+
.optional()
|
|
33
|
+
.describe("Package to target in a workspace (-p <SPEC>)"),
|
|
34
|
+
locked: z
|
|
35
|
+
.boolean()
|
|
36
|
+
.optional()
|
|
37
|
+
.default(false)
|
|
38
|
+
.describe("Require Cargo.lock is up to date (--locked)"),
|
|
39
|
+
frozen: z
|
|
40
|
+
.boolean()
|
|
41
|
+
.optional()
|
|
42
|
+
.default(false)
|
|
43
|
+
.describe("Require Cargo.lock and cache are up to date (--frozen)"),
|
|
44
|
+
offline: z
|
|
24
45
|
.boolean()
|
|
25
46
|
.optional()
|
|
26
|
-
.default(
|
|
27
|
-
.describe("
|
|
47
|
+
.default(false)
|
|
48
|
+
.describe("Run without accessing the network (--offline)"),
|
|
49
|
+
manifestPath: z
|
|
50
|
+
.string()
|
|
51
|
+
.max(INPUT_LIMITS.PATH_MAX)
|
|
52
|
+
.optional()
|
|
53
|
+
.describe("Path to Cargo.toml (--manifest-path <PATH>)"),
|
|
54
|
+
compact: z.boolean().optional().default(true).describe("Prefer compact output"),
|
|
28
55
|
},
|
|
29
56
|
outputSchema: CargoRemoveResultSchema,
|
|
30
|
-
}, async ({ path, packages, dev, compact }) => {
|
|
57
|
+
}, async ({ path, packages, dev, build, dryRun, package: pkg, locked, frozen, offline, manifestPath, compact, }) => {
|
|
31
58
|
const cwd = path || process.cwd();
|
|
32
|
-
for (const
|
|
33
|
-
assertNoFlagInjection(
|
|
59
|
+
for (const p of packages) {
|
|
60
|
+
assertNoFlagInjection(p, "packages");
|
|
34
61
|
}
|
|
62
|
+
if (pkg)
|
|
63
|
+
assertNoFlagInjection(pkg, "package");
|
|
64
|
+
if (manifestPath)
|
|
65
|
+
assertNoFlagInjection(manifestPath, "manifestPath");
|
|
35
66
|
const args = ["remove", ...packages];
|
|
36
67
|
if (dev)
|
|
37
68
|
args.push("--dev");
|
|
69
|
+
if (build)
|
|
70
|
+
args.push("--build");
|
|
71
|
+
if (dryRun)
|
|
72
|
+
args.push("--dry-run");
|
|
73
|
+
if (pkg)
|
|
74
|
+
args.push("-p", pkg);
|
|
75
|
+
if (locked)
|
|
76
|
+
args.push("--locked");
|
|
77
|
+
if (frozen)
|
|
78
|
+
args.push("--frozen");
|
|
79
|
+
if (offline)
|
|
80
|
+
args.push("--offline");
|
|
81
|
+
if (manifestPath)
|
|
82
|
+
args.push("--manifest-path", manifestPath);
|
|
83
|
+
// Gap #93: Determine dependency type from flags
|
|
84
|
+
const depType = dev ? "dev" : build ? "build" : "normal";
|
|
38
85
|
const result = await cargo(args, cwd);
|
|
39
|
-
const data = parseCargoRemoveOutput(result.stdout, result.stderr, result.exitCode);
|
|
86
|
+
const data = parseCargoRemoveOutput(result.stdout, result.stderr, result.exitCode, depType);
|
|
40
87
|
return compactDualOutput(data, result.stdout + result.stderr, formatCargoRemove, compactRemoveMap, formatRemoveCompact, compact === false);
|
|
41
88
|
});
|
|
42
89
|
}
|
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,
|
|
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,QAoKhD"}
|