mirror of
https://github.com/stablyai/orca.git
synced 2026-10-25 08:04:05 +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.
101 lines
3.7 KiB
TypeScript
101 lines
3.7 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
import type { UpdateStatus } from '../shared/update-status-types'
|
|
import {
|
|
compareVersions,
|
|
isBenignCheckFailure,
|
|
isMissingUpdateManifestFailure,
|
|
isReleaseAssetsPublishingFailure,
|
|
isPrereleaseVersion,
|
|
statusesEqual
|
|
} from './updater-fallback'
|
|
|
|
describe('compareVersions', () => {
|
|
it('compares prerelease and build semver strings correctly', () => {
|
|
expect(compareVersions('1.0.70-rc.1', '1.0.69')).toBeGreaterThan(0)
|
|
expect(compareVersions('1.0.70', '1.0.70-rc.1')).toBeGreaterThan(0)
|
|
expect(compareVersions('1.0.70+build.5', '1.0.70')).toBe(0)
|
|
expect(compareVersions('v1.0.70-beta.2', '1.0.70-beta.1')).toBeGreaterThan(0)
|
|
})
|
|
})
|
|
|
|
describe('isPrereleaseVersion', () => {
|
|
it('recognises RC, beta, and alpha variants', () => {
|
|
expect(isPrereleaseVersion('1.3.17-rc.1')).toBe(true)
|
|
expect(isPrereleaseVersion('v1.3.17-rc.2')).toBe(true)
|
|
expect(isPrereleaseVersion('1.0.0-beta.5')).toBe(true)
|
|
expect(isPrereleaseVersion('2.1.0-alpha')).toBe(true)
|
|
})
|
|
|
|
it('returns false for stable releases and unparseable values', () => {
|
|
expect(isPrereleaseVersion('1.3.17')).toBe(false)
|
|
expect(isPrereleaseVersion('v1.3.17')).toBe(false)
|
|
expect(isPrereleaseVersion('1.3.17+build.5')).toBe(false)
|
|
expect(isPrereleaseVersion('not-a-version')).toBe(false)
|
|
})
|
|
})
|
|
|
|
describe('isMissingUpdateManifestFailure', () => {
|
|
it('matches platform manifest 404s but not generic network failures', () => {
|
|
expect(
|
|
isMissingUpdateManifestFailure(
|
|
'Cannot find channel "latest-mac.yml" update info: HttpError: 404'
|
|
)
|
|
).toBe(true)
|
|
expect(isMissingUpdateManifestFailure('net::ERR_FAILED')).toBe(false)
|
|
expect(isMissingUpdateManifestFailure('Unable to find latest version on GitHub')).toBe(false)
|
|
})
|
|
})
|
|
|
|
describe('isBenignCheckFailure', () => {
|
|
it('treats in-progress release asset publication as retryable', () => {
|
|
expect(isBenignCheckFailure('Latest release assets are still publishing')).toBe(true)
|
|
})
|
|
})
|
|
|
|
describe('statusesEqual', () => {
|
|
const recovery = {
|
|
kind: 'linux-package-install',
|
|
packageType: 'deb',
|
|
reason: 'authentication-agent-unavailable',
|
|
version: '1.0.61'
|
|
} as const
|
|
const withRecovery: UpdateStatus = { state: 'error', message: 'install failed', recovery }
|
|
const withoutRecovery: UpdateStatus = { state: 'error', message: 'install failed' }
|
|
|
|
it('does not dedupe a recovery-carrying error against the same message without recovery', () => {
|
|
// Why: deduping here would leave the card's copy/show actions enabled with no usable package.
|
|
expect(statusesEqual(withRecovery, withoutRecovery)).toBe(false)
|
|
expect(statusesEqual(withoutRecovery, withRecovery)).toBe(false)
|
|
})
|
|
|
|
it('separates recovery statuses that differ only in package type, reason, or version', () => {
|
|
expect(
|
|
statusesEqual(withRecovery, {
|
|
...withRecovery,
|
|
recovery: { ...recovery, packageType: 'rpm' }
|
|
})
|
|
).toBe(false)
|
|
expect(
|
|
statusesEqual(withRecovery, {
|
|
...withRecovery,
|
|
recovery: { ...recovery, reason: 'package-install-failed' }
|
|
})
|
|
).toBe(false)
|
|
expect(
|
|
statusesEqual(withRecovery, { ...withRecovery, recovery: { ...recovery, version: '1.0.62' } })
|
|
).toBe(false)
|
|
expect(statusesEqual(withRecovery, { ...withRecovery })).toBe(true)
|
|
})
|
|
})
|
|
|
|
describe('isReleaseAssetsPublishingFailure', () => {
|
|
it('only matches the explicit release-asset publishing sentinel', () => {
|
|
expect(isReleaseAssetsPublishingFailure('Latest release assets are still publishing')).toBe(
|
|
true
|
|
)
|
|
expect(
|
|
isReleaseAssetsPublishingFailure('Cannot find channel "latest-mac.yml" update info: 404')
|
|
).toBe(false)
|
|
})
|
|
})
|