Merge pull request #65 from DaanIhomer/fix-gl-group-bug

Fix gl group bug

Author: inesgomas

src/common/parseGitRemote.ts

@@ -4,12 +4,32 @@ const validProviders: Record<string, 'gh' | 'gl' | 'bb'> = {
   bitbucket: 'bb',
 }
 
+interface GitRemoteInfo {
+  provider: 'gh' | 'gl' | 'bb'
+  organization: string
+  repository: string
+  originalRepository?: string
+}
+
+/**
+ * Normalize repository name based on provider
+ * For GitLab, extracts the last part of group/subgroup/project path
+ */
+const normalizeRepositoryName = (provider: 'gh' | 'gl' | 'bb', repository: string): string => {
+  if (provider === 'gl') {
+    // For GitLab, take the last part of the path
+    const parts = repository.split('/')
+    return parts[parts.length - 1]
+  }
+  return repository
+}
+
 /**
  * Parse a git remote URL into its component parts
  * @param remoteUrl
- * @returns
+ * @returns GitRemoteInfo with normalized repository name and original if different
  */
-export const parseGitRemote = (remoteUrl: string) => {
+export const parseGitRemote = (remoteUrl: string): GitRemoteInfo => {
   const pattern = /^.*(github|gitlab|bitbucket)\.(?:com|org)[:|/](.+?)\/(.+?)(\.git)?$/
   const match = remoteUrl.match(pattern)
 
@@ -19,17 +39,20 @@ export const parseGitRemote = (remoteUrl: string) => {
 
   const providerName = match[1]
   const organization = match[2]
-  const repository = match[3]
+  const originalRepository = match[3]
 
   const provider = validProviders[providerName]
 
   if (!provider) {
     throw new Error(`Invalid provider: ${providerName}`)
   }
 
+  const repository = normalizeRepositoryName(provider, originalRepository)
+
   return {
     provider,
     organization,
     repository,
+    ...(repository !== originalRepository ? { originalRepository } : {}),
   }
 }

src/test/suite/common/parseGitRemote.test.ts

@@ -5,6 +5,8 @@ const GITHUB_SSH_REMOTE_MOCK = 'git@github.com:organization/repository.git'
 const GITHUB_HTTPS_REMOTE_MOCK = 'https://github.com/organization/repository.git'
 const GITLAB_SSH_REMOTE_MOCK = 'git@gitlab.com:organization/repository.git'
 const GITLAB_HTTPS_REMOTE_MOCK = 'https://gitlab.com/organization/repository.git'
+const GITLAB_GROUP_SSH_REMOTE_MOCK = 'git@gitlab.com:group/subgroup/repository.git'
+const GITLAB_GROUP_HTTPS_REMOTE_MOCK = 'https://gitlab.com/group/subgroup/repository.git'
 const BITBUCKET_SSH_REMOTE_MOCK = 'git@bitbucket.org:organization/repository.git'
 const BITBUCKET_HTTPS_REMOTE_MOCK = 'https://user@bitbucket.org/organization/repository.git'
 
@@ -15,6 +17,7 @@ suite('parseGitRemote', () => {
     assert.strictEqual(parsed.provider, 'gh')
     assert.strictEqual(parsed.organization, 'organization')
     assert.strictEqual(parsed.repository, 'repository')
+    assert.strictEqual(parsed.originalRepository, undefined)
   })
 
   test('parses GitHub HTTPS remote format', () => {
@@ -23,6 +26,7 @@ suite('parseGitRemote', () => {
     assert.strictEqual(parsed.provider, 'gh')
     assert.strictEqual(parsed.organization, 'organization')
     assert.strictEqual(parsed.repository, 'repository')
+    assert.strictEqual(parsed.originalRepository, undefined)
   })
 
   test('parses GitLab SSH remote format', () => {
@@ -31,6 +35,7 @@ suite('parseGitRemote', () => {
     assert.strictEqual(parsed.provider, 'gl')
     assert.strictEqual(parsed.organization, 'organization')
     assert.strictEqual(parsed.repository, 'repository')
+    assert.strictEqual(parsed.originalRepository, undefined)
   })
 
   test('parses GitLab HTTPS remote format', () => {
@@ -39,6 +44,25 @@ suite('parseGitRemote', () => {
     assert.strictEqual(parsed.provider, 'gl')
     assert.strictEqual(parsed.organization, 'organization')
     assert.strictEqual(parsed.repository, 'repository')
+    assert.strictEqual(parsed.originalRepository, undefined)
+  })
+
+  test('parses GitLab group/subgroup SSH remote format', () => {
+    const parsed = parseGitRemote(GITLAB_GROUP_SSH_REMOTE_MOCK)
+
+    assert.strictEqual(parsed.provider, 'gl')
+    assert.strictEqual(parsed.organization, 'group')
+    assert.strictEqual(parsed.repository, 'repository')
+    assert.strictEqual(parsed.originalRepository, 'subgroup/repository')
+  })
+
+  test('parses GitLab group/subgroup HTTPS remote format', () => {
+    const parsed = parseGitRemote(GITLAB_GROUP_HTTPS_REMOTE_MOCK)
+
+    assert.strictEqual(parsed.provider, 'gl')
+    assert.strictEqual(parsed.organization, 'group')
+    assert.strictEqual(parsed.repository, 'repository')
+    assert.strictEqual(parsed.originalRepository, 'subgroup/repository')
   })
 
   test('parses Bitbucket SSH remote format', () => {
@@ -47,6 +71,7 @@ suite('parseGitRemote', () => {
     assert.strictEqual(parsed.provider, 'bb')
     assert.strictEqual(parsed.organization, 'organization')
     assert.strictEqual(parsed.repository, 'repository')
+    assert.strictEqual(parsed.originalRepository, undefined)
   })
 
   test('parses Bitbucket HTTPS remote format', () => {
@@ -55,5 +80,6 @@ suite('parseGitRemote', () => {
     assert.strictEqual(parsed.provider, 'bb')
     assert.strictEqual(parsed.organization, 'organization')
     assert.strictEqual(parsed.repository, 'repository')
+    assert.strictEqual(parsed.originalRepository, undefined)
   })
 })