parse `git+https://github.com/` as GitHub URLs (#1926)

fixes #1921

4 files changed, 222 insertions, 33 deletions

diff --git a/src/install/dependency.zig b/src/install/dependency.zig
index 600a90373..98a62ac87 100644
--- a/src/install/dependency.zig
+++ b/src/install/dependency.zig
@@ -377,20 +377,43 @@ pub const Version = struct {
                 // git://user@example.com/repo.git
                 'g' => {
                     if (strings.hasPrefixComptime(dependency, "git")) {
-                        const url = dependency["git".len..];
+                        var url = dependency["git".len..];
                         if (url.len > 2) {
                             switch (url[0]) {
                                 ':' => {
                                     if (strings.hasPrefixComptime(url, "://")) return .git;
                                 },
                                 '+' => {
-                                    if (strings.hasPrefixComptime(url, "+ssh") or
-                                        strings.hasPrefixComptime(url, "+file") or
-                                        strings.hasPrefixComptime(url, "+http") or
-                                        strings.hasPrefixComptime(url, "+https"))
+                                    if (strings.hasPrefixComptime(url, "+ssh:") or
+                                        strings.hasPrefixComptime(url, "+file:"))
                                     {
                                         return .git;
                                     }
+                                    if (strings.hasPrefixComptime(url, "+http")) {
+                                        url = url["+http".len..];
+                                        if (url.len > 2 and switch (url[0]) {
+                                            ':' => brk: {
+                                                if (strings.hasPrefixComptime(url, "://")) {
+                                                    url = url["://".len..];
+                                                    break :brk true;
+                                                }
+                                                break :brk false;
+                                            },
+                                            's' => brk: {
+                                                if (strings.hasPrefixComptime(url, "s://")) {
+                                                    url = url["s://".len..];
+                                                    break :brk true;
+                                                }
+                                                break :brk false;
+                                            },
+                                            else => false,
+                                        }) {
+                                            if (strings.hasPrefixComptime(url, "github.com/")) {
+                                                if (isGitHubRepoPath(url["github.com/".len..])) return .github;
+                                            }
+                                            return .git;
+                                        }
+                                    }
                                 },
                                 'h' => {
                                     if (strings.hasPrefixComptime(url, "hub:")) {
@@ -666,25 +689,30 @@ pub fn parseWithTag(
             var input = dependency;
             if (strings.hasPrefixComptime(input, "github:")) {
                 input = input["github:".len..];
-            } else if (strings.hasPrefixComptime(input, "http")) {
-                var url = input["http".len..];
-                if (url.len > 2) {
-                    switch (url[0]) {
-                        ':' => {
-                            if (strings.hasPrefixComptime(url, "://")) {
-                                url = url["://".len..];
-                            }
-                        },
-                        's' => {
-                            if (strings.hasPrefixComptime(url, "s://")) {
-                                url = url["s://".len..];
-                            }
-                        },
-                        else => {},
-                    }
-                    if (strings.hasPrefixComptime(url, "github.com/")) {
-                        input = url["github.com/".len..];
-                        from_url = true;
+            } else {
+                if (strings.hasPrefixComptime(input, "git+")) {
+                    input = input["git+".len..];
+                }
+                if (strings.hasPrefixComptime(input, "http")) {
+                    var url = input["http".len..];
+                    if (url.len > 2) {
+                        switch (url[0]) {
+                            ':' => {
+                                if (strings.hasPrefixComptime(url, "://")) {
+                                    url = url["://".len..];
+                                }
+                            },
+                            's' => {
+                                if (strings.hasPrefixComptime(url, "s://")) {
+                                    url = url["s://".len..];
+                                }
+                            },
+                            else => {},
+                        }
+                        if (strings.hasPrefixComptime(url, "github.com/")) {
+                            input = url["github.com/".len..];
+                            from_url = true;
+                        }
                     }
                 }
             }
diff --git a/src/install/install.zig b/src/install/install.zig
index 3a165d234..585243163 100644
--- a/src/install/install.zig
+++ b/src/install/install.zig
@@ -5340,10 +5340,12 @@ pub const PackageManager = struct {
                     };
                 }
                 switch (version.tag) {
-                    .dist_tag, .npm => version.literal = if (strings.lastIndexOfChar(value, '@')) |at|
-                        String.init(value, value[at + 1 ..])
-                    else
-                        String.from(""),
+                    .dist_tag, .npm => version.literal = brk: {
+                        if (strings.lastIndexOfChar(value, '@')) |at| {
+                            if (at >= "npm:@".len) break :brk String.init(value, value[at + 1 ..]);
+                        }
+                        break :brk String.from("");
+                    },
                     else => {},
                 }
 
diff --git a/test/bun.js/install/bun-add.test.ts b/test/bun.js/install/bun-add.test.ts
index 42affcb70..cabc7820c 100644
--- a/test/bun.js/install/bun-add.test.ts
+++ b/test/bun.js/install/bun-add.test.ts
@@ -156,6 +156,102 @@ it("should reject invalid path without segfault", async () => {
   });
 });
 
+it("should handle semver-like names", async() => {
+  const urls: string[] = [];
+  setHandler(async (request) => {
+    expect(request.method).toBe("GET");
+    expect(request.headers.get("accept")).toBe(
+      "application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*",
+    );
+    expect(request.headers.get("npm-auth-type")).toBe(null);
+    expect(await request.text()).toBe("");
+    urls.push(request.url);
+    return new Response("not to be found", { status: 404 });
+  });
+  await writeFile(join(package_dir, "package.json"), JSON.stringify({
+    name: "foo",
+    version: "0.0.1",
+  }));
+  const { stdout, stderr, exited } = spawn({
+    cmd: [
+      bunExe(),
+      "add",
+      "1.2.3",
+      "--config",
+      import.meta.dir + "/basic.toml",
+    ],
+    cwd: package_dir,
+    stdout: null,
+    stdin: "pipe",
+    stderr: "pipe",
+    env,
+  });
+  expect(stderr).toBeDefined();
+  const err = await new Response(stderr).text();
+  expect(err.split(/\r?\n/)).toContain(
+    'error: package "1.2.3" not found localhost/1.2.3 404',
+  );
+  expect(stdout).toBeDefined();
+  expect(await new Response(stdout).text()).toBe("");
+  expect(await exited).toBe(1);
+  expect(urls).toEqual([`${root_url}/1.2.3`]);
+  expect(requested).toBe(1);
+  try {
+    await access(join(package_dir, "bun.lockb"));
+    expect(() => {}).toThrow();
+  } catch (err: any) {
+    expect(err.code).toBe("ENOENT");
+  }
+});
+
+it("should handle @scoped names", async() => {
+  const urls: string[] = [];
+  setHandler(async (request) => {
+    expect(request.method).toBe("GET");
+    expect(request.headers.get("accept")).toBe(
+      "application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*",
+    );
+    expect(request.headers.get("npm-auth-type")).toBe(null);
+    expect(await request.text()).toBe("");
+    urls.push(request.url);
+    return new Response("not to be found", { status: 404 });
+  });
+  await writeFile(join(package_dir, "package.json"), JSON.stringify({
+    name: "foo",
+    version: "0.0.1",
+  }));
+  const { stdout, stderr, exited } = spawn({
+    cmd: [
+      bunExe(),
+      "add",
+      "@bar/baz",
+      "--config",
+      import.meta.dir + "/basic.toml",
+    ],
+    cwd: package_dir,
+    stdout: null,
+    stdin: "pipe",
+    stderr: "pipe",
+    env,
+  });
+  expect(stderr).toBeDefined();
+  const err = await new Response(stderr).text();
+  expect(err.split(/\r?\n/)).toContain(
+    'error: package "@bar/baz" not found localhost/@bar/baz 404',
+  );
+  expect(stdout).toBeDefined();
+  expect(await new Response(stdout).text()).toBe("");
+  expect(await exited).toBe(1);
+  expect(urls).toEqual([`${root_url}/@bar/baz`]);
+  expect(requested).toBe(1);
+  try {
+    await access(join(package_dir, "bun.lockb"));
+    expect(() => {}).toThrow();
+  } catch (err: any) {
+    expect(err.code).toBe("ENOENT");
+  }
+});
+
 it("should add dependency with specified semver", async () => {
   const urls: string[] = [];
   setHandler(dummyRegistry(urls, "0.0.3", {
diff --git a/test/bun.js/install/bun-install.test.ts b/test/bun.js/install/bun-install.test.ts
index 2bf59211e..7f5fe656e 100644
--- a/test/bun.js/install/bun-install.test.ts
+++ b/test/bun.js/install/bun-install.test.ts
@@ -1292,7 +1292,7 @@ it("should handle GitHub URL in dependencies (user/repo)", async () => {
     "test",
     "tools",
   ]);
-  var package_json = await file(
+  const package_json = await file(
     join(package_dir, "node_modules", "uglify", "package.json"),
   ).json();
   expect(package_json.name).toBe("uglify-js");
@@ -1376,7 +1376,7 @@ it("should handle GitHub URL in dependencies (user/repo#commit-id)", async () =>
     "test",
     "tools",
   ]);
-  var package_json = await file(
+  const package_json = await file(
     join(package_dir, "node_modules", "uglify", "package.json"),
   ).json();
   expect(package_json.name).toBe("uglify-js");
@@ -1461,7 +1461,7 @@ it("should handle GitHub URL in dependencies (user/repo#tag)", async () => {
     "test",
     "tools",
   ]);
-  var package_json = await file(
+  const package_json = await file(
     join(package_dir, "node_modules", "uglify", "package.json"),
   ).json();
   expect(package_json.name).toBe("uglify-js");
@@ -1546,7 +1546,7 @@ it("should handle GitHub URL in dependencies (github:user/repo#tag)", async () =
     "test",
     "tools",
   ]);
-  var package_json = await file(
+  const package_json = await file(
     join(package_dir, "node_modules", "uglify", "package.json"),
   ).json();
   expect(package_json.name).toBe("uglify-js");
@@ -1610,7 +1610,70 @@ it("should handle GitHub URL in dependencies (https://github.com/user/repo.git)"
     "test",
     "tools",
   ]);
-  var package_json = await file(
+  const package_json = await file(
+    join(package_dir, "node_modules", "uglify", "package.json"),
+  ).json();
+  expect(package_json.name).toBe("uglify-js");
+  await access(join(package_dir, "bun.lockb"));
+});
+
+it("should handle GitHub URL in dependencies (git+https://github.com/user/repo.git)", async () => {
+  const urls: string[] = [];
+  setHandler(dummyRegistry(urls));
+  await writeFile(
+    join(package_dir, "package.json"),
+    JSON.stringify({
+      name: "Foo",
+      version: "0.0.1",
+      dependencies: {
+        uglify: "git+https://github.com/mishoo/UglifyJS.git",
+      },
+    }),
+  );
+  const { stdout, stderr, exited } = spawn({
+    cmd: [bunExe(), "install", "--config", import.meta.dir + "/basic.toml"],
+    cwd: package_dir,
+    stdout: null,
+    stdin: "pipe",
+    stderr: "pipe",
+    env,
+  });
+  expect(stderr).toBeDefined();
+  const err = await new Response(stderr).text();
+  expect(err).toContain("Saved lockfile");
+  expect(stdout).toBeDefined();
+  let out = await new Response(stdout).text();
+  out = out.replace(/\s*\[[0-9\.]+ms\]\s*$/, "");
+  out = out.replace(/(github:[^#]+)#[a-f0-9]+/, "$1");
+  expect(out.split(/\r?\n/)).toEqual([
+    " + uglify@github:mishoo/UglifyJS",
+    "",
+    " 1 packages installed",
+  ]);
+  expect(await exited).toBe(0);
+  expect(urls).toEqual([]);
+  expect(requested).toBe(0);
+  expect(await readdirSorted(join(package_dir, "node_modules"))).toEqual([
+    ".bin",
+    ".cache",
+    "uglify",
+  ]);
+  expect(await readdirSorted(join(package_dir, "node_modules", ".bin"))).toEqual(["uglifyjs"]);
+  expect(await readdirSorted(join(package_dir, "node_modules", "uglify"))).toEqual([
+    ".bun-tag",
+    ".gitattributes",
+    ".github",
+    ".gitignore",
+    "CONTRIBUTING.md",
+    "LICENSE",
+    "README.md",
+    "bin",
+    "lib",
+    "package.json",
+    "test",
+    "tools",
+  ]);
+  const package_json = await file(
     join(package_dir, "node_modules", "uglify", "package.json"),
   ).json();
   expect(package_json.name).toBe("uglify-js");