Skip to content
This repository was archived by the owner on Apr 3, 2026. It is now read-only.

perf(pm): skip registry fetches on lockfile hits during install #76

Merged
viniciusdacal merged 1 commit into from
Apr 1, 2026
Merged

perf(pm): skip registry fetches on lockfile hits during install #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
229 changes: 208 additions & 21 deletions native/vtz/src/pm/lockfile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,20 @@ pub fn write_lockfile(path: &Path, lockfile: &Lockfile) -> Result<(), std::io::E
}
}

if !entry.bin.is_empty() {
output.push_str(" bin:\n");
for (bin_name, bin_path) in &entry.bin {
output.push_str(&format!(" \"{}\" \"{}\"\n", bin_name, bin_path));
}
}

if !entry.scripts.is_empty() {
output.push_str(" scripts:\n");
for (script_name, script_cmd) in &entry.scripts {
output.push_str(&format!(" \"{}\" \"{}\"\n", script_name, script_cmd));
}
}

output.push('\n');
}

Expand All @@ -56,10 +70,12 @@ pub fn parse_lockfile(content: &str) -> Result<Lockfile, Box<dyn std::error::Err
resolved: String::new(),
integrity: String::new(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
};
let mut in_dependencies = false;
let mut in_section: Option<&'static str> = None;

for line in content.lines() {
// Skip comments and empty lines
Expand All @@ -75,18 +91,23 @@ pub fn parse_lockfile(content: &str) -> Result<Lockfile, Box<dyn std::error::Err
resolved: String::new(),
integrity: String::new(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
};
in_dependencies = false;
in_section = None;
}
continue;
}

let trimmed = line.trim();

// Subsection headers that are NOT top-level entry keys
const SECTION_HEADERS: &[&str] = &["dependencies:", "bin:", "scripts:"];

