mirror of
https://github.com/stablyai/orca.git
synced 2026-09-23 00:02:29 +00:00
Neil
77f23b013f
#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.
73 lines
2.5 KiB
TypeScript
73 lines
2.5 KiB
TypeScript
import path from 'node:path'
|
|
import { test, expect } from './helpers/orca-app'
|
|
import { waitForSessionReady } from './helpers/store'
|
|
import type { Repo } from '../../src/shared/repo-types'
|
|
|
|
const MATCHING_PROJECT_COUNT = 240
|
|
|
|
function buildProjectPaths(): string[] {
|
|
return Array.from({ length: MATCHING_PROJECT_COUNT }, (_, index) =>
|
|
path.join(process.cwd(), '.e2e-settings-search', `project-${String(index).padStart(3, '0')}`)
|
|
)
|
|
}
|
|
|
|
test.describe('Settings search responsiveness', () => {
|
|
test('renders only the active settings pane when many projects match search', async ({
|
|
orcaPage
|
|
}) => {
|
|
await waitForSessionReady(orcaPage)
|
|
|
|
await orcaPage.evaluate(
|
|
({ projectPaths, projectCount }) => {
|
|
const store = window.__store
|
|
if (!store) {
|
|
throw new Error('window.__store is not available')
|
|
}
|
|
const state = store.getState()
|
|
const seedRepo = state.repos[0]
|
|
if (!seedRepo) {
|
|
throw new Error('Expected seeded repo for settings search regression')
|
|
}
|
|
const now = Date.now()
|
|
const repos: Repo[] = Array.from({ length: projectCount }, (_, index) => ({
|
|
...seedRepo,
|
|
id: `settings-search-repo-${index}`,
|
|
path: projectPaths[index],
|
|
displayName: `Project Long Search ${String(index).padStart(3, '0')}`,
|
|
addedAt: now + index,
|
|
upstream: null,
|
|
hookSettings: undefined
|
|
}))
|
|
store.setState({ repos })
|
|
state.openSettingsPage()
|
|
},
|
|
{ projectPaths: buildProjectPaths(), projectCount: MATCHING_PROJECT_COUNT }
|
|
)
|
|
|
|
const searchInput = orcaPage.getByPlaceholder('Search settings')
|
|
await expect(searchInput).toBeVisible()
|
|
await searchInput.fill('Project Long Search')
|
|
|
|
await expect
|
|
.poll(() => orcaPage.evaluate(() => window.__store?.getState().settingsSearchQuery ?? ''), {
|
|
timeout: 5_000,
|
|
message: 'settings search query did not apply'
|
|
})
|
|
.toBe('Project Long Search')
|
|
|
|
await expect(orcaPage.getByRole('button', { name: 'Project Long Search 000' })).toBeVisible()
|
|
await expect
|
|
.poll(() => orcaPage.locator('section.scroll-mt-8[data-settings-section]').count(), {
|
|
timeout: 5_000,
|
|
message: 'settings search rendered more than the active pane'
|
|
})
|
|
.toBe(1)
|
|
|
|
const renderedSectionId = await orcaPage
|
|
.locator('section.scroll-mt-8[data-settings-section]')
|
|
.first()
|
|
.getAttribute('data-settings-section')
|
|
expect(renderedSectionId).toBe('repo-settings-search-repo-0')
|
|
})
|
|
})
|