diff options
| author |  Alex Lam S.L <alexlamsl@gmail.com>
| 2023-07-18 02:06:31 +0300 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-07-17 16:06:31 -0700 |
| commit | 9f031b36425580350f35fcd1082ad9445cab163e (patch) | |
| tree | f9b8c892e592aacce0e27346f2ef228e9d061892 /src | |
| parent | ca3b7fa3c9179a764ce7a7bf6c52de3b3cd1f232 (diff) | |
| download | bun-9f031b36425580350f35fcd1082ad9445cab163e.tar.gz bun-9f031b36425580350f35fcd1082ad9445cab163e.tar.zst bun-9f031b36425580350f35fcd1082ad9445cab163e.zip | |
[install] handle duplicated workspace declarations gracefully (#3662)
fixes #3644
Diffstat (limited to 'src')
| -rw-r--r-- | src/install/lockfile.zig | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/src/install/lockfile.zig b/src/install/lockfile.zig index 843381228..202cfddc0 100644 --- a/src/install/lockfile.zig +++ b/src/install/lockfile.zig @@ -2533,7 +2533,7 @@ pub const Package = extern struct { dependency_version.value.workspace = path; } else { const workspace = dependency_version.value.workspace.slice(buf); - const path = string_builder.append( + var path = string_builder.append( String, if (strings.eqlComptime(workspace, "*")) "*" else Path.relative( FileSystem.instance.top_level_dir, @@ -2547,13 +2547,32 @@ pub const Package = extern struct { ), ), ); - dependency_version.value.workspace = path; + defer dependency_version.value.workspace = path; var workspace_entry = try lockfile.workspace_paths.getOrPut(allocator, @truncate(u32, external_name.hash)); if (workspace_entry.found_existing) { - log.addErrorFmt(&source, logger.Loc.Empty, allocator, "Workspace name \"{s}\" already exists", .{ - external_name.slice(buf), - }) catch {}; - return error.InstallFailed; + const old_path = workspace_entry.value_ptr.*; + + if (strings.eqlComptime(workspace, "*")) { + path = old_path; + return null; + } else if (strings.eqlComptime(old_path.slice(buf), "*")) brk: { + workspace_entry.value_ptr.* = path; + for (package_dependencies[0..dependencies_count]) |*package_dep| { + if (package_dep.name_hash == external_name.hash) { + if (package_dep.version.tag != .workspace) break :brk; + package_dep.version.value.workspace = path; + return null; + } + } + return error.InstallFailed; + } else if (strings.eql(old_path.slice(buf), path.slice(buf))) { + return null; + } else { + log.addErrorFmt(&source, logger.Loc.Empty, allocator, "Workspace name \"{s}\" already exists", .{ + external_name.slice(buf), + }) catch {}; + return error.InstallFailed; + } } workspace_entry.value_ptr.* = path; }, |