@git.zone/tsrust 1.5.0 → 1.6.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/.smartconfig.json +10 -1
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/mod_cargo/classes.cargorunner.d.ts +4 -1
- package/dist_ts/mod_cargo/classes.cargorunner.js +8 -6
- package/dist_ts/mod_cargo/classes.targetcache.d.ts +37 -0
- package/dist_ts/mod_cargo/classes.targetcache.js +260 -0
- package/dist_ts/mod_cargo/index.d.ts +1 -0
- package/dist_ts/mod_cargo/index.js +2 -1
- package/dist_ts/mod_cli/classes.tsrustcli.d.ts +2 -0
- package/dist_ts/mod_cli/classes.tsrustcli.js +52 -7
- package/package.json +2 -2
- package/readme.md +39 -8
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/mod_cargo/classes.cargorunner.ts +8 -6
- package/ts/mod_cargo/classes.targetcache.ts +304 -0
- package/ts/mod_cargo/index.ts +1 -0
- package/ts/mod_cli/classes.tsrustcli.ts +63 -6
package/.smartconfig.json
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"@git.zone/cli": {
|
|
3
|
+
"schemaVersion": 2,
|
|
3
4
|
"projectType": "npm",
|
|
4
5
|
"module": {
|
|
5
6
|
"githost": "code.foss.global",
|
|
@@ -20,12 +21,20 @@
|
|
|
20
21
|
},
|
|
21
22
|
"release": {
|
|
22
23
|
"targets": {
|
|
24
|
+
"git": {
|
|
25
|
+
"enabled": true,
|
|
26
|
+
"remote": "origin",
|
|
27
|
+
"pushBranch": true,
|
|
28
|
+
"pushTags": true
|
|
29
|
+
},
|
|
23
30
|
"npm": {
|
|
31
|
+
"enabled": true,
|
|
24
32
|
"registries": [
|
|
25
33
|
"https://verdaccio.lossless.digital",
|
|
26
34
|
"https://registry.npmjs.org"
|
|
27
35
|
],
|
|
28
|
-
"accessLevel": "public"
|
|
36
|
+
"accessLevel": "public",
|
|
37
|
+
"alreadyPublished": "success"
|
|
29
38
|
}
|
|
30
39
|
}
|
|
31
40
|
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@git.zone/tsrust',
|
|
6
|
-
version: '1.
|
|
6
|
+
version: '1.6.0',
|
|
7
7
|
description: 'A tool for compiling Rust projects, detecting Cargo workspaces, building with cargo, and placing binaries in a conventional dist_rust directory.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxrQkFBa0I7SUFDeEIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLGtKQUFrSjtDQUNoSyxDQUFBIn0=
|
|
@@ -16,11 +16,14 @@ export declare class CargoRunner {
|
|
|
16
16
|
target?: string;
|
|
17
17
|
crtStatic?: boolean;
|
|
18
18
|
rustflags?: string[];
|
|
19
|
+
targetDir?: string;
|
|
19
20
|
}): Promise<ICargoRunResult>;
|
|
20
21
|
private shellQuote;
|
|
21
22
|
/**
|
|
22
23
|
* Ensures a rustup target is installed. If not present, installs it via `rustup target add`.
|
|
23
24
|
*/
|
|
24
25
|
ensureTarget(triple: string): Promise<void>;
|
|
25
|
-
clean(
|
|
26
|
+
clean(options?: {
|
|
27
|
+
targetDir?: string;
|
|
28
|
+
}): Promise<ICargoRunResult>;
|
|
26
29
|
}
|
|
@@ -21,7 +21,7 @@ export class CargoRunner {
|
|
|
21
21
|
async build(options = {}) {
|
|
22
22
|
if (options.clean) {
|
|
23
23
|
console.log('Cleaning previous build...');
|
|
24
|
-
await this.clean();
|
|
24
|
+
await this.clean({ targetDir: options.targetDir });
|
|
25
25
|
}
|
|
26
26
|
// crt-static may only be injected together with an explicit --target:
|
|
27
27
|
// without one, cargo applies RUSTFLAGS to host artifacts too, and rustc
|
|
@@ -39,8 +39,9 @@ export class CargoRunner {
|
|
|
39
39
|
rustflags.unshift('-C', 'target-feature=+crt-static');
|
|
40
40
|
}
|
|
41
41
|
const rustflagsPrefix = rustflags.length ? `RUSTFLAGS=${this.shellQuote(rustflags.join(' '))} ` : '';
|
|
42
|
-
const
|
|
43
|
-
|
|
42
|
+
const targetDirPrefix = options.targetDir ? `CARGO_TARGET_DIR=${this.shellQuote(options.targetDir)} ` : '';
|
|
43
|
+
const command = `${this.envPrefix}cd ${this.rustDir} && ${targetDirPrefix}${rustflagsPrefix}cargo build${profile}${targetFlag}`;
|
|
44
|
+
console.log(`Running: ${targetDirPrefix}${rustflagsPrefix}cargo build${profile}${targetFlag}`);
|
|
44
45
|
const result = await this.shell.exec(command);
|
|
45
46
|
return {
|
|
46
47
|
success: result.exitCode === 0,
|
|
@@ -66,8 +67,9 @@ export class CargoRunner {
|
|
|
66
67
|
throw new Error(`Failed to install rustup target ${triple}`);
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
|
-
async clean() {
|
|
70
|
-
const
|
|
70
|
+
async clean(options = {}) {
|
|
71
|
+
const targetDirPrefix = options.targetDir ? `CARGO_TARGET_DIR=${this.shellQuote(options.targetDir)} ` : '';
|
|
72
|
+
const command = `${this.envPrefix}cd ${this.rustDir} && ${targetDirPrefix}cargo clean`;
|
|
71
73
|
const result = await this.shell.exec(command);
|
|
72
74
|
return {
|
|
73
75
|
success: result.exitCode === 0,
|
|
@@ -76,4 +78,4 @@ export class CargoRunner {
|
|
|
76
78
|
};
|
|
77
79
|
}
|
|
78
80
|
}
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5jYXJnb3J1bm5lci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL21vZF9jYXJnby9jbGFzc2VzLmNhcmdvcnVubmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sZUFBZSxDQUFDO0FBUXpDLE1BQU0sT0FBTyxXQUFXO0lBQ2QsS0FBSyxDQUFnQztJQUNyQyxPQUFPLENBQVM7SUFDaEIsU0FBUyxDQUFTO0lBRTFCLFlBQVksT0FBZSxFQUFFLFlBQW9CLEVBQUU7UUFDakQsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7UUFDM0IsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDO1lBQzdDLFFBQVEsRUFBRSxNQUFNO1NBQ2pCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFTSxLQUFLLENBQUMsbUJBQW1CO1FBQzlCLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsR0FBRyxJQUFJLENBQUMsU0FBUyxpQkFBaUIsQ0FBQyxDQUFDO1FBQy9FLE9BQU8sTUFBTSxDQUFDLFFBQVEsS0FBSyxDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVNLEtBQUssQ0FBQyxlQUFlO1FBQzFCLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsR0FBRyxJQUFJLENBQUMsU0FBUyxpQkFBaUIsQ0FBQyxDQUFDO1FBQy9FLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUM5QixDQUFDO0lBRU0sS0FBSyxDQUFDLEtBQUssQ0FBQyxVQUFnSSxFQUFFO1FBQ25KLElBQUksT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ2xCLE9BQU8sQ0FBQyxHQUFHLENBQUMsNEJBQTRCLENB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
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
export declare const toolCacheMarkerFile = ".gitzone-tool-cache.json";
|
|
2
|
+
export declare const tsrustCacheOwner = "@git.zone/tsrust";
|
|
3
|
+
export declare const targetCacheKind = "rust-target-cache";
|
|
4
|
+
export interface IToolCacheMarker {
|
|
5
|
+
owner: string;
|
|
6
|
+
kind: string;
|
|
7
|
+
safeToPrune: boolean;
|
|
8
|
+
createdAt: string;
|
|
9
|
+
schemaVersion: 1;
|
|
10
|
+
}
|
|
11
|
+
export interface ITsrustPruneCandidate {
|
|
12
|
+
path: string;
|
|
13
|
+
workspace: string;
|
|
14
|
+
bytes: number;
|
|
15
|
+
marked: boolean;
|
|
16
|
+
shouldPrune: boolean;
|
|
17
|
+
reason: string;
|
|
18
|
+
truncated?: boolean;
|
|
19
|
+
}
|
|
20
|
+
export interface ITsrustPruneOptions {
|
|
21
|
+
workspace: string;
|
|
22
|
+
targetDir?: string;
|
|
23
|
+
days?: number;
|
|
24
|
+
maxSizeBytes?: number;
|
|
25
|
+
}
|
|
26
|
+
export declare function createTargetCacheMarker(): IToolCacheMarker;
|
|
27
|
+
export declare function isValidTargetCacheMarker(markerArg: unknown): markerArg is IToolCacheMarker;
|
|
28
|
+
export declare function getDefaultManagedTargetDir(workspaceArg: string): string;
|
|
29
|
+
export declare function isSafeManagedTargetDir(workspaceArg: string, targetDirArg: string): boolean;
|
|
30
|
+
export declare function resolveManagedTargetDir(workspaceArg: string, configTargetDirArg?: string): string;
|
|
31
|
+
export declare function getCargoArtifactDir(targetDirArg: string, profileArg: string, targetTripleArg?: string): string;
|
|
32
|
+
export declare function parseSizeToBytes(valueArg: string | undefined): number | undefined;
|
|
33
|
+
export declare function writeTargetCacheMarker(targetDirArg: string): Promise<void>;
|
|
34
|
+
export declare function readTargetCacheMarker(targetDirArg: string): Promise<IToolCacheMarker | undefined>;
|
|
35
|
+
export declare function getDirectorySize(pathArg: string): Promise<number>;
|
|
36
|
+
export declare function createTsrustPrunePlan(optionsArg: ITsrustPruneOptions): Promise<ITsrustPruneCandidate[]>;
|
|
37
|
+
export declare function applyTsrustPrunePlan(planArg: ITsrustPruneCandidate[]): Promise<void>;
|
|
@@ -0,0 +1,260 @@
|
|
|
1
|
+
import * as fs from 'node:fs/promises';
|
|
2
|
+
import * as path from 'node:path';
|
|
3
|
+
export const toolCacheMarkerFile = '.gitzone-tool-cache.json';
|
|
4
|
+
export const tsrustCacheOwner = '@git.zone/tsrust';
|
|
5
|
+
export const targetCacheKind = 'rust-target-cache';
|
|
6
|
+
export function createTargetCacheMarker() {
|
|
7
|
+
return {
|
|
8
|
+
owner: tsrustCacheOwner,
|
|
9
|
+
kind: targetCacheKind,
|
|
10
|
+
safeToPrune: true,
|
|
11
|
+
createdAt: new Date().toISOString(),
|
|
12
|
+
schemaVersion: 1,
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
export function isValidTargetCacheMarker(markerArg) {
|
|
16
|
+
const marker = markerArg;
|
|
17
|
+
return marker.owner === tsrustCacheOwner
|
|
18
|
+
&& marker.kind === targetCacheKind
|
|
19
|
+
&& marker.safeToPrune === true
|
|
20
|
+
&& marker.schemaVersion === 1;
|
|
21
|
+
}
|
|
22
|
+
export function getDefaultManagedTargetDir(workspaceArg) {
|
|
23
|
+
return path.resolve(workspaceArg, '.nogit', 'tsrust-target');
|
|
24
|
+
}
|
|
25
|
+
export function isSafeManagedTargetDir(workspaceArg, targetDirArg) {
|
|
26
|
+
const workspace = path.resolve(workspaceArg);
|
|
27
|
+
const targetDir = path.resolve(targetDirArg);
|
|
28
|
+
const relative = path.relative(workspace, targetDir);
|
|
29
|
+
if (!relative || relative.startsWith('..') || path.isAbsolute(relative)) {
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
return relative === path.join('.nogit', 'tsrust-target')
|
|
33
|
+
|| relative.startsWith(`${path.join('.nogit', 'tsrust-')}`)
|
|
34
|
+
|| relative.startsWith(`${path.join('.nogit', 'tsrust')}${path.sep}`);
|
|
35
|
+
}
|
|
36
|
+
export function resolveManagedTargetDir(workspaceArg, configTargetDirArg) {
|
|
37
|
+
const configured = process.env.TSRUST_TARGET_DIR || configTargetDirArg;
|
|
38
|
+
const targetDir = configured
|
|
39
|
+
? path.isAbsolute(configured) ? configured : path.resolve(workspaceArg, configured)
|
|
40
|
+
: getDefaultManagedTargetDir(workspaceArg);
|
|
41
|
+
if (!isSafeManagedTargetDir(workspaceArg, targetDir)) {
|
|
42
|
+
throw new Error(`Refusing unsafe tsrust target dir outside workspace .nogit/: ${targetDir}`);
|
|
43
|
+
}
|
|
44
|
+
return targetDir;
|
|
45
|
+
}
|
|
46
|
+
export function getCargoArtifactDir(targetDirArg, profileArg, targetTripleArg) {
|
|
47
|
+
return targetTripleArg
|
|
48
|
+
? path.join(targetDirArg, targetTripleArg, profileArg)
|
|
49
|
+
: path.join(targetDirArg, profileArg);
|
|
50
|
+
}
|
|
51
|
+
export function parseSizeToBytes(valueArg) {
|
|
52
|
+
if (!valueArg) {
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
55
|
+
const match = valueArg.trim().match(/^(\d+(?:\.\d+)?)(b|kb|kib|mb|mib|gb|gib)?$/i);
|
|
56
|
+
if (!match) {
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
const value = Number(match[1]);
|
|
60
|
+
const unit = (match[2] || 'b').toLowerCase();
|
|
61
|
+
const multiplier = unit === 'gb' || unit === 'gib'
|
|
62
|
+
? 1024 ** 3
|
|
63
|
+
: unit === 'mb' || unit === 'mib'
|
|
64
|
+
? 1024 ** 2
|
|
65
|
+
: unit === 'kb' || unit === 'kib'
|
|
66
|
+
? 1024
|
|
67
|
+
: 1;
|
|
68
|
+
return Math.round(value * multiplier);
|
|
69
|
+
}
|
|
70
|
+
export async function writeTargetCacheMarker(targetDirArg) {
|
|
71
|
+
await fs.mkdir(targetDirArg, { recursive: true });
|
|
72
|
+
const existingMarker = await readTargetCacheMarker(targetDirArg);
|
|
73
|
+
if (existingMarker) {
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
const entries = await fs.readdir(targetDirArg);
|
|
77
|
+
if (entries.length > 0) {
|
|
78
|
+
throw new Error(`Refusing to mark pre-existing non-empty tsrust target cache: ${targetDirArg}`);
|
|
79
|
+
}
|
|
80
|
+
await fs.writeFile(path.join(targetDirArg, toolCacheMarkerFile), `${JSON.stringify(createTargetCacheMarker(), null, 2)}\n`);
|
|
81
|
+
}
|
|
82
|
+
export async function readTargetCacheMarker(targetDirArg) {
|
|
83
|
+
try {
|
|
84
|
+
const markerRaw = await fs.readFile(path.join(targetDirArg, toolCacheMarkerFile), 'utf8');
|
|
85
|
+
const marker = JSON.parse(markerRaw);
|
|
86
|
+
return isValidTargetCacheMarker(marker) ? marker : undefined;
|
|
87
|
+
}
|
|
88
|
+
catch {
|
|
89
|
+
return undefined;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
async function pathExists(pathArg) {
|
|
93
|
+
try {
|
|
94
|
+
await fs.stat(pathArg);
|
|
95
|
+
return true;
|
|
96
|
+
}
|
|
97
|
+
catch {
|
|
98
|
+
return false;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
export async function getDirectorySize(pathArg) {
|
|
102
|
+
let total = 0;
|
|
103
|
+
let entries;
|
|
104
|
+
try {
|
|
105
|
+
entries = await fs.readdir(pathArg, { withFileTypes: true });
|
|
106
|
+
}
|
|
107
|
+
catch {
|
|
108
|
+
return 0;
|
|
109
|
+
}
|
|
110
|
+
for (const entry of entries) {
|
|
111
|
+
const entryPath = path.join(pathArg, entry.name);
|
|
112
|
+
if (entry.isDirectory()) {
|
|
113
|
+
total += await getDirectorySize(entryPath);
|
|
114
|
+
}
|
|
115
|
+
else if (entry.isFile()) {
|
|
116
|
+
try {
|
|
117
|
+
total += (await fs.stat(entryPath)).size;
|
|
118
|
+
}
|
|
119
|
+
catch {
|
|
120
|
+
// Ignore files that disappear while planning a prune.
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
return total;
|
|
125
|
+
}
|
|
126
|
+
async function getDirectoryUsage(pathArg, maxEntriesArg = 100_000) {
|
|
127
|
+
let bytes = 0;
|
|
128
|
+
let newestMtimeMs = 0;
|
|
129
|
+
let visitedEntries = 0;
|
|
130
|
+
let truncated = false;
|
|
131
|
+
const visit = async (entryPathArg) => {
|
|
132
|
+
if (visitedEntries >= maxEntriesArg) {
|
|
133
|
+
truncated = true;
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
visitedEntries++;
|
|
137
|
+
let stat;
|
|
138
|
+
try {
|
|
139
|
+
stat = await fs.stat(entryPathArg);
|
|
140
|
+
}
|
|
141
|
+
catch {
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
144
|
+
newestMtimeMs = Math.max(newestMtimeMs, stat.mtimeMs);
|
|
145
|
+
if (stat.isFile()) {
|
|
146
|
+
bytes += stat.size;
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
149
|
+
if (!stat.isDirectory()) {
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
let entries;
|
|
153
|
+
try {
|
|
154
|
+
entries = await fs.readdir(entryPathArg, { withFileTypes: true });
|
|
155
|
+
}
|
|
156
|
+
catch {
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
159
|
+
for (const entry of entries) {
|
|
160
|
+
if (visitedEntries >= maxEntriesArg) {
|
|
161
|
+
truncated = true;
|
|
162
|
+
return;
|
|
163
|
+
}
|
|
164
|
+
await visit(path.join(entryPathArg, entry.name));
|
|
165
|
+
}
|
|
166
|
+
};
|
|
167
|
+
await visit(pathArg);
|
|
168
|
+
return { bytes, newestMtimeMs, truncated };
|
|
169
|
+
}
|
|
170
|
+
async function getNewestMtimeMs(pathArg) {
|
|
171
|
+
let newest = 0;
|
|
172
|
+
try {
|
|
173
|
+
const stat = await fs.stat(pathArg);
|
|
174
|
+
newest = stat.mtimeMs;
|
|
175
|
+
}
|
|
176
|
+
catch {
|
|
177
|
+
return 0;
|
|
178
|
+
}
|
|
179
|
+
let entries;
|
|
180
|
+
try {
|
|
181
|
+
entries = await fs.readdir(pathArg, { withFileTypes: true });
|
|
182
|
+
}
|
|
183
|
+
catch {
|
|
184
|
+
return newest;
|
|
185
|
+
}
|
|
186
|
+
for (const entry of entries) {
|
|
187
|
+
const entryPath = path.join(pathArg, entry.name);
|
|
188
|
+
if (entry.isDirectory()) {
|
|
189
|
+
newest = Math.max(newest, await getNewestMtimeMs(entryPath));
|
|
190
|
+
}
|
|
191
|
+
else if (entry.isFile()) {
|
|
192
|
+
try {
|
|
193
|
+
newest = Math.max(newest, (await fs.stat(entryPath)).mtimeMs);
|
|
194
|
+
}
|
|
195
|
+
catch {
|
|
196
|
+
// Ignore files that disappear while planning a prune.
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
return newest;
|
|
201
|
+
}
|
|
202
|
+
export async function createTsrustPrunePlan(optionsArg) {
|
|
203
|
+
const workspace = path.resolve(optionsArg.workspace);
|
|
204
|
+
const managedTargetDir = optionsArg.targetDir
|
|
205
|
+
? resolveManagedTargetDir(workspace, optionsArg.targetDir)
|
|
206
|
+
: resolveManagedTargetDir(workspace);
|
|
207
|
+
const candidates = [
|
|
208
|
+
managedTargetDir,
|
|
209
|
+
path.join(workspace, 'rust', 'target'),
|
|
210
|
+
path.join(workspace, 'ts_rust', 'target'),
|
|
211
|
+
];
|
|
212
|
+
const uniqueCandidates = [...new Set(candidates.map((candidate) => path.resolve(candidate)))];
|
|
213
|
+
const pruneCandidates = [];
|
|
214
|
+
const maxAgeMs = typeof optionsArg.days === 'number' ? optionsArg.days * 24 * 60 * 60 * 1000 : undefined;
|
|
215
|
+
for (const candidate of uniqueCandidates) {
|
|
216
|
+
if (!(await pathExists(candidate))) {
|
|
217
|
+
continue;
|
|
218
|
+
}
|
|
219
|
+
const marker = await readTargetCacheMarker(candidate);
|
|
220
|
+
const usage = await getDirectoryUsage(candidate);
|
|
221
|
+
const isManagedTarget = isSafeManagedTargetDir(workspace, candidate);
|
|
222
|
+
const ageMatches = typeof maxAgeMs === 'number' ? Date.now() - usage.newestMtimeMs >= maxAgeMs : false;
|
|
223
|
+
const bytes = usage.bytes;
|
|
224
|
+
const sizeMatches = typeof optionsArg.maxSizeBytes === 'number' ? bytes >= optionsArg.maxSizeBytes : false;
|
|
225
|
+
const shouldPrune = !!marker && isManagedTarget && (ageMatches || sizeMatches);
|
|
226
|
+
const reason = marker
|
|
227
|
+
? !isManagedTarget
|
|
228
|
+
? 'marked Rust target outside managed tsrust target allowlist; report-only'
|
|
229
|
+
: shouldPrune
|
|
230
|
+
? [ageMatches ? `older than ${optionsArg.days} day(s)` : '', sizeMatches ? `at least ${optionsArg.maxSizeBytes} bytes` : ''].filter(Boolean).join(', ')
|
|
231
|
+
: 'marked tsrust target cache; below prune thresholds'
|
|
232
|
+
: 'unmarked conventional Rust target; report-only';
|
|
233
|
+
pruneCandidates.push({
|
|
234
|
+
path: candidate,
|
|
235
|
+
workspace,
|
|
236
|
+
bytes,
|
|
237
|
+
marked: !!marker,
|
|
238
|
+
shouldPrune,
|
|
239
|
+
reason,
|
|
240
|
+
truncated: usage.truncated,
|
|
241
|
+
});
|
|
242
|
+
}
|
|
243
|
+
return pruneCandidates;
|
|
244
|
+
}
|
|
245
|
+
export async function applyTsrustPrunePlan(planArg) {
|
|
246
|
+
for (const candidate of planArg) {
|
|
247
|
+
if (!candidate.shouldPrune) {
|
|
248
|
+
continue;
|
|
249
|
+
}
|
|
250
|
+
if (!isSafeManagedTargetDir(candidate.workspace, candidate.path)) {
|
|
251
|
+
throw new Error(`Refusing unsafe Rust target cache path: ${candidate.path}`);
|
|
252
|
+
}
|
|
253
|
+
const marker = await readTargetCacheMarker(candidate.path);
|
|
254
|
+
if (!marker) {
|
|
255
|
+
throw new Error(`Refusing to remove unmarked Rust target cache: ${candidate.path}`);
|
|
256
|
+
}
|
|
257
|
+
await fs.rm(candidate.path, { recursive: true, force: true });
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.targetcache.js","sourceRoot":"","sources":["../../ts/mod_cargo/classes.targetcache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export { CargoConfig } from './classes.cargoconfig.js';
|
|
2
2
|
export { CargoRunner } from './classes.cargorunner.js';
|
|
3
|
-
|
|
3
|
+
export * from './classes.targetcache.js';
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfY2FyZ28vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN2RCxjQUFjLDBCQUEwQixDQUFDIn0=
|
|
@@ -11,8 +11,10 @@ export declare class TsRustCli {
|
|
|
11
11
|
*/
|
|
12
12
|
private resolveToolchain;
|
|
13
13
|
private registerStandardCommand;
|
|
14
|
+
private shouldPruneAfterBuild;
|
|
14
15
|
private buildRustflags;
|
|
15
16
|
private registerCleanCommand;
|
|
17
|
+
private registerPruneCommand;
|
|
16
18
|
private detectRustDir;
|
|
17
19
|
run(): void;
|
|
18
20
|
}
|
|
@@ -3,6 +3,7 @@ import * as os from 'os';
|
|
|
3
3
|
import * as plugins from '../plugins.js';
|
|
4
4
|
import { CargoConfig } from '../mod_cargo/index.js';
|
|
5
5
|
import { CargoRunner } from '../mod_cargo/index.js';
|
|
6
|
+
import { applyTsrustPrunePlan, createTsrustPrunePlan, getCargoArtifactDir, parseSizeToBytes, resolveManagedTargetDir, writeTargetCacheMarker, } from '../mod_cargo/index.js';
|
|
6
7
|
import { ElfInspector } from '../mod_elf/index.js';
|
|
7
8
|
import { FsHelpers } from '../mod_fs/index.js';
|
|
8
9
|
import { ToolchainManager } from '../mod_toolchain/index.js';
|
|
@@ -59,6 +60,7 @@ export class TsRustCli {
|
|
|
59
60
|
registerCommands() {
|
|
60
61
|
this.registerStandardCommand();
|
|
61
62
|
this.registerCleanCommand();
|
|
63
|
+
this.registerPruneCommand();
|
|
62
64
|
}
|
|
63
65
|
/**
|
|
64
66
|
* Resolves the Rust toolchain to use. Tries system cargo first,
|
|
@@ -107,6 +109,8 @@ export class TsRustCli {
|
|
|
107
109
|
const shouldClean = !!argvArg.clean;
|
|
108
110
|
const distDir = path.join(this.cwd, 'dist_rust');
|
|
109
111
|
const profile = isDebug ? 'debug' : 'release';
|
|
112
|
+
const managedTargetDir = resolveManagedTargetDir(this.cwd, this.config.targetDir);
|
|
113
|
+
await writeTargetCacheMarker(managedTargetDir);
|
|
110
114
|
// Parse --target flag (can appear multiple times), fall back to smartconfig.json config
|
|
111
115
|
const cliTargets = argvArg.target;
|
|
112
116
|
const targets = cliTargets
|
|
@@ -140,13 +144,13 @@ export class TsRustCli {
|
|
|
140
144
|
target: triple,
|
|
141
145
|
crtStatic: useStatic && wantsCrtStatic(triple),
|
|
142
146
|
rustflags,
|
|
147
|
+
targetDir: managedTargetDir,
|
|
143
148
|
});
|
|
144
149
|
if (!buildResult.success) {
|
|
145
150
|
console.error(`Build failed for target ${triple} with exit code ${buildResult.exitCode}`);
|
|
146
151
|
process.exit(1);
|
|
147
152
|
}
|
|
148
|
-
|
|
149
|
-
const targetDir = path.join(rustDir, 'target', triple, profile);
|
|
153
|
+
const targetDir = getCargoArtifactDir(managedTargetDir, profile, triple);
|
|
150
154
|
for (const binName of workspaceInfo.binTargets) {
|
|
151
155
|
const srcBinary = path.join(targetDir, binName);
|
|
152
156
|
const destName = `${binName}_${friendly}`;
|
|
@@ -191,14 +195,13 @@ export class TsRustCli {
|
|
|
191
195
|
target: nativeTriple,
|
|
192
196
|
crtStatic: !!nativeTriple && wantsCrtStatic(nativeTriple),
|
|
193
197
|
rustflags,
|
|
198
|
+
targetDir: managedTargetDir,
|
|
194
199
|
});
|
|
195
200
|
if (!buildResult.success) {
|
|
196
201
|
console.error(`Build failed with exit code ${buildResult.exitCode}`);
|
|
197
202
|
process.exit(1);
|
|
198
203
|
}
|
|
199
|
-
const targetDir = nativeTriple
|
|
200
|
-
? path.join(rustDir, 'target', nativeTriple, profile)
|
|
201
|
-
: path.join(rustDir, 'target', profile);
|
|
204
|
+
const targetDir = getCargoArtifactDir(managedTargetDir, profile, nativeTriple);
|
|
202
205
|
await FsHelpers.ensureEmptyDir(distDir);
|
|
203
206
|
for (const binName of workspaceInfo.binTargets) {
|
|
204
207
|
const srcBinary = path.join(targetDir, binName);
|
|
@@ -220,10 +223,23 @@ export class TsRustCli {
|
|
|
220
223
|
}
|
|
221
224
|
}
|
|
222
225
|
}
|
|
226
|
+
if (this.shouldPruneAfterBuild()) {
|
|
227
|
+
const plan = await createTsrustPrunePlan({
|
|
228
|
+
workspace: this.cwd,
|
|
229
|
+
targetDir: managedTargetDir,
|
|
230
|
+
days: 0,
|
|
231
|
+
});
|
|
232
|
+
await applyTsrustPrunePlan(plan);
|
|
233
|
+
console.log('Pruned marked tsrust target cache after successful build.');
|
|
234
|
+
}
|
|
223
235
|
const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
|
|
224
236
|
console.log(`\nDone in ${elapsed}s`);
|
|
225
237
|
});
|
|
226
238
|
}
|
|
239
|
+
shouldPruneAfterBuild() {
|
|
240
|
+
const normalized = process.env.TSRUST_PRUNE_AFTER_BUILD?.toLowerCase();
|
|
241
|
+
return normalized === '1' || normalized === 'true' || normalized === 'yes' || normalized === 'y' || this.config.pruneAfterBuild === true;
|
|
242
|
+
}
|
|
227
243
|
buildRustflags(rustDir) {
|
|
228
244
|
const rustflags = [...(this.config.rustflags || [])];
|
|
229
245
|
if (this.config.remapLocalPaths) {
|
|
@@ -248,7 +264,7 @@ export class TsRustCli {
|
|
|
248
264
|
const envPrefix = await this.resolveToolchain();
|
|
249
265
|
console.log('Running cargo clean...');
|
|
250
266
|
const runner = new CargoRunner(rustDir, envPrefix);
|
|
251
|
-
await runner.clean();
|
|
267
|
+
await runner.clean({ targetDir: resolveManagedTargetDir(this.cwd, this.config.targetDir) });
|
|
252
268
|
console.log('Cargo clean complete.');
|
|
253
269
|
}
|
|
254
270
|
// Remove dist_rust/
|
|
@@ -260,6 +276,35 @@ export class TsRustCli {
|
|
|
260
276
|
console.log('Clean complete.');
|
|
261
277
|
});
|
|
262
278
|
}
|
|
279
|
+
registerPruneCommand() {
|
|
280
|
+
this.cli.addCommand('prune').subscribe(async (argvArg) => {
|
|
281
|
+
const workspace = argvArg.workspace || this.cwd;
|
|
282
|
+
const daysArg = argvArg.days;
|
|
283
|
+
const days = daysArg === undefined ? 14 : Number(daysArg);
|
|
284
|
+
const maxSizeBytes = parseSizeToBytes(argvArg.maxSize);
|
|
285
|
+
const apply = !!argvArg.apply;
|
|
286
|
+
const plan = await createTsrustPrunePlan({
|
|
287
|
+
workspace,
|
|
288
|
+
targetDir: resolveManagedTargetDir(workspace, this.config.targetDir),
|
|
289
|
+
days: Number.isFinite(days) ? days : 14,
|
|
290
|
+
maxSizeBytes,
|
|
291
|
+
});
|
|
292
|
+
console.log(apply ? 'tsrust prune apply plan:' : 'tsrust prune dry-run plan:');
|
|
293
|
+
if (plan.length === 0) {
|
|
294
|
+
console.log('No Rust target caches found.');
|
|
295
|
+
}
|
|
296
|
+
for (const candidate of plan) {
|
|
297
|
+
const action = candidate.shouldPrune ? (apply ? 'remove' : 'would remove') : 'report';
|
|
298
|
+
console.log(`${action}: ${candidate.path} (${FsHelpers.formatFileSize(candidate.bytes)}) - ${candidate.reason}`);
|
|
299
|
+
}
|
|
300
|
+
if (apply) {
|
|
301
|
+
await applyTsrustPrunePlan(plan);
|
|
302
|
+
}
|
|
303
|
+
else {
|
|
304
|
+
console.log('Dry-run only. Re-run with --apply to remove marked tsrust target caches.');
|
|
305
|
+
}
|
|
306
|
+
});
|
|
307
|
+
}
|
|
263
308
|
async detectRustDir() {
|
|
264
309
|
// Check rust/ first
|
|
265
310
|
const rustDir = path.join(this.cwd, 'rust');
|
|
@@ -281,4 +326,4 @@ export const runCli = async () => {
|
|
|
281
326
|
const cli = new TsRustCli();
|
|
282
327
|
cli.run();
|
|
283
328
|
};
|
|
284
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tsrustcli.js","sourceRoot":"","sources":["../../ts/mod_cli/classes.tsrustcli.ts"],"names":[],"mappings":"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"}
|
|
329
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tsrustcli.js","sourceRoot":"","sources":["../../ts/mod_cli/classes.tsrustcli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/tsrust",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.6.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A tool for compiling Rust projects, detecting Cargo workspaces, building with cargo, and placing binaries in a conventional dist_rust directory.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"@git.zone/tsbuild": "^4.4.2",
|
|
42
42
|
"@git.zone/tsrun": "^2.0.4",
|
|
43
43
|
"@git.zone/tstest": "^3.6.6",
|
|
44
|
-
"@types/node": "^25.9.
|
|
44
|
+
"@types/node": "^25.9.3"
|
|
45
45
|
},
|
|
46
46
|
"files": [
|
|
47
47
|
"ts/**/*",
|
package/readme.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# @git.zone/tsrust
|
|
2
2
|
|
|
3
|
-
A CLI build tool for Rust projects that follows the same conventions as `@git.zone/tsbuild`. It detects your `rust/` source directory, parses `Cargo.toml` (including workspaces), runs `cargo build --release
|
|
3
|
+
A CLI build tool for Rust projects that follows the same conventions as `@git.zone/tsbuild`. It detects your `rust/` source directory, parses `Cargo.toml` (including workspaces), runs `cargo build --release` with a managed target cache, and copies the resulting binaries into a clean `dist_rust/` directory at the project root.
|
|
4
4
|
|
|
5
5
|
## Issue Reporting and Security
|
|
6
6
|
|
|
@@ -48,8 +48,9 @@ This will:
|
|
|
48
48
|
2. Locate your `rust/` directory (containing `Cargo.toml`)
|
|
49
49
|
3. Parse the workspace to discover all `[[bin]]` targets
|
|
50
50
|
4. Run `cargo build --release` with full streaming output
|
|
51
|
-
5.
|
|
52
|
-
6.
|
|
51
|
+
5. Store Cargo intermediates in `.nogit/tsrust-target` by default
|
|
52
|
+
6. Copy each binary to `dist_rust/` with executable permissions (`chmod 755`)
|
|
53
|
+
7. Report file sizes and total build time
|
|
53
54
|
|
|
54
55
|
**Example output:**
|
|
55
56
|
|
|
@@ -58,7 +59,7 @@ Using cargo 1.90.0 (840b83a10 2025-07-30)
|
|
|
58
59
|
Found Rust project at: rust
|
|
59
60
|
Detected Cargo workspace
|
|
60
61
|
Binary targets: rustproxy
|
|
61
|
-
Running: cargo build --release
|
|
62
|
+
Running: CARGO_TARGET_DIR="/path/to/project/.nogit/tsrust-target" cargo build --release
|
|
62
63
|
Compiling rustproxy v0.1.0
|
|
63
64
|
Finished `release` profile [optimized] target(s) in 29.01s
|
|
64
65
|
Copied rustproxy (13.4 MB) -> dist_rust/rustproxy
|
|
@@ -85,7 +86,7 @@ Build with the debug profile instead of release:
|
|
|
85
86
|
tsrust --debug
|
|
86
87
|
```
|
|
87
88
|
|
|
88
|
-
Binaries are taken from
|
|
89
|
+
Binaries are taken from `.nogit/tsrust-target/debug/` instead of `.nogit/tsrust-target/release/`.
|
|
89
90
|
|
|
90
91
|
### 🧹 Clean Before Building
|
|
91
92
|
|
|
@@ -138,13 +139,17 @@ You can set default cross-compilation targets in your project's `.smartconfig.js
|
|
|
138
139
|
```json
|
|
139
140
|
{
|
|
140
141
|
"@git.zone/tsrust": {
|
|
141
|
-
"targets": ["linux_arm64", "linux_amd64"]
|
|
142
|
+
"targets": ["linux_arm64", "linux_amd64"],
|
|
143
|
+
"targetDir": ".nogit/tsrust-target",
|
|
144
|
+
"pruneAfterBuild": false
|
|
142
145
|
}
|
|
143
146
|
}
|
|
144
147
|
```
|
|
145
148
|
|
|
146
149
|
When targets are configured in `.smartconfig.json`, simply running `tsrust` will cross-compile for all listed targets. CLI `--target` flags take full precedence — if any `--target` is provided, the `.smartconfig.json` targets are ignored entirely.
|
|
147
150
|
|
|
151
|
+
`targetDir` is optional. It must point to a tsrust-owned path under `.nogit/`, such as `.nogit/tsrust-target` or `.nogit/tsrust-custom-target`. You can also set `TSRUST_TARGET_DIR` for one-off runs. `pruneAfterBuild: true` or `TSRUST_PRUNE_AFTER_BUILD=true` removes the marked managed target cache after binaries have been copied to `dist_rust/`.
|
|
152
|
+
|
|
148
153
|
### Static Linking
|
|
149
154
|
|
|
150
155
|
`tsrust` can produce fully statically linked Linux binaries (static-pie) that run on both glibc distros (Debian/Ubuntu) and musl distros (Alpine). Enable it via `.smartconfig.json`:
|
|
@@ -211,6 +216,29 @@ tsrust clean
|
|
|
211
216
|
|
|
212
217
|
This runs `cargo clean` in the Rust directory and deletes the `dist_rust/` output directory.
|
|
213
218
|
|
|
219
|
+
### 🧹 Prune Rust Target Caches
|
|
220
|
+
|
|
221
|
+
Report Rust target caches without deleting anything:
|
|
222
|
+
|
|
223
|
+
```bash
|
|
224
|
+
tsrust prune
|
|
225
|
+
```
|
|
226
|
+
|
|
227
|
+
Apply cleanup to marked tsrust-managed target caches:
|
|
228
|
+
|
|
229
|
+
```bash
|
|
230
|
+
tsrust prune --apply --days 14 --max-size 5GiB
|
|
231
|
+
```
|
|
232
|
+
|
|
233
|
+
| Option | Description |
|
|
234
|
+
| --- | --- |
|
|
235
|
+
| `--apply` | Remove marked managed target caches that match the filters |
|
|
236
|
+
| `--days <n>` | Prune marked caches whose newest file is at least `n` days old; default `14` |
|
|
237
|
+
| `--max-size <size>` | Prune marked caches at or above a size such as `5GiB` |
|
|
238
|
+
| `--workspace <path>` | Inspect another workspace path |
|
|
239
|
+
|
|
240
|
+
Conventional `rust/target` and `ts_rust/target` directories are report-only, even if they carry a marker. Only managed `.nogit/tsrust*` target directories are eligible for `--apply`; arbitrary app data is never marked or removed.
|
|
241
|
+
|
|
214
242
|
## Project Structure
|
|
215
243
|
|
|
216
244
|
`tsrust` expects your project to follow this layout:
|
|
@@ -230,6 +258,8 @@ my-project/
|
|
|
230
258
|
│ └── src/
|
|
231
259
|
├── dist_rust/ # 📦 Output: compiled binaries go here
|
|
232
260
|
│ └── my-binary
|
|
261
|
+
├── .nogit/
|
|
262
|
+
│ └── tsrust-target/ # 🧹 Managed Cargo target cache
|
|
233
263
|
├── ts/ # (your TypeScript code, built by tsbuild)
|
|
234
264
|
├── dist_ts/ # (TypeScript output)
|
|
235
265
|
└── package.json
|
|
@@ -253,7 +283,7 @@ If no `rust/` directory is found, `tsrust` checks for `ts_rust/` as a fallback.
|
|
|
253
283
|
`tsrust` exports its internals for use in other Node.js/TypeScript tools:
|
|
254
284
|
|
|
255
285
|
```typescript
|
|
256
|
-
import { CargoConfig, CargoRunner, FsHelpers, TsRustCli } from '@git.zone/tsrust';
|
|
286
|
+
import { CargoConfig, CargoRunner, FsHelpers, TsRustCli, resolveManagedTargetDir } from '@git.zone/tsrust';
|
|
257
287
|
|
|
258
288
|
// Parse a Cargo workspace
|
|
259
289
|
const config = new CargoConfig('/path/to/rust');
|
|
@@ -263,7 +293,8 @@ console.log(info.binTargets); // ['rustproxy']
|
|
|
263
293
|
|
|
264
294
|
// Run cargo build
|
|
265
295
|
const runner = new CargoRunner('/path/to/rust');
|
|
266
|
-
const
|
|
296
|
+
const targetDir = resolveManagedTargetDir('/path/to/project');
|
|
297
|
+
const result = await runner.build({ debug: false, clean: false, targetDir });
|
|
267
298
|
console.log(result.success); // true
|
|
268
299
|
console.log(result.exitCode); // 0
|
|
269
300
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -29,10 +29,10 @@ export class CargoRunner {
|
|
|
29
29
|
return result.stdout.trim();
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
public async build(options: { debug?: boolean; clean?: boolean; target?: string; crtStatic?: boolean; rustflags?: string[] } = {}): Promise<ICargoRunResult> {
|
|
32
|
+
public async build(options: { debug?: boolean; clean?: boolean; target?: string; crtStatic?: boolean; rustflags?: string[]; targetDir?: string } = {}): Promise<ICargoRunResult> {
|
|
33
33
|
if (options.clean) {
|
|
34
34
|
console.log('Cleaning previous build...');
|
|
35
|
-
await this.clean();
|
|
35
|
+
await this.clean({ targetDir: options.targetDir });
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
// crt-static may only be injected together with an explicit --target:
|
|
@@ -53,9 +53,10 @@ export class CargoRunner {
|
|
|
53
53
|
rustflags.unshift('-C', 'target-feature=+crt-static');
|
|
54
54
|
}
|
|
55
55
|
const rustflagsPrefix = rustflags.length ? `RUSTFLAGS=${this.shellQuote(rustflags.join(' '))} ` : '';
|
|
56
|
-
const
|
|
56
|
+
const targetDirPrefix = options.targetDir ? `CARGO_TARGET_DIR=${this.shellQuote(options.targetDir)} ` : '';
|
|
57
|
+
const command = `${this.envPrefix}cd ${this.rustDir} && ${targetDirPrefix}${rustflagsPrefix}cargo build${profile}${targetFlag}`;
|
|
57
58
|
|
|
58
|
-
console.log(`Running: ${rustflagsPrefix}cargo build${profile}${targetFlag}`);
|
|
59
|
+
console.log(`Running: ${targetDirPrefix}${rustflagsPrefix}cargo build${profile}${targetFlag}`);
|
|
59
60
|
const result = await this.shell.exec(command);
|
|
60
61
|
|
|
61
62
|
return {
|
|
@@ -85,8 +86,9 @@ export class CargoRunner {
|
|
|
85
86
|
}
|
|
86
87
|
}
|
|
87
88
|
|
|
88
|
-
public async clean(): Promise<ICargoRunResult> {
|
|
89
|
-
const
|
|
89
|
+
public async clean(options: { targetDir?: string } = {}): Promise<ICargoRunResult> {
|
|
90
|
+
const targetDirPrefix = options.targetDir ? `CARGO_TARGET_DIR=${this.shellQuote(options.targetDir)} ` : '';
|
|
91
|
+
const command = `${this.envPrefix}cd ${this.rustDir} && ${targetDirPrefix}cargo clean`;
|
|
90
92
|
const result = await this.shell.exec(command);
|
|
91
93
|
|
|
92
94
|
return {
|
|
@@ -0,0 +1,304 @@
|
|
|
1
|
+
import * as fs from 'node:fs/promises';
|
|
2
|
+
import * as path from 'node:path';
|
|
3
|
+
|
|
4
|
+
export const toolCacheMarkerFile = '.gitzone-tool-cache.json';
|
|
5
|
+
export const tsrustCacheOwner = '@git.zone/tsrust';
|
|
6
|
+
export const targetCacheKind = 'rust-target-cache';
|
|
7
|
+
|
|
8
|
+
export interface IToolCacheMarker {
|
|
9
|
+
owner: string;
|
|
10
|
+
kind: string;
|
|
11
|
+
safeToPrune: boolean;
|
|
12
|
+
createdAt: string;
|
|
13
|
+
schemaVersion: 1;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export interface ITsrustPruneCandidate {
|
|
17
|
+
path: string;
|
|
18
|
+
workspace: string;
|
|
19
|
+
bytes: number;
|
|
20
|
+
marked: boolean;
|
|
21
|
+
shouldPrune: boolean;
|
|
22
|
+
reason: string;
|
|
23
|
+
truncated?: boolean;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export interface ITsrustPruneOptions {
|
|
27
|
+
workspace: string;
|
|
28
|
+
targetDir?: string;
|
|
29
|
+
days?: number;
|
|
30
|
+
maxSizeBytes?: number;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
export function createTargetCacheMarker(): IToolCacheMarker {
|
|
34
|
+
return {
|
|
35
|
+
owner: tsrustCacheOwner,
|
|
36
|
+
kind: targetCacheKind,
|
|
37
|
+
safeToPrune: true,
|
|
38
|
+
createdAt: new Date().toISOString(),
|
|
39
|
+
schemaVersion: 1,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export function isValidTargetCacheMarker(markerArg: unknown): markerArg is IToolCacheMarker {
|
|
44
|
+
const marker = markerArg as Partial<IToolCacheMarker>;
|
|
45
|
+
return marker.owner === tsrustCacheOwner
|
|
46
|
+
&& marker.kind === targetCacheKind
|
|
47
|
+
&& marker.safeToPrune === true
|
|
48
|
+
&& marker.schemaVersion === 1;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
export function getDefaultManagedTargetDir(workspaceArg: string): string {
|
|
52
|
+
return path.resolve(workspaceArg, '.nogit', 'tsrust-target');
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
export function isSafeManagedTargetDir(workspaceArg: string, targetDirArg: string): boolean {
|
|
56
|
+
const workspace = path.resolve(workspaceArg);
|
|
57
|
+
const targetDir = path.resolve(targetDirArg);
|
|
58
|
+
const relative = path.relative(workspace, targetDir);
|
|
59
|
+
if (!relative || relative.startsWith('..') || path.isAbsolute(relative)) {
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
62
|
+
return relative === path.join('.nogit', 'tsrust-target')
|
|
63
|
+
|| relative.startsWith(`${path.join('.nogit', 'tsrust-')}`)
|
|
64
|
+
|| relative.startsWith(`${path.join('.nogit', 'tsrust')}${path.sep}`);
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
export function resolveManagedTargetDir(workspaceArg: string, configTargetDirArg?: string): string {
|
|
68
|
+
const configured = process.env.TSRUST_TARGET_DIR || configTargetDirArg;
|
|
69
|
+
const targetDir = configured
|
|
70
|
+
? path.isAbsolute(configured) ? configured : path.resolve(workspaceArg, configured)
|
|
71
|
+
: getDefaultManagedTargetDir(workspaceArg);
|
|
72
|
+
if (!isSafeManagedTargetDir(workspaceArg, targetDir)) {
|
|
73
|
+
throw new Error(`Refusing unsafe tsrust target dir outside workspace .nogit/: ${targetDir}`);
|
|
74
|
+
}
|
|
75
|
+
return targetDir;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
export function getCargoArtifactDir(targetDirArg: string, profileArg: string, targetTripleArg?: string): string {
|
|
79
|
+
return targetTripleArg
|
|
80
|
+
? path.join(targetDirArg, targetTripleArg, profileArg)
|
|
81
|
+
: path.join(targetDirArg, profileArg);
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
export function parseSizeToBytes(valueArg: string | undefined): number | undefined {
|
|
85
|
+
if (!valueArg) {
|
|
86
|
+
return undefined;
|
|
87
|
+
}
|
|
88
|
+
const match = valueArg.trim().match(/^(\d+(?:\.\d+)?)(b|kb|kib|mb|mib|gb|gib)?$/i);
|
|
89
|
+
if (!match) {
|
|
90
|
+
return undefined;
|
|
91
|
+
}
|
|
92
|
+
const value = Number(match[1]);
|
|
93
|
+
const unit = (match[2] || 'b').toLowerCase();
|
|
94
|
+
const multiplier = unit === 'gb' || unit === 'gib'
|
|
95
|
+
? 1024 ** 3
|
|
96
|
+
: unit === 'mb' || unit === 'mib'
|
|
97
|
+
? 1024 ** 2
|
|
98
|
+
: unit === 'kb' || unit === 'kib'
|
|
99
|
+
? 1024
|
|
100
|
+
: 1;
|
|
101
|
+
return Math.round(value * multiplier);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
export async function writeTargetCacheMarker(targetDirArg: string): Promise<void> {
|
|
105
|
+
await fs.mkdir(targetDirArg, { recursive: true });
|
|
106
|
+
const existingMarker = await readTargetCacheMarker(targetDirArg);
|
|
107
|
+
if (existingMarker) {
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
const entries = await fs.readdir(targetDirArg);
|
|
111
|
+
if (entries.length > 0) {
|
|
112
|
+
throw new Error(`Refusing to mark pre-existing non-empty tsrust target cache: ${targetDirArg}`);
|
|
113
|
+
}
|
|
114
|
+
await fs.writeFile(
|
|
115
|
+
path.join(targetDirArg, toolCacheMarkerFile),
|
|
116
|
+
`${JSON.stringify(createTargetCacheMarker(), null, 2)}\n`,
|
|
117
|
+
);
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
export async function readTargetCacheMarker(targetDirArg: string): Promise<IToolCacheMarker | undefined> {
|
|
121
|
+
try {
|
|
122
|
+
const markerRaw = await fs.readFile(path.join(targetDirArg, toolCacheMarkerFile), 'utf8');
|
|
123
|
+
const marker = JSON.parse(markerRaw);
|
|
124
|
+
return isValidTargetCacheMarker(marker) ? marker : undefined;
|
|
125
|
+
} catch {
|
|
126
|
+
return undefined;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
async function pathExists(pathArg: string): Promise<boolean> {
|
|
131
|
+
try {
|
|
132
|
+
await fs.stat(pathArg);
|
|
133
|
+
return true;
|
|
134
|
+
} catch {
|
|
135
|
+
return false;
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
export async function getDirectorySize(pathArg: string): Promise<number> {
|
|
140
|
+
let total = 0;
|
|
141
|
+
let entries;
|
|
142
|
+
try {
|
|
143
|
+
entries = await fs.readdir(pathArg, { withFileTypes: true });
|
|
144
|
+
} catch {
|
|
145
|
+
return 0;
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
for (const entry of entries) {
|
|
149
|
+
const entryPath = path.join(pathArg, entry.name);
|
|
150
|
+
if (entry.isDirectory()) {
|
|
151
|
+
total += await getDirectorySize(entryPath);
|
|
152
|
+
} else if (entry.isFile()) {
|
|
153
|
+
try {
|
|
154
|
+
total += (await fs.stat(entryPath)).size;
|
|
155
|
+
} catch {
|
|
156
|
+
// Ignore files that disappear while planning a prune.
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
return total;
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
async function getDirectoryUsage(pathArg: string, maxEntriesArg = 100_000): Promise<{ bytes: number; newestMtimeMs: number; truncated: boolean }> {
|
|
165
|
+
let bytes = 0;
|
|
166
|
+
let newestMtimeMs = 0;
|
|
167
|
+
let visitedEntries = 0;
|
|
168
|
+
let truncated = false;
|
|
169
|
+
|
|
170
|
+
const visit = async (entryPathArg: string): Promise<void> => {
|
|
171
|
+
if (visitedEntries >= maxEntriesArg) {
|
|
172
|
+
truncated = true;
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
|
+
visitedEntries++;
|
|
176
|
+
|
|
177
|
+
let stat;
|
|
178
|
+
try {
|
|
179
|
+
stat = await fs.stat(entryPathArg);
|
|
180
|
+
} catch {
|
|
181
|
+
return;
|
|
182
|
+
}
|
|
183
|
+
newestMtimeMs = Math.max(newestMtimeMs, stat.mtimeMs);
|
|
184
|
+
if (stat.isFile()) {
|
|
185
|
+
bytes += stat.size;
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
188
|
+
if (!stat.isDirectory()) {
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
let entries;
|
|
193
|
+
try {
|
|
194
|
+
entries = await fs.readdir(entryPathArg, { withFileTypes: true });
|
|
195
|
+
} catch {
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
for (const entry of entries) {
|
|
199
|
+
if (visitedEntries >= maxEntriesArg) {
|
|
200
|
+
truncated = true;
|
|
201
|
+
return;
|
|
202
|
+
}
|
|
203
|
+
await visit(path.join(entryPathArg, entry.name));
|
|
204
|
+
}
|
|
205
|
+
};
|
|
206
|
+
|
|
207
|
+
await visit(pathArg);
|
|
208
|
+
return { bytes, newestMtimeMs, truncated };
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
async function getNewestMtimeMs(pathArg: string): Promise<number> {
|
|
212
|
+
let newest = 0;
|
|
213
|
+
try {
|
|
214
|
+
const stat = await fs.stat(pathArg);
|
|
215
|
+
newest = stat.mtimeMs;
|
|
216
|
+
} catch {
|
|
217
|
+
return 0;
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
let entries;
|
|
221
|
+
try {
|
|
222
|
+
entries = await fs.readdir(pathArg, { withFileTypes: true });
|
|
223
|
+
} catch {
|
|
224
|
+
return newest;
|
|
225
|
+
}
|
|
226
|
+
|
|
227
|
+
for (const entry of entries) {
|
|
228
|
+
const entryPath = path.join(pathArg, entry.name);
|
|
229
|
+
if (entry.isDirectory()) {
|
|
230
|
+
newest = Math.max(newest, await getNewestMtimeMs(entryPath));
|
|
231
|
+
} else if (entry.isFile()) {
|
|
232
|
+
try {
|
|
233
|
+
newest = Math.max(newest, (await fs.stat(entryPath)).mtimeMs);
|
|
234
|
+
} catch {
|
|
235
|
+
// Ignore files that disappear while planning a prune.
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
return newest;
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
export async function createTsrustPrunePlan(optionsArg: ITsrustPruneOptions): Promise<ITsrustPruneCandidate[]> {
|
|
244
|
+
const workspace = path.resolve(optionsArg.workspace);
|
|
245
|
+
const managedTargetDir = optionsArg.targetDir
|
|
246
|
+
? resolveManagedTargetDir(workspace, optionsArg.targetDir)
|
|
247
|
+
: resolveManagedTargetDir(workspace);
|
|
248
|
+
const candidates = [
|
|
249
|
+
managedTargetDir,
|
|
250
|
+
path.join(workspace, 'rust', 'target'),
|
|
251
|
+
path.join(workspace, 'ts_rust', 'target'),
|
|
252
|
+
];
|
|
253
|
+
const uniqueCandidates = [...new Set(candidates.map((candidate) => path.resolve(candidate)))];
|
|
254
|
+
const pruneCandidates: ITsrustPruneCandidate[] = [];
|
|
255
|
+
const maxAgeMs = typeof optionsArg.days === 'number' ? optionsArg.days * 24 * 60 * 60 * 1000 : undefined;
|
|
256
|
+
|
|
257
|
+
for (const candidate of uniqueCandidates) {
|
|
258
|
+
if (!(await pathExists(candidate))) {
|
|
259
|
+
continue;
|
|
260
|
+
}
|
|
261
|
+
const marker = await readTargetCacheMarker(candidate);
|
|
262
|
+
const usage = await getDirectoryUsage(candidate);
|
|
263
|
+
const isManagedTarget = isSafeManagedTargetDir(workspace, candidate);
|
|
264
|
+
const ageMatches = typeof maxAgeMs === 'number' ? Date.now() - usage.newestMtimeMs >= maxAgeMs : false;
|
|
265
|
+
const bytes = usage.bytes;
|
|
266
|
+
const sizeMatches = typeof optionsArg.maxSizeBytes === 'number' ? bytes >= optionsArg.maxSizeBytes : false;
|
|
267
|
+
const shouldPrune = !!marker && isManagedTarget && (ageMatches || sizeMatches);
|
|
268
|
+
const reason = marker
|
|
269
|
+
? !isManagedTarget
|
|
270
|
+
? 'marked Rust target outside managed tsrust target allowlist; report-only'
|
|
271
|
+
: shouldPrune
|
|
272
|
+
? [ageMatches ? `older than ${optionsArg.days} day(s)` : '', sizeMatches ? `at least ${optionsArg.maxSizeBytes} bytes` : ''].filter(Boolean).join(', ')
|
|
273
|
+
: 'marked tsrust target cache; below prune thresholds'
|
|
274
|
+
: 'unmarked conventional Rust target; report-only';
|
|
275
|
+
|
|
276
|
+
pruneCandidates.push({
|
|
277
|
+
path: candidate,
|
|
278
|
+
workspace,
|
|
279
|
+
bytes,
|
|
280
|
+
marked: !!marker,
|
|
281
|
+
shouldPrune,
|
|
282
|
+
reason,
|
|
283
|
+
truncated: usage.truncated,
|
|
284
|
+
});
|
|
285
|
+
}
|
|
286
|
+
|
|
287
|
+
return pruneCandidates;
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
export async function applyTsrustPrunePlan(planArg: ITsrustPruneCandidate[]): Promise<void> {
|
|
291
|
+
for (const candidate of planArg) {
|
|
292
|
+
if (!candidate.shouldPrune) {
|
|
293
|
+
continue;
|
|
294
|
+
}
|
|
295
|
+
if (!isSafeManagedTargetDir(candidate.workspace, candidate.path)) {
|
|
296
|
+
throw new Error(`Refusing unsafe Rust target cache path: ${candidate.path}`);
|
|
297
|
+
}
|
|
298
|
+
const marker = await readTargetCacheMarker(candidate.path);
|
|
299
|
+
if (!marker) {
|
|
300
|
+
throw new Error(`Refusing to remove unmarked Rust target cache: ${candidate.path}`);
|
|
301
|
+
}
|
|
302
|
+
await fs.rm(candidate.path, { recursive: true, force: true });
|
|
303
|
+
}
|
|
304
|
+
}
|
package/ts/mod_cargo/index.ts
CHANGED
|
@@ -3,6 +3,14 @@ import * as os from 'os';
|
|
|
3
3
|
import * as plugins from '../plugins.js';
|
|
4
4
|
import { CargoConfig } from '../mod_cargo/index.js';
|
|
5
5
|
import { CargoRunner } from '../mod_cargo/index.js';
|
|
6
|
+
import {
|
|
7
|
+
applyTsrustPrunePlan,
|
|
8
|
+
createTsrustPrunePlan,
|
|
9
|
+
getCargoArtifactDir,
|
|
10
|
+
parseSizeToBytes,
|
|
11
|
+
resolveManagedTargetDir,
|
|
12
|
+
writeTargetCacheMarker,
|
|
13
|
+
} from '../mod_cargo/index.js';
|
|
6
14
|
import { ElfInspector } from '../mod_elf/index.js';
|
|
7
15
|
import { FsHelpers } from '../mod_fs/index.js';
|
|
8
16
|
import { ToolchainManager } from '../mod_toolchain/index.js';
|
|
@@ -48,6 +56,8 @@ interface ITsrustConfig {
|
|
|
48
56
|
static?: boolean;
|
|
49
57
|
rustflags?: string[];
|
|
50
58
|
remapLocalPaths?: boolean;
|
|
59
|
+
targetDir?: string;
|
|
60
|
+
pruneAfterBuild?: boolean;
|
|
51
61
|
}
|
|
52
62
|
|
|
53
63
|
/** crt-static injection only applies to glibc targets; musl is static by default. */
|
|
@@ -75,6 +85,7 @@ export class TsRustCli {
|
|
|
75
85
|
private registerCommands(): void {
|
|
76
86
|
this.registerStandardCommand();
|
|
77
87
|
this.registerCleanCommand();
|
|
88
|
+
this.registerPruneCommand();
|
|
78
89
|
}
|
|
79
90
|
|
|
80
91
|
/**
|
|
@@ -135,6 +146,8 @@ export class TsRustCli {
|
|
|
135
146
|
const shouldClean = !!(argvArg as any).clean;
|
|
136
147
|
const distDir = path.join(this.cwd, 'dist_rust');
|
|
137
148
|
const profile = isDebug ? 'debug' : 'release';
|
|
149
|
+
const managedTargetDir = resolveManagedTargetDir(this.cwd, this.config.targetDir);
|
|
150
|
+
await writeTargetCacheMarker(managedTargetDir);
|
|
138
151
|
|
|
139
152
|
// Parse --target flag (can appear multiple times), fall back to smartconfig.json config
|
|
140
153
|
const cliTargets = (argvArg as any).target;
|
|
@@ -175,6 +188,7 @@ export class TsRustCli {
|
|
|
175
188
|
target: triple,
|
|
176
189
|
crtStatic: useStatic && wantsCrtStatic(triple),
|
|
177
190
|
rustflags,
|
|
191
|
+
targetDir: managedTargetDir,
|
|
178
192
|
});
|
|
179
193
|
|
|
180
194
|
if (!buildResult.success) {
|
|
@@ -182,8 +196,7 @@ export class TsRustCli {
|
|
|
182
196
|
process.exit(1);
|
|
183
197
|
}
|
|
184
198
|
|
|
185
|
-
|
|
186
|
-
const targetDir = path.join(rustDir, 'target', triple, profile);
|
|
199
|
+
const targetDir = getCargoArtifactDir(managedTargetDir, profile, triple);
|
|
187
200
|
|
|
188
201
|
for (const binName of workspaceInfo.binTargets) {
|
|
189
202
|
const srcBinary = path.join(targetDir, binName);
|
|
@@ -234,6 +247,7 @@ export class TsRustCli {
|
|
|
234
247
|
target: nativeTriple,
|
|
235
248
|
crtStatic: !!nativeTriple && wantsCrtStatic(nativeTriple),
|
|
236
249
|
rustflags,
|
|
250
|
+
targetDir: managedTargetDir,
|
|
237
251
|
});
|
|
238
252
|
|
|
239
253
|
if (!buildResult.success) {
|
|
@@ -241,9 +255,7 @@ export class TsRustCli {
|
|
|
241
255
|
process.exit(1);
|
|
242
256
|
}
|
|
243
257
|
|
|
244
|
-
const targetDir = nativeTriple
|
|
245
|
-
? path.join(rustDir, 'target', nativeTriple, profile)
|
|
246
|
-
: path.join(rustDir, 'target', profile);
|
|
258
|
+
const targetDir = getCargoArtifactDir(managedTargetDir, profile, nativeTriple);
|
|
247
259
|
|
|
248
260
|
await FsHelpers.ensureEmptyDir(distDir);
|
|
249
261
|
|
|
@@ -272,11 +284,26 @@ export class TsRustCli {
|
|
|
272
284
|
}
|
|
273
285
|
}
|
|
274
286
|
|
|
287
|
+
if (this.shouldPruneAfterBuild()) {
|
|
288
|
+
const plan = await createTsrustPrunePlan({
|
|
289
|
+
workspace: this.cwd,
|
|
290
|
+
targetDir: managedTargetDir,
|
|
291
|
+
days: 0,
|
|
292
|
+
});
|
|
293
|
+
await applyTsrustPrunePlan(plan);
|
|
294
|
+
console.log('Pruned marked tsrust target cache after successful build.');
|
|
295
|
+
}
|
|
296
|
+
|
|
275
297
|
const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
|
|
276
298
|
console.log(`\nDone in ${elapsed}s`);
|
|
277
299
|
});
|
|
278
300
|
}
|
|
279
301
|
|
|
302
|
+
private shouldPruneAfterBuild(): boolean {
|
|
303
|
+
const normalized = process.env.TSRUST_PRUNE_AFTER_BUILD?.toLowerCase();
|
|
304
|
+
return normalized === '1' || normalized === 'true' || normalized === 'yes' || normalized === 'y' || this.config.pruneAfterBuild === true;
|
|
305
|
+
}
|
|
306
|
+
|
|
280
307
|
private buildRustflags(rustDir: string): string[] {
|
|
281
308
|
const rustflags = [...(this.config.rustflags || [])];
|
|
282
309
|
if (this.config.remapLocalPaths) {
|
|
@@ -303,7 +330,7 @@ export class TsRustCli {
|
|
|
303
330
|
const envPrefix = await this.resolveToolchain();
|
|
304
331
|
console.log('Running cargo clean...');
|
|
305
332
|
const runner = new CargoRunner(rustDir, envPrefix);
|
|
306
|
-
await runner.clean();
|
|
333
|
+
await runner.clean({ targetDir: resolveManagedTargetDir(this.cwd, this.config.targetDir) });
|
|
307
334
|
console.log('Cargo clean complete.');
|
|
308
335
|
}
|
|
309
336
|
|
|
@@ -318,6 +345,36 @@ export class TsRustCli {
|
|
|
318
345
|
});
|
|
319
346
|
}
|
|
320
347
|
|
|
348
|
+
private registerPruneCommand(): void {
|
|
349
|
+
this.cli.addCommand('prune').subscribe(async (argvArg) => {
|
|
350
|
+
const workspace = ((argvArg as any).workspace as string | undefined) || this.cwd;
|
|
351
|
+
const daysArg = (argvArg as any).days;
|
|
352
|
+
const days = daysArg === undefined ? 14 : Number(daysArg);
|
|
353
|
+
const maxSizeBytes = parseSizeToBytes((argvArg as any).maxSize as string | undefined);
|
|
354
|
+
const apply = !!(argvArg as any).apply;
|
|
355
|
+
const plan = await createTsrustPrunePlan({
|
|
356
|
+
workspace,
|
|
357
|
+
targetDir: resolveManagedTargetDir(workspace, this.config.targetDir),
|
|
358
|
+
days: Number.isFinite(days) ? days : 14,
|
|
359
|
+
maxSizeBytes,
|
|
360
|
+
});
|
|
361
|
+
|
|
362
|
+
console.log(apply ? 'tsrust prune apply plan:' : 'tsrust prune dry-run plan:');
|
|
363
|
+
if (plan.length === 0) {
|
|
364
|
+
console.log('No Rust target caches found.');
|
|
365
|
+
}
|
|
366
|
+
for (const candidate of plan) {
|
|
367
|
+
const action = candidate.shouldPrune ? (apply ? 'remove' : 'would remove') : 'report';
|
|
368
|
+
console.log(`${action}: ${candidate.path} (${FsHelpers.formatFileSize(candidate.bytes)}) - ${candidate.reason}`);
|
|
369
|
+
}
|
|
370
|
+
if (apply) {
|
|
371
|
+
await applyTsrustPrunePlan(plan);
|
|
372
|
+
} else {
|
|
373
|
+
console.log('Dry-run only. Re-run with --apply to remove marked tsrust target caches.');
|
|
374
|
+
}
|
|
375
|
+
});
|
|
376
|
+
}
|
|
377
|
+
|
|
321
378
|
private async detectRustDir(): Promise<string | null> {
|
|
322
379
|
// Check rust/ first
|
|
323
380
|
const rustDir = path.join(this.cwd, 'rust');
|