Files
orca/src/shared/task-provider-identity.ts
T
Neil 77f23b013f refactor(shared): drop the shared/types barrel and import from the real modules (#14447)
#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.
2026-08-13 22:48:24 -07:00

171 lines
5.0 KiB
TypeScript

import { githubRepoIdentityKey } from './github/repository-identity-key'
import type { TaskProvider } from './task-providers'
import type { ProjectProviderIdentity } from './project-types'
export type GitHubTaskProviderIdentity = ProjectProviderIdentity & {
provider: 'github'
}
export type GitLabTaskProviderIdentity = {
provider: 'gitlab'
projectId?: string | null
namespace?: string | null
project?: string | null
webUrl?: string | null
}
export type LinearTaskProviderIdentity = {
provider: 'linear'
workspaceId?: string | null
workspaceName?: string | null
teamId?: string | null
teamKey?: string | null
}
export type JiraTaskProviderIdentity = {
provider: 'jira'
siteId?: string | null
siteUrl?: string | null
projectKey?: string | null
}
export type TaskProviderIdentity =
| GitHubTaskProviderIdentity
| GitLabTaskProviderIdentity
| LinearTaskProviderIdentity
| JiraTaskProviderIdentity
export function normalizeTaskProviderIdentity(
provider: TaskProvider,
identity: unknown
): TaskProviderIdentity | null {
if (!identity || typeof identity !== 'object') {
return null
}
const raw = identity as Record<string, unknown>
if (raw.provider !== provider) {
return null
}
switch (provider) {
case 'github': {
const owner = normalizeNonEmptyString(raw.owner)
const repo = normalizeNonEmptyString(raw.repo)
if (!owner || !repo) {
return null
}
const host = normalizeNonEmptyString(raw.host)
return { provider, owner, repo, ...(host ? { host } : {}) }
}
case 'gitlab':
return {
provider,
projectId: normalizeNonEmptyString(raw.projectId),
namespace: normalizeNonEmptyString(raw.namespace),
project: normalizeNonEmptyString(raw.project),
webUrl: normalizeNonEmptyString(raw.webUrl)
}
case 'linear':
return {
provider,
workspaceId: normalizeNonEmptyString(raw.workspaceId),
workspaceName: normalizeNonEmptyString(raw.workspaceName),
teamId: normalizeNonEmptyString(raw.teamId),
teamKey: normalizeNonEmptyString(raw.teamKey)
}
case 'jira':
return {
provider,
siteId: normalizeNonEmptyString(raw.siteId),
siteUrl: normalizeNonEmptyString(raw.siteUrl),
projectKey: normalizeNonEmptyString(raw.projectKey)
}
}
}
export function isStoredTaskProviderIdentity(provider: TaskProvider, identity: unknown): boolean {
if (identity === undefined || identity === null) {
return true
}
if (typeof identity !== 'object') {
return false
}
const raw = identity as Record<string, unknown>
if (raw.provider !== provider) {
return false
}
switch (provider) {
case 'github':
return (
typeof raw.owner === 'string' &&
raw.owner.trim().length > 0 &&
typeof raw.repo === 'string' &&
raw.repo.trim().length > 0 &&
isNullableOptionalString(raw.host)
)
case 'gitlab':
return ['projectId', 'namespace', 'project', 'webUrl'].every((key) =>
isNullableOptionalString(raw[key])
)
case 'linear':
return ['workspaceId', 'workspaceName', 'teamId', 'teamKey'].every((key) =>
isNullableOptionalString(raw[key])
)
case 'jira':
return ['siteId', 'siteUrl', 'projectKey'].every((key) => isNullableOptionalString(raw[key]))
}
}
const TASK_PROVIDER_IDENTITY_FIELDS: Record<TaskProvider, readonly string[]> = {
github: ['owner', 'repo', 'host'],
gitlab: ['projectId', 'namespace', 'project', 'webUrl'],
linear: ['workspaceId', 'workspaceName', 'teamId', 'teamKey'],
jira: ['siteId', 'siteUrl', 'projectKey']
}
export function areTaskProviderIdentitiesEqual(
a: TaskProviderIdentity | null | undefined,
b: TaskProviderIdentity | null | undefined
): boolean {
if (a === b) {
return true
}
if (!a || !b) {
return !a && !b
}
if (a.provider !== b.provider) {
return false
}
const left = a as unknown as Record<string, unknown>
const right = b as unknown as Record<string, unknown>
return TASK_PROVIDER_IDENTITY_FIELDS[a.provider].every(
(field) => (left[field] ?? null) === (right[field] ?? null)
)
}
export function taskProviderIdentityCachePart(
identity: TaskProviderIdentity | null | undefined
): string {
if (!identity) {
return ''
}
switch (identity.provider) {
case 'github':
return githubRepoIdentityKey(identity)
case 'gitlab':
return identity.projectId ?? [identity.namespace, identity.project].filter(Boolean).join('/')
case 'linear':
return [identity.workspaceId, identity.teamId ?? identity.teamKey].filter(Boolean).join('/')
case 'jira':
return [identity.siteId ?? identity.siteUrl, identity.projectKey].filter(Boolean).join('/')
}
}
function normalizeNonEmptyString(value: unknown): string | null {
const trimmed = typeof value === 'string' ? value.trim() : ''
return trimmed ? trimmed : null
}
function isNullableOptionalString(value: unknown): boolean {
return value === undefined || value === null || typeof value === 'string'
}