Skip to content

Commit 6d10901

Browse files
cardoso-netocodex
andcommitted
Preserve repository display capitalization
Co-authored-by: Codex gpt-6.1-sol <[email protected]>
1 parent 7ac952c commit 6d10901

2 files changed

Lines changed: 14 additions & 11 deletions

File tree

‎apps/server/src/project/RepositoryIdentityResolver.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
196196
expect(identity).not.toBeNull();
197197
expect(identity?.canonicalKey).toBe("github.com/t3tools/t3code");
198198
expect(normalizeResolvedPath(resolvedIdentityRoot)).toBe(normalizeResolvedPath(resolvedCwd));
199-
expect(identity?.displayName).toBe("t3tools/t3code");
199+
expect(identity?.displayName).toBe("T3Tools/t3code");
200200
expect(identity?.provider).toBe("github");
201-
expect(identity?.owner).toBe("t3tools");
201+
expect(identity?.owner).toBe("T3Tools");
202202
expect(identity?.name).toBe("t3code");
203203
}).pipe(Effect.provide(RepositoryIdentityResolver.layer)),
204204
);
@@ -284,7 +284,7 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
284284
expect(identity).not.toBeNull();
285285
expect(identity?.locator.remoteName).toBe("upstream");
286286
expect(identity?.canonicalKey).toBe("github.com/t3tools/t3code");
287-
expect(identity?.displayName).toBe("t3tools/t3code");
287+
expect(identity?.displayName).toBe("T3Tools/t3code");
288288
expect(yield* resolver.resolve(cwd)).toEqual(identity);
289289
}).pipe(Effect.provide(RepositoryIdentityResolver.layer)),
290290
);
@@ -304,7 +304,7 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
304304
const identity = yield* resolver.resolve(cwd);
305305

306306
expect(identity?.canonicalKey).toBe("github.com/t3tools/t3code");
307-
expect(identity?.displayName).toBe("t3tools/t3code");
307+
expect(identity?.displayName).toBe("T3Tools/t3code");
308308
expect(identity?.origin).toEqual({
309309
canonicalKey: "github.com/julius/t3code-fork",
310310
displayName: "julius/t3code-fork",
@@ -327,8 +327,8 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
327327

328328
expect(identity).not.toBeNull();
329329
expect(identity?.canonicalKey).toBe("gitlab.com/t3tools/platform/t3code");
330-
expect(identity?.displayName).toBe("t3tools/platform/t3code");
331-
expect(identity?.owner).toBe("t3tools");
330+
expect(identity?.displayName).toBe("T3Tools/platform/t3code");
331+
expect(identity?.owner).toBe("T3Tools");
332332
expect(identity?.name).toBe("t3code");
333333
}).pipe(Effect.provide(RepositoryIdentityResolver.layer)),
334334
);
@@ -400,7 +400,7 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
400400
const refreshedIdentity = yield* resolver.resolve(cwd);
401401
expect(refreshedIdentity).not.toBeNull();
402402
expect(refreshedIdentity?.canonicalKey).toBe("github.com/t3tools/t3code-next");
403-
expect(refreshedIdentity?.displayName).toBe("t3tools/t3code-next");
403+
expect(refreshedIdentity?.displayName).toBe("T3Tools/t3code-next");
404404
expect(refreshedIdentity?.name).toBe("t3code-next");
405405
}).pipe(
406406
Effect.provide(

‎apps/server/src/project/RepositoryIdentityResolver.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { RepositoryIdentity, SourceControlProviderError } from "@t3tools/contracts";
2+
import { repositoryPathFromRemoteUrl } from "@t3tools/source-control-core/server/SourceControlProvider";
23
import {
34
detectSourceControlProviderFromGitRemoteUrl,
45
normalizeGitRemoteUrl,
@@ -70,8 +71,10 @@ function pickPrimaryRemote(
7071
return remoteName && remoteUrl ? { remoteName, remoteUrl } : null;
7172
}
7273

73-
function repositoryPathOf(canonicalKey: string): string {
74-
return canonicalKey.split("/").slice(1).join("/");
74+
function repositoryPathOf(canonicalKey: string, remoteUrl: string): string {
75+
const canonicalPath = canonicalKey.split("/").slice(1).join("/");
76+
const displayPath = repositoryPathFromRemoteUrl(remoteUrl);
77+
return displayPath?.toLowerCase() === canonicalPath ? displayPath : canonicalPath;
7578
}
7679

7780
function buildRepositoryOrigin(
@@ -81,7 +84,7 @@ function buildRepositoryOrigin(
8184
if (!originUrl) return undefined;
8285
const originKey = normalizeGitRemoteUrl(originUrl);
8386
if (originKey === canonicalKey) return undefined;
84-
const displayName = repositoryPathOf(originKey);
87+
const displayName = repositoryPathOf(originKey, originUrl);
8588
return { canonicalKey: originKey, ...(displayName ? { displayName } : {}) };
8689
}
8790

@@ -93,7 +96,7 @@ function buildRepositoryIdentity(input: {
9396
}): RepositoryIdentity {
9497
const canonicalKey = normalizeGitRemoteUrl(input.remoteUrl);
9598
const sourceControlProvider = detectSourceControlProviderFromGitRemoteUrl(input.remoteUrl);
96-
const repositoryPath = repositoryPathOf(canonicalKey);
99+
const repositoryPath = repositoryPathOf(canonicalKey, input.remoteUrl);
97100
const repositoryPathSegments = repositoryPath.split("/").filter((segment) => segment.length > 0);
98101
const [owner] = repositoryPathSegments;
99102
const repositoryName = repositoryPathSegments.at(-1);

0 commit comments

Comments
 (0)