mirror of
https://github.com/stablyai/orca.git
synced 2026-09-29 16:02:50 +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.
88 lines
2.3 KiB
TypeScript
88 lines
2.3 KiB
TypeScript
import type { GitHubReaction, GitHubReactionContent } from '../../shared/github/comment-types'
|
|
|
|
type GitHubGraphQLReactionContent =
|
|
| 'THUMBS_UP'
|
|
| 'THUMBS_DOWN'
|
|
| 'LAUGH'
|
|
| 'CONFUSED'
|
|
| 'HEART'
|
|
| 'HOORAY'
|
|
| 'ROCKET'
|
|
| 'EYES'
|
|
|
|
export type GitHubGraphQLReactionGroup = {
|
|
content?: string | null
|
|
reactors?: { totalCount?: number | null } | null
|
|
viewerHasReacted?: boolean | null
|
|
}
|
|
|
|
const GRAPHQL_REACTION_CONTENT: Record<GitHubGraphQLReactionContent, GitHubReactionContent> = {
|
|
THUMBS_UP: '+1',
|
|
THUMBS_DOWN: '-1',
|
|
LAUGH: 'laugh',
|
|
CONFUSED: 'confused',
|
|
HEART: 'heart',
|
|
HOORAY: 'hooray',
|
|
ROCKET: 'rocket',
|
|
EYES: 'eyes'
|
|
}
|
|
|
|
const REACTION_ORDER: GitHubReactionContent[] = [
|
|
'+1',
|
|
'-1',
|
|
'laugh',
|
|
'confused',
|
|
'heart',
|
|
'hooray',
|
|
'rocket',
|
|
'eyes'
|
|
]
|
|
|
|
const REACTION_CONTENT_TO_GRAPHQL: Record<GitHubReactionContent, GitHubGraphQLReactionContent> = {
|
|
'+1': 'THUMBS_UP',
|
|
'-1': 'THUMBS_DOWN',
|
|
laugh: 'LAUGH',
|
|
confused: 'CONFUSED',
|
|
heart: 'HEART',
|
|
hooray: 'HOORAY',
|
|
rocket: 'ROCKET',
|
|
eyes: 'EYES'
|
|
}
|
|
|
|
export function toGraphQLReactionContent(
|
|
content: GitHubReactionContent
|
|
): GitHubGraphQLReactionContent {
|
|
return REACTION_CONTENT_TO_GRAPHQL[content]
|
|
}
|
|
|
|
export function mapGraphQLReactionGroups(
|
|
groups?: GitHubGraphQLReactionGroup[] | null
|
|
): GitHubReaction[] | undefined {
|
|
const reactionsByContent = new Map<GitHubReactionContent, GitHubReaction>()
|
|
for (const group of groups ?? []) {
|
|
const content =
|
|
group.content && group.content in GRAPHQL_REACTION_CONTENT
|
|
? GRAPHQL_REACTION_CONTENT[group.content as GitHubGraphQLReactionContent]
|
|
: null
|
|
const count = group.reactors?.totalCount ?? 0
|
|
if (!content || count <= 0) {
|
|
continue
|
|
}
|
|
const existing = reactionsByContent.get(content)
|
|
const viewerHasReacted = Boolean(existing?.viewerHasReacted || group.viewerHasReacted)
|
|
reactionsByContent.set(content, {
|
|
content,
|
|
count: (existing?.count ?? 0) + count,
|
|
...(existing?.viewerHasReacted !== undefined || group.viewerHasReacted != null
|
|
? { viewerHasReacted }
|
|
: {})
|
|
})
|
|
}
|
|
|
|
const reactions = REACTION_ORDER.flatMap((content) => {
|
|
const reaction = reactionsByContent.get(content)
|
|
return reaction ? [reaction] : []
|
|
})
|
|
return reactions.length > 0 ? reactions : undefined
|
|
}
|