diff options
| author |  Dylan Conway <dylan.conway567@gmail.com>
| 2023-10-05 11:30:52 -0700 |
|---|---|---|
| committer | Dylan Conway <dylan.conway567@gmail.com>
| 2023-10-05 11:30:52 -0700 |
| commit | df1b0c4332ed1ef8de57b5bdcaa4dbe8b1450847 (patch) | |
| tree | 184a672769bd09a1e6cf103ea5fafbc19a14df53 | |
| parent | 4a2e1574e4d4001b60c96a315491dd622d7d54b6 (diff) | |
| download | bun-df1b0c4332ed1ef8de57b5bdcaa4dbe8b1450847.tar.gz bun-df1b0c4332ed1ef8de57b5bdcaa4dbe8b1450847.tar.zst bun-df1b0c4332ed1ef8de57b5bdcaa4dbe8b1450847.zip | |
fix printing latest available version
| -rw-r--r-- | src/install/install.zig | 15 | ||||
| -rw-r--r-- | src/install/lockfile.zig | 4 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/install/install.zig b/src/install/install.zig index cee080116..83e060e07 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -1905,7 +1905,12 @@ pub const PackageManager = struct { @memset(this.preinstall_state.items[offset..], PreinstallState.unknown); } - pub fn laterVersionInCache(this: *PackageManager, name: []const u8, name_hash: PackageNameHash, resolution: Resolution) ?Semver.Version { + pub fn formatLaterVersionInCache( + this: *PackageManager, + name: []const u8, + name_hash: PackageNameHash, + resolution: Resolution, + ) ?Semver.Version.Formatter { switch (resolution.tag) { Resolution.Tag.npm => { if (resolution.value.npm.version.tag.hasPre()) @@ -1927,8 +1932,12 @@ pub const PackageManager = struct { }; if (manifest.findByDistTag("latest")) |latest_version| { - if (latest_version.version.order(resolution.value.npm.version, this.lockfile.buffers.string_bytes.items, this.lockfile.buffers.string_bytes.items) != .gt) return null; - return latest_version.version; + if (latest_version.version.order( + resolution.value.npm.version, + manifest.string_buf, + this.lockfile.buffers.string_bytes.items, + ) != .gt) return null; + return latest_version.version.fmt(manifest.string_buf); } return null; diff --git a/src/install/lockfile.zig b/src/install/lockfile.zig index acd40b42e..dc0a64475 100644 --- a/src/install/lockfile.zig +++ b/src/install/lockfile.zig @@ -1119,7 +1119,7 @@ pub const Printer = struct { if (!installed.isSet(package_id)) continue; - if (PackageManager.instance.laterVersionInCache(package_name, dependency.name_hash, resolved[package_id])) |later_version| { + if (PackageManager.instance.formatLaterVersionInCache(package_name, dependency.name_hash, resolved[package_id])) |later_version_fmt| { const fmt = comptime brk: { if (enable_ansi_colors) { break :brk Output.prettyFmt("<r> <green>+<r> <b>{s}<r><d>@{}<r> <d>(<blue>v{} available<r><d>)<r>\n", enable_ansi_colors); @@ -1132,7 +1132,7 @@ pub const Printer = struct { .{ package_name, resolved[package_id].fmt(string_buf), - later_version.fmt(string_buf), + later_version_fmt, }, ); } else { |