Files
orca/tests/e2e/helpers/pr-comments-sidebar-fixture.ts
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

149 lines
4.3 KiB
TypeScript

import type { Page } from '@stablyai/playwright-test'
import type { PRComment } from '../../../src/shared/github/comment-types'
import type { PRInfo } from '../../../src/shared/github/pull-request-types'
export type PRCommentsSidebarSeed = {
worktreeId: string
branch: string
prNumber: number
}
export const FIXTURE_COMMENTS: PRComment[] = [
{
id: 101,
author: 'coderabbitai',
authorAvatarUrl: '',
body: 'Please update this handler before merge.',
createdAt: '2026-05-14T10:00:00.000Z',
url: 'https://github.com/acme/orca/pull/73#discussion_r101',
reactionSubjectId: 'PRRC_101',
threadId: 'thread-open',
path: 'src/handler.ts',
isBot: true,
isResolved: false
},
{
id: 102,
author: 'bob',
authorAvatarUrl: '',
body: 'LGTM on the overall approach.',
createdAt: '2026-05-14T11:00:00.000Z',
url: 'https://github.com/acme/orca/pull/73#issuecomment-102',
reactionSubjectId: 'IC_102'
},
{
id: 103,
author: 'carol',
authorAvatarUrl: '',
body: 'Already fixed upstream.',
createdAt: '2026-05-13T09:00:00.000Z',
url: 'https://github.com/acme/orca/pull/73#discussion_r103',
threadId: 'thread-resolved',
path: 'src/legacy.ts',
isResolved: true
}
]
/** Seed an open PR on e2e-secondary with mixed comment triage states for sidebar tests. */
export async function seedPRCommentsSidebarFixture(page: Page): Promise<PRCommentsSidebarSeed> {
return page.evaluate(async (fixtureComments: PRComment[]) => {
const store = window.__store
if (!store) {
throw new Error('window.__store is not available')
}
const state = store.getState()
const worktrees = Object.values(state.worktreesByRepo).flat()
const worktree = worktrees.find(
(entry) => entry.branch.replace(/^refs\/heads\//, '') === 'e2e-secondary'
)
if (!worktree) {
throw new Error('seeded e2e-secondary worktree not found')
}
state.setActiveWorktree(worktree.id)
const repo = state.repos.find((entry) => entry.id === worktree.repoId)
if (!repo) {
throw new Error('active repo not found')
}
const branch = worktree.branch.replace(/^refs\/heads\//, '')
const prNumber = 73
const pr: PRInfo = {
number: prNumber,
title: 'E2E PR comments sidebar',
state: 'open',
url: `https://github.com/acme/orca/pull/${prNumber}`,
checksStatus: 'pending',
updatedAt: '2026-05-15T00:00:00.000Z',
mergeable: 'MERGEABLE',
prRepo: { owner: 'acme', repo: 'orca' }
}
const prCacheEntries = {
[`${repo.id}::${branch}`]: {
data: pr,
fetchedAt: Date.now()
},
[`${repo.path}::${branch}`]: {
data: pr,
fetchedAt: Date.now()
}
}
const comments = fixtureComments
store.setState((current) => ({
prCache: {
...current.prCache,
...prCacheEntries
},
repos: current.repos.map((candidate) =>
candidate.id === repo.id ? { ...candidate, worktreeBaseRef: 'origin/main' } : candidate
),
gitStatusByWorktree: {
...current.gitStatusByWorktree,
[worktree.id]: []
},
remoteStatusesByWorktree: {
...current.remoteStatusesByWorktree,
[worktree.id]: {
hasUpstream: true,
upstreamName: `origin/${branch}`,
ahead: 0,
behind: 0
}
},
settings: current.settings
? {
...current.settings,
sourceControlAi: {
...current.settings.sourceControlAi,
enabled: true
}
}
: current.settings,
fetchPRForBranch: async (repoPath: string, targetBranch: string) => {
if (targetBranch !== branch) {
return null
}
store.setState((next) => ({
prCache: {
...next.prCache,
...prCacheEntries
}
}))
return pr
},
fetchPRChecks: async () => [],
fetchPRComments: async () => comments,
setPRCommentReaction: async () => true,
fetchUpstreamStatus: async () => undefined,
setUpstreamStatus: () => undefined
}))
window.localStorage.setItem('orca:pr-comment-presentation', 'cards')
return { worktreeId: worktree.id, branch, prNumber }
}, FIXTURE_COMMENTS)
}