mirror of
https://github.com/stablyai/orca.git
synced 2026-09-26 16:02:43 +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.
119 lines
3.7 KiB
TypeScript
119 lines
3.7 KiB
TypeScript
import type { GlobalSettings } from '../global-settings-types'
|
|
import type { PersistedUIState } from '../persisted-ui-state-types'
|
|
import type { WorktreeCardMode, WorktreeCardProperty } from '../ui-chrome-types'
|
|
|
|
const FIXED_WORKTREE_CARD_PROPERTIES: WorktreeCardProperty[] = ['status', 'unread']
|
|
|
|
export const TASK_WORKTREE_CARD_PROPERTIES: WorktreeCardProperty[] = [
|
|
'issue',
|
|
'linear-issue',
|
|
'jira-issue'
|
|
]
|
|
|
|
export const DEFAULT_WORKTREE_CARD_PROPERTIES: WorktreeCardProperty[] = [
|
|
...FIXED_WORKTREE_CARD_PROPERTIES,
|
|
...TASK_WORKTREE_CARD_PROPERTIES,
|
|
'pr',
|
|
'automation',
|
|
'cli',
|
|
'comment',
|
|
'ports',
|
|
// Why: agent activity is the primary reason users opt into the feature, so
|
|
// the Default mode keeps it inline on each card while Compact removes the
|
|
// extra row.
|
|
'inline-agents'
|
|
]
|
|
|
|
// Why: compact cards default to the quiet preset; metadata icons remain opt-in
|
|
// through Show properties instead of appearing automatically.
|
|
export const COMPACT_WORKTREE_CARD_PROPERTIES: WorktreeCardProperty[] = ['status']
|
|
const NORMALIZED_COMPACT_WORKTREE_CARD_PROPERTIES: WorktreeCardProperty[] = ['status', 'unread']
|
|
|
|
const LEGACY_COMPACT_WORKTREE_CARD_PROPERTIES_WITH_AUTOMATION: WorktreeCardProperty[] = [
|
|
'status',
|
|
'automation'
|
|
]
|
|
|
|
const LEGACY_NORMALIZED_COMPACT_WORKTREE_CARD_PROPERTIES_WITH_AUTOMATION: WorktreeCardProperty[] = [
|
|
'status',
|
|
'unread',
|
|
'automation'
|
|
]
|
|
|
|
/** Every card property, in canonical render order. Client schemas derive their
|
|
* accepted value domain from this so a new property cannot drift out of them. */
|
|
export const WORKTREE_CARD_PROPERTIES = [
|
|
'status',
|
|
'unread',
|
|
'ci',
|
|
'branch',
|
|
'issue',
|
|
'linear-issue',
|
|
'jira-issue',
|
|
'pr',
|
|
'automation',
|
|
'cli',
|
|
'comment',
|
|
'ports',
|
|
'inline-agents'
|
|
] as const satisfies readonly WorktreeCardProperty[]
|
|
|
|
export function normalizeWorktreeCardProperties(
|
|
properties: readonly unknown[] | null | undefined
|
|
): WorktreeCardProperty[] {
|
|
const normalized: WorktreeCardProperty[] = [...FIXED_WORKTREE_CARD_PROPERTIES]
|
|
const source = properties ?? DEFAULT_WORKTREE_CARD_PROPERTIES
|
|
for (const property of WORKTREE_CARD_PROPERTIES) {
|
|
if (source.includes(property) && !normalized.includes(property)) {
|
|
normalized.push(property)
|
|
}
|
|
}
|
|
return normalized
|
|
}
|
|
|
|
export function getWorktreeCardModeProperties(mode: WorktreeCardMode): WorktreeCardProperty[] {
|
|
return mode === 'Compact'
|
|
? [...COMPACT_WORKTREE_CARD_PROPERTIES]
|
|
: [...DEFAULT_WORKTREE_CARD_PROPERTIES]
|
|
}
|
|
|
|
export function getWorktreeCardModeUpdates(mode: WorktreeCardMode): {
|
|
settings: Pick<GlobalSettings, 'compactWorktreeCards'>
|
|
ui: Pick<PersistedUIState, 'worktreeCardProperties' | '_worktreeCardModeDefaulted'>
|
|
} {
|
|
return {
|
|
settings: { compactWorktreeCards: mode === 'Compact' },
|
|
ui: {
|
|
worktreeCardProperties: getWorktreeCardModeProperties(mode),
|
|
_worktreeCardModeDefaulted: true
|
|
}
|
|
}
|
|
}
|
|
|
|
export function isDefaultedCompactWorktreeCardProperties(
|
|
properties: readonly unknown[] | null | undefined
|
|
): boolean {
|
|
return (
|
|
matchesWorktreeCardProperties(properties, COMPACT_WORKTREE_CARD_PROPERTIES) ||
|
|
matchesWorktreeCardProperties(properties, NORMALIZED_COMPACT_WORKTREE_CARD_PROPERTIES) ||
|
|
matchesWorktreeCardProperties(
|
|
properties,
|
|
LEGACY_COMPACT_WORKTREE_CARD_PROPERTIES_WITH_AUTOMATION
|
|
) ||
|
|
matchesWorktreeCardProperties(
|
|
properties,
|
|
LEGACY_NORMALIZED_COMPACT_WORKTREE_CARD_PROPERTIES_WITH_AUTOMATION
|
|
)
|
|
)
|
|
}
|
|
|
|
function matchesWorktreeCardProperties(
|
|
properties: readonly unknown[] | null | undefined,
|
|
expected: readonly WorktreeCardProperty[]
|
|
): boolean {
|
|
if (properties?.length !== expected.length) {
|
|
return false
|
|
}
|
|
return expected.every((property, index) => properties[index] === property)
|
|
}
|