aboutsummaryrefslogtreecommitdiff
path: root/src/install/install.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/install/install.zig')
-rw-r--r--src/install/install.zig556
1 files changed, 317 insertions, 239 deletions
diff --git a/src/install/install.zig b/src/install/install.zig
index 88c8f653f..65f4a35e9 100644
--- a/src/install/install.zig
+++ b/src/install/install.zig
@@ -146,12 +146,12 @@ pub fn ExternalSliceAligned(comptime Type: type, comptime alignment_: ?u29) type
pub fn init(buf: []const Type, in: []const Type) Slice {
// if (comptime Environment.allow_assert) {
- // std.debug.assert(@ptrToInt(buf.ptr) <= @ptrToInt(in.ptr));
- // std.debug.assert((@ptrToInt(in.ptr) + in.len) <= (@ptrToInt(buf.ptr) + buf.len));
+ // std.debug.assert(@intFromPtr(buf.ptr) <= @intFromPtr(in.ptr));
+ // std.debug.assert((@intFromPtr(in.ptr) + in.len) <= (@intFromPtr(buf.ptr) + buf.len));
// }
return Slice{
- .off = @truncate(u32, (@ptrToInt(in.ptr) - @ptrToInt(buf.ptr)) / @sizeOf(Type)),
+ .off = @truncate(u32, (@intFromPtr(in.ptr) - @intFromPtr(buf.ptr)) / @sizeOf(Type)),
.len = @truncate(u32, in.len),
};
}
@@ -166,8 +166,8 @@ pub const ExternalStringList = ExternalSlice(ExternalString);
pub const VersionSlice = ExternalSlice(Semver.Version);
pub const ExternalStringMap = extern struct {
- name: ExternalStringList = ExternalStringList{},
- value: ExternalStringList = ExternalStringList{},
+ name: ExternalStringList = .{},
+ value: ExternalStringList = .{},
};
pub const PackageNameHash = u64;
@@ -183,7 +183,7 @@ pub const Aligner = struct {
}
pub inline fn skipAmount(comptime Type: type, pos: usize) usize {
- return std.mem.alignForward(pos, @alignOf(Type)) - pos;
+ return std.mem.alignForward(usize, pos, @alignOf(Type)) - pos;
}
};
@@ -351,7 +351,7 @@ const NetworkTask = struct {
},
);
header_builder.header_count = 1;
- header_builder.content = GlobalStringBuilder{ .ptr = @intToPtr([*]u8, @ptrToInt(bun.span(default_headers_buf).ptr)), .len = default_headers_buf.len, .cap = default_headers_buf.len };
+ header_builder.content = GlobalStringBuilder{ .ptr = @ptrFromInt([*]u8, @intFromPtr(bun.span(default_headers_buf).ptr)), .len = default_headers_buf.len, .cap = default_headers_buf.len };
}
this.response_buffer = try MutableString.init(allocator, 0);
@@ -467,19 +467,19 @@ pub const Features = struct {
is_main: bool = false,
optional_dependencies: bool = false,
peer_dependencies: bool = true,
- scripts: bool = false,
+ trusted_dependencies: bool = false,
workspaces: bool = false,
check_for_duplicate_dependencies: bool = false,
pub fn behavior(this: Features) Behavior {
var out: u8 = 0;
- out |= @as(u8, @boolToInt(this.dependencies)) << 1;
- out |= @as(u8, @boolToInt(this.optional_dependencies)) << 2;
- out |= @as(u8, @boolToInt(this.dev_dependencies)) << 3;
- out |= @as(u8, @boolToInt(this.peer_dependencies)) << 4;
- out |= @as(u8, @boolToInt(this.workspaces)) << 5;
- return @intToEnum(Behavior, out);
+ out |= @as(u8, @intFromBool(this.dependencies)) << 1;
+ out |= @as(u8, @intFromBool(this.optional_dependencies)) << 2;
+ out |= @as(u8, @intFromBool(this.dev_dependencies)) << 3;
+ out |= @as(u8, @intFromBool(this.peer_dependencies)) << 4;
+ out |= @as(u8, @intFromBool(this.workspaces)) << 5;
+ return @enumFromInt(Behavior, out);
}
pub const main = Features{
@@ -487,7 +487,7 @@ pub const Features = struct {
.dev_dependencies = true,
.is_main = true,
.optional_dependencies = true,
- .scripts = true,
+ .trusted_dependencies = true,
.workspaces = true,
};
@@ -499,7 +499,7 @@ pub const Features = struct {
pub const workspace = Features{
.dev_dependencies = true,
.optional_dependencies = true,
- .scripts = true,
+ .trusted_dependencies = true,
};
pub const link = Features{
@@ -541,7 +541,7 @@ const Task = struct {
/// An ID that lets us register a callback without keeping the same pointer around
pub const Id = struct {
pub fn forNPMPackage(package_name: string, package_version: Semver.Version) u64 {
- var hasher = std.hash.Wyhash.init(0);
+ var hasher = bun.Wyhash.init(0);
hasher.update(package_name);
hasher.update("@");
hasher.update(std.mem.asBytes(&package_version));
@@ -549,28 +549,28 @@ const Task = struct {
}
pub fn forBinLink(package_id: PackageID) u64 {
- const hash = std.hash.Wyhash.hash(0, std.mem.asBytes(&package_id));
+ const hash = bun.Wyhash.hash(0, std.mem.asBytes(&package_id));
return @as(u64, 1 << 61) | @as(u64, @truncate(u61, hash));
}
pub fn forManifest(name: string) u64 {
- return @as(u64, 2 << 61) | @as(u64, @truncate(u61, std.hash.Wyhash.hash(0, name)));
+ return @as(u64, 2 << 61) | @as(u64, @truncate(u61, bun.Wyhash.hash(0, name)));
}
pub fn forTarball(url: string) u64 {
- var hasher = std.hash.Wyhash.init(0);
+ var hasher = bun.Wyhash.init(0);
hasher.update(url);
return @as(u64, 3 << 61) | @as(u64, @truncate(u61, hasher.final()));
}
pub fn forGitClone(url: string) u64 {
- var hasher = std.hash.Wyhash.init(0);
+ var hasher = bun.Wyhash.init(0);
hasher.update(url);
return @as(u64, 4 << 61) | @as(u64, @truncate(u61, hasher.final()));
}
pub fn forGitCheckout(url: string, resolved: string) u64 {
- var hasher = std.hash.Wyhash.init(0);
+ var hasher = bun.Wyhash.init(0);
hasher.update(url);
hasher.update("@");
hasher.update(resolved);
@@ -1079,10 +1079,10 @@ const PackageInstall = struct {
var stackpath: [bun.MAX_PATH_BYTES]u8 = undefined;
while (try walker.next()) |entry| {
switch (entry.kind) {
- .Directory => {
+ .directory => {
std.os.mkdirat(destination_dir_.dir.fd, entry.path, 0o755) catch {};
},
- .File => {
+ .file => {
bun.copy(u8, &stackpath, entry.path);
stackpath[entry.path.len] = 0;
var path: [:0]u8 = stackpath[0..entry.path.len :0];
@@ -1190,7 +1190,7 @@ const PackageInstall = struct {
) !u32 {
var real_file_count: u32 = 0;
while (try walker.next()) |entry| {
- if (entry.kind != .File) continue;
+ if (entry.kind != .file) continue;
real_file_count += 1;
var outfile = destination_dir_.createFile(entry.path, .{}) catch brk: {
@@ -1268,10 +1268,10 @@ const PackageInstall = struct {
var real_file_count: u32 = 0;
while (try walker.next()) |entry| {
switch (entry.kind) {
- .Directory => {
+ .directory => {
std.os.mkdirat(destination_dir_.dir.fd, entry.path, 0o755) catch {};
},
- .File => {
+ .file => {
try std.os.linkat(entry.dir.dir.fd, entry.basename, destination_dir_.dir.fd, entry.path, 0);
real_file_count += 1;
},
@@ -1351,16 +1351,16 @@ const PackageInstall = struct {
while (try walker.next()) |entry| {
switch (entry.kind) {
// directories are created
- .Directory => {
+ .directory => {
std.os.mkdirat(dest_dir_fd, entry.path, 0o755) catch {};
},
// but each file in the directory is a symlink
- .File => {
- @memcpy(remain.ptr, entry.path.ptr, entry.path.len);
+ .file => {
+ @memcpy(remain[0..entry.path.len], entry.path);
remain[entry.path.len] = 0;
var from_path = buf[0 .. cache_dir_offset + entry.path.len :0];
- @memcpy(dest_remaining.ptr, entry.path.ptr, entry.path.len);
+ @memcpy(dest_remaining[0..entry.path.len], entry.path);
dest_remaining[entry.path.len] = 0;
var to_path = dest_buf[0 .. dest_dir_offset + entry.path.len :0];
@@ -1718,9 +1718,8 @@ pub const PackageManager = struct {
}
pub fn wake(this: *PackageManager) void {
- if (this.onWake.context != null) {
- this.onWake.getHandler()(this.onWake.context.?, this);
- return;
+ if (this.onWake.context) |ctx| {
+ this.onWake.getHandler()(ctx, this);
}
_ = this.wait_count.fetchAdd(1, .Monotonic);
@@ -1743,60 +1742,81 @@ pub const PackageManager = struct {
pub fn enqueueDependencyToRoot(
this: *PackageManager,
name: []const u8,
- version_buf: []const u8,
version: *const Dependency.Version,
+ version_buf: []const u8,
behavior: Dependency.Behavior,
) DependencyToEnqueue {
- const str_buf = this.lockfile.buffers.string_bytes.items;
- for (this.lockfile.buffers.dependencies.items, 0..) |dependency, dependency_id| {
- if (!strings.eqlLong(dependency.name.slice(str_buf), name, true)) continue;
- if (!dependency.version.eql(version, str_buf, version_buf)) continue;
- return switch (this.lockfile.buffers.resolutions.items[dependency_id]) {
- invalid_package_id => .{
- .pending = @truncate(DependencyID, dependency_id),
- },
- else => |resolution_id| .{
- .resolution = .{
- .resolution = this.lockfile.packages.items(.resolution)[resolution_id],
- .package_id = resolution_id,
- },
- },
+ const dep_id = @truncate(DependencyID, brk: {
+ const str_buf = this.lockfile.buffers.string_bytes.items;
+ for (this.lockfile.buffers.dependencies.items, 0..) |dep, id| {
+ if (!strings.eqlLong(dep.name.slice(str_buf), name, true)) continue;
+ if (!dep.version.eql(version, str_buf, version_buf)) continue;
+ break :brk id;
+ }
+
+ var builder = this.lockfile.stringBuilder();
+ const dummy = Dependency{
+ .name = String.init(name, name),
+ .name_hash = String.Builder.stringHash(name),
+ .version = version.*,
+ .behavior = behavior,
};
- }
+ dummy.countWithDifferentBuffers(name, version_buf, @TypeOf(&builder), &builder);
- var builder = this.lockfile.stringBuilder();
- const dependency = Dependency{
- .name = String.init(name, name),
- .name_hash = String.Builder.stringHash(name),
- .version = version.*,
- .behavior = behavior,
- };
- dependency.countWithDifferentBuffers(name, version_buf, @TypeOf(&builder), &builder);
-
- builder.allocate() catch |err| return .{ .failure = err };
-
- const cloned_dependency = dependency.cloneWithDifferentBuffers(name, version_buf, @TypeOf(&builder), &builder) catch unreachable;
- builder.clamp();
- const index = @truncate(DependencyID, this.lockfile.buffers.dependencies.items.len);
- this.lockfile.buffers.dependencies.append(this.allocator, cloned_dependency) catch unreachable;
- this.lockfile.buffers.resolutions.append(this.allocator, invalid_package_id) catch unreachable;
- if (comptime Environment.allow_assert) std.debug.assert(this.lockfile.buffers.dependencies.items.len == this.lockfile.buffers.resolutions.items.len);
- this.enqueueDependencyWithMainAndSuccessFn(
- index,
- &cloned_dependency,
- invalid_package_id,
- assignRootResolution,
- failRootResolution,
- ) catch |err| {
- return .{ .failure = err };
- };
+ builder.allocate() catch |err| return .{ .failure = err };
- const resolution_id = this.lockfile.buffers.resolutions.items[index];
+ const dep = dummy.cloneWithDifferentBuffers(name, version_buf, @TypeOf(&builder), &builder) catch unreachable;
+ builder.clamp();
+ const index = this.lockfile.buffers.dependencies.items.len;
+ this.lockfile.buffers.dependencies.append(this.allocator, dep) catch unreachable;
+ this.lockfile.buffers.resolutions.append(this.allocator, invalid_package_id) catch unreachable;
+ if (comptime Environment.allow_assert) std.debug.assert(this.lockfile.buffers.dependencies.items.len == this.lockfile.buffers.resolutions.items.len);
+ break :brk index;
+ });
- // check if we managed to synchronously resolve the dependency
- if (resolution_id == invalid_package_id) return .{ .pending = index };
+ if (this.lockfile.buffers.resolutions.items[dep_id] == invalid_package_id) {
+ this.enqueueDependencyWithMainAndSuccessFn(
+ dep_id,
+ &this.lockfile.buffers.dependencies.items[dep_id],
+ invalid_package_id,
+ assignRootResolution,
+ failRootResolution,
+ ) catch |err| {
+ return .{ .failure = err };
+ };
+ }
+
+ const resolution_id = switch (this.lockfile.buffers.resolutions.items[dep_id]) {
+ invalid_package_id => brk: {
+ this.drainDependencyList();
+
+ switch (this.options.log_level) {
+ inline else => |log_level| {
+ if (log_level.showProgress()) this.startProgressBarIfNone();
+ while (this.pending_tasks > 0) : (this.sleep()) {
+ this.runTasks(
+ void,
+ {},
+ .{
+ .onExtract = {},
+ .onResolve = {},
+ .onPackageManifestError = {},
+ .onPackageDownloadError = {},
+ },
+ log_level,
+ ) catch |err| {
+ return .{ .failure = err };
+ };
+ }
+ },
+ }
+
+ break :brk this.lockfile.buffers.resolutions.items[dep_id];
+ },
+ // we managed to synchronously resolve the dependency
+ else => |pkg_id| pkg_id,
+ };
- this.drainDependencyList();
return .{
.resolution = .{
.resolution = this.lockfile.packages.items(.resolution)[resolution_id],
@@ -1830,7 +1850,7 @@ pub const PackageManager = struct {
const offset = this.preinstall_state.items.len;
try this.preinstall_state.ensureTotalCapacity(this.allocator, count);
this.preinstall_state.expandToCapacity();
- std.mem.set(PreinstallState, this.preinstall_state.items[offset..], PreinstallState.unknown);
+ @memset(this.preinstall_state.items[offset..], PreinstallState.unknown);
}
pub fn setPreinstallState(this: *PackageManager, package_id: PackageID, lockfile: *Lockfile, value: PreinstallState) void {
@@ -2263,7 +2283,7 @@ pub const PackageManager = struct {
var iter = dir.iterate();
while (try iter.next()) |entry| {
- if (entry.kind != .Directory and entry.kind != .SymLink) continue;
+ if (entry.kind != .directory and entry.kind != .sym_link) continue;
const name = entry.name;
const sliced = SlicedString.init(name, name);
const parsed = Semver.Version.parse(sliced, allocator);
@@ -2305,7 +2325,7 @@ pub const PackageManager = struct {
};
// TODO: make this fewer passes
- std.sort.sort(
+ std.sort.block(
Semver.Version,
installed_versions.items,
@as([]const u8, tags_buf.items),
@@ -3546,7 +3566,34 @@ pub const PackageManager = struct {
return package;
},
- else => {},
+ else => if (data.json_len > 0) {
+ const package_json_source = logger.Source.initPathString(
+ data.json_path,
+ data.json_buf[0..data.json_len],
+ );
+ initializeStore();
+ const json = json_parser.ParseJSONUTF8(
+ &package_json_source,
+ manager.log,
+ manager.allocator,
+ ) catch |err| {
+ if (comptime log_level != .silent) {
+ const string_buf = manager.lockfile.buffers.string_bytes.items;
+ Output.prettyErrorln("<r><red>error:<r> expected package.json in <b>{any}<r> to be a JSON file: {s}\n", .{
+ resolution.fmtURL(&manager.options, string_buf),
+ @errorName(err),
+ });
+ }
+ Global.crash();
+ };
+ var builder = manager.lockfile.stringBuilder();
+ Lockfile.Package.Scripts.parseCount(manager.allocator, &builder, json);
+ builder.allocate() catch unreachable;
+ if (comptime Environment.allow_assert) std.debug.assert(package_id.* != invalid_package_id);
+ var scripts = manager.lockfile.packages.items(.scripts)[package_id.*];
+ scripts.parseAlloc(manager.allocator, &builder, json);
+ scripts.filled = true;
+ },
}
return null;
@@ -3752,7 +3799,7 @@ pub const PackageManager = struct {
if (comptime log_level.isVerbose()) {
Output.prettyError(" ", .{});
- Output.printElapsed(@intToFloat(f64, task.http.elapsed) / std.time.ns_per_ms);
+ Output.printElapsed(@floatFromInt(f64, task.http.elapsed) / std.time.ns_per_ms);
Output.prettyError("\n <d>Downloaded <r><green>{s}<r> versions\n", .{name.slice()});
Output.flush();
}
@@ -3886,7 +3933,7 @@ pub const PackageManager = struct {
if (comptime log_level.isVerbose()) {
Output.prettyError(" ", .{});
- Output.printElapsed(@floatCast(f64, @intToFloat(f64, task.http.elapsed) / std.time.ns_per_ms));
+ Output.printElapsed(@floatCast(f64, @floatFromInt(f64, task.http.elapsed) / std.time.ns_per_ms));
Output.prettyError(" <d>Downloaded <r><green>{s}<r> tarball\n", .{extract.name.slice()});
Output.flush();
}
@@ -3910,10 +3957,10 @@ pub const PackageManager = struct {
var task: Task = task_;
if (task.log.msgs.items.len > 0) {
- if (Output.enable_ansi_colors) {
- try task.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), true);
- } else {
- try task.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), false);
+ switch (Output.enable_ansi_colors) {
+ inline else => |enable_ansi_colors| {
+ try task.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), enable_ansi_colors);
+ },
}
}
@@ -4434,6 +4481,10 @@ pub const PackageManager = struct {
this.remote_package_features.peer_dependencies = save;
}
+ if (bun_install.exact) |exact| {
+ this.enable.exact_versions = exact;
+ }
+
if (bun_install.production) |production| {
if (production) {
this.local_package_features.dev_dependencies = false;
@@ -4443,6 +4494,12 @@ pub const PackageManager = struct {
}
}
+ if (bun_install.frozen_lockfile) |frozen_lockfile| {
+ if (frozen_lockfile) {
+ this.enable.frozen_lockfile = true;
+ }
+ }
+
if (bun_install.save_optional) |save| {
this.remote_package_features.optional_dependencies = save;
this.local_package_features.optional_dependencies = save;
@@ -4536,6 +4593,10 @@ pub const PackageManager = struct {
this.scope.url = URL.parse(cli.registry);
}
+ if (cli.exact) {
+ this.enable.exact_versions = true;
+ }
+
if (cli.token.len > 0) {
this.scope.token = cli.token;
}
@@ -4676,6 +4737,10 @@ pub const PackageManager = struct {
this.enable.frozen_lockfile = true;
}
+ if (cli.frozen_lockfile) {
+ this.enable.frozen_lockfile = true;
+ }
+
if (cli.force) {
this.enable.manifest_cache_control = false;
this.enable.force_install = true;
@@ -4718,6 +4783,8 @@ pub const PackageManager = struct {
force_save_lockfile: bool = false,
force_install: bool = false,
+
+ exact_versions: bool = false,
};
};
@@ -4765,6 +4832,7 @@ pub const PackageManager = struct {
updates: []UpdateRequest,
current_package_json: *JSAst.Expr,
dependency_list: string,
+ exact_versions: bool,
) !void {
const G = JSAst.G;
@@ -4814,7 +4882,7 @@ pub const PackageManager = struct {
var new_dependencies = try allocator.alloc(G.Property, dependencies.len + remaining - replacing);
bun.copy(G.Property, new_dependencies, dependencies);
- std.mem.set(G.Property, new_dependencies[dependencies.len..], G.Property{});
+ @memset(new_dependencies[dependencies.len..], G.Property{});
outer: for (updates) |*update| {
if (update.e_string != null) continue;
@@ -4952,9 +5020,14 @@ pub const PackageManager = struct {
if (update.e_string) |e_string| {
e_string.data = switch (update.resolution.tag) {
.npm => if (update.version.tag == .dist_tag and update.version.literal.isEmpty())
- std.fmt.allocPrint(allocator, "^{}", .{
- update.resolution.value.npm.version.fmt(update.version_buf),
- }) catch unreachable
+ switch (exact_versions) {
+ false => std.fmt.allocPrint(allocator, "^{}", .{
+ update.resolution.value.npm.version.fmt(update.version_buf),
+ }) catch unreachable,
+ true => std.fmt.allocPrint(allocator, "{}", .{
+ update.resolution.value.npm.version.fmt(update.version_buf),
+ }) catch unreachable,
+ }
else
null,
.uninitialized => switch (update.version.tag) {
@@ -5257,6 +5330,8 @@ pub const PackageManager = struct {
manager.progress.supports_ansi_escape_codes = Output.enable_ansi_colors_stderr;
manager.root_progress_node = manager.progress.start("", 0);
manager.root_download_node = manager.root_progress_node.start(ProgressStrings.download(), 0);
+ } else {
+ manager.options.log_level = .default_no_progress;
}
if (!manager.options.enable.cache) {
@@ -5298,36 +5373,31 @@ pub const PackageManager = struct {
// When using bun, we only do staleness checks once per day
) -| std.time.s_per_day;
- manager.lockfile = brk: {
+ if (root_dir.entries.hasComptimeQuery("bun.lockb")) {
var buf: [bun.MAX_PATH_BYTES]u8 = undefined;
+ var parts = [_]string{
+ "./bun.lockb",
+ };
+ var lockfile_path = Path.joinAbsStringBuf(
+ Fs.FileSystem.instance.top_level_dir,
+ &buf,
+ &parts,
+ .auto,
+ );
+ buf[lockfile_path.len] = 0;
+ var lockfile_path_z = buf[0..lockfile_path.len :0];
- if (root_dir.entries.hasComptimeQuery("bun.lockb")) {
- var parts = [_]string{
- "./bun.lockb",
- };
- var lockfile_path = Path.joinAbsStringBuf(
- Fs.FileSystem.instance.top_level_dir,
- &buf,
- &parts,
- .auto,
- );
- buf[lockfile_path.len] = 0;
- var lockfile_path_z = buf[0..lockfile_path.len :0];
-
- const result = manager.lockfile.loadFromDisk(
- allocator,
- log,
- lockfile_path_z,
- );
-
- if (result == .ok) {
- break :brk result.ok;
- }
+ switch (manager.lockfile.loadFromDisk(
+ allocator,
+ log,
+ lockfile_path_z,
+ )) {
+ .ok => |lockfile| manager.lockfile = lockfile,
+ else => try manager.lockfile.initEmpty(allocator),
}
-
+ } else {
try manager.lockfile.initEmpty(allocator);
- break :brk manager.lockfile;
- };
+ }
return manager;
}
@@ -5438,7 +5508,7 @@ pub const PackageManager = struct {
// create scope if specified
if (name[0] == '@') {
- if (std.mem.indexOfScalar(u8, name, '/')) |i| {
+ if (strings.indexOfChar(name, '/')) |i| {
node_modules.dir.makeDir(name[0..i]) catch |err| brk: {
if (err == error.PathAlreadyExists) break :brk;
if (manager.options.log_level != .silent)
@@ -5484,7 +5554,7 @@ pub const PackageManager = struct {
// Done
if (manager.options.log_level != .silent)
Output.prettyln(
- \\<r><green>Success!<r> Registered \"{[name]s}\"
+ \\<r><green>Success!<r> Registered "{[name]s}"
\\
\\To use {[name]s} in a project, run:
\\ <cyan>bun link {[name]s}<r>
@@ -5503,11 +5573,7 @@ pub const PackageManager = struct {
} else {
// bun link lodash
switch (manager.options.log_level) {
- .default => try updatePackageJSONAndInstallWithManager(ctx, manager, .link, .default),
- .verbose => try updatePackageJSONAndInstallWithManager(ctx, manager, .link, .verbose),
- .silent => try updatePackageJSONAndInstallWithManager(ctx, manager, .link, .silent),
- .default_no_progress => try updatePackageJSONAndInstallWithManager(ctx, manager, .link, .default_no_progress),
- .verbose_no_progress => try updatePackageJSONAndInstallWithManager(ctx, manager, .link, .verbose_no_progress),
+ inline else => |log_level| try updatePackageJSONAndInstallWithManager(ctx, manager, .link, log_level),
}
}
}
@@ -5649,6 +5715,7 @@ pub const PackageManager = struct {
clap.parseParam("--save Save to package.json") catch unreachable,
clap.parseParam("--dry-run Don't install anything") catch unreachable,
clap.parseParam("--lockfile <PATH> Store & load a lockfile at a specific filepath") catch unreachable,
+ clap.parseParam("--frozen-lockfile Disallow changes to lockfile") catch unreachable,
clap.parseParam("-f, --force Always request the latest versions from the registry & reinstall all dependencies") catch unreachable,
clap.parseParam("--cache-dir <PATH> Store & load cached data from a specific directory path") catch unreachable,
clap.parseParam("--no-cache Ignore manifest cache entirely") catch unreachable,
@@ -5680,6 +5747,7 @@ pub const PackageManager = struct {
const add_params = install_params_ ++ [_]ParamType{
clap.parseParam("-d, --development Add dependency to \"devDependencies\"") catch unreachable,
clap.parseParam("--optional Add dependency to \"optionalDependencies\"") catch unreachable,
+ clap.parseParam("--exact Add the exact version instead of the ^range") catch unreachable,
clap.parseParam("<POS> ... \"name\" or \"name@version\" of packages to install") catch unreachable,
};
@@ -5709,6 +5777,7 @@ pub const PackageManager = struct {
yarn: bool = false,
production: bool = false,
+ frozen_lockfile: bool = false,
no_save: bool = false,
dry_run: bool = false,
force: bool = false,
@@ -5729,6 +5798,8 @@ pub const PackageManager = struct {
no_optional: bool = false,
omit: Omit = Omit{},
+ exact: bool = false,
+
const Omit = struct {
dev: bool = false,
optional: bool = true,
@@ -5777,6 +5848,7 @@ pub const PackageManager = struct {
var cli = CommandLineArguments{};
cli.yarn = args.flag("--yarn");
cli.production = args.flag("--production");
+ cli.frozen_lockfile = args.flag("--frozen-lockfile");
cli.no_progress = args.flag("--no-progress");
cli.dry_run = args.flag("--dry-run");
cli.global = args.flag("--global");
@@ -5806,6 +5878,7 @@ pub const PackageManager = struct {
if (comptime subcommand == .add) {
cli.development = args.flag("--development");
cli.optional = args.flag("--optional");
+ cli.exact = args.flag("--exact");
}
// for (args.options("--omit")) |omit| {
@@ -6006,11 +6079,7 @@ pub const PackageManager = struct {
}
switch (manager.options.log_level) {
- .default => try updatePackageJSONAndInstallWithManager(ctx, manager, op, .default),
- .verbose => try updatePackageJSONAndInstallWithManager(ctx, manager, op, .verbose),
- .silent => try updatePackageJSONAndInstallWithManager(ctx, manager, op, .silent),
- .default_no_progress => try updatePackageJSONAndInstallWithManager(ctx, manager, op, .default_no_progress),
- .verbose_no_progress => try updatePackageJSONAndInstallWithManager(ctx, manager, op, .verbose_no_progress),
+ inline else => |log_level| try updatePackageJSONAndInstallWithManager(ctx, manager, op, log_level),
}
}
@@ -6140,13 +6209,12 @@ pub const PackageManager = struct {
) !void {
if (ctx.log.errors > 0) {
if (comptime log_level != .silent) {
- if (Output.enable_ansi_colors) {
- ctx.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), true) catch {};
- } else {
- ctx.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), false) catch {};
+ switch (Output.enable_ansi_colors) {
+ inline else => |enable_ansi_colors| {
+ ctx.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), enable_ansi_colors) catch {};
+ },
}
}
-
Global.crash();
}
@@ -6170,10 +6238,10 @@ pub const PackageManager = struct {
initializeStore();
var current_package_json = json_parser.ParseJSONUTF8(&package_json_source, ctx.log, manager.allocator) catch |err| {
- if (Output.enable_ansi_colors) {
- ctx.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), true) catch {};
- } else {
- ctx.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), false) catch {};
+ switch (Output.enable_ansi_colors) {
+ inline else => |enable_ansi_colors| {
+ ctx.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), enable_ansi_colors) catch {};
+ },
}
if (err == error.ParserError and ctx.log.errors > 0) {
@@ -6267,7 +6335,13 @@ pub const PackageManager = struct {
manager.to_remove = updates;
},
.link, .add, .update => {
- try PackageJSONEditor.edit(ctx.allocator, updates, &current_package_json, dependency_list);
+ try PackageJSONEditor.edit(
+ ctx.allocator,
+ updates,
+ &current_package_json,
+ dependency_list,
+ manager.options.enable.exact_versions,
+ );
manager.package_json_updates = updates;
},
else => {},
@@ -6300,7 +6374,7 @@ pub const PackageManager = struct {
// haha unless
defer if (auto_free) bun.default_allocator.free(old_ast_nodes);
- try installWithManager(ctx, manager, new_package_json_source, log_level);
+ try manager.installWithManager(ctx, new_package_json_source, log_level);
if (op == .update or op == .add or op == .link) {
for (manager.package_json_updates) |update| {
@@ -6320,7 +6394,13 @@ pub const PackageManager = struct {
return;
};
- try PackageJSONEditor.edit(ctx.allocator, updates, &current_package_json, dependency_list);
+ try PackageJSONEditor.edit(
+ ctx.allocator,
+ updates,
+ &current_package_json,
+ dependency_list,
+ manager.options.enable.exact_versions,
+ );
var buffer_writer_two = try JSPrinter.BufferWriter.init(ctx.allocator);
try buffer_writer_two.buffer.list.ensureTotalCapacity(ctx.allocator, new_package_json_source.len + 1);
buffer_writer_two.append_newline =
@@ -6372,7 +6452,7 @@ pub const PackageManager = struct {
var iter: std.fs.IterableDir.Iterator = node_modules_bin.iterate();
iterator: while (iter.next() catch null) |entry| {
switch (entry.kind) {
- std.fs.IterableDir.Entry.Kind.SymLink => {
+ std.fs.IterableDir.Entry.Kind.sym_link => {
// any symlinks which we are unable to open are assumed to be dangling
// note that using access won't work here, because access doesn't resolve symlinks
@@ -6422,11 +6502,7 @@ pub const PackageManager = struct {
};
try switch (manager.options.log_level) {
- .default => installWithManager(ctx, manager, package_json_contents, .default),
- .verbose => installWithManager(ctx, manager, package_json_contents, .verbose),
- .silent => installWithManager(ctx, manager, package_json_contents, .silent),
- .default_no_progress => installWithManager(ctx, manager, package_json_contents, .default_no_progress),
- .verbose_no_progress => installWithManager(ctx, manager, package_json_contents, .verbose_no_progress),
+ inline else => |log_level| manager.installWithManager(ctx, package_json_contents, log_level),
};
}
@@ -6547,7 +6623,7 @@ pub const PackageManager = struct {
if (folder.len == 0 or (folder.len == 1 and folder[0] == '.')) {
installer.cache_dir_subpath = ".";
} else {
- @memcpy(&this.folder_path_buf, folder.ptr, folder.len);
+ @memcpy(this.folder_path_buf[0..folder.len], folder);
this.folder_path_buf[folder.len] = 0;
installer.cache_dir_subpath = this.folder_path_buf[0..folder.len :0];
}
@@ -6567,7 +6643,7 @@ pub const PackageManager = struct {
if (folder.len == 0 or (folder.len == 1 and folder[0] == '.')) {
installer.cache_dir_subpath = ".";
} else {
- @memcpy(&this.folder_path_buf, folder.ptr, folder.len);
+ @memcpy(this.folder_path_buf[0..folder.len], folder);
this.folder_path_buf[folder.len] = 0;
installer.cache_dir_subpath = this.folder_path_buf[0..folder.len :0];
}
@@ -6580,10 +6656,10 @@ pub const PackageManager = struct {
const args = .{ name, @errorName(err) };
if (comptime log_level.showProgress()) {
- if (Output.enable_ansi_colors) {
- this.progress.log(comptime Output.prettyFmt(fmt, true), args);
- } else {
- this.progress.log(comptime Output.prettyFmt(fmt, false), args);
+ switch (Output.enable_ansi_colors) {
+ inline else => |enable_ansi_colors| {
+ this.progress.log(comptime Output.prettyFmt(fmt, enable_ansi_colors), args);
+ },
}
} else {
Output.prettyErrorln(fmt, args);
@@ -6608,16 +6684,16 @@ pub const PackageManager = struct {
const global_link_dir = this.manager.globalLinkDirPath() catch unreachable;
var ptr = &this.folder_path_buf;
var remain: []u8 = this.folder_path_buf[0..];
- @memcpy(ptr, global_link_dir.ptr, global_link_dir.len);
+ @memcpy(ptr[0..global_link_dir.len], global_link_dir);
remain = remain[global_link_dir.len..];
if (global_link_dir[global_link_dir.len - 1] != std.fs.path.sep) {
remain[0] = std.fs.path.sep;
remain = remain[1..];
}
- @memcpy(remain.ptr, folder.ptr, folder.len);
+ @memcpy(remain[0..folder.len], folder);
remain = remain[folder.len..];
remain[0] = 0;
- const len = @ptrToInt(remain.ptr) - @ptrToInt(ptr);
+ const len = @intFromPtr(remain.ptr) - @intFromPtr(ptr);
installer.cache_dir_subpath = this.folder_path_buf[0..len :0];
installer.cache_dir = directory;
}
@@ -6626,7 +6702,7 @@ pub const PackageManager = struct {
}
const needs_install = this.force_install or this.skip_verify_installed_version_number or !installer.verify(resolution, buf);
- this.summary.skipped += @as(u32, @boolToInt(!needs_install));
+ this.summary.skipped += @as(u32, @intFromBool(!needs_install));
if (needs_install) {
const result: PackageInstall.Result = switch (resolution.tag) {
@@ -6637,7 +6713,7 @@ pub const PackageManager = struct {
switch (result) {
.success => {
const is_duplicate = this.successfully_installed.isSet(package_id);
- this.summary.success += @as(u32, @boolToInt(!is_duplicate));
+ this.summary.success += @as(u32, @intFromBool(!is_duplicate));
this.successfully_installed.set(package_id);
if (comptime log_level.showProgress()) {
@@ -6686,10 +6762,10 @@ pub const PackageManager = struct {
const args = .{ alias, @errorName(err) };
if (comptime log_level.showProgress()) {
- if (Output.enable_ansi_colors) {
- this.progress.log(comptime Output.prettyFmt(fmt, true), args);
- } else {
- this.progress.log(comptime Output.prettyFmt(fmt, false), args);
+ switch (Output.enable_ansi_colors) {
+ inline else => |enable_ansi_colors| {
+ this.progress.log(comptime Output.prettyFmt(fmt, enable_ansi_colors), args);
+ },
}
} else {
Output.prettyErrorln(fmt, args);
@@ -6705,61 +6781,56 @@ pub const PackageManager = struct {
}
}
- var scripts = this.lockfile.packages.items(.scripts)[package_id];
- if (scripts.hasAny()) {
- var path_buf: [bun.MAX_PATH_BYTES]u8 = undefined;
- const path_str = Path.joinAbsString(
- bun.getFdPath(this.node_modules_folder.dir.fd, &path_buf) catch unreachable,
- &[_]string{destination_dir_subpath},
- .posix,
- );
+ if (resolution.tag == .workspace or this.lockfile.trusted_dependencies.contains(@truncate(u32, String.Builder.stringHash(name)))) {
+ var scripts = this.lockfile.packages.items(.scripts)[package_id];
+ if (scripts.hasAny()) {
+ var path_buf: [bun.MAX_PATH_BYTES]u8 = undefined;
+ const path_str = Path.joinAbsString(
+ bun.getFdPath(this.node_modules_folder.dir.fd, &path_buf) catch unreachable,
+ &[_]string{destination_dir_subpath},
+ .posix,
+ );
- scripts.enqueue(this.lockfile, buf, path_str);
- } else if (!scripts.filled and switch (resolution.tag) {
- .folder => Features.folder.scripts,
- .npm => Features.npm.scripts,
- .git, .github, .gitlab, .local_tarball, .remote_tarball => Features.tarball.scripts,
- .symlink => Features.link.scripts,
- .workspace => Features.workspace.scripts,
- else => false,
- }) {
- var path_buf: [bun.MAX_PATH_BYTES]u8 = undefined;
- const path_str = Path.joinAbsString(
- bun.getFdPath(this.node_modules_folder.dir.fd, &path_buf) catch unreachable,
- &[_]string{destination_dir_subpath},
- .posix,
- );
+ scripts.enqueue(this.lockfile, buf, path_str);
+ } else if (!scripts.filled) {
+ var path_buf: [bun.MAX_PATH_BYTES]u8 = undefined;
+ const path_str = Path.joinAbsString(
+ bun.getFdPath(this.node_modules_folder.dir.fd, &path_buf) catch unreachable,
+ &[_]string{destination_dir_subpath},
+ .posix,
+ );
- scripts.enqueueFromPackageJSON(
- this.manager.log,
- this.lockfile,
- this.node_modules_folder.dir,
- destination_dir_subpath,
- path_str,
- ) catch |err| {
- if (comptime log_level != .silent) {
- const fmt = "\n<r><red>error:<r> failed to parse life-cycle scripts for <b>{s}<r>: {s}\n";
- const args = .{ name, @errorName(err) };
+ scripts.enqueueFromPackageJSON(
+ this.manager.log,
+ this.lockfile,
+ this.node_modules_folder.dir,
+ destination_dir_subpath,
+ path_str,
+ ) catch |err| {
+ if (comptime log_level != .silent) {
+ const fmt = "\n<r><red>error:<r> failed to parse life-cycle scripts for <b>{s}<r>: {s}\n";
+ const args = .{ name, @errorName(err) };
- if (comptime log_level.showProgress()) {
- if (Output.enable_ansi_colors) {
- this.progress.log(comptime Output.prettyFmt(fmt, true), args);
+ if (comptime log_level.showProgress()) {
+ switch (Output.enable_ansi_colors) {
+ inline else => |enable_ansi_colors| {
+ this.progress.log(comptime Output.prettyFmt(fmt, enable_ansi_colors), args);
+ },
+ }
} else {
- this.progress.log(comptime Output.prettyFmt(fmt, false), args);
+ Output.prettyErrorln(fmt, args);
}
- } else {
- Output.prettyErrorln(fmt, args);
}
- }
- if (this.manager.options.enable.fail_early) {
- Global.exit(1);
- }
+ if (this.manager.options.enable.fail_early) {
+ Global.exit(1);
+ }
- Output.flush();
- this.summary.fail += 1;
- return;
- };
+ Output.flush();
+ this.summary.fail += 1;
+ return;
+ };
+ }
}
},
.fail => |cause| {
@@ -7014,7 +7085,10 @@ pub const PackageManager = struct {
) !PackageInstall.Summary {
var lockfile = lockfile_;
if (!this.options.local_package_features.dev_dependencies) {
- lockfile = try lockfile.maybeCloneFilteringRootPackages(this.options.local_package_features);
+ lockfile = try lockfile.maybeCloneFilteringRootPackages(
+ this.options.local_package_features,
+ this.options.enable.exact_versions,
+ );
}
var root_node: *Progress.Node = undefined;
@@ -7228,10 +7302,10 @@ pub const PackageManager = struct {
const args = .{ name, @errorName(err) };
if (comptime log_level.showProgress()) {
- if (Output.enable_ansi_colors) {
- this.progress.log(comptime Output.prettyFmt(fmt, true), args);
- } else {
- this.progress.log(comptime Output.prettyFmt(fmt, false), args);
+ switch (Output.enable_ansi_colors) {
+ inline else => |enable_ansi_colors| {
+ this.progress.log(comptime Output.prettyFmt(fmt, enable_ansi_colors), args);
+ },
}
} else {
Output.prettyErrorln(fmt, args);
@@ -7249,10 +7323,10 @@ pub const PackageManager = struct {
const args = .{lockfile.str(&names[package_id])};
if (comptime log_level.showProgress()) {
- if (Output.enable_ansi_colors) {
- this.progress.log(comptime Output.prettyFmt(fmt, true), args);
- } else {
- this.progress.log(comptime Output.prettyFmt(fmt, false), args);
+ switch (Output.enable_ansi_colors) {
+ inline else => |enable_ansi_colors| {
+ this.progress.log(comptime Output.prettyFmt(fmt, enable_ansi_colors), args);
+ },
}
} else {
Output.prettyErrorln(fmt, args);
@@ -7299,8 +7373,8 @@ pub const PackageManager = struct {
}
fn installWithManager(
- ctx: Command.Context,
manager: *PackageManager,
+ ctx: Command.Context,
package_json_contents: string,
comptime log_level: Options.LogLevel,
) !void {
@@ -7313,7 +7387,7 @@ pub const PackageManager = struct {
manager.options.lockfile_path,
)
else
- Lockfile.LoadFromDiskResult{ .not_found = {} };
+ .{ .not_found = {} };
var root = Lockfile.Package{};
var needs_new_lockfile = load_lockfile_result != .ok or (load_lockfile_result.ok.buffers.dependencies.items.len == 0 and manager.package_json_updates.len > 0);
// this defaults to false
@@ -7347,10 +7421,10 @@ pub const PackageManager = struct {
}
if (ctx.log.errors > 0) {
- if (Output.enable_ansi_colors) {
- try manager.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), true);
- } else {
- try manager.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), false);
+ switch (Output.enable_ansi_colors) {
+ inline else => |enable_ansi_colors| {
+ try manager.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), enable_ansi_colors);
+ },
}
}
Output.flush();
@@ -7390,7 +7464,7 @@ pub const PackageManager = struct {
);
}
var mapping = try manager.lockfile.allocator.alloc(PackageID, maybe_root.dependencies.len);
- std.mem.set(PackageID, mapping, invalid_package_id);
+ @memset(mapping, invalid_package_id);
manager.summary = try Package.Diff.generate(
ctx.allocator,
@@ -7443,8 +7517,8 @@ pub const PackageManager = struct {
var resolutions = manager.lockfile.buffers.resolutions.items.ptr[off .. off + len];
// It is too easy to accidentally undefined memory
- std.mem.set(PackageID, resolutions, invalid_package_id);
- std.mem.set(Dependency, dependencies, Dependency{});
+ @memset(resolutions, invalid_package_id);
+ @memset(dependencies, Dependency{});
manager.lockfile.buffers.dependencies.items = manager.lockfile.buffers.dependencies.items.ptr[0 .. off + len];
manager.lockfile.buffers.resolutions.items = manager.lockfile.buffers.resolutions.items.ptr[0 .. off + len];
@@ -7554,10 +7628,10 @@ pub const PackageManager = struct {
}
}
- if (Output.enable_ansi_colors) {
- try manager.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), true);
- } else {
- try manager.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), false);
+ switch (Output.enable_ansi_colors) {
+ inline else => |enable_ansi_colors| {
+ try manager.log.printForLogLevelWithEnableAnsiColors(Output.errorWriter(), enable_ansi_colors);
+ },
}
if (manager.log.hasErrors()) Global.crash();
@@ -7565,7 +7639,11 @@ pub const PackageManager = struct {
const needs_clean_lockfile = had_any_diffs or needs_new_lockfile or manager.package_json_updates.len > 0;
var did_meta_hash_change = needs_clean_lockfile;
if (needs_clean_lockfile) {
- manager.lockfile = try manager.lockfile.cleanWithLogger(manager.package_json_updates, manager.log);
+ manager.lockfile = try manager.lockfile.cleanWithLogger(
+ manager.package_json_updates,
+ manager.log,
+ manager.options.enable.exact_versions,
+ );
}
if (manager.lockfile.packages.len > 0) {
@@ -7718,10 +7796,10 @@ pub const PackageManager = struct {
.successfully_installed = install_summary.successfully_installed,
};
- if (Output.enable_ansi_colors) {
- try Lockfile.Printer.Tree.print(&printer, Output.WriterType, Output.writer(), true);
- } else {
- try Lockfile.Printer.Tree.print(&printer, Output.WriterType, Output.writer(), false);
+ switch (Output.enable_ansi_colors) {
+ inline else => |enable_ansi_colors| {
+ try Lockfile.Printer.Tree.print(&printer, Output.WriterType, Output.writer(), enable_ansi_colors);
+ },
}
if (!did_meta_hash_change) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-26 07:47:55 +0000