mirror of
https://github.com/stablyai/orca.git
synced 2026-09-27 16:02:35 +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.
141 lines
4.0 KiB
TypeScript
141 lines
4.0 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import type { ProviderRateLimits } from './rate-limit-types'
|
|
import type { CodexManagedAccountSummary } from './managed-account-types'
|
|
import { buildCodexResetCreditExpectedScope } from './codex-reset-credit-scope'
|
|
|
|
const account: CodexManagedAccountSummary = {
|
|
id: 'account-host',
|
|
email: 'dev@example.com',
|
|
managedHomeRuntime: 'host',
|
|
wslDistro: null,
|
|
createdAt: 10,
|
|
updatedAt: 20,
|
|
lastAuthenticatedAt: 20
|
|
}
|
|
|
|
const limits: ProviderRateLimits = {
|
|
provider: 'codex',
|
|
session: {
|
|
usedPercent: 100,
|
|
windowMinutes: 300,
|
|
resetsAt: 1_000,
|
|
resetDescription: 'soon'
|
|
},
|
|
weekly: null,
|
|
rateLimitResetCredits: {
|
|
availableCount: 1,
|
|
totalEarnedCount: 2,
|
|
nextExpiresAt: 2_000,
|
|
credits: [{ status: 'available', expiresAt: 2_000, grantedAt: 500 }]
|
|
},
|
|
updatedAt: 30,
|
|
error: null,
|
|
status: 'ok'
|
|
}
|
|
|
|
describe('buildCodexResetCreditExpectedScope', () => {
|
|
it('builds a deterministic exact host scope', () => {
|
|
const first = buildCodexResetCreditExpectedScope({
|
|
target: { runtime: 'host', wslDistro: null },
|
|
account,
|
|
limits
|
|
})
|
|
const second = buildCodexResetCreditExpectedScope({
|
|
target: { runtime: 'host', wslDistro: null },
|
|
account,
|
|
limits: {
|
|
...limits,
|
|
rateLimitResetCredits: {
|
|
...limits.rateLimitResetCredits!,
|
|
credits: [
|
|
{ status: 'available', expiresAt: 3_000, grantedAt: 600 },
|
|
...limits.rateLimitResetCredits!.credits!
|
|
].toReversed()
|
|
}
|
|
}
|
|
})
|
|
|
|
const firstWithBothRows = buildCodexResetCreditExpectedScope({
|
|
target: { runtime: 'host', wslDistro: null },
|
|
account,
|
|
limits: {
|
|
...limits,
|
|
rateLimitResetCredits: {
|
|
...limits.rateLimitResetCredits!,
|
|
credits: [
|
|
...limits.rateLimitResetCredits!.credits!,
|
|
{ status: 'available', expiresAt: 3_000, grantedAt: 600 }
|
|
]
|
|
}
|
|
}
|
|
})
|
|
|
|
expect(firstWithBothRows).toEqual(second)
|
|
expect(first).toMatchObject({
|
|
target: { runtime: 'host', wslDistro: null },
|
|
accountId: account.id,
|
|
accountRevision: account.updatedAt,
|
|
offerRevision: expect.stringMatching(/^v1:/)
|
|
})
|
|
})
|
|
|
|
it('changes the offer revision when fetched credit or window data changes', () => {
|
|
const original = buildCodexResetCreditExpectedScope({
|
|
target: { runtime: 'host', wslDistro: null },
|
|
account,
|
|
limits
|
|
})
|
|
const refreshed = buildCodexResetCreditExpectedScope({
|
|
target: { runtime: 'host', wslDistro: null },
|
|
account,
|
|
limits: { ...limits, updatedAt: limits.updatedAt + 1 }
|
|
})
|
|
|
|
expect(refreshed?.offerRevision).not.toBe(original?.offerRevision)
|
|
})
|
|
|
|
it.each([
|
|
{
|
|
name: 'system default account',
|
|
target: { runtime: 'host', wslDistro: null } as const,
|
|
candidate: null,
|
|
candidateLimits: limits
|
|
},
|
|
{
|
|
name: 'no available credit',
|
|
target: { runtime: 'host', wslDistro: null } as const,
|
|
candidate: account,
|
|
candidateLimits: {
|
|
...limits,
|
|
rateLimitResetCredits: { ...limits.rateLimitResetCredits!, availableCount: 0 }
|
|
}
|
|
},
|
|
{
|
|
name: 'unknown WSL distro',
|
|
target: { runtime: 'wsl', wslDistro: null } as const,
|
|
candidate: { ...account, managedHomeRuntime: 'wsl' as const, wslDistro: 'Ubuntu' },
|
|
candidateLimits: limits
|
|
},
|
|
{
|
|
name: 'runtime mismatch',
|
|
target: { runtime: 'wsl', wslDistro: 'Ubuntu' } as const,
|
|
candidate: account,
|
|
candidateLimits: limits
|
|
},
|
|
{
|
|
name: 'WSL distro mismatch',
|
|
target: { runtime: 'wsl', wslDistro: 'Ubuntu' } as const,
|
|
candidate: { ...account, managedHomeRuntime: 'wsl' as const, wslDistro: 'Debian' },
|
|
candidateLimits: limits
|
|
}
|
|
])('fails closed for $name', ({ target, candidate, candidateLimits }) => {
|
|
expect(
|
|
buildCodexResetCreditExpectedScope({
|
|
target,
|
|
account: candidate,
|
|
limits: candidateLimits
|
|
})
|
|
).toBeNull()
|
|
})
|
|
})
|