mirror of
https://github.com/stablyai/orca.git
synced 2026-09-26 00:02:34 +00:00
#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.
136 lines
4.0 KiB
TypeScript
136 lines
4.0 KiB
TypeScript
import type { SpriteAnimation } from '../../shared/pet-types'
|
|
import {
|
|
CODEX_PET_ANIMATIONS,
|
|
CODEX_PET_DEFAULT_ANIMATION,
|
|
CODEX_PET_DEFAULT_FPS,
|
|
CODEX_PET_FRAME,
|
|
CODEX_PET_SPRITESHEET_PATH,
|
|
codexAnimationsAtUniformFps
|
|
} from '../../shared/codex-pet-sprite-defaults'
|
|
|
|
// Re-exported so main-side consumers keep their import path. The tables live
|
|
// in shared/ so the renderer can reuse the same fingerprint for upgrades.
|
|
export {
|
|
CODEX_PET_ANIMATIONS,
|
|
CODEX_PET_DEFAULT_ANIMATION,
|
|
CODEX_PET_DEFAULT_FPS,
|
|
CODEX_PET_FRAME,
|
|
CODEX_PET_SPRITESHEET_PATH
|
|
}
|
|
|
|
export type PetManifestLike = {
|
|
id?: string
|
|
displayName?: string
|
|
description?: string
|
|
spritesheetPath?: string
|
|
frame?: {
|
|
width: number
|
|
height: number
|
|
}
|
|
fps?: number
|
|
defaultAnimation?: string
|
|
animations?: Record<string, SpriteAnimation>
|
|
}
|
|
|
|
export type ResolvedPetManifest<T extends PetManifestLike = PetManifestLike> = T &
|
|
PetManifestLike & {
|
|
spritesheetPath: string
|
|
}
|
|
|
|
function isCodexPetSpritePath(spritesheetPath: string | undefined): boolean {
|
|
return spritesheetPath === undefined || /(^|[/\\])spritesheet\.webp$/i.test(spritesheetPath)
|
|
}
|
|
|
|
export function applyCodexPetDefaults<T extends PetManifestLike>(
|
|
manifest: T
|
|
): ResolvedPetManifest<T> {
|
|
const shouldApplyCodexLayout =
|
|
isCodexPetSpritePath(manifest.spritesheetPath) &&
|
|
manifest.frame === undefined &&
|
|
manifest.animations === undefined
|
|
|
|
if (!shouldApplyCodexLayout) {
|
|
return {
|
|
...manifest,
|
|
spritesheetPath: manifest.spritesheetPath ?? CODEX_PET_SPRITESHEET_PATH
|
|
} as ResolvedPetManifest<T>
|
|
}
|
|
|
|
return {
|
|
...manifest,
|
|
spritesheetPath: manifest.spritesheetPath ?? CODEX_PET_SPRITESHEET_PATH,
|
|
frame: manifest.frame ?? CODEX_PET_FRAME,
|
|
fps: manifest.fps ?? CODEX_PET_DEFAULT_FPS,
|
|
defaultAnimation: manifest.defaultAnimation ?? CODEX_PET_DEFAULT_ANIMATION,
|
|
// Why: with no fps, bake Codex's intended uneven pacing; with an explicit
|
|
// fps, bake that as uniform durations so it is honored instead of being
|
|
// overridden by the timed table (and stays out of the legacy retiming path).
|
|
animations:
|
|
manifest.animations ??
|
|
(manifest.fps === undefined
|
|
? CODEX_PET_ANIMATIONS
|
|
: codexAnimationsAtUniformFps(manifest.fps))
|
|
}
|
|
}
|
|
|
|
function readUInt24LE(buffer: Buffer, offset: number): number {
|
|
return buffer[offset] | (buffer[offset + 1] << 8) | (buffer[offset + 2] << 16)
|
|
}
|
|
|
|
export function readWebpDimensionsFromBuffer(
|
|
buffer: Buffer
|
|
): { width: number; height: number } | null {
|
|
if (
|
|
buffer.byteLength < 20 ||
|
|
buffer.toString('ascii', 0, 4) !== 'RIFF' ||
|
|
buffer.toString('ascii', 8, 12) !== 'WEBP'
|
|
) {
|
|
return null
|
|
}
|
|
|
|
let offset = 12
|
|
while (offset + 8 <= buffer.byteLength) {
|
|
const chunkType = buffer.toString('ascii', offset, offset + 4)
|
|
const chunkSize = buffer.readUInt32LE(offset + 4)
|
|
const dataOffset = offset + 8
|
|
const dataEnd = dataOffset + chunkSize
|
|
if (dataEnd > buffer.byteLength) {
|
|
return null
|
|
}
|
|
|
|
if (chunkType === 'VP8X' && chunkSize >= 10) {
|
|
return {
|
|
width: readUInt24LE(buffer, dataOffset + 4) + 1,
|
|
height: readUInt24LE(buffer, dataOffset + 7) + 1
|
|
}
|
|
}
|
|
|
|
if (chunkType === 'VP8L' && chunkSize >= 5 && buffer[dataOffset] === 0x2f) {
|
|
const b0 = buffer[dataOffset + 1]
|
|
const b1 = buffer[dataOffset + 2]
|
|
const b2 = buffer[dataOffset + 3]
|
|
const b3 = buffer[dataOffset + 4]
|
|
return {
|
|
width: 1 + (((b1 & 0x3f) << 8) | b0),
|
|
height: 1 + (((b3 & 0x0f) << 10) | (b2 << 2) | ((b1 & 0xc0) >> 6))
|
|
}
|
|
}
|
|
|
|
if (
|
|
chunkType === 'VP8 ' &&
|
|
chunkSize >= 10 &&
|
|
buffer[dataOffset + 3] === 0x9d &&
|
|
buffer[dataOffset + 4] === 0x01 &&
|
|
buffer[dataOffset + 5] === 0x2a
|
|
) {
|
|
const width = buffer.readUInt16LE(dataOffset + 6) & 0x3fff
|
|
const height = buffer.readUInt16LE(dataOffset + 8) & 0x3fff
|
|
return width > 0 && height > 0 ? { width, height } : null
|
|
}
|
|
|
|
offset = dataEnd + (chunkSize % 2)
|
|
}
|
|
|
|
return null
|
|
}
|