mirror of
https://github.com/stablyai/orca.git
synced 2026-10-29 08:07:18 +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.
227 lines
6.1 KiB
TypeScript
227 lines
6.1 KiB
TypeScript
import { getLinearOrganizationUrlKeyFromIssueUrl } from '../linear/links'
|
|
import type { FolderWorkspaceLinkedTask } from '../folder-workspace-types'
|
|
import type { JiraIssue } from '../jira-types'
|
|
import type { LinearIssue } from '../linear/issue-types'
|
|
import {
|
|
getLinkedWorkItemSuggestedName,
|
|
getLinkedWorkItemWorkspaceName,
|
|
type WorkspaceIntentWorkItem
|
|
} from '../workspace-name'
|
|
import { isWorkItemLookupText } from './work-item-lookup-text'
|
|
|
|
export type WorkspaceSourceProvider = FolderWorkspaceLinkedTask['provider']
|
|
|
|
export type WorkspaceSourceLinkedItem = FolderWorkspaceLinkedTask & {
|
|
linearWorkspaceId?: string
|
|
linearOrganizationUrlKey?: string
|
|
linearBranchName?: string
|
|
}
|
|
|
|
export type GitHubWorkspaceSource = WorkspaceSourceLinkedItem & {
|
|
provider: 'github'
|
|
type: 'issue' | 'pr'
|
|
}
|
|
|
|
export type GitLabWorkspaceSource = WorkspaceSourceLinkedItem & {
|
|
provider: 'gitlab'
|
|
type: 'issue' | 'mr'
|
|
}
|
|
|
|
export type LinearWorkspaceSource = WorkspaceSourceLinkedItem & {
|
|
provider: 'linear'
|
|
type: 'issue'
|
|
}
|
|
|
|
export type JiraWorkspaceSource = WorkspaceSourceLinkedItem & {
|
|
provider: 'jira'
|
|
type: 'issue'
|
|
}
|
|
|
|
export type WorkspaceSourceItemLike = Omit<WorkspaceSourceLinkedItem, 'provider'> & {
|
|
provider?: WorkspaceSourceProvider
|
|
}
|
|
|
|
export type WorkspaceSourceSelectionKind =
|
|
| 'github-pr'
|
|
| 'github-issue'
|
|
| 'gitlab-mr'
|
|
| 'gitlab-issue'
|
|
| 'branch'
|
|
| 'linear'
|
|
| 'jira'
|
|
|
|
export type WorkspaceSourceSelection = {
|
|
kind: WorkspaceSourceSelectionKind
|
|
label: string
|
|
url?: string
|
|
}
|
|
|
|
const GITLAB_ISSUE_PATH_RE = /\/-\/(?:issues|work_items)\//i
|
|
|
|
export function isGitLabIssueUrl(url: string): boolean {
|
|
try {
|
|
return GITLAB_ISSUE_PATH_RE.test(new URL(url).pathname)
|
|
} catch {
|
|
return GITLAB_ISSUE_PATH_RE.test(url)
|
|
}
|
|
}
|
|
|
|
function isJiraIssueUrl(url: string): boolean {
|
|
try {
|
|
const parsed = new URL(url)
|
|
return (
|
|
/\.atlassian\.net$/i.test(parsed.hostname) ||
|
|
/\/browse\/[A-Z][A-Z0-9]+-\d+/i.test(parsed.pathname)
|
|
)
|
|
} catch {
|
|
return false
|
|
}
|
|
}
|
|
|
|
export function getWorkspaceSourceProvider(item: WorkspaceSourceItemLike): WorkspaceSourceProvider {
|
|
if (item.provider) {
|
|
return item.provider
|
|
}
|
|
if (item.linearIdentifier) {
|
|
return 'linear'
|
|
}
|
|
if (item.jiraIdentifier || isJiraIssueUrl(item.url)) {
|
|
return 'jira'
|
|
}
|
|
if (item.type === 'mr' || isGitLabIssueUrl(item.url)) {
|
|
return 'gitlab'
|
|
}
|
|
if (item.number === 0 && !item.url.includes('github.com')) {
|
|
return 'linear'
|
|
}
|
|
return 'github'
|
|
}
|
|
|
|
export function buildGitHubWorkspaceSource(item: {
|
|
type: 'issue' | 'pr'
|
|
number: number
|
|
title: string
|
|
url: string
|
|
repoId?: string
|
|
}): GitHubWorkspaceSource {
|
|
return { provider: 'github', ...item }
|
|
}
|
|
|
|
export function buildGitLabWorkspaceSource(item: {
|
|
type: 'issue' | 'mr'
|
|
number: number
|
|
title: string
|
|
url: string
|
|
repoId?: string
|
|
}): GitLabWorkspaceSource {
|
|
return { provider: 'gitlab', ...item }
|
|
}
|
|
|
|
export function getUsableLinearBranchName(
|
|
branchName: string | null | undefined
|
|
): string | undefined {
|
|
// Why: only a non-blank normalized value can safely enter the exact git-ref
|
|
// override path; missing values must keep Orca's generated-name fallback.
|
|
return branchName?.trim() || undefined
|
|
}
|
|
|
|
export function buildLinearWorkspaceSource(
|
|
issue: Pick<LinearIssue, 'identifier' | 'title' | 'url' | 'workspaceId' | 'branchName'>
|
|
): LinearWorkspaceSource {
|
|
const organizationUrlKey = getLinearOrganizationUrlKeyFromIssueUrl(issue.url)
|
|
const branchName = getUsableLinearBranchName(issue.branchName)
|
|
return {
|
|
provider: 'linear',
|
|
type: 'issue',
|
|
// Why: Linear uses a string identifier; numeric issue metadata must stay empty.
|
|
number: 0,
|
|
title: issue.title,
|
|
url: issue.url,
|
|
linearIdentifier: issue.identifier,
|
|
...(issue.workspaceId ? { linearWorkspaceId: issue.workspaceId } : {}),
|
|
...(organizationUrlKey ? { linearOrganizationUrlKey: organizationUrlKey } : {}),
|
|
...(branchName ? { linearBranchName: branchName } : {})
|
|
}
|
|
}
|
|
|
|
export function buildJiraWorkspaceSource(
|
|
issue: Pick<JiraIssue, 'key' | 'title' | 'url'>
|
|
): JiraWorkspaceSource {
|
|
return {
|
|
provider: 'jira',
|
|
type: 'issue',
|
|
number: 0,
|
|
title: issue.title,
|
|
url: issue.url,
|
|
jiraIdentifier: issue.key
|
|
}
|
|
}
|
|
|
|
export function shouldApplyWorkspaceSourceAutoName(args: {
|
|
currentName: string
|
|
lastAutoName: string
|
|
}): boolean {
|
|
return (
|
|
!args.currentName.trim() ||
|
|
args.currentName === args.lastAutoName ||
|
|
isWorkItemLookupText(args.currentName)
|
|
)
|
|
}
|
|
|
|
function toWorkspaceIntentItem(item: WorkspaceSourceItemLike): WorkspaceIntentWorkItem {
|
|
return { ...item, provider: getWorkspaceSourceProvider(item) }
|
|
}
|
|
|
|
export function getWorkspaceSourceName(item: WorkspaceSourceItemLike): {
|
|
seedName: string
|
|
displayName: string
|
|
} {
|
|
const normalized = toWorkspaceIntentItem(item)
|
|
const resolved = getLinkedWorkItemWorkspaceName(normalized)
|
|
return {
|
|
seedName: resolved?.seedName ?? getLinkedWorkItemSuggestedName(normalized),
|
|
displayName: resolved?.displayName ?? item.title.trim()
|
|
}
|
|
}
|
|
|
|
export function buildWorkspaceSourceSelection(args: {
|
|
linkedWorkItem: WorkspaceSourceItemLike | null
|
|
baseBranch?: string
|
|
}): WorkspaceSourceSelection | null {
|
|
const { linkedWorkItem, baseBranch } = args
|
|
if (!linkedWorkItem) {
|
|
return baseBranch ? { kind: 'branch', label: baseBranch } : null
|
|
}
|
|
const provider = getWorkspaceSourceProvider(linkedWorkItem)
|
|
const kind: WorkspaceSourceSelectionKind =
|
|
provider === 'linear'
|
|
? 'linear'
|
|
: provider === 'jira'
|
|
? 'jira'
|
|
: provider === 'gitlab'
|
|
? linkedWorkItem.type === 'mr'
|
|
? 'gitlab-mr'
|
|
: 'gitlab-issue'
|
|
: linkedWorkItem.type === 'pr'
|
|
? 'github-pr'
|
|
: 'github-issue'
|
|
return {
|
|
kind,
|
|
label:
|
|
provider === 'linear' || provider === 'jira' || linkedWorkItem.number === 0
|
|
? linkedWorkItem.title
|
|
: `#${linkedWorkItem.number} ${linkedWorkItem.title}`,
|
|
url: linkedWorkItem.url
|
|
}
|
|
}
|
|
|
|
export function shouldPreserveWorkspaceSourceOnRepoChange(
|
|
item: WorkspaceSourceItemLike | null
|
|
): boolean {
|
|
if (!item) {
|
|
return false
|
|
}
|
|
const provider = getWorkspaceSourceProvider(item)
|
|
return provider === 'linear' || provider === 'jira'
|
|
}
|