// New entry: "name@range:" at column 0
if !line.starts_with(' ') && trimmed.ends_with(':') && trimmed != "dependencies:" {
if !line.starts_with(' ') && trimmed.ends_with(':') && !SECTION_HEADERS.contains(&trimmed) {
// Save previous entry if exists
if let Some(key) = current_key.take() {
lockfile.entries.insert(key, current_entry.clone());
Expand All @@ -97,10 +118,12 @@ pub fn parse_lockfile(content: &str) -> Result<Lockfile, Box<dyn std::error::Err
resolved: String::new(),
integrity: String::new(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
};
in_dependencies = false;
in_section = None;
}

let spec = &trimmed[..trimmed.len() - 1]; // Remove trailing ':'
Expand All @@ -115,27 +138,51 @@ pub fn parse_lockfile(content: &str) -> Result<Lockfile, Box<dyn std::error::Err
// Inside an entry
if current_key.is_some() {
if trimmed == "dependencies:" {
in_dependencies = true;
in_section = Some("dependencies");
continue;
}
if trimmed == "bin:" {
in_section = Some("bin");
continue;
}
if trimmed == "scripts:" {
in_section = Some("scripts");
continue;
}

if in_dependencies {
// Parse dependency line: "dep-name" "dep-range"
if let Some((name, range)) = parse_quoted_pair(trimmed) {
current_entry
.dependencies
.insert(name.to_string(), range.to_string());
match in_section {
Some("dependencies") => {
if let Some((name, range)) = parse_quoted_pair(trimmed) {
current_entry
.dependencies
.insert(name.to_string(), range.to_string());
}
}
Some("bin") => {
if let Some((name, path)) = parse_quoted_pair(trimmed) {
current_entry.bin.insert(name.to_string(), path.to_string());
}
}
Some("scripts") => {
if let Some((name, cmd)) = parse_quoted_pair(trimmed) {
current_entry
.scripts
.insert(name.to_string(), cmd.to_string());
}
}
_ => {
if let Some(rest) = trimmed.strip_prefix("version ") {
current_entry.version = unquote(rest).to_string();
} else if let Some(rest) = trimmed.strip_prefix("resolved ") {
current_entry.resolved = unquote(rest).to_string();
} else if let Some(rest) = trimmed.strip_prefix("integrity ") {
current_entry.integrity = unquote(rest).to_string();
} else if trimmed == "optional true" {
current_entry.optional = true;
} else if trimmed == "overridden true" {
current_entry.overridden = true;
}
}
} else if let Some(rest) = trimmed.strip_prefix("version ") {
current_entry.version = unquote(rest).to_string();
} else if let Some(rest) = trimmed.strip_prefix("resolved ") {
current_entry.resolved = unquote(rest).to_string();
} else if let Some(rest) = trimmed.strip_prefix("integrity ") {
current_entry.integrity = unquote(rest).to_string();
} else if trimmed == "optional true" {
current_entry.optional = true;
} else if trimmed == "overridden true" {
current_entry.overridden = true;
}
}
}
Expand Down Expand Up @@ -196,6 +243,8 @@ mod tests {
resolved: "https://registry.npmjs.org/react/-/react-18.3.1.tgz".to_string(),
integrity: "sha512-abc123".to_string(),
dependencies: deps,
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
},
Expand All @@ -210,6 +259,8 @@ mod tests {
resolved: "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz".to_string(),
integrity: "sha512-def456".to_string(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
},
Expand Down Expand Up @@ -257,6 +308,8 @@ mod tests {
resolved: "url1".to_string(),
integrity: "hash1".to_string(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
},
Expand All @@ -270,6 +323,8 @@ mod tests {
resolved: "url2".to_string(),
integrity: "hash2".to_string(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
},
Expand Down Expand Up @@ -298,6 +353,8 @@ mod tests {
resolved: "url".to_string(),
integrity: "hash".to_string(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
},
Expand All @@ -311,6 +368,8 @@ mod tests {
resolved: "url".to_string(),
integrity: "hash".to_string(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
},
Expand Down Expand Up @@ -381,6 +440,8 @@ mod tests {
resolved: "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz".to_string(),
integrity: "sha512-abc".to_string(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
},
Expand All @@ -396,6 +457,8 @@ mod tests {
resolved: "link:packages/shared".to_string(),
integrity: String::new(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
},
Expand Down Expand Up @@ -447,6 +510,8 @@ mod tests {
resolved: "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz".to_string(),
integrity: "sha512-abc".to_string(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: true,
overridden: false,
},
Expand All @@ -460,6 +525,8 @@ mod tests {
resolved: "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz".to_string(),
integrity: "sha512-def".to_string(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
},
Expand Down Expand Up @@ -512,6 +579,8 @@ fsevents@^2.3.0:
resolved: "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz".to_string(),
integrity: "sha512-abc".to_string(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: true,
},
Expand All @@ -525,6 +594,8 @@ fsevents@^2.3.0:
resolved: "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz".to_string(),
integrity: "sha512-def".to_string(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
},
Expand Down Expand Up @@ -555,4 +626,120 @@ zod@^3.24.0:
let lockfile = parse_lockfile(content).unwrap();
assert!(!lockfile.entries["zod@^3.24.0"].overridden);
}

#[test]
fn test_write_and_read_bin_entries() {
let dir = tempfile::tempdir().unwrap();
let path = dir.path().join("vertz.lock");

let mut lockfile = Lockfile::default();
let mut bin = BTreeMap::new();
bin.insert("esbuild".to_string(), "bin/esbuild".to_string());

lockfile.entries.insert(
"esbuild@^0.20.0".to_string(),
LockfileEntry {
name: "esbuild".to_string(),
range: "^0.20.0".to_string(),
version: "0.20.2".to_string(),
resolved: "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz".to_string(),
integrity: "sha512-abc".to_string(),
dependencies: BTreeMap::new(),
bin,
scripts: BTreeMap::new(),
optional: false,
overridden: false,
},
);

write_lockfile(&path, &lockfile).unwrap();

let content = std::fs::read_to_string(&path).unwrap();
assert!(content.contains("bin:"));
assert!(content.contains("\"esbuild\" \"bin/esbuild\""));

let parsed = read_lockfile(&path).unwrap();
let entry = &parsed.entries["esbuild@^0.20.0"];
assert_eq!(entry.bin.len(), 1);
assert_eq!(entry.bin["esbuild"], "bin/esbuild");
}

#[test]
fn test_write_and_read_scripts_entries() {
let dir = tempfile::tempdir().unwrap();
let path = dir.path().join("vertz.lock");

let mut lockfile = Lockfile::default();
let mut scripts = BTreeMap::new();
scripts.insert(
"postinstall".to_string(),
"node scripts/build.js".to_string(),
);

lockfile.entries.insert(
"esbuild@^0.20.0".to_string(),
LockfileEntry {
name: "esbuild".to_string(),
range: "^0.20.0".to_string(),
version: "0.20.2".to_string(),
resolved: "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz".to_string(),
integrity: "sha512-abc".to_string(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts,
optional: false,
overridden: false,
},
);

write_lockfile(&path, &lockfile).unwrap();

let content = std::fs::read_to_string(&path).unwrap();
assert!(content.contains("scripts:"));
assert!(content.contains("\"postinstall\" \"node scripts/build.js\""));

let parsed = read_lockfile(&path).unwrap();
let entry = &parsed.entries["esbuild@^0.20.0"];
assert_eq!(entry.scripts.len(), 1);
assert_eq!(entry.scripts["postinstall"], "node scripts/build.js");
}

#[test]
fn test_parse_lockfile_with_bin_and_scripts() {
let content = r#"# vertz.lock v1 — DO NOT EDIT
# Run "vertz install" to regenerate

esbuild@^0.20.0:
version "0.20.2"
resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz"
integrity "sha512-abc"
bin:
"esbuild" "bin/esbuild"
scripts:
"postinstall" "node scripts/build.js"

"#;
let lockfile = parse_lockfile(content).unwrap();
let entry = &lockfile.entries["esbuild@^0.20.0"];
assert_eq!(entry.version, "0.20.2");
assert_eq!(entry.bin["esbuild"], "bin/esbuild");
assert_eq!(entry.scripts["postinstall"], "node scripts/build.js");
}

#[test]
fn test_lockfile_without_bin_scripts_defaults_empty() {
let content = r#"# vertz.lock v1 — DO NOT EDIT
# Run "vertz install" to regenerate

zod@^3.24.0:
version "3.24.4"
resolved "url"
integrity "hash"

"#;
let lockfile = parse_lockfile(content).unwrap();
let entry = &lockfile.entries["zod@^3.24.0"];
assert!(entry.bin.is_empty());
assert!(entry.scripts.is_empty());
}
}
6 changes: 6 additions & 0 deletions native/vtz/src/pm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2995,6 +2995,8 @@ mod tests {
),
integrity: format!("sha512-fake-{}", name),
dependencies,
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
}
Expand Down Expand Up @@ -4731,6 +4733,8 @@ mod tests {
resolved: "https://codeload.github.com/user/my-lib/tar.gz/a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2".to_string(),
integrity: "sha512-fakehash".to_string(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
},
Expand Down Expand Up @@ -4774,6 +4778,8 @@ mod tests {
resolved: "https://codeload.github.com/user/my-lib/tar.gz/a1b2c3d".to_string(),
integrity: "sha512-fakehash".to_string(),
dependencies: BTreeMap::new(),
bin: BTreeMap::new(),
scripts: BTreeMap::new(),
optional: false,
overridden: false,
},
Expand Down
Loading
Loading