mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 16:02:32 +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.
184 lines
6.1 KiB
TypeScript
184 lines
6.1 KiB
TypeScript
import type { GitHubWorkItem } from '../../../src/shared/github/work-item-types'
|
|
import type { GitLabWorkItem } from '../../../src/shared/gitlab-types'
|
|
import {
|
|
normalizeGitHubLinkQuery,
|
|
parseGitHubIssueOrPRLink,
|
|
type GitHubIssueOrPRLink,
|
|
type RepoSlug
|
|
} from '../../../src/shared/new-workspace/github-links'
|
|
import { parseGitLabIssueOrMRLink } from '../../../src/shared/new-workspace/gitlab-links'
|
|
import { isSmartWorkspaceSourceQueryWithinLimit } from '../../../src/shared/new-workspace/smart-workspace-source-results'
|
|
import type { RpcClient } from '../transport/rpc-client'
|
|
import type { RpcSuccess } from '../transport/types'
|
|
import { githubRepoIdentityKey } from '../../../src/shared/github/repository-identity-key'
|
|
|
|
// A repo the picker can switch to for a cross-repo GitHub paste. Slug is derived
|
|
// best-effort from the repo's remote metadata.
|
|
export type PasteRepoCandidate = {
|
|
id: string
|
|
displayName: string
|
|
slug: RepoSlug | null
|
|
}
|
|
|
|
export type GitHubPasteIntent =
|
|
| { kind: 'github-link'; link: GitHubIssueOrPRLink }
|
|
| { kind: 'github-number'; number: number }
|
|
|
|
export type GitLabPasteIntent = {
|
|
kind: 'gitlab-link'
|
|
link: NonNullable<ReturnType<typeof parseGitLabIssueOrMRLink>>
|
|
}
|
|
|
|
export type PasteIntent = GitHubPasteIntent | GitLabPasteIntent | null
|
|
|
|
// Pure: classify pasted text into a work-item lookup intent. A slug-bearing
|
|
// GitHub URL becomes 'github-link'; a bare "#123"/number becomes 'github-number';
|
|
// a GitLab issue/MR URL becomes 'gitlab-link'.
|
|
export function resolvePasteIntent(query: string): PasteIntent {
|
|
if (!isSmartWorkspaceSourceQueryWithinLimit(query)) {
|
|
return null
|
|
}
|
|
const trimmed = query.trim()
|
|
if (!trimmed) {
|
|
return null
|
|
}
|
|
const ghLink = parseGitHubIssueOrPRLink(trimmed)
|
|
if (ghLink) {
|
|
return { kind: 'github-link', link: ghLink }
|
|
}
|
|
const normalizedGh = normalizeGitHubLinkQuery(trimmed)
|
|
if (normalizedGh.directNumber !== null && !/^https?:\/\//i.test(trimmed)) {
|
|
return { kind: 'github-number', number: normalizedGh.directNumber }
|
|
}
|
|
const glLink = parseGitLabIssueOrMRLink(trimmed)
|
|
if (glLink) {
|
|
return { kind: 'gitlab-link', link: glLink }
|
|
}
|
|
return null
|
|
}
|
|
|
|
// Pure: derive an owner/repo slug from a repo's remote metadata so a pasted
|
|
// cross-repo URL can be matched to a locally known repo.
|
|
export function deriveRepoSlug(repo: {
|
|
upstream?: { owner: string; repo: string; host?: string } | null
|
|
gitRemoteIdentity?: { remoteUrl?: string; canonicalKey?: string } | null
|
|
}): RepoSlug | null {
|
|
if (repo.upstream?.owner && repo.upstream.repo) {
|
|
return {
|
|
owner: repo.upstream.owner,
|
|
repo: repo.upstream.repo,
|
|
...(repo.upstream.host ? { host: repo.upstream.host } : {})
|
|
}
|
|
}
|
|
const source = repo.gitRemoteIdentity?.remoteUrl ?? repo.gitRemoteIdentity?.canonicalKey ?? ''
|
|
const match = /(?:github\.com[/:]|^)([^/\s:]+)\/([^/\s]+?)(?:\.git)?$/i.exec(source)
|
|
if (match) {
|
|
return { owner: match[1], repo: match[2] }
|
|
}
|
|
return null
|
|
}
|
|
|
|
function slugsEqual(a: RepoSlug | null, b: RepoSlug | null): boolean {
|
|
if (!a || !b) {
|
|
return false
|
|
}
|
|
return githubRepoIdentityKey(a) === githubRepoIdentityKey(b)
|
|
}
|
|
|
|
export function findRepoMatchingSlug(
|
|
repos: readonly PasteRepoCandidate[],
|
|
slug: RepoSlug
|
|
): PasteRepoCandidate | null {
|
|
return repos.find((repo) => slugsEqual(repo.slug, slug)) ?? null
|
|
}
|
|
|
|
export async function findRepoMatchingSlugForPaste(
|
|
client: RpcClient,
|
|
repos: readonly PasteRepoCandidate[],
|
|
slug: RepoSlug,
|
|
cache: Map<string, RepoSlug | null>
|
|
): Promise<PasteRepoCandidate | null> {
|
|
const projected = findRepoMatchingSlug(repos, slug)
|
|
if (projected) {
|
|
return projected
|
|
}
|
|
// Why: projected remote metadata is incomplete for SSH and GitHub Enterprise;
|
|
// ask each repo's owning runtime instead of assuming github.com URL syntax.
|
|
for (const repo of repos) {
|
|
let resolved = cache.get(repo.id)
|
|
if (!cache.has(repo.id)) {
|
|
try {
|
|
const response = await client.sendRequest('github.repoSlug', { repo: `id:${repo.id}` })
|
|
if (!response.ok && response.error.code === 'method_not_found') {
|
|
// Why: RPC availability is host-wide; avoid repeating an unsupported
|
|
// probe for every repo or on the next paste attempt.
|
|
repos.forEach((candidate) => cache.set(candidate.id, null))
|
|
return null
|
|
}
|
|
resolved = response.ok ? ((response as RpcSuccess).result as RepoSlug | null) : null
|
|
} catch {
|
|
resolved = null
|
|
}
|
|
cache.set(repo.id, resolved ?? null)
|
|
}
|
|
if (slugsEqual(resolved ?? null, slug)) {
|
|
return repo
|
|
}
|
|
}
|
|
return null
|
|
}
|
|
|
|
export async function lookupGitHubItemByNumber(
|
|
client: RpcClient,
|
|
repoId: string,
|
|
number: number
|
|
): Promise<GitHubWorkItem | null> {
|
|
const response = await client.sendRequest('github.workItem', { repo: `id:${repoId}`, number })
|
|
if (!response.ok) {
|
|
throw new Error(response.error.message)
|
|
}
|
|
const item = (response as RpcSuccess).result as GitHubWorkItem | null
|
|
return item ? { ...item, repoId } : null
|
|
}
|
|
|
|
export async function lookupGitHubItemByOwnerRepo(
|
|
client: RpcClient,
|
|
repoId: string,
|
|
slug: RepoSlug,
|
|
number: number,
|
|
type: 'issue' | 'pr'
|
|
): Promise<GitHubWorkItem | null> {
|
|
const response = await client.sendRequest('github.workItemByOwnerRepo', {
|
|
repo: `id:${repoId}`,
|
|
owner: slug.owner,
|
|
ownerRepo: slug.repo,
|
|
...(slug.host ? { host: slug.host } : {}),
|
|
number,
|
|
type
|
|
})
|
|
if (!response.ok) {
|
|
throw new Error(response.error.message)
|
|
}
|
|
const item = (response as RpcSuccess).result as GitHubWorkItem | null
|
|
return item ? { ...item, repoId } : null
|
|
}
|
|
|
|
export async function lookupGitLabItemByPath(
|
|
client: RpcClient,
|
|
repoId: string,
|
|
link: NonNullable<ReturnType<typeof parseGitLabIssueOrMRLink>>
|
|
): Promise<GitLabWorkItem | null> {
|
|
const response = await client.sendRequest('gitlab.workItemByPath', {
|
|
repo: `id:${repoId}`,
|
|
host: link.slug.host,
|
|
path: link.slug.path,
|
|
iid: link.number,
|
|
type: link.type
|
|
})
|
|
if (!response.ok) {
|
|
throw new Error(response.error.message)
|
|
}
|
|
const item = (response as RpcSuccess).result as GitLabWorkItem | null
|
|
return item ? { ...item, repoId } : null
|
|
}
|