Merge pull request #801 from githru/bugfix/#798_azure-devops-url-parsing-error

[vscode] Azure DevOps URL 파싱 지원 및 getRepo 함수 개선

Author: SingTheCode

packages/vscode/src/test/utils/getRepo.spec.ts

@@ -0,0 +1,121 @@
+import { getRepo } from "../../utils/git.util";
+
+describe("getRepo", () => {
+  describe("Valid Git URL formats", () => {
+    it("HTTPS URL with .git extension should parse correctly", () => {
+      const url = "https://github.com/owner/repo.git";
+      const result = getRepo(url);
+
+      expect(result).toEqual({
+        owner: "owner",
+        repo: "repo",
+      });
+    });
+
+    it("SSH URL with .git extension should parse correctly", () => {
+      const url = "[email protected]:owner/repo.git";
+      const result = getRepo(url);
+
+      expect(result).toEqual({
+        owner: "owner",
+        repo: "repo",
+      });
+    });
+
+    it("HTTPS URL without .git extension should parse correctly", () => {
+      const url = "https://github.com/owner/repo";
+      const result = getRepo(url);
+
+      expect(result).toEqual({
+        owner: "owner",
+        repo: "repo",
+      });
+    });
+
+    it("SSH URL without .git extension should parse correctly", () => {
+      const url = "[email protected]:owner/repo";
+      const result = getRepo(url);
+
+      expect(result).toEqual({
+        owner: "owner",
+        repo: "repo",
+      });
+    });
+
+    it("HTTPS URL with username should parse correctly", () => {
+      const url = "https://[email protected]/owner/repo.git";
+      const result = getRepo(url);
+
+      expect(result).toEqual({
+        owner: "owner",
+        repo: "repo",
+      });
+    });
+
+    it("URL with trailing slash should parse correctly", () => {
+      const url = "https://github.com/owner/repo/";
+      const result = getRepo(url);
+
+      expect(result).toEqual({
+        owner: "owner",
+        repo: "repo",
+      });
+    });
+
+    it("Complex repo name with hyphens should parse correctly", () => {
+      const url = "https://github.com/githru/githru-vscode-ext.git";
+      const result = getRepo(url);
+
+      expect(result).toEqual({
+        owner: "githru",
+        repo: "githru-vscode-ext",
+      });
+    });
+
+    it("Azure DevOps URL should parse correctly", () => {
+      const url = "https://[email protected]/organization/organization-sub-name/_git/repository-name";
+      const result = getRepo(url);
+
+      expect(result).toEqual({
+        owner: "organization",
+        repo: "repository-name",
+      });
+    });
+
+    it("Azure DevOps URL without username should parse correctly", () => {
+      const url = "https://dev.azure.com/organization/organization-sub-name/_git/repository-name";
+      const result = getRepo(url);
+
+      expect(result).toEqual({
+        owner: "organization",
+        repo: "repository-name",
+      });
+    });
+  });
+
+  describe("Invalid Git URL formats", () => {
+    it("should throw error for invalid URL format", () => {
+      const invalidUrl = "invalid-url-format";
+
+      expect(() => getRepo(invalidUrl)).toThrow(
+        'Invalid Git remote config format: "invalid-url-format". Expected format: [https?://|git@]github.com/owner/repo[.git] or https://[email protected]/organization/project/_git/repository-name'
+      );
+    });
+
+    it("should throw error for non-GitHub URL", () => {
+      const nonGithubUrl = "https://gitlab.com/owner/repo.git";
+
+      expect(() => getRepo(nonGithubUrl)).toThrow(
+        'Invalid Git remote config format: "https://gitlab.com/owner/repo.git". Expected format: [https?://|git@]github.com/owner/repo[.git] or https://[email protected]/organization/project/_git/repository-name'
+      );
+    });
+
+    it("should throw error for URL without owner/repo", () => {
+      const incompleteUrl = "https://github.com/";
+
+      expect(() => getRepo(incompleteUrl)).toThrow(
+        'Invalid Git remote config format: "https://github.com/". Expected format: [https?://|git@]github.com/owner/repo[.git] or https://[email protected]/organization/project/_git/repository-name'
+      );
+    });
+  });
+});

packages/vscode/src/utils/git.util.ts

@@ -288,19 +288,33 @@ export async function getGitConfig(
 }
 
 export const getRepo = (gitRemoteConfig: string) => {
-  const gitRemoteConfigPattern =
-    /(?:https?|git)(?::\/\/(?:\w+@)?|@)(?:github\.com)(?:\/|:)(?:(?<owner>[^/]+?)\/(?<repo>[^/.]+))(?:\.git|\/)?(\S*)$/m;
-  const gitRemote = gitRemoteConfig.match(gitRemoteConfigPattern)?.groups;
-  if (!gitRemote) {
-    throw new Error("git remote config should be: [https?://|git@]${domain}/${owner}/${repo}.git");
+  const gitHubPattern =
+    /(?:https?|git)(?::\/\/(?:\w+@)?|@)(?:github\.com)(?:\/|:)(?:(?<owner>[^/]+?)\/(?<repo>[^/]+?))(?:\.git|\/)?$/m;
+  const azureDevOpsPattern =
+    /https:\/\/(?:\w+@)?dev\.azure\.com\/(?<owner>[^/]+?)\/(?<project>[^/]+?)\/_git\/(?<repo>[^/]+?)(?:\/)?$/m;
+  const patterns = [gitHubPattern, azureDevOpsPattern];
+
+  let gitRemote: { owner: string; repo: string } | null = null;
+
+  for (const pattern of patterns) {
+    const match = gitRemoteConfig.match(pattern);
+    if (!match?.groups) continue;
+
+    const { owner, repo } = match.groups;
+    if (owner && repo) {
+      const repoWithoutGit = repo.replace(/\.git$/, "");
+      gitRemote = { owner, repo: repoWithoutGit };
+      break;
+    }
   }
 
-  const { owner, repo } = gitRemote;
-  if (!owner || !repo) {
-    throw new Error("no owner/repo");
+  if (!gitRemote) {
+    throw new Error(
+      `Invalid Git remote config format: "${gitRemoteConfig}". Expected format: [https?://|git@]github.com/owner/repo[.git] or https://[email protected]/organization/project/_git/repository-name`
+    );
   }
 
-  return { owner, repo };
+  return gitRemote;
 };
 
 export async function getBranches(