1 files changed, 55 insertions, 1 deletions

diff --git a/src/install/npm.zig b/src/install/npm.zig
index fec545b0c..24e631836 100644
--- a/src/install/npm.zig
+++ b/src/install/npm.zig
@@ -81,6 +81,7 @@ pub const Registry = struct {
 
             var url = URL.parse(registry.url);
             var auth: string = "";
+            var needs_normalize = false;
 
             if (registry.token.len == 0) {
                 outer: {
@@ -90,10 +91,12 @@ pub const Registry = struct {
                             url.pathname = pathname;
                             url.path = pathname;
                         }
-
+                        var needs_to_check_slash = true;
                         while (strings.lastIndexOfChar(pathname, ':')) |colon| {
                             var segment = pathname[colon + 1 ..];
                             pathname = pathname[0..colon];
+                            needs_to_check_slash = false;
+                            needs_normalize = true;
                             if (pathname.len > 1 and pathname[pathname.len - 1] == '/') {
                                 pathname = pathname[0 .. pathname.len - 1];
                             }
@@ -124,6 +127,47 @@ pub const Registry = struct {
                                 continue;
                             }
                         }
+
+                        // In this case, there is only one.
+                        if (needs_to_check_slash) {
+                            if (strings.lastIndexOfChar(pathname, '/')) |last_slash| {
+                                var remain = pathname[last_slash + 1 ..];
+                                if (strings.indexOfChar(remain, '=')) |eql_i| {
+                                    const segment = remain[0..eql_i];
+                                    var value = remain[eql_i + 1 ..];
+
+                                    // https://github.com/yarnpkg/yarn/blob/6db39cf0ff684ce4e7de29669046afb8103fce3d/src/registries/npm-registry.js#L364
+                                    // Bearer Token
+                                    if (strings.eqlComptime(segment, "_authToken")) {
+                                        registry.token = value;
+                                        pathname = pathname[0 .. last_slash + 1];
+                                        needs_normalize = true;
+                                        break :outer;
+                                    }
+
+                                    if (strings.eqlComptime(segment, "_auth")) {
+                                        auth = value;
+                                        pathname = pathname[0 .. last_slash + 1];
+                                        needs_normalize = true;
+                                        break :outer;
+                                    }
+
+                                    if (strings.eqlComptime(segment, "username")) {
+                                        registry.username = value;
+                                        pathname = pathname[0 .. last_slash + 1];
+                                        needs_normalize = true;
+                                        break :outer;
+                                    }
+
+                                    if (strings.eqlComptime(segment, "_password")) {
+                                        registry.password = value;
+                                        pathname = pathname[0 .. last_slash + 1];
+                                        needs_normalize = true;
+                                        break :outer;
+                                    }
+                                }
+                            }
+                        }
                     }
 
                     registry.username = env.getAuto(registry.username);
@@ -144,6 +188,16 @@ pub const Registry = struct {
 
             registry.token = env.getAuto(registry.token);
 
+            if (needs_normalize) {
+                url = URL.parse(
+                    try std.fmt.allocPrint(allocator, "{s}://{}/{s}/", .{
+                        url.displayProtocol(),
+                        url.displayHost(),
+                        strings.trim(url.pathname, "/"),
+                    }),
+                );
+            }
+
             return Scope{ .name = name, .url = url, .token = registry.token, .auth = auth };
         }
     };