mirror of
https://github.com/stablyai/orca.git
synced 2026-10-02 08:02:02 +00:00
#14397 split `shared/types.ts` into 46 per-domain modules but kept the path as a re-export barrel so the import sites did not have to change. This removes the barrel: every consumer now imports from the module that actually declares the type, and `src/shared/types.ts` is deleted. Barrels hide where a type lives, make every consumer look like it depends on the whole domain, and let an unrelated edit invalidate a module that ~2,000 files transitively import. 2,323 import declarations across 2,321 files. Rewritten mechanically: each specifier was resolved to an absolute path via the TypeScript AST and recomputed, rather than string-substituted, so alias forms (`@/../../shared/ types`) and per-specifier `type` modifiers survive. Four cases the mechanical pass had to handle, each found by a gate rather than by reading the diff: - Modules inside `src/shared` import the barrel as `./types`, not `shared/types`. A pre-filter on the latter string skipped 176 of them and left imports dangling at a deleted file, which surfaced as confusing `Property 'x' is optional in type 'Repo' but required in Pick<Repo, ...>` errors rather than "module not found". - The barrel RENAMED one type on the way through (`WorkspaceSource as WorkspaceCreateTelemetrySource`), so the original name in the owning module has to be re-aliased at each consumer. - Three test files put `;(globalThis as ...)` on the line after the import. TypeScript parses that `;` as the import statement's terminator, so replacing through `statement.getEnd()` deletes it and breaks ASI. The rewrite now stops at the module specifier. - A file that already imported directly from a module got a SECOND import from it, because the barrel re-exported those same names — which trips `import/no-duplicates` under `--deny-warnings`. A post-pass merges declarations sharing a specifier and type-only-ness; the `import type` plus `import` pair from one module is left alone, since that form is allowed. Splitting one barrel import into several genuinely adds lines, which pushed `terminal-layout-pty-ownership.ts` to 301 counted lines: its 107-character import must wrap, and neither local type collapses onto one line (101 and 116 characters). Rather than contort a type declaration to fit a line budget, `collectLeafIds` and `pruneLeaves` move to `terminal-pane-layout-tree.ts` — they are pure structural operations on the layout tree and independent of PTY ownership. `visible-worktrees.ts` similarly loses its own mini-barrel re-export of `isDefaultBranchWorkspace`, with the four real consumers repointed at the declaring module. No `max-lines` bypass added. Verified: cold `tsc --noEmit` green on node, cli, and web (buildinfo deleted first — these projects are `composite: true` and reuse stale caches); the full `pnpm lint` green, not just bare oxlint — the narrower local check is what let the duplicate imports reach CI; max-lines ratchet OK at 344.
124 lines
4.0 KiB
TypeScript
124 lines
4.0 KiB
TypeScript
import { normalizeGitHubRemoteHost } from '../../shared/git-remote-host-alias'
|
|
import type { GitHubOwnerRepo } from '../../shared/github/pull-request-types'
|
|
|
|
export type GitHubRemoteIdentity = GitHubOwnerRepo & { host: string }
|
|
|
|
// Why: HTTP ports identify the GHES web/API endpoint; SSH and git ports are
|
|
// transport-only and must not leak into gh's host identity.
|
|
function hostFromRemoteUrl(url: URL): string {
|
|
const protocol = url.protocol.toLowerCase()
|
|
return protocol === 'http:' || protocol === 'https:' ? url.host : url.hostname
|
|
}
|
|
|
|
function parseGitHubRemotePath(path: string): Pick<GitHubRemoteIdentity, 'owner' | 'repo'> | null {
|
|
const parts = path.replace(/^\/+/, '').replace(/\/+$/, '').split('/')
|
|
if (parts.length !== 2) {
|
|
return null
|
|
}
|
|
const [owner, repoWithSuffix] = parts
|
|
const repo = repoWithSuffix.replace(/\.git$/i, '')
|
|
if (!owner || !repo) {
|
|
return null
|
|
}
|
|
return { owner, repo }
|
|
}
|
|
|
|
/** SCP-style / ssh:// / git+ssh:// remotes may use an OpenSSH Host alias. */
|
|
export function remoteUrlUsesSshTransport(remoteUrl: string): boolean {
|
|
const trimmed = remoteUrl.trim().toLowerCase()
|
|
return (
|
|
trimmed.startsWith('git@') || trimmed.startsWith('ssh://') || trimmed.startsWith('git+ssh://')
|
|
)
|
|
}
|
|
|
|
/** SSH transport host as written, preserving SCP alias case. */
|
|
export function rawSshTransportHost(remoteUrl: string): string | null {
|
|
const trimmed = remoteUrl.trim()
|
|
const scpMatch = trimmed.match(/^git@([^:]+):/i)
|
|
if (scpMatch) {
|
|
return scpMatch[1]
|
|
}
|
|
try {
|
|
const url = new URL(trimmed)
|
|
if (!['ssh:', 'git+ssh:'].includes(url.protocol.toLowerCase())) {
|
|
return null
|
|
}
|
|
return url.hostname || null
|
|
} catch {
|
|
return null
|
|
}
|
|
}
|
|
|
|
/** Non-GitHub SSH host that may need OpenSSH alias expansion. */
|
|
export function gitHubSshConfigHostAlias(remoteUrl: string): string | null {
|
|
if (!remoteUrlUsesSshTransport(remoteUrl)) {
|
|
return null
|
|
}
|
|
const identity = parseGitHubRemoteIdentity(remoteUrl)
|
|
if (!identity || identity.host === 'github.com') {
|
|
return null
|
|
}
|
|
return rawSshTransportHost(remoteUrl) ?? identity.host
|
|
}
|
|
|
|
export function parseGitHubRemoteIdentity(remoteUrl: string): GitHubRemoteIdentity | null {
|
|
const trimmed = remoteUrl.trim()
|
|
const sshMatch = trimmed.match(/^git@([^:]+):([^/]+)\/([^/]+?)(?:\.git)?$/i)
|
|
if (sshMatch) {
|
|
return { host: normalizeGitHubRemoteHost(sshMatch[1]), owner: sshMatch[2], repo: sshMatch[3] }
|
|
}
|
|
|
|
try {
|
|
const url = new URL(trimmed)
|
|
if (!['git:', 'git+ssh:', 'http:', 'https:', 'ssh:'].includes(url.protocol.toLowerCase())) {
|
|
return null
|
|
}
|
|
const path = parseGitHubRemotePath(url.pathname)
|
|
return path ? { host: normalizeGitHubRemoteHost(hostFromRemoteUrl(url)), ...path } : null
|
|
} catch {
|
|
return null
|
|
}
|
|
}
|
|
|
|
export function parseGitHubOwnerRepo(remoteUrl: string): GitHubOwnerRepo | null {
|
|
const identity = parseGitHubRemoteIdentity(remoteUrl)
|
|
if (!identity || identity.host.toLowerCase() !== 'github.com') {
|
|
return null
|
|
}
|
|
return { owner: identity.owner, repo: identity.repo }
|
|
}
|
|
|
|
/** Parse github.com identity using an expanded SSH HostName. */
|
|
export function parseGitHubOwnerRepoWithResolvedSshHostname(
|
|
remoteUrl: string,
|
|
resolvedSshHostname: string | null | undefined
|
|
): GitHubOwnerRepo | null {
|
|
const direct = parseGitHubOwnerRepo(remoteUrl)
|
|
if (direct) {
|
|
return direct
|
|
}
|
|
if (!remoteUrlUsesSshTransport(remoteUrl)) {
|
|
return null
|
|
}
|
|
if (!resolvedSshHostname?.trim()) {
|
|
return null
|
|
}
|
|
const identity = parseGitHubRemoteIdentity(remoteUrl)
|
|
if (!identity) {
|
|
return null
|
|
}
|
|
if (normalizeGitHubRemoteHost(resolvedSshHostname.trim()) !== 'github.com') {
|
|
return null
|
|
}
|
|
return { owner: identity.owner, repo: identity.repo }
|
|
}
|
|
|
|
/** Effective forge host after optional SSH config HostName expansion. */
|
|
export function effectiveGitHubRemoteHost(
|
|
parsedHost: string,
|
|
resolvedSshHostname?: string | null
|
|
): string {
|
|
const candidate = resolvedSshHostname?.trim() || parsedHost
|
|
return normalizeGitHubRemoteHost(candidate)
|
|
}
|