@hasna/terminal 2.2.0 → 2.3.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/cli.js +29 -12
- package/package.json +1 -1
- package/src/ai.ts +50 -36
- package/src/cli.tsx +29 -12
- package/src/context-hints.ts +89 -0
- package/src/discover.ts +238 -0
- package/src/economy.ts +53 -0
- package/src/output-store.ts +65 -0
- package/src/providers/index.ts +4 -4
- package/src/sessions-db.ts +81 -0
- package/temp/rtk/.claude/agents/code-reviewer.md +221 -0
- package/temp/rtk/.claude/agents/debugger.md +519 -0
- package/temp/rtk/.claude/agents/rtk-testing-specialist.md +461 -0
- package/temp/rtk/.claude/agents/rust-rtk.md +511 -0
- package/temp/rtk/.claude/agents/technical-writer.md +355 -0
- package/temp/rtk/.claude/commands/diagnose.md +352 -0
- package/temp/rtk/.claude/commands/test-routing.md +362 -0
- package/temp/rtk/.claude/hooks/bash/pre-commit-format.sh +16 -0
- package/temp/rtk/.claude/hooks/rtk-rewrite.sh +70 -0
- package/temp/rtk/.claude/hooks/rtk-suggest.sh +152 -0
- package/temp/rtk/.claude/rules/cli-testing.md +526 -0
- package/temp/rtk/.claude/skills/issue-triage/SKILL.md +348 -0
- package/temp/rtk/.claude/skills/issue-triage/templates/issue-comment.md +134 -0
- package/temp/rtk/.claude/skills/performance.md +435 -0
- package/temp/rtk/.claude/skills/pr-triage/SKILL.md +315 -0
- package/temp/rtk/.claude/skills/pr-triage/templates/review-comment.md +71 -0
- package/temp/rtk/.claude/skills/repo-recap.md +206 -0
- package/temp/rtk/.claude/skills/rtk-tdd/SKILL.md +78 -0
- package/temp/rtk/.claude/skills/rtk-tdd/references/testing-patterns.md +124 -0
- package/temp/rtk/.claude/skills/security-guardian.md +503 -0
- package/temp/rtk/.claude/skills/ship.md +404 -0
- package/temp/rtk/.github/workflows/benchmark.yml +34 -0
- package/temp/rtk/.github/workflows/dco-check.yaml +12 -0
- package/temp/rtk/.github/workflows/release-please.yml +51 -0
- package/temp/rtk/.github/workflows/release.yml +343 -0
- package/temp/rtk/.github/workflows/security-check.yml +135 -0
- package/temp/rtk/.github/workflows/validate-docs.yml +78 -0
- package/temp/rtk/.release-please-manifest.json +3 -0
- package/temp/rtk/ARCHITECTURE.md +1491 -0
- package/temp/rtk/CHANGELOG.md +640 -0
- package/temp/rtk/CLAUDE.md +605 -0
- package/temp/rtk/CONTRIBUTING.md +199 -0
- package/temp/rtk/Cargo.lock +1668 -0
- package/temp/rtk/Cargo.toml +64 -0
- package/temp/rtk/Formula/rtk.rb +43 -0
- package/temp/rtk/INSTALL.md +390 -0
- package/temp/rtk/LICENSE +21 -0
- package/temp/rtk/README.md +386 -0
- package/temp/rtk/README_es.md +159 -0
- package/temp/rtk/README_fr.md +197 -0
- package/temp/rtk/README_ja.md +159 -0
- package/temp/rtk/README_ko.md +159 -0
- package/temp/rtk/README_zh.md +167 -0
- package/temp/rtk/ROADMAP.md +15 -0
- package/temp/rtk/SECURITY.md +217 -0
- package/temp/rtk/TEST_EXEC_TIME.md +102 -0
- package/temp/rtk/build.rs +57 -0
- package/temp/rtk/docs/AUDIT_GUIDE.md +432 -0
- package/temp/rtk/docs/FEATURES.md +1410 -0
- package/temp/rtk/docs/TROUBLESHOOTING.md +309 -0
- package/temp/rtk/docs/filter-workflow.md +102 -0
- package/temp/rtk/docs/images/gain-dashboard.jpg +0 -0
- package/temp/rtk/docs/tracking.md +583 -0
- package/temp/rtk/hooks/opencode-rtk.ts +39 -0
- package/temp/rtk/hooks/rtk-awareness.md +29 -0
- package/temp/rtk/hooks/rtk-rewrite.sh +61 -0
- package/temp/rtk/hooks/test-rtk-rewrite.sh +442 -0
- package/temp/rtk/install.sh +124 -0
- package/temp/rtk/release-please-config.json +10 -0
- package/temp/rtk/scripts/benchmark.sh +592 -0
- package/temp/rtk/scripts/check-installation.sh +162 -0
- package/temp/rtk/scripts/install-local.sh +37 -0
- package/temp/rtk/scripts/rtk-economics.sh +137 -0
- package/temp/rtk/scripts/test-all.sh +561 -0
- package/temp/rtk/scripts/test-aristote.sh +227 -0
- package/temp/rtk/scripts/test-tracking.sh +79 -0
- package/temp/rtk/scripts/update-readme-metrics.sh +32 -0
- package/temp/rtk/scripts/validate-docs.sh +73 -0
- package/temp/rtk/src/aws_cmd.rs +880 -0
- package/temp/rtk/src/binlog.rs +1645 -0
- package/temp/rtk/src/cargo_cmd.rs +1727 -0
- package/temp/rtk/src/cc_economics.rs +1157 -0
- package/temp/rtk/src/ccusage.rs +340 -0
- package/temp/rtk/src/config.rs +187 -0
- package/temp/rtk/src/container.rs +855 -0
- package/temp/rtk/src/curl_cmd.rs +134 -0
- package/temp/rtk/src/deps.rs +268 -0
- package/temp/rtk/src/diff_cmd.rs +367 -0
- package/temp/rtk/src/discover/mod.rs +274 -0
- package/temp/rtk/src/discover/provider.rs +388 -0
- package/temp/rtk/src/discover/registry.rs +2022 -0
- package/temp/rtk/src/discover/report.rs +202 -0
- package/temp/rtk/src/discover/rules.rs +667 -0
- package/temp/rtk/src/display_helpers.rs +402 -0
- package/temp/rtk/src/dotnet_cmd.rs +1771 -0
- package/temp/rtk/src/dotnet_format_report.rs +133 -0
- package/temp/rtk/src/dotnet_trx.rs +593 -0
- package/temp/rtk/src/env_cmd.rs +204 -0
- package/temp/rtk/src/filter.rs +462 -0
- package/temp/rtk/src/filters/README.md +52 -0
- package/temp/rtk/src/filters/ansible-playbook.toml +34 -0
- package/temp/rtk/src/filters/basedpyright.toml +47 -0
- package/temp/rtk/src/filters/biome.toml +45 -0
- package/temp/rtk/src/filters/brew-install.toml +37 -0
- package/temp/rtk/src/filters/composer-install.toml +40 -0
- package/temp/rtk/src/filters/df.toml +16 -0
- package/temp/rtk/src/filters/dotnet-build.toml +64 -0
- package/temp/rtk/src/filters/du.toml +16 -0
- package/temp/rtk/src/filters/fail2ban-client.toml +15 -0
- package/temp/rtk/src/filters/gcc.toml +49 -0
- package/temp/rtk/src/filters/gcloud.toml +22 -0
- package/temp/rtk/src/filters/hadolint.toml +24 -0
- package/temp/rtk/src/filters/helm.toml +29 -0
- package/temp/rtk/src/filters/iptables.toml +27 -0
- package/temp/rtk/src/filters/jj.toml +28 -0
- package/temp/rtk/src/filters/jq.toml +24 -0
- package/temp/rtk/src/filters/make.toml +41 -0
- package/temp/rtk/src/filters/markdownlint.toml +24 -0
- package/temp/rtk/src/filters/mix-compile.toml +27 -0
- package/temp/rtk/src/filters/mix-format.toml +15 -0
- package/temp/rtk/src/filters/mvn-build.toml +44 -0
- package/temp/rtk/src/filters/oxlint.toml +43 -0
- package/temp/rtk/src/filters/ping.toml +63 -0
- package/temp/rtk/src/filters/pio-run.toml +40 -0
- package/temp/rtk/src/filters/poetry-install.toml +50 -0
- package/temp/rtk/src/filters/pre-commit.toml +35 -0
- package/temp/rtk/src/filters/ps.toml +16 -0
- package/temp/rtk/src/filters/quarto-render.toml +41 -0
- package/temp/rtk/src/filters/rsync.toml +48 -0
- package/temp/rtk/src/filters/shellcheck.toml +27 -0
- package/temp/rtk/src/filters/shopify-theme.toml +29 -0
- package/temp/rtk/src/filters/skopeo.toml +45 -0
- package/temp/rtk/src/filters/sops.toml +16 -0
- package/temp/rtk/src/filters/ssh.toml +44 -0
- package/temp/rtk/src/filters/stat.toml +34 -0
- package/temp/rtk/src/filters/swift-build.toml +41 -0
- package/temp/rtk/src/filters/systemctl-status.toml +33 -0
- package/temp/rtk/src/filters/terraform-plan.toml +35 -0
- package/temp/rtk/src/filters/tofu-fmt.toml +16 -0
- package/temp/rtk/src/filters/tofu-init.toml +38 -0
- package/temp/rtk/src/filters/tofu-plan.toml +35 -0
- package/temp/rtk/src/filters/tofu-validate.toml +17 -0
- package/temp/rtk/src/filters/trunk-build.toml +39 -0
- package/temp/rtk/src/filters/ty.toml +50 -0
- package/temp/rtk/src/filters/uv-sync.toml +37 -0
- package/temp/rtk/src/filters/xcodebuild.toml +99 -0
- package/temp/rtk/src/filters/yamllint.toml +25 -0
- package/temp/rtk/src/find_cmd.rs +598 -0
- package/temp/rtk/src/format_cmd.rs +386 -0
- package/temp/rtk/src/gain.rs +723 -0
- package/temp/rtk/src/gh_cmd.rs +1651 -0
- package/temp/rtk/src/git.rs +2012 -0
- package/temp/rtk/src/go_cmd.rs +592 -0
- package/temp/rtk/src/golangci_cmd.rs +254 -0
- package/temp/rtk/src/grep_cmd.rs +288 -0
- package/temp/rtk/src/gt_cmd.rs +810 -0
- package/temp/rtk/src/hook_audit_cmd.rs +283 -0
- package/temp/rtk/src/hook_check.rs +171 -0
- package/temp/rtk/src/init.rs +1859 -0
- package/temp/rtk/src/integrity.rs +537 -0
- package/temp/rtk/src/json_cmd.rs +231 -0
- package/temp/rtk/src/learn/detector.rs +628 -0
- package/temp/rtk/src/learn/mod.rs +119 -0
- package/temp/rtk/src/learn/report.rs +184 -0
- package/temp/rtk/src/lint_cmd.rs +694 -0
- package/temp/rtk/src/local_llm.rs +316 -0
- package/temp/rtk/src/log_cmd.rs +248 -0
- package/temp/rtk/src/ls.rs +324 -0
- package/temp/rtk/src/main.rs +2482 -0
- package/temp/rtk/src/mypy_cmd.rs +389 -0
- package/temp/rtk/src/next_cmd.rs +241 -0
- package/temp/rtk/src/npm_cmd.rs +236 -0
- package/temp/rtk/src/parser/README.md +267 -0
- package/temp/rtk/src/parser/error.rs +46 -0
- package/temp/rtk/src/parser/formatter.rs +336 -0
- package/temp/rtk/src/parser/mod.rs +311 -0
- package/temp/rtk/src/parser/types.rs +119 -0
- package/temp/rtk/src/pip_cmd.rs +302 -0
- package/temp/rtk/src/playwright_cmd.rs +479 -0
- package/temp/rtk/src/pnpm_cmd.rs +573 -0
- package/temp/rtk/src/prettier_cmd.rs +221 -0
- package/temp/rtk/src/prisma_cmd.rs +482 -0
- package/temp/rtk/src/psql_cmd.rs +382 -0
- package/temp/rtk/src/pytest_cmd.rs +384 -0
- package/temp/rtk/src/read.rs +217 -0
- package/temp/rtk/src/rewrite_cmd.rs +50 -0
- package/temp/rtk/src/ruff_cmd.rs +402 -0
- package/temp/rtk/src/runner.rs +271 -0
- package/temp/rtk/src/summary.rs +297 -0
- package/temp/rtk/src/tee.rs +405 -0
- package/temp/rtk/src/telemetry.rs +248 -0
- package/temp/rtk/src/toml_filter.rs +1655 -0
- package/temp/rtk/src/tracking.rs +1416 -0
- package/temp/rtk/src/tree.rs +209 -0
- package/temp/rtk/src/tsc_cmd.rs +259 -0
- package/temp/rtk/src/utils.rs +432 -0
- package/temp/rtk/src/verify_cmd.rs +47 -0
- package/temp/rtk/src/vitest_cmd.rs +385 -0
- package/temp/rtk/src/wc_cmd.rs +401 -0
- package/temp/rtk/src/wget_cmd.rs +260 -0
- package/temp/rtk/tests/fixtures/dotnet/build_failed.txt +11 -0
- package/temp/rtk/tests/fixtures/dotnet/format_changes.json +31 -0
- package/temp/rtk/tests/fixtures/dotnet/format_empty.json +1 -0
- package/temp/rtk/tests/fixtures/dotnet/format_success.json +12 -0
- package/temp/rtk/tests/fixtures/dotnet/test_failed.txt +18 -0
|
@@ -0,0 +1,573 @@
|
|
|
1
|
+
use crate::tracking;
|
|
2
|
+
use anyhow::{Context, Result};
|
|
3
|
+
use serde::Deserialize;
|
|
4
|
+
use std::collections::HashMap;
|
|
5
|
+
use std::ffi::OsString;
|
|
6
|
+
use std::process::Command;
|
|
7
|
+
|
|
8
|
+
use crate::parser::{
|
|
9
|
+
emit_degradation_warning, emit_passthrough_warning, truncate_output, Dependency,
|
|
10
|
+
DependencyState, FormatMode, OutputParser, ParseResult, TokenFormatter,
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
/// pnpm list JSON output structure
|
|
14
|
+
#[derive(Debug, Deserialize)]
|
|
15
|
+
struct PnpmListOutput {
|
|
16
|
+
#[serde(flatten)]
|
|
17
|
+
packages: HashMap<String, PnpmPackage>,
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
#[derive(Debug, Deserialize)]
|
|
21
|
+
struct PnpmPackage {
|
|
22
|
+
version: Option<String>,
|
|
23
|
+
#[serde(rename = "dependencies", default)]
|
|
24
|
+
dependencies: HashMap<String, PnpmPackage>,
|
|
25
|
+
#[serde(rename = "devDependencies", default)]
|
|
26
|
+
dev_dependencies: HashMap<String, PnpmPackage>,
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/// pnpm outdated JSON output structure
|
|
30
|
+
#[derive(Debug, Deserialize)]
|
|
31
|
+
struct PnpmOutdatedOutput {
|
|
32
|
+
#[serde(flatten)]
|
|
33
|
+
packages: HashMap<String, PnpmOutdatedPackage>,
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
#[derive(Debug, Deserialize)]
|
|
37
|
+
struct PnpmOutdatedPackage {
|
|
38
|
+
current: String,
|
|
39
|
+
latest: String,
|
|
40
|
+
wanted: Option<String>,
|
|
41
|
+
#[serde(rename = "dependencyType", default)]
|
|
42
|
+
dependency_type: String,
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/// Parser for pnpm list output
|
|
46
|
+
pub struct PnpmListParser;
|
|
47
|
+
|
|
48
|
+
impl OutputParser for PnpmListParser {
|
|
49
|
+
type Output = DependencyState;
|
|
50
|
+
|
|
51
|
+
fn parse(input: &str) -> ParseResult<DependencyState> {
|
|
52
|
+
// Tier 1: Try JSON parsing
|
|
53
|
+
match serde_json::from_str::<PnpmListOutput>(input) {
|
|
54
|
+
Ok(json) => {
|
|
55
|
+
let mut dependencies = Vec::new();
|
|
56
|
+
let mut total_count = 0;
|
|
57
|
+
|
|
58
|
+
for (name, pkg) in &json.packages {
|
|
59
|
+
collect_dependencies(name, pkg, false, &mut dependencies, &mut total_count);
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
let result = DependencyState {
|
|
63
|
+
total_packages: total_count,
|
|
64
|
+
outdated_count: 0, // list doesn't provide outdated info
|
|
65
|
+
dependencies,
|
|
66
|
+
};
|
|
67
|
+
|
|
68
|
+
ParseResult::Full(result)
|
|
69
|
+
}
|
|
70
|
+
Err(e) => {
|
|
71
|
+
// Tier 2: Try text extraction
|
|
72
|
+
match extract_list_text(input) {
|
|
73
|
+
Some(result) => {
|
|
74
|
+
ParseResult::Degraded(result, vec![format!("JSON parse failed: {}", e)])
|
|
75
|
+
}
|
|
76
|
+
None => {
|
|
77
|
+
// Tier 3: Passthrough
|
|
78
|
+
ParseResult::Passthrough(truncate_output(input, 500))
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
/// Recursively collect dependencies from pnpm package tree
|
|
87
|
+
fn collect_dependencies(
|
|
88
|
+
name: &str,
|
|
89
|
+
pkg: &PnpmPackage,
|
|
90
|
+
is_dev: bool,
|
|
91
|
+
deps: &mut Vec<Dependency>,
|
|
92
|
+
count: &mut usize,
|
|
93
|
+
) {
|
|
94
|
+
if let Some(version) = &pkg.version {
|
|
95
|
+
deps.push(Dependency {
|
|
96
|
+
name: name.to_string(),
|
|
97
|
+
current_version: version.clone(),
|
|
98
|
+
latest_version: None,
|
|
99
|
+
wanted_version: None,
|
|
100
|
+
dev_dependency: is_dev,
|
|
101
|
+
});
|
|
102
|
+
*count += 1;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
for (dep_name, dep_pkg) in &pkg.dependencies {
|
|
106
|
+
collect_dependencies(dep_name, dep_pkg, is_dev, deps, count);
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
for (dep_name, dep_pkg) in &pkg.dev_dependencies {
|
|
110
|
+
collect_dependencies(dep_name, dep_pkg, true, deps, count);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
/// Tier 2: Extract list info from text output
|
|
115
|
+
fn extract_list_text(output: &str) -> Option<DependencyState> {
|
|
116
|
+
let mut dependencies = Vec::new();
|
|
117
|
+
let mut count = 0;
|
|
118
|
+
|
|
119
|
+
for line in output.lines() {
|
|
120
|
+
// Skip box-drawing and metadata
|
|
121
|
+
if line.contains('│')
|
|
122
|
+
|| line.contains('├')
|
|
123
|
+
|| line.contains('└')
|
|
124
|
+
|| line.contains("Legend:")
|
|
125
|
+
|| line.trim().is_empty()
|
|
126
|
+
{
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
// Parse lines like: "package@1.2.3"
|
|
131
|
+
let parts: Vec<&str> = line.split_whitespace().collect();
|
|
132
|
+
if !parts.is_empty() {
|
|
133
|
+
let pkg_str = parts[0];
|
|
134
|
+
if let Some(at_pos) = pkg_str.rfind('@') {
|
|
135
|
+
let name = &pkg_str[..at_pos];
|
|
136
|
+
let version = &pkg_str[at_pos + 1..];
|
|
137
|
+
if !name.is_empty() && !version.is_empty() {
|
|
138
|
+
dependencies.push(Dependency {
|
|
139
|
+
name: name.to_string(),
|
|
140
|
+
current_version: version.to_string(),
|
|
141
|
+
latest_version: None,
|
|
142
|
+
wanted_version: None,
|
|
143
|
+
dev_dependency: false,
|
|
144
|
+
});
|
|
145
|
+
count += 1;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
if count > 0 {
|
|
152
|
+
Some(DependencyState {
|
|
153
|
+
total_packages: count,
|
|
154
|
+
outdated_count: 0,
|
|
155
|
+
dependencies,
|
|
156
|
+
})
|
|
157
|
+
} else {
|
|
158
|
+
None
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
/// Parser for pnpm outdated output
|
|
163
|
+
pub struct PnpmOutdatedParser;
|
|
164
|
+
|
|
165
|
+
impl OutputParser for PnpmOutdatedParser {
|
|
166
|
+
type Output = DependencyState;
|
|
167
|
+
|
|
168
|
+
fn parse(input: &str) -> ParseResult<DependencyState> {
|
|
169
|
+
// Tier 1: Try JSON parsing
|
|
170
|
+
match serde_json::from_str::<PnpmOutdatedOutput>(input) {
|
|
171
|
+
Ok(json) => {
|
|
172
|
+
let mut dependencies = Vec::new();
|
|
173
|
+
let mut outdated_count = 0;
|
|
174
|
+
|
|
175
|
+
for (name, pkg) in &json.packages {
|
|
176
|
+
if pkg.current != pkg.latest {
|
|
177
|
+
outdated_count += 1;
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
dependencies.push(Dependency {
|
|
181
|
+
name: name.clone(),
|
|
182
|
+
current_version: pkg.current.clone(),
|
|
183
|
+
latest_version: Some(pkg.latest.clone()),
|
|
184
|
+
wanted_version: pkg.wanted.clone(),
|
|
185
|
+
dev_dependency: pkg.dependency_type == "devDependencies",
|
|
186
|
+
});
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
let result = DependencyState {
|
|
190
|
+
total_packages: dependencies.len(),
|
|
191
|
+
outdated_count,
|
|
192
|
+
dependencies,
|
|
193
|
+
};
|
|
194
|
+
|
|
195
|
+
ParseResult::Full(result)
|
|
196
|
+
}
|
|
197
|
+
Err(e) => {
|
|
198
|
+
// Tier 2: Try text extraction
|
|
199
|
+
match extract_outdated_text(input) {
|
|
200
|
+
Some(result) => {
|
|
201
|
+
ParseResult::Degraded(result, vec![format!("JSON parse failed: {}", e)])
|
|
202
|
+
}
|
|
203
|
+
None => {
|
|
204
|
+
// Tier 3: Passthrough
|
|
205
|
+
ParseResult::Passthrough(truncate_output(input, 500))
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
/// Tier 2: Extract outdated info from text output
|
|
214
|
+
fn extract_outdated_text(output: &str) -> Option<DependencyState> {
|
|
215
|
+
let mut dependencies = Vec::new();
|
|
216
|
+
let mut outdated_count = 0;
|
|
217
|
+
|
|
218
|
+
for line in output.lines() {
|
|
219
|
+
// Skip box-drawing, headers, legend
|
|
220
|
+
if line.contains('│')
|
|
221
|
+
|| line.contains('├')
|
|
222
|
+
|| line.contains('└')
|
|
223
|
+
|| line.contains('─')
|
|
224
|
+
|| line.starts_with("Legend:")
|
|
225
|
+
|| line.starts_with("Package")
|
|
226
|
+
|| line.trim().is_empty()
|
|
227
|
+
{
|
|
228
|
+
continue;
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
// Parse lines: "package current wanted latest"
|
|
232
|
+
let parts: Vec<&str> = line.split_whitespace().collect();
|
|
233
|
+
if parts.len() >= 4 {
|
|
234
|
+
let name = parts[0];
|
|
235
|
+
let current = parts[1];
|
|
236
|
+
let latest = parts[3];
|
|
237
|
+
|
|
238
|
+
if current != latest {
|
|
239
|
+
outdated_count += 1;
|
|
240
|
+
}
|
|
241
|
+
|
|
242
|
+
dependencies.push(Dependency {
|
|
243
|
+
name: name.to_string(),
|
|
244
|
+
current_version: current.to_string(),
|
|
245
|
+
latest_version: Some(latest.to_string()),
|
|
246
|
+
wanted_version: parts.get(2).map(|s| s.to_string()),
|
|
247
|
+
dev_dependency: false,
|
|
248
|
+
});
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
if !dependencies.is_empty() {
|
|
253
|
+
Some(DependencyState {
|
|
254
|
+
total_packages: dependencies.len(),
|
|
255
|
+
outdated_count,
|
|
256
|
+
dependencies,
|
|
257
|
+
})
|
|
258
|
+
} else {
|
|
259
|
+
None
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
|
|
263
|
+
/// Validates npm package name according to official rules
|
|
264
|
+
fn is_valid_package_name(name: &str) -> bool {
|
|
265
|
+
if name.is_empty() || name.len() > 214 {
|
|
266
|
+
return false;
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
// No path traversal
|
|
270
|
+
if name.contains("..") {
|
|
271
|
+
return false;
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
// Only safe characters
|
|
275
|
+
name.chars()
|
|
276
|
+
.all(|c| c.is_alphanumeric() || matches!(c, '@' | '/' | '-' | '_' | '.'))
|
|
277
|
+
}
|
|
278
|
+
|
|
279
|
+
#[derive(Debug, Clone)]
|
|
280
|
+
pub enum PnpmCommand {
|
|
281
|
+
List { depth: usize },
|
|
282
|
+
Outdated,
|
|
283
|
+
Install { packages: Vec<String> },
|
|
284
|
+
}
|
|
285
|
+
|
|
286
|
+
pub fn run(cmd: PnpmCommand, args: &[String], verbose: u8) -> Result<()> {
|
|
287
|
+
match cmd {
|
|
288
|
+
PnpmCommand::List { depth } => run_list(depth, args, verbose),
|
|
289
|
+
PnpmCommand::Outdated => run_outdated(args, verbose),
|
|
290
|
+
PnpmCommand::Install { packages } => run_install(&packages, args, verbose),
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
fn run_list(depth: usize, args: &[String], verbose: u8) -> Result<()> {
|
|
295
|
+
let timer = tracking::TimedExecution::start();
|
|
296
|
+
|
|
297
|
+
let mut cmd = Command::new("pnpm");
|
|
298
|
+
cmd.arg("list");
|
|
299
|
+
cmd.arg(format!("--depth={}", depth));
|
|
300
|
+
cmd.arg("--json");
|
|
301
|
+
|
|
302
|
+
for arg in args {
|
|
303
|
+
cmd.arg(arg);
|
|
304
|
+
}
|
|
305
|
+
|
|
306
|
+
let output = cmd.output().context("Failed to run pnpm list")?;
|
|
307
|
+
|
|
308
|
+
if !output.status.success() {
|
|
309
|
+
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
310
|
+
anyhow::bail!("pnpm list failed: {}", stderr);
|
|
311
|
+
}
|
|
312
|
+
|
|
313
|
+
let stdout = String::from_utf8_lossy(&output.stdout);
|
|
314
|
+
|
|
315
|
+
// Parse output using PnpmListParser
|
|
316
|
+
let parse_result = PnpmListParser::parse(&stdout);
|
|
317
|
+
let mode = FormatMode::from_verbosity(verbose);
|
|
318
|
+
|
|
319
|
+
let filtered = match parse_result {
|
|
320
|
+
ParseResult::Full(data) => {
|
|
321
|
+
if verbose > 0 {
|
|
322
|
+
eprintln!("pnpm list (Tier 1: Full JSON parse)");
|
|
323
|
+
}
|
|
324
|
+
data.format(mode)
|
|
325
|
+
}
|
|
326
|
+
ParseResult::Degraded(data, warnings) => {
|
|
327
|
+
if verbose > 0 {
|
|
328
|
+
emit_degradation_warning("pnpm list", &warnings.join(", "));
|
|
329
|
+
}
|
|
330
|
+
data.format(mode)
|
|
331
|
+
}
|
|
332
|
+
ParseResult::Passthrough(raw) => {
|
|
333
|
+
emit_passthrough_warning("pnpm list", "All parsing tiers failed");
|
|
334
|
+
raw
|
|
335
|
+
}
|
|
336
|
+
};
|
|
337
|
+
|
|
338
|
+
println!("{}", filtered);
|
|
339
|
+
|
|
340
|
+
timer.track(
|
|
341
|
+
&format!("pnpm list --depth={}", depth),
|
|
342
|
+
&format!("rtk pnpm list --depth={}", depth),
|
|
343
|
+
&stdout,
|
|
344
|
+
&filtered,
|
|
345
|
+
);
|
|
346
|
+
|
|
347
|
+
Ok(())
|
|
348
|
+
}
|
|
349
|
+
|
|
350
|
+
fn run_outdated(args: &[String], verbose: u8) -> Result<()> {
|
|
351
|
+
let timer = tracking::TimedExecution::start();
|
|
352
|
+
|
|
353
|
+
let mut cmd = Command::new("pnpm");
|
|
354
|
+
cmd.arg("outdated");
|
|
355
|
+
cmd.arg("--format");
|
|
356
|
+
cmd.arg("json");
|
|
357
|
+
|
|
358
|
+
for arg in args {
|
|
359
|
+
cmd.arg(arg);
|
|
360
|
+
}
|
|
361
|
+
|
|
362
|
+
let output = cmd.output().context("Failed to run pnpm outdated")?;
|
|
363
|
+
let stdout = String::from_utf8_lossy(&output.stdout);
|
|
364
|
+
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
365
|
+
let combined = format!("{}{}", stdout, stderr);
|
|
366
|
+
|
|
367
|
+
// Parse output using PnpmOutdatedParser
|
|
368
|
+
let parse_result = PnpmOutdatedParser::parse(&stdout);
|
|
369
|
+
let mode = FormatMode::from_verbosity(verbose);
|
|
370
|
+
|
|
371
|
+
let filtered = match parse_result {
|
|
372
|
+
ParseResult::Full(data) => {
|
|
373
|
+
if verbose > 0 {
|
|
374
|
+
eprintln!("pnpm outdated (Tier 1: Full JSON parse)");
|
|
375
|
+
}
|
|
376
|
+
data.format(mode)
|
|
377
|
+
}
|
|
378
|
+
ParseResult::Degraded(data, warnings) => {
|
|
379
|
+
if verbose > 0 {
|
|
380
|
+
emit_degradation_warning("pnpm outdated", &warnings.join(", "));
|
|
381
|
+
}
|
|
382
|
+
data.format(mode)
|
|
383
|
+
}
|
|
384
|
+
ParseResult::Passthrough(raw) => {
|
|
385
|
+
emit_passthrough_warning("pnpm outdated", "All parsing tiers failed");
|
|
386
|
+
raw
|
|
387
|
+
}
|
|
388
|
+
};
|
|
389
|
+
|
|
390
|
+
if filtered.trim().is_empty() {
|
|
391
|
+
println!("All packages up-to-date ✓");
|
|
392
|
+
} else {
|
|
393
|
+
println!("{}", filtered);
|
|
394
|
+
}
|
|
395
|
+
|
|
396
|
+
timer.track("pnpm outdated", "rtk pnpm outdated", &combined, &filtered);
|
|
397
|
+
|
|
398
|
+
Ok(())
|
|
399
|
+
}
|
|
400
|
+
|
|
401
|
+
fn run_install(packages: &[String], args: &[String], verbose: u8) -> Result<()> {
|
|
402
|
+
let timer = tracking::TimedExecution::start();
|
|
403
|
+
|
|
404
|
+
// Validate package names to prevent command injection
|
|
405
|
+
for pkg in packages {
|
|
406
|
+
if !is_valid_package_name(pkg) {
|
|
407
|
+
anyhow::bail!(
|
|
408
|
+
"Invalid package name: '{}' (contains unsafe characters)",
|
|
409
|
+
pkg
|
|
410
|
+
);
|
|
411
|
+
}
|
|
412
|
+
}
|
|
413
|
+
|
|
414
|
+
let mut cmd = Command::new("pnpm");
|
|
415
|
+
cmd.arg("install");
|
|
416
|
+
|
|
417
|
+
for pkg in packages {
|
|
418
|
+
cmd.arg(pkg);
|
|
419
|
+
}
|
|
420
|
+
|
|
421
|
+
for arg in args {
|
|
422
|
+
cmd.arg(arg);
|
|
423
|
+
}
|
|
424
|
+
|
|
425
|
+
if verbose > 0 {
|
|
426
|
+
eprintln!("pnpm install running...");
|
|
427
|
+
}
|
|
428
|
+
|
|
429
|
+
let output = cmd.output().context("Failed to run pnpm install")?;
|
|
430
|
+
let stdout = String::from_utf8_lossy(&output.stdout);
|
|
431
|
+
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
432
|
+
|
|
433
|
+
if !output.status.success() {
|
|
434
|
+
anyhow::bail!("pnpm install failed: {}", stderr);
|
|
435
|
+
}
|
|
436
|
+
|
|
437
|
+
let combined = format!("{}{}", stdout, stderr);
|
|
438
|
+
let filtered = filter_pnpm_install(&combined);
|
|
439
|
+
|
|
440
|
+
println!("{}", filtered);
|
|
441
|
+
|
|
442
|
+
timer.track(
|
|
443
|
+
&format!("pnpm install {}", packages.join(" ")),
|
|
444
|
+
&format!("rtk pnpm install {}", packages.join(" ")),
|
|
445
|
+
&combined,
|
|
446
|
+
&filtered,
|
|
447
|
+
);
|
|
448
|
+
|
|
449
|
+
Ok(())
|
|
450
|
+
}
|
|
451
|
+
|
|
452
|
+
/// Filter pnpm install output - remove progress bars, keep summary
|
|
453
|
+
fn filter_pnpm_install(output: &str) -> String {
|
|
454
|
+
let mut result = Vec::new();
|
|
455
|
+
let mut saw_progress = false;
|
|
456
|
+
|
|
457
|
+
for line in output.lines() {
|
|
458
|
+
// Skip progress bars
|
|
459
|
+
if line.contains("Progress") || line.contains('│') || line.contains('%') {
|
|
460
|
+
saw_progress = true;
|
|
461
|
+
continue;
|
|
462
|
+
}
|
|
463
|
+
|
|
464
|
+
if saw_progress && line.trim().is_empty() {
|
|
465
|
+
continue;
|
|
466
|
+
}
|
|
467
|
+
|
|
468
|
+
// Keep error lines
|
|
469
|
+
if line.contains("ERR") || line.contains("error") || line.contains("ERROR") {
|
|
470
|
+
result.push(line.to_string());
|
|
471
|
+
continue;
|
|
472
|
+
}
|
|
473
|
+
|
|
474
|
+
// Keep summary lines
|
|
475
|
+
if line.contains("packages in")
|
|
476
|
+
|| line.contains("dependencies")
|
|
477
|
+
|| line.starts_with('+')
|
|
478
|
+
|| line.starts_with('-')
|
|
479
|
+
{
|
|
480
|
+
result.push(line.trim().to_string());
|
|
481
|
+
}
|
|
482
|
+
}
|
|
483
|
+
|
|
484
|
+
if result.is_empty() {
|
|
485
|
+
"ok ✓".to_string()
|
|
486
|
+
} else {
|
|
487
|
+
result.join("\n")
|
|
488
|
+
}
|
|
489
|
+
}
|
|
490
|
+
|
|
491
|
+
/// Runs an unsupported pnpm subcommand by passing it through directly
|
|
492
|
+
pub fn run_passthrough(args: &[OsString], verbose: u8) -> Result<()> {
|
|
493
|
+
let timer = tracking::TimedExecution::start();
|
|
494
|
+
|
|
495
|
+
if verbose > 0 {
|
|
496
|
+
eprintln!("pnpm passthrough: {:?}", args);
|
|
497
|
+
}
|
|
498
|
+
let status = Command::new("pnpm")
|
|
499
|
+
.args(args)
|
|
500
|
+
.status()
|
|
501
|
+
.context("Failed to run pnpm")?;
|
|
502
|
+
|
|
503
|
+
let args_str = tracking::args_display(args);
|
|
504
|
+
timer.track_passthrough(
|
|
505
|
+
&format!("pnpm {}", args_str),
|
|
506
|
+
&format!("rtk pnpm {} (passthrough)", args_str),
|
|
507
|
+
);
|
|
508
|
+
|
|
509
|
+
if !status.success() {
|
|
510
|
+
std::process::exit(status.code().unwrap_or(1));
|
|
511
|
+
}
|
|
512
|
+
Ok(())
|
|
513
|
+
}
|
|
514
|
+
|
|
515
|
+
#[cfg(test)]
|
|
516
|
+
mod tests {
|
|
517
|
+
use super::*;
|
|
518
|
+
|
|
519
|
+
#[test]
|
|
520
|
+
fn test_pnpm_list_parser_json() {
|
|
521
|
+
let json = r#"{
|
|
522
|
+
"my-project": {
|
|
523
|
+
"version": "1.0.0",
|
|
524
|
+
"dependencies": {
|
|
525
|
+
"express": {
|
|
526
|
+
"version": "4.18.2"
|
|
527
|
+
}
|
|
528
|
+
}
|
|
529
|
+
}
|
|
530
|
+
}"#;
|
|
531
|
+
|
|
532
|
+
let result = PnpmListParser::parse(json);
|
|
533
|
+
assert_eq!(result.tier(), 1);
|
|
534
|
+
assert!(result.is_ok());
|
|
535
|
+
|
|
536
|
+
let data = result.unwrap();
|
|
537
|
+
assert!(data.total_packages >= 2);
|
|
538
|
+
}
|
|
539
|
+
|
|
540
|
+
#[test]
|
|
541
|
+
fn test_pnpm_outdated_parser_json() {
|
|
542
|
+
let json = r#"{
|
|
543
|
+
"express": {
|
|
544
|
+
"current": "4.18.2",
|
|
545
|
+
"latest": "4.19.0",
|
|
546
|
+
"wanted": "4.18.2"
|
|
547
|
+
}
|
|
548
|
+
}"#;
|
|
549
|
+
|
|
550
|
+
let result = PnpmOutdatedParser::parse(json);
|
|
551
|
+
assert_eq!(result.tier(), 1);
|
|
552
|
+
assert!(result.is_ok());
|
|
553
|
+
|
|
554
|
+
let data = result.unwrap();
|
|
555
|
+
assert_eq!(data.outdated_count, 1);
|
|
556
|
+
assert_eq!(data.dependencies[0].name, "express");
|
|
557
|
+
}
|
|
558
|
+
|
|
559
|
+
#[test]
|
|
560
|
+
fn test_package_name_validation() {
|
|
561
|
+
assert!(is_valid_package_name("lodash"));
|
|
562
|
+
assert!(is_valid_package_name("@clerk/express"));
|
|
563
|
+
assert!(!is_valid_package_name("../../../etc/passwd"));
|
|
564
|
+
assert!(!is_valid_package_name("lodash; rm -rf /"));
|
|
565
|
+
}
|
|
566
|
+
|
|
567
|
+
#[test]
|
|
568
|
+
fn test_run_passthrough_accepts_args() {
|
|
569
|
+
// Test that run_passthrough compiles and has correct signature
|
|
570
|
+
let _args: Vec<OsString> = vec![OsString::from("help")];
|
|
571
|
+
// Compile-time verification that the function exists with correct signature
|
|
572
|
+
}
|
|
573
|
+
}
|