mirror of
https://github.com/stablyai/orca.git
synced 2026-10-08 08:02:32 +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.
84 lines
3.0 KiB
TypeScript
84 lines
3.0 KiB
TypeScript
/* Why: the browser slice of the persisted workspace session. Split out of
|
|
* workspace-session-schema.ts to keep that file inside its line budget; the
|
|
* schemas themselves are unchanged apart from the per-entry tolerance the
|
|
* session schema now declares everywhere. */
|
|
import { z } from 'zod'
|
|
import type { BrowserWorkspace } from './browser-workspace-types'
|
|
import { normalizeBrowserHistoryEntries } from './workspace-session-browser-history'
|
|
import { salvagingArray } from './zod-salvage'
|
|
|
|
const browserLoadErrorSchema = z.object({
|
|
code: z.number(),
|
|
description: z.string(),
|
|
validatedUrl: z.string()
|
|
})
|
|
|
|
const browserViewportPresetIdSchema = z.enum([
|
|
'mobile-s',
|
|
'mobile-m',
|
|
'mobile-l',
|
|
'tablet',
|
|
'laptop',
|
|
'laptop-l',
|
|
'desktop'
|
|
])
|
|
|
|
// Why: the z.ZodType<BrowserWorkspace> cast only aligns the static type — it
|
|
// does NOT let new fields survive parsing. z.object strips unknown keys, so
|
|
// every additive field must be listed below (optional+nullable) or it is
|
|
// dropped on restore.
|
|
export const browserWorkspaceSchema: z.ZodType<BrowserWorkspace> = z.object({
|
|
id: z.string(),
|
|
worktreeId: z.string(),
|
|
label: z.string().optional(),
|
|
sessionProfileId: z.string().nullable().optional(),
|
|
// Why: optional+nullable so pre-field sessions still validate; without this
|
|
// zod strips the persisted partition on restore, and an isolated tab whose
|
|
// profile mirror is stale at startup would silently fall back to the shared
|
|
// default partition — reopening the storage leak (#6923) across restarts.
|
|
sessionPartition: z.string().nullable().optional(),
|
|
activePageId: z.string().nullable().optional(),
|
|
pageIds: z.array(z.string()).optional(),
|
|
url: z.string(),
|
|
title: z.string(),
|
|
loading: z.boolean(),
|
|
faviconUrl: z.string().nullable(),
|
|
canGoBack: z.boolean(),
|
|
canGoForward: z.boolean(),
|
|
loadError: browserLoadErrorSchema.nullable(),
|
|
createdAt: z.number()
|
|
})
|
|
|
|
export const browserPageSchema = z.object({
|
|
id: z.string(),
|
|
workspaceId: z.string(),
|
|
worktreeId: z.string(),
|
|
url: z.string(),
|
|
title: z.string(),
|
|
loading: z.boolean(),
|
|
faviconUrl: z.string().nullable(),
|
|
canGoBack: z.boolean(),
|
|
canGoForward: z.boolean(),
|
|
loadError: browserLoadErrorSchema.nullable(),
|
|
createdAt: z.number(),
|
|
// Why: explicit null marks a browser page as client-local even when its
|
|
// worktree is remote-owned; older sessions omit it and keep inferred runtime.
|
|
browserRuntimeEnvironmentId: z.string().nullable().optional(),
|
|
// Why: optional+nullable so sessions persisted before viewport presets were
|
|
// added still validate; without this, zod would strip the field during
|
|
// restore and reset the user's chosen preset on every app restart.
|
|
viewportPresetId: browserViewportPresetIdSchema.nullable().optional()
|
|
})
|
|
|
|
const browserHistoryEntrySchema = z.object({
|
|
url: z.string(),
|
|
normalizedUrl: z.string(),
|
|
title: z.string(),
|
|
lastVisitedAt: z.number(),
|
|
visitCount: z.number()
|
|
})
|
|
|
|
export const browserHistoryEntriesSchema = salvagingArray(browserHistoryEntrySchema).transform(
|
|
(entries) => normalizeBrowserHistoryEntries(entries)
|
|
)
